diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..b44f3fab1b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+**/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text
+**/src/androidTest/assets/*.realm filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 2dd968951f..0e51d5155e 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for taking the time to propose a new feature or make a suggestion.
+        Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
   - type: textarea
     id: usecase
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/release.yml b/.github/ISSUE_TEMPLATE/release.yml
index b063c93530..4ab77af5a0 100644
--- a/.github/ISSUE_TEMPLATE/release.yml
+++ b/.github/ISSUE_TEMPLATE/release.yml
@@ -10,7 +10,6 @@ body:
     id: checklist
     attributes:
       label: Release checklist
-      description: For the template example, we are releasing the version 1.2.3. Replace 1.2.3 with the version in the issue body.
       placeholder: |
         If you are reading this, you have deleted the content of the release template: undo the deletion or start again.
       value: |
@@ -20,32 +19,11 @@ body:
         - [ ] Check the update of the store descriptions (using Google Translate if necessary) to ensure that the changes are acceptable to be published to the stores.
         - [ ] While Weblate is locked, and after the PR from Weblate has been merged, handle all the TODOs in the main `strings.xml` file
         - [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.
+        - [ ] Ensure all [the required PRs](https://github.com/vector-im/element-android/pulls?q=is%3Aopen+is%3Apr+label%3AZ-NextRelease) have been merged
 
         ### Do the release
 
-        - [ ] Make sure `develop` and `main` are up to date (git pull)
-        - [ ] Checkout develop and create a release with gitflow, branch name `release/1.2.3`
-        - [ ] Check the crashes from the PlayStore
-        - [ ] Check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/1.2.3-dev
-        - [ ] Run the integration test, and especially `UiAllScreensSanityTest.allScreensTest()`
-        - [ ] Create an account on matrix.org and do some smoke tests that the sanity test does not cover like: 1-1 call, 1-1 video call, Jitsi call for instance
-        - [ ] Run towncrier: `towncrier build --version v1.2.3 --draft` (remove `--draft` do write the file CHANGES.md)
-        - [ ] Check that the folder `changelog.d` is empty. It can happen that some remaining files stay here
-        - [ ] Check the file CHANGES.md consistency. It's possible to reorder items (most important changes first) or change their section if relevant. Also an opportunity to fix some typo, or rewrite things
-        - [ ] Add file for fastlane under ./fastlane/metadata/android/en-US/changelogs
-        - [ ] (optional) Push the branch and start a draft PR (will not be merged), to check that the CI is happy with all the changes.
-        - [ ] Finish release with gitflow, delete the draft PR (if created)
-        - [ ] Push `main` and the new tag `v1.2.3` to origin
-        - [ ] Checkout `develop`
-        - [ ] Increase version (versionPatch + 2) in `./vector/build.gradle`
-        - [ ] Change the value of SDK_VERSION in the file `./matrix-sdk-android/build.gradle`
-        - [ ] Commit and push `develop`
-        - [ ] Wait for [Buildkite](https://buildkite.com/matrix-dot-org/element-android/builds?branch=main) to build the `main` branch.
-        - [ ] Run the script `~/scripts/releaseElement.sh`. It will download the APKs from Buildkite check them and sign them.
-        - [ ] Install the APK on your phone to check that the upgrade went well (no init sync, etc.)
-        - [ ] Create the release on gitHub [from the tag](https://github.com/vector-im/element-android/tags), copy paste the block from the file CHANGES.md
-        - [ ] Add the 4 signed APKs to the GitHub release
-        - [ ] Ping the Android Internal room
+        - [ ] Run the script ./tools/release/releaseScript.sh and follow the steps.
 
         ### Once tested and validated internally
 
@@ -82,29 +60,9 @@ body:
 
         The SDK2 and the sample app are released only when Element has been pushed to production.
 
-        - [ ] Checkout the `main` branch on Element Android project
+        - [ ] On the [SDK2 project](https://github.com/matrix-org/matrix-android-sdk2), run the script ./tools/releaseScript.sh and follow the instructions.
 
-        #### On the SDK2 project
-
-        https://github.com/matrix-org/matrix-android-sdk2
-
-        - [ ] Create a release with GitFlow
-        - [ ] Update the value of VERSION_NAME in the file gradle.properties
-        - [ ] Update the files `./build.gradle` and `./gradle/gradle-wrapper.properties` manually, to use the latest version for the dependency. You can get inspired by the same files on Element Android project.
-        - [ ] Run the script `./tools/import_from_element.sh`
-        - [ ] Check the diff in the file `./matrix-sdk-android/build.gradle` and restore what may have been erased (in particular the line `apply plugin: "com.vanniktech.maven.publish"` and the line about the version)
-        - [ ] Let the script finish to build the library
-        - [ ] Update the file `CHANGES.md`
-        - [ ] Finish the release using GitFlow
-        - [ ] Push the branch `main`, the new tag and the branch `develop` to origin
-
-        ##### Release on MavenCentral
-
-        - [ ] Checkout the branch `main`
-        - [ ] Run the command `./gradlew publish --no-daemon --no-parallel`. You'll need some non-public element to do so
-        - [ ] Run the command `./gradlew closeAndReleaseRepository`. If it is working well, you can jump directly to the final step of this section.
-
-        If `./gradlew closeAndReleaseRepository` fails (for instance, several repositories are waiting to be handled), you have to close and release the repository manually. Do the following steps:
+        Note: if the step `./gradlew closeAndReleaseRepository` fails (for instance, several repositories are waiting to be handled), you have to close and release the repository manually. Do the following steps:
 
         - [ ] Connect to https://s01.oss.sonatype.org
         - [ ] Click on Staging Repositories and check the the files have been uploaded
@@ -112,15 +70,6 @@ body:
         - [ ] Wait (check Activity tab until step "Repository closed" is displayed)
         - [ ] Click on release. The staging repository will disappear
 
-        Final step
-
-        - [ ] Check that the release is available in https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/ (it can take a few minutes)
-
-        ##### Release on GitHub
-
-        - [ ] Create the release on GitHub from [the tag](https://github.com/matrix-org/matrix-android-sdk2/tags)
-        - [ ] Upload the AAR on the GitHub release
-
         ### Android SDK2 sample
 
         https://github.com/matrix-org/matrix-android-sdk2-sample
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 933c442501..be175c0436 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           name: vector-${{ matrix.target }}-debug
           path: |
-            vector/build/outputs/apk/*/debug/*.apk
+            vector-app/build/outputs/apk/*/debug/*.apk
 
   release:
     name: Build unsigned GPlay APKs
@@ -65,7 +65,7 @@ jobs:
         with:
           name: vector-gplay-release-unsigned
           path: |
-            vector/build/outputs/apk/*/release/*.apk
+            vector-app/build/outputs/apk/*/release/*.apk
 
   exodus:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index a1d754b4de..8752f339bd 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -11,8 +11,10 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@11.1.1
+        uses: danger/danger-js@11.2.0
         with:
-          args: "--dangerfile tools/danger/dangerfile.js"
+          args: "--dangerfile ./tools/danger/dangerfile.js"
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
+          # Fallback for forks
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index b6333c5940..a44872e0ef 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build docs
         run: ./gradlew dokkaHtml
diff --git a/.github/workflows/post-pr.yml b/.github/workflows/post-pr.yml
index 5cde95e625..af854bf371 100644
--- a/.github/workflows/post-pr.yml
+++ b/.github/workflows/post-pr.yml
@@ -16,7 +16,7 @@ env:
 jobs:
 
   # More info on should-i-run:
-  # If this fails to run (the IF doesn't complete) then the needs will not be satisfied for any of the 
+  # If this fails to run (the IF doesn't complete) then the needs will not be satisfied for any of the
   # other jobs below, so none will run.
   # except for the notification job at the bottom which will run all the time, unless should-i-run isn't
   # successful, or all the other jobs have succeeded
@@ -27,11 +27,12 @@ jobs:
     if: github.event.pull_request.merged # Additionally require PR to have been completely merged.
     steps:
       - run: echo "Run those tests!" # no-op success
-        
+
   ui-tests:
     name: UI Tests (Synapse)
     needs: should-i-run
-    runs-on: macos-latest
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 90 # We might need to increase it if the time for tests grows
     strategy:
       fail-fast: false
       matrix:
@@ -52,7 +53,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v1.0.3
+        uses: michaelkaye/setup-matrix-synapse@v1.0.4
         with:
           uploadLogs: true
           httpPort: 8080
@@ -94,7 +95,7 @@ jobs:
     needs:
       - should-i-run
       - ui-tests
-    if: always() && (needs.should-i-run.result == 'success' ) && ((needs.codecov-units.result != 'success' ) || (needs.ui-tests.result != 'success') || (needs.integration-tests.result != 'success'))
+    if: always() && (needs.should-i-run.result == 'success' ) && (needs.ui-tests.result != 'success')
     # No concurrency required, runs every time on a schedule.
     steps:
       - uses: michaelkaye/matrix-hookshot-action@v1.0.0
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 6e5e2e4d67..fae8d97688 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -7,7 +7,7 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxPermSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
   CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Run knit
         run: |
-          ./gradlew knitCheck
+          ./gradlew knitCheck $CI_GRADLE_ARG_PROPERTIES
 
   # Check the project: ktlint, detekt, lint
   lint:
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Run ktlint
         run: |
-          ./gradlew ktlintCheck --continue
+          ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES --continue
       - name: Run detekt
         if: always()
         run: |
@@ -49,8 +49,8 @@ jobs:
       - name: Run lint
         # Not always, if ktlint or detekt fail, avoid running the long lint check.
         run: |
-          ./gradlew lintGplayRelease $CI_GRADLE_ARG_PROPERTIES
-          ./gradlew lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew vector-app:lintGplayRelease $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew vector-app:lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES
       - name: Upload reports
         if: always()
         uses: actions/upload-artifact@v3
@@ -66,11 +66,13 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@11.1.1
+        uses: danger/danger-js@11.2.0
         with:
-          args: "--dangerfile tools/danger/dangerfile-lint.js"
+          args: "--dangerfile ./tools/danger/dangerfile-lint.js"
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
+          # Fallback for forks
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   # Gradle dependency analysis using https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
   dependency-analysis:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2a89ed3040..931ec2da45 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,19 +1,23 @@
 name: Test
 
 on:
-  pull_request: {}
+  pull_request: { }
   push:
-    branches: [main, develop]
+    branches: [ main, develop ]
 
 # Enrich gradle.properties for CI/CD
 env:
   GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
+  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon
 
 jobs:
   tests:
     name: Runs all tests
-    runs-on: macos-latest # for the emulator
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 90 # We might need to increase it if the time for tests grows
+    strategy:
+      matrix:
+        api-level: [28]
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('unit-tests-{0}', github.ref) }}
@@ -21,59 +25,91 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          lfs: true
           fetch-depth: 0
       - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: '11'
       - uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
+          gradle-home-cache-cleanup: ${{ github.ref == 'refs/heads/develop' }}
+
+      - name: Run screenshot tests
+        run: ./gradlew verifyScreenshots $CI_GRADLE_ARG_PROPERTIES
+
+      - name: Archive Screenshot Results on Error
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: screenshot-results
+          path: |
+            **/out/failures/
+            **/build/reports/tests/*UnitTest/
+
       - uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - uses: michaelkaye/setup-matrix-synapse@v1.0.3
+      - uses: michaelkaye/setup-matrix-synapse@v1.0.4
         with:
           uploadLogs: true
           httpPort: 8080
           disableRateLimiting: true
           public_baseurl: "http://10.0.2.2:8080/"
+
       - name: Run all the codecoverage tests at once
-        id: tests
         uses: reactivecircus/android-emulator-runner@v2
-        continue-on-error: true
+        # continue-on-error: true
         with:
-          api-level: 28
+          api-level: ${{ matrix.api-level }}
           arch: x86
           profile: Nexus 5X
+          target: playstore
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          emulator-build: 7425822
-          script: | 
-            ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
-# NB: continue-on-error marks steps.tests.conclusion = 'success' but leaves stes.tests.outcome = 'failure'
-      - name: Run all the codecoverage tests at once (retry if emulator failed)
-        uses: reactivecircus/android-emulator-runner@v2
-        if: always() && steps.tests.outcome == 'failure' # don't run if previous step succeeded.
-        with:
-          api-level: 28
-          arch: x86
-          profile: Nexus 5X
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          emulator-build: 7425822
+          # emulator-build: 7425822
           script: |
+            ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
             ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
             ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
             ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
-      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
-        if: always() # we may have failed a previous step and retried, that's OK
+      # NB: continue-on-error marks steps.tests.conclusion = 'success' but leaves steps.tests.outcome = 'failure'
+      ### - name: Run all the codecoverage tests at once (retry if emulator failed)
+      ###   uses: reactivecircus/android-emulator-runner@v2
+      ###   if: always() && steps.tests.outcome == 'failure' # don't run if previous step succeeded.
+      ###   with:
+      ###     api-level: 28
+      ###     arch: x86
+      ###     profile: Nexus 5X
+      ###     force-avd-creation: false
+      ###     emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+      ###     disable-animations: true
+      ###     emulator-build: 7425822
+      ###     script: |
+      ###       ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
+      ###       ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
+      ###       ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
+      ###       ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
+
+      - name: Upload Integration Test Report Log
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: integration-test-error-results
+          path: |
+            */build/outputs/androidTest-results/connected/
+            */build/reports/androidTests/connected/
+
+      # we may have failed a previous step and retried, that's OK
+      - name: Publish results to Sonar
         env:
           GITHUB_TOKEN: ${{ secrets.SONARQUBE_GITHUB_API_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
+        if: ${{ always() && env.GITHUB_TOKEN != '' && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
+        run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
 
       - name: Format unit test results
         if: always()
@@ -91,26 +127,26 @@ jobs:
 # Unneeded as part of the test suite above, kept around in case we want to re-enable them.
 #
 #  # Build Android Tests
-#  build-android-tests: 
-#    name: Build Android Tests 
-#    runs-on: ubuntu-latest 
+#  build-android-tests:
+#    name: Build Android Tests
+#    runs-on: ubuntu-latest
 #    concurrency:
 #      group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('build-android-tests-{0}', github.ref) }}
 #      cancel-in-progress: true
-#    steps: 
-#      - uses: actions/checkout@v3 
-#      - uses: actions/setup-java@v3 
-#        with: 
-#          distribution: 'adopt' 
-#          java-version: 11 
-#      - uses: actions/cache@v3 
-#        with: 
-#          path: | 
-#            ~/.gradle/caches 
-#            ~/.gradle/wrapper 
-#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} 
-#          restore-keys: | 
-#            ${{ runner.os }}-gradle- 
-#      - name: Build Android Tests  
+#    steps:
+#      - uses: actions/checkout@v3
+#      - uses: actions/setup-java@v3
+#        with:
+#          distribution: 'adopt'
+#          java-version: 11
+#      - uses: actions/cache@v3
+#        with:
+#          path: |
+#            ~/.gradle/caches
+#            ~/.gradle/wrapper
+#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+#          restore-keys: |
+#            ${{ runner.os }}-gradle-
+#      - name: Build Android Tests
 #        run: ./gradlew clean assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES
 
diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
index 6a22bf5223..4dadc25ab4 100644
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -10,7 +10,7 @@ jobs:
     # Skip in forks
     if: github.repository == 'vector-im/element-android'
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Issue triage
           column: Incoming
diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 90f03779a6..036bc069ac 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -17,7 +17,8 @@ jobs:
       contains(github.event.issue.labels.*.name, 'Z-IA') ||
       contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
       contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-      contains(github.event.issue.labels.*.name, 'A-Tags')
+      contains(github.event.issue.labels.*.name, 'A-Tags') ||
+      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
     steps:
       - uses: actions/github-script@v5
         with:
@@ -29,6 +30,23 @@ jobs:
               labels: ['Z-Labs']
             })
 
+  apply_Help-Wanted_label:
+    name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'good first issue') ||
+      contains(github.event.issue.labels.*.name, 'Hacktoberfest')
+    steps:
+      - uses: actions/github-script@v5
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['Help Wanted']
+            })
+
   move_needs_info_issues:
     name: X-Needs-Info issues to Need info column on triage board
     runs-on: ubuntu-latest
@@ -48,7 +66,13 @@ jobs:
     # Skip in forks
     if: >
       github.repository == 'vector-im/element-android' &&
-      contains(github.event.issue.labels.*.name, 'X-Needs-Design')
+      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'))
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
@@ -56,8 +80,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -65,7 +89,7 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc0sUA"
+          PROJECT_ID: "PVT_kwDOAM0swc0sUA"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   add_product_issues:
@@ -80,8 +104,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -89,7 +113,7 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc4AAg6N"
+          PROJECT_ID: "PVT_kwDOAM0swc4AAg6N"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   delight_issues_to_board:
@@ -98,15 +122,16 @@ jobs:
     # Skip in forks
     if: >
       github.repository == 'vector-im/element-android' &&
-      (contains(github.event.issue.labels.*.name, 'Team: Delight'))
+      (contains(github.event.issue.labels.*.name, 'Team: Delight') ||
+       contains(github.event.issue.labels.*.name, 'Z-AppLayout'))
     steps:
       - uses: octokit/graphql-action@v2.x
         with:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -114,7 +139,7 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc1HvQ"
+          PROJECT_ID: "PVT_kwDOAM0swc1HvQ"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   move_voice-message_issues:
@@ -130,8 +155,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -139,34 +164,8 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc2KCw"
+          PROJECT_ID: "PVT_kwDOAM0swc2KCw"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  move_threads_issues:
-    name: A-Threads to Thread board
-    runs-on: ubuntu-latest
-    # Skip in forks
-    if: >
-      github.repository == 'vector-im/element-android' &&
-      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:ID!,$contentid:ID!) {
-              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_bubbles_issues:
     name: A-Message-Bubbles to Message bubbles board
     runs-on: ubuntu-latest
@@ -180,8 +179,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -189,7 +188,7 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc3m-g"
+          PROJECT_ID: "PVT_kwDOAM0swc3m-g"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   move_ftue_issues:
@@ -205,8 +204,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -214,7 +213,7 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc4AAqVx"
+          PROJECT_ID: "PVT_kwDOAM0swc4AAqVx"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   move_WTF_issues:
@@ -230,8 +229,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -239,7 +238,7 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc4AArk0"
+          PROJECT_ID: "PVT_kwDOAM0swc4AArk0"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   move_element_x_issues:
@@ -260,8 +259,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -269,5 +268,107 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc4ABTXY"
+          PROJECT_ID: "PVT_kwDOAM0swc4ABTXY"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features1:
+    name: Add labelled issues to PS features team 1
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Polls') ||
+      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
+        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
+      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
+        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AHJKF"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features2:
+    name: Add labelled issues to PS features team 2
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
+      contains(github.event.issue.labels.*.name, 'A-Broadcast')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AHJKd"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features3:
+    name: Add labelled issues to PS features team 3
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  voip:
+    name: Add labelled issues to VoIP project board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'Team: VoIP')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4ABMIk"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-move-review-requests.yml b/.github/workflows/triage-move-review-requests.yml
index 61f1f114dd..f604b82873 100644
--- a/.github/workflows/triage-move-review-requests.yml
+++ b/.github/workflows/triage-move-review-requests.yml
@@ -60,8 +60,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -69,7 +69,7 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.pull_request.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc0sUA"
+          PROJECT_ID: "PVT_kwDOAM0swc0sUA"
           TEAM: "design"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
@@ -129,8 +129,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                   id
                 }
               }
@@ -138,6 +138,6 @@ jobs:
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.pull_request.node_id }}
         env:
-          PROJECT_ID: "PN_kwDOAM0swc4AAg6N"
+          PROJECT_ID: "PVT_kwDOAM0swc4AAg6N"
           TEAM: "product"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
index 6cde154370..07e73fe805 100644
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -24,10 +24,10 @@ jobs:
         contains(github.event.issue.labels.*.name, 'A11y') &&
         contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Android App Team
-          column: P1
+          column: Important Issues & Topics (P1)
           repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   P1_issues_to_crypto_team_workboard:
@@ -50,7 +50,7 @@ jobs:
         contains(github.event.issue.labels.*.name, 'A11y') &&
         contains(github.event.issue.labels.*.name, 'O-Frequent')))
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Crypto Team
           column: Ready
diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml
index 06df286d09..98d6579958 100644
--- a/.github/workflows/triage-unlabelled.yml
+++ b/.github/workflows/triage-unlabelled.yml
@@ -28,7 +28,7 @@ jobs:
             echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
           fi
       - name: Move issue
-        uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         if: ${{ env.ALREADY_IN_BOARD == 'true' }}
         with:
           project: Issue triage
diff --git a/.github/workflows/validate-lfs.yml b/.github/workflows/validate-lfs.yml
new file mode 100644
index 0000000000..203ecb0481
--- /dev/null
+++ b/.github/workflows/validate-lfs.yml
@@ -0,0 +1,15 @@
+name: Validate Git LFS
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Validate
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          lfs: 'true'
+
+      - run: |
+          ./tools/validate_lfs.sh
diff --git a/.gitignore b/.gitignore
index f1c0b99b58..aae906afc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /package.json
 /yarn.lock
 /node_modules
+**/out/failures
diff --git a/CHANGES.md b/CHANGES.md
index 829b1a0caa..e742d79c1e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,511 @@
+Changes in Element v1.5.18 (2023-01-02)
+=======================================
+
+This release fixes a bunch of recent regressions. Most of them were not pushed to production hopefully. Current production version is 1.5.11.
+Threads are now enabled by default, and this may let the application perform an initial sync.
+Testers on the PlayStore may have experimented some issues like empty room list, or incomplete room state (room name missing, etc.), or even crashing due to initial sync not using lazy loading of room members. All those issues have been fixed, but to fix your current state, please clear cache once you get the release 1.5.18.
+
+Bugfixes 🐛
+----------
+ - Start DM will create a deadlock if user profile was never loaded ([#7870](https://github.com/vector-im/element-android/issues/7870))
+ 
+
+Changes in Element v1.5.16 (2022-12-29)
+======================================
+
+Features ✨
+----------
+ - [Rich text editor] Add support for links ([#7746](https://github.com/vector-im/element-android/issues/7746))
+ - [Poll] When a poll is ended, use /relations API to ensure poll results are correct ([#7767](https://github.com/vector-im/element-android/issues/7767))
+ - [Session manager] Security recommendations cards: whole view should be tappable ([#7795](https://github.com/vector-im/element-android/issues/7795))
+ - [Session manager] Other sessions list: header should not be sticky ([#7797](https://github.com/vector-im/element-android/issues/7797))
+
+Bugfixes 🐛
+----------
+ - Do not show typing notification of ignored users. ([#2965](https://github.com/vector-im/element-android/issues/2965))
+ - [Push Notifications, Threads] - quick reply to threaded notification now sent to thread except main timeline ([#7475](https://github.com/vector-im/element-android/issues/7475))
+ - [Session manager] Other sessions list: filter option is displayed when selection mode is enabled ([#7784](https://github.com/vector-im/element-android/issues/7784))
+ - [Session manager] Other sessions: Filter bottom sheet cut in landscape mode ([#7786](https://github.com/vector-im/element-android/issues/7786))
+ - Automatically show keyboard after learn more bottom sheet is dismissed ([#7790](https://github.com/vector-im/element-android/issues/7790))
+ - [Session Manager] Other sessions list: cannot select/deselect session by a long press when in select mode ([#7792](https://github.com/vector-im/element-android/issues/7792))
+ - Fix current session ip address visibility ([#7794](https://github.com/vector-im/element-android/issues/7794))
+ - Device Manager UI review fixes ([#7798](https://github.com/vector-im/element-android/issues/7798))
+
+SDK API changes ⚠️
+------------------
+ - [Sync] Sync Filter params are moved to MatrixConfiguration and will not be stored in session realm to avoid bug when session cache is cleared ([#7843](https://github.com/vector-im/element-android/issues/7843))
+
+Other changes
+-------------
+ - [Voice Broadcast] Replace the player timeline ([#7821](https://github.com/vector-im/element-android/issues/7821))
+ - Increase session manager test coverage ([#7836](https://github.com/vector-im/element-android/issues/7836))
+
+
+Changes in Element v1.5.14 (2022-12-20)
+=======================================
+
+Bugfixes 🐛
+----------
+- ActiveSessionHolder is not supposed to start syncing. Instead, the MainActivity does it, if necessary. Fixes a race condition when clearing cache.
+
+
+Changes in Element v1.5.13 (2022-12-19)
+=======================================
+
+Bugfixes 🐛
+----------
+- Add `largeHeap=true` in the manifest since we are seeing more crashes (OOM) when handling sync response.
+
+
+Changes in Element v1.5.12 (2022-12-15)
+=======================================
+
+Features ✨
+----------
+- [Threads] - Threads Labs Flag is enabled by default and forced to be enabled for existing users, but sill can be disabled manually ([#5503](https://github.com/vector-im/element-android/issues/5503))
+ - [Session manager] Add action to signout all the other session ([#7693](https://github.com/vector-im/element-android/issues/7693))
+ - Remind unverified sessions with a banner once a week ([#7694](https://github.com/vector-im/element-android/issues/7694))
+ - [Session manager] Add actions to rename and signout current session ([#7697](https://github.com/vector-im/element-android/issues/7697))
+ - Voice Broadcast - Update last message in the room list ([#7719](https://github.com/vector-im/element-android/issues/7719))
+ - Delete unused client information from account data ([#7754](https://github.com/vector-im/element-android/issues/7754))
+
+Bugfixes 🐛
+----------
+ - Fix bad pills color background. For light and dark theme the color is now 61708B (iso EleWeb) ([#7274](https://github.com/vector-im/element-android/issues/7274))
+ - [Notifications] Fixed a bug when push notification was automatically dismissed while app is on background ([#7643](https://github.com/vector-im/element-android/issues/7643))
+ - ANR when asking to select the notification method ([#7653](https://github.com/vector-im/element-android/issues/7653))
+ - [Rich text editor] Fix design and spacing of rich text editor ([#7658](https://github.com/vector-im/element-android/issues/7658))
+ - [Rich text editor] Fix keyboard closing after collapsing editor ([#7659](https://github.com/vector-im/element-android/issues/7659))
+ - Rich Text Editor: fix several issues related to insets:
+  * Empty space displayed at the bottom when you don't have permissions to send messages into a room.
+  * Wrong insets being kept when you exit the room screen and the keyboard is displayed, then come back to it. ([#7680](https://github.com/vector-im/element-android/issues/7680))
+ - Fix crash in message composer when room is missing ([#7683](https://github.com/vector-im/element-android/issues/7683))
+ - Fix crash when invalid homeserver url is entered. ([#7684](https://github.com/vector-im/element-android/issues/7684))
+ - Rich Text Editor: improve performance when entering reply/edit/quote mode. ([#7691](https://github.com/vector-im/element-android/issues/7691))
+ - [Rich text editor] Add error tracking for rich text editor ([#7695](https://github.com/vector-im/element-android/issues/7695))
+ - Fix E2EE set up failure whilst signing in using QR code ([#7699](https://github.com/vector-im/element-android/issues/7699))
+ - Fix usage of unknown shield in room summary ([#7710](https://github.com/vector-im/element-android/issues/7710))
+ - Fix crash when the network is not available. ([#7725](https://github.com/vector-im/element-android/issues/7725))
+ - [Session manager] Sessions without encryption support should not prompt to verify ([#7733](https://github.com/vector-im/element-android/issues/7733))
+ - Fix issue of Scan QR code button sometimes not showing when it should be available ([#7737](https://github.com/vector-im/element-android/issues/7737))
+ - Verification request is not showing when verify session popup is displayed ([#7743](https://github.com/vector-im/element-android/issues/7743))
+ - Fix crash when inviting by email. ([#7744](https://github.com/vector-im/element-android/issues/7744))
+ - Revert usage of stable fields in live location sharing and polls ([#7751](https://github.com/vector-im/element-android/issues/7751))
+ - [Poll] Poll end event is not recognized ([#7753](https://github.com/vector-im/element-android/issues/7753))
+ - [Push Notifications] When push notification for threaded message is clicked, thread timeline will be opened instead of room's main timeline ([#7770](https://github.com/vector-im/element-android/issues/7770))
+
+Other changes
+-------------
+ - [Threads] - added API to fetch threads list from the server instead of building it locally from events ([#5819](https://github.com/vector-im/element-android/issues/5819))
+ - Add Z-Labs label for rich text editor and migrate to new label naming. ([#7477](https://github.com/vector-im/element-android/issues/7477))
+ - Crypto database migration tests ([#7645](https://github.com/vector-im/element-android/issues/7645))
+ - Add tracing Id for to device messages ([#7708](https://github.com/vector-im/element-android/issues/7708))
+ - Disable nightly popup and add an entry point in the advanced settings instead. ([#7723](https://github.com/vector-im/element-android/issues/7723))
+- Save m.local_notification_settings.<device-id> event in account_data ([#7596](https://github.com/vector-im/element-android/issues/7596))
+- Update notifications setting when m.local_notification_settings.<device-id> event changes for current device ([#7632](https://github.com/vector-im/element-android/issues/7632))
+
+SDK API changes ⚠️
+------------------
+- Handle account data removal ([#7740](https://github.com/vector-im/element-android/issues/7740))
+
+Changes in Element 1.5.11 (2022-12-07)
+======================================
+
+Bugfixes 🐛
+----------
+ - Fix crash when the network is not available. ([#7725](https://github.com/vector-im/element-android/issues/7725))
+
+
+Changes in Element v1.5.10 (2022-11-30)
+=======================================
+
+Features ✨
+----------
+ - Add setting to allow disabling direct share ([#2725](https://github.com/vector-im/element-android/issues/2725))
+ - [Device Manager] Toggle IP address visibility ([#7546](https://github.com/vector-im/element-android/issues/7546))
+ - New implementation of the full screen mode for the Rich Text Editor. ([#7577](https://github.com/vector-im/element-android/issues/7577))
+
+Bugfixes 🐛
+----------
+ - Fix italic text is truncated when bubble mode and markdown is enabled ([#5679](https://github.com/vector-im/element-android/issues/5679))
+ - Missing translations on "replyTo" messages ([#7555](https://github.com/vector-im/element-android/issues/7555))
+ - ANR on session start when sending client info is enabled ([#7604](https://github.com/vector-im/element-android/issues/7604))
+ - Make the plain text mode layout of the RTE more compact. ([#7620](https://github.com/vector-im/element-android/issues/7620))
+ - Push notification for thread message is now shown correctly when user observes rooms main timeline ([#7634](https://github.com/vector-im/element-android/issues/7634))
+ - Voice Broadcast - Fix playback stuck in buffering mode ([#7646](https://github.com/vector-im/element-android/issues/7646))
+
+In development 🚧
+----------------
+ - Voice Broadcast - Handle redaction of the state events on the listener and recorder sides ([#7629](https://github.com/vector-im/element-android/issues/7629))
+ - Voice Broadcast - Update the buffering display in the timeline ([#7655](https://github.com/vector-im/element-android/issues/7655))
+ - Voice Broadcast - Remove voice messages related to a VB from the room attachments ([#7656](https://github.com/vector-im/element-android/issues/7656))
+
+SDK API changes ⚠️
+------------------
+ - Added support for read receipts in threads. Now user in a room can have multiple read receipts (one per thread + one in main thread + one without threadId) ([#6996](https://github.com/vector-im/element-android/issues/6996))
+ - Sync Filter now taking in account homeserver capabilities to not pass unsupported parameters.
+  Sync Filter is now configured by providing SyncFilterBuilder class instance, instead of Filter to identify Filter changes related to homeserver capabilities ([#7626](https://github.com/vector-im/element-android/issues/7626))
+
+Other changes
+-------------
+ - Remove usage of Buildkite. ([#7583](https://github.com/vector-im/element-android/issues/7583))
+ - Better validation of edits ([#7594](https://github.com/vector-im/element-android/issues/7594))
+
+
+Changes in Element v1.5.8 (2022-11-17)
+======================================
+
+Features ✨
+----------
+ - [Session manager] Multi-session signout ([#7418](https://github.com/vector-im/element-android/issues/7418))
+ - Rich text editor: add full screen mode. ([#7436](https://github.com/vector-im/element-android/issues/7436))
+ - [Rich text editor] Add plain text mode ([#7452](https://github.com/vector-im/element-android/issues/7452))
+ - Move TypingView inside the timeline items. ([#7496](https://github.com/vector-im/element-android/issues/7496))
+ - Push notifications toggle: align implementation for current session ([#7512](https://github.com/vector-im/element-android/issues/7512))
+ - Voice messages - Persist the playback position across different screens ([#7582](https://github.com/vector-im/element-android/issues/7582))
+
+Bugfixes 🐛
+----------
+ - [Voice Broadcast] Do not display the recorder view for a live broadcast started from another session ([#7431](https://github.com/vector-im/element-android/issues/7431))
+ - [Session manager] Hide push notification toggle when there is no server support ([#7457](https://github.com/vector-im/element-android/issues/7457))
+ - Fix rich text editor textfield not growing to fill parent on full screen. ([#7491](https://github.com/vector-im/element-android/issues/7491))
+ - Fix duplicated mention pills in some cases ([#7501](https://github.com/vector-im/element-android/issues/7501))
+ - Voice Broadcast - Fix duplicated voice messages in the internal playlist ([#7502](https://github.com/vector-im/element-android/issues/7502))
+ - When joining a room, the message composer is displayed once the room is loaded. ([#7509](https://github.com/vector-im/element-android/issues/7509))
+ - Voice Broadcast - Fix error on voice messages in unencrypted rooms ([#7519](https://github.com/vector-im/element-android/issues/7519))
+ - Fix description of verified sessions ([#7533](https://github.com/vector-im/element-android/issues/7533))
+
+In development 🚧
+----------------
+ - [Voice Broadcast] Improve timeline items factory and handle bad recording state display ([#7448](https://github.com/vector-im/element-android/issues/7448))
+ - [Voice Broadcast] Stop recording when opening the room after an app restart ([#7450](https://github.com/vector-im/element-android/issues/7450))
+ - [Voice Broadcast] Improve playlist fetching and player codebase ([#7478](https://github.com/vector-im/element-android/issues/7478))
+ - [Voice Broadcast] Display an error dialog if the user fails to start a voice broadcast ([#7485](https://github.com/vector-im/element-android/issues/7485))
+ - [Voice Broadcast] Add seekbar in listening tile ([#7496](https://github.com/vector-im/element-android/issues/7496))
+ - [Voice Broadcast] Improve the live indicator icon rendering in the timeline ([#7579](https://github.com/vector-im/element-android/issues/7579))
+ - Voice Broadcast - Add maximum length ([#7588](https://github.com/vector-im/element-android/issues/7588))
+
+SDK API changes ⚠️
+------------------
+ - [Metrics] Add `SpannableMetricPlugin` to support spans within transactions. ([#7514](https://github.com/vector-im/element-android/issues/7514))
+ - Fix a bug that caused messages with no formatted text to be quoted as "null". ([#7530](https://github.com/vector-im/element-android/issues/7530))
+ - If message content has no `formattedBody`, default to `body` when editing. ([#7574](https://github.com/vector-im/element-android/issues/7574))
+
+
+Changes in Element v1.5.7 (2022-11-07)
+======================================
+
+Bugfixes 🐛
+----------
+- Fix regression when syncing with homeserver < 1.4. ([#7534](https://github.com/vector-im/element-android/issues/7534))
+
+Changes in Element v1.5.6 (2022-11-02)
+======================================
+
+Features ✨
+----------
+ - Add new UI for selecting an attachment ([#7429](https://github.com/vector-im/element-android/issues/7429))
+ - Multi selection in sessions list ([#7396](https://github.com/vector-im/element-android/issues/7396))
+
+Bugfixes 🐛
+----------
+ - New line and Enter hardware key presses deleting existing text in some keyboards. ([#7357](https://github.com/vector-im/element-android/issues/7357))
+ - Fix share actions using share dialog. ([#7400](https://github.com/vector-im/element-android/issues/7400))
+ - Fix crash by disabling Flipper on Android API 22 and below - only affects debug version of the application. ([#7428](https://github.com/vector-im/element-android/issues/7428))
+
+In development 🚧
+----------------
+ - [Voice Broadcast] Live listening support ([#7419](https://github.com/vector-im/element-android/issues/7419))
+ - [Voice Broadcast] Improve rendering in the timeline ([#7421](https://github.com/vector-im/element-android/issues/7421))
+ - Add logic for sign in with QR code ([#7369](https://github.com/vector-im/element-android/issues/7369))
+
+SDK API changes ⚠️
+------------------
+ - Add MetricPlugin interface to implement metrics in SDK clients. ([#7438](https://github.com/vector-im/element-android/issues/7438))
+
+Other changes
+-------------
+ - Upgrade Jitsi SDK to 6.2.2 and WebRtc to 1.106.1-jitsi-12039821. ([#6195](https://github.com/vector-im/element-android/issues/6195))
+ - Gets thread notifications from sync response ([#7424](https://github.com/vector-im/element-android/issues/7424))
+ - Replace org.apache.sanselan:sanselan by org.apache.commons:commons-imaging ([#7454](https://github.com/vector-im/element-android/issues/7454))
+
+
+Changes in Element v1.5.4 (2022-10-19)
+======================================
+
+Features ✨
+----------
+ - Add WYSIWYG editor, under a lab flag. ([#7288](https://github.com/vector-im/element-android/issues/7288))
+ - New Device management, can be enabled in the labs settings.
+ - Voice broadcast can be enabled in the labs settings (recording is possible only on Android 10 and up).
+
+Bugfixes 🐛
+----------
+ - Fix wrong mic button direction to cancel on RTL languages ([#5968](https://github.com/vector-im/element-android/issues/5968))
+ - Handle properly when getUser returns null - prefer using getUserOrDefault ([#7372](https://github.com/vector-im/element-android/issues/7372))
+ - [Device Management] Long session names not handled well ([#7310](https://github.com/vector-im/element-android/issues/7310))
+ - Fix editing formatted messages with plain text editor ([#7359](https://github.com/vector-im/element-android/issues/7359))
+
+In development 🚧
+----------------
+ - [Device Management] Save "matrix_client_information" events on login/registration ([#7257](https://github.com/vector-im/element-android/issues/7257))
+ - [Device management] Add lab flag for the feature ([#7336](https://github.com/vector-im/element-android/issues/7336))
+ - [Device management] Add lab flag for matrix client info account data event ([#7344](https://github.com/vector-im/element-android/issues/7344))
+ - [Device Management] Redirect to the new screen everywhere when lab flag is on ([#7374](https://github.com/vector-im/element-android/issues/7374))
+ - [Device Management] Show correct device type icons ([#7277](https://github.com/vector-im/element-android/issues/7277))
+ - [Device Management] Render extended device info ([#7294](https://github.com/vector-im/element-android/issues/7294))
+ - [Device management] Improve the parsing for OS of Desktop/Web sessions ([#7321](https://github.com/vector-im/element-android/issues/7321))
+ - [Device management] Hide the IP address and last activity date on current session ([#7324](https://github.com/vector-im/element-android/issues/7324))
+ - [Device management] Update the unknown verification status icon ([#7327](https://github.com/vector-im/element-android/issues/7327))
+ - [Voice Broadcast] Add the "io.element.voice_broadcast_info" state event with a minimalist timeline widget ([#7273](https://github.com/vector-im/element-android/issues/7273))
+ - [Voice Broadcast] Aggregate state events in the timeline ([#7283](https://github.com/vector-im/element-android/issues/7283))
+ - [Voice Broadcast] Record and send non aggregated voice messages to the room ([#7363](https://github.com/vector-im/element-android/issues/7363))
+ - [Voice Broadcast] Start listening to a voice broadcast ([#7387](https://github.com/vector-im/element-android/issues/7387))
+ - [Voice Broadcast] Enable the feature (behind a lab flag and only for Android 10 and up) ([#7393](https://github.com/vector-im/element-android/issues/7393))
+ - [Voice Broadcast] Add additional data in events ([#7397](https://github.com/vector-im/element-android/issues/7397))
+ - Implements MSC3881: Parses `enabled` and `device_id` fields from updated Pusher API ([#7217](https://github.com/vector-im/element-android/issues/7217))
+ - Adds pusher toggle setting to device manager v2 ([#7261](https://github.com/vector-im/element-android/issues/7261))
+ - Implement QR Code Login UI ([#7338](https://github.com/vector-im/element-android/issues/7338))
+ - Implements client-side of local notification settings event ([#7300](https://github.com/vector-im/element-android/issues/7300))
+ - Links "Enable Notifications for this session" setting to enabled value in pusher ([#7281](https://github.com/vector-im/element-android/issues/7281))
+
+SDK API changes ⚠️
+------------------
+ - Stop using `original_event` field from `/relations` endpoint ([#7282](https://github.com/vector-im/element-android/issues/7282))
+ - Add `formattedText` or similar optional parameters in several methods:
+  * RelationService:
+  	* editTextMessage
+  	* editReply
+  	* replyToMessage
+  * SendService:
+  	* sendQuotedTextMessage
+  This allows us to send any HTML formatted text message without needing to rely on automatic Markdown > HTML translation. All these new parameters have a `null` value by default, so previous calls to these API methods remain compatible. ([#7288](https://github.com/vector-im/element-android/issues/7288))
+ - Add support for `m.login.token` auth during QR code based sign in ([#7358](https://github.com/vector-im/element-android/issues/7358))
+ - Allow getting the formatted or plain text body of a message for the fun `TimelineEvent.getTextEditableContent()`. ([#7359](https://github.com/vector-im/element-android/issues/7359))
+
+Other changes
+-------------
+ - Refactor TimelineFragment, split it into MessageComposerFragment and VoiceRecorderFragment. ([#7285](https://github.com/vector-im/element-android/issues/7285))
+ - Dependency to arrow has been removed. Please use `org.matrix.android.sdk.api.util.Optional` instead. ([#7335](https://github.com/vector-im/element-android/issues/7335))
+ - Update WYSIWYG editor designs. ([#7354](https://github.com/vector-im/element-android/issues/7354))
+ - Update WYSIWYG library to v0.2.1. ([#7384](https://github.com/vector-im/element-android/issues/7384))
+
+
+Changes in Element v1.5.2 (2022-10-05)
+======================================
+
+Features ✨
+----------
+ - New App Layout is now enabled by default! Go to the Settings > Labs to toggle this ([#7166](https://github.com/vector-im/element-android/issues/7166))
+ - Render inline images in the timeline ([#351](https://github.com/vector-im/element-android/issues/351))
+ - Add privacy setting to disable personalized learning by the keyboard ([#6633](https://github.com/vector-im/element-android/issues/6633))
+
+Bugfixes 🐛
+----------
+ - Disable emoji keyboard not applies in reply ([#5029](https://github.com/vector-im/element-android/issues/5029))
+ - Fix animated images not autoplaying sometimes if only a thumbnail was fetched from the server ([#6215](https://github.com/vector-im/element-android/issues/6215))
+ - Add Warning shield when a user previously verified rotated their cross signing keys ([#6702](https://github.com/vector-im/element-android/issues/6702))
+ - Can't verify user when option to send keys to verified devices only is selected ([#6723](https://github.com/vector-im/element-android/issues/6723))
+ - Add option to only send to verified devices per room (web parity) ([#6725](https://github.com/vector-im/element-android/issues/6725))
+ - Delete pin code key and the key used for biometrics authentication on logout ([#6906](https://github.com/vector-im/element-android/issues/6906))
+ - Fix crash on previewing images to upload on Android Pie. ([#7184](https://github.com/vector-im/element-android/issues/7184))
+ - Fix app restarts in loop on Android 13 on the first run of the app. ([#7224](https://github.com/vector-im/element-android/issues/7224))
+
+In development 🚧
+----------------
+ - [Device Management] Learn more bottom sheets ([#7100](https://github.com/vector-im/element-android/issues/7100))
+ - [Device management] Verify current session ([#7114](https://github.com/vector-im/element-android/issues/7114))
+ - [Device management] Verify another session ([#7143](https://github.com/vector-im/element-android/issues/7143))
+ - [Device management] Rename a session ([#7158](https://github.com/vector-im/element-android/issues/7158))
+ - [Device Manager] Unverified and inactive sessions list ([#7170](https://github.com/vector-im/element-android/issues/7170))
+ - [Device management] Sign out a session ([#7190](https://github.com/vector-im/element-android/issues/7190))
+ - [Device Manager] Parse user agents ([#7247](https://github.com/vector-im/element-android/issues/7247))
+ - [Voice Broadcast] Add a feature flag with the composer action ([#7258](https://github.com/vector-im/element-android/issues/7258))
+
+Improved Documentation 📚
+------------------------
+ - Draft onboarding documentation of the project at `./docs/_developer_onboarding.md` ([#7126](https://github.com/vector-im/element-android/issues/7126))
+
+SDK API changes ⚠️
+------------------
+ - Allow the sync timeout to be configured (mainly useful for testing) ([#7198](https://github.com/vector-im/element-android/issues/7198))
+ - Ports SDK instrumentation tests to use suspending functions instead of countdown latches ([#7207](https://github.com/vector-im/element-android/issues/7207))
+ - [Device Manager] Extend user agent to include device information ([#7209](https://github.com/vector-im/element-android/issues/7209))
+
+Other changes
+-------------
+ - Add support for `/tableflip` command ([#12](https://github.com/vector-im/element-android/issues/12))
+ - Decreases the size of rounded corners and increases the maximum width of message bubbles to help avoid unnecessary unused space on screen ([#5712](https://github.com/vector-im/element-android/issues/5712))
+ - Adds screenshot testing tooling ([#5798](https://github.com/vector-im/element-android/issues/5798))
+ - [AppLayout]: added tracking of new analytics events ([#6508](https://github.com/vector-im/element-android/issues/6508))
+ - Target API 12 and compile with Android SDK 32. ([#6929](https://github.com/vector-im/element-android/issues/6929))
+ - Add basic integration of Sentry to capture errors and crashes if user has given consent. ([#7076](https://github.com/vector-im/element-android/issues/7076))
+ - Add support to `/devtools` command. ([#7126](https://github.com/vector-im/element-android/issues/7126))
+ - Fix lint warning, and cleanup the code ([#7159](https://github.com/vector-im/element-android/issues/7159))
+ - Mutualize the pending auth handling ([#7193](https://github.com/vector-im/element-android/issues/7193))
+ - CI: Prevent modification of translations by developer. ([#7211](https://github.com/vector-im/element-android/issues/7211))
+ - Fix typo in strings.xml and make sure this is American English. ([#7287](https://github.com/vector-im/element-android/issues/7287))
+
+
+Changes in Element v1.5.1 (2022-09-28)
+======================================
+
+Security ⚠️
+----------
+
+This update provides important security fixes, update now.
+Ref: CVE-2022-39246 CVE-2022-39248
+
+Changes in Element v1.5.0 (2022-09-23)
+======================================
+
+Features ✨
+----------
+ - Deferred DMs - Enable and move the feature to labs settings ([#7180](https://github.com/vector-im/element-android/issues/7180))
+
+Bugfixes 🐛
+----------
+ - Fix text margin in QR code view when no display name is set ([#5424](https://github.com/vector-im/element-android/issues/5424))
+ - [App Layout] Recents carousel now scrolled to first position when new item added to or moved to this position ([#6776](https://github.com/vector-im/element-android/issues/6776))
+ - Fixed problem when room list's scroll did jump after rooms placeholders were replaced with rooms summary items ([#7079](https://github.com/vector-im/element-android/issues/7079))
+ - Fixes crash when quickly double clicking FABs in the new app layout ([#7102](https://github.com/vector-im/element-android/issues/7102))
+ - Fixes space list and new chat bottom sheets showing too small in New App Layout (especially evident in landscape) ([#7103](https://github.com/vector-im/element-android/issues/7103))
+ - [App Layout] Room leaving prompt dialog now waits user to confirm leaving before do so ([#7122](https://github.com/vector-im/element-android/issues/7122))
+ - Fix empty verification bottom sheet. ([#7130](https://github.com/vector-im/element-android/issues/7130))
+ - [New Layout] Fixes new chat dialog not getting dismissed after selecting its actions ([#7132](https://github.com/vector-im/element-android/issues/7132))
+ - Fixes Room List not getting updated when fragment is not in focus ([#7186](https://github.com/vector-im/element-android/issues/7186))
+
+In development 🚧
+----------------
+ - Create DM room only on first message - Add a spinner when sending the first message ([#6970](https://github.com/vector-im/element-android/issues/6970))
+ - [Device Manager] Filter Other Sessions ([#7045](https://github.com/vector-im/element-android/issues/7045))
+ - [Device management] Session details screen ([#7077](https://github.com/vector-im/element-android/issues/7077))
+ - Create DM room only on first message - Fix glitch in the room list ([#7121](https://github.com/vector-im/element-android/issues/7121))
+ - Create DM room only on first message - Handle the local rooms within the new AppLayout ([#7153](https://github.com/vector-im/element-android/issues/7153))
+
+Other changes
+-------------
+ - [Modules] Lifts the application variants to the app module ([#6779](https://github.com/vector-im/element-android/issues/6779))
+ - Ensure that we do not expect all the Event fields when requesting `rooms/{roomId}/hierarchy` endpoint. ([#7035](https://github.com/vector-im/element-android/issues/7035))
+ - Move some GitHub actions to buildjet runners, and remove the second attempt to run integration tests. ([#7108](https://github.com/vector-im/element-android/issues/7108))
+ - Exclude legacy android support annotation library ([#7140](https://github.com/vector-im/element-android/issues/7140))
+ - Pulling no longer hosted im.dlg:android-dialer directly into the repository and removing legacy support library usages ([#7142](https://github.com/vector-im/element-android/issues/7142))
+ - Fixing build cache misses when compiling the vector module ([#7157](https://github.com/vector-im/element-android/issues/7157))
+
+Changes in Element v1.4.36 (2022-09-10)
+=======================================
+
+New App Layout can be enabled in the Labs settings. Please give it a try!
+
+Features ✨
+----------
+ - Adds New App Layout into Labs ([#7038](https://github.com/vector-im/element-android/issues/7038))
+ - Try to detect devices that lack Opus encoder support, use bundled libopus library for those. ([#7010](https://github.com/vector-im/element-android/issues/7010))
+ - Suggest @room when @channel, @everyone, or @here is typed in composer ([#6529](https://github.com/vector-im/element-android/issues/6529))
+
+Bugfixes 🐛
+----------
+ - Fix long incremental sync. ([#6917](https://github.com/vector-im/element-android/issues/6917))
+ - Fix push with FCM ([#7068](https://github.com/vector-im/element-android/issues/7068))
+ - FTUE - Fixes optional email registration step always being mandatory ([#6969](https://github.com/vector-im/element-android/issues/6969))
+ - Fixes /addToSpace and /joinSpace commands showing invalid syntax warnings ([#6844](https://github.com/vector-im/element-android/issues/6844))
+ - Fix low occurrence crashes. ([#6967](https://github.com/vector-im/element-android/issues/6967))
+ - Fix crash when opening an unknown room ([#6978](https://github.com/vector-im/element-android/issues/6978))
+ - Fix crash on PIN code settings screen. ([#6979](https://github.com/vector-im/element-android/issues/6979))
+ - Fix autoplayed animated stickers ([#6982](https://github.com/vector-im/element-android/issues/6982))
+ - Catch race condition crash in voice recording ([#6989](https://github.com/vector-im/element-android/issues/6989))
+ - Fix invite to room when in a space buttons not working. ([#7054](https://github.com/vector-im/element-android/issues/7054))
+
+In development 🚧
+----------------
+ - Create DM room only on first message - Create the DM and navigate to the new room after sending an event ([#5525](https://github.com/vector-im/element-android/issues/5525))
+ - [App Layout] New empty states for home screen ([#6835](https://github.com/vector-im/element-android/issues/6835))
+ - [App Layout] Bottom navigation tabs are removed for new home screen ([#6565](https://github.com/vector-im/element-android/issues/6565))
+ - [App Layout] fixed space switching dialog measured with wrong height sometimes ([#6750](https://github.com/vector-im/element-android/issues/6750))
+ - [App Layout] Fabs doesn't go off screen anymore ([#6765](https://github.com/vector-im/element-android/issues/6765))
+ - [New Layout] Adds back navigation through spaces ([#6877](https://github.com/vector-im/element-android/issues/6877))
+ - [App Layout] new room invites screen ([#6889](https://github.com/vector-im/element-android/issues/6889))
+ - [App Layout] - Invites now show empty screen after you reject last invite ([#6876](https://github.com/vector-im/element-android/issues/6876))
+ - [App Layout] - space switcher now has empty state ([#6754](https://github.com/vector-im/element-android/issues/6754))
+ - [App Layout] - Improves Developer Mode Debug Button UX and adds it to New App Layout ([#6871](https://github.com/vector-im/element-android/issues/6871))
+ - [New Layout] Changes space sheet to accordion-style with expandable subspaces ([#6907](https://github.com/vector-im/element-android/issues/6907))
+ - [New Layout] Adds space invites ([#6924](https://github.com/vector-im/element-android/issues/6924))
+ - [App Layout] fixed invites count badge bottom margin on a home screen ([#6947](https://github.com/vector-im/element-android/issues/6947))
+ - [New Layout] Improves talkback accessibility ([#7016](https://github.com/vector-im/element-android/issues/7016))
+ - [New Layout] Changes space icon in fab and in release notes screen ([#7039](https://github.com/vector-im/element-android/issues/7039))
+ - [New Layout] Adds header to spaces bottom sheet ([#7040](https://github.com/vector-im/element-android/issues/7040))
+ - [App Layout] New App Layout is enabled by default (Edit: has to be enabled in Labs) ([#6958](https://github.com/vector-im/element-android/issues/6958))
+ - [App Layout] Obsolete settings are not shown when App Layout flag is enabled ([#6646](https://github.com/vector-im/element-android/issues/6646))
+ - [Devices Management] Session overview screen ([#6961](https://github.com/vector-im/element-android/issues/6961))
+ - [Devices Management] Refactor some code to improve testability ([#7043](https://github.com/vector-im/element-android/issues/7043))
+ - [Device Manager] Current Session Section ([#6902](https://github.com/vector-im/element-android/issues/6902))
+ - [Device Manager] Other Sessions Section ([#6945](https://github.com/vector-im/element-android/issues/6945))
+ - [Device Manager] Render Security Recommendations ([#6964](https://github.com/vector-im/element-android/issues/6964))
+
+Improved Documentation 📚
+------------------------
+ - Clarify that setting up a FCM Rewrite Proxy is not necessary for use of the UnifiedPush FCM distributor. ([#6727](https://github.com/vector-im/element-android/issues/6727))
+
+Other changes
+-------------
+ - Increase sticker size ([#6982](https://github.com/vector-im/element-android/issues/6982))
+ - Focus input field when editing homeserver address to speed up login and registration. ([#6926](https://github.com/vector-im/element-android/issues/6926))
+ - Log basic Http information in production. ([#6925](https://github.com/vector-im/element-android/issues/6925))
+ - Converts the vector module to a library with a parent vector-app application module ([#6407](https://github.com/vector-im/element-android/issues/6407))
+ - Creates a dedicated strings module ([#3955](https://github.com/vector-im/element-android/issues/3955))
+ - Remove FragmentModule and the Fragment factory. No need to Inject the constructor on your Fragment, just add @AndroidEntryPoint annotation and @Inject class members. ([#6894](https://github.com/vector-im/element-android/issues/6894))
+ - Small refactor of UnifiedPushHelper ([#6936](https://github.com/vector-im/element-android/issues/6936))
+ - CI: only run sonarqube task when token is known ([#7057](https://github.com/vector-im/element-android/issues/7057))
+
+
+Changes in Element v1.4.34 (2022-08-23)
+=======================================
+
+Features ✨
+----------
+ - [Notification] - Handle creation of notification for live location and poll start ([#6746](https://github.com/vector-im/element-android/issues/6746))
+
+Bugfixes 🐛
+----------
+ - Fixes onboarding requiring matrix.org to be accessible on the first step, the server can now be manually changed ([#6718](https://github.com/vector-im/element-android/issues/6718))
+ - Fixing sign in/up for homeservers that rely on the SSO fallback url ([#6827](https://github.com/vector-im/element-android/issues/6827))
+ - Fixes uncaught exceptions in the SyncWorker to cause the worker to become stuck in the failure state ([#6836](https://github.com/vector-im/element-android/issues/6836))
+ - Fixes onboarding captcha crashing when no WebView is available by showing an error with information instead ([#6855](https://github.com/vector-im/element-android/issues/6855))
+ - Removes ability to continue registration after the app has been destroyed, fixes the next steps crashing due to missing information from the previous steps ([#6860](https://github.com/vector-im/element-android/issues/6860))
+ - Fixes crash when exiting the login or registration entry screens whilst they're loading ([#6861](https://github.com/vector-im/element-android/issues/6861))
+ - Fixes server selection being unable to trust certificates ([#6864](https://github.com/vector-im/element-android/issues/6864))
+ - Ensure SyncThread is started when the app is launched after a Push has been received. ([#6884](https://github.com/vector-im/element-android/issues/6884))
+ - Fixes missing firebase notifications after logging in when UnifiedPush distributor is installed ([#6891](https://github.com/vector-im/element-android/issues/6891))
+
+In development 🚧
+----------------
+ - Create DM room only on first message - Trigger the flow when the "Direct Message" action is selected from the room member details screen ([#5525](https://github.com/vector-im/element-android/issues/5525))
+ - added filter tabs for new App layout's Home screen ([#6505](https://github.com/vector-im/element-android/issues/6505))
+ - [App Layout] added dialog to configure app layout ([#6506](https://github.com/vector-im/element-android/issues/6506))
+ - Adds space list bottom sheet for new app layout ([#6749](https://github.com/vector-im/element-android/issues/6749))
+ - [App Layout] Dialpad moved from bottom navigation tab to a separate activity accessed via home screen context menu ([#6787](https://github.com/vector-im/element-android/issues/6787))
+ - Makes toolbar switch title based on space in New App Layout ([#6795](https://github.com/vector-im/element-android/issues/6795))
+ - [Devices management] Add a feature flag and empty screen for future new layout ([#6798](https://github.com/vector-im/element-android/issues/6798))
+ - Adds new chat bottom sheet as the click action of the main FAB in the new app layout ([#6801](https://github.com/vector-im/element-android/issues/6801))
+ - [Devices management] Other sessions section in new layout ([#6806](https://github.com/vector-im/element-android/issues/6806))
+ - [New Layout] Adds space settings accessible through clicking the toolbar ([#6859](https://github.com/vector-im/element-android/issues/6859))
+ - Adds New App Layout FABs (hidden behind feature flag) ([#6693](https://github.com/vector-im/element-android/issues/6693))
+
+SDK API changes ⚠️
+------------------
+ - Rename `DebugService.logDbUsageInfo` (resp. `Session.logDbUsageInfo`) to `DebugService.getDbUsageInfo` (resp. `Session.getDbUsageInfo`) and return a String instead of logging. The caller may want to log the String. ([#6884](https://github.com/vector-im/element-android/issues/6884))
+
+Other changes
+-------------
+ - Removes the Login2 proof of concept - replaced by the FTUE changes ([#5974](https://github.com/vector-im/element-android/issues/5974))
+ - Enable auto-capitalization for Room creation Title field ([#6645](https://github.com/vector-im/element-android/issues/6645))
+ - Decouples the variant logic from the vector module ([#6783](https://github.com/vector-im/element-android/issues/6783))
+ - Add a developer setting to enable LeakCanary at runtime ([#6786](https://github.com/vector-im/element-android/issues/6786))
+ - [Create Room] Reduce some boilerplate with room state event contents ([#6799](https://github.com/vector-im/element-android/issues/6799))
+ - [Call] Memory leak after a call ([#6808](https://github.com/vector-im/element-android/issues/6808))
+ - Fix some string template ([#6843](https://github.com/vector-im/element-android/issues/6843))
+
+
 Changes in Element v1.4.32 (2022-08-10)
 =======================================
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 52ccf47e6a..40ae848415 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,10 +1,43 @@
-# Contributing code to Matrix
+# Contributing to Element Android
+
+<!--- TOC -->
+
+* [Contributing code to Matrix](#contributing-code-to-matrix)
+* [Android Studio settings](#android-studio-settings)
+  * [Template](#template)
+* [Compilation](#compilation)
+* [I want to help translating Element](#i-want-to-help-translating-element)
+* [I want to submit a PR to fix an issue](#i-want-to-submit-a-pr-to-fix-an-issue)
+  * [Kotlin](#kotlin)
+  * [Changelog](#changelog)
+  * [Code quality](#code-quality)
+    * [Internal tool](#internal-tool)
+    * [ktlint](#ktlint)
+    * [knit](#knit)
+    * [lint](#lint)
+  * [Unit tests](#unit-tests)
+  * [Tests](#tests)
+  * [Internationalisation](#internationalisation)
+    * [Adding new string](#adding-new-string)
+      * [Plurals](#plurals)
+    * [Editing existing strings](#editing-existing-strings)
+    * [Removing existing strings](#removing-existing-strings)
+    * [Renaming string ids](#renaming-string-ids)
+    * [Reordering strings](#reordering-strings)
+  * [Accessibility](#accessibility)
+  * [Layout](#layout)
+  * [Authors](#authors)
+* [Thanks](#thanks)
+
+<!--- END -->
+
+## Contributing code to Matrix
 
 Please read https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md
 
 Element Android support can be found in this room: [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org).
 
-# Specific rules for Matrix Android projects
+The rest of the document contains specific rules for Matrix Android projects
 
 ## Android Studio settings
 
@@ -94,6 +127,23 @@ Note that you can run
 
 For ktlint to fix some detected errors for you (you still have to check and commit the fix of course)
 
+#### knit
+
+[knit](https://github.com/Kotlin/kotlinx-knit) is a tool which checks markdown files on the project. Also it generates/updates the table of content (toc) of the markdown files.
+
+So everytime the toc should be updated, just run
+<pre>
+./gradlew knit
+</pre>
+
+and commit the changes.
+
+The CI will check that markdown files are up to date by running
+
+<pre>
+./gradlew knitCheck
+</pre>
+
 #### lint
 
 <pre>
@@ -120,17 +170,21 @@ You should consider adding Unit tests with your PR, and also integration tests (
 
 Translations are handled using an external tool: [Weblate](https://translate.element.io/projects/element-android/)
 
-As a general rule, please never edit or add or remove translations to the project in a Pull Request. It can lead to merge conflict if the translations are also modified in Weblate side.
+**As a general rule, please never edit or add or remove translations to the project in a Pull Request**. It can lead to merge conflict if the translations are also modified in Weblate side. Pull Request containing change(s) on the translation files cannot be merged.
 
 #### Adding new string
 
-When adding new string resources, please only add new entries in the file `value/strings.xml`. Translations will be added later by the community of translators using Weblate.
+When adding new string resources, please only add new entries in the file `values/strings.xml` ([this file](./library/ui-strings/src/main/res/values/strings.xml)). Translations will be added later by the community of translators using Weblate.
 
-The file `value/strings.xml` must only contain American English (U. S. English) values, as this is the default language of the Android operating system. So for instance, please use "color" instead of "colour". Element Android will still use the language set on the system by the user, like any other Android applications which provide translations. The system language can be any other English language variants, or any other languages. Note that this is also possible to override the system language using the Element Android in-app language settings.
+The file `values/strings.xml` must only contain American English (U. S. English) values, as this is the default language of the Android operating system. So for instance, please use "color" instead of "colour". Element Android will still use the language set on the system by the user, like any other Android applications which provide translations. The system language can be any other English language variants, or any other languages. Note that this is also possible to override the system language using the Element Android in-app language settings.
 
-New strings can be added anywhere in the file `value/strings.xml`, not necessarily at the end of the file. Generally, it's even better to add the new strings in some dedicated section per feature, and not at the end of the file, to avoid merge conflict between 2 PR adding strings at the end of the same file.
+New strings can be added anywhere in the file `values/strings.xml`, not necessarily at the end of the file. Generally, it's even better to add the new strings in some dedicated section per feature, and not at the end of the file, to avoid merge conflict between 2 PR adding strings at the end of the same file.
 
-Do not hesitate to use plurals when appropriate.
+##### Plurals
+
+Please use `plurals` resources when appropriate, and note that some languages have specific rules for `plurals`, so even if the string will always be at the plural form for English, please always create a `plurals` resource.
+
+Specific plural forms can be found [here](https://unicode-org.github.io/cldr-staging/charts/37/supplemental/language_plural_rules.html).
 
 #### Editing existing strings
 
@@ -150,6 +204,23 @@ And add `tools:ignore="UnusedResources"` to the string, to let lint ignore that
 
 The string will be removed during the next sync with Weblate.
 
+#### Renaming string ids
+
+This is possible to rename ids of the String resources, but since translation files cannot be edited, add TODO in the main strings.xml file above the strings you want to rename. 
+
+```xml
+<!-- TODO Rename id to put_new_id_here -->
+<string name="current_id">Hello Matrix world!</string>
+```
+
+The string id(s) will be renamed during the next Weblate sync.
+
+#### Reordering strings
+
+To group strings per feature, or for any other reasons, it is possible to reorder string resources, but only in the [main strings.xml file](./library/ui-strings/src/main/res/values/strings.xml). ). We do not mind about ordering in the translation files, and anyway this is forbidden to edit manually the translation files.
+
+It is also possible to add empty lines between string resources, and to add XML comments. Please note that the XML comment just above a String resource will also appear on Weblate and be visible to the translators.
+
 ### Accessibility
 
 Please consider accessibility as an important point. As a minimum requirement, in layout XML files please use attributes such as `android:contentDescription` and `android:importantForAccessibility`, and test with a screen reader if it's working well. You can add new string resources, dedicated to accessibility, in this case, please prefix theirs id with `a11y_`.
diff --git a/Gemfile.lock b/Gemfile.lock
index 90e846860e..276f4ae66a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,29 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
+    CFPropertyList (3.0.5)
+      rexml
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.479.0)
-    aws-sdk-core (3.117.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.619.0)
+    aws-sdk-core (3.132.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.44.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.58.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.96.1)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.4)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    claide (1.0.3)
+    claide (1.1.0)
     claide-plugins (0.9.2)
       cork
       nap
@@ -48,22 +49,24 @@ GEM
       octokit (~> 4.7)
       terminal-table (>= 1, < 4)
     declarative (0.0.20)
-    digest-crc (0.6.3)
+    digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
-    emoji_regex (3.2.2)
-    excon (0.85.0)
-    faraday (1.5.1)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.92.4)
+    faraday (1.10.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -71,18 +74,22 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
-    faraday-http-cache (2.4.0)
+    faraday-http-cache (2.4.1)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
-    faraday_middleware (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.4)
-    fastlane (2.187.0)
+    fastimage (2.2.6)
+    fastlane (2.209.0)
       CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
+      addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
@@ -97,7 +104,7 @@ GEM
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.1)
+      google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
@@ -106,6 +113,7 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (~> 2.0.0)
       naturally (~> 2.2)
+      optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
@@ -121,9 +129,9 @@ GEM
     gh_inspector (1.1.3)
     git (1.11.0)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.8.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.0)
+    google-apis-androidpublisher_v3 (0.25.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-core (0.7.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -132,47 +140,47 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.6.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.5.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.6.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.13.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-playcustomapp_v1 (0.10.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-storage_v1 (0.17.0)
+      google-apis-core (>= 0.7, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.2.0)
+    google-cloud-storage (1.38.0)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.17.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (0.16.2)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.2.0)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
+      signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.4.0)
-    json (2.5.1)
-    jwt (2.2.3)
+    jmespath (1.6.1)
+    json (2.6.2)
+    jwt (2.4.1)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.1.0)
+    mini_mime (1.1.2)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
@@ -183,12 +191,13 @@ GEM
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    os (1.1.1)
+    optparse (0.1.1)
+    os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rake (13.0.6)
     rchardet (1.8.0)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -201,9 +210,9 @@ GEM
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     security (0.1.3)
-    signet (0.15.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
+    signet (0.17.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -212,7 +221,7 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.1)
+    trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
@@ -220,11 +229,11 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.20.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -239,6 +248,7 @@ GEM
 PLATFORMS
   universal-darwin-21
   x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   danger
diff --git a/README.md b/README.md
index 7acb5aa638..e8fceb2eb2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
+[![Latest build](https://github.com/vector-im/element-android/actions/workflows/build.yml/badge.svg?query=branch%3Adevelop)](https://github.com/vector-im/element-android/actions/workflows/build.yml?query=branch%3Adevelop)
 [![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
 [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
@@ -14,7 +14,7 @@ It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-androi
 [<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
 [<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)
 
-Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) Nightly test status: [![allScreensTest](https://github.com/vector-im/element-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/vector-im/element-android/actions/workflows/nightly.yml)
+Build of develop branch: [![GitHub Action](https://github.com/vector-im/element-android/actions/workflows/build.yml/badge.svg?query=branch%3Adevelop)](https://github.com/vector-im/element-android/actions/workflows/build.yml?query=branch%3Adevelop) Nightly test status: [![allScreensTest](https://github.com/vector-im/element-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/vector-im/element-android/actions/workflows/nightly.yml)
 
 
 # New Android SDK
@@ -40,14 +40,16 @@ If you would like to receive releases more quickly (bearing in mind that they ma
 
 1. [Sign up to receive beta releases](https://play.google.com/apps/testing/im.vector.app) via the Google Play Store.
 2. Install a [release APK](https://github.com/vector-im/element-android/releases) directly - download the relevant .apk file and allow installing from untrusted sources in your device settings.  Note: these releases are the Google Play version, which depend on some Google services.  If you prefer to avoid that, try the latest dev builds, and choose the F-Droid version.
-3. If you're really brave, install the [very latest dev build](https://buildkite.com/matrix-dot-org/element-android/builds/latest?branch=develop&state=passed) - click on *Assemble (GPlay or FDroid) Debug version* then on *Artifacts*.
+3. If you're really brave, install the [very latest dev build](https://github.com/vector-im/element-android/actions/workflows/build.yml?query=branch%3Adevelop) - pick a build, then click on `Summary` to download the APKs from there: `vector-Fdroid-debug` and `vector-Gplay-debug` contains the APK for the desired store. Each file contains 5 APKs. 4 APKs for every supported specific architecture of device. In doubt you can install the `universal` APK.
 
 ## Contributing
 
-Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
+Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
 
 Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).
 
+Also [this documentation](./docs/_developer_onboarding.md) can hopefully help developers to start working on the project.
+
 ## Triaging issues
 
 Issues are triaged by community members and the Android App Team, following the [triage process](https://github.com/vector-im/element-meta/wiki/Triage-process).
diff --git a/build.gradle b/build.gradle
index afe51cc734..0f94fc418c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,14 +24,16 @@ buildscript {
         classpath libs.gradle.gradlePlugin
         classpath libs.gradle.kotlinPlugin
         classpath libs.gradle.hiltPlugin
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.2'
-        classpath 'com.google.gms:google-services:4.3.13'
-        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513'
+        classpath 'com.google.firebase:firebase-appdistribution-gradle:3.1.1'
+        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
-        classpath "com.likethesalad.android:stem-plugin:2.1.1"
-        classpath 'org.owasp:dependency-check-gradle:7.1.1'
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
+        classpath "com.likethesalad.android:stem-plugin:2.2.3"
+        classpath 'org.owasp:dependency-check-gradle:7.4.1'
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
+        classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
+        classpath libs.squareup.paparazziPlugin
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -39,12 +41,16 @@ buildscript {
 
 plugins {
     // ktlint Plugin
-    id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
+    id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
     // Detekt
-    id "io.gitlab.arturbosch.detekt" version "1.21.0"
+    id "io.gitlab.arturbosch.detekt" version "1.22.0"
+    // Ksp
+    id "com.google.devtools.ksp" version "1.7.22-1.0.8"
 
     // Dependency Analysis
-    id 'com.autonomousapps.dependency-analysis' version "1.11.2"
+    id 'com.autonomousapps.dependency-analysis' version "1.17.0"
+    // Gradle doctor
+    id "com.osacky.doctor" version "0.8.1"
 }
 
 // https://github.com/jeremylong/DependencyCheck
@@ -57,6 +63,9 @@ dependencyCheck {
     ]
 }
 
+// Gradle doctor configuration
+apply from: './tools/gradle/doctor.gradle'
+
 allprojects {
     apply plugin: "org.jlleitschuh.gradle.ktlint"
     apply plugin: "io.gitlab.arturbosch.detekt"
@@ -70,6 +79,14 @@ allprojects {
                 groups.mavenCentral.group.each { includeGroup it }
             }
         }
+        // snapshots repository
+        maven {
+            url "https://oss.sonatype.org/content/repositories/snapshots"
+            content {
+                groups.snapshot.regex.each { includeGroupByRegex it }
+                groups.snapshot.group.each { includeGroup it }
+            }
+        }
         maven {
             url 'https://jitpack.io'
             content {
@@ -79,9 +96,9 @@ allprojects {
         }
         // Jitsi repo
         maven {
-            url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-5.0.2"
+            url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-6.2.2"
             // Note: to test Jitsi release you can use a local file like this:
-            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0"
+            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-6.2.2"
             content {
                 groups.jitsi.regex.each { includeGroupByRegex it }
                 groups.jitsi.group.each { includeGroup it }
@@ -131,6 +148,9 @@ allprojects {
             // To have XML report for Danger
             reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
         }
+        filter {
+            exclude { element -> element.file.path.contains("$buildDir/generated/") }
+        }
         disabledRules = [
                 // TODO Re-enable these 4 rules after reformatting project
                 "indent",
@@ -151,6 +171,8 @@ allprojects {
                 "experimental:comment-wrapping",
                 // - A KDoc comment after any other element on the same line must be separated by a new line
                 "experimental:kdoc-wrapping",
+                // Ignore error "Redundant curly braces", since we use it to fix false positives, for instance in "elementLogs.${i}.txt"
+                "string-template",
         ]
     }
 
@@ -213,7 +235,7 @@ project(":vector") {
     }
 }
 
-project(":library:diff-match-patch") {
+project(":library:external:diff-match-patch") {
     sonarqube {
         skipProject = true
     }
@@ -284,3 +306,61 @@ dependencyAnalysis {
         }
     }
 }
+
+tasks.register("recordScreenshots", GradleBuild) {
+    startParameter.projectProperties.screenshot = ""
+    tasks = [':vector:recordPaparazziDebug']
+}
+
+tasks.register("verifyScreenshots", GradleBuild) {
+    startParameter.projectProperties.screenshot = ""
+    tasks = [':vector:verifyPaparazziDebug']
+}
+
+ext.initScreenshotTests = { project ->
+    def hasScreenshots = project.hasProperty("screenshot")
+    if (hasScreenshots) {
+        project.apply plugin: 'app.cash.paparazzi'
+    }
+    project.dependencies { testCompileOnly libs.squareup.paparazzi }
+    project.android.testOptions.unitTests.all {
+        def screenshotTestCapture = "**/*ScreenshotTest*"
+        if (hasScreenshots) {
+            include screenshotTestCapture
+        } else {
+            exclude screenshotTestCapture
+        }
+    }
+}
+
+// Workaround to have KSP generated Kotlin code available in the IDE (for code completion)
+// Ref: https://github.com/airbnb/epoxy/releases/tag/5.0.0beta02
+subprojects { project ->
+    afterEvaluate {
+        if (project.hasProperty("android")) {
+            android {
+                if (it instanceof com.android.build.gradle.LibraryExtension) {
+                    libraryVariants.all { variant ->
+                        def outputFolder = new File("build/generated/ksp/${variant.name}/kotlin")
+                        if (outputFolder.exists()) {
+                            variant.addJavaSourceFoldersToModel(outputFolder)
+                            android.sourceSets.getAt(variant.name).java {
+                                srcDir(outputFolder)
+                            }
+                        }
+                    }
+                } else if (it instanceof com.android.build.gradle.AppExtension) {
+                    applicationVariants.all { variant ->
+                        def outputFolder = new File("build/generated/ksp/${variant.name}/kotlin")
+                        if (outputFolder.exists()) {
+                            variant.addJavaSourceFoldersToModel(outputFolder)
+                            android.sourceSets.getAt(variant.name).java {
+                                srcDir(outputFolder)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/changelog.d/5546.bugfix b/changelog.d/5546.bugfix
new file mode 100644
index 0000000000..a3ff48a4a2
--- /dev/null
+++ b/changelog.d/5546.bugfix
@@ -0,0 +1 @@
+ReplyTo are not updated if the original message is edited or deleted.
diff --git a/changelog.d/6505.wip b/changelog.d/6505.wip
deleted file mode 100644
index 1109c5fff1..0000000000
--- a/changelog.d/6505.wip
+++ /dev/null
@@ -1 +0,0 @@
-added filter tabs for new App layout's Home screen
diff --git a/changelog.d/6693.feature b/changelog.d/6693.feature
deleted file mode 100644
index 5e905766a9..0000000000
--- a/changelog.d/6693.feature
+++ /dev/null
@@ -1 +0,0 @@
-Adds New App Layout FABs (hidden behind feature flag)
diff --git a/changelog.d/6746.feature b/changelog.d/6746.feature
deleted file mode 100644
index 7869e7f57a..0000000000
--- a/changelog.d/6746.feature
+++ /dev/null
@@ -1 +0,0 @@
-[Notification] - Handle creation of notification for live location and poll start
diff --git a/changelog.d/6783.misc b/changelog.d/6783.misc
deleted file mode 100644
index d1095c1203..0000000000
--- a/changelog.d/6783.misc
+++ /dev/null
@@ -1 +0,0 @@
-Decouples the variant logic from the vector module
diff --git a/changelog.d/6786.misc b/changelog.d/6786.misc
deleted file mode 100644
index a916336ae4..0000000000
--- a/changelog.d/6786.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a developer setting to enable LeakCanary at runtime
diff --git a/changelog.d/6798.wip b/changelog.d/6798.wip
deleted file mode 100644
index a16270666b..0000000000
--- a/changelog.d/6798.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Devices management] Add a feature flag and empty screen for future new layout
diff --git a/changelog.d/6799.misc b/changelog.d/6799.misc
deleted file mode 100644
index b756c2c07b..0000000000
--- a/changelog.d/6799.misc
+++ /dev/null
@@ -1 +0,0 @@
-[Create Room] Reduce some boilerplate with room state event contents
diff --git a/changelog.d/6808.misc b/changelog.d/6808.misc
deleted file mode 100644
index 06eeff862b..0000000000
--- a/changelog.d/6808.misc
+++ /dev/null
@@ -1 +0,0 @@
-[Call] Memory leak after a call
diff --git a/changelog.d/7853.bugfix b/changelog.d/7853.bugfix
new file mode 100644
index 0000000000..885233553e
--- /dev/null
+++ b/changelog.d/7853.bugfix
@@ -0,0 +1 @@
+[Session manager] Missing info when a session does not support encryption
diff --git a/changelog.d/7887.feature b/changelog.d/7887.feature
new file mode 100644
index 0000000000..1f1c29761a
--- /dev/null
+++ b/changelog.d/7887.feature
@@ -0,0 +1 @@
+"[Rich text editor] Add list formatting buttons to the rich text editor"
\ No newline at end of file
diff --git a/coverage.gradle b/coverage.gradle
index f335ed8063..2c0af25368 100644
--- a/coverage.gradle
+++ b/coverage.gradle
@@ -28,8 +28,8 @@ def initializeReport(report, projects, classExcludes) {
 
     report.executionData {
         fileTree(rootProject.rootDir.absolutePath).include(
-            "**/build/**/*.exec",
-            "**/build/outputs/code_coverage/**/coverage.ec",
+                "**/build/**/*.exec",
+                "**/build/outputs/code_coverage/**/coverage.ec",
         )
     }
     report.reports {
@@ -74,18 +74,18 @@ def collectProjects(predicate) {
 task generateCoverageReport(type: JacocoReport) {
     outputs.upToDateWhen { false }
     rootProject.apply plugin: 'jacoco'
-    def projects = collectProjects { ['vector', 'matrix-sdk-android'].contains(it.name) }
+    def projects = collectProjects { ['vector-app', 'vector', 'matrix-sdk-android'].contains(it.name) }
     initializeReport(it, projects, excludes)
 }
 
 task unitTestsWithCoverage(type: GradleBuild) {
     // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage
-    startParameter.projectProperties.coverage = [enableTestCoverage:  false]
-    tasks = [':vector:testGplayDebugUnitTest', ':matrix-sdk-android:testDebugUnitTest']
+    startParameter.projectProperties.coverage = [enableTestCoverage: false]
+    tasks = ['testDebugUnitTest']
 }
 
 task instrumentationTestsWithCoverage(type: GradleBuild) {
-    startParameter.projectProperties.coverage = [enableTestCoverage:  true]
+    startParameter.projectProperties.coverage = [enableTestCoverage: true]
     startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-    tasks = [':vector:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
+    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index 93a62a548e..76ff9b0c6f 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,48 +1,46 @@
 ext.versions = [
-
         'minSdk'            : 21,
-        'compileSdk'        : 31,
-        'targetSdk'         : 31,
+        'compileSdk'        : 33,
+        'targetSdk'         : 33,
         'sourceCompat'      : JavaVersion.VERSION_11,
         'targetCompat'      : JavaVersion.VERSION_11,
 ]
 
-
-// Pinned to 7.1.3 because of https://github.com/vector-im/element-android/issues/6142
-// Please test carefully before upgrading again.
-def gradle = "7.1.3"
+def gradle = "7.3.1"
 // Ref: https://kotlinlang.org/releases.html
-def kotlin = "1.6.21"
+def kotlin = "1.7.22"
 def kotlinCoroutines = "1.6.4"
-def dagger = "2.42"
-def appDistribution = "16.0.0-beta03"
+def dagger = "2.44.2"
+def firebaseBom = "31.1.1"
+def appDistribution = "16.0.0-beta05"
 def retrofit = "2.9.0"
-def arrow = "0.8.2"
 def markwon = "4.6.2"
-def moshi = "1.13.0"
+def moshi = "1.14.0"
 def lifecycle = "2.5.1"
 def flowBinding = "1.2.0"
-def flipper = "0.156.0"
-def epoxy = "4.6.2"
-def mavericks = "2.7.0"
-def glide = "4.13.2"
+def flipper = "0.176.0"
+def epoxy = "5.0.0"
+def mavericks = "3.0.1"
+def glide = "4.14.2"
 def bigImageViewer = "1.8.1"
 def jjwt = "0.11.5"
-def vanniktechEmoji = "0.15.0"
-
-def fragment = "1.5.1"
-
+// Temporary version to unblock #6929. Once 0.16.0 is released we should use it, and revert
+// the whole commit which set version 0.16.0-SNAPSHOT
+def vanniktechEmoji = "0.16.0-SNAPSHOT"
+def sentry = "6.9.2"
+def fragment = "1.5.5"
 // Testing
 def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
 def espresso = "3.4.0"
 def androidxTest = "1.4.0"
-def androidxOrchestrator = "1.4.1"
+def androidxOrchestrator = "1.4.2"
+def paparazzi = "1.1.0"
+
 ext.libs = [
         gradle      : [
                 'gradlePlugin'            : "com.android.tools.build:gradle:$gradle",
                 'kotlinPlugin'            : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin",
                 'hiltPlugin'              : "com.google.dagger:hilt-android-gradle-plugin:$dagger"
-
         ],
         jetbrains   : [
                 'coroutinesCore'          : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines",
@@ -50,12 +48,12 @@ ext.libs = [
                 'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
         ],
         androidx    : [
-                'activity'                : "androidx.activity:activity:1.5.1",
-                'appCompat'               : "androidx.appcompat:appcompat:1.4.2",
+                'activity'                : "androidx.activity:activity-ktx:1.6.1",
+                'appCompat'               : "androidx.appcompat:appcompat:1.5.1",
                 'biometric'               : "androidx.biometric:biometric:1.1.0",
-                'core'                    : "androidx.core:core-ktx:1.8.0",
+                'core'                    : "androidx.core:core-ktx:1.9.0",
                 'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
-                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.3",
+                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.5",
                 'fragmentKtx'             : "androidx.fragment:fragment-ktx:$fragment",
                 'fragmentTesting'         : "androidx.fragment:fragment-testing:$fragment",
                 'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.4",
@@ -82,9 +80,13 @@ ext.libs = [
                 'transition'              : "androidx.transition:transition:1.2.0",
         ],
         google      : [
-                'material'                : "com.google.android.material:material:1.6.1",
+                'material'                : "com.google.android.material:material:1.7.0",
+                'firebaseBom'             : "com.google.firebase:firebase-bom:$firebaseBom",
+                'messaging'               : "com.google.firebase:firebase-messaging",
                 'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
                 'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
+                // Phone number https://github.com/google/libphonenumber
+                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.13.3"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",
@@ -98,25 +100,26 @@ ext.libs = [
                 'flipperNetworkPlugin'    : "com.facebook.flipper:flipper-network-plugin:$flipper",
         ],
         element     : [
-                'opusencoder'             : "io.element.android:opusencoder:1.0.4",
+                'opusencoder'             : "io.element.android:opusencoder:1.1.0",
+                'wysiwyg'                 : "io.element.android:wysiwyg:0.13.0"
         ],
         squareup    : [
                 'moshi'                  : "com.squareup.moshi:moshi:$moshi",
                 'moshiKt'                : "com.squareup.moshi:moshi-kotlin:$moshi",
                 'moshiKotlin'            : "com.squareup.moshi:moshi-kotlin-codegen:$moshi",
+                'moshiAdapters'          : "com.squareup.moshi:moshi-adapters:$moshi",
+                'paparazzi'              : "app.cash.paparazzi:paparazzi:$paparazzi",
+                'paparazziPlugin'        : "app.cash.paparazzi:paparazzi-gradle-plugin:$paparazzi",
                 'retrofit'               : "com.squareup.retrofit2:retrofit:$retrofit",
                 'retrofitMoshi'          : "com.squareup.retrofit2:converter-moshi:$retrofit"
         ],
         rx          : [
                 'rxKotlin'               : "io.reactivex.rxjava2:rxkotlin:2.4.0"
         ],
-        arrow       : [
-                'core'                   : "io.arrow-kt:arrow-core:$arrow",
-                'instances'              : "io.arrow-kt:arrow-instances-core:$arrow"
-        ],
         markwon     : [
                 'core'                   : "io.noties.markwon:core:$markwon",
                 'extLatex'               : "io.noties.markwon:ext-latex:$markwon",
+                'imageGlide'             : "io.noties.markwon:image-glide:$markwon",
                 'inlineParser'           : "io.noties.markwon:inline-parser:$markwon",
                 'html'                   : "io.noties.markwon:html:$markwon"
         ],
@@ -129,7 +132,7 @@ ext.libs = [
                 'mavericksTesting'       : "com.airbnb.android:mavericks-testing:$mavericks"
         ],
         maplibre    : [
-                'androidSdk'             : "org.maplibre.gl:android-sdk:9.5.2",
+                'androidSdk'             : "org.maplibre.gl:android-sdk:9.6.0",
                 'pluginAnnotation'       : "org.maplibre.gl:android-plugin-annotation-v9:1.0.0"
         ],
         mockk      : [
@@ -160,12 +163,15 @@ ext.libs = [
                 'emojiGoogle'            : "com.vanniktech:emoji-google:$vanniktechEmoji"
         ],
         apache      : [
-                'commonsImaging'         : "org.apache.sanselan:sanselan:0.97-incubator"
+                'commonsImaging'         : "org.apache.commons:commons-imaging:1.0-alpha3"
+        ],
+        sentry: [
+                'sentryAndroid'         : "io.sentry:sentry-android:$sentry"
         ],
         tests       : [
-                'kluent'                 : "org.amshove.kluent:kluent-android:1.68",
+                'kluent'                 : "org.amshove.kluent:kluent-android:1.72",
                 'timberJunitRule'        : "net.lachlanmckee:timber-junit-rule:1.0.1",
-                'junit'                  : "junit:junit:4.13.2"
+                'junit'                  : "junit:junit:4.13.2",
         ]
 ]
 
diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle
index bcd737acc9..8d488ba2f8 100644
--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@@ -38,10 +38,18 @@ ext.groups = [
                         'com.google.testing.platform',
                 ]
         ],
+        snapshot: [
+                regex: [
+                ],
+                group: [
+                        'com.vanniktech',
+                ]
+        ],
         mavenCentral: [
                 regex: [
                 ],
                 group: [
+                        'app.cash.paparazzi',
                         'ch.qos.logback',
                         'com.adevinta.android',
                         'com.airbnb.android',
@@ -69,8 +77,6 @@ ext.groups = [
                         'com.gabrielittner.threetenbp',
                         'com.getkeepsafe.relinker',
                         'com.github.bumptech.glide',
-                        'com.github.filippudak',
-                        'com.github.filippudak.progresspieview',
                         'com.github.javaparser',
                         'com.github.piasy',
                         'com.github.shyiko.klob',
@@ -78,6 +84,7 @@ ext.groups = [
                         'com.google',
                         'com.google.android',
                         'com.google.api.grpc',
+                        'com.google.auto',
                         'com.google.auto.service',
                         'com.google.auto.value',
                         'com.google.code.findbugs',
@@ -95,6 +102,7 @@ ext.groups = [
                         'com.googlecode.json-simple',
                         'com.googlecode.libphonenumber',
                         'com.ibm.icu',
+                        'com.intellij',
                         'com.jakewharton.android.repackaged',
                         'com.jakewharton.timber',
                         'com.kgurgul.flipper',
@@ -120,13 +128,12 @@ ext.groups = [
                         'com.sun.xml.bind.mvn',
                         'com.sun.xml.fastinfoset',
                         'com.thoughtworks.qdox',
-                        'com.vanniktech',
+                        // 'com.vanniktech',
                         'commons-cli',
                         'commons-codec',
                         'commons-io',
                         'commons-logging',
                         'info.picocli',
-                        'io.arrow-kt',
                         'io.element.android',
                         'io.github.davidburstrom.contester',
                         'io.github.detekt.sarif4k',
@@ -140,16 +147,21 @@ ext.groups = [
                         'io.netty',
                         'io.noties.markwon',
                         'io.opencensus',
+                        'io.perfmark',
                         'io.reactivex.rxjava2',
                         'io.realm',
+                        'io.sentry',
                         'it.unimi.dsi',
                         'jakarta.activation',
                         'jakarta.xml.bind',
+                        'javax.activation',
                         'javax.annotation',
                         'javax.inject',
+                        'javax.xml.bind',
                         'jline',
                         'jp.wasabeef',
                         'junit',
+                        'kxml2',
                         'me.saket',
                         'net.bytebuddy',
                         'net.java',
@@ -164,8 +176,8 @@ ext.groups = [
                         'org.apache.ant',
                         'org.apache.commons',
                         'org.apache.httpcomponents',
-                        'org.apache.sanselan',
                         'org.bouncycastle',
+                        'org.ccil.cowan.tagsoup',
                         'org.checkerframework',
                         'org.codehaus',
                         'org.codehaus.groovy',
@@ -178,11 +190,13 @@ ext.groups = [
                         'org.hamcrest',
                         'org.jacoco',
                         'org.java-websocket',
+                        'org.jcodec',
                         'org.jetbrains',
                         'org.jetbrains.dokka',
                         'org.jetbrains.intellij.deps',
                         'org.jetbrains.kotlin',
                         'org.jetbrains.kotlinx',
+                        'org.jetbrains.trove4j',
                         'org.json',
                         'org.jsoup',
                         'org.junit',
@@ -199,7 +213,6 @@ ext.groups = [
                         'org.ow2.asm',
                         'org.ow2.asm',
                         'org.reactivestreams',
-                        'org.robolectric',
                         'org.slf4j',
                         'org.sonatype.oss',
                         'org.testng',
diff --git a/docs/_developer_onboarding.md b/docs/_developer_onboarding.md
new file mode 100644
index 0000000000..2f414063e3
--- /dev/null
+++ b/docs/_developer_onboarding.md
@@ -0,0 +1,259 @@
+# Developer on boarding
+
+<!--- TOC -->
+
+* [Introduction](#introduction)
+  * [Quick introduction to Matrix](#quick-introduction-to-matrix)
+    * [Matrix data](#matrix-data)
+      * [Room](#room)
+      * [Event](#event)
+    * [Sync](#sync)
+      * [Glossary about syncs](#glossary-about-syncs)
+  * [The Android project](#the-android-project)
+  * [Matrix SDK](#matrix-sdk)
+  * [Application](#application)
+    * [MvRx](#mvrx)
+      * [Behavior](#behavior)
+    * [Epoxy](#epoxy)
+    * [Other frameworks](#other-frameworks)
+  * [Push](#push)
+  * [Dependencies management](#dependencies-management)
+  * [Test](#test)
+  * [Other points](#other-points)
+    * [Logging](#logging)
+    * [Rageshake](#rageshake)
+  * [Tips](#tips)
+* [Happy coding!](#happy-coding)
+
+<!--- END -->
+
+## Introduction
+
+This doc is a quick introduction about the project and its architecture.
+
+It's aim is to help new developers to understand the overall project and where to start developing.
+
+Other useful documentation:
+- all the docs in this folder!
+- the [contributing doc](../CONTRIBUTING.md), that you should also read carefully.
+
+### Quick introduction to Matrix
+
+Matrix website: [matrix.org](https://matrix.org), [discover page](https://matrix.org/discover).
+*Note*: Matrix.org is also hosting a homeserver ([.well-known file](https://matrix.org/.well-known/matrix/client)).
+The reference homeserver (this is how Matrix servers are called) implementation is [Synapse](https://github.com/matrix-org/synapse/). But other implementations exist. The Matrix specification is here to ensure that any Matrix client, such as Element Android and its SDK can talk to any Matrix server.
+
+Have a quick look to the client-server API documentation: [Client-server documentation](https://spec.matrix.org/v1.3/client-server-api/). Other network API exist, the list is here: (https://spec.matrix.org/latest/)
+
+Matrix is an open source protocol. Change are possible and are tracked using [this GitHub repository](https://github.com/matrix-org/matrix-doc/). Changes to the protocol are called MSC: Matrix Spec Change. These are PullRequest to this project.
+
+Matrix object are Json data. Unstable prefixes must be used for Json keys when the MSC is not merged (i.e. accepted). 
+
+#### Matrix data
+
+There are many object and data in the Matrix worlds. Let's focus on the most important and used, `Room` and `Event`
+
+##### Room
+
+`Room` is a place which contains ordered `Event`s. They are identified with their `room_id`. Nearly all the data are stored in rooms, and shared using homeserver to all the Room Member.
+
+*Note*: Spaces are also Rooms with a different `type`.
+
+##### Event
+
+`Events` are items of a Room, where data is embedded.
+
+There are 2 types of Room Event:
+
+- Regular Events: contain useful content for the user (message, image, etc.), but are not necessarily displayed as this in the timeline (reaction, message edition, call signaling).
+- State Events: contain the state of the Room (name, topic, etc.). They have a non null value for the key `state_key`.
+
+Also all the Room Member details are in State Events: one State Event per member. In this case, the `state_key` is the matrixId (= userId).
+
+Important Fields of an Event:
+- `event_id`: unique across the Matrix universe;
+- `room_id`: the room the Event belongs to;
+- `type`: describe what the Event contain, especially in the `content` section, and how the SDK should handle this Event;
+- `content`: dynamic Event data; depends on the `type`.
+
+So we have a triple `event_id`, `type`, `state_key` which uniquely defines an Event.
+
+#### Sync
+
+The `Sync` is a way for the Matrix client to be up to date regarding the user data hosted by the server. All the Events are coming through the sync response. More details can be found here: [spec.matrix.org/v1.3/client-server-api/#syncing](https://spec.matrix.org/v1.3/client-server-api/#syncing)
+When the application is in foreground, this is a looping request. We are using Https requests, which offer the advantage to be compatible with any homeserver. A sync token is used as request parameter, to let the server know what the client knows.
+The `SyncThread` is responsible to manage the sync request loop.
+
+When the application is in background, a Push will trigger a sync request.
+
+##### Glossary about syncs
+
+- **initial sync**: a sync request without a token. This is the first request a client perform after login or after a clear cache. The server will include in the response all your rooms with the full state (all the room membership Event will not be present), with the latest messages for each room. We are in the process to replace this by version 3: sliding sync. All data are inserted to the Database (currently [Realm](https://www.mongodb.com/docs/realm/sdk/java/)).
+- **incremental sync**: sync request with a token.
+- **gappy sync**: sync request where all the new Events are not returned for one or several Rooms. Also called `limited sync`. It can be limited per Room. To get all the missing Events, a Room pagination API has to be called.
+- **sync token**: `next_batch` value in the previous sync response. Will be provided as the `since` parameter for the next sync request.
+
+### The Android project
+
+The project should compile out of the box.
+
+The project is split into several modules. The main ones are:
+For the app
+- `vector-app`: application entry point;
+- `vector`: legacy application, but now a library. In the process of being split into several modules;
+- `vector-config`: this is where all the configuration of the application should occurs. Should because we are in the process of migrating all the configuration here;
+- `library/ui-strings`: this is where all the string resources are stored. Please refer to [contributing doc](../CONTRIBUTING.md) to know how to make change on this module;
+- `library/ui-styles`: this is where the Android styles are defined.
+
+For the SDK
+- `matrix-sdk-android`: the main SDK module. The sources are in this project, but are also exported to [its own project](https://github.com/matrix-org/matrix-android-sdk2). All the PRs and issues related to the SDK take place in the Element Android project;
+- `matrix-sdk-android-flow`: contains some wrapper to expose `Flow` to the application.
+
+### Matrix SDK
+
+SDK exposes `Services` to the client application. `Services` are public interface, and are defined in this parent package: `org.matrix.android.sdk.api`. Default implementation are internal to the SDK, in this parent package: `org.matrix.android.sdk.internal`. Note that you also have to declare the classes as `internal` when adding classes to the `org.matrix.android.sdk.internal` package.
+
+Interface allows us to replace the implementation for testing purpose.
+
+A generated documentation of the SDK is available [here](https://matrix-org.github.io/matrix-android-sdk2/). Updated after each release. Please ensure that the documentation (KDoc) of all the SDK Services is up to date, and is clear for a SDK user.
+The SDK generated documentation also contains information about the entry points of the SDK.
+
+[Dagger](https://dagger.dev/) is used to inject all the dependencies to the SDK classes.
+
+SDK is exposing data as `LiveData`, but we are progressively migrating to `Flow`. Database is the source of truth.
+
+Example:
+- Client send an Event using the `SendService`;
+- At the end a `SendEvent` task is used;
+- Retrofit API is used to send data to the server;
+- Goes to the server, which returns only the `event_id`;
+- The `Event` is coming back from the `sync` response with eventually extra added data.
+
+### Application
+
+This is the UI part of the project.
+
+There are two variants of the application: `Gplay` and `Fdroid`.
+
+The main difference is about using Firebase on `Gplay` variant, to have Push from Google Services. `FDroid` variant cannot contain closed source dependency.
+
+`Fdroid` is using background polling to lack the missing of Pushed. Now a solution using UnifiedPush has ben added to the project. See refer to [the dedicated documentation](./unifiedpush.md) for more details.
+
+#### MvRx
+
+[Maverick](https://airbnb.io/mavericks/#/README) (or MvRx) is an Android MVI framework that helps to develop Reactive application on Android.
+
+- Activity: holder for Fragment. See the parent [VectorBaseActivity](../vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt);
+- Fragment: manage screen of the application. See the parent [VectorBaseFragment](../vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt);
+- BottomSheet: see the parent [VectorBaseBottomSheetDialogFragment](../vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt);
+- ViewModel: this is where the logic is placed. All our ViewModel has a `handle()` which takes action as parameter. See the parent [VectorViewModel](../vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt);
+- VectorSharedActionViewModel: Specific ViewModel that can be used to communicate between Fragment(s) and the host Activity. See the parent [VectorSharedActionViewModel](../vector/src/main/java/im/vector/app/core/platform/VectorSharedActionViewModel.kt);
+- ViewState: this are `data class`, and this represent the state of the View. Has to be copied and set to be updated. Fragment will update the UI regarding the current state (`invalidate()` method). `Async` class from MvRx can be used in the ViewState, especially for asynchronous data loading. Nullability can also be used for optional data. ViewStates have to implement `MavericksState`;
+- ViewEvents: useful when the ViewModel asks the View to trigger a specific action: navigation, show dialog, etc. See the parent [VectorViewEvents](../vector/src/main/java/im/vector/app/core/platform/VectorViewEvents.kt);
+- ViewAction (`VectorViewModelAction`): useful when the UI (generally the Fragment) asks the ViewModel to do something. See the parent [VectorViewModelAction](../vector/src/main/java/im/vector/app/core/platform/VectorViewModelAction.kt);
+- Controller: see the `Epoxy` section just below.
+
+##### Behavior
+
+Fragment asks the ViewModel to perform an action (coming from the user, but not necessarily. ViewModel can then talk to the SDK, updates the state once or several times. Fragment update the UI regarding the new state.
+
+When ViewModel is instantiated, it can subscribe using the SDK Services to get live state of the data.
+
+`invalidate()` has to be used by default, but it's possible to listen to specific member(s) of the `ViewState` using `onEach`. TODO Add an example.
+`awaitState()` method
+
+#### Epoxy
+
+[Epoxy](https://github.com/airbnb/epoxy) is an Android library for building complex screens in a RecyclerView. Please read [the introduction](https://github.com/airbnb/epoxy#epoxy).
+
+- Controller declares items of the RecyclerView. Controller is injected in the Fragment. Controller extends `EpoxyController`, or one of its subclass, especially `TypedEpoxyController`;
+- Fragment gives the state to the controller using `setData`;
+- `buildModels` will be called by the framework;
+- Controller will create ordered Items.
+
+Epoxy does the diffing, and handle many other thing for us, like handling item type, etc.
+
+See for instance the controller [AccountDataEpoxyController](../vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt)) for a simple example.
+
+Warning: do not use twice the same item `id` or it will crash.
+
+#### Other frameworks
+
+- Dependency injection is managed by [Dagger](https://dagger.dev/) (SDK) and [Hilt](https://developer.android.com/training/dependency-injection/hilt-android) (App);
+- [Retrofit](https://square.github.io/retrofit/) and [OkHttp3](https://square.github.io/okhttp/): network requests;
+- [Moshi](https://github.com/square/moshi) is used to parse and serialize Json object; 
+
+### Push
+
+Please see the dedicated documentation for more details.
+
+This is the classical scenario:
+
+- App receives a Push. Note: Push is ignored if app is in foreground;
+- App asks the SDK to load Event data (fastlane mode). We have a change to get the data faster and display the notification faster;
+- App asks the SDK to perform a sync request.
+
+### Dependencies management
+
+All the dependencies are declared in `build.gradle` files. But some versions are declared in [this dedicated file](../dependencies.gradle).
+
+When adding a new dependency, you will have to update the file [dependencies_groups.gradle](../dependencies_groups.gradle) to allow the dependency to be downloaded from the artifact repository. Sometimes sub-dependencies need to be added too, until the project can compile.
+
+[Dependabot](https://github.com/dependabot) is set up on the project. This tool will automatically create Pull Request to upgrade our dependencies one by one.
+dependencies_group, gradle files, Dependabot, etc.
+
+### Test
+
+Please refer to [this dedicated document](./ui-tests.md).
+
+TODO add link to the dedicated screenshot test documentation
+
+### Other points
+
+#### Logging
+
+**Important warning: ** NEVER log private user data, or use the flag `LOG_PRIVATE_DATA`. Be very careful when logging `data class`, all the content will be output!
+
+[Timber](https://github.com/JakeWharton/timber) is used to log data to logcat. We do not use directly the `Log` class. If possible please use a tag, as per
+
+````kotlin
+Timber.tag(loggerTag.value).d("my log")
+````
+
+because automatic tag (= class name) will not be available on the release version.
+
+Also generally it is recommended to provide the `Throwable` to the Timber log functions.
+
+Last point, not that `Timber.v` function may have no effect on some devices. Prefer using `Timber.d` and up.
+
+#### Rageshake
+
+Rageshake is a feature to send bug report directly from the application. Just shake your phone and you will be prompted to send a bug report.
+
+Bug report can contain:
+- a screenshot of the current application state
+- the application logs from up to 15 application starts
+- the logcat logs
+- the key share history (crypto data)
+
+The data will be sent to an internal server, which is not publicly accessible. A GitHub issue will also be created to a private GitHub repository.
+
+Rageshake can be very useful to get logs from a release version of the application.
+
+### Tips
+
+- Element Android has a `developer mode` in the `Settings/Advanced settings`. Other useful options are available here;
+- Show hidden Events can also help to debug feature. When developer mode is enabled, it is possible to view the source (= the Json content) of any Events;
+- Type `/devtools` in a Room composer to access a developer menu. There are some other entry points. Developer mode has to be enabled;
+- Hidden debug menu: when developer mode is enabled and on debug build, there are some extra screens that can be accessible using the green wheel. In those screens, it will be possible to toggle some feature flags;
+- Using logcat, filtering with `onResume` can help you to understand what screen are currently displayed on your device. Searching for string displayed on the screen can also help to find the running code in the codebase.
+- When this is possible, prefer using `sealed interface` instead of `sealed class`;
+- When writing temporary code, using the string "DO NOT COMMIT" in a comment can help to avoid committing things by mistake. If committed and pushed, the CI will detect this String and will warn the user about it.
+
+## Happy coding!
+
+The team is here to support you, feel free to ask anything to other developers.
+
+Also please feel to update this documentation, if incomplete/wrong/obsolete/etc.
+
+**Thanks!**
diff --git a/docs/danger.md b/docs/danger.md
index 19728f00e9..34baa62e9e 100644
--- a/docs/danger.md
+++ b/docs/danger.md
@@ -23,10 +23,12 @@ Here are the checks that Danger does so far:
 - PR description is not empty
 - Big PR got a warning to recommend to split
 - PR contains a file for towncrier and extension is checked
+- PR does not modify frozen classes
 - PR contains a Sign-Off, with exception for Element employee contributors
 - PR with change on layout should include screenshot in the description
 - PR which adds png file warn about the usage of vector drawables
 - non draft PR should have a reviewer
+- files containing translations are not modified by developers
 
 ### Quality check
 
@@ -84,6 +86,8 @@ To let Danger check all the PRs, including PRs form forks, a GitHub account have
 - password: Stored on Passbolt
 - GitHub token: A token with limited access has been created and added to the repository https://github.com/vector-im/element-android as secret DANGER_GITHUB_API_TOKEN. This token is not saved anywhere else. In case of problem, just delete it and create a new one, then update the secret.
 
+PRs from forks do not always have access to the secret `secrets.DANGER_GITHUB_API_TOKEN`, so `secrets.GITHUB_TOKEN` is also provided to the job environment. If `secrets.DANGER_GITHUB_API_TOKEN` is available, it will be used, so user `ElementBot` will comment the PR. Else `secrets.GITHUB_TOKEN` will be used, and bot `github-actions` will comment the PR.
+
 ## Useful links
 
 - https://danger.systems/
diff --git a/docs/database_migration_test.md b/docs/database_migration_test.md
new file mode 100644
index 0000000000..f7844abde8
--- /dev/null
+++ b/docs/database_migration_test.md
@@ -0,0 +1,55 @@
+<!--- TOC -->
+
+* [Testing database migration](#testing-database-migration)
+  * [Creating a reference database](#creating-a-reference-database)
+  * [Testing](#testing)
+
+<!--- END -->
+
+## Testing database migration
+
+### Creating a reference database
+
+Databases are encrypted, the key to decrypt is needed to setup the test.
+A special build property must be enabled to extract it. 
+
+Set `vector.debugPrivateData=true` in `~/.gradle/gradle.properties` (to avoid committing by mistake)
+
+Launch the app in your emulator, login and use the app to fill up the database.
+
+Save the key for the tested database
+```
+RealmKeysUtils  W  Database key for alias `session_db_fe9f212a611ccf6dea1141777065ed0a`: 935a6dfa0b0fc5cce1414194ed190....
+RealmKeysUtils  W  Database key for alias `crypto_module_fe9f212a611ccf6dea1141777065ed0a`: 7b9a21a8a311e85d75b069a343.....
+```
+
+
+Use the [Device File Explorer](https://developer.android.com/studio/debug/device-file-explorer) to extrat the database file from the emulator.
+
+Go to `data/data/im.vector.app.debug/files/<hash>/`
+Pick the database you want to test (name can be found in SessionRealmConfigurationFactory):
+ - crypto_store.realm for crypto
+ - disk_store.realm for session
+ - etc... 
+
+Download the file on your disk
+
+### Testing
+
+Copy the file in `src/AndroidTest/assets`
+
+see `CryptoSanityMigrationTest` or `RealmSessionStoreMigration43Test` for sample tests.
+
+There are already some databases in the assets folder.
+The existing test will properly detect schema changes, and fail with such errors if a migration is missing:
+
+```
+io.realm.exceptions.RealmMigrationNeededException: Migration is required due to the following errors:
+- Property 'CryptoMetadataEntity.foo' has been added.
+```
+
+If you want to test properly more complex database migration (dynamic transforms) ensure that the database contains
+the entity you want to migrate.
+
+You can explore the database with [realm studio](https://www.mongodb.com/docs/realm/studio/) if needed.
+
diff --git a/docs/hilt_migration.md b/docs/hilt_migration.md
index 50021e9792..0556cf85dc 100644
--- a/docs/hilt_migration.md
+++ b/docs/hilt_migration.md
@@ -7,8 +7,8 @@ Hilt is built on top of Dagger 2 and simplify usage by removing needs to create
 When you create a new feature, you should have the following:
 
 Annotate your Activity with @AndroidEntryPoint
+Annotate your Fragment with @AndroidEntryPoint
 If you have a BottomSheetFragment => Annotate it with @AndroidEntryPoint
-Otherwise => Add your Fragment to the FragmentModule
 Add your ViewModel.Factory to the MavericksViewModelModule
 Makes sure your ViewModel as the following code:
 
diff --git a/docs/installing_from_ci.md b/docs/installing_from_ci.md
new file mode 100644
index 0000000000..01fb4afef2
--- /dev/null
+++ b/docs/installing_from_ci.md
@@ -0,0 +1,52 @@
+## Installing from CI
+
+<!--- TOC -->
+
+  * [Installing from Buildkite](#installing-from-buildkite)
+  * [Installing from GitHub](#installing-from-github)
+    * [Create a GitHub token](#create-a-github-token)
+  * [Provide artifact URL](#provide-artifact-url)
+  * [Next steps](#next-steps)
+  * [Future improvement](#future-improvement)
+
+<!--- END -->
+
+Installing APK build by the CI is possible
+
+### Installing from Buildkite
+
+The script `./tools/install/installFromBuildkite.sh` can be used, but Builkite will be removed soon. See next section.
+
+### Installing from GitHub
+
+To install an APK built by a GitHub action, run the script `./tools/install/installFromGitHub.sh`. You will need to pass a GitHub token to do so.
+
+#### Create a GitHub token
+
+You can create a GitHub token going to your Github account, at this page: [https://github.com/settings/tokens](https://github.com/settings/tokens).
+
+You need to create a token (classic) with the scope `repo/public_repo`. So just check the corresponding checkbox.
+Validity can be long since the scope of this token is limited. You will still be able to delete the token and generate a new one.
+Click on Generate token and save the token locally.
+
+### Provide artifact URL
+
+The script will ask for an artifact URL. You can get this artifact URL by following these steps:
+
+- open the pull request
+- in the check at the bottom, click on `APK Build / Build debug APKs`
+- click on `Summary`
+- scroll to the bottom of the page
+- copy the link `vector-Fdroid-debug` if you want the F-Droid variant or `vector-Gplay-debug` if you want the Gplay variant.
+
+The copied link can be provided to the script.
+
+### Next steps
+
+The script will download the artifact, unzip it and install the correct version (regarding arch) on your device.
+
+Files will be added to the folder `./tmp/DebugApks`. Feel free to cleanup this folder from time to time, the script will not delete files.
+
+### Future improvement
+
+The script could ask the user for a Pull Request number and Gplay/Fdroid choice like it was done with Buildkite script. Using GitHub API may be possible to do that.
diff --git a/docs/jitsi.md b/docs/jitsi.md
index 4dd06effdb..d6c93c49aa 100644
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@@ -93,4 +93,4 @@ url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.
 
 - Build the project and perform the sanity tests again.
 
-- Update the file `/CHANGES.md` to notify about the library upgrade, and create a regular PR for project Element Android.
+- Create a PR for project Element Android and add a changelog file `<PR_NUMBER>.misc` to notify about the library upgrade.
diff --git a/docs/nightly_build.md b/docs/nightly_build.md
index 7750e0466a..77cc676c7f 100644
--- a/docs/nightly_build.md
+++ b/docs/nightly_build.md
@@ -47,7 +47,7 @@ git checkout develop
 mv towncrier.toml towncrier.toml.bak
 sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
 rm towncrier.toml.bak
-yes n | towncrier --version nightly
+yes n | towncrier build --version nightly
 ./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
 ```
 
diff --git a/docs/screenshot_testing.md b/docs/screenshot_testing.md
new file mode 100644
index 0000000000..93b91cdf67
--- /dev/null
+++ b/docs/screenshot_testing.md
@@ -0,0 +1,72 @@
+# Screenshot testing
+
+<!--- TOC -->
+
+* [Overview](#overview)
+* [Setup](#setup)
+* [Recording](#recording)
+* [Verifying](#verifying)
+* [Contributing](#contributing)
+* [Example](#example)
+
+<!--- END -->
+
+## Overview
+
+- Screenshot tests are tests which record the content of a rendered screen and verify subsequent runs to check if the screen renders differently.
+- Element uses [Paparazzi](https://github.com/cashapp/paparazzi) to render, record and verify android layouts. 
+- The screenshot verification occurs on every pull request as part of the `tests.yml` workflow.
+
+## Setup
+
+- Install Git LFS through your package manager of choice (`brew install git-lfs` | `yay -S git-lfs`).
+- Install the Git LFS hooks into the project.
+
+```bash
+# with element-android as the current working directory
+git lfs install --local
+```
+
+- If installed correctly, `git push` and `git pull` will now include LFS content.
+
+## Recording
+
+- `./gradlew recordScreenshots`
+- Paparazzi will generate images in `${module}/src/test/snapshots`, which will need to be committed to the repository using Git LFS.
+
+## Verifying
+
+- `./gradlew verifyScreenshots`
+- In the case of failure, Paparazzi will generate images in `${module}/out/failure`. The images will show the expected and actual screenshots along with a delta of the two images.
+
+## Contributing
+
+- When creating a test, the file (and class) name names must include `ScreenshotTest`, eg `ItemScreenshotTest`.
+- After creating the new test, record and commit the newly rendered screens.
+- `./tools/validate_lfs` can be ran to ensure everything is working correctly with Git LFS, the CI also runs this check.
+
+## Example
+
+```kotlin
+class PaparazziExampleScreenshotTest {
+
+    @get:Rule
+    val paparazzi = Paparazzi(
+            deviceConfig = PIXEL_3,
+            theme = "Theme.Vector.Light",
+    )
+
+    @Test
+    fun `example paparazzi test`() {
+        // Inflate the layout
+        val view = paparazzi.inflate<ConstraintLayout>(R.layout.item_radio)
+
+        // Bind data to the view
+        view.findViewById<TextView>(R.id.actionTitle).text = paparazzi.resources.getString(R.string.room_settings_all_messages)
+        view.findViewById<ImageView>(R.id.radioIcon).setImageResource(R.drawable.ic_radio_on)
+
+        // Record the bound view
+        paparazzi.snapshot(view)
+    }
+}
+```
diff --git a/docs/unifiedpush.md b/docs/unifiedpush.md
index 2851644e66..9f44c6b2f9 100644
--- a/docs/unifiedpush.md
+++ b/docs/unifiedpush.md
@@ -18,7 +18,7 @@ The recently started UnifiedPush project is an Android protocol and library for
 
 The *F-Droid* and *Gplay* flavors of Element Android support UnifiedPush, so the user can use any distributor installed on their devices. This would make it possible to have push notifications without depending on Google services or libraries. Currently, the main distributors are [ntfy](https://ntfy.sh) which does not require any setup (like manual registration) to use the public server and [NextPush](https://github.com/UP-NextPush/android), available as a nextcloud application.
 
-The *Gplay* variant uses a UnifiedPush library which basically embed a FCM distributor built into the application (so a user doesn't need to do anything other than install the app to get FCM notifications). This variant uses Google Services to receive notifications if the user has not installed any distributor.
+The *Gplay* variant uses a UnifiedPush library which basically embed a FCM distributor built into the application (so a user doesn't need to do anything other than install the app to get FCM notifications). This variant uses Google Services to receive notifications if the user has not installed any distributor. A [FCM Rewrite Proxy](https://unifiedpush.org/developers/embedded_fcm/#fcm-rewrite-proxy) is not required for Element Android's implementation of the FCM distributor - it will work with an existing Matrix push provider, such as [Sygnal](https://github.com/matrix-org/sygnal).
 
 The *F-Droid* variant does not use this library to avoid any proprietary blob. It will use a polling service if the user has not installed any distributor.
 
diff --git a/docs/unit_testing.md b/docs/unit_testing.md
new file mode 100644
index 0000000000..95b78c7f5f
--- /dev/null
+++ b/docs/unit_testing.md
@@ -0,0 +1,351 @@
+# Table of Contents
+
+<!--- TOC -->  
+
+* [Overview](#overview)
+  * [Best Practices](#best-practices)
+* [Project Conventions](#project-conventions)
+    * [Setup](#setup)
+    * [Naming](#naming)
+    * [Format](#format)
+    * [Assertions](#assertions)
+    * [Constants](#constants)
+    * [Mocking](#mocking)
+    * [Fakes](#fakes)
+    * [Fixtures](#fixtures)
+  * [Examples](#examples)
+      * [Extensions used to streamline the test setup](#extensions-used-to-streamline-the-test-setup)
+      * [Fakes and Fixtures](#fakes-and-fixtures)
+
+<!--- END -->  
+
+## Overview
+
+Unit tests are a mechanism to validate our code executes the way we expect. They help to inform the design of our systems by requiring testability and
+understanding, they describe the inner workings without relying on inline comments and protect from unexpected regressions.
+
+However, unit tests are not a magical solution to solve all our problems and come at a cost. Unreliable and hard to maintain tests often end up ignored, deleted
+or worse, provide a false sense of security.
+
+### Best Practices
+
+Tests can be written in many ways, the main rule is to keep them simple and maintainable. Some ways to help achieve this are...
+
+- Break out logic into single units (following the Single Responsibility Principle) to reduce test complexity.
+- Favour pure functions, avoiding mutable state.
+- Prefer dependency injection to static calls to allow for simpler test setup.
+- Write concise tests with a single function under test, clearly showing the inputs and expected output.
+- Create separate test cases instead of changing parameters and grouping multiple assertions within a single test to help trace back failure causes (with the
+  exception of parameterised tests).
+- Assert against entire models instead of subsets of properties to capture any possible changes within the test scope.
+- Avoid invoking logic from production instances other than the class under test to guard from unrelated changes.
+- Always inject `Dispatchers` and `Clock` instances and provide fake implementations for tests to avoid non deterministic results.
+
+## Project Conventions
+
+#### Setup
+
+- Test file and class name should be the class under test with the Test suffix, created in a `test` sourceset, with the same package name as the class under
+  test.
+- Dependencies of the class are instantiated inline, junit will recreate the test class for each test run.
+- A line break between the dependencies and class under test helps clarify the instance being tested.
+
+```kotlin
+
+class MyClassTest {
+
+    private val fakeUppercaser = FakeUppercaser()
+
+    // line break between the class under test and its dependencies
+    private val myClass = MyClass(fakeUppercaser.instance)
+}
+
+```  
+
+#### Naming
+
+- Test names use the `Gherkin` format, `given, when, then` mapping to the input, logic under test and expected result.
+    - `given` - Uniqueness about the environment or dependencies in which the test case is running. _"given device is android 12 and supports dark mode"_
+    - `when` - The action/function under test. _"when reading dark mode status"_
+    - `then` - The expected result from the combination of _given_ and _when_. _"then returns dark mode enabled"_
+- Test names are written using kotlin back ticks to enable sentences _ish_.
+
+```kotlin
+@Test
+fun `given a lowercase label, when uppercasing, then returns label uppercased`
+```
+
+When the input is given directly to the _when_, this can also be represented as...
+
+```kotlin
+@Test
+fun `when uppercasing a lowercase label, then returns label uppercased`
+```
+
+Multiple given or returns statements can be used in the name although it could be a sign that the logic being tested does too much.
+
+---
+
+#### Format
+
+- Test bodies are broken into sections through the use of blank lines where the sections correspond to the test name.
+- Sections can span multiple lines.
+
+```kotlin 
+// comments are for illustrative purposes
+/* given */ val lowercaseLabel = "hello world" 
+
+/* when */ val result = textUppercaser.uppercase(lowercaseLabel)
+
+/* then */ result shouldBeEqualTo "HELLO WORLD"
+```
+
+- Functions extracted from test bodies are placed beneath all the unit tests.
+
+---
+
+#### Assertions
+
+- Assertions against test results are made using [Kluent's](https://github.com/MarkusAmshove/Kluent) _fluent_ api.
+- Typically `shouldBeEqualTo`is the main assertion to use for asserting function return values as by project convention we assert against entire objects or
+  lists.
+
+```kotlin
+val result = listOf("hello", "world")
+
+// Fail
+result shouldBeEqualTo listOf("hello")
+```
+
+```kotlin
+data class Person(val age: Int, val name: String)
+
+val result = Person(age = 100, name = "Gandalf")
+
+// Avoid
+result.age shouldBeEqualTo 100
+
+// Prefer
+result shouldBeEqualTo Person(age = 100, "Gandalf")
+```
+
+- Exception throwing can be asserted against using `assertFailsWith<T : Throwable>`.
+- When asserting reusable exceptions, include the message to distinguish between them.
+
+```kotlin
+assertFailsWith<ConcreteException>(message = "Details about error") {
+    // when section of the test
+    codeUnderTest()
+}
+```
+
+---
+
+#### Constants
+
+- Reusable values are extracted to file level immutable properties or constants.
+- These can be parameters or expected results.
+- The naming convention is to prefix with `A` or `AN` for better matching with the test name.
+
+```kotlin
+private const val A_LOWERCASE_LABEL = "hello"
+
+class MyTest {
+    @Test
+    fun `when uppercasing a lowercase label, then returns label uppercased`() {
+        val result = TextUppercaser().uppercase(A_LOWERCASE_LABEL)
+        ...
+    }
+}
+```
+
+---
+
+#### Mocking
+
+- In order to provide different behaviour for dependencies within tests our main method is through mocking, using [Mockk](https://mockk.io/).
+- We avoid using relaxed mocks in favour of explicitly declaring mock behaviour through the _Fake_ convention. There are exceptions when mocking framework
+  classes which would require a lot of boilerplate.
+- Using `Spy` is discouraged as it inherently requires real instances, which we are avoiding in our tests. There are exceptions such as `VectorFeatures` which
+  acts like a `Fixture` in release builds.
+
+---
+
+#### Fakes
+
+- Fakes are reusable instances of classes purely for testing purposes. They provide functions to replace the functions of the interface/class they're faking
+  with test specific values.
+- When faking an interface, the _Fake_ can be written using delegation or by stubbing
+- All Fakes currently reside in the same package `${package}.test.fakes`
+
+```kotlin
+// Delegating to a mock
+class FakeClock : Clock by mockk() {
+    fun givenEpoch(epoch: Long) {
+        every { epochMillis() } returns epoch
+    }
+}
+
+// Stubbing the interface
+class FakeClock(private val epoch: Long) : Clock {
+    override fun epochMillis() = epoch
+}
+```  
+
+It's currently more common for fakes to fake class behaviour, we achieve this by wrapping and exposing a mock instance.
+
+```kotlin
+class FakeCursor {
+    val instance = mockk<Cursor>()
+    fun givenEmpty() {
+        every { instance.count } returns 0
+        every { instance.moveToFirst() } returns false
+    }
+}
+
+val fakeCursor = FakeCursor().apply { givenEmpty() }
+```
+
+#### Fixtures
+
+- Fixtures are a reusable wrappers around data models. They provide default values to make creating instances as easy as possible, with the option to override
+  specific parameters when needed.
+- Are namespaced within an `object`.
+- Reduces the _find usages_ noise when searching for usages of the origin class construction.
+- All Fixtures currently reside in the same package `${package}.test.fixtures`.
+
+```kotlin
+object ContentAttachmentDataFixture {
+    fun aContentAttachmentData(
+            type: ContentAttachmentData.Type.TEXT,
+            mimeType: String? = null
+    ) = ContentAttachmentData(type, mimeType)
+}
+```
+
+- Fixtures can also be used to manage specific combinations of parameters
+
+```kotlin
+fun aContentAttachmentAudioData() = aContentAttachmentData(
+        type = ContentAttachmentData.Type.AUDIO,
+        mimeType = "audio/mp3",
+)
+```
+
+--- 
+
+### Examples
+
+##### Extensions used to streamline the test setup
+
+```kotlin
+class CircularCacheTest {
+
+    @Test
+    fun `when putting more than cache size then cache is limited to cache size`() {
+        val (cache, internalData) = createIntCache(cacheSize = 3)
+
+        cache.putInOrder(1, 1, 1, 1, 1, 1)
+
+        internalData shouldBeEqualTo arrayOf(1, 1, 1)
+    }
+}
+
+private fun createIntCache(cacheSize: Int): Pair<CircularCache<Int>, Array<Int?>> {
+    var internalData: Array<Int?>? = null
+    val factory: (Int) -> Array<Int?> = {
+        Array<Int?>(it) { null }.also { array -> internalData = array }
+    }
+    return CircularCache(cacheSize, factory) to internalData!!
+}
+
+private fun CircularCache<Int>.putInOrder(vararg values: Int) {
+    values.forEach { put(it) }
+}
+```
+
+##### Fakes and Fixtures
+
+```kotlin
+class LateInitUserPropertiesFactoryTest {
+
+    private val fakeActiveSessionDataSource = FakeActiveSessionDataSource()
+    private val fakeVectorStore = FakeVectorStore()
+    private val fakeContext = FakeContext()
+    private val fakeSession = FakeSession().also {
+        it.givenVectorStore(fakeVectorStore.instance)
+    }
+
+    private val lateInitUserProperties = LateInitUserPropertiesFactory(
+            fakeActiveSessionDataSource.instance,
+            fakeContext.instance
+    )
+
+    @Test
+    fun `given no active session, when creating properties, then returns null`() {
+        val result = lateInitUserProperties.createUserProperties()
+
+        result shouldBeEqualTo null
+    }
+
+    @Test
+    fun `given a teams use case set on an active session, when creating properties, then includes the remapped WorkMessaging selection`() {
+        fakeVectorStore.givenUseCase(FtueUseCase.TEAMS)
+        fakeActiveSessionDataSource.setActiveSession(fakeSession)
+
+        val result = lateInitUserProperties.createUserProperties()
+
+        result shouldBeEqualTo UserProperties(
+                ftueUseCaseSelection = UserProperties.FtueUseCaseSelection.WorkMessaging
+        )
+    }
+}
+  ```
+
+##### ViewModel
+
+- `ViewModels` tend to be one of the most complex areas to unit test due to their position as a coordinator of data flows and bridge between domains.
+- As the project uses a slightly tweaked`MvRx`, our API for the `ViewModel` is simplified down to `input - ViewModel.handle(Action)`
+  and `output Flows - ViewModel.viewEvents & ViewModel.stateFlow`. A `ViewModel` test asserter has been created to further simplify the process.
+
+```kotlin
+class ViewModelTest {
+
+    private var initialState = ViewState.Empty
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = UnconfinedTestDispatcher())
+
+    @Test
+    fun `when handling MyAction, then emits Loading and Content states`() {
+        val viewModel = ViewModel<State>(initialState)
+        val test = viewModel.test() // must be invoked before interacting with the VM 
+
+        viewModel.handle(MyAction)
+
+        test
+                .assertViewStates(initialState, State.Loading, State.Content())
+                .assertNoEvents()
+                .finish()
+    }
+}
+```
+
+- `ViewModels` often emit multiple states which are copies of the previous state, the `test` extension `assertStatesChanges` allows only the difference to be
+  supplied.
+
+```kotlin
+data class ViewState(val name: String? = null, val age: Int? = null)
+val initialState = ViewState()
+val viewModel = ViewModel<State>(initialState)
+val test = viewModel.test()
+
+viewModel.handle(ChangeNameAction("Gandalf"))
+
+test
+        .assertStatesChanges(
+                initialState,
+                { copy(name = "Gandalf") },
+        )
+        .finish()
+```
diff --git a/fastlane/metadata/android/az/short_description.txt b/fastlane/metadata/android/az/short_description.txt
new file mode 100644
index 0000000000..ecf3d5008c
--- /dev/null
+++ b/fastlane/metadata/android/az/short_description.txt
@@ -0,0 +1 @@
+Qrup mesajlaşma - şifrəli mesajlaşma, qrup söhbəti və video zənglər
diff --git a/fastlane/metadata/android/az/title.txt b/fastlane/metadata/android/az/title.txt
new file mode 100644
index 0000000000..4ca0ffb55b
--- /dev/null
+++ b/fastlane/metadata/android/az/title.txt
@@ -0,0 +1 @@
+Element - Təhlükəsiz Mesajlaşma
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104300.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104300.txt
new file mode 100644
index 0000000000..e74d892209
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Umožňuje vylepšené přihlašování a registraci.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104310.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104310.txt
new file mode 100644
index 0000000000..e74d892209
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Umožňuje vylepšené přihlašování a registraci.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104320.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104320.txt
new file mode 100644
index 0000000000..578549ce6c
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104340.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104340.txt
new file mode 100644
index 0000000000..578549ce6c
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104360.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104360.txt
new file mode 100644
index 0000000000..fcadf9898c
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Nový vzhled aplikace lze povolit v Experimentálních funkcích. Prosíme, vyzkoušejte ho!
+Oprava problémů s chybějícími oznámeními a dlouhou přírůstkovou synchronizací.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105000.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105000.txt
new file mode 100644
index 0000000000..032fa68e48
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Odložené přímé zprávy jsou ve výchozím nastavení povoleny.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105020.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105020.txt
new file mode 100644
index 0000000000..b2b7ca7675
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Nové rozvržení aplikace je povoleno ve výchozím nastavení!
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105040.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105040.txt
new file mode 100644
index 0000000000..c1bf4fd59a
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Nové funkce v Experimentálních funkcích: Rozšířený editor zpráv, nová správa zařízení, hlasové vysílání. Stále v aktivním vývoji!
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105060.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105060.txt
new file mode 100644
index 0000000000..e966dbbd92
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: nové uživatelské rozhraní pro výběr přílohy.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105070.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105070.txt
new file mode 100644
index 0000000000..e966dbbd92
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: nové uživatelské rozhraní pro výběr přílohy.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105080.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105080.txt
new file mode 100644
index 0000000000..90210199a1
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: opravy různých chyb a vylepšení.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105100.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105100.txt
new file mode 100644
index 0000000000..8c51742e06
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Nová implementace celoobrazovkového režimu pro editor formátovaného textu a opravy chyb.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105110.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105110.txt
new file mode 100644
index 0000000000..8c51742e06
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Nová implementace celoobrazovkového režimu pro editor formátovaného textu a opravy chyb.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105120.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105120.txt
new file mode 100644
index 0000000000..b7f38f629f
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Vlákna jsou nyní ve výchozím nastavení povolena.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105130.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105130.txt
new file mode 100644
index 0000000000..69c2b3304c
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Vlákna jsou nyní povolena ve výchozím nastavení.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105140.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105140.txt
new file mode 100644
index 0000000000..69c2b3304c
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Vlákna jsou nyní povolena ve výchozím nastavení.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40104260.txt b/fastlane/metadata/android/de-DE/changelogs/40104260.txt
new file mode 100644
index 0000000000..0298255dad
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: UnifiedPush wird unterstützt; Dies ermöglicht Push-Benachrichtigungen ohne FCM.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40104270.txt b/fastlane/metadata/android/de-DE/changelogs/40104270.txt
new file mode 100644
index 0000000000..50b5647608
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40104280.txt b/fastlane/metadata/android/de-DE/changelogs/40104280.txt
new file mode 100644
index 0000000000..50b5647608
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40104280.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40104300.txt b/fastlane/metadata/android/de-DE/changelogs/40104300.txt
new file mode 100644
index 0000000000..c906fedd54
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verbessertes Anmelde- und Registrierungserlebnis.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40104310.txt b/fastlane/metadata/android/de-DE/changelogs/40104310.txt
new file mode 100644
index 0000000000..c906fedd54
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verbessertes Anmelde- und Registrierungserlebnis.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40104320.txt b/fastlane/metadata/android/de-DE/changelogs/40104320.txt
new file mode 100644
index 0000000000..50b5647608
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40104340.txt b/fastlane/metadata/android/de-DE/changelogs/40104340.txt
new file mode 100644
index 0000000000..50b5647608
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40104360.txt b/fastlane/metadata/android/de-DE/changelogs/40104360.txt
new file mode 100644
index 0000000000..3c47fa7eb6
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Das neue App-Layout kann in den experimentellen Einstellungen aktiviert werden. Probier es gerne aus!
+Fehler bzgl. ausbleibender Benachrichtigungen und langwierigem inkrementellem Synchronisieren behoben.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105000.txt b/fastlane/metadata/android/de-DE/changelogs/40105000.txt
new file mode 100644
index 0000000000..254c0fe0d8
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Die wichtigste Änderung in dieser Version: Verzögerte Direktnachrichten standardmäßig aktiviert!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105020.txt b/fastlane/metadata/android/de-DE/changelogs/40105020.txt
new file mode 100644
index 0000000000..af7a8d7cce
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Die wichtigste Änderung in dieser Version: Neues App-Layout standardmäßig aktiviert!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105040.txt b/fastlane/metadata/android/de-DE/changelogs/40105040.txt
new file mode 100644
index 0000000000..017e23cd9e
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Die wichtigste Änderung in dieser Version: Neue Funktionen in den Labor-Einstellungen: Textverarbeitungs-Editor, neue Geräteverwaltung, Sprachübertragung. Noch in aktiver Entwicklung!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105060.txt b/fastlane/metadata/android/de-DE/changelogs/40105060.txt
new file mode 100644
index 0000000000..0b36faff1e
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Die wichtigste Änderung in dieser Version: Neues Anhangauswahl-UI.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105070.txt b/fastlane/metadata/android/de-DE/changelogs/40105070.txt
new file mode 100644
index 0000000000..3141cea7cb
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Die wichtigste Änderung in dieser Version: Neue Anhangauswahl-Oberfläche.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105080.txt b/fastlane/metadata/android/de-DE/changelogs/40105080.txt
new file mode 100644
index 0000000000..0422f9cd4f
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Fehlerbehebungen und Verbesserungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105100.txt b/fastlane/metadata/android/de-DE/changelogs/40105100.txt
new file mode 100644
index 0000000000..de5f4d90e8
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Der Vollbildmodus des Textverarbeitungseditors wurde neu umgesetzt und es wurden diverse Fehler behoben.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105110.txt b/fastlane/metadata/android/de-DE/changelogs/40105110.txt
new file mode 100644
index 0000000000..de5f4d90e8
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Der Vollbildmodus des Textverarbeitungseditors wurde neu umgesetzt und es wurden diverse Fehler behoben.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105120.txt b/fastlane/metadata/android/de-DE/changelogs/40105120.txt
new file mode 100644
index 0000000000..901b4c2a70
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Threads sind nun automatisch aktiviert.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105130.txt b/fastlane/metadata/android/de-DE/changelogs/40105130.txt
new file mode 100644
index 0000000000..901b4c2a70
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Threads sind nun automatisch aktiviert.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105140.txt b/fastlane/metadata/android/de-DE/changelogs/40105140.txt
new file mode 100644
index 0000000000..c55d8d998f
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Threads sind nun standardmäßig aktiviert.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
index d27bd3ef12..de571645ee 100644
--- a/fastlane/metadata/android/de-DE/short_description.txt
+++ b/fastlane/metadata/android/de-DE/short_description.txt
@@ -1 +1 @@
-Gruppen-Messenger - verschlüsselte Kommunikation, Gruppenchat und Videoanrufe
+Gruppen-Messenger – verschlüsselte Kommunikation, Gruppen und Videoanrufe
diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
index 6304f37925..edee751d06 100644
--- a/fastlane/metadata/android/de-DE/title.txt
+++ b/fastlane/metadata/android/de-DE/title.txt
@@ -1 +1 @@
-Element - Sicherer Messenger
+Element – Sicher kommunizieren
diff --git a/fastlane/metadata/android/en-US/changelogs/40104340.txt b/fastlane/metadata/android/en-US/changelogs/40104340.txt
new file mode 100644
index 0000000000..61db61727a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40104360.txt b/fastlane/metadata/android/en-US/changelogs/40104360.txt
new file mode 100644
index 0000000000..da03f28760
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+New App Layout can be enabled in the Labs settings. Please give it a try!
+Fix issues about missing notification, and long incremental sync.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105000.txt b/fastlane/metadata/android/en-US/changelogs/40105000.txt
new file mode 100644
index 0000000000..e86519e6e9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Deferred DM enabled by default.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105020.txt b/fastlane/metadata/android/en-US/changelogs/40105020.txt
new file mode 100644
index 0000000000..41795c468c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Main changes in this version: New app layout enabled by default!
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105040.txt b/fastlane/metadata/android/en-US/changelogs/40105040.txt
new file mode 100644
index 0000000000..1073dc57e0
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Main changes in this version: New features under the labs settings: Rich text composer, new device management, voice broadcast. Still under active development!
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105060.txt b/fastlane/metadata/android/en-US/changelogs/40105060.txt
new file mode 100644
index 0000000000..8269f7145c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Main changes in this version: new UI for selecting an attachment.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105070.txt b/fastlane/metadata/android/en-US/changelogs/40105070.txt
new file mode 100644
index 0000000000..8269f7145c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Main changes in this version: new UI for selecting an attachment.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105080.txt b/fastlane/metadata/android/en-US/changelogs/40105080.txt
new file mode 100644
index 0000000000..f9ca8cdd7c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105100.txt b/fastlane/metadata/android/en-US/changelogs/40105100.txt
new file mode 100644
index 0000000000..c9e5ba5fa9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Main changes in this version: New implementation of the full screen mode for the Rich Text Editor and bugfixes.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105110.txt b/fastlane/metadata/android/en-US/changelogs/40105110.txt
new file mode 100644
index 0000000000..c9e5ba5fa9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Main changes in this version: New implementation of the full screen mode for the Rich Text Editor and bugfixes.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105120.txt b/fastlane/metadata/android/en-US/changelogs/40105120.txt
new file mode 100644
index 0000000000..91c25cf053
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Thread are now enabled by default.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105130.txt b/fastlane/metadata/android/en-US/changelogs/40105130.txt
new file mode 100644
index 0000000000..91c25cf053
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Thread are now enabled by default.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105140.txt b/fastlane/metadata/android/en-US/changelogs/40105140.txt
new file mode 100644
index 0000000000..91c25cf053
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Thread are now enabled by default.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105160.txt b/fastlane/metadata/android/en-US/changelogs/40105160.txt
new file mode 100644
index 0000000000..91c25cf053
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105160.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Thread are now enabled by default.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40105180.txt b/fastlane/metadata/android/en-US/changelogs/40105180.txt
new file mode 100644
index 0000000000..91c25cf053
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105180.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Thread are now enabled by default.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104300.txt b/fastlane/metadata/android/et/changelogs/40104300.txt
new file mode 100644
index 0000000000..e01c9b4329
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: senisest parem liitumise ja sisselogimise töövoog.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104310.txt b/fastlane/metadata/android/et/changelogs/40104310.txt
new file mode 100644
index 0000000000..e01c9b4329
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: senisest parem liitumise ja sisselogimise töövoog.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104320.txt b/fastlane/metadata/android/et/changelogs/40104320.txt
new file mode 100644
index 0000000000..1df5ac4176
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104340.txt b/fastlane/metadata/android/et/changelogs/40104340.txt
new file mode 100644
index 0000000000..1df5ac4176
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104360.txt b/fastlane/metadata/android/et/changelogs/40104360.txt
new file mode 100644
index 0000000000..1c2733683d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Testide alt saad sisse lülitada uue kujunduse - palun proovi seda!
+Parandasime teavitustega seotud vigu ning andmete sünkroniseerimist pika viitega.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105000.txt b/fastlane/metadata/android/et/changelogs/40105000.txt
new file mode 100644
index 0000000000..2a031d88ac
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: ajastatud otsesõnumite saatmine on nüüd vaikimisi kasutusel.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105020.txt b/fastlane/metadata/android/et/changelogs/40105020.txt
new file mode 100644
index 0000000000..7a4a6ca253
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: rakenduse uus kujundus on nüüd vaikimisi kasutusel.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105040.txt b/fastlane/metadata/android/et/changelogs/40105040.txt
new file mode 100644
index 0000000000..b1c84cad47
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: Uued võimalused katsete all: vormindatud teksti põhine toimeti, uus seadmehaldus, ringhäälingukõned (kõik on hetkel aktiivsel arendamisel).
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105060.txt b/fastlane/metadata/android/et/changelogs/40105060.txt
new file mode 100644
index 0000000000..d5606e24b3
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: uus liides manuste lisamiseks.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105070.txt b/fastlane/metadata/android/et/changelogs/40105070.txt
new file mode 100644
index 0000000000..061e09814d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: uus liides manuste valimiseks.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105080.txt b/fastlane/metadata/android/et/changelogs/40105080.txt
new file mode 100644
index 0000000000..37b9a2cfe5
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: erinevate vigade parandused ja kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105100.txt b/fastlane/metadata/android/et/changelogs/40105100.txt
new file mode 100644
index 0000000000..f6212db01b
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: tekstitoimeti täisekraanivaade ja erinevate vigade parandused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105110.txt b/fastlane/metadata/android/et/changelogs/40105110.txt
new file mode 100644
index 0000000000..833a567ce2
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: tekstitoimeti täisekraanivaate uus versioon ja erinevate vigade parandused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105120.txt b/fastlane/metadata/android/et/changelogs/40105120.txt
new file mode 100644
index 0000000000..9aadf5dae8
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jutulõngad on vaikimisi kasutusel.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105130.txt b/fastlane/metadata/android/et/changelogs/40105130.txt
new file mode 100644
index 0000000000..c8f1e98c3d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jutulõngad on nüüd vaikimisi kasutusel.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40105140.txt b/fastlane/metadata/android/et/changelogs/40105140.txt
new file mode 100644
index 0000000000..c8f1e98c3d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jutulõngad on nüüd vaikimisi kasutusel.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104300.txt b/fastlane/metadata/android/fa/changelogs/40104300.txt
new file mode 100644
index 0000000000..7a0e87b263
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: به کار انداختن ورود بهبود یافته و سفرهای ورود.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104310.txt b/fastlane/metadata/android/fa/changelogs/40104310.txt
new file mode 100644
index 0000000000..7a0e87b263
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: به کار انداختن ورود بهبود یافته و سفرهای ورود.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104320.txt b/fastlane/metadata/android/fa/changelogs/40104320.txt
new file mode 100644
index 0000000000..29efb95925
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رفع اشکال‌های مختلف و بهبودهای پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104340.txt b/fastlane/metadata/android/fa/changelogs/40104340.txt
new file mode 100644
index 0000000000..29efb95925
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رفع اشکال‌های مختلف و بهبودهای پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104360.txt b/fastlane/metadata/android/fa/changelogs/40104360.txt
new file mode 100644
index 0000000000..be14e1b9e2
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+چینش کارهٔ جدید می‌تواند در تنظیمات آزمایشگاه‌ها به کار بیفتند. لطفاً بیازماییدش!
+رفع مشکلات مربوط به آگاهی غایب و همگام‌سازی تجمعّی طولانی.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105000.txt b/fastlane/metadata/android/fa/changelogs/40105000.txt
new file mode 100644
index 0000000000..605efd76f1
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: پیام‌های مستقیم تعویقی به کار افتاده به صورت پیش‌گزیده!
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105020.txt b/fastlane/metadata/android/fa/changelogs/40105020.txt
new file mode 100644
index 0000000000..f6e193ede5
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: چینش کارهٔ جدید به کار افتاده به صورت پیش‌گزیده!
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105040.txt b/fastlane/metadata/android/fa/changelogs/40105040.txt
new file mode 100644
index 0000000000..a33ad09422
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: قابلیت‌های جدید در تنظیمات آزمایشگاه‌ها: نگارندهٔ متن غنی، مدیریت افزارهٔ جدید، پخش صدا. هنوز زیر توسعهٔ فعّال!
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105060.txt b/fastlane/metadata/android/fa/changelogs/40105060.txt
new file mode 100644
index 0000000000..b677c05c89
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رابط کاربری جدید برای گزینش پیوست.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105070.txt b/fastlane/metadata/android/fa/changelogs/40105070.txt
new file mode 100644
index 0000000000..b677c05c89
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رابط کاربری جدید برای گزینش پیوست.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105080.txt b/fastlane/metadata/android/fa/changelogs/40105080.txt
new file mode 100644
index 0000000000..91385addde
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رفع اشکال‌ها و بهبود.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105100.txt b/fastlane/metadata/android/fa/changelogs/40105100.txt
new file mode 100644
index 0000000000..b6a96e2fe8
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: پیاده‌سازی جدید حالت تمام‌صفحه برای ویرایشگر متن غنی و رفع اشکال‌ها.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105110.txt b/fastlane/metadata/android/fa/changelogs/40105110.txt
new file mode 100644
index 0000000000..b6a96e2fe8
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: پیاده‌سازی جدید حالت تمام‌صفحه برای ویرایشگر متن غنی و رفع اشکال‌ها.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105120.txt b/fastlane/metadata/android/fa/changelogs/40105120.txt
new file mode 100644
index 0000000000..0c3cc5aa31
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رشته‌ها اکنون به صورت پیش‌گزیده به کار افتاده‌اند.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105130.txt b/fastlane/metadata/android/fa/changelogs/40105130.txt
new file mode 100644
index 0000000000..0c3cc5aa31
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رشته‌ها اکنون به صورت پیش‌گزیده به کار افتاده‌اند.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40105140.txt b/fastlane/metadata/android/fa/changelogs/40105140.txt
new file mode 100644
index 0000000000..0c3cc5aa31
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رشته‌ها اکنون به صورت پیش‌گزیده به کار افتاده‌اند.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fi-FI/full_description.txt b/fastlane/metadata/android/fi-FI/full_description.txt
index ac02bc3b42..a1defe8131 100644
--- a/fastlane/metadata/android/fi-FI/full_description.txt
+++ b/fastlane/metadata/android/fi-FI/full_description.txt
@@ -1,4 +1,4 @@
-Element on turvallinen pikaviesti- ja tiimityösovellus joka sopii mainiosti ryhmäkeskusteluihin etätöissä. Sovellus käyttää päästä päähän -salausta ja tarjoaa videoneuvottelun, tiedostojen jakamisen ja äänipuhelut.
+Element on turvallinen pikaviesti- ja tiimityösovellus, joka sopii mainiosti ryhmäkeskusteluihin etätöissä. Sovellus käyttää läpisalausta ja tarjoaa videoneuvottelun, tiedostojen jakamisen ja äänipuhelut.
 
 <b>Elementin ominaisuuksia:</b>
 - Edistyneet viestintätyökalut
@@ -35,5 +35,8 @@ Real end-to-end encryption (only those in the conversation can decrypt messages)
 <b>Kattavaa viestintää ja integraatioita</b>
 Viestit, ääni- ja videopuhelut, tiedostojen jakaminen, näytön jakaminen ja koko joukko integraatioita, botteja ja sovelmia. Luo huoneita ja yhteisöjä, pidä yhteyttä ja hoida asiasi.
 
-<b>Jatka siitä mihin jäit</b>
-Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io
+<b>Jatka siitä, mihin jäit</b>
+Täysin synkronoitu viestihistoria kaikkien laitteidesi välillä ja verkkoselaimessa: https://app.element.io
+
+<b>Avointa lähdekoodia</b>
+Element Android on avoimen lähdekoodin projekti GitHubissa. Ilmoita virheistä ja osallistu kehittämiseen osoitteessa https://github.com/vector-im/element-android
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104300.txt b/fastlane/metadata/android/fr-FR/changelogs/40104300.txt
new file mode 100644
index 0000000000..328e66aaa0
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Activation de l’authentification et du parcours d’inscription améliorés.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104310.txt b/fastlane/metadata/android/fr-FR/changelogs/40104310.txt
new file mode 100644
index 0000000000..328e66aaa0
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Activation de l’authentification et du parcours d’inscription améliorés.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104320.txt b/fastlane/metadata/android/fr-FR/changelogs/40104320.txt
new file mode 100644
index 0000000000..fe61fd021c
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104340.txt b/fastlane/metadata/android/fr-FR/changelogs/40104340.txt
new file mode 100644
index 0000000000..fe61fd021c
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104360.txt b/fastlane/metadata/android/fr-FR/changelogs/40104360.txt
new file mode 100644
index 0000000000..80f59952d1
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+La nouvelle présentation de l’application est disponibles dans les paramètres expérimentaux. Essayez-là !
+Correction de problèmes sur les notifications manquantes, et la synchronisation incrémentale lente.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105000.txt b/fastlane/metadata/android/fr-FR/changelogs/40105000.txt
new file mode 100644
index 0000000000..707cc20fd3
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Création des conversations privées différée activée par défaut.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105020.txt b/fastlane/metadata/android/fr-FR/changelogs/40105020.txt
new file mode 100644
index 0000000000..fec750141c
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Nouvelle disposition de l’application activée par défaut !
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105040.txt b/fastlane/metadata/android/fr-FR/changelogs/40105040.txt
new file mode 100644
index 0000000000..027e2b0252
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Nouvelles fonctionnalités expérimentales : éditeur de texte formaté, nouveau gestionnaire d’appareils, diffusion audio. C’est toujours en cours de développement !
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105060.txt b/fastlane/metadata/android/fr-FR/changelogs/40105060.txt
new file mode 100644
index 0000000000..b33f290d0d
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : nouvelle interface de sélection d’une pièce jointe.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105070.txt b/fastlane/metadata/android/fr-FR/changelogs/40105070.txt
new file mode 100644
index 0000000000..b33f290d0d
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : nouvelle interface de sélection d’une pièce jointe.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105080.txt b/fastlane/metadata/android/fr-FR/changelogs/40105080.txt
new file mode 100644
index 0000000000..d33197c270
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : corrections de bugs et améliorations.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105100.txt b/fastlane/metadata/android/fr-FR/changelogs/40105100.txt
new file mode 100644
index 0000000000..9f0d0823b4
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Nouvelle implémentation du mode plein écran pour l’éditeur de texte formaté, et correction de bogues.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105110.txt b/fastlane/metadata/android/fr-FR/changelogs/40105110.txt
new file mode 100644
index 0000000000..9f0d0823b4
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Nouvelle implémentation du mode plein écran pour l’éditeur de texte formaté, et correction de bogues.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105120.txt b/fastlane/metadata/android/fr-FR/changelogs/40105120.txt
new file mode 100644
index 0000000000..4101bb0c86
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Fils de discussion activés par défaut.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105130.txt b/fastlane/metadata/android/fr-FR/changelogs/40105130.txt
new file mode 100644
index 0000000000..4101bb0c86
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Fils de discussion activés par défaut.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105140.txt b/fastlane/metadata/android/fr-FR/changelogs/40105140.txt
new file mode 100644
index 0000000000..4101bb0c86
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Fils de discussion activés par défaut.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104160.txt b/fastlane/metadata/android/gl-ES/changelogs/40104160.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104160.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104160.txt
diff --git a/fastlane/metadata/android/gl/changelogs/40104180.txt b/fastlane/metadata/android/gl-ES/changelogs/40104180.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104180.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104180.txt
diff --git a/fastlane/metadata/android/gl/changelogs/40104190.txt b/fastlane/metadata/android/gl-ES/changelogs/40104190.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104190.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104190.txt
diff --git a/fastlane/metadata/android/gl/changelogs/40104200.txt b/fastlane/metadata/android/gl-ES/changelogs/40104200.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104200.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104200.txt
diff --git a/fastlane/metadata/android/gl/changelogs/40104220.txt b/fastlane/metadata/android/gl-ES/changelogs/40104220.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104220.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104220.txt
diff --git a/fastlane/metadata/android/gl/changelogs/40104230.txt b/fastlane/metadata/android/gl-ES/changelogs/40104230.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104230.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104230.txt
diff --git a/fastlane/metadata/android/gl/changelogs/40104240.txt b/fastlane/metadata/android/gl-ES/changelogs/40104240.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104240.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104240.txt
diff --git a/fastlane/metadata/android/gl/changelogs/40104250.txt b/fastlane/metadata/android/gl-ES/changelogs/40104250.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104250.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104250.txt
diff --git a/fastlane/metadata/android/gl/changelogs/40104260.txt b/fastlane/metadata/android/gl-ES/changelogs/40104260.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104260.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104260.txt
diff --git a/fastlane/metadata/android/gl/changelogs/40104270.txt b/fastlane/metadata/android/gl-ES/changelogs/40104270.txt
similarity index 100%
rename from fastlane/metadata/android/gl/changelogs/40104270.txt
rename to fastlane/metadata/android/gl-ES/changelogs/40104270.txt
diff --git a/fastlane/metadata/android/gl/full_description.txt b/fastlane/metadata/android/gl-ES/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/gl/full_description.txt
rename to fastlane/metadata/android/gl-ES/full_description.txt
diff --git a/fastlane/metadata/android/gl/short_description.txt b/fastlane/metadata/android/gl-ES/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/gl/short_description.txt
rename to fastlane/metadata/android/gl-ES/short_description.txt
diff --git a/fastlane/metadata/android/gl/title.txt b/fastlane/metadata/android/gl-ES/title.txt
similarity index 100%
rename from fastlane/metadata/android/gl/title.txt
rename to fastlane/metadata/android/gl-ES/title.txt
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104100.txt b/fastlane/metadata/android/hu-HU/changelogs/40104100.txt
new file mode 100644
index 0000000000..97746bdcc6
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Görgetés a hangüzenetben. Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104110.txt b/fastlane/metadata/android/hu-HU/changelogs/40104110.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104120.txt b/fastlane/metadata/android/hu-HU/changelogs/40104120.txt
new file mode 100644
index 0000000000..79df59cf5e
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104120.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a felhasználók számára, hogy offline jelenjenek meg, és audio lejátszót ad hozzá a hangmellékletekhez.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104130.txt b/fastlane/metadata/android/hu-HU/changelogs/40104130.txt
new file mode 100644
index 0000000000..79df59cf5e
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104130.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a felhasználók számára, hogy offline jelenjenek meg, és audio lejátszót ad hozzá a hangmellékletekhez.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104140.txt b/fastlane/metadata/android/hu-HU/changelogs/40104140.txt
new file mode 100644
index 0000000000..2ea8acda97
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: A figyelmen kívül hagyott felhasználók kezelésének javítása. Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104160.txt b/fastlane/metadata/android/hu-HU/changelogs/40104160.txt
new file mode 100644
index 0000000000..d92018adb0
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104160.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: A titkosított üzenetek jobb kezelése. Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104180.txt b/fastlane/metadata/android/hu-HU/changelogs/40104180.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104180.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104190.txt b/fastlane/metadata/android/hu-HU/changelogs/40104190.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104190.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104200.txt b/fastlane/metadata/android/hu-HU/changelogs/40104200.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104200.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104220.txt b/fastlane/metadata/android/hu-HU/changelogs/40104220.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104220.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104230.txt b/fastlane/metadata/android/hu-HU/changelogs/40104230.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104230.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104240.txt b/fastlane/metadata/android/hu-HU/changelogs/40104240.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104240.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104250.txt b/fastlane/metadata/android/hu-HU/changelogs/40104250.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104250.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104260.txt b/fastlane/metadata/android/hu-HU/changelogs/40104260.txt
new file mode 100644
index 0000000000..54d881323f
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: UnifiedPush használata, és lehetővé teszi a felhasználó számára, hogy FCM nélkül tolja.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104270.txt b/fastlane/metadata/android/hu-HU/changelogs/40104270.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104280.txt b/fastlane/metadata/android/hu-HU/changelogs/40104280.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104280.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104300.txt b/fastlane/metadata/android/hu-HU/changelogs/40104300.txt
new file mode 100644
index 0000000000..9882e09368
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a továbbfejlesztett bejelentkezési és regisztrációs utakat.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104310.txt b/fastlane/metadata/android/hu-HU/changelogs/40104310.txt
new file mode 100644
index 0000000000..9882e09368
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a továbbfejlesztett bejelentkezési és regisztrációs utakat.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104320.txt b/fastlane/metadata/android/hu-HU/changelogs/40104320.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104340.txt b/fastlane/metadata/android/hu-HU/changelogs/40104340.txt
new file mode 100644
index 0000000000..25772a8ea1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104360.txt b/fastlane/metadata/android/hu-HU/changelogs/40104360.txt
new file mode 100644
index 0000000000..a63a8d1a83
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Az új alkalmazás megjelenés a Laborokban bekapcsolható. Próbáld ki!
+Hiányzó értesítések és hosszú inkrementális szinkronizáció javítása.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105000.txt b/fastlane/metadata/android/hu-HU/changelogs/40105000.txt
new file mode 100644
index 0000000000..7298a41794
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: A késleltetett DM alapból engedélyezve van.
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105020.txt b/fastlane/metadata/android/hu-HU/changelogs/40105020.txt
new file mode 100644
index 0000000000..1686d93813
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: Új app layout alapból bekapcsolva!
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105040.txt b/fastlane/metadata/android/hu-HU/changelogs/40105040.txt
new file mode 100644
index 0000000000..9821c573de
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: Új funkciók a laboratórium beállítások alatt: Gazdag szöveg kompózer, új eszköz kezelése, hangközvetítés. Még mindig aktív fejlesztés alatt!
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105060.txt b/fastlane/metadata/android/hu-HU/changelogs/40105060.txt
new file mode 100644
index 0000000000..f62af5db6b
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: Új felhasználói felület a mellékletek kiválasztására.
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105070.txt b/fastlane/metadata/android/hu-HU/changelogs/40105070.txt
new file mode 100644
index 0000000000..f62af5db6b
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: Új felhasználói felület a mellékletek kiválasztására.
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105080.txt b/fastlane/metadata/android/hu-HU/changelogs/40105080.txt
new file mode 100644
index 0000000000..de2fe57fe1
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: bugfixek és javítások
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105100.txt b/fastlane/metadata/android/hu-HU/changelogs/40105100.txt
new file mode 100644
index 0000000000..560103b913
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: A teljes képernyős mód új megvalósítása a Rich Text Editor számára és hibajavítások.
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105110.txt b/fastlane/metadata/android/hu-HU/changelogs/40105110.txt
new file mode 100644
index 0000000000..560103b913
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: A teljes képernyős mód új megvalósítása a Rich Text Editor számára és hibajavítások.
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105120.txt b/fastlane/metadata/android/hu-HU/changelogs/40105120.txt
new file mode 100644
index 0000000000..a4e7c9acb9
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: Threadek már alapból engedélyezve vannak.
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105130.txt b/fastlane/metadata/android/hu-HU/changelogs/40105130.txt
new file mode 100644
index 0000000000..a4e7c9acb9
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: Threadek már alapból engedélyezve vannak.
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40105140.txt b/fastlane/metadata/android/hu-HU/changelogs/40105140.txt
new file mode 100644
index 0000000000..a4e7c9acb9
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Legnagyobb változtatás ebben a verzióban: Threadek már alapból engedélyezve vannak.
+Teljes változási napló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104300.txt b/fastlane/metadata/android/id/changelogs/40104300.txt
new file mode 100644
index 0000000000..3d8d13e23d
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Mengaktifkan perjalanan masuk dan keluar yang diperbaiki.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104310.txt b/fastlane/metadata/android/id/changelogs/40104310.txt
new file mode 100644
index 0000000000..3d8d13e23d
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Mengaktifkan perjalanan masuk dan keluar yang diperbaiki.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104320.txt b/fastlane/metadata/android/id/changelogs/40104320.txt
new file mode 100644
index 0000000000..1017951d47
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104340.txt b/fastlane/metadata/android/id/changelogs/40104340.txt
new file mode 100644
index 0000000000..1017951d47
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104360.txt b/fastlane/metadata/android/id/changelogs/40104360.txt
new file mode 100644
index 0000000000..be626f6350
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Tata Letak Aplikasi Baru dapat diaktifkan di pengaturan Uji Coba. Cobalah!
+Perbariki masalah tentang notifikasi hilang, dan penyinkronan inkremental panjang.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105000.txt b/fastlane/metadata/android/id/changelogs/40105000.txt
new file mode 100644
index 0000000000..08e3e78300
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Pesan langsung yang ditangguhkan diaktifkan secara bawaan.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105020.txt b/fastlane/metadata/android/id/changelogs/40105020.txt
new file mode 100644
index 0000000000..736d2c48a6
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Tata letak aplikasi baru diaktifkan secara bawaan!
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105040.txt b/fastlane/metadata/android/id/changelogs/40105040.txt
new file mode 100644
index 0000000000..810af47607
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Fitur baru di belakang pengaturan uji coba: Komposer teks kaya, pengelolaan perangkat baru, siaran suara. Masih dalam pengembangan aktif!
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105060.txt b/fastlane/metadata/android/id/changelogs/40105060.txt
new file mode 100644
index 0000000000..32fb87563e
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Antarmuka baru untuk memilih sebuah lampiran.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105070.txt b/fastlane/metadata/android/id/changelogs/40105070.txt
new file mode 100644
index 0000000000..32fb87563e
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Antarmuka baru untuk memilih sebuah lampiran.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105080.txt b/fastlane/metadata/android/id/changelogs/40105080.txt
new file mode 100644
index 0000000000..8384716bbc
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: perbaikan kutu dan fitur
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105100.txt b/fastlane/metadata/android/id/changelogs/40105100.txt
new file mode 100644
index 0000000000..0c7d2f5262
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Penerapan baru mode layar penuh untuk Penyunting Teks Kaya dan perbaikan kutu.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105110.txt b/fastlane/metadata/android/id/changelogs/40105110.txt
new file mode 100644
index 0000000000..0c7d2f5262
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Penerapan baru mode layar penuh untuk Penyunting Teks Kaya dan perbaikan kutu.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105120.txt b/fastlane/metadata/android/id/changelogs/40105120.txt
new file mode 100644
index 0000000000..173a1bfb1b
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Utasan sekarang diaktifkan secara bawaan.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105130.txt b/fastlane/metadata/android/id/changelogs/40105130.txt
new file mode 100644
index 0000000000..173a1bfb1b
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Utasan sekarang diaktifkan secara bawaan.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40105140.txt b/fastlane/metadata/android/id/changelogs/40105140.txt
new file mode 100644
index 0000000000..173a1bfb1b
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Utasan sekarang diaktifkan secara bawaan.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/full_description.txt b/fastlane/metadata/android/id/full_description.txt
index d3bed0bf6b..79baa1f9ac 100644
--- a/fastlane/metadata/android/id/full_description.txt
+++ b/fastlane/metadata/android/id/full_description.txt
@@ -1,42 +1,42 @@
-Element adalah perpesanan yang aman dan aplikasi kolaborasi tim produktivitas yang ideal untuk obrolan grup saat bekerja jarak jauh. Aplikasi perpesanan ini menggunakan enkripsi ujung-ke-ujung untuk memberikan konferensi video, pembagian file, dan panggilan suara yang aman.
+Element adalah perpesanan yang aman dan aplikasi kolaborasi tim produktivitas yang ideal untuk obrolan grup saat bekerja jarak jauh. Aplikasi perpesanan ini menggunakan enkripsi ujung ke ujung untuk menyediakan konferensi video, pembagian berkas, dan panggilan suara yang aman.
 
-<b>Fitur Element termasuk</b>
-- Alat komunikasi online yang canggih
+<b>Fitur Element termasuk:</b>
+- Alat komunikasi daring yang canggih
 - Pesan-pesan yang dienkripsi sepenuhnya untuk memungkinkan komunikasi perusahaan yang lebih aman, bahkan untuk pekerja jarak jauh
-- Obrolan terdesentralisasi berdasarkan kerangka Matrix yang sumber terbuka
-- Pembagian file aman dengan data terenkripsi saat mengelola proyek
+- Obrolan terdesentralisasi berdasarkan kerangka kerja Matrix yang sumber terbuka
+- Pembagian berkas aman dengan data terenkripsi saat mengelola proyek
 - Obrolan video dengan VoIP dan pembagian layar
-- Integrasi yang mudah dengan alat kolaborasi online favorit Anda, alat manajemen proyek, layanan VoIP dan aplikasi perpesanan tim lainnya
+- Integrasi yang mudah dengan alat kolaborasi daring favorit Anda, alat pengelola proyek, layanan VoIP dan aplikasi perpesanan tim lainnya
 
-Element benar-benar berbeda dari aplikasi perpesanan dan aplikasi kolaborasi lainnya. Element beroperasi pada Matrix, jaringan terbuka untuk pengiriman pesan yang aman dan komunikasi terdesentralisasi.
+Element benar-benar berbeda dari aplikasi perpesanan dan aplikasi kolaborasi lainnya. Element beroperasi pada Matrix, jaringan terbuka untuk pengiriman pesan yang aman dan komunikasi yang terdesentralisasi.
 
 <b>Perpesanan dengan privasi dan enkripsi</b>
-Element melindungi Anda dari iklan yang tidak diinginkan, penambangan data dan taman berdinding. Element juga mengamankan semua data Anda, komunikasi video dan suara satu-ke-satu dengan enkripsi ujung-ke-ujung dan verifikasi perangkat menggunakan penandatanganan silang.
+Element melindungi Anda dari iklan yang tidak diinginkan, penambangan data, dan taman berdinding. Element juga mengamankan semua data Anda, komunikasi video dan suara satu-ke-satu dengan enkripsi ujung ke ujung, dan verifikasi perangkat menggunakan penandatanganan silang.
 
-Element memberikan Anda kendali atas privasi Anda sambil memungkinkan Anda untuk berkomunikasi dengan siapa saja secara aman di jaringan Matrix, atau alat kolaborasi bisnis lainnya dengan mengintegrasikan aplikasi-aplikasi seperti Slack.
+Element memberikan Anda kendali atas privasi Anda sambil memungkinkan Anda untuk berkomunikasi dengan siapa saja secara aman di jaringan Matrix, atau alat kolaborasi bisnis lainnya dengan mengintegrasikan aplikasi seperti Slack.
 
-<b>Element dapat dihost sendiri</b>
-Untuk memungkinkan lebih banyak kendali atas data dan pesan-pesan sensitif Anda, Element dapat dihost sendiri atau Anda dapat memilih host berbasis Matrix, standar untuk komunikasi terdesentralisasi sumber terbuka. Element memberi Anda privasi, kepatuhan keamanan, dan fleksibilitas integrasi.
+<b>Element dapat di-host sendiri</b>
+Untuk memungkinkan lebih banyak kendali atas data dan pesan-pesan sensitif Anda, Element dapat dilayani sendiri atau Anda dapat memilih layanan berbasis Matrix, standar untuk komunikasi terdesentralisasi sumber terbuka. Element memberikan Anda privasi, kepatuhan keamanan, dan fleksibilitas integrasi.
 
 <b>Miliki data Anda</b>
 Anda memutuskan di mana untuk menyimpan data dan pesan-pesan Anda, tanpa risiko penambangan data atau akses dari pihak ketiga.
 
 Element menempatkan Anda dalam kendali dengan cara yang berbeda:
-1. Dapatkan akun gratis pada server publik matrix.org yang dihost oleh pengembang Matrix, atau memilih dari ribuan server publik yang dihost oleh sukarelawan
-2. Host sendiri akun Anda dengan menjalankan server pada infrastruktur IT Anda sendiri
+1. Dapatkan akun gratis pada server publik matrix.org yang dilayani oleh pengembang Matrix, atau memilih dari ribuan server publik yang dilayani oleh sukarelawan
+2. Layani akun Anda sendiri dengan menjalankan server pada infrastruktur IT Anda sendiri
 3. Daftar untuk akun di server khusus dengan berlangganan platform hosting Layanan Matrix Element
 
 <b>Perpesanan dan kolaborasi terbuka</b>
-Anda dapat mengobrol dengan siapa saja di jaringan Matrix, jika mereka menggunakan Element, aplikasi Matrix lain atau bahkan menggunakan aplikasi perpesanan yang berbeda.
+Anda dapat mengobrol dengan siapa saja di jaringan Matrix, jika mereka menggunakan Element, aplikasi Matrix lain, atau bahkan menggunakan aplikasi perpesanan yang berbeda.
 
 <b>Sangat aman</b>
-Enkripsi ujung-ke-ujung yang nyata (hanya mereka yang dalam obrolan dapat mendekripsi pesan), dan verifikasi perangkat menggunakan penandatanganan silang.
+Enkripsi ujung ke ujung yang nyata (hanya mereka yang di dalam obrolan dapat mendekripsikan pesan), dan verifikasi perangkat menggunakan penandatanganan silang.
 
 <b>Komunikasi dan integrasi lengkap</b>
-Perpesanan, panggilan suara dan video, pembagian file, pembagian layar dan banyak integrasi bot dan widget. Buat ruangan dan komunitas, tetap terhubung dan selesaikan hal-hal penting.
+Perpesanan, panggilan suara dan video, pembagian berkas, pembagian layar dan banyak integrasi bot dan widget. Buat ruangan dan komunitas, tetap terhubung, dan selesaikan hal-hal penting.
 
 <b>Ambil di mana Anda tinggalkan</b>
-Tetap terhubung di mana Anda berada, dengan riwayat pesan yang disinkronkan di semua perangkat Anda dan web di https://app.element.io
+Tetap terhubung di mana Anda berada, dengan riwayat pesan yang disinkronkan pada semua perangkat Anda dan pada web di https://app.element.io
 
 <b>Sumber terbuka</b>
-Element Android adalah proyek sumber terbuka, dihost oleh GitHub. Silakan laporkan masalah yang Anda temukan, atau membuat kontribusi ke pengembangannya di https://github.com/vector-im/element-android
+Element Android adalah proyek sumber terbuka, dilayani oleh GitHub. Silakan laporkan masalah yang Anda temukan, atau membuat kontribusi ke pengembangannya di https://github.com/vector-im/element-android
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104300.txt b/fastlane/metadata/android/it-IT/changelogs/40104300.txt
new file mode 100644
index 0000000000..40d9618137
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: introduce i percorsi migliorati di accesso e registrazione.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104310.txt b/fastlane/metadata/android/it-IT/changelogs/40104310.txt
new file mode 100644
index 0000000000..40d9618137
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: introduce i percorsi migliorati di accesso e registrazione.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104320.txt b/fastlane/metadata/android/it-IT/changelogs/40104320.txt
new file mode 100644
index 0000000000..556a6fc7ea
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104340.txt b/fastlane/metadata/android/it-IT/changelogs/40104340.txt
new file mode 100644
index 0000000000..556a6fc7ea
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104360.txt b/fastlane/metadata/android/it-IT/changelogs/40104360.txt
new file mode 100644
index 0000000000..c6749d3ff7
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Nuova disposizione dell'app attivabile nelle impostazioni Laboratori. Provala!
+Corretti problemi su notifiche mancanti e sincronizzazioni incrementali lunghe.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105000.txt b/fastlane/metadata/android/it-IT/changelogs/40105000.txt
new file mode 100644
index 0000000000..9132fea7b9
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: messaggi diretti differiti attivati in modo predefinito.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105020.txt b/fastlane/metadata/android/it-IT/changelogs/40105020.txt
new file mode 100644
index 0000000000..accee9e36d
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: nuova interfaccia dell'app attivata in modo predefinito!
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105040.txt b/fastlane/metadata/android/it-IT/changelogs/40105040.txt
new file mode 100644
index 0000000000..1e69c7436e
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: nuove funzioni nelle impostazioni Laboratori: compositore in rich text, nuova gestione dispositivi, trasmissione voce. Ancora in sviluppo attivo!
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105060.txt b/fastlane/metadata/android/it-IT/changelogs/40105060.txt
new file mode 100644
index 0000000000..34d299b774
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: nuova interfaccia utente per selezionare un allegato!
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105070.txt b/fastlane/metadata/android/it-IT/changelogs/40105070.txt
new file mode 100644
index 0000000000..ec4d944d72
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: nuova interfaccia utente per selezionare un allegato.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105080.txt b/fastlane/metadata/android/it-IT/changelogs/40105080.txt
new file mode 100644
index 0000000000..a3d49ca1b7
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: correzione di errori e miglioramenti.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105100.txt b/fastlane/metadata/android/it-IT/changelogs/40105100.txt
new file mode 100644
index 0000000000..7dc50eab33
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: nuova implementazione della modalità a schermo intero per l'editor in Rich Text e correzione di errori.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105110.txt b/fastlane/metadata/android/it-IT/changelogs/40105110.txt
new file mode 100644
index 0000000000..7dc50eab33
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: nuova implementazione della modalità a schermo intero per l'editor in Rich Text e correzione di errori.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105120.txt b/fastlane/metadata/android/it-IT/changelogs/40105120.txt
new file mode 100644
index 0000000000..ab24842e82
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: i messaggi in conversazioni sono attivi in modo predefinito.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105130.txt b/fastlane/metadata/android/it-IT/changelogs/40105130.txt
new file mode 100644
index 0000000000..ab24842e82
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: i messaggi in conversazioni sono attivi in modo predefinito.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40105140.txt b/fastlane/metadata/android/it-IT/changelogs/40105140.txt
new file mode 100644
index 0000000000..ab24842e82
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: i messaggi in conversazioni sono attivi in modo predefinito.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/lt/full_description.txt b/fastlane/metadata/android/lt/full_description.txt
new file mode 100644
index 0000000000..7189008456
--- /dev/null
+++ b/fastlane/metadata/android/lt/full_description.txt
@@ -0,0 +1,42 @@
+Element yra ir saugaus žinučių siuntimo, ir produktyvaus komandinio bendradarbiavimo programėlė, puikiai tinkanti grupiniams pokalbiams dirbant nuotoliniu būdu. Ši pokalbių programa naudoja visapusį šifravimą, kad užtikrintų galingas vaizdo konferencijas, dalijimąsi failais ir balso skambučius.
+
+<b>Element funkcijos turi:</b>
+- Išplėstinės bendravimo internetu priemonės
+- Visiškai užšifruotos žinutės, kad būtų galima saugiau bendrauti su įmone, net ir su nuotoliniais darbuotojais
+- Decentralizuoti pokalbiai, pagrįsti atvirojo kodo sistema Matrix
+- Saugus dalijimasis failais su šifruotais duomenimis valdant projektus
+- Vaizdo pokalbiai su IP balso perdavimu ir ekrano bendrinimu
+- Lengva integracija su mėgstamiausiomis internetinėmis bendradarbiavimo priemonėmis, projektų valdymo įrankiais, VoIP paslaugomis ir kitomis komandinių pokalbių programomis
+
+Element visiškai skiriasi nuo kitų žinučių siuntimo ir bendradarbiavimo programėlių. Ji veikia Matrix - atvirame tinkle, skirtame saugiam žinučių siuntimui ir decentralizuotam bendravimui. Jame galima savarankiškai talpinti duomenis ir žinutes savo serveryje, kad naudotojai galėtų maksimaliai valdyti ir kontroliuoti savo duomenis ir žinutes.
+
+<b>Privatumas ir šifruotos žinutės</b>
+Element apsaugo jus nuo nepageidaujamų reklamų, duomenų gavybos ir uždarų sodų. Jis taip pat apsaugo visus jūsų duomenis, "vienas su vienu" vaizdo ir balso ryšį, naudodamas visapusį šifravimą ir kryžmiškai pasirašytą įrenginių patvirtinimą.
+
+Element suteikia galimybę kontroliuoti savo privatumą ir kartu saugiai bendrauti su visais, esančiais Matrix tinkle, arba kitais verslo bendradarbiavimo įrankiais integruojantis su tokiomis programėlėmis kaip Slack.
+
+<b>Element gali būti savarankiškai talpinamas</b>
+Kad galėtumėte geriau kontroliuoti savo slaptus duomenis ir pokalbius, Element gali būti savarankiškai talpinamas arba galite pasirinkti bet kurį Matrix pagrindu veikiantį serverį - atvirojo kodo decentralizuoto bendravimo standartu. Element suteikia privatumą, saugumo atititikimą ir integracijos lankstumą.
+
+<b>Jūsų duomenys priklauso jums</b>
+Jūs nusprendžiate, kur laikyti savo duomenis ir žinutes. Be duomenų gavybos ar trečiųjų šalių prieigos rizikos.
+
+Element suteikia jums kontrolę įvairiais būdais:
+1. Gaukite nemokamą paskyrą viešajame serveryje matrix.org, kurį talpina Matrix kūrėjai, arba rinkitės iš tūkstančių viešųjų serverių, kurių talpinimą teikia savanoriai
+2. Savarankiškai talpinkite savo paskyrą, naudodami serverį savo IT infrastruktūroje
+3. Užsisakykite paskyrą nuosavame serveryje tiesiog užsisakydami "Element Matrix Services" talpinimo paslaugą
+
+<b>Atviras žinučių siuntimas ir bendradarbiavimas</b>
+Galite bendrauti su bet kuriuo Matrix tinklo nariu, nesvarbu, ar jis naudojasi Element, kita Matrix programėle, ar net jei naudoja kitą žinučių siuntimo programėlę.
+
+<b>Super saugus</b>
+Tikras visapusis šifravimas (žinutes gali iššifruoti tik pokalbio dalyviai) ir kryžminiu parašu patvirtintas įrenginių patvirtinimas.
+
+<b>Pilnas bendravimas ir integracija</b>
+Žinučių siuntimas, balso ir vaizdo skambučiai, failų ir ekrano bendrinimas ir daugybė integracijų, robotų ir valdiklių. Kurkite kambarius, bendruomenes, palaikykite ryšį ir atlikite darbus.
+
+<b>Tęskite darbą ten, kur baigėte</b>
+Palaikykite ryšį, kad ir kur būtumėte, naudodami visiškai sinchronizuotą žinučių istoriją visuose įrenginiuose ir internete adresu https://app.element.io
+
+<b>Atviras kodas</b>
+Element Android yra atvirojo kodo projektas, kurį talpina GitHub. Praneškite apie klaidas ir (arba) prisidėkite prie jo kūrimo adresu https://github.com/vector-im/element-android
diff --git a/fastlane/metadata/android/lt/short_description.txt b/fastlane/metadata/android/lt/short_description.txt
new file mode 100644
index 0000000000..600e76b35d
--- /dev/null
+++ b/fastlane/metadata/android/lt/short_description.txt
@@ -0,0 +1 @@
+Grupiniai pokalbiai - šifruotos žinutės ir vaizdo skambučiai
diff --git a/fastlane/metadata/android/lt/title.txt b/fastlane/metadata/android/lt/title.txt
new file mode 100644
index 0000000000..d911c34bb2
--- /dev/null
+++ b/fastlane/metadata/android/lt/title.txt
@@ -0,0 +1 @@
+Element - Saugūs pokalbiai
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104180.txt b/fastlane/metadata/android/nl-NL/changelogs/40104180.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104180.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104190.txt b/fastlane/metadata/android/nl-NL/changelogs/40104190.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104190.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104200.txt b/fastlane/metadata/android/nl-NL/changelogs/40104200.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104200.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104220.txt b/fastlane/metadata/android/nl-NL/changelogs/40104220.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104220.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104230.txt b/fastlane/metadata/android/nl-NL/changelogs/40104230.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104230.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104240.txt b/fastlane/metadata/android/nl-NL/changelogs/40104240.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104240.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104250.txt b/fastlane/metadata/android/nl-NL/changelogs/40104250.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104250.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104270.txt b/fastlane/metadata/android/nl-NL/changelogs/40104270.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104280.txt b/fastlane/metadata/android/nl-NL/changelogs/40104280.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104280.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104320.txt b/fastlane/metadata/android/nl-NL/changelogs/40104320.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/nl-NL/changelogs/40104340.txt b/fastlane/metadata/android/nl-NL/changelogs/40104340.txt
new file mode 100644
index 0000000000..48796d85bc
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Belangrijkste veranderingen in deze versie: Verscheidene foutoplossingen en stabiliteitsverbeteringen.
+Volledige lijst met veranderingen: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40100100.txt b/fastlane/metadata/android/pl-PL/changelogs/40100100.txt
new file mode 100644
index 0000000000..7960e8a961
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40100100.txt
@@ -0,0 +1,2 @@
+Ta nowa wersja zawiera głównie poprawki błędów i ulepszenia. Wysyłanie wiadomości jest teraz znacznie szybsze.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.0.10
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40100110.txt b/fastlane/metadata/android/pl-PL/changelogs/40100110.txt
new file mode 100644
index 0000000000..ce95f4ab46
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40100110.txt
@@ -0,0 +1,2 @@
+Ta nowa wersja zawiera głównie ulepszenia interfejsu i doświadczenia użytkownika. Teraz możesz zapraszać znajomych i bardzo szybko tworzyć bezpośrednie rozmowy, skanując kody QR.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40100120.txt b/fastlane/metadata/android/pl-PL/changelogs/40100120.txt
new file mode 100644
index 0000000000..5b79301d97
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40100120.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Podgląd URL, nowa klawiatura Emoji, nowe możliwości ustawień pokoju i śnieg na Boże Narodzenie!
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40100130.txt b/fastlane/metadata/android/pl-PL/changelogs/40100130.txt
new file mode 100644
index 0000000000..6a8f3ac662
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40100130.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Podgląd URL, nowa klawiatura Emoji, nowe możliwości ustawień pokoju i śnieg na Boże Narodzenie!
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40100140.txt b/fastlane/metadata/android/pl-PL/changelogs/40100140.txt
new file mode 100644
index 0000000000..084f75dbf7
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Edytuj uprawnienia do pokoju, automatyczny jasny/ciemny motyw i kilka poprawek błędów.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40100150.txt b/fastlane/metadata/android/pl-PL/changelogs/40100150.txt
new file mode 100644
index 0000000000..f2cb216b06
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Obsługa logowania społecznościowego.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40100160.txt b/fastlane/metadata/android/pl-PL/changelogs/40100160.txt
new file mode 100644
index 0000000000..354d794070
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Obsługa logowania społecznościowego.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.0.15 i https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104300.txt b/fastlane/metadata/android/pl-PL/changelogs/40104300.txt
new file mode 100644
index 0000000000..d50c5a3f0e
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Włącza ulepszone podróże w logowaniu i przy rejestracji.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104310.txt b/fastlane/metadata/android/pl-PL/changelogs/40104310.txt
new file mode 100644
index 0000000000..d50c5a3f0e
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Włącza ulepszone podróże w logowaniu i przy rejestracji.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104320.txt b/fastlane/metadata/android/pl-PL/changelogs/40104320.txt
new file mode 100644
index 0000000000..005f2d2b71
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Różne poprawki błędów i ulepszenia stabilności.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104340.txt b/fastlane/metadata/android/pl-PL/changelogs/40104340.txt
new file mode 100644
index 0000000000..e175a61725
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Rozmaite poprawki błędów i usprawnienia stabilności.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104300.txt b/fastlane/metadata/android/pt-BR/changelogs/40104300.txt
new file mode 100644
index 0000000000..5f1aaf4b3d
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Habilita as jornadas melhoradas de sign in e sign up.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104310.txt b/fastlane/metadata/android/pt-BR/changelogs/40104310.txt
new file mode 100644
index 0000000000..5f1aaf4b3d
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Habilita as jornadas melhoradas de sign in e sign up.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104320.txt b/fastlane/metadata/android/pt-BR/changelogs/40104320.txt
new file mode 100644
index 0000000000..6e11e92579
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104340.txt b/fastlane/metadata/android/pt-BR/changelogs/40104340.txt
new file mode 100644
index 0000000000..6e11e92579
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104360.txt b/fastlane/metadata/android/pt-BR/changelogs/40104360.txt
new file mode 100644
index 0000000000..78a879ccb7
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Novo Layout de App poder ser habilitado nas configurações de Labs. Por favor dê uma chance!
+Consertar problemas sobre notificação faltando, e sinc incremental longo.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105000.txt b/fastlane/metadata/android/pt-BR/changelogs/40105000.txt
new file mode 100644
index 0000000000..d8f3a953a3
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: DM diferida habilitada por default.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105020.txt b/fastlane/metadata/android/pt-BR/changelogs/40105020.txt
new file mode 100644
index 0000000000..d7cca674fa
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Novo layout de app habilitado por default!
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105040.txt b/fastlane/metadata/android/pt-BR/changelogs/40105040.txt
new file mode 100644
index 0000000000..99d6971bf3
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Novas funcionalidades sob as configurações de labs: Compositor de texto rico, novo gerenciador de dispositivo, broadcast de voz. Ainda sob desenvolvimento ativo!
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105060.txt b/fastlane/metadata/android/pt-BR/changelogs/40105060.txt
new file mode 100644
index 0000000000..108a8a88b4
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: novo UI para selecionar um anexo.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105070.txt b/fastlane/metadata/android/pt-BR/changelogs/40105070.txt
new file mode 100644
index 0000000000..108a8a88b4
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: novo UI para selecionar um anexo.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105080.txt b/fastlane/metadata/android/pt-BR/changelogs/40105080.txt
new file mode 100644
index 0000000000..6e85b9ba6a
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: consertos de bugs e melhorias.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105100.txt b/fastlane/metadata/android/pt-BR/changelogs/40105100.txt
new file mode 100644
index 0000000000..c03bb2b140
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Nova implementação do modo de tela cheia para o Editor de Texto Rico e consertos de bugs.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105110.txt b/fastlane/metadata/android/pt-BR/changelogs/40105110.txt
new file mode 100644
index 0000000000..c03bb2b140
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Nova implementação do modo de tela cheia para o Editor de Texto Rico e consertos de bugs.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105120.txt b/fastlane/metadata/android/pt-BR/changelogs/40105120.txt
new file mode 100644
index 0000000000..0e5e1a9401
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Threads são agora habilitadas por padrão.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105130.txt b/fastlane/metadata/android/pt-BR/changelogs/40105130.txt
new file mode 100644
index 0000000000..0e5e1a9401
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Threads são agora habilitadas por padrão.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105140.txt b/fastlane/metadata/android/pt-BR/changelogs/40105140.txt
new file mode 100644
index 0000000000..0e5e1a9401
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Threads são agora habilitadas por padrão.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104260.txt b/fastlane/metadata/android/ru-RU/changelogs/40104260.txt
new file mode 100644
index 0000000000..b023e07b3d
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Использование UnifiedPush и разрешение пользователям получать push-оповещения без FCM.
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104270.txt b/fastlane/metadata/android/ru-RU/changelogs/40104270.txt
new file mode 100644
index 0000000000..ff4e5cdf15
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Исправления различных багов и улучшения стабильности работы.
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104280.txt b/fastlane/metadata/android/ru-RU/changelogs/40104280.txt
new file mode 100644
index 0000000000..ff4e5cdf15
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104280.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Исправления различных багов и улучшения стабильности работы.
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104300.txt b/fastlane/metadata/android/ru-RU/changelogs/40104300.txt
new file mode 100644
index 0000000000..aec45e0348
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Улучшены вход и регистрация
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104310.txt b/fastlane/metadata/android/ru-RU/changelogs/40104310.txt
new file mode 100644
index 0000000000..aec45e0348
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Улучшены вход и регистрация
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104320.txt b/fastlane/metadata/android/ru-RU/changelogs/40104320.txt
new file mode 100644
index 0000000000..d6c614f22b
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Исправления различных багов и улучшения стабильности работы
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104340.txt b/fastlane/metadata/android/ru-RU/changelogs/40104340.txt
new file mode 100644
index 0000000000..63da187fe9
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: различные исправления ошибок и улучшения стабильности.
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104360.txt b/fastlane/metadata/android/ru-RU/changelogs/40104360.txt
new file mode 100644
index 0000000000..208233d92e
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Новый вид приложения можно включить в настройках лаборатории. Пожалуйста, попробуйте!
+Исправлены проблемы, связанные с отсутствием уведомлений и длительной инкрементной синхронизацией.
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105000.txt b/fastlane/metadata/android/ru-RU/changelogs/40105000.txt
new file mode 100644
index 0000000000..93ea0aff68
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: отложённые личные сообщения включены по умолчанию
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105020.txt b/fastlane/metadata/android/ru-RU/changelogs/40105020.txt
new file mode 100644
index 0000000000..83bf3c747b
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: новый вид приложения включён по умолчанию!
+Весь список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105040.txt b/fastlane/metadata/android/ru-RU/changelogs/40105040.txt
new file mode 100644
index 0000000000..c923750bc4
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии — новые возможности в настройках лаборатории: наглядный текстовый редактор, новое управление устройствами, голосовая трансляция. Всё это ещё находится в активной разработке!
+Весь список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105060.txt b/fastlane/metadata/android/ru-RU/changelogs/40105060.txt
new file mode 100644
index 0000000000..234d265dd8
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: новый интерфейс для выбора прикреплённых файлов
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105070.txt b/fastlane/metadata/android/ru-RU/changelogs/40105070.txt
new file mode 100644
index 0000000000..234d265dd8
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: новый интерфейс для выбора прикреплённых файлов
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105080.txt b/fastlane/metadata/android/ru-RU/changelogs/40105080.txt
new file mode 100644
index 0000000000..42f8b2263d
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Главные изменения в этой версии: исправления ошибок и улучшения.
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105100.txt b/fastlane/metadata/android/ru-RU/changelogs/40105100.txt
new file mode 100644
index 0000000000..14fb635403
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Главные изменения в этой версии: Новая имплементация полноэкранного режима для расширенного режима текстового редактора и исправления ошибок.
+Полный список всех изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105120.txt b/fastlane/metadata/android/ru-RU/changelogs/40105120.txt
new file mode 100644
index 0000000000..047e0254ae
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Обсуждения теперь включены по умолчанию.
+Перечень всех изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105130.txt b/fastlane/metadata/android/ru-RU/changelogs/40105130.txt
new file mode 100644
index 0000000000..047e0254ae
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Обсуждения теперь включены по умолчанию.
+Перечень всех изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104300.txt b/fastlane/metadata/android/sk/changelogs/40104300.txt
new file mode 100644
index 0000000000..dd0f554532
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Umožňuje vylepšené postupy prihlasovania a registrácie.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104310.txt b/fastlane/metadata/android/sk/changelogs/40104310.txt
new file mode 100644
index 0000000000..dd0f554532
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Umožňuje vylepšené postupy prihlasovania a registrácie.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104320.txt b/fastlane/metadata/android/sk/changelogs/40104320.txt
new file mode 100644
index 0000000000..50670f18c2
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104340.txt b/fastlane/metadata/android/sk/changelogs/40104340.txt
new file mode 100644
index 0000000000..50670f18c2
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104360.txt b/fastlane/metadata/android/sk/changelogs/40104360.txt
new file mode 100644
index 0000000000..af4154b5cf
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Nové usporiadanie aplikácie môžete povoliť v nastaveniach laboratórií. Vyskúšajte to!
+Oprava problémov týkajúcich sa chýbajúcich oznámení a dlhej inkrementálnej synchronizácie.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105000.txt b/fastlane/metadata/android/sk/changelogs/40105000.txt
new file mode 100644
index 0000000000..9f48366456
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Oneskorené priame správy sú zapnuté ako predvolené.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105020.txt b/fastlane/metadata/android/sk/changelogs/40105020.txt
new file mode 100644
index 0000000000..ceec087a30
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Nové rozvrhnutie aplikácie je zapnuté ako predvolené!
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105040.txt b/fastlane/metadata/android/sk/changelogs/40105040.txt
new file mode 100644
index 0000000000..75d4196fbf
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Nové funkcie v rámci laboratórnych nastavení: Rozšírený textový editor, nová správa zariadení, hlasové vysielanie. Stále prebieha aktívny vývoj!
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105060.txt b/fastlane/metadata/android/sk/changelogs/40105060.txt
new file mode 100644
index 0000000000..0d1d4965ca
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: nové používateľské rozhranie na výber príloh.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105070.txt b/fastlane/metadata/android/sk/changelogs/40105070.txt
new file mode 100644
index 0000000000..0d1d4965ca
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: nové používateľské rozhranie na výber príloh.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105080.txt b/fastlane/metadata/android/sk/changelogs/40105080.txt
new file mode 100644
index 0000000000..56daa3b4b7
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: opravy chýb a vylepšenia.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105100.txt b/fastlane/metadata/android/sk/changelogs/40105100.txt
new file mode 100644
index 0000000000..c286f155d4
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Nová implementácia celo-obrazovkového režimu pre Rozšírený textový editor a opravy chýb.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105110.txt b/fastlane/metadata/android/sk/changelogs/40105110.txt
new file mode 100644
index 0000000000..af32da6d29
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Nová implementácia režimu celej obrazovky pre rozšírený textový editor a opravy chýb.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105120.txt b/fastlane/metadata/android/sk/changelogs/40105120.txt
new file mode 100644
index 0000000000..d5b5ad330d
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Vlákna sú teraz predvolene zapnuté.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105130.txt b/fastlane/metadata/android/sk/changelogs/40105130.txt
new file mode 100644
index 0000000000..d5b5ad330d
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Vlákna sú teraz predvolene zapnuté.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40105140.txt b/fastlane/metadata/android/sk/changelogs/40105140.txt
new file mode 100644
index 0000000000..d5b5ad330d
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Vlákna sú teraz predvolene zapnuté.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104120.txt b/fastlane/metadata/android/sq/changelogs/40104120.txt
new file mode 100644
index 0000000000..f93220235b
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104120.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: U lejon përdoruesve të shfaqen si jo në linjë dhe shton një lojtës audio për bashkëngjitje audio
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104130.txt b/fastlane/metadata/android/sq/changelogs/40104130.txt
new file mode 100644
index 0000000000..f93220235b
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104130.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: U lejon përdoruesve të shfaqen si jo në linjë dhe shton një lojtës audio për bashkëngjitje audio
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104140.txt b/fastlane/metadata/android/sq/changelogs/40104140.txt
new file mode 100644
index 0000000000..c8b2eb09ab
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Përmirësim i administrimit të përdoruesve të shpërfillur. Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104160.txt b/fastlane/metadata/android/sq/changelogs/40104160.txt
new file mode 100644
index 0000000000..987197f0f6
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104160.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Administrim më i mirë i mesazheve të fshehtëzuar. Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104180.txt b/fastlane/metadata/android/sq/changelogs/40104180.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104180.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104190.txt b/fastlane/metadata/android/sq/changelogs/40104190.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104190.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104200.txt b/fastlane/metadata/android/sq/changelogs/40104200.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104200.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104220.txt b/fastlane/metadata/android/sq/changelogs/40104220.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104220.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104230.txt b/fastlane/metadata/android/sq/changelogs/40104230.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104230.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104240.txt b/fastlane/metadata/android/sq/changelogs/40104240.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104240.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104250.txt b/fastlane/metadata/android/sq/changelogs/40104250.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104250.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104260.txt b/fastlane/metadata/android/sq/changelogs/40104260.txt
new file mode 100644
index 0000000000..c5ffad38c9
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Përdorim i UnifiedPush dhe lejim i përdoruesve të kenë push pa FCM.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104270.txt b/fastlane/metadata/android/sq/changelogs/40104270.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104280.txt b/fastlane/metadata/android/sq/changelogs/40104280.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104280.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104300.txt b/fastlane/metadata/android/sq/changelogs/40104300.txt
new file mode 100644
index 0000000000..6c1be8f556
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Bërje e mundur hapash të përmirësuar hyrje dhe dalje nga llogaria.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104310.txt b/fastlane/metadata/android/sq/changelogs/40104310.txt
new file mode 100644
index 0000000000..6c1be8f556
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Bërje e mundur hapash të përmirësuar hyrje dhe dalje nga llogaria.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104320.txt b/fastlane/metadata/android/sq/changelogs/40104320.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104340.txt b/fastlane/metadata/android/sq/changelogs/40104340.txt
new file mode 100644
index 0000000000..87f801d1f4
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash dhe përmirësime të ndryshme qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104360.txt b/fastlane/metadata/android/sq/changelogs/40104360.txt
new file mode 100644
index 0000000000..ef9251a497
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Skema e re e Aplikacionit mund të aktivizohet që nga rregullimet Labs. Ju lutemi, provojeni!
+Ndreqje problemesh me njoftim që mungon dhe njëkohësim i gjatë shtues.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105000.txt b/fastlane/metadata/android/sq/changelogs/40105000.txt
new file mode 100644
index 0000000000..2ee2ded823
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Hedhje poshtë MD e aktivizuar, si parazgjedhje.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105020.txt b/fastlane/metadata/android/sq/changelogs/40105020.txt
new file mode 100644
index 0000000000..26647d519f
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Skema e re e aplikacionit e aktivizuar, si parazgjedhje!
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105040.txt b/fastlane/metadata/android/sq/changelogs/40105040.txt
new file mode 100644
index 0000000000..4e38434f89
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Veçori të reja nën rregullimet Labs: hartues teksti të pasur, administrim i ri pajisjesh, transmetim zanor. Ende nën zhvillim aktivt!
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105060.txt b/fastlane/metadata/android/sq/changelogs/40105060.txt
new file mode 100644
index 0000000000..eb300bafed
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: ndërfaqe e re UI për përzgjedhjen e një bashkëngjitjeje!
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105070.txt b/fastlane/metadata/android/sq/changelogs/40105070.txt
new file mode 100644
index 0000000000..f4beb912a5
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë verson: ndërfaqe UI e re për përzgjedhje të një bashkëngjitjeje.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105080.txt b/fastlane/metadata/android/sq/changelogs/40105080.txt
new file mode 100644
index 0000000000..b059e86cbd
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: ndreqje të metash dhe përmirësime.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105100.txt b/fastlane/metadata/android/sq/changelogs/40105100.txt
new file mode 100644
index 0000000000..a103977a73
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Sendërtim i ri i mënyrës “Sa krejt ekrani”, për Përpunues Teksti të Pasur, si dhe ndreqje të metash.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105110.txt b/fastlane/metadata/android/sq/changelogs/40105110.txt
new file mode 100644
index 0000000000..78d3d9785b
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Sendërtim i ri i mënyrë “Sa krejt ekrani” për Përpunuesin Tekst i Pasur, si dhe ndreqje të metash.
+Regjistër ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105120.txt b/fastlane/metadata/android/sq/changelogs/40105120.txt
new file mode 100644
index 0000000000..51350f5c00
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Rrjedhat tanimë janë të aktivizuara, si parazgjedhje.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105130.txt b/fastlane/metadata/android/sq/changelogs/40105130.txt
new file mode 100644
index 0000000000..51350f5c00
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Rrjedhat tanimë janë të aktivizuara, si parazgjedhje.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40105140.txt b/fastlane/metadata/android/sq/changelogs/40105140.txt
new file mode 100644
index 0000000000..51350f5c00
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Rrjedhat tanimë janë të aktivizuara, si parazgjedhje.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104300.txt b/fastlane/metadata/android/sv-SE/changelogs/40104300.txt
new file mode 100644
index 0000000000..dcf7fd896c
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Aktiverar förbättrad inloggnings- och registreringsprocedur.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104310.txt b/fastlane/metadata/android/sv-SE/changelogs/40104310.txt
new file mode 100644
index 0000000000..dcf7fd896c
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Aktiverar förbättrad inloggnings- och registreringsprocedur.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104320.txt b/fastlane/metadata/android/sv-SE/changelogs/40104320.txt
new file mode 100644
index 0000000000..d8db452b51
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Diverse buggfixar och stabilitetsförbättringar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104340.txt b/fastlane/metadata/android/sv-SE/changelogs/40104340.txt
new file mode 100644
index 0000000000..d8db452b51
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Diverse buggfixar och stabilitetsförbättringar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104360.txt b/fastlane/metadata/android/sv-SE/changelogs/40104360.txt
new file mode 100644
index 0000000000..1f2c984748
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Ny applayout kan aktiveras in experimentinställningarna. Ge det ett försök!
+Fixa problem med missade aviseringar, och long inkrementell synk.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105000.txt b/fastlane/metadata/android/sv-SE/changelogs/40105000.txt
new file mode 100644
index 0000000000..f425ec24e8
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Fördröjda DM:er aktiverad som förval.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105020.txt b/fastlane/metadata/android/sv-SE/changelogs/40105020.txt
new file mode 100644
index 0000000000..66af38ec60
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Ny applayout aktiv som förval.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105040.txt b/fastlane/metadata/android/sv-SE/changelogs/40105040.txt
new file mode 100644
index 0000000000..66b2b47e7d
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Nya funktioner under experimentinställningarna: Rik-text-redigerare, ny enhetshantering, röstsändning. Fortfarande under aktiv utveckling!
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105060.txt b/fastlane/metadata/android/sv-SE/changelogs/40105060.txt
new file mode 100644
index 0000000000..d64984fcfb
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: nytt gränssnitt för val av bilaga.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105070.txt b/fastlane/metadata/android/sv-SE/changelogs/40105070.txt
new file mode 100644
index 0000000000..d64984fcfb
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: nytt gränssnitt för val av bilaga.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105080.txt b/fastlane/metadata/android/sv-SE/changelogs/40105080.txt
new file mode 100644
index 0000000000..cee589ed35
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: buggfixar och förbättringar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105100.txt b/fastlane/metadata/android/sv-SE/changelogs/40105100.txt
new file mode 100644
index 0000000000..3c4b0f2297
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Ny implementering av fullskärmsläget för rik-textredigeraren och buggfixar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105110.txt b/fastlane/metadata/android/sv-SE/changelogs/40105110.txt
new file mode 100644
index 0000000000..3c4b0f2297
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Ny implementering av fullskärmsläget för rik-textredigeraren och buggfixar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105120.txt b/fastlane/metadata/android/sv-SE/changelogs/40105120.txt
new file mode 100644
index 0000000000..d0f9c996af
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Trådar är nu aktivt som förval.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104300.txt b/fastlane/metadata/android/uk/changelogs/40104300.txt
new file mode 100644
index 0000000000..727508a0cc
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Поліпшені вхід і реєстрація.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104310.txt b/fastlane/metadata/android/uk/changelogs/40104310.txt
new file mode 100644
index 0000000000..727508a0cc
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Поліпшені вхід і реєстрація.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104320.txt b/fastlane/metadata/android/uk/changelogs/40104320.txt
new file mode 100644
index 0000000000..9664c615c1
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104340.txt b/fastlane/metadata/android/uk/changelogs/40104340.txt
new file mode 100644
index 0000000000..9664c615c1
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104360.txt b/fastlane/metadata/android/uk/changelogs/40104360.txt
new file mode 100644
index 0000000000..a2c9bcc4b5
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Новий макет програми можна увімкнути в налаштуваннях лабораторії. Спробуйте!
+Виправлено проблеми з відсутністю сповіщень та тривалою інкрементною синхронізацією.
+Список усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105000.txt b/fastlane/metadata/android/uk/changelogs/40105000.txt
new file mode 100644
index 0000000000..ab8964b99a
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: відкладені особисті повідомлення увімкнено типово.
+Повний журнал змін: https://github.com/vector-im/element-android/releases/tag/v1.2.0
diff --git a/fastlane/metadata/android/uk/changelogs/40105020.txt b/fastlane/metadata/android/uk/changelogs/40105020.txt
new file mode 100644
index 0000000000..90a62209dc
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: новий вигляд застосунку типово увімкнено!
+Журнал усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105040.txt b/fastlane/metadata/android/uk/changelogs/40105040.txt
new file mode 100644
index 0000000000..b3327f68ab
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Нові можливості в налаштуваннях лабораторії: Текстовий редактор, нове керування пристроями, голосові трансляції. Досі в активній розробці!
+Список усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105060.txt b/fastlane/metadata/android/uk/changelogs/40105060.txt
new file mode 100644
index 0000000000..4be635901f
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: новий інтерфейс для вибору вкладення.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105070.txt b/fastlane/metadata/android/uk/changelogs/40105070.txt
new file mode 100644
index 0000000000..65254059c5
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: новий інтерфейс для вибору вкладень.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105080.txt b/fastlane/metadata/android/uk/changelogs/40105080.txt
new file mode 100644
index 0000000000..e6f6384a5f
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: усування вад і вдосконалення.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105100.txt b/fastlane/metadata/android/uk/changelogs/40105100.txt
new file mode 100644
index 0000000000..6bb3ab95c7
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Нова реалізація повноекранного режиму для редактора розширеного тексту та виправлення помилок.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105110.txt b/fastlane/metadata/android/uk/changelogs/40105110.txt
new file mode 100644
index 0000000000..5f348b8a50
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Нова реалізація повноекранного режиму для редактора розширеного тексту й виправлення помилок.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105120.txt b/fastlane/metadata/android/uk/changelogs/40105120.txt
new file mode 100644
index 0000000000..edbd209d17
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Гілки відтепер типово ввімкнено.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105130.txt b/fastlane/metadata/android/uk/changelogs/40105130.txt
new file mode 100644
index 0000000000..edbd209d17
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Гілки відтепер типово ввімкнено.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40105140.txt b/fastlane/metadata/android/uk/changelogs/40105140.txt
new file mode 100644
index 0000000000..edbd209d17
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Гілки відтепер типово ввімкнено.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
index c046d8a40a..330ddde4ae 100644
--- a/fastlane/metadata/android/uk/full_description.txt
+++ b/fastlane/metadata/android/uk/full_description.txt
@@ -5,7 +5,7 @@ Element — це і безпечний месенджер, і застосуно
 - Повністю зашифровані повідомлення для надання можливості безпечнішого корпоративного спілкування, навіть для віддалених працівників
 - Децентралізований чат на основі відкритого коду Matrix
 - Безпечний обмін файлами із зашифрованими даними для керування проєктами
-- Відеочати з передачею голосу через IP та показом екрану іншим
+- Відеочати з передачею голосу через IP та показом екрана іншим
 - Проста інтеграція з вашими улюбленими інструментами для онлайн-співпраці, інструментами керування проєктами, послугами VoIP та іншими застосунками обміну повідомленнями для команд
 
 Element цілковито відрізняється від інших застосунків обміну повідомленнями та спільної роботи. Він працює на Matrix, відкритій мережі для безпечного обміну повідомленнями та децентралізованого зв'язку. Це дозволяє самостійне розгортання, щоб надати користувачам якнайбільше володіння та контролю над їх даними та повідомленнями.
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40104080.txt b/fastlane/metadata/android/zh-CN/changelogs/40104080.txt
index 44d178cfce..09b5bf2cd3 100644
--- a/fastlane/metadata/android/zh-CN/changelogs/40104080.txt
+++ b/fastlane/metadata/android/zh-CN/changelogs/40104080.txt
@@ -1,2 +1,2 @@
-此版本的主要变化：Thread timeline are now live and faster. 多个bug修复及稳定性改进。
+此版本的主要变化：消息列时间线 are now live and faster. 多个bug修复及稳定性改进。
 完整更改日志：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40104300.txt b/fastlane/metadata/android/zh-CN/changelogs/40104300.txt
new file mode 100644
index 0000000000..f6e5f8ddfc
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：启用改善的登录与注册流程。
+完整更改日志：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40104310.txt b/fastlane/metadata/android/zh-CN/changelogs/40104310.txt
new file mode 100644
index 0000000000..f6e5f8ddfc
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：启用改善的登录与注册流程。
+完整更改日志：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40104320.txt b/fastlane/metadata/android/zh-CN/changelogs/40104320.txt
new file mode 100644
index 0000000000..be6a485fb4
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：多个bug修复与稳定性改善。
+完整更改日志：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt
index 9b60098c34..03fdb6e34d 100644
--- a/fastlane/metadata/android/zh-CN/full_description.txt
+++ b/fastlane/metadata/android/zh-CN/full_description.txt
@@ -30,7 +30,7 @@ Element 透过不同的方式让你掌控一切：
 你可以与 Matrix 网络上的任何人聊天，不论他们是使用 Element、其他 Matrix 应用或其他通讯应用。
 
 <b>超级安全</b>
-真正的端到端加密（仅有那些在对话中的可以解密讯息）以及交叉签章装置验证。
+真正的端到端加密（仅有那些在对话中的人可以解密讯息）以及交叉签章装置验证。
 
 <b>完整的通讯与整合</b>
 信息传递、语音与视频通话、文件分享、画面分享与超多的整合、机器人与挂件。建构房间、社群、保持联络并完成工作。
diff --git a/fastlane/metadata/android/zh-CN/short_description.txt b/fastlane/metadata/android/zh-CN/short_description.txt
index e271e7f9a4..8cfea85b90 100644
--- a/fastlane/metadata/android/zh-CN/short_description.txt
+++ b/fastlane/metadata/android/zh-CN/short_description.txt
@@ -1 +1 @@
-群组消息应用-加密的消息传递、群组聊天和视频通话
+群组消息应用——加密的消息传递、群组聊天和视频通话
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104300.txt b/fastlane/metadata/android/zh-TW/changelogs/40104300.txt
new file mode 100644
index 0000000000..3055389b2b
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：啟用改善的登入與註冊流程。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104310.txt b/fastlane/metadata/android/zh-TW/changelogs/40104310.txt
new file mode 100644
index 0000000000..3055389b2b
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：啟用改善的登入與註冊流程。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104320.txt b/fastlane/metadata/android/zh-TW/changelogs/40104320.txt
new file mode 100644
index 0000000000..4bcca9a0b8
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104340.txt b/fastlane/metadata/android/zh-TW/changelogs/40104340.txt
new file mode 100644
index 0000000000..4bcca9a0b8
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104360.txt b/fastlane/metadata/android/zh-TW/changelogs/40104360.txt
new file mode 100644
index 0000000000..be36b60840
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+新的應用程式佈局可在「實驗室」設定中啟用。請試試看！
+修復關於遺失通知的問題，以及增量同步需要長時間的問題。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105000.txt b/fastlane/metadata/android/zh-TW/changelogs/40105000.txt
new file mode 100644
index 0000000000..7ab6a7a7bf
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105000.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：預設啟用延遲直接訊息。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105020.txt b/fastlane/metadata/android/zh-TW/changelogs/40105020.txt
new file mode 100644
index 0000000000..d83fd08a53
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：預設啟用新的應用程式佈局！
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105040.txt b/fastlane/metadata/android/zh-TW/changelogs/40105040.txt
new file mode 100644
index 0000000000..b35b1185b9
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：實驗室設定下有新功能：格式化文字編輯器、新裝置管理、語音廣播。仍在積極開發中！
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105060.txt b/fastlane/metadata/android/zh-TW/changelogs/40105060.txt
new file mode 100644
index 0000000000..56667ccfc0
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：選取附件的新使用者介面。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105070.txt b/fastlane/metadata/android/zh-TW/changelogs/40105070.txt
new file mode 100644
index 0000000000..56667ccfc0
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105070.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：選取附件的新使用者介面。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105080.txt b/fastlane/metadata/android/zh-TW/changelogs/40105080.txt
new file mode 100644
index 0000000000..2a368ec8be
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：臭蟲修復與改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105100.txt b/fastlane/metadata/android/zh-TW/changelogs/40105100.txt
new file mode 100644
index 0000000000..20341b84fe
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：格式化文字編輯器的全螢幕模式新實作與臭蟲修復。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105110.txt b/fastlane/metadata/android/zh-TW/changelogs/40105110.txt
new file mode 100644
index 0000000000..20341b84fe
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105110.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：格式化文字編輯器的全螢幕模式新實作與臭蟲修復。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105120.txt b/fastlane/metadata/android/zh-TW/changelogs/40105120.txt
new file mode 100644
index 0000000000..9c66f3c2ad
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105120.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：討論串現在預設啟用。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105130.txt b/fastlane/metadata/android/zh-TW/changelogs/40105130.txt
new file mode 100644
index 0000000000..9c66f3c2ad
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105130.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：討論串現在預設啟用。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105140.txt b/fastlane/metadata/android/zh-TW/changelogs/40105140.txt
new file mode 100644
index 0000000000..9c66f3c2ad
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105140.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：討論串現在預設啟用。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/gradle.properties b/gradle.properties
index 2af9214ed5..ea70ad5e51 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,9 +12,11 @@ org.gradle.jvmargs=-Xmx4g -Xms512M -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=1g
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=true
+org.gradle.caching=true
 
 # Android Settings
 android.enableJetifier=true
+android.jetifier.ignorelist=android-base-common,common
 android.useAndroidX=true
 
 #Project Settings
@@ -37,3 +39,7 @@ signing.element.keyPassword=Secret
 signing.element.nightly.storePassword=Secret
 signing.element.nightly.keyId=Secret
 signing.element.nightly.keyPassword=Secret
+
+# Customise the Lint version to use a more recent version than the one bundled with AGP
+# https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
+android.experimental.lint.version=8.0.0-alpha10
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832f0..943f0cbfa7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f7189a776c..bc073f6761 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionSha256Sum=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6c2..65dcd68d65 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
index 53a6b238d4..6689b85bee 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
diff --git a/library/attachment-viewer/build.gradle b/library/attachment-viewer/build.gradle
index 8bbafd3387..fc9495b113 100644
--- a/library/attachment-viewer/build.gradle
+++ b/library/attachment-viewer/build.gradle
@@ -18,6 +18,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace "im.vector.lib.attachmentviewer"
 
     compileSdk versions.compileSdk
 
diff --git a/library/attachment-viewer/src/main/AndroidManifest.xml b/library/attachment-viewer/src/main/AndroidManifest.xml
index 8970b47178..8072ee00db 100644
--- a/library/attachment-viewer/src/main/AndroidManifest.xml
+++ b/library/attachment-viewer/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.lib.attachmentviewer" />
+<manifest />
diff --git a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
index 764cf8419a..21d96afb77 100644
--- a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
+++ b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
@@ -17,7 +17,6 @@
 
 package im.vector.lib.attachmentviewer
 
-import android.annotation.SuppressLint
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
@@ -136,7 +135,6 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
         }
     }
 
-    @Suppress("DEPRECATION")
     private fun setDecorViewFullScreen() {
         // This is important for the dispatchTouchEvent, if not we must correct
         // the touch coordinates
@@ -144,22 +142,20 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
             // New API instead of SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN and SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
             window.setDecorFitsSystemWindows(false)
             // New API instead of SYSTEM_UI_FLAG_IMMERSIVE
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            } else {
-                @SuppressLint("WrongConstant")
-                window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_SWIPE
-            }
+            window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
             // New API instead of FLAG_TRANSLUCENT_STATUS
             window.statusBarColor = ContextCompat.getColor(this, R.color.half_transparent_status_bar)
             // new API instead of FLAG_TRANSLUCENT_NAVIGATION
             window.navigationBarColor = ContextCompat.getColor(this, R.color.half_transparent_status_bar)
         } else {
+            @Suppress("DEPRECATION")
             window.decorView.systemUiVisibility = (
                     View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                             or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
                             or View.SYSTEM_UI_FLAG_IMMERSIVE)
+            @Suppress("DEPRECATION")
             window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+            @Suppress("DEPRECATION")
             window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
         }
     }
@@ -320,10 +316,6 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
                     }
                     return false
                 }
-
-                override fun onDoubleTap(e: MotionEvent?): Boolean {
-                    return super.onDoubleTap(e)
-                }
             })
 
     override fun onEvent(event: AttachmentEvents) {
@@ -344,7 +336,6 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
                 ?.handleCommand(commands)
     }
 
-    @Suppress("DEPRECATION")
     private fun hideSystemUI() {
         systemUiVisibility = false
         // Enables regular immersive mode.
@@ -356,17 +347,13 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
             // new API instead of SYSTEM_UI_FLAG_HIDE_NAVIGATION
             window.decorView.windowInsetsController?.hide(WindowInsets.Type.navigationBars())
             // New API instead of SYSTEM_UI_FLAG_IMMERSIVE
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            } else {
-                @SuppressLint("WrongConstant")
-                window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_SWIPE
-            }
+            window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
             // New API instead of FLAG_TRANSLUCENT_STATUS
             window.statusBarColor = ContextCompat.getColor(this, R.color.half_transparent_status_bar)
             // New API instead of FLAG_TRANSLUCENT_NAVIGATION
             window.navigationBarColor = ContextCompat.getColor(this, R.color.half_transparent_status_bar)
         } else {
+            @Suppress("DEPRECATION")
             window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE
                     // Set the content to appear under the system bars so that the
                     // content doesn't resize when the system bars hide and show.
@@ -381,13 +368,13 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
 
     // Shows the system bars by removing all the flags
 // except for the ones that make the content appear under the system bars.
-    @Suppress("DEPRECATION")
     private fun showSystemUI() {
         systemUiVisibility = true
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             // New API instead of SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN and SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
             window.setDecorFitsSystemWindows(false)
         } else {
+            @Suppress("DEPRECATION")
             window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                     or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                     or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
diff --git a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
index 7a83ee28d4..2f840cebee 100644
--- a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
+++ b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
@@ -96,31 +96,27 @@ class SwipeToDismissHandler(
                 .setDuration(ANIMATION_DURATION)
                 .setInterpolator(AccelerateInterpolator())
                 .setUpdateListener { onSwipeViewMove(swipeView.translationY, translationLimit) }
-                .setAnimatorListener(onAnimationEnd = {
+                .setAnimatorEndListener {
                     if (translationTo != 0f) {
                         onDismiss()
                     }
 
                     // remove the update listener, otherwise it will be saved on the next animation execution:
                     swipeView.animate().setUpdateListener(null)
-                })
+                }
                 .start()
     }
 }
 
-internal fun ViewPropertyAnimator.setAnimatorListener(
-        onAnimationEnd: ((Animator?) -> Unit)? = null,
-        onAnimationStart: ((Animator?) -> Unit)? = null
-) = this.setListener(
+private fun ViewPropertyAnimator.setAnimatorEndListener(
+        onAnimationEnd: () -> Unit,
+) = setListener(
         object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator?) {
-                onAnimationEnd?.invoke(animation)
+            override fun onAnimationEnd(animation: Animator) {
+                onAnimationEnd()
             }
+        }
+)
 
-            override fun onAnimationStart(animation: Animator?) {
-                onAnimationStart?.invoke(animation)
-            }
-        })
-
-internal val View?.hitRect: Rect
-    get() = Rect().also { this?.getHitRect(it) }
+private val View.hitRect: Rect
+    get() = Rect().also { getHitRect(it) }
diff --git a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
index 92d28d26c9..07c7b4588f 100644
--- a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
+++ b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
@@ -103,14 +103,12 @@ class VideoViewHolder constructor(itemView: View) :
         views.videoView.setOnPreparedListener {
             stopTimer()
             countUpTimer = CountUpTimer(100).also {
-                it.tickListener = object : CountUpTimer.TickListener {
-                    override fun onTick(milliseconds: Long) {
-                        val duration = views.videoView.duration
-                        val progress = views.videoView.currentPosition
-                        val isPlaying = views.videoView.isPlaying
-//                        Log.v("FOO", "isPlaying $isPlaying $progress/$duration")
-                        eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
-                    }
+                it.tickListener = CountUpTimer.TickListener {
+                    val duration = views.videoView.duration
+                    val progress = views.videoView.currentPosition
+                    val isPlaying = views.videoView.isPlaying
+                    //                        Log.v("FOO", "isPlaying $isPlaying $progress/$duration")
+                    eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
                 }
                 it.resume()
             }
diff --git a/library/core-utils/build.gradle b/library/core-utils/build.gradle
index 0f7789a2a8..b985127ec6 100644
--- a/library/core-utils/build.gradle
+++ b/library/core-utils/build.gradle
@@ -20,6 +20,8 @@ plugins {
 }
 
 android {
+    namespace "im.vector.lib.core.utils"
+
     compileSdk versions.compileSdk
     defaultConfig {
         minSdk versions.minSdk
diff --git a/library/core-utils/src/main/AndroidManifest.xml b/library/core-utils/src/main/AndroidManifest.xml
index 20a9414519..8072ee00db 100644
--- a/library/core-utils/src/main/AndroidManifest.xml
+++ b/library/core-utils/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.lib.core.utils" />
\ No newline at end of file
+<manifest />
diff --git a/library/core-utils/src/main/java/im/vector/lib/core/utils/compat/Compat.kt b/library/core-utils/src/main/java/im/vector/lib/core/utils/compat/Compat.kt
new file mode 100644
index 0000000000..8b0ad7767b
--- /dev/null
+++ b/library/core-utils/src/main/java/im/vector/lib/core/utils/compat/Compat.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.lib.core.utils.compat
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.os.Build
+import android.os.Bundle
+import android.os.Parcelable
+import java.io.Serializable
+
+inline fun <reified T> Intent.getParcelableExtraCompat(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getParcelableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelableExtra(key) as? T?
+}
+
+inline fun <reified T : Parcelable> Intent.getParcelableArrayListExtraCompat(key: String): ArrayList<T>? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getParcelableArrayListExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelableArrayListExtra<T>(key)
+}
+
+inline fun <reified T> Bundle.getParcelableCompat(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getParcelable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelable(key) as? T?
+}
+
+inline fun <reified T : Serializable> Bundle.getSerializableCompat(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializable(key) as? T?
+}
+
+inline fun <reified T : Serializable> Intent.getSerializableExtraCompat(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializableExtra(key) as? T?
+}
+
+fun PackageManager.queryIntentActivitiesCompat(data: Intent, flags: Int): List<ResolveInfo> {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> queryIntentActivities(
+                data,
+                PackageManager.ResolveInfoFlags.of(flags.toLong())
+        )
+        else -> @Suppress("DEPRECATION") queryIntentActivities(data, flags)
+    }
+}
+
+fun PackageManager.resolveActivityCompat(data: Intent, flags: Int): ResolveInfo? {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> resolveActivity(
+                data,
+                PackageManager.ResolveInfoFlags.of(flags.toLong())
+        )
+        else -> @Suppress("DEPRECATION") resolveActivity(data, flags)
+    }
+}
diff --git a/library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt b/library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt
index e9d311fe03..a4fd8bb4e1 100644
--- a/library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt
+++ b/library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt
@@ -66,7 +66,7 @@ class CountUpTimer(private val intervalInMs: Long = 1_000) {
         coroutineScope.cancel()
     }
 
-    interface TickListener {
+    fun interface TickListener {
         fun onTick(milliseconds: Long)
     }
 }
diff --git a/library/external/dialpad/build.gradle b/library/external/dialpad/build.gradle
new file mode 100644
index 0000000000..e6f249f535
--- /dev/null
+++ b/library/external/dialpad/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    namespace "com.android.dialer.dialpadview"
+
+    compileSdk versions.compileSdk
+
+    defaultConfig {
+        minSdk versions.minSdk
+        targetSdk versions.targetSdk
+    }
+
+    compileOptions {
+        sourceCompatibility versions.sourceCompat
+        targetCompatibility versions.targetCompat
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+    implementation libs.androidx.appCompat
+}
+
+afterEvaluate {
+    tasks.findAll { it.name.startsWith("lint") }.each {
+        it.enabled = false
+    }
+}
diff --git a/library/external/dialpad/src/main/AndroidManifest.xml b/library/external/dialpad/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..8072ee00db
--- /dev/null
+++ b/library/external/dialpad/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />
diff --git a/library/external/dialpad/src/main/java/com/android/dialer/animation/AnimUtils.java b/library/external/dialpad/src/main/java/com/android/dialer/animation/AnimUtils.java
new file mode 100644
index 0000000000..b6a32c587c
--- /dev/null
+++ b/library/external/dialpad/src/main/java/com/android/dialer/animation/AnimUtils.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.animation;
+
+import android.view.animation.Interpolator;
+
+import com.android.dialer.compat.PathInterpolatorCompat;
+
+public class AnimUtils {
+  public static final Interpolator EASE_OUT_EASE_IN =
+      PathInterpolatorCompat.create(0.4f, 0, 0.2f, 1);
+}
diff --git a/library/external/dialpad/src/main/java/com/android/dialer/compat/PathInterpolatorCompat.java b/library/external/dialpad/src/main/java/com/android/dialer/compat/PathInterpolatorCompat.java
new file mode 100644
index 0000000000..7139bc4af1
--- /dev/null
+++ b/library/external/dialpad/src/main/java/com/android/dialer/compat/PathInterpolatorCompat.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.compat;
+
+import android.graphics.Path;
+import android.graphics.PathMeasure;
+import android.os.Build;
+import android.view.animation.Interpolator;
+import android.view.animation.PathInterpolator;
+
+public class PathInterpolatorCompat {
+
+  public static Interpolator create(
+      float controlX1, float controlY1, float controlX2, float controlY2) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      return new PathInterpolator(controlX1, controlY1, controlX2, controlY2);
+    }
+    return new PathInterpolatorBase(controlX1, controlY1, controlX2, controlY2);
+  }
+
+  private static class PathInterpolatorBase implements Interpolator {
+
+    /** Governs the accuracy of the approximation of the {@link Path}. */
+    private static final float PRECISION = 0.002f;
+
+    private final float[] mX;
+    private final float[] mY;
+
+    public PathInterpolatorBase(Path path) {
+      final PathMeasure pathMeasure = new PathMeasure(path, false /* forceClosed */);
+
+      final float pathLength = pathMeasure.getLength();
+      final int numPoints = (int) (pathLength / PRECISION) + 1;
+
+      mX = new float[numPoints];
+      mY = new float[numPoints];
+
+      final float[] position = new float[2];
+      for (int i = 0; i < numPoints; ++i) {
+        final float distance = (i * pathLength) / (numPoints - 1);
+        pathMeasure.getPosTan(distance, position, null /* tangent */);
+
+        mX[i] = position[0];
+        mY[i] = position[1];
+      }
+    }
+
+    public PathInterpolatorBase(float controlX, float controlY) {
+      this(createQuad(controlX, controlY));
+    }
+
+    public PathInterpolatorBase(
+        float controlX1, float controlY1, float controlX2, float controlY2) {
+      this(createCubic(controlX1, controlY1, controlX2, controlY2));
+    }
+
+    private static Path createQuad(float controlX, float controlY) {
+      final Path path = new Path();
+      path.moveTo(0.0f, 0.0f);
+      path.quadTo(controlX, controlY, 1.0f, 1.0f);
+      return path;
+    }
+
+    private static Path createCubic(
+        float controlX1, float controlY1, float controlX2, float controlY2) {
+      final Path path = new Path();
+      path.moveTo(0.0f, 0.0f);
+      path.cubicTo(controlX1, controlY1, controlX2, controlY2, 1.0f, 1.0f);
+      return path;
+    }
+
+    @Override
+    public float getInterpolation(float t) {
+      if (t <= 0.0f) {
+        return 0.0f;
+      } else if (t >= 1.0f) {
+        return 1.0f;
+      }
+
+      // Do a binary search for the correct x to interpolate between.
+      int startIndex = 0;
+      int endIndex = mX.length - 1;
+      while (endIndex - startIndex > 1) {
+        int midIndex = (startIndex + endIndex) / 2;
+        if (t < mX[midIndex]) {
+          endIndex = midIndex;
+        } else {
+          startIndex = midIndex;
+        }
+      }
+
+      final float xRange = mX[endIndex] - mX[startIndex];
+      if (xRange == 0) {
+        return mY[startIndex];
+      }
+
+      final float tInRange = t - mX[startIndex];
+      final float fraction = tInRange / xRange;
+
+      final float startY = mY[startIndex];
+      final float endY = mY[endIndex];
+
+      return startY + (fraction * (endY - startY));
+    }
+  }
+}
diff --git a/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadKeyButton.java b/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadKeyButton.java
new file mode 100644
index 0000000000..de6d2c6282
--- /dev/null
+++ b/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadKeyButton.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.dialpadview;
+
+import android.content.Context;
+import android.graphics.RectF;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.FrameLayout;
+
+/**
+ * Custom class for dialpad buttons.
+ *
+ * <p>When touch exploration mode is enabled for accessibility, this class implements the
+ * lift-to-type interaction model:
+ *
+ * <ul>
+ * <li>Hovering over the button will cause it to gain accessibility focus
+ * <li>Removing the hover pointer while inside the bounds of the button will perform a click action
+ * <li>If long-click is supported, hovering over the button for a longer period of time will switch
+ *     to the long-click action
+ * <li>Moving the hover pointer outside of the bounds of the button will restore to the normal click
+ *     action
+ * </ul>
+ */
+public class DialpadKeyButton extends FrameLayout {
+
+  /** Timeout before switching to long-click accessibility mode. */
+  private static final int LONG_HOVER_TIMEOUT = ViewConfiguration.getLongPressTimeout() * 2;
+
+  /** Accessibility manager instance used to check touch exploration state. */
+  private AccessibilityManager mAccessibilityManager;
+
+  /** Bounds used to filter HOVER_EXIT events. */
+  private RectF mHoverBounds = new RectF();
+
+  /** Whether this view is currently in the long-hover state. */
+  private boolean mLongHovered;
+
+  /** Alternate content description for long-hover state. */
+  private CharSequence mLongHoverContentDesc;
+
+  /** Backup of standard content description. Used for accessibility. */
+  private CharSequence mBackupContentDesc;
+
+  /** Backup of clickable property. Used for accessibility. */
+  private boolean mWasClickable;
+
+  /** Backup of long-clickable property. Used for accessibility. */
+  private boolean mWasLongClickable;
+
+  /** Runnable used to trigger long-click mode for accessibility. */
+  private Runnable mLongHoverRunnable;
+
+  private OnPressedListener mOnPressedListener;
+
+  public DialpadKeyButton(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    initForAccessibility(context);
+  }
+
+  public DialpadKeyButton(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+    initForAccessibility(context);
+  }
+
+  public void setOnPressedListener(OnPressedListener onPressedListener) {
+    mOnPressedListener = onPressedListener;
+  }
+
+  private void initForAccessibility(Context context) {
+    mAccessibilityManager =
+        (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
+  }
+
+  public void setLongHoverContentDescription(CharSequence contentDescription) {
+    mLongHoverContentDesc = contentDescription;
+
+    if (mLongHovered) {
+      super.setContentDescription(mLongHoverContentDesc);
+    }
+  }
+
+  @Override
+  public void setContentDescription(CharSequence contentDescription) {
+    if (mLongHovered) {
+      mBackupContentDesc = contentDescription;
+    } else {
+      super.setContentDescription(contentDescription);
+    }
+  }
+
+  @Override
+  public void setPressed(boolean pressed) {
+    super.setPressed(pressed);
+    if (mOnPressedListener != null) {
+      mOnPressedListener.onPressed(this, pressed);
+    }
+  }
+
+  @Override
+  public void onSizeChanged(int w, int h, int oldw, int oldh) {
+    super.onSizeChanged(w, h, oldw, oldh);
+
+    mHoverBounds.left = getPaddingLeft();
+    mHoverBounds.right = w - getPaddingRight();
+    mHoverBounds.top = getPaddingTop();
+    mHoverBounds.bottom = h - getPaddingBottom();
+  }
+
+  @Override
+  public boolean performAccessibilityAction(int action, Bundle arguments) {
+    if (action == AccessibilityNodeInfo.ACTION_CLICK) {
+      simulateClickForAccessibility();
+      return true;
+    }
+
+    return super.performAccessibilityAction(action, arguments);
+  }
+
+  @Override
+  public boolean onHoverEvent(MotionEvent event) {
+    // When touch exploration is turned on, lifting a finger while inside
+    // the button's hover target bounds should perform a click action.
+    if (mAccessibilityManager.isEnabled() && mAccessibilityManager.isTouchExplorationEnabled()) {
+      switch (event.getActionMasked()) {
+        case MotionEvent.ACTION_HOVER_ENTER:
+          // Lift-to-type temporarily disables double-tap activation.
+          mWasClickable = isClickable();
+          mWasLongClickable = isLongClickable();
+          if (mWasLongClickable && mLongHoverContentDesc != null) {
+            if (mLongHoverRunnable == null) {
+              mLongHoverRunnable =
+                  new Runnable() {
+                    @Override
+                    public void run() {
+                      setLongHovered(true);
+                      announceForAccessibility(mLongHoverContentDesc);
+                    }
+                  };
+            }
+            postDelayed(mLongHoverRunnable, LONG_HOVER_TIMEOUT);
+          }
+
+          setClickable(false);
+          setLongClickable(false);
+          break;
+        case MotionEvent.ACTION_HOVER_EXIT:
+          if (mHoverBounds.contains(event.getX(), event.getY())) {
+            if (mLongHovered) {
+              performLongClick();
+            } else {
+              simulateClickForAccessibility();
+            }
+          }
+
+          cancelLongHover();
+          setClickable(mWasClickable);
+          setLongClickable(mWasLongClickable);
+          break;
+      }
+    }
+
+    return super.onHoverEvent(event);
+  }
+
+  /**
+   * When accessibility is on, simulate press and release to preserve the semantic meaning of
+   * performClick(). Required for Braille support.
+   */
+  private void simulateClickForAccessibility() {
+    // Checking the press state prevents double activation.
+    if (isPressed()) {
+      return;
+    }
+
+    setPressed(true);
+
+    // Stay consistent with performClick() by sending the event after
+    // setting the pressed state but before performing the action.
+    sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+
+    setPressed(false);
+  }
+
+  private void setLongHovered(boolean enabled) {
+    if (mLongHovered != enabled) {
+      mLongHovered = enabled;
+
+      // Switch between normal and alternate description, if available.
+      if (enabled) {
+        mBackupContentDesc = getContentDescription();
+        super.setContentDescription(mLongHoverContentDesc);
+      } else {
+        super.setContentDescription(mBackupContentDesc);
+      }
+    }
+  }
+
+  private void cancelLongHover() {
+    if (mLongHoverRunnable != null) {
+      removeCallbacks(mLongHoverRunnable);
+    }
+    setLongHovered(false);
+  }
+
+  public interface OnPressedListener {
+
+    void onPressed(View view, boolean pressed);
+  }
+}
diff --git a/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadTextView.java b/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadTextView.java
new file mode 100644
index 0000000000..5b1b7bb5dc
--- /dev/null
+++ b/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadTextView.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.dialpadview;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+/**
+ * This is a custom text view intended only for rendering the numerals (and star and pound) on the
+ * dialpad. TextView has built in top/bottom padding to help account for ascenders/descenders.
+ *
+ * <p>Since vertical space is at a premium on the dialpad, particularly if the font size is scaled
+ * to a larger default, for the dialpad we use this class to more precisely render characters
+ * according to the precise amount of space they need.
+ */
+public class DialpadTextView extends TextView {
+
+  private Rect mTextBounds = new Rect();
+  private String mTextStr;
+
+  public DialpadTextView(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  /** Draw the text to fit within the height/width which have been specified during measurement. */
+  @Override
+  public void draw(Canvas canvas) {
+    Paint paint = getPaint();
+
+    // Without this, the draw does not respect the style's specified text color.
+    paint.setColor(getCurrentTextColor());
+
+    // The text bounds values are relative and can be negative,, so rather than specifying a
+    // standard origin such as 0, 0, we need to use negative of the left/top bounds.
+    // For example, the bounds may be: Left: 11, Right: 37, Top: -77, Bottom: 0
+    canvas.drawText(mTextStr, -mTextBounds.left, -mTextBounds.top, paint);
+  }
+
+  /**
+   * Calculate the pixel-accurate bounds of the text when rendered, and use that to specify the
+   * height and width.
+   */
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    mTextStr = getText().toString();
+    getPaint().getTextBounds(mTextStr, 0, mTextStr.length(), mTextBounds);
+
+    int width = resolveSize(mTextBounds.width(), widthMeasureSpec);
+    int height = resolveSize(mTextBounds.height(), heightMeasureSpec);
+    setMeasuredDimension(width, height);
+  }
+}
diff --git a/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadView.java b/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadView.java
new file mode 100644
index 0000000000..09079235af
--- /dev/null
+++ b/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadView.java
@@ -0,0 +1,448 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.dialpadview;
+
+import android.animation.AnimatorListenerAdapter;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.text.Spannable;
+import android.text.TextUtils;
+import android.text.style.TtsSpan;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewPropertyAnimator;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.dialer.animation.AnimUtils;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.Locale;
+
+/** View that displays a twelve-key phone dialpad. */
+public class DialpadView extends LinearLayout {
+
+  private static final String TAG = DialpadView.class.getSimpleName();
+
+  private static final double DELAY_MULTIPLIER = 0.66;
+  private static final double DURATION_MULTIPLIER = 0.8;
+  // For animation.
+  private static final int KEY_FRAME_DURATION = 33;
+  /** {@code True} if the dialpad is in landscape orientation. */
+  private final boolean mIsLandscape;
+  /** {@code True} if the dialpad is showing in a right-to-left locale. */
+  private final boolean mIsRtl;
+
+  private final int[] mButtonIds =
+      new int[] {
+        R.id.zero,
+        R.id.one,
+        R.id.two,
+        R.id.three,
+        R.id.four,
+        R.id.five,
+        R.id.six,
+        R.id.seven,
+        R.id.eight,
+        R.id.nine,
+        R.id.star,
+        R.id.pound
+      };
+  private EditText mDigits;
+  private ImageButton mDelete;
+  private View mOverflowMenuButton;
+  private ViewGroup mRateContainer;
+  private TextView mIldCountry;
+  private TextView mIldRate;
+  private boolean mCanDigitsBeEdited;
+  private int mTranslateDistance;
+
+  public DialpadView(Context context) {
+    this(context, null);
+  }
+
+  public DialpadView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public DialpadView(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+
+    mTranslateDistance =
+        getResources().getDimensionPixelSize(R.dimen.dialpad_key_button_translate_y);
+
+    mIsLandscape =
+        getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
+    mIsRtl = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 &&
+        TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL;
+  }
+
+  @Override
+  protected void onFinishInflate() {
+    super.onFinishInflate();
+    setupKeypad();
+    mDigits = (EditText) findViewById(R.id.digits);
+    mDelete = (ImageButton) findViewById(R.id.deleteButton);
+    mOverflowMenuButton = findViewById(R.id.dialpad_overflow);
+    mRateContainer = (ViewGroup) findViewById(R.id.rate_container);
+    mIldCountry = (TextView) mRateContainer.findViewById(R.id.ild_country);
+    mIldRate = (TextView) mRateContainer.findViewById(R.id.ild_rate);
+
+    AccessibilityManager accessibilityManager =
+        (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
+    if (accessibilityManager.isEnabled()) {
+      // The text view must be selected to send accessibility events.
+      mDigits.setSelected(true);
+    }
+  }
+
+  private void setupKeypad() {
+    final int[] letterIds =
+        new int[] {
+          R.string.dialpad_0_letters,
+          R.string.dialpad_1_letters,
+          R.string.dialpad_2_letters,
+          R.string.dialpad_3_letters,
+          R.string.dialpad_4_letters,
+          R.string.dialpad_5_letters,
+          R.string.dialpad_6_letters,
+          R.string.dialpad_7_letters,
+          R.string.dialpad_8_letters,
+          R.string.dialpad_9_letters,
+          R.string.dialpad_star_letters,
+          R.string.dialpad_pound_letters
+        };
+
+    final Resources resources = getContext().getResources();
+
+    DialpadKeyButton dialpadKey;
+    TextView numberView;
+    TextView lettersView;
+
+    final Locale currentLocale = resources.getConfiguration().locale;
+    final NumberFormat nf;
+    // We translate dialpad numbers only for "fa" and not any other locale
+    // ("ar" anybody ?).
+    if ("fa".equals(currentLocale.getLanguage())) {
+      nf = DecimalFormat.getInstance(resources.getConfiguration().locale);
+    } else {
+      nf = DecimalFormat.getInstance(Locale.ENGLISH);
+    }
+
+    for (int i = 0; i < mButtonIds.length; i++) {
+      dialpadKey = (DialpadKeyButton) findViewById(mButtonIds[i]);
+      numberView = (TextView) dialpadKey.findViewById(R.id.dialpad_key_number);
+      lettersView = (TextView) dialpadKey.findViewById(R.id.dialpad_key_letters);
+
+      final String numberString;
+      final CharSequence numberContentDescription;
+      if (mButtonIds[i] == R.id.pound) {
+        numberString = resources.getString(R.string.dialpad_pound_number);
+        numberContentDescription = numberString;
+      } else if (mButtonIds[i] == R.id.star) {
+        numberString = resources.getString(R.string.dialpad_star_number);
+        numberContentDescription = numberString;
+      } else {
+        numberString = nf.format(i);
+        // The content description is used for Talkback key presses. The number is
+        // separated by a "," to introduce a slight delay. Convert letters into a verbatim
+        // span so that they are read as letters instead of as one word.
+        String letters = resources.getString(letterIds[i]);
+        Spannable spannable =
+            Spannable.Factory.getInstance().newSpannable(numberString + "," + letters);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+          spannable.setSpan(
+              (new TtsSpan.VerbatimBuilder(letters)).build(),
+              numberString.length() + 1,
+              numberString.length() + 1 + letters.length(),
+              Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+        numberContentDescription = spannable;
+      }
+
+      numberView.setText(numberString);
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        numberView.setElegantTextHeight(false);
+      }
+      dialpadKey.setContentDescription(numberContentDescription);
+
+      if (lettersView != null) {
+        lettersView.setText(resources.getString(letterIds[i]));
+      }
+    }
+
+    final DialpadKeyButton one = (DialpadKeyButton) findViewById(R.id.one);
+    one.setLongHoverContentDescription(resources.getText(R.string.description_voicemail_button));
+
+    final DialpadKeyButton zero = (DialpadKeyButton) findViewById(R.id.zero);
+    zero.setLongHoverContentDescription(resources.getText(R.string.description_image_button_plus));
+  }
+
+  public void setShowVoicemailButton(boolean show) {
+    View view = findViewById(R.id.dialpad_key_voicemail);
+    if (view != null) {
+      view.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
+    }
+  }
+
+  /**
+   * Whether or not the digits above the dialer can be edited.
+   *
+   * @param canBeEdited If true, the backspace button will be shown and the digits EditText will be
+   *     configured to allow text manipulation.
+   */
+  public void setCanDigitsBeEdited(boolean canBeEdited) {
+//    View deleteButton = findViewById(R.id.deleteButton);
+//    deleteButton.setVisibility(canBeEdited ? View.VISIBLE : View.INVISIBLE);
+//    View overflowMenuButton = findViewById(R.id.dialpad_overflow);
+//    overflowMenuButton.setVisibility(canBeEdited ? View.VISIBLE : View.GONE);
+
+//    EditText digits = (EditText) findViewById(R.id.digits);
+//    digits.setClickable(canBeEdited);
+//    digits.setLongClickable(canBeEdited);
+//    digits.setFocusableInTouchMode(canBeEdited);
+//    digits.setCursorVisible(false);
+
+    mCanDigitsBeEdited = canBeEdited;
+  }
+
+  public void setCallRateInformation(String countryName, String displayRate) {
+    if (TextUtils.isEmpty(countryName) && TextUtils.isEmpty(displayRate)) {
+      mRateContainer.setVisibility(View.GONE);
+      return;
+    }
+    mRateContainer.setVisibility(View.VISIBLE);
+    mIldCountry.setText(countryName);
+    mIldRate.setText(displayRate);
+  }
+
+  public boolean canDigitsBeEdited() {
+    return mCanDigitsBeEdited;
+  }
+
+  /**
+   * Always returns true for onHoverEvent callbacks, to fix problems with accessibility due to the
+   * dialpad overlaying other fragments.
+   */
+  @Override
+  public boolean onHoverEvent(MotionEvent event) {
+    return true;
+  }
+
+  public void animateShow() {
+    // This is a hack; without this, the setTranslationY is delayed in being applied, and the
+    // numbers appear at their original position (0) momentarily before animating.
+    final AnimatorListenerAdapter showListener = new AnimatorListenerAdapter() {};
+
+    for (int i = 0; i < mButtonIds.length; i++) {
+      int delay = (int) (getKeyButtonAnimationDelay(mButtonIds[i]) * DELAY_MULTIPLIER);
+      int duration = (int) (getKeyButtonAnimationDuration(mButtonIds[i]) * DURATION_MULTIPLIER);
+      final DialpadKeyButton dialpadKey = (DialpadKeyButton) findViewById(mButtonIds[i]);
+
+      ViewPropertyAnimator animator = dialpadKey.animate();
+      if (mIsLandscape) {
+        // Landscape orientation requires translation along the X axis.
+        // For RTL locales, ensure we translate negative on the X axis.
+        dialpadKey.setTranslationX((mIsRtl ? -1 : 1) * mTranslateDistance);
+        animator.translationX(0);
+      } else {
+        // Portrait orientation requires translation along the Y axis.
+        dialpadKey.setTranslationY(mTranslateDistance);
+        animator.translationY(0);
+      }
+      animator
+          .setInterpolator(AnimUtils.EASE_OUT_EASE_IN)
+          .setStartDelay(delay)
+          .setDuration(duration)
+          .setListener(showListener)
+          .start();
+    }
+  }
+
+  public EditText getDigits() {
+    return mDigits;
+  }
+
+  public ImageButton getDeleteButton() {
+    return mDelete;
+  }
+
+  public View getOverflowMenuButton() {
+    return mOverflowMenuButton;
+  }
+
+  /**
+   * Get the animation delay for the buttons, taking into account whether the dialpad is in
+   * landscape left-to-right, landscape right-to-left, or portrait.
+   *
+   * @param buttonId The button ID.
+   * @return The animation delay.
+   */
+  private int getKeyButtonAnimationDelay(int buttonId) {
+    if (mIsLandscape) {
+      if (mIsRtl) {
+        if (buttonId == R.id.three) {
+          return KEY_FRAME_DURATION * 1;
+        } else if (buttonId == R.id.six) {
+          return KEY_FRAME_DURATION * 2;
+        } else if (buttonId == R.id.nine) {
+          return KEY_FRAME_DURATION * 3;
+        } else if (buttonId == R.id.pound) {
+          return KEY_FRAME_DURATION * 4;
+        } else if (buttonId == R.id.two) {
+          return KEY_FRAME_DURATION * 5;
+        } else if (buttonId == R.id.five) {
+          return KEY_FRAME_DURATION * 6;
+        } else if (buttonId == R.id.eight) {
+          return KEY_FRAME_DURATION * 7;
+        } else if (buttonId == R.id.zero) {
+          return KEY_FRAME_DURATION * 8;
+        } else if (buttonId == R.id.one) {
+          return KEY_FRAME_DURATION * 9;
+        } else if (buttonId == R.id.four) {
+          return KEY_FRAME_DURATION * 10;
+        } else if (buttonId == R.id.seven || buttonId == R.id.star) {
+          return KEY_FRAME_DURATION * 11;
+        }
+      } else {
+        if (buttonId == R.id.one) {
+          return KEY_FRAME_DURATION * 1;
+        } else if (buttonId == R.id.four) {
+          return KEY_FRAME_DURATION * 2;
+        } else if (buttonId == R.id.seven) {
+          return KEY_FRAME_DURATION * 3;
+        } else if (buttonId == R.id.star) {
+          return KEY_FRAME_DURATION * 4;
+        } else if (buttonId == R.id.two) {
+          return KEY_FRAME_DURATION * 5;
+        } else if (buttonId == R.id.five) {
+          return KEY_FRAME_DURATION * 6;
+        } else if (buttonId == R.id.eight) {
+          return KEY_FRAME_DURATION * 7;
+        } else if (buttonId == R.id.zero) {
+          return KEY_FRAME_DURATION * 8;
+        } else if (buttonId == R.id.three) {
+          return KEY_FRAME_DURATION * 9;
+        } else if (buttonId == R.id.six) {
+          return KEY_FRAME_DURATION * 10;
+        } else if (buttonId == R.id.nine || buttonId == R.id.pound) {
+          return KEY_FRAME_DURATION * 11;
+        }
+      }
+    } else {
+      if (buttonId == R.id.one) {
+        return KEY_FRAME_DURATION * 1;
+      } else if (buttonId == R.id.two) {
+        return KEY_FRAME_DURATION * 2;
+      } else if (buttonId == R.id.three) {
+        return KEY_FRAME_DURATION * 3;
+      } else if (buttonId == R.id.four) {
+        return KEY_FRAME_DURATION * 4;
+      } else if (buttonId == R.id.five) {
+        return KEY_FRAME_DURATION * 5;
+      } else if (buttonId == R.id.six) {
+        return KEY_FRAME_DURATION * 6;
+      } else if (buttonId == R.id.seven) {
+        return KEY_FRAME_DURATION * 7;
+      } else if (buttonId == R.id.eight) {
+        return KEY_FRAME_DURATION * 8;
+      } else if (buttonId == R.id.nine) {
+        return KEY_FRAME_DURATION * 9;
+      } else if (buttonId == R.id.star) {
+        return KEY_FRAME_DURATION * 10;
+      } else if (buttonId == R.id.zero || buttonId == R.id.pound) {
+        return KEY_FRAME_DURATION * 11;
+      }
+    }
+
+    Log.wtf(TAG, "Attempted to get animation delay for invalid key button id.");
+    return 0;
+  }
+
+  /**
+   * Get the button animation duration, taking into account whether the dialpad is in landscape
+   * left-to-right, landscape right-to-left, or portrait.
+   *
+   * @param buttonId The button ID.
+   * @return The animation duration.
+   */
+  private int getKeyButtonAnimationDuration(int buttonId) {
+    if (mIsLandscape) {
+      if (mIsRtl) {
+        if (buttonId == R.id.one
+            || buttonId == R.id.four
+            || buttonId == R.id.seven
+            || buttonId == R.id.star) {
+          return KEY_FRAME_DURATION * 8;
+        } else if (buttonId == R.id.two
+            || buttonId == R.id.five
+            || buttonId == R.id.eight
+            || buttonId == R.id.zero) {
+          return KEY_FRAME_DURATION * 9;
+        } else if (buttonId == R.id.three
+            || buttonId == R.id.six
+            || buttonId == R.id.nine
+            || buttonId == R.id.pound) {
+          return KEY_FRAME_DURATION * 10;
+        }
+      } else {
+        if (buttonId == R.id.one
+            || buttonId == R.id.four
+            || buttonId == R.id.seven
+            || buttonId == R.id.star) {
+          return KEY_FRAME_DURATION * 10;
+        } else if (buttonId == R.id.two
+            || buttonId == R.id.five
+            || buttonId == R.id.eight
+            || buttonId == R.id.zero) {
+          return KEY_FRAME_DURATION * 9;
+        } else if (buttonId == R.id.three
+            || buttonId == R.id.six
+            || buttonId == R.id.nine
+            || buttonId == R.id.pound) {
+          return KEY_FRAME_DURATION * 8;
+        }
+      }
+    } else {
+      if (buttonId == R.id.one
+          || buttonId == R.id.two
+          || buttonId == R.id.three
+          || buttonId == R.id.four
+          || buttonId == R.id.five
+          || buttonId == R.id.six) {
+        return KEY_FRAME_DURATION * 10;
+      } else if (buttonId == R.id.seven || buttonId == R.id.eight || buttonId == R.id.nine) {
+        return KEY_FRAME_DURATION * 9;
+      } else if (buttonId == R.id.star || buttonId == R.id.zero || buttonId == R.id.pound) {
+        return KEY_FRAME_DURATION * 8;
+      }
+    }
+
+    Log.wtf(TAG, "Attempted to get animation duration for invalid key button id.");
+    return 0;
+  }
+}
diff --git a/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DigitsEditText.java b/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DigitsEditText.java
new file mode 100644
index 0000000000..053b301eed
--- /dev/null
+++ b/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DigitsEditText.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.dialpadview;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.text.InputType;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.inputmethod.InputMethodManager;
+
+import com.android.dialer.widget.ResizingTextEditText;
+
+/** EditText which suppresses IME show up. */
+public class DigitsEditText extends ResizingTextEditText {
+  private OnTextContextMenuClickListener mOnTextContextMenuClickListener;
+
+  public DigitsEditText(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    setInputType(getInputType() | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+    setShowSoftInputOnFocus(false);
+  }
+
+  @Override
+  protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+    super.onFocusChanged(focused, direction, previouslyFocusedRect);
+    final InputMethodManager imm =
+        ((InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE));
+    if (imm != null && imm.isActive(this)) {
+      imm.hideSoftInputFromWindow(getApplicationWindowToken(), 0);
+    }
+  }
+
+  @Override
+  public boolean onTouchEvent(MotionEvent event) {
+    final boolean ret = super.onTouchEvent(event);
+    // Must be done after super.onTouchEvent()
+    final InputMethodManager imm =
+        ((InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE));
+    if (imm != null && imm.isActive(this)) {
+      imm.hideSoftInputFromWindow(getApplicationWindowToken(), 0);
+    }
+    return ret;
+  }
+
+  @Override
+  protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+    super.onTextChanged(text, start, lengthBefore, lengthAfter);
+    if (isCursorVisible()) {
+      setSelection(getText().length());
+    }
+  }
+
+  @Override
+  public boolean onTextContextMenuItem(int id) {
+    boolean value = super.onTextContextMenuItem(id);
+    if (mOnTextContextMenuClickListener != null) {
+      mOnTextContextMenuClickListener.onTextContextMenuClickListener(id);
+    }
+    return value;
+  }
+
+  public interface OnTextContextMenuClickListener {
+    void onTextContextMenuClickListener(int id);
+  }
+
+  public void setOnTextContextMenuClickListener(OnTextContextMenuClickListener listener) {
+    this.mOnTextContextMenuClickListener = listener;
+  }
+}
diff --git a/library/external/dialpad/src/main/java/com/android/dialer/util/ViewUtil.java b/library/external/dialpad/src/main/java/com/android/dialer/util/ViewUtil.java
new file mode 100644
index 0000000000..4f6d1dd47c
--- /dev/null
+++ b/library/external/dialpad/src/main/java/com/android/dialer/util/ViewUtil.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.util;
+
+import android.graphics.Paint;
+import android.util.TypedValue;
+import android.widget.TextView;
+
+/** Provides static functions to work with views */
+public class ViewUtil {
+
+  private ViewUtil() {}
+
+  public static void resizeText(TextView textView, int originalTextSize, int minTextSize) {
+    final Paint paint = textView.getPaint();
+    final int width = textView.getWidth();
+    if (width == 0) {
+      return;
+    }
+    textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, originalTextSize);
+    float ratio = width / paint.measureText(textView.getText().toString());
+    if (ratio <= 1.0f) {
+      textView.setTextSize(
+          TypedValue.COMPLEX_UNIT_PX, Math.max(minTextSize, originalTextSize * ratio));
+    }
+  }
+}
diff --git a/library/external/dialpad/src/main/java/com/android/dialer/widget/ResizingTextEditText.java b/library/external/dialpad/src/main/java/com/android/dialer/widget/ResizingTextEditText.java
new file mode 100644
index 0000000000..216175981b
--- /dev/null
+++ b/library/external/dialpad/src/main/java/com/android/dialer/widget/ResizingTextEditText.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.widget.EditText;
+import com.android.dialer.dialpadview.R;
+import com.android.dialer.util.ViewUtil;
+
+/** EditText which resizes dynamically with respect to text length. */
+public class ResizingTextEditText extends EditText {
+
+  private final int mOriginalTextSize;
+  private final int mMinTextSize;
+
+  public ResizingTextEditText(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    mOriginalTextSize = (int) getTextSize();
+    TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ResizingText);
+    mMinTextSize =
+        (int) a.getDimension(R.styleable.ResizingText_resizing_text_min_size, mOriginalTextSize);
+    a.recycle();
+  }
+
+  @Override
+  protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+    super.onTextChanged(text, start, lengthBefore, lengthAfter);
+    ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize);
+  }
+
+  @Override
+  protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+    super.onSizeChanged(w, h, oldw, oldh);
+    ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize);
+  }
+}
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..cd19726776
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_arrow_drop_down_white_18.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_arrow_drop_down_white_18.png
new file mode 100644
index 0000000000..41541bb0d0
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_arrow_drop_down_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_backspace_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_backspace_white_24.png
new file mode 100644
index 0000000000..136e8b8c1a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_backspace_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_block_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_block_white_24.png
new file mode 100644
index 0000000000..2ccc89d246
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_block_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png
new file mode 100644
index 0000000000..ec2349ca83
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_bluetooth_audio_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_bluetooth_audio_white_36.png
new file mode 100644
index 0000000000..398f0a938c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_bluetooth_audio_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_end_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_end_white_24.png
new file mode 100644
index 0000000000..625b827c44
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_end_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_end_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_end_white_36.png
new file mode 100644
index 0000000000..51456d3d5d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_end_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_made_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_made_white_24.png
new file mode 100644
index 0000000000..ea6a8ab5f2
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_made_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_merge_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_merge_white_36.png
new file mode 100644
index 0000000000..b7aba8072e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_merge_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_missed_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_missed_white_24.png
new file mode 100644
index 0000000000..f188eb9aa5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_missed_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_received_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_received_white_24.png
new file mode 100644
index 0000000000..ca2ae411a8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_received_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_white_18.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_white_18.png
new file mode 100644
index 0000000000..0bdc56be6f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_white_24.png
new file mode 100644
index 0000000000..4dc5065155
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_call_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_camera_alt_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_camera_alt_white_24.png
new file mode 100644
index 0000000000..497c88ca82
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_camera_alt_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_camera_alt_white_48.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_camera_alt_white_48.png
new file mode 100644
index 0000000000..c8e69dcebb
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_camera_alt_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_check_black_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_check_black_24.png
new file mode 100644
index 0000000000..e802d90aeb
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_check_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_check_circle_googblue_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_check_circle_googblue_24.png
new file mode 100644
index 0000000000..52ff857ba8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_check_circle_googblue_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_close_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_close_white_24.png
new file mode 100644
index 0000000000..ceb1a1eebf
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_close_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..6acef1745d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_delete_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_delete_white_24.png
new file mode 100644
index 0000000000..8444f31384
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_delete_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_dialpad_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_dialpad_white_24.png
new file mode 100644
index 0000000000..9037f94e84
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_dialpad_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_dialpad_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_dialpad_white_36.png
new file mode 100644
index 0000000000..82710e72a5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_dialpad_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_edit_grey600_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_edit_grey600_24.png
new file mode 100644
index 0000000000..4a27b46968
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_edit_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_forward_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_forward_white_24.png
new file mode 100644
index 0000000000..a0711d377e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_forward_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_fullscreen_exit_white_48.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_fullscreen_exit_white_48.png
new file mode 100644
index 0000000000..159bea7fd8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_fullscreen_exit_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_fullscreen_white_48.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_fullscreen_white_48.png
new file mode 100644
index 0000000000..9b8131124d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_fullscreen_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_grade_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_grade_white_24.png
new file mode 100644
index 0000000000..86eecdd4a0
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_grade_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_group_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_group_white_36.png
new file mode 100644
index 0000000000..f98a074ac1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_group_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_hd_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_hd_white_24.png
new file mode 100644
index 0000000000..35bf51a4f1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_hd_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_headset_grey600_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_headset_grey600_24.png
new file mode 100644
index 0000000000..e859c2f31a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_headset_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_headset_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_headset_white_36.png
new file mode 100644
index 0000000000..f77f24767c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_headset_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_history_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_history_white_24.png
new file mode 100644
index 0000000000..485c826fdf
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_history_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_image_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_image_white_24.png
new file mode 100644
index 0000000000..b414cf5b68
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_image_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_info_outline_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_info_outline_white_24.png
new file mode 100644
index 0000000000..c7b1113cfe
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_info_outline_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_message_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_message_white_24.png
new file mode 100644
index 0000000000..57177b7c6f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_message_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_mic_off_black_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_mic_off_black_24.png
new file mode 100644
index 0000000000..1755dbf3fa
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_mic_off_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_mic_off_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_mic_off_white_36.png
new file mode 100644
index 0000000000..203cb8a9ff
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_mic_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_more_vert_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_more_vert_white_24.png
new file mode 100644
index 0000000000..58e092b8af
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_more_vert_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_network_wifi_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_network_wifi_white_24.png
new file mode 100644
index 0000000000..8df91f2367
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_network_wifi_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_pause_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_pause_white_24.png
new file mode 100644
index 0000000000..4d2ea05c46
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_pause_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_pause_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_pause_white_36.png
new file mode 100644
index 0000000000..1d024393aa
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_pause_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_people_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_people_white_24.png
new file mode 100644
index 0000000000..25e443424e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_people_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_person_add_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_person_add_white_24.png
new file mode 100644
index 0000000000..10ae5a70c4
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_person_add_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_person_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_person_white_24.png
new file mode 100644
index 0000000000..56708b0bad
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_person_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_photo_library_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_photo_library_white_24.png
new file mode 100644
index 0000000000..c4a2229e94
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_photo_library_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_photo_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_photo_white_24.png
new file mode 100644
index 0000000000..b414cf5b68
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_photo_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_photo_white_48.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_photo_white_48.png
new file mode 100644
index 0000000000..f9f1defa6d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_photo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_play_arrow_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_play_arrow_white_24.png
new file mode 100644
index 0000000000..57c9fa5460
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_play_arrow_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_report_white_18.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_report_white_18.png
new file mode 100644
index 0000000000..f0bb6f5beb
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_report_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_report_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_report_white_24.png
new file mode 100644
index 0000000000..ff7d95706a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_report_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_report_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_report_white_36.png
new file mode 100644
index 0000000000..057d9c757c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_report_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_schedule_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_schedule_white_24.png
new file mode 100644
index 0000000000..4b7caa097c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_schedule_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_search_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_search_white_24.png
new file mode 100644
index 0000000000..bbfbc96cbc
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_search_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..5d4ad4b020
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png
new file mode 100644
index 0000000000..5a53192125
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_swap_calls_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_swap_calls_white_36.png
new file mode 100644
index 0000000000..8c3a0edaa3
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_swap_calls_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..4366bb0827
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_off_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_off_white_24.png
new file mode 100644
index 0000000000..aaf5ac2085
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_off_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_off_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_off_white_36.png
new file mode 100644
index 0000000000..f2e461a9f1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_white_18.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_white_18.png
new file mode 100644
index 0000000000..abf478adaa
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_white_24.png
new file mode 100644
index 0000000000..d83e0d50c3
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_white_36.png
new file mode 100644
index 0000000000..49562a6408
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_videocam_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_voicemail_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_voicemail_white_24.png
new file mode 100644
index 0000000000..03a62e15f9
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_voicemail_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_down_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_down_white_24.png
new file mode 100644
index 0000000000..e22e92c857
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_down_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_up_grey600_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_up_grey600_24.png
new file mode 100644
index 0000000000..49eb8fcc34
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_up_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_up_white_24.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_up_white_24.png
new file mode 100644
index 0000000000..57d787163e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_up_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_up_white_36.png b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_up_white_36.png
new file mode 100644
index 0000000000..62d22bec87
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-hdpi-v4/quantum_ic_volume_up_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..f517557627
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..90bf872ac8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..b8d4ce444b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..6c8174f3af
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-hdpi-v17/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..22a1140ae2
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..01b869a608
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..7933f42f0a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..b47cef666e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-mdpi-v17/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..d858f18e6c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..831b5249cb
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..4735a7d711
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..6a984c4f16
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xhdpi-v17/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..614ad49a3e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..71f3bd6838
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..4a9e2c24aa
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..907911055b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xxhdpi-v17/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..d409b544b7
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..3b2aed29b5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..0167ac8291
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..aa7a919430
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-ldrtl-xxxhdpi-v17/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..4ef72eec99
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_arrow_drop_down_white_18.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_arrow_drop_down_white_18.png
new file mode 100644
index 0000000000..7c1fc3d7ca
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_arrow_drop_down_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_backspace_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_backspace_white_24.png
new file mode 100644
index 0000000000..48863dcdd7
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_backspace_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_block_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_block_white_24.png
new file mode 100644
index 0000000000..ec1b33f0ea
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_block_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png
new file mode 100644
index 0000000000..de635e034d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_bluetooth_audio_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_bluetooth_audio_white_36.png
new file mode 100644
index 0000000000..046372d0df
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_bluetooth_audio_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_end_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_end_white_24.png
new file mode 100644
index 0000000000..378272ffc1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_end_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_end_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_end_white_36.png
new file mode 100644
index 0000000000..625b827c44
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_end_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_made_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_made_white_24.png
new file mode 100644
index 0000000000..9b3cd43803
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_made_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_merge_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_merge_white_36.png
new file mode 100644
index 0000000000..a2eb54bab1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_merge_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_missed_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_missed_white_24.png
new file mode 100644
index 0000000000..42c360b8a2
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_missed_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_received_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_received_white_24.png
new file mode 100644
index 0000000000..fbc1e86e24
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_received_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_white_18.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_white_18.png
new file mode 100644
index 0000000000..bd5748575f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_white_24.png
new file mode 100644
index 0000000000..77f9de5e3c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_call_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_camera_alt_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_camera_alt_white_24.png
new file mode 100644
index 0000000000..e830522008
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_camera_alt_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_camera_alt_white_48.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_camera_alt_white_48.png
new file mode 100644
index 0000000000..be9fb226a5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_camera_alt_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_check_black_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_check_black_24.png
new file mode 100644
index 0000000000..1c14c9c445
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_check_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_check_circle_googblue_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_check_circle_googblue_24.png
new file mode 100644
index 0000000000..eff5627225
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_check_circle_googblue_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_close_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_close_white_24.png
new file mode 100644
index 0000000000..af7f8288da
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_close_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..8ac80b083f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_delete_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_delete_white_24.png
new file mode 100644
index 0000000000..e2268c9bed
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_delete_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_dialpad_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_dialpad_white_24.png
new file mode 100644
index 0000000000..6c405f9ba9
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_dialpad_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_dialpad_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_dialpad_white_36.png
new file mode 100644
index 0000000000..9037f94e84
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_dialpad_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_edit_grey600_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_edit_grey600_24.png
new file mode 100644
index 0000000000..f003bc9d33
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_edit_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_forward_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_forward_white_24.png
new file mode 100644
index 0000000000..65f73299f9
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_forward_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_fullscreen_exit_white_48.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_fullscreen_exit_white_48.png
new file mode 100644
index 0000000000..364bad0b84
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_fullscreen_exit_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_fullscreen_white_48.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_fullscreen_white_48.png
new file mode 100644
index 0000000000..4423c7ce99
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_fullscreen_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_grade_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_grade_white_24.png
new file mode 100644
index 0000000000..d2cbe4c92b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_grade_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_group_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_group_white_36.png
new file mode 100644
index 0000000000..25e443424e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_group_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_hd_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_hd_white_24.png
new file mode 100644
index 0000000000..30938fe4d4
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_hd_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_headset_grey600_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_headset_grey600_24.png
new file mode 100644
index 0000000000..371efd3822
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_headset_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_headset_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_headset_white_36.png
new file mode 100644
index 0000000000..d25d3888e1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_headset_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_history_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_history_white_24.png
new file mode 100644
index 0000000000..d67647c560
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_history_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_image_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_image_white_24.png
new file mode 100644
index 0000000000..d474bd577d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_image_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_info_outline_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_info_outline_white_24.png
new file mode 100644
index 0000000000..353e064951
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_info_outline_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_message_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_message_white_24.png
new file mode 100644
index 0000000000..3072b75699
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_message_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_mic_off_black_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_mic_off_black_24.png
new file mode 100644
index 0000000000..da605a5a19
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_mic_off_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_mic_off_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_mic_off_white_36.png
new file mode 100644
index 0000000000..6fccf5d09f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_mic_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_more_vert_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_more_vert_white_24.png
new file mode 100644
index 0000000000..5ec0116f05
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_more_vert_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_network_wifi_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_network_wifi_white_24.png
new file mode 100644
index 0000000000..1c3e8b9879
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_network_wifi_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_pause_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_pause_white_24.png
new file mode 100644
index 0000000000..2272d478c3
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_pause_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_pause_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_pause_white_36.png
new file mode 100644
index 0000000000..4d2ea05c46
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_pause_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_people_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_people_white_24.png
new file mode 100644
index 0000000000..3f20e75533
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_people_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_person_add_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_person_add_white_24.png
new file mode 100644
index 0000000000..38e0a2882a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_person_add_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_person_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_person_white_24.png
new file mode 100644
index 0000000000..f0b1c725da
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_person_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_photo_library_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_photo_library_white_24.png
new file mode 100644
index 0000000000..02ef4cdb00
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_photo_library_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_photo_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_photo_white_24.png
new file mode 100644
index 0000000000..d474bd577d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_photo_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_photo_white_48.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_photo_white_48.png
new file mode 100644
index 0000000000..2642b9e09e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_photo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_play_arrow_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_play_arrow_white_24.png
new file mode 100644
index 0000000000..c61e948bbf
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_play_arrow_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_report_white_18.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_report_white_18.png
new file mode 100644
index 0000000000..63ef736834
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_report_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_report_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_report_white_24.png
new file mode 100644
index 0000000000..ac0f3948db
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_report_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_report_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_report_white_36.png
new file mode 100644
index 0000000000..ff7d95706a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_report_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_schedule_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_schedule_white_24.png
new file mode 100644
index 0000000000..f69736faa6
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_schedule_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_search_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_search_white_24.png
new file mode 100644
index 0000000000..faefc59c8e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_search_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..b58afb0b49
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png
new file mode 100644
index 0000000000..dd5a42f55c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_swap_calls_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_swap_calls_white_36.png
new file mode 100644
index 0000000000..9491f2d1af
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_swap_calls_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..b67f6a9116
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_off_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_off_white_24.png
new file mode 100644
index 0000000000..d1cca6f0a0
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_off_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_off_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_off_white_36.png
new file mode 100644
index 0000000000..aaf5ac2085
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_white_18.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_white_18.png
new file mode 100644
index 0000000000..1dafd49276
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_white_24.png
new file mode 100644
index 0000000000..d146209a51
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_white_36.png
new file mode 100644
index 0000000000..d83e0d50c3
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_videocam_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_voicemail_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_voicemail_white_24.png
new file mode 100644
index 0000000000..e5aa7db055
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_voicemail_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_down_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_down_white_24.png
new file mode 100644
index 0000000000..10992ed70c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_down_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_up_grey600_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_up_grey600_24.png
new file mode 100644
index 0000000000..d6cea3667a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_up_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_up_white_24.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_up_white_24.png
new file mode 100644
index 0000000000..7cfd4c7b88
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_up_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_up_white_36.png b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_up_white_36.png
new file mode 100644
index 0000000000..57d787163e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-mdpi-v4/quantum_ic_volume_up_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-v21/btn_dialpad_key.xml b/library/external/dialpad/src/main/res/drawable-v21/btn_dialpad_key.xml
new file mode 100644
index 0000000000..50614f9bed
--- /dev/null
+++ b/library/external/dialpad/src/main/res/drawable-v21/btn_dialpad_key.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?android:attr/colorControlHighlight"/>
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..832f5a3617
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_arrow_drop_down_white_18.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_arrow_drop_down_white_18.png
new file mode 100644
index 0000000000..4c6076df77
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_arrow_drop_down_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_backspace_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_backspace_white_24.png
new file mode 100644
index 0000000000..ec5412bd8a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_backspace_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_block_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_block_white_24.png
new file mode 100644
index 0000000000..7aba97b659
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_block_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png
new file mode 100644
index 0000000000..eea1bbf04b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_bluetooth_audio_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_bluetooth_audio_white_36.png
new file mode 100644
index 0000000000..d5022d063e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_bluetooth_audio_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_end_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_end_white_24.png
new file mode 100644
index 0000000000..a4fe6889d1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_end_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_end_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_end_white_36.png
new file mode 100644
index 0000000000..e1831d7afd
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_end_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_made_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_made_white_24.png
new file mode 100644
index 0000000000..7fe6941051
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_made_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_merge_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_merge_white_36.png
new file mode 100644
index 0000000000..01daecf656
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_merge_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_missed_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_missed_white_24.png
new file mode 100644
index 0000000000..dd64489aae
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_missed_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_received_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_received_white_24.png
new file mode 100644
index 0000000000..807308d9de
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_received_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_white_18.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_white_18.png
new file mode 100644
index 0000000000..4dc5065155
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_white_24.png
new file mode 100644
index 0000000000..ef45e933a9
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_call_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_camera_alt_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_camera_alt_white_24.png
new file mode 100644
index 0000000000..be9fb226a5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_camera_alt_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_camera_alt_white_48.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_camera_alt_white_48.png
new file mode 100644
index 0000000000..777658e955
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_camera_alt_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_check_black_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_check_black_24.png
new file mode 100644
index 0000000000..64a4944f75
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_check_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_check_circle_googblue_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_check_circle_googblue_24.png
new file mode 100644
index 0000000000..e31fcf3507
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_check_circle_googblue_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_close_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_close_white_24.png
new file mode 100644
index 0000000000..b7c7ffd0e7
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_close_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..ca62598599
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_delete_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_delete_white_24.png
new file mode 100644
index 0000000000..484260a971
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_delete_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_dialpad_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_dialpad_white_24.png
new file mode 100644
index 0000000000..0e89f6c74b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_dialpad_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_dialpad_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_dialpad_white_36.png
new file mode 100644
index 0000000000..175000510d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_dialpad_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_edit_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_edit_grey600_24.png
new file mode 100644
index 0000000000..b5b3a243c7
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_edit_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_forward_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_forward_white_24.png
new file mode 100644
index 0000000000..7a5df52bf0
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_forward_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_fullscreen_exit_white_48.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_fullscreen_exit_white_48.png
new file mode 100644
index 0000000000..ef360fe40c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_fullscreen_exit_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_fullscreen_white_48.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_fullscreen_white_48.png
new file mode 100644
index 0000000000..c1dcfb2902
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_fullscreen_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_grade_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_grade_white_24.png
new file mode 100644
index 0000000000..d65f39d7cc
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_grade_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_group_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_group_white_36.png
new file mode 100644
index 0000000000..7f0b7e903b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_group_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_hd_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_hd_white_24.png
new file mode 100644
index 0000000000..4c954d86f8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_hd_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_headset_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_headset_grey600_24.png
new file mode 100644
index 0000000000..f7dbee156b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_headset_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_headset_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_headset_white_36.png
new file mode 100644
index 0000000000..82db5427b7
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_headset_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_history_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_history_white_24.png
new file mode 100644
index 0000000000..3e73b49ee5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_history_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_image_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_image_white_24.png
new file mode 100644
index 0000000000..2642b9e09e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_image_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_info_outline_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_info_outline_white_24.png
new file mode 100644
index 0000000000..c571b2e3e7
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_info_outline_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_message_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_message_white_24.png
new file mode 100644
index 0000000000..763767b4f6
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_message_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_mic_off_black_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_mic_off_black_24.png
new file mode 100644
index 0000000000..fa741be1c0
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_mic_off_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_mic_off_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_mic_off_white_36.png
new file mode 100644
index 0000000000..7a15a9ea9e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_mic_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_more_vert_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_more_vert_white_24.png
new file mode 100644
index 0000000000..96e5d4321c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_more_vert_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_network_wifi_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_network_wifi_white_24.png
new file mode 100644
index 0000000000..ca927f3de5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_network_wifi_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_pause_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_pause_white_24.png
new file mode 100644
index 0000000000..f49aed7571
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_pause_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_pause_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_pause_white_36.png
new file mode 100644
index 0000000000..7192ad487e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_pause_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_people_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_people_white_24.png
new file mode 100644
index 0000000000..715b49a3c8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_people_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_person_add_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_person_add_white_24.png
new file mode 100644
index 0000000000..7e7c289d49
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_person_add_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_person_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_person_white_24.png
new file mode 100644
index 0000000000..aea15f0be5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_person_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_photo_library_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_photo_library_white_24.png
new file mode 100644
index 0000000000..4bd2898a83
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_photo_library_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_photo_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_photo_white_24.png
new file mode 100644
index 0000000000..2642b9e09e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_photo_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_photo_white_48.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_photo_white_48.png
new file mode 100644
index 0000000000..2ffdb55f26
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_photo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_play_arrow_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_play_arrow_white_24.png
new file mode 100644
index 0000000000..a3c80e73da
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_play_arrow_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_report_white_18.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_report_white_18.png
new file mode 100644
index 0000000000..dc0c995c17
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_report_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_report_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_report_white_24.png
new file mode 100644
index 0000000000..74fc594aab
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_report_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_report_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_report_white_36.png
new file mode 100644
index 0000000000..26b9172e8f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_report_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_schedule_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_schedule_white_24.png
new file mode 100644
index 0000000000..1749ea2758
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_schedule_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_search_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_search_white_24.png
new file mode 100644
index 0000000000..bfc3e39394
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_search_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..ef59e77678
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png
new file mode 100644
index 0000000000..28b5afa9d4
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_swap_calls_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_swap_calls_white_36.png
new file mode 100644
index 0000000000..698cd5d756
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_swap_calls_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..a5e719cdfb
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_off_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_off_white_24.png
new file mode 100644
index 0000000000..5d540589b4
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_off_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_off_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_off_white_36.png
new file mode 100644
index 0000000000..69565f2c75
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_white_18.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_white_18.png
new file mode 100644
index 0000000000..d83e0d50c3
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_white_24.png
new file mode 100644
index 0000000000..1b2583d34e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_white_36.png
new file mode 100644
index 0000000000..44c28e2f28
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_videocam_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_voicemail_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_voicemail_white_24.png
new file mode 100644
index 0000000000..59126d7066
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_voicemail_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_down_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_down_white_24.png
new file mode 100644
index 0000000000..2621bc15d3
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_down_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_up_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_up_grey600_24.png
new file mode 100644
index 0000000000..a45093ff79
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_up_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_up_white_24.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_up_white_24.png
new file mode 100644
index 0000000000..2ed00343b8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_up_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_up_white_36.png b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_up_white_36.png
new file mode 100644
index 0000000000..2e751a40f5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xhdpi-v4/quantum_ic_volume_up_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..32a6d91ce8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_arrow_drop_down_white_18.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_arrow_drop_down_white_18.png
new file mode 100644
index 0000000000..2609ae1341
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_arrow_drop_down_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_backspace_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_backspace_white_24.png
new file mode 100644
index 0000000000..f6a90accff
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_backspace_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_block_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_block_white_24.png
new file mode 100644
index 0000000000..fddfa54b85
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_block_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png
new file mode 100644
index 0000000000..99f57c12a8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_bluetooth_audio_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_bluetooth_audio_white_36.png
new file mode 100644
index 0000000000..6842da6d0a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_bluetooth_audio_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_end_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_end_white_24.png
new file mode 100644
index 0000000000..e1831d7afd
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_end_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_end_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_end_white_36.png
new file mode 100644
index 0000000000..13ffc2ad75
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_end_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_made_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_made_white_24.png
new file mode 100644
index 0000000000..ae471c9fc5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_made_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_merge_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_merge_white_36.png
new file mode 100644
index 0000000000..cefef6551b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_merge_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_missed_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_missed_white_24.png
new file mode 100644
index 0000000000..2374dc5a11
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_missed_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_received_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_received_white_24.png
new file mode 100644
index 0000000000..58421114fd
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_received_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_white_18.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_white_18.png
new file mode 100644
index 0000000000..6f4dcea1f3
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_white_24.png
new file mode 100644
index 0000000000..90ead2e455
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_call_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_camera_alt_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_camera_alt_white_24.png
new file mode 100644
index 0000000000..c8e69dcebb
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_camera_alt_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_camera_alt_white_48.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_camera_alt_white_48.png
new file mode 100644
index 0000000000..a4e7aea72d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_camera_alt_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_check_black_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_check_black_24.png
new file mode 100644
index 0000000000..b26a2c05e3
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_check_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_check_circle_googblue_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_check_circle_googblue_24.png
new file mode 100644
index 0000000000..a8eb2a45ec
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_check_circle_googblue_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_close_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_close_white_24.png
new file mode 100644
index 0000000000..6b717e0dda
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_close_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..c480ba78fe
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_delete_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_delete_white_24.png
new file mode 100644
index 0000000000..603f28cbd1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_delete_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_dialpad_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_dialpad_white_24.png
new file mode 100644
index 0000000000..175000510d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_dialpad_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_dialpad_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_dialpad_white_36.png
new file mode 100644
index 0000000000..54ebbafaeb
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_dialpad_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_edit_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_edit_grey600_24.png
new file mode 100644
index 0000000000..f1f9ffce89
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_edit_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_forward_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_forward_white_24.png
new file mode 100644
index 0000000000..7bd5b1635b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_forward_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_fullscreen_exit_white_48.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_fullscreen_exit_white_48.png
new file mode 100644
index 0000000000..b7f4133fd9
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_fullscreen_exit_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_fullscreen_white_48.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_fullscreen_white_48.png
new file mode 100644
index 0000000000..a0a1b4d4f3
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_fullscreen_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_grade_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_grade_white_24.png
new file mode 100644
index 0000000000..aa5879215e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_grade_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_group_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_group_white_36.png
new file mode 100644
index 0000000000..952e15fa69
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_group_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_hd_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_hd_white_24.png
new file mode 100644
index 0000000000..dd08bbbecc
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_hd_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_headset_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_headset_grey600_24.png
new file mode 100644
index 0000000000..de1739bf4f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_headset_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_headset_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_headset_white_36.png
new file mode 100644
index 0000000000..a0d8b14c04
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_headset_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_history_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_history_white_24.png
new file mode 100644
index 0000000000..1358a129cf
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_history_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_image_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_image_white_24.png
new file mode 100644
index 0000000000..f9f1defa6d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_image_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_info_outline_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_info_outline_white_24.png
new file mode 100644
index 0000000000..c41a5fcffa
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_info_outline_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_message_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_message_white_24.png
new file mode 100644
index 0000000000..0a79824b8f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_message_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_mic_off_black_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_mic_off_black_24.png
new file mode 100644
index 0000000000..084bf3c9f4
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_mic_off_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_mic_off_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_mic_off_white_36.png
new file mode 100644
index 0000000000..585d38326c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_mic_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_more_vert_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_more_vert_white_24.png
new file mode 100644
index 0000000000..801ad89095
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_more_vert_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_network_wifi_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_network_wifi_white_24.png
new file mode 100644
index 0000000000..75469cd852
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_network_wifi_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_pause_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_pause_white_24.png
new file mode 100644
index 0000000000..7192ad487e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_pause_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_pause_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_pause_white_36.png
new file mode 100644
index 0000000000..a03bad27ed
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_pause_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_people_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_people_white_24.png
new file mode 100644
index 0000000000..7f0b7e903b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_people_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_person_add_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_person_add_white_24.png
new file mode 100644
index 0000000000..8f744f0391
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_person_add_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_person_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_person_white_24.png
new file mode 100644
index 0000000000..184f7418d5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_person_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_photo_library_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_photo_library_white_24.png
new file mode 100644
index 0000000000..497479291e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_photo_library_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_photo_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_photo_white_24.png
new file mode 100644
index 0000000000..f9f1defa6d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_photo_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_photo_white_48.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_photo_white_48.png
new file mode 100644
index 0000000000..3fe5c5ceb6
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_photo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_play_arrow_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_play_arrow_white_24.png
new file mode 100644
index 0000000000..547ef30aac
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_play_arrow_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_report_white_18.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_report_white_18.png
new file mode 100644
index 0000000000..919a872e0e
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_report_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_report_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_report_white_24.png
new file mode 100644
index 0000000000..26b9172e8f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_report_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_report_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_report_white_36.png
new file mode 100644
index 0000000000..2040c36d57
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_report_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_schedule_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_schedule_white_24.png
new file mode 100644
index 0000000000..96df1fbac0
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_schedule_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_search_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_search_white_24.png
new file mode 100644
index 0000000000..abbb989510
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_search_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..0c5256413c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png
new file mode 100644
index 0000000000..f4105ec8d1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_swap_calls_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_swap_calls_white_36.png
new file mode 100644
index 0000000000..140da28a8c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_swap_calls_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..8745f69ffc
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_off_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_off_white_24.png
new file mode 100644
index 0000000000..69565f2c75
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_off_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_off_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_off_white_36.png
new file mode 100644
index 0000000000..ff84832956
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_white_18.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_white_18.png
new file mode 100644
index 0000000000..49562a6408
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_white_24.png
new file mode 100644
index 0000000000..44c28e2f28
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_white_36.png
new file mode 100644
index 0000000000..839af26f82
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_videocam_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_voicemail_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_voicemail_white_24.png
new file mode 100644
index 0000000000..28b8e936a0
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_voicemail_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_down_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_down_white_24.png
new file mode 100644
index 0000000000..5eb8b671f2
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_down_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_up_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_up_grey600_24.png
new file mode 100644
index 0000000000..413b386524
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_up_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_up_white_24.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_up_white_24.png
new file mode 100644
index 0000000000..2e751a40f5
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_up_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_up_white_36.png b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_up_white_36.png
new file mode 100644
index 0000000000..96c1f982fb
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxhdpi-v4/quantum_ic_volume_up_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_arrow_back_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_arrow_back_white_24.png
new file mode 100644
index 0000000000..e27034d678
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_arrow_back_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_arrow_drop_down_white_18.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_arrow_drop_down_white_18.png
new file mode 100644
index 0000000000..c19c19d2bd
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_arrow_drop_down_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_backspace_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_backspace_white_24.png
new file mode 100644
index 0000000000..88131b9aff
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_backspace_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_block_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_block_white_24.png
new file mode 100644
index 0000000000..0378d1bedc
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_block_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png
new file mode 100644
index 0000000000..1595be1697
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_bluetooth_audio_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_bluetooth_audio_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_bluetooth_audio_white_36.png
new file mode 100644
index 0000000000..3fe7c23502
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_bluetooth_audio_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_end_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_end_white_24.png
new file mode 100644
index 0000000000..8801d0ded4
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_end_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_end_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_end_white_36.png
new file mode 100644
index 0000000000..c8099a1a15
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_end_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_made_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_made_white_24.png
new file mode 100644
index 0000000000..844ef86a07
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_made_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_merge_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_merge_white_36.png
new file mode 100644
index 0000000000..9419ffbbc9
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_merge_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_missed_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_missed_white_24.png
new file mode 100644
index 0000000000..b1321a9aed
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_missed_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_received_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_received_white_24.png
new file mode 100644
index 0000000000..417999c85a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_received_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_white_18.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_white_18.png
new file mode 100644
index 0000000000..90ead2e455
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_white_24.png
new file mode 100644
index 0000000000..b0e020573d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_call_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_camera_alt_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_camera_alt_white_24.png
new file mode 100644
index 0000000000..777658e955
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_camera_alt_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_camera_alt_white_48.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_camera_alt_white_48.png
new file mode 100644
index 0000000000..f2fe54bd51
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_camera_alt_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_check_black_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_check_black_24.png
new file mode 100644
index 0000000000..2f6d6386de
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_check_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_check_circle_googblue_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_check_circle_googblue_24.png
new file mode 100644
index 0000000000..7e08f61086
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_check_circle_googblue_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_close_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_close_white_24.png
new file mode 100644
index 0000000000..3964192192
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_close_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_content_copy_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_content_copy_grey600_24.png
new file mode 100644
index 0000000000..f0ea085c90
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_content_copy_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_delete_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_delete_white_24.png
new file mode 100644
index 0000000000..c582dc2a49
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_delete_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_dialpad_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_dialpad_white_24.png
new file mode 100644
index 0000000000..eb4307aeb2
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_dialpad_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_dialpad_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_dialpad_white_36.png
new file mode 100644
index 0000000000..a53aeb1d33
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_dialpad_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_edit_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_edit_grey600_24.png
new file mode 100644
index 0000000000..a61298dbe6
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_edit_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_forward_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_forward_white_24.png
new file mode 100644
index 0000000000..428009cfef
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_forward_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_fullscreen_exit_white_48.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_fullscreen_exit_white_48.png
new file mode 100644
index 0000000000..b47b3f8bdb
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_fullscreen_exit_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_fullscreen_white_48.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_fullscreen_white_48.png
new file mode 100644
index 0000000000..ea9f18ae63
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_fullscreen_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_grade_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_grade_white_24.png
new file mode 100644
index 0000000000..7f38d09639
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_grade_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_group_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_group_white_36.png
new file mode 100644
index 0000000000..dacf299327
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_group_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_hd_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_hd_white_24.png
new file mode 100644
index 0000000000..3f87b882ee
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_hd_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_headset_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_headset_grey600_24.png
new file mode 100644
index 0000000000..e968fa7d12
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_headset_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_headset_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_headset_white_36.png
new file mode 100644
index 0000000000..89b9910476
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_headset_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_history_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_history_white_24.png
new file mode 100644
index 0000000000..5b99ef6550
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_history_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_image_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_image_white_24.png
new file mode 100644
index 0000000000..2ffdb55f26
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_image_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_info_outline_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_info_outline_white_24.png
new file mode 100644
index 0000000000..3a82cab3b4
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_info_outline_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_message_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_message_white_24.png
new file mode 100644
index 0000000000..fa7c17ac45
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_message_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_mic_off_black_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_mic_off_black_24.png
new file mode 100644
index 0000000000..90d0606a45
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_mic_off_black_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_mic_off_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_mic_off_white_36.png
new file mode 100644
index 0000000000..b0a10fbf67
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_mic_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_more_vert_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_more_vert_white_24.png
new file mode 100644
index 0000000000..7a97f4cb70
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_more_vert_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_network_wifi_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_network_wifi_white_24.png
new file mode 100644
index 0000000000..eb284e3838
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_network_wifi_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_pause_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_pause_white_24.png
new file mode 100644
index 0000000000..660ac65858
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_pause_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_pause_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_pause_white_36.png
new file mode 100644
index 0000000000..3ea7e03e5d
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_pause_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_people_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_people_white_24.png
new file mode 100644
index 0000000000..f52bd1ae59
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_people_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_person_add_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_person_add_white_24.png
new file mode 100644
index 0000000000..2fa2cca80c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_person_add_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_person_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_person_white_24.png
new file mode 100644
index 0000000000..33d40d8b62
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_person_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_photo_library_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_photo_library_white_24.png
new file mode 100644
index 0000000000..8627f42767
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_photo_library_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_photo_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_photo_white_24.png
new file mode 100644
index 0000000000..2ffdb55f26
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_photo_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_photo_white_48.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_photo_white_48.png
new file mode 100644
index 0000000000..7d5091ded8
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_photo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_play_arrow_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_play_arrow_white_24.png
new file mode 100644
index 0000000000..be5c062b5f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_play_arrow_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_report_white_18.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_report_white_18.png
new file mode 100644
index 0000000000..aed7668042
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_report_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_report_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_report_white_24.png
new file mode 100644
index 0000000000..023a56e76a
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_report_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_report_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_report_white_36.png
new file mode 100644
index 0000000000..1912789d2f
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_report_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_schedule_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_schedule_white_24.png
new file mode 100644
index 0000000000..19390a8bd2
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_schedule_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_search_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_search_white_24.png
new file mode 100644
index 0000000000..dd5adfc7f9
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_search_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_send_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_send_white_24.png
new file mode 100644
index 0000000000..9dfa888c15
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_send_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png
new file mode 100644
index 0000000000..58a4f9c945
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_signal_wifi_4_bar_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_swap_calls_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_swap_calls_white_36.png
new file mode 100644
index 0000000000..f8470b5dc0
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_swap_calls_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_undo_white_48.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_undo_white_48.png
new file mode 100644
index 0000000000..6d703c6ae2
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_undo_white_48.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_off_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_off_white_24.png
new file mode 100644
index 0000000000..bf37b57f9c
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_off_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_off_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_off_white_36.png
new file mode 100644
index 0000000000..7a915c30db
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_off_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_white_18.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_white_18.png
new file mode 100644
index 0000000000..44c28e2f28
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_white_18.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_white_24.png
new file mode 100644
index 0000000000..ed20c07062
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_white_36.png
new file mode 100644
index 0000000000..eff5923da4
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_videocam_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_voicemail_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_voicemail_white_24.png
new file mode 100644
index 0000000000..820ff5066b
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_voicemail_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_down_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_down_white_24.png
new file mode 100644
index 0000000000..4ab55abbd1
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_down_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_up_grey600_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_up_grey600_24.png
new file mode 100644
index 0000000000..429dc02df0
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_up_grey600_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_up_white_24.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_up_white_24.png
new file mode 100644
index 0000000000..82972b4e59
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_up_white_24.png differ
diff --git a/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_up_white_36.png b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_up_white_36.png
new file mode 100644
index 0000000000..fd633b6cb4
Binary files /dev/null and b/library/external/dialpad/src/main/res/drawable-xxxhdpi-v4/quantum_ic_volume_up_white_36.png differ
diff --git a/library/external/dialpad/src/main/res/drawable/btn_dialpad_key.xml b/library/external/dialpad/src/main/res/drawable/btn_dialpad_key.xml
new file mode 100644
index 0000000000..10099df046
--- /dev/null
+++ b/library/external/dialpad/src/main/res/drawable/btn_dialpad_key.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="oval">
+            <solid android:color="@color/dialpad_ripple_color"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@android:color/transparent"/>
+        </shape>
+    </item>
+</selector>
diff --git a/library/external/dialpad/src/main/res/layout/dialpad.xml b/library/external/dialpad/src/main/res/layout/dialpad.xml
new file mode 100644
index 0000000000..ec8450c7b5
--- /dev/null
+++ b/library/external/dialpad/src/main/res/layout/dialpad.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Dialpad in the Phone app. -->
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/dialpad"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:orientation="vertical">
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:orientation="horizontal">
+    <Space style="@style/DialpadSpaceStyle"/>
+    <include layout="@layout/dialpad_key_one"/>
+    <include
+      android:id="@+id/two"
+      style="@style/DialpadKeyButtonStyle"
+      layout="@layout/dialpad_key"/>
+    <include
+      android:id="@+id/three"
+      style="@style/DialpadKeyButtonStyle"
+      layout="@layout/dialpad_key"/>
+    <Space style="@style/DialpadSpaceStyle"/>
+  </LinearLayout>
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:orientation="horizontal">
+    <Space style="@style/DialpadSpaceStyle"/>
+    <include
+      android:id="@+id/four"
+      style="@style/DialpadKeyButtonStyle"
+      layout="@layout/dialpad_key"/>
+    <include
+      android:id="@+id/five"
+      style="@style/DialpadKeyButtonStyle"
+      layout="@layout/dialpad_key"/>
+    <include
+      android:id="@+id/six"
+      style="@style/DialpadKeyButtonStyle"
+      layout="@layout/dialpad_key"/>
+    <Space style="@style/DialpadSpaceStyle"/>
+  </LinearLayout>
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:orientation="horizontal">
+    <Space style="@style/DialpadSpaceStyle"/>
+    <include
+      android:id="@+id/seven"
+      style="@style/DialpadKeyButtonStyle"
+      layout="@layout/dialpad_key"/>
+    <include
+      android:id="@+id/eight"
+      style="@style/DialpadKeyButtonStyle"
+      layout="@layout/dialpad_key"/>
+    <include
+      android:id="@+id/nine"
+      style="@style/DialpadKeyButtonStyle"
+      layout="@layout/dialpad_key"/>
+    <Space style="@style/DialpadSpaceStyle"/>
+  </LinearLayout>
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:orientation="horizontal">
+    <Space style="@style/DialpadSpaceStyle"/>
+    <include layout="@layout/dialpad_key_star"/>
+    <include layout="@layout/dialpad_key_zero"/>
+    <include layout="@layout/dialpad_key_pound"/>
+    <Space style="@style/DialpadSpaceStyle"/>
+  </LinearLayout>
+</LinearLayout>
diff --git a/library/external/dialpad/src/main/res/layout/dialpad_fragment.xml b/library/external/dialpad/src/main/res/layout/dialpad_fragment.xml
new file mode 100644
index 0000000000..4e9a5f330c
--- /dev/null
+++ b/library/external/dialpad/src/main/res/layout/dialpad_fragment.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:weightSum="5">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="4">
+
+        <include layout="@layout/dialpad_view" />
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/quantum_ic_call_white_24" />
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/library/external/dialpad/src/main/res/layout/dialpad_key.xml b/library/external/dialpad/src/main/res/layout/dialpad_key.xml
new file mode 100644
index 0000000000..77e4fc53a6
--- /dev/null
+++ b/library/external/dialpad/src/main/res/layout/dialpad_key.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- A layout representing a single key in the dialpad -->
+<com.android.dialer.dialpadview.DialpadKeyButton
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/DialpadKeyButtonStyle">
+
+  <LinearLayout style="@style/DialpadKeyInternalLayoutStyle">
+
+    <!-- Note in the referenced styles that we assign hard widths to these components
+         because we want them to line up vertically when we arrange them in an MxN grid -->
+
+    <com.android.dialer.dialpadview.DialpadTextView
+      android:id="@+id/dialpad_key_number"
+      style="@style/DialpadKeyNumberStyle"/>
+
+    <TextView
+      android:id="@+id/dialpad_key_letters"
+      style="@style/DialpadKeyLettersStyle"/>
+  </LinearLayout>
+</com.android.dialer.dialpadview.DialpadKeyButton>
diff --git a/library/external/dialpad/src/main/res/layout/dialpad_key_one.xml b/library/external/dialpad/src/main/res/layout/dialpad_key_one.xml
new file mode 100644
index 0000000000..2ef0baa1de
--- /dev/null
+++ b/library/external/dialpad/src/main/res/layout/dialpad_key_one.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.dialer.dialpadview.DialpadKeyButton
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/one"
+  style="@style/DialpadKeyButtonStyle">
+  <LinearLayout
+    style="@style/DialpadKeyInternalLayoutStyle">
+    <com.android.dialer.dialpadview.DialpadTextView
+      android:id="@+id/dialpad_key_number"
+      style="@style/DialpadKeyNumberStyle"/>
+    <RelativeLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
+      <ImageView
+        android:id="@+id/dialpad_key_voicemail"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
+        android:scaleType="fitCenter"
+        android:src="@drawable/quantum_ic_voicemail_white_24"
+        android:tint="@color/dialpad_voicemail_tint"/>
+      <!-- Place empty text view so vertical height is same as other dialpad keys. -->
+      <TextView style="@style/DialpadKeyLettersStyle"/>
+    </RelativeLayout>
+  </LinearLayout>
+</com.android.dialer.dialpadview.DialpadKeyButton>
diff --git a/library/external/dialpad/src/main/res/layout/dialpad_key_pound.xml b/library/external/dialpad/src/main/res/layout/dialpad_key_pound.xml
new file mode 100644
index 0000000000..d37a6aa788
--- /dev/null
+++ b/library/external/dialpad/src/main/res/layout/dialpad_key_pound.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.dialer.dialpadview.DialpadKeyButton
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/pound"
+  style="@style/DialpadKeyButtonStyle">
+  <LinearLayout
+    style="@style/DialpadKeyInternalLayoutStyle">
+    <com.android.dialer.dialpadview.DialpadTextView
+      android:id="@id/dialpad_key_number"
+      style="@style/DialpadKeyPoundStyle"/>
+  </LinearLayout>
+</com.android.dialer.dialpadview.DialpadKeyButton>
diff --git a/library/external/dialpad/src/main/res/layout/dialpad_key_star.xml b/library/external/dialpad/src/main/res/layout/dialpad_key_star.xml
new file mode 100644
index 0000000000..d288475d01
--- /dev/null
+++ b/library/external/dialpad/src/main/res/layout/dialpad_key_star.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.dialer.dialpadview.DialpadKeyButton
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/star"
+  style="@style/DialpadKeyButtonStyle">
+  <LinearLayout
+    style="@style/DialpadKeyInternalLayoutStyle">
+    <com.android.dialer.dialpadview.DialpadTextView
+      android:id="@+id/dialpad_key_number"
+      style="@style/DialpadKeyStarStyle"/>
+  </LinearLayout>
+</com.android.dialer.dialpadview.DialpadKeyButton>
diff --git a/library/external/dialpad/src/main/res/layout/dialpad_key_zero.xml b/library/external/dialpad/src/main/res/layout/dialpad_key_zero.xml
new file mode 100644
index 0000000000..943ae48dd2
--- /dev/null
+++ b/library/external/dialpad/src/main/res/layout/dialpad_key_zero.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- A layout representing the zero key in the dialpad, with the plus sign shifted up because it is
+     smaller than a regular letter -->
+<com.android.dialer.dialpadview.DialpadKeyButton
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/zero"
+  style="@style/DialpadKeyButtonStyle">
+
+  <LinearLayout style="@style/DialpadKeyInternalLayoutStyle">
+
+    <!-- Note in the referenced styles that we assign hard widths to these components
+         because we want them to line up vertically when we arrange them in an MxN grid -->
+
+    <com.android.dialer.dialpadview.DialpadTextView
+      android:id="@+id/dialpad_key_number"
+      style="@style/DialpadBottomKeyNumberStyle"/>
+
+    <TextView
+      android:id="@+id/dialpad_key_letters"
+      style="@style/DialpadKeyLettersStyle"/>
+  </LinearLayout>
+</com.android.dialer.dialpadview.DialpadKeyButton>
diff --git a/library/external/dialpad/src/main/res/layout/dialpad_view.xml b/library/external/dialpad/src/main/res/layout/dialpad_view.xml
new file mode 100644
index 0000000000..fb14ad0989
--- /dev/null
+++ b/library/external/dialpad/src/main/res/layout/dialpad_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false">
+  <include layout="@layout/dialpad_view_unthemed"/>
+</FrameLayout>
diff --git a/library/external/dialpad/src/main/res/layout/dialpad_view_unthemed.xml b/library/external/dialpad/src/main/res/layout/dialpad_view_unthemed.xml
new file mode 100644
index 0000000000..1b7b78f907
--- /dev/null
+++ b/library/external/dialpad/src/main/res/layout/dialpad_view_unthemed.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/dialpad_view"
+  class="com.android.dialer.dialpadview.DialpadView"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:layout_gravity="bottom"
+  android:clickable="true"
+  android:elevation="0dp"
+  android:layoutDirection="ltr"
+  android:orientation="vertical">
+
+  <!-- Text field where call rate is displayed for ILD calls. -->
+  <LinearLayout
+    android:id="@+id/rate_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:visibility="gone">
+
+    <LinearLayout
+      android:id="@+id/ild_container"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/ild_margin_height"
+      android:layout_marginBottom="@dimen/ild_margin_height"
+      android:layout_gravity="center_horizontal"
+      android:orientation="horizontal">
+
+      <TextView
+        android:id="@+id/ild_country"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+      <TextView
+        android:id="@+id/ild_rate"
+        android:textStyle="bold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"/>
+
+    </LinearLayout>
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="#e3e3e3"/>
+
+  </LinearLayout>
+
+  <!-- Text field and possibly soft menu button above the keypad where
+   the digits are displayed. -->
+  <LinearLayout
+    android:id="@+id/digits_container"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dialpad_digits_height"
+    android:orientation="horizontal">
+
+    <ImageButton
+      android:id="@+id/dialpad_back"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:layout_margin="@dimen/dialpad_overflow_margin"
+      android:paddingLeft="@dimen/dialpad_digits_menu_left_padding"
+      android:paddingRight="@dimen/dialpad_digits_menu_right_padding"
+      android:background="@drawable/btn_dialpad_key"
+      android:contentDescription="@string/description_dialpad_back"
+      android:gravity="center"
+      android:src="@drawable/quantum_ic_close_white_24"
+      android:tint="@color/dialpad_icon_tint"
+      android:tintMode="src_in"
+      android:visibility="gone"/>
+
+    <ImageButton
+      android:id="@+id/dialpad_overflow"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:layout_margin="@dimen/dialpad_overflow_margin"
+      android:paddingLeft="@dimen/dialpad_digits_menu_left_padding"
+      android:paddingRight="@dimen/dialpad_digits_menu_right_padding"
+      android:background="@drawable/btn_dialpad_key"
+      android:contentDescription="@string/description_dialpad_overflow"
+      android:gravity="center"
+      android:src="@drawable/quantum_ic_more_vert_white_24"
+      android:tint="@color/dialpad_icon_tint"
+      android:tintMode="src_in"
+      android:visibility="gone"/>
+
+    <view xmlns:ex="http://schemas.android.com/apk/res-auto"
+      android:id="@+id/digits"
+      class="com.android.dialer.dialpadview.DigitsEditText"
+      android:textStyle="normal"
+      android:layout_width="0dp"
+      android:layout_height="match_parent"
+      android:layout_weight="1"
+      android:background="@android:color/transparent"
+      android:cursorVisible="false"
+      android:focusableInTouchMode="true"
+      android:fontFamily="sans-serif"
+      android:freezesText="true"
+      android:gravity="center"
+      android:maxLines="1"
+      android:scrollHorizontally="true"
+      android:singleLine="true"
+      android:textColor="@color/dialpad_digits_text_color"
+      android:textCursorDrawable="@null"
+      android:textSize="@dimen/dialpad_digits_text_size"
+      ex:resizing_text_min_size="@dimen/dialpad_digits_text_min_size"/>
+
+    <ImageButton
+      android:id="@+id/deleteButton"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:paddingLeft="@dimen/dialpad_digits_padding"
+      android:paddingRight="@dimen/dialpad_digits_padding"
+      android:background="@drawable/btn_dialpad_key"
+      android:contentDescription="@string/description_delete_button"
+      android:src="@drawable/quantum_ic_backspace_white_24"
+      android:state_enabled="false"
+      android:tint="@color/dialpad_icon_tint"
+      android:tintMode="src_in"/>
+  </LinearLayout>
+
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="#e3e3e3"/>
+
+  <Space
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dialpad_space_above_keys"/>
+
+  <include layout="@layout/dialpad"/>
+
+  <Space
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dialpad_space_below_keys"/>
+
+</view>
diff --git a/library/external/dialpad/src/main/res/values-af/values-af.xml b/library/external/dialpad/src/main/res/values-af/values-af.xml
new file mode 100644
index 0000000000..6a93515ac0
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-af/values-af.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Gaan terug"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Meer opsies"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"stemboodskap"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-am/values-am.xml b/library/external/dialpad/src/main/res/values-am/values-am.xml
new file mode 100644
index 0000000000..08955ffeec
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-am/values-am.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"የኋሊት ደምሳሽ"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"ወደኋላ ያስሱ"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"ተጨማሪ አማራጮች"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"የመደመር ምልክት"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"የድምፅ መልዕክት"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ar/values-ar.xml b/library/external/dialpad/src/main/res/values-ar/values-ar.xml
new file mode 100644
index 0000000000..e791d1e5f2
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ar/values-ar.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"مسافة للخلف"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"الرجوع"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"مزيد من الخيارات"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"علامة الجمع"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"بريد صوتي"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-az/values-az.xml b/library/external/dialpad/src/main/res/values-az/values-az.xml
new file mode 100644
index 0000000000..152fdea46e
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-az/values-az.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"geri düyməsi"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Geri naviqasiya edin"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Daha çox seçim"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"səsli məktub"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-b+sr+Latn/values-b+sr+Latn.xml b/library/external/dialpad/src/main/res/values-b+sr+Latn/values-b+sr+Latn.xml
new file mode 100644
index 0000000000..4925383c9c
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-b+sr+Latn/values-b+sr+Latn.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Idite nazad"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Još opcija"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"govorna pošta"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-be/values-be.xml b/library/external/dialpad/src/main/res/values-be/values-be.xml
new file mode 100644
index 0000000000..3b795ba0f6
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-be/values-be.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Перайсці назад"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Дадатковыя параметры"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"плюс"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"галасавая пошта"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-bg/values-bg.xml b/library/external/dialpad/src/main/res/values-bg/values-bg.xml
new file mode 100644
index 0000000000..aa464b870b
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-bg/values-bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Преминаване назад"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Още опции"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"плюс"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"гласова поща"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-bn/values-bn.xml b/library/external/dialpad/src/main/res/values-bn/values-bn.xml
new file mode 100644
index 0000000000..78efb7eb12
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-bn/values-bn.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"ব্যাক-স্পেস"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"পিছনে যান"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"আরো বিকল্প"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"যোগ চিহ্ন"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ভয়েসমেল"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-bs/values-bs.xml b/library/external/dialpad/src/main/res/values-bs/values-bs.xml
new file mode 100644
index 0000000000..6782138188
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-bs/values-bs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"tipka za brisanje"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Vrati se nazad"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Više opcija"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"govorna pošta"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ca/values-ca.xml b/library/external/dialpad/src/main/res/values-ca/values-ca.xml
new file mode 100644
index 0000000000..b4c70bdc49
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ca/values-ca.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"retrocés"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Torna enrere"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Més opcions"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"més"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"missatge de veu"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-cs/values-cs.xml b/library/external/dialpad/src/main/res/values-cs/values-cs.xml
new file mode 100644
index 0000000000..b9f770215c
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-cs/values-cs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"Backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Přejít zpět"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Více možností"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"hlasová zpráva"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-da/values-da.xml b/library/external/dialpad/src/main/res/values-da/values-da.xml
new file mode 100644
index 0000000000..b842e27303
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-da/values-da.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"tilbagetast"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Naviger tilbage"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Flere valgmuligheder"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"telefonsvarer"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-de/values-de.xml b/library/external/dialpad/src/main/res/values-de/values-de.xml
new file mode 100644
index 0000000000..7d3f7b9a77
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-de/values-de.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"Rücktaste"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Zurück"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Mehr Optionen"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"Plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"Mailboxnachricht"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-el/values-el.xml b/library/external/dialpad/src/main/res/values-el/values-el.xml
new file mode 100644
index 0000000000..1998e9e464
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-el/values-el.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Μετάβαση πίσω"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Περισσότερες επιλογές"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"συν"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"αυτόματος τηλεφωνητής"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-en-rAU/values-en-rAU.xml b/library/external/dialpad/src/main/res/values-en-rAU/values-en-rAU.xml
new file mode 100644
index 0000000000..5281387a9d
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-en-rAU/values-en-rAU.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Navigate back"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"More options"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"voicemail"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-en-rGB/values-en-rGB.xml b/library/external/dialpad/src/main/res/values-en-rGB/values-en-rGB.xml
new file mode 100644
index 0000000000..5281387a9d
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-en-rGB/values-en-rGB.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Navigate back"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"More options"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"voicemail"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-en-rIN/values-en-rIN.xml b/library/external/dialpad/src/main/res/values-en-rIN/values-en-rIN.xml
new file mode 100644
index 0000000000..5281387a9d
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-en-rIN/values-en-rIN.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Navigate back"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"More options"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"voicemail"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-es-rUS/values-es-rUS.xml b/library/external/dialpad/src/main/res/values-es-rUS/values-es-rUS.xml
new file mode 100644
index 0000000000..0eda697d16
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-es-rUS/values-es-rUS.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"retroceso"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Volver"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Más opciones"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"más"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"buzón de voz"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-es/values-es.xml b/library/external/dialpad/src/main/res/values-es/values-es.xml
new file mode 100644
index 0000000000..3386a4e7e9
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-es/values-es.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"retroceso"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Volver"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Más opciones"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"más"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"mensaje de voz"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-et/values-et.xml b/library/external/dialpad/src/main/res/values-et/values-et.xml
new file mode 100644
index 0000000000..05499ef49f
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-et/values-et.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"tagasilüke"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Tagasi navigeerimine"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Rohkem valikuid"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"pluss"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"kõnepostisõnum"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-eu/values-eu.xml b/library/external/dialpad/src/main/res/values-eu/values-eu.xml
new file mode 100644
index 0000000000..788a168eb6
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-eu/values-eu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"atzera tekla"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Egin atzera"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Aukera gehiago"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"gehi"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"erantzungailua"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-fa/values-fa.xml b/library/external/dialpad/src/main/res/values-fa/values-fa.xml
new file mode 100644
index 0000000000..e28807f063
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-fa/values-fa.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"برگشت به عقب"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"پیمایش به عقب"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"گزینه‌های بیشتر"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"به‌علاوه"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"پست صوتی"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-fi/values-fi.xml b/library/external/dialpad/src/main/res/values-fi/values-fi.xml
new file mode 100644
index 0000000000..30ec4d5c8c
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-fi/values-fi.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"askelpalautin"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Siirry takaisin"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Lisää vaihtoehtoja"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ääniviesti"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-fr-rCA/values-fr-rCA.xml b/library/external/dialpad/src/main/res/values-fr-rCA/values-fr-rCA.xml
new file mode 100644
index 0000000000..e2dc9e4527
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-fr-rCA/values-fr-rCA.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"retour arrière"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Naviguer vers l\'arrière"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Plus d\'options"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"messagerie vocale"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-fr/values-fr.xml b/library/external/dialpad/src/main/res/values-fr/values-fr.xml
new file mode 100644
index 0000000000..265b089baf
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-fr/values-fr.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"retour arrière"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Revenir en arrière"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Plus d\'options"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"message vocal"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-gl/values-gl.xml b/library/external/dialpad/src/main/res/values-gl/values-gl.xml
new file mode 100644
index 0000000000..932feba9df
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-gl/values-gl.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"retroceso"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Volver á vista anterior"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Máis opcións"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"máis"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"correo de voz"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-gu/values-gu.xml b/library/external/dialpad/src/main/res/values-gu/values-gu.xml
new file mode 100644
index 0000000000..78997a8be6
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-gu/values-gu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"પાછળ નૅવિગેટ કરો"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"વધુ વિકલ્પો"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"પ્લસ"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"વૉઇસમેઇલ"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-hi/values-hi.xml b/library/external/dialpad/src/main/res/values-hi/values-hi.xml
new file mode 100644
index 0000000000..cc10b134ee
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-hi/values-hi.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"वापस नेविगेट करें"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"अधिक विकल्प"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"धन का चिह्न"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"वॉइसमेल"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-hr/values-hr.xml b/library/external/dialpad/src/main/res/values-hr/values-hr.xml
new file mode 100644
index 0000000000..19f1922c5f
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-hr/values-hr.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"povratna tipka"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Kretanje natrag"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Više opcija"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"govorna pošta"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-hu/values-hu.xml b/library/external/dialpad/src/main/res/values-hu/values-hu.xml
new file mode 100644
index 0000000000..4aa7a3943d
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-hu/values-hu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"Backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Vissza"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"További beállítások"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plusz"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"hangposta"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-hy/values-hy.xml b/library/external/dialpad/src/main/res/values-hy/values-hy.xml
new file mode 100644
index 0000000000..0c13c0e156
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-hy/values-hy.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"հետշարժ"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Հետ գնալ"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Այլ ընտրանքներ"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"գումարում"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ձայնային փոստ"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-in/values-in.xml b/library/external/dialpad/src/main/res/values-in/values-in.xml
new file mode 100644
index 0000000000..9384f9c220
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-in/values-in.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Tombol kembali"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Opsi lainnya"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"tambah"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"pesan suara"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-is/values-is.xml b/library/external/dialpad/src/main/res/values-is/values-is.xml
new file mode 100644
index 0000000000..bbf02c8e91
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-is/values-is.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"bakklykill"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Fara til baka"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Fleiri valkostir"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plús"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"talhólfsskilaboð"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-it/values-it.xml b/library/external/dialpad/src/main/res/values-it/values-it.xml
new file mode 100644
index 0000000000..563975ce15
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-it/values-it.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Torna indietro"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Altre opzioni"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"più"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"messaggio vocale"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-iw/values-iw.xml b/library/external/dialpad/src/main/res/values-iw/values-iw.xml
new file mode 100644
index 0000000000..34493a8ac6
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-iw/values-iw.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"Backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"ניווט חזרה"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"אפשרויות נוספות"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"פלוס"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"דואר קולי"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ja/values-ja.xml b/library/external/dialpad/src/main/res/values-ja/values-ja.xml
new file mode 100644
index 0000000000..b8c17100c2
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ja/values-ja.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"Backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"戻る"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"その他のオプション"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"足す"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ボイスメール"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ka/values-ka.xml b/library/external/dialpad/src/main/res/values-ka/values-ka.xml
new file mode 100644
index 0000000000..2613d048a4
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ka/values-ka.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"უკუშლა"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"უკან დაბრუნება"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"სხვა პარამეტრები"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"პლუსი"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ხმოვანი ფოსტა"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-kk/values-kk.xml b/library/external/dialpad/src/main/res/values-kk/values-kk.xml
new file mode 100644
index 0000000000..65015a6e66
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-kk/values-kk.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"Backspace пернесі"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Артқа қайту"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Басқа опциялар"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"қосу"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"дауыстық пошта"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-km/values-km.xml b/library/external/dialpad/src/main/res/values-km/values-km.xml
new file mode 100644
index 0000000000..bb4754c842
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-km/values-km.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"លុប​ថយក្រោយ"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"រក​មើលថយ​ក្រោយ​វិញ"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"ជម្រើស​បន្ថែម"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"សារ​ជា​សំឡេង"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-kn/values-kn.xml b/library/external/dialpad/src/main/res/values-kn/values-kn.xml
new file mode 100644
index 0000000000..e49a0633bc
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-kn/values-kn.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"ಹಿಂದಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡು"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"ಸಂಕಲನ"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ಧ್ವನಿಮೇಲ್"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ko/values-ko.xml b/library/external/dialpad/src/main/res/values-ko/values-ko.xml
new file mode 100644
index 0000000000..f9ebed349a
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ko/values-ko.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"백스페이스"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"뒤로 이동"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"옵션 더보기"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"더하기"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"음성사서함"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ky/values-ky.xml b/library/external/dialpad/src/main/res/values-ky/values-ky.xml
new file mode 100644
index 0000000000..a894cd7cf2
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ky/values-ky.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"артка карай өчүрүү"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Артка кайтуу"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Көбүрөөк мүмкүнчүлүктөр"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"кошуу"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"үн почтасы"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-land/values-land.xml b/library/external/dialpad/src/main/res/values-land/values-land.xml
new file mode 100644
index 0000000000..364bf95f05
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-land/values-land.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialpad_bottom_space_height">65dp</dimen>
+    <dimen name="dialpad_key_margin_right">5dp</dimen>
+    <dimen name="dialpad_key_number_width">20sp</dimen>
+    <dimen name="dialpad_key_one_margin_right">3dp</dimen>
+    <dimen name="dialpad_key_text_width">35dp</dimen>
+    <dimen name="dialpad_symbol_margin_bottom">0dp</dimen>
+    <style name="DialpadKeyLettersStyle">
+    <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+    <item name="android:textSize">@dimen/dialpad_key_letters_size</item>
+    <item name="android:fontFamily">sans-serif-regular</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:gravity">left</item>
+  </style>
+    <style name="DialpadKeyNumberStyle">
+    <item name="android:textColor">?attr/colorPrimary</item>
+    <item name="android:textSize">@dimen/dialpad_key_numbers_default_size</item>
+    <item name="android:fontFamily">sans-serif-light</item>
+    <item name="android:layout_width">@dimen/dialpad_key_number_width</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginBottom">@dimen/dialpad_key_number_default_margin_bottom</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-lo/values-lo.xml b/library/external/dialpad/src/main/res/values-lo/values-lo.xml
new file mode 100644
index 0000000000..e73d68cc95
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-lo/values-lo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"ປຸ່ມ backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"ນຳທາງກັບຄືນ"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"ໂຕເລືອກເພີ່ມເຕີມ"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"ບວກ"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ຂໍ້ຄວາມສຽງ"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-lt/values-lt.xml b/library/external/dialpad/src/main/res/values-lt/values-lt.xml
new file mode 100644
index 0000000000..858ca29dc9
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-lt/values-lt.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"naikinimo klavišas"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Eiti atgal"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Daugiau parinkčių"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"sudėties ženklas"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"balso pašto pranešimas"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-lv/values-lv.xml b/library/external/dialpad/src/main/res/values-lv/values-lv.xml
new file mode 100644
index 0000000000..70a59dc3b5
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-lv/values-lv.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"atpakaļatkāpe"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Pāriet atpakaļ"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Vairāk opciju"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"pluszīme"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"balss pasts"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-mk/values-mk.xml b/library/external/dialpad/src/main/res/values-mk/values-mk.xml
new file mode 100644
index 0000000000..0f958f19a0
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-mk/values-mk.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"избриши"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Оди назад"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Повеќе опции"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"плус"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"говорна пошта"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ml/values-ml.xml b/library/external/dialpad/src/main/res/values-ml/values-ml.xml
new file mode 100644
index 0000000000..43dbec3911
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ml/values-ml.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"ബാക്ക്‌സ്‌പെയ്‌സ്"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"തിരികെ പോകുക"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"കൂടുതൽ‍ ഓപ്‌ഷനുകള്‍"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"പ്ലസ്"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"വോയ്‌സ്‌മെയിൽ"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-mn/values-mn.xml b/library/external/dialpad/src/main/res/values-mn/values-mn.xml
new file mode 100644
index 0000000000..86e965baf5
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-mn/values-mn.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"ухраах"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Буцах"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Нэмэлт сонголтууд"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"нэмэх"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"дуут шуудан"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-mr/values-mr.xml b/library/external/dialpad/src/main/res/values-mr/values-mr.xml
new file mode 100644
index 0000000000..385a98df01
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-mr/values-mr.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"मागे नेव्हिगेट करा"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"अधिक पर्याय"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"अधिक"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"व्हॉइसमेल"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ms/values-ms.xml b/library/external/dialpad/src/main/res/values-ms/values-ms.xml
new file mode 100644
index 0000000000..a41274606d
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ms/values-ms.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"undur ruang"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Navigasi kembali"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Lagi pilihan"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"tambah"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"mel suara"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-my/values-my.xml b/library/external/dialpad/src/main/res/values-my/values-my.xml
new file mode 100644
index 0000000000..7e1ff4231c
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-my/values-my.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"နောက်ပြန်ဖျက်ခလုတ်"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"အနောက်သို့ ပြန်သွားပါ"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"ပိုမိုရွေးချယ်စရာများ"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"အပေါင်း လက္ခဏာ"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"အသံမေးလ်"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-nb/values-nb.xml b/library/external/dialpad/src/main/res/values-nb/values-nb.xml
new file mode 100644
index 0000000000..cd08c3b339
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-nb/values-nb.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"tilbaketast"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Gå tilbake"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Flere alternativer"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"pluss"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"talepost"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ne/values-ne.xml b/library/external/dialpad/src/main/res/values-ne/values-ne.xml
new file mode 100644
index 0000000000..28ec947b80
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ne/values-ne.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"ब्याकस्पेस"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"पछाडि नेभिगेट गर्नुहोस्"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"थप विकल्पहरू"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"जोड"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"भ्वाइसमेल"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-nl/values-nl.xml b/library/external/dialpad/src/main/res/values-nl/values-nl.xml
new file mode 100644
index 0000000000..6e3badad9d
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-nl/values-nl.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Terug navigeren"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Meer opties"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"voicemail"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-no/values-no.xml b/library/external/dialpad/src/main/res/values-no/values-no.xml
new file mode 100644
index 0000000000..cd08c3b339
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-no/values-no.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"tilbaketast"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Gå tilbake"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Flere alternativer"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"pluss"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"talepost"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-pa/values-pa.xml b/library/external/dialpad/src/main/res/values-pa/values-pa.xml
new file mode 100644
index 0000000000..add9e7a3bd
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-pa/values-pa.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"ਬੈਕਸਪੇਸ"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"ਪਿੱਛੇ ਆਵਾਗੌਣ ਕਰੋ"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"ਹੋਰ ਚੋਣਾਂ"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"ਪਲਸ"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ਵੌਇਸਮੇਲ"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-pl/values-pl.xml b/library/external/dialpad/src/main/res/values-pl/values-pl.xml
new file mode 100644
index 0000000000..94c00bb06a
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-pl/values-pl.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"usuń"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Wstecz"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Więcej opcji"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"poczta głosowa"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-pt-rBR/values-pt-rBR.xml b/library/external/dialpad/src/main/res/values-pt-rBR/values-pt-rBR.xml
new file mode 100644
index 0000000000..49ae0d6428
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-pt-rBR/values-pt-rBR.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"voltar"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Voltar"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Mais opções"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"mais"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"correio de voz"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-pt-rPT/values-pt-rPT.xml b/library/external/dialpad/src/main/res/values-pt-rPT/values-pt-rPT.xml
new file mode 100644
index 0000000000..5d42ca8b61
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-pt-rPT/values-pt-rPT.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"retrocesso"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Navegar para trás"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Mais opções"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"mais"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"mensagem de correio de voz"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-pt/values-pt.xml b/library/external/dialpad/src/main/res/values-pt/values-pt.xml
new file mode 100644
index 0000000000..49ae0d6428
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-pt/values-pt.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"voltar"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Voltar"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Mais opções"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"mais"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"correio de voz"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ro/values-ro.xml b/library/external/dialpad/src/main/res/values-ro/values-ro.xml
new file mode 100644
index 0000000000..34f7e9fe03
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ro/values-ro.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"tasta backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Navigați înapoi"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Mai multe opțiuni"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"mesaj vocal"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ru/values-ru.xml b/library/external/dialpad/src/main/res/values-ru/values-ru.xml
new file mode 100644
index 0000000000..261fdf0ee6
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ru/values-ru.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"клавиша Backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Вернуться"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Ещё"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"плюс"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"голосовая почта"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-si/values-si.xml b/library/external/dialpad/src/main/res/values-si/values-si.xml
new file mode 100644
index 0000000000..09a999100f
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-si/values-si.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace බොත්තම"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"ආපසු සංචාලනය කරන්න"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"තවත් විකල්ප"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"ධන"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"හඬ තැපෑල"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-sk/values-sk.xml b/library/external/dialpad/src/main/res/values-sk/values-sk.xml
new file mode 100644
index 0000000000..6b8990a941
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-sk/values-sk.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"spätné mazanie"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Prejsť späť"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Ďalšie možnosti"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"hlasová správa"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-sl/values-sl.xml b/library/external/dialpad/src/main/res/values-sl/values-sl.xml
new file mode 100644
index 0000000000..2abde10f12
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-sl/values-sl.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"vračalka"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Pomik nazaj"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Več možnosti"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"sporočilo v odzivniku"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-sq/values-sq.xml b/library/external/dialpad/src/main/res/values-sq/values-sq.xml
new file mode 100644
index 0000000000..22400298fb
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-sq/values-sq.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"kthim prapa"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Kthehu prapa"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Opsione të tjera"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"postë zanore"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-sr/values-sr.xml b/library/external/dialpad/src/main/res/values-sr/values-sr.xml
new file mode 100644
index 0000000000..6f1beb2900
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-sr/values-sr.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Идите назад"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Још опција"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"плус"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"говорна пошта"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-sv/values-sv.xml b/library/external/dialpad/src/main/res/values-sv/values-sv.xml
new file mode 100644
index 0000000000..25de9491a7
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-sv/values-sv.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backsteg"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Tillbaka"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Fler alternativ"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"röstbrevlåda"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-sw/values-sw.xml b/library/external/dialpad/src/main/res/values-sw/values-sw.xml
new file mode 100644
index 0000000000..e4273eca9a
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-sw/values-sw.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"nafasi ya nyuma"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Rudi nyuma"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Chaguo zaidi"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"jumlisha"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ujumbe wa sauti"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ta/values-ta.xml b/library/external/dialpad/src/main/res/values-ta/values-ta.xml
new file mode 100644
index 0000000000..1412f6ae92
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ta/values-ta.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"பேக்ஸ்பேஸ்"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"பின் செல்லும்"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"மேலும் விருப்பங்கள்"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"பிளஸ்"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"குரலஞ்சல்"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-te/values-te.xml b/library/external/dialpad/src/main/res/values-te/values-te.xml
new file mode 100644
index 0000000000..ad60e2fd31
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-te/values-te.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"బ్యాక్‌స్పేస్"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"వెనుకకు నావిగేట్ చేస్తుంది"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"మరిన్ని ఎంపికలు"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"కూడిక"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"వాయిస్ మెయిల్"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-th/values-th.xml b/library/external/dialpad/src/main/res/values-th/values-th.xml
new file mode 100644
index 0000000000..a9240af28a
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-th/values-th.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"ลบถอยหลัง"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"ย้อนกลับ"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"ตัวเลือกเพิ่มเติม"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"บวก"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ข้อความเสียง"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-tl/values-tl.xml b/library/external/dialpad/src/main/res/values-tl/values-tl.xml
new file mode 100644
index 0000000000..f5ec293cc3
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-tl/values-tl.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Nagna-navigate pabalik"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Higit pang mga pagpipilian"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"plus"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"voicemail"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-tr/values-tr.xml b/library/external/dialpad/src/main/res/values-tr/values-tr.xml
new file mode 100644
index 0000000000..6006ed5857
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-tr/values-tr.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"geri tuşu"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Geri dön"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Diğer seçenekler"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"artı"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"sesli mesaj"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-uk/values-uk.xml b/library/external/dialpad/src/main/res/values-uk/values-uk.xml
new file mode 100644
index 0000000000..0d235facdf
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-uk/values-uk.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"видалення символів перед курсором"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Назад"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Інші варіанти"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"плюс"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"голосова пошта"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-ur/values-ur.xml b/library/external/dialpad/src/main/res/values-ur/values-ur.xml
new file mode 100644
index 0000000000..721322d66d
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-ur/values-ur.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"بیک اسپیس"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"پیچھے کو نیویگیٹ کریں"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"مزید اختیارات"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"جمع"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"صوتی میل"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-uz/values-uz.xml b/library/external/dialpad/src/main/res/values-uz/values-uz.xml
new file mode 100644
index 0000000000..74e39230ef
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-uz/values-uz.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"orqaga"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Orqaga qaytish"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Boshqa parametrlar"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"qo‘shuv belgisi"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ovozli pochta"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-vi/values-vi.xml b/library/external/dialpad/src/main/res/values-vi/values-vi.xml
new file mode 100644
index 0000000000..cc83289497
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-vi/values-vi.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"phím lùi"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Điều hướng trở lại"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Tùy chọn khác"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"cộng"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"thư thoại"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-zh-rCN/values-zh-rCN.xml b/library/external/dialpad/src/main/res/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000000..95bc2d1160
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"删除"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"返回"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"更多选项"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"加号"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"语音邮件"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-zh-rHK/values-zh-rHK.xml b/library/external/dialpad/src/main/res/values-zh-rHK/values-zh-rHK.xml
new file mode 100644
index 0000000000..6631ffe940
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-zh-rHK/values-zh-rHK.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"退格鍵"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"返回"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"更多選項"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"加號"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"留言"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-zh-rTW/values-zh-rTW.xml b/library/external/dialpad/src/main/res/values-zh-rTW/values-zh-rTW.xml
new file mode 100644
index 0000000000..bb486569a0
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"Backspace 鍵"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"返回"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"更多選項"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"加號"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"語音留言"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values-zu/values-zu.xml b/library/external/dialpad/src/main/res/values-zu/values-zu.xml
new file mode 100644
index 0000000000..023f3aec62
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values-zu/values-zu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string msgid="8431313818404527096" name="description_delete_button">"i-backspace"</string>
+    <string msgid="6226488105558971135" name="description_dialpad_back">"Zulazula uye emuva"</string>
+    <string msgid="5984341386518189787" name="description_dialpad_overflow">"Izinketho eziningi"</string>
+    <string msgid="8936338119824589388" name="description_image_button_plus">"hlanganisa"</string>
+    <string msgid="4187006295368768215" name="description_voicemail_button">"ivoyisimeyili"</string>
+</resources>
\ No newline at end of file
diff --git a/library/external/dialpad/src/main/res/values/values.xml b/library/external/dialpad/src/main/res/values/values.xml
new file mode 100644
index 0000000000..71d9b27cef
--- /dev/null
+++ b/library/external/dialpad/src/main/res/values/values.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr format="reference" name="dialpad_style"/>
+    <color name="background_dialpad">#fcfcfc</color>
+    <color name="background_dialpad_pressed">#ececec</color>
+    <color name="dialpad_digits_text_color">#333</color>
+    <color name="dialpad_icon_tint">#89000000</color>
+    <color name="dialpad_ripple_color">#10000000</color>
+    <color name="dialpad_secondary_text_color">#737373</color>
+    <color name="dialpad_separator_line_color">#dadada</color>
+    <color name="dialpad_voicemail_tint">#919191</color>
+    <declare-styleable name="ResizingText"><attr format="dimension" name="resizing_text_min_size"/></declare-styleable>
+    <dimen name="dialpad_bottom_space_height">80dp</dimen>
+    <dimen name="dialpad_button_margin">2dp</dimen>
+    <dimen name="dialpad_center_margin">3dp</dimen>
+    <dimen name="dialpad_digits_height">60dp</dimen>
+    <dimen name="dialpad_digits_menu_left_padding">8dp</dimen>
+    <dimen name="dialpad_digits_menu_right_padding">10dp</dimen>
+    <dimen name="dialpad_digits_padding">16dp</dimen>
+    <dimen name="dialpad_digits_text_min_size">24sp</dimen>
+    <dimen name="dialpad_digits_text_size">34sp</dimen>
+    <dimen name="dialpad_horizontal_padding">5dp</dimen>
+    <dimen name="dialpad_key_button_translate_y">100dp</dimen>
+    <dimen name="dialpad_key_height">64dp</dimen>
+    <dimen name="dialpad_key_letters_size">12sp</dimen>
+    <dimen name="dialpad_key_number_default_margin_bottom">3dp</dimen>
+    <dimen name="dialpad_key_numbers_default_size">36sp</dimen>
+    <dimen name="dialpad_key_plus_size">18sp</dimen>
+    <dimen name="dialpad_key_pound_size">23sp</dimen>
+    <dimen name="dialpad_key_star_size">36sp</dimen>
+    <dimen name="dialpad_overflow_margin">8dp</dimen>
+    <dimen name="dialpad_space_above_keys">14dp</dimen>
+    <dimen name="dialpad_space_below_keys">8dp</dimen>
+    <dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
+    <dimen name="dialpad_voicemail_icon_padding_top">2dp</dimen>
+    <dimen name="dialpad_zero_key_number_default_margin_bottom">1dp</dimen>
+    <dimen name="ild_margin_height">10dp</dimen>
+    <integer name="dialpad_slide_in_duration">400</integer>
+    <integer name="dialpad_slide_out_duration">400</integer>
+    <string name="description_delete_button">backspace</string>
+    <string name="description_dialpad_back">Navigate back</string>
+    <string name="description_dialpad_overflow">More options</string>
+    <string name="description_image_button_plus">plus</string>
+    <string name="description_voicemail_button">voicemail</string>
+    <string name="dialpad_0_letters" translatable="false">+</string>
+    <string name="dialpad_1_letters" translatable="false"/>
+    <string name="dialpad_2_letters" translatable="false">ABC</string>
+    <string name="dialpad_3_letters" translatable="false">DEF</string>
+    <string name="dialpad_4_letters" translatable="false">GHI</string>
+    <string name="dialpad_5_letters" translatable="false">JKL</string>
+    <string name="dialpad_6_letters" translatable="false">MNO</string>
+    <string name="dialpad_7_letters" translatable="false">PQRS</string>
+    <string name="dialpad_8_letters" translatable="false">TUV</string>
+    <string name="dialpad_9_letters" translatable="false">WXYZ</string>
+    <string name="dialpad_pound_letters" translatable="false"/>
+    <string name="dialpad_pound_number" translatable="false">#</string>
+    <string name="dialpad_star_letters" translatable="false"/>
+    <string name="dialpad_star_number" translatable="false">*</string>
+    <style name="DialpadBottomKeyNumberStyle" parent="DialpadKeyNumberStyle">
+    <item name="android:layout_marginBottom">@dimen/dialpad_zero_key_number_default_margin_bottom</item>
+  </style>
+    <style name="DialpadKeyButtonStyle">
+    <item name="android:soundEffectsEnabled">false</item>
+    <item name="android:clickable">true</item>
+    <item name="android:layout_width">0dp</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_weight">13</item>
+    <item name="android:minHeight">@dimen/dialpad_key_height</item>
+    <item name="android:focusable">true</item>
+    <item name="android:background">@drawable/btn_dialpad_key</item>
+  </style>
+    <style name="DialpadKeyInternalLayoutStyle">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_gravity">center</item>
+    <item name="android:gravity">center</item>
+    <item name="android:orientation">vertical</item>
+  </style>
+    <style name="DialpadKeyLettersStyle">
+    <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+    <item name="android:textSize">@dimen/dialpad_key_letters_size</item>
+    <item name="android:fontFamily">sans-serif-regular</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:gravity">center_horizontal</item>
+  </style>
+    <style name="DialpadKeyNumberStyle">
+    <item name="android:textColor">?attr/colorPrimary</item>
+    <item name="android:textSize">@dimen/dialpad_key_numbers_default_size</item>
+    <item name="android:fontFamily">sans-serif-light</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginBottom">@dimen/dialpad_key_number_default_margin_bottom</item>
+    <item name="android:gravity">center</item>
+  </style>
+    <style name="DialpadKeyPoundStyle">
+    <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+    <item name="android:textSize">@dimen/dialpad_key_pound_size</item>
+    <item name="android:fontFamily">sans-serif-light</item>
+    <item name="android:alpha">0.8</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>
+    <item name="android:gravity">center</item>
+  </style>
+    <style name="DialpadKeyStarStyle">
+    <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+    <item name="android:textSize">@dimen/dialpad_key_star_size</item>
+    <item name="android:fontFamily">sans-serif-light</item>
+    <item name="android:alpha">0.8</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>
+    <item name="android:gravity">center</item>
+  </style>
+    <style name="DialpadSpaceStyle">
+    <item name="android:layout_width">0dp</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_weight">3</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/library/diff-match-patch/.gitignore b/library/external/diff-match-patch/.gitignore
similarity index 100%
rename from library/diff-match-patch/.gitignore
rename to library/external/diff-match-patch/.gitignore
diff --git a/library/diff-match-patch/build.gradle b/library/external/diff-match-patch/build.gradle
similarity index 100%
rename from library/diff-match-patch/build.gradle
rename to library/external/diff-match-patch/build.gradle
diff --git a/library/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java b/library/external/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java
similarity index 100%
rename from library/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java
rename to library/external/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java
diff --git a/library/jsonviewer/.gitignore b/library/external/jsonviewer/.gitignore
similarity index 100%
rename from library/jsonviewer/.gitignore
rename to library/external/jsonviewer/.gitignore
diff --git a/library/jsonviewer/build.gradle b/library/external/jsonviewer/build.gradle
similarity index 84%
rename from library/jsonviewer/build.gradle
rename to library/external/jsonviewer/build.gradle
index ad472b0b54..a5d297b860 100644
--- a/library/jsonviewer/build.gradle
+++ b/library/external/jsonviewer/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.devtools.ksp'
 
 buildscript {
     repositories {
@@ -17,6 +18,8 @@ buildscript {
 }
 
 android {
+    namespace "org.billcarsonfr.jsonviewer"
+
     compileSdk versions.compileSdk
 
     defaultConfig {
@@ -51,17 +54,18 @@ dependencies {
     implementation libs.androidx.recyclerview
 
     implementation libs.airbnb.epoxy
-    kapt libs.airbnb.epoxyProcessor
+    ksp libs.airbnb.epoxyProcessor
 
     implementation libs.airbnb.mavericks
     // Span utils
-    implementation 'me.gujun.android:span:1.7'
-
+    implementation('me.gujun.android:span:1.7') {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
 
     implementation libs.jetbrains.coroutinesCore
     implementation libs.jetbrains.coroutinesAndroid
 
-    testImplementation 'org.json:json:20220320'
+    testImplementation 'org.json:json:20220924'
     testImplementation libs.tests.junit
     androidTestImplementation libs.androidx.junit
     androidTestImplementation libs.androidx.espressoCore
diff --git a/library/external/jsonviewer/src/main/AndroidManifest.xml b/library/external/jsonviewer/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..cc947c5679
--- /dev/null
+++ b/library/external/jsonviewer/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest />
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt
similarity index 84%
rename from library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt
rename to library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt
index 0ebf539d4d..696655a19f 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt
+++ b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.fragment.app.DialogFragment
 import com.airbnb.mvrx.Mavericks
+import im.vector.lib.core.utils.compat.getParcelableCompat
 
 class JSonViewerDialog : DialogFragment() {
 
@@ -36,16 +37,17 @@ class JSonViewerDialog : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val args: JSonViewerFragmentArgs = arguments?.getParcelable(Mavericks.KEY_ARG) ?: return
+        val args: JSonViewerFragmentArgs = arguments?.getParcelableCompat(Mavericks.KEY_ARG) ?: return
         if (savedInstanceState == null) {
             childFragmentManager.beginTransaction()
                     .replace(
-                            R.id.fragmentContainer, JSonViewerFragment.newInstance(
-                            args.jsonString,
-                            args.defaultOpenDepth,
-                            true,
-                            args.styleProvider
-                    )
+                            R.id.fragmentContainer,
+                            JSonViewerFragment.newInstance(
+                                    args.jsonString,
+                                    args.defaultOpenDepth,
+                                    true,
+                                    args.styleProvider
+                            )
                     )
                     .commitNow()
         }
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerEpoxyController.kt b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerEpoxyController.kt
similarity index 100%
rename from library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerEpoxyController.kt
rename to library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerEpoxyController.kt
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt
similarity index 95%
rename from library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt
rename to library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt
index fbf6f88bc3..f7c7f4d7bc 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt
+++ b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt
@@ -28,6 +28,7 @@ import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.MavericksView
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -53,7 +54,7 @@ class JSonViewerFragment : Fragment(), MavericksView {
             container: ViewGroup?,
             savedInstanceState: Bundle?
     ): View? {
-        val args: JSonViewerFragmentArgs? = arguments?.getParcelable(Mavericks.KEY_ARG)
+        val args: JSonViewerFragmentArgs? = arguments?.getParcelableCompat(Mavericks.KEY_ARG)
         val inflate =
                 if (args?.wrap == true) {
                     inflater.inflate(R.layout.fragment_jv_recycler_view_wrap, container, false)
@@ -62,7 +63,7 @@ class JSonViewerFragment : Fragment(), MavericksView {
                 }
         recyclerView = inflate.findViewById(R.id.jvRecyclerView)
         recyclerView.layoutManager =
-                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+                LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
         recyclerView.setController(epoxyController)
         epoxyController.setStyle(args?.styleProvider)
         registerForContextMenu(recyclerView)
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerModel.kt b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerModel.kt
similarity index 100%
rename from library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerModel.kt
rename to library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerModel.kt
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerStyleProvider.kt b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerStyleProvider.kt
similarity index 100%
rename from library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerStyleProvider.kt
rename to library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerStyleProvider.kt
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerViewModel.kt b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerViewModel.kt
similarity index 100%
rename from library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerViewModel.kt
rename to library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerViewModel.kt
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/Utils.kt b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/Utils.kt
similarity index 100%
rename from library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/Utils.kt
rename to library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/Utils.kt
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt
similarity index 100%
rename from library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt
rename to library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt
diff --git a/library/jsonviewer/src/main/res/layout/fragment_dialog_jv.xml b/library/external/jsonviewer/src/main/res/layout/fragment_dialog_jv.xml
similarity index 100%
rename from library/jsonviewer/src/main/res/layout/fragment_dialog_jv.xml
rename to library/external/jsonviewer/src/main/res/layout/fragment_dialog_jv.xml
diff --git a/library/jsonviewer/src/main/res/layout/fragment_jv_recycler_view.xml b/library/external/jsonviewer/src/main/res/layout/fragment_jv_recycler_view.xml
similarity index 100%
rename from library/jsonviewer/src/main/res/layout/fragment_jv_recycler_view.xml
rename to library/external/jsonviewer/src/main/res/layout/fragment_jv_recycler_view.xml
diff --git a/library/jsonviewer/src/main/res/layout/fragment_jv_recycler_view_wrap.xml b/library/external/jsonviewer/src/main/res/layout/fragment_jv_recycler_view_wrap.xml
similarity index 100%
rename from library/jsonviewer/src/main/res/layout/fragment_jv_recycler_view_wrap.xml
rename to library/external/jsonviewer/src/main/res/layout/fragment_jv_recycler_view_wrap.xml
diff --git a/library/jsonviewer/src/main/res/layout/item_jv_base_value.xml b/library/external/jsonviewer/src/main/res/layout/item_jv_base_value.xml
similarity index 100%
rename from library/jsonviewer/src/main/res/layout/item_jv_base_value.xml
rename to library/external/jsonviewer/src/main/res/layout/item_jv_base_value.xml
diff --git a/library/jsonviewer/src/main/res/values/colors.xml b/library/external/jsonviewer/src/main/res/values/colors.xml
similarity index 100%
rename from library/jsonviewer/src/main/res/values/colors.xml
rename to library/external/jsonviewer/src/main/res/values/colors.xml
diff --git a/library/jsonviewer/src/main/res/values/strings.xml b/library/external/jsonviewer/src/main/res/values/strings.xml
similarity index 100%
rename from library/jsonviewer/src/main/res/values/strings.xml
rename to library/external/jsonviewer/src/main/res/values/strings.xml
diff --git a/library/jsonviewer/src/test/java/org/billcarsonfr/jsonviewer/ModelParseTest.kt b/library/external/jsonviewer/src/test/java/org/billcarsonfr/jsonviewer/ModelParseTest.kt
similarity index 100%
rename from library/jsonviewer/src/test/java/org/billcarsonfr/jsonviewer/ModelParseTest.kt
rename to library/external/jsonviewer/src/test/java/org/billcarsonfr/jsonviewer/ModelParseTest.kt
diff --git a/library/jsonviewer/src/main/AndroidManifest.xml b/library/jsonviewer/src/main/AndroidManifest.xml
deleted file mode 100644
index 73322c2fdb..0000000000
--- a/library/jsonviewer/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="org.billcarsonfr.jsonviewer" />
diff --git a/library/multipicker/build.gradle b/library/multipicker/build.gradle
index 2de99d5c20..c77a86a764 100644
--- a/library/multipicker/build.gradle
+++ b/library/multipicker/build.gradle
@@ -19,6 +19,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
 android {
+    namespace "im.vector.lib.multipicker"
+
     compileSdk versions.compileSdk
 
     defaultConfig {
@@ -35,9 +37,19 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility versions.sourceCompat
+        targetCompatibility versions.targetCompat
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {
+    implementation project(":library:core-utils")
+
     api libs.androidx.activity
     implementation libs.androidx.exifinterface
     implementation libs.androidx.core
diff --git a/library/multipicker/src/main/AndroidManifest.xml b/library/multipicker/src/main/AndroidManifest.xml
index c02a22d1d9..2b4ef0e884 100644
--- a/library/multipicker/src/main/AndroidManifest.xml
+++ b/library/multipicker/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.lib.multipicker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <provider
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
index be83d2ea47..04dc8feb7b 100644
--- a/library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
+++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
@@ -16,6 +16,7 @@
 
 package im.vector.lib.multipicker
 
+import android.annotation.SuppressLint
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
@@ -34,6 +35,7 @@ class ContactPicker : Picker<MultiPickerContactType>() {
      * Call this function from onActivityResult(int, int, Intent).
      * Returns selected contact or empty list if user did not select any contacts.
      */
+    @SuppressLint("Recycle")
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerContactType> {
         val contactList = mutableListOf<MultiPickerContactType>()
 
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
index 8960f3228b..1cfcba505f 100644
--- a/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
+++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
@@ -22,6 +22,9 @@ import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.net.Uri
 import androidx.activity.result.ActivityResultLauncher
+import im.vector.lib.core.utils.compat.getParcelableArrayListExtraCompat
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
+import im.vector.lib.core.utils.compat.queryIntentActivitiesCompat
 
 /**
  * Abstract class to provide all types of Pickers.
@@ -45,13 +48,13 @@ abstract class Picker<T> {
 
         val uriList = mutableListOf<Uri>()
         if (data.action == Intent.ACTION_SEND) {
-            (data.getParcelableExtra(Intent.EXTRA_STREAM) as? Uri)?.let { uriList.add(it) }
+            data.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM)?.let { uriList.add(it) }
         } else if (data.action == Intent.ACTION_SEND_MULTIPLE) {
-            val extraUriList: List<Uri>? = data.getParcelableArrayListExtra(Intent.EXTRA_STREAM)
+            val extraUriList: List<Uri>? = data.getParcelableArrayListExtraCompat(Intent.EXTRA_STREAM)
             extraUriList?.let { uriList.addAll(it) }
         }
 
-        val resInfoList: List<ResolveInfo> = context.packageManager.queryIntentActivities(data, PackageManager.MATCH_DEFAULT_ONLY)
+        val resInfoList: List<ResolveInfo> = context.packageManager.queryIntentActivitiesCompat(data, PackageManager.MATCH_DEFAULT_ONLY)
         uriList.forEach {
             for (resolveInfo in resInfoList) {
                 val packageName: String = resolveInfo.activityInfo.packageName
@@ -91,6 +94,7 @@ abstract class Picker<T> {
         } else if (dataUri != null) {
             selectedUriList.add(dataUri)
         } else {
+            @Suppress("DEPRECATION")
             data?.extras?.get(Intent.EXTRA_STREAM)?.let {
                 (it as? List<*>)?.filterIsInstance<Uri>()?.let { uriList ->
                     selectedUriList.addAll(uriList)
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
index a3d69ae8cf..705223c55e 100644
--- a/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
+++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
@@ -30,7 +30,15 @@ object ImageUtils {
     fun getBitmap(context: Context, uri: Uri): Bitmap? {
         return try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                ImageDecoder.decodeBitmap(ImageDecoder.createSource(context.contentResolver, uri))
+                val source = ImageDecoder.createSource(context.contentResolver, uri)
+                val listener = ImageDecoder.OnHeaderDecodedListener { decoder, _, _ ->
+                    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
+                        // Allocating hardware bitmap may cause a crash on framework versions prior to Android Q
+                        decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
+                    }
+                }
+
+                ImageDecoder.decodeBitmap(source, listener)
             } else {
                 context.contentResolver.openInputStream(uri)?.use { inputStream ->
                     BitmapFactory.decodeStream(inputStream)
diff --git a/library/ui-strings/build.gradle b/library/ui-strings/build.gradle
new file mode 100644
index 0000000000..b6e6de5c22
--- /dev/null
+++ b/library/ui-strings/build.gradle
@@ -0,0 +1,28 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'com.likethesalad.stem-library'
+}
+
+android {
+    namespace "im.vector.lib.strings"
+
+    compileSdk versions.compileSdk
+    defaultConfig {
+        minSdk versions.minSdk
+        targetSdk versions.targetSdk
+    }
+
+    compileOptions {
+        sourceCompatibility versions.sourceCompat
+        targetCompatibility versions.targetCompat
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+tasks.withType( com.likethesalad.android.templates.common.tasks.BaseTask) {
+    it.outputs.cacheIf { true }
+}
diff --git a/library/ui-strings/src/main/AndroidManifest.xml b/library/ui-strings/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..8072ee00db
--- /dev/null
+++ b/library/ui-strings/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />
diff --git a/vector/src/main/res/values-ab/strings.xml b/library/ui-strings/src/main/res/values-ab/strings.xml
similarity index 100%
rename from vector/src/main/res/values-ab/strings.xml
rename to library/ui-strings/src/main/res/values-ab/strings.xml
diff --git a/vector/src/main/res/values-ang/strings.xml b/library/ui-strings/src/main/res/values-ang/strings.xml
similarity index 100%
rename from vector/src/main/res/values-ang/strings.xml
rename to library/ui-strings/src/main/res/values-ang/strings.xml
diff --git a/vector/src/main/res/values-ar/strings.xml b/library/ui-strings/src/main/res/values-ar/strings.xml
similarity index 99%
rename from vector/src/main/res/values-ar/strings.xml
rename to library/ui-strings/src/main/res/values-ar/strings.xml
index 1df5563686..a49ecc3d08 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/library/ui-strings/src/main/res/values-ar/strings.xml
@@ -143,8 +143,6 @@
     <string name="event_status_sending_message">يُرسل الرِّسالة…</string>
     <string name="initial_sync_start_importing_account_data">المُزامنة الأولية:
 \nيستورد بيانات الحِساب</string>
-    <string name="initial_sync_start_importing_account_groups">المُزامنة الأولية:
-\nيستورد المُجتمعات</string>
     <string name="initial_sync_start_importing_account_left_rooms">المُزامنة الأولية:
 \nيستورد الغُرف المُغادَر مِنها</string>
     <string name="initial_sync_start_importing_account_invited_rooms">المُزامنة الأولية:
@@ -229,7 +227,6 @@
     <string name="auth_invalid_login_param">اسم المستخدم و/أو كلمة السر خاطئة</string>
     <string name="auth_invalid_email">لا يبدو هذا وكأنه بريد إلكتروني صالح</string>
     <string name="auth_forgot_password">أنسيت كلمة السر؟</string>
-    <string name="auth_reset_password_missing_email">يجب إدخال عنوان البريد الإلكتروني المرتبط بحسابك.</string>
     <string name="auth_reset_password_error_unauthorized">فشل تأكيد عنوان البريد: تحقق من نقر الرابط في البريد</string>
     <string name="login_error_invalid_home_server">أدخِل مسارا صالحا</string>
     <string name="login_error_not_json">لم يحتوي JSON صالح</string>
@@ -323,7 +320,7 @@
     <string name="settings_theme">السمة</string>
     <string name="encryption_information_decryption_error">خطأ في فكّ التعمية</string>
     <string name="encryption_information_device_name">اسم الجهاز</string>
-    <string name="encryption_information_device_id">معرّف الجهاز</string>
+    <string name="device_manager_session_details_session_id">معرّف الجهاز</string>
     <string name="encryption_information_device_key">مفتاح الجهاز</string>
     <string name="encryption_export_room_keys">صدّر مفاتيح الغرفة</string>
     <string name="encryption_export_room_keys_summary">صدّر المفاتيح إلى ملف محلي</string>
@@ -376,7 +373,6 @@
         <item quantity="other">%d رسالة جديدة</item>
     </plurals>
     <string name="low_priority_header">أولوية منخفضة</string>
-    <string name="groups_header">المجتمعات</string>
     <string name="send_bug_report_rage_shake">هزّ الجهاز بجنون يُرسل بلاغًا بعلة</string>
     <string name="notification_noisy_notifications">الإخطارات المزعجة</string>
     <string name="notification_silent_notifications">الإخطارات الصامتة</string>
@@ -859,7 +855,6 @@
     <string name="room_preview_not_found">لا يمكنك الوصول إلى هذه الغرفة حاليًا.
 \nحاول لاحقًا، أو اسأل مدير الغرفة إن كان لديك نفاذ لها.</string>
     <string name="room_preview_no_preview">تتعذر معاية هذه الغرفة</string>
-    <string name="group_all_communities">كل المجتمعات</string>
     <string name="please_wait">رجاء انتظر…</string>
     <string name="change_room_directory_network">غيّر الشبكة</string>
     <string name="create_new_space">أنشئ فضاء جديد</string>
@@ -925,7 +920,6 @@
     <string name="ftue_profile_picture_title">أضف صورة لللاحة</string>
     <string name="ftue_display_name_entry_footer">يمكنك تغييره لاحقًا</string>
     <string name="ftue_display_name_entry_title">الاسم العلني</string>
-    <string name="ftue_display_name_subtitle">سيظهر هذا الاسم مع رسائلك.</string>
     <string name="ftue_display_name_title">اختر الاسم العلني</string>
     <string name="ftue_account_created_subtitle">أُنشئ حسابك %s.</string>
     <string name="ftue_account_created_congratulations_title">مبارك!</string>
@@ -1173,4 +1167,12 @@
     <string name="login_reset_password_email_hint">البريد الإلكتروني</string>
     <string name="login_reset_password_password_hint">كلمة السر الجديدة</string>
     <string name="login_reset_password_submit">التالي</string>
+    <plurals name="x_selected">
+        <item quantity="zero">صفر</item>
+        <item quantity="one">واحد</item>
+        <item quantity="two">اثنان</item>
+        <item quantity="few">قليلة</item>
+        <item quantity="many">كثيرة</item>
+        <item quantity="other">اخرى</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ar/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-ar/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-ar/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-ar/strings_no_weblate.xml
diff --git a/library/ui-strings/src/main/res/values-az/strings.xml b/library/ui-strings/src/main/res/values-az/strings.xml
new file mode 100644
index 0000000000..b8341cd2b4
--- /dev/null
+++ b/library/ui-strings/src/main/res/values-az/strings.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="notice_room_invite_no_invitee">%s-nin dəvəti</string>
+    <string name="notice_room_invite">%1$s dəvət etdi %2$s</string>
+    <string name="notice_room_invite_you">%1$s sizi dəvət etdi</string>
+    <string name="notice_room_join">%1$s qoşuldu</string>
+    <string name="notice_room_leave">%1$s qalıb</string>
+    <string name="notice_room_reject">%1$s dəvəti rədd etdi</string>
+    <string name="notice_room_remove">%1$s %2$s-i xaric etdi</string>
+    <string name="notice_room_unban">%1$s %2$s-i blokdan açdı</string>
+    <string name="notice_room_ban">%1$s %2$s-i blokladı</string>
+    <string name="notice_room_withdraw">%1$s %2$s-in dəvətini geri götürdü</string>
+    <string name="notice_avatar_url_changed">%1$s avatarı dəyişdi</string>
+    <string name="notice_display_name_set">%1$s ekran adını %2$s olaraq təyin etdi</string>
+    <string name="notice_display_name_changed_from">%1$s ekran adını %2$s-dan %3$s-ya dəyişdi</string>
+    <string name="notice_display_name_removed">%1$s onların göstərilən adlarını sildi (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s mövzunu dəyişdi: %2$s</string>
+    <string name="notice_room_name_changed">%1$s otaq adını dəyişdirdi: %2$s</string>
+    <string name="notice_placed_video_call">%s video zəng etdi.</string>
+    <string name="notice_placed_voice_call">%s səsli zəng etdi.</string>
+    <string name="notice_answered_call">%s zəngə cavab verdi.</string>
+    <string name="notice_ended_call">%s zəng başa çatdı.</string>
+    <string name="notice_made_future_room_visibility">%1$s gələcək otaq tarixçəsini %2$s-ə görünən etdi</string>
+    <string name="notice_room_visibility_invited">bütün otaq üzvləri, dəvət olunduğu andan.</string>
+    <string name="notice_room_visibility_joined">bütün otaq üzvləri, qoşulduğu andan.</string>
+    <string name="notice_room_visibility_shared">bütün otaq üzvləri.</string>
+    <string name="notice_room_visibility_world_readable">hər kəs.</string>
+    <string name="notice_room_update">%s bu otağı təkmilləşdirdi.</string>
+    <string name="notice_avatar_changed_too">(avatar da dəyişdirilib)</string>
+    <string name="notice_room_name_removed">%1$s otaq adını sildi</string>
+    <string name="notice_room_topic_removed">%1$s otaq mövzusunu sildi</string>
+    <string name="notice_room_third_party_invite">%1$s otağa qoşulmaq üçün %2$s dəvətnamə göndərdi</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s otağa qoşulmaq üçün %2$s dəvətini ləğv etdi</string>
+    <string name="notice_room_third_party_registered_invite">%1$s %2$s üçün dəvəti qəbul etdi</string>
+    <string name="notice_crypto_unable_to_decrypt">** Şifrəni aça bilmir: %s **</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Göndərənin cihazı bu mesaj üçün açarları bizə göndərməyib.</string>
+    <string name="unable_to_send_message">Mesaj göndərmək olmur</string>
+    <string name="matrix_error">Matrix xətası</string>
+    <string name="encrypted_message">Şifrəli mesaj</string>
+    <string name="medium_email">Elektron poçt ünvanı</string>
+    <string name="medium_phone_number">Telefon nömrəsi</string>
+    <string name="room_displayname_room_invite">Otağa dəvət</string>
+    <string name="room_displayname_two_members">%1$s və %2$s</string>
+    <string name="room_displayname_empty_room">Boş otaq</string>
+    <string name="initial_sync_start_importing_account">İlkin sinxronizasiya:
+\nHesab idxal olunur…</string>
+    <string name="initial_sync_start_importing_account_crypto">İlkin sinxronizasiya:
+\nKriptografiyanın idxalı</string>
+    <string name="initial_sync_start_importing_account_rooms">İlkin sinxronizasiya:
+\nOtaqlar idxalı</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">İlkin sinxronizasiya: 
+\nSöhbətləriniz yüklənilir
+\nƏgər çoxlu otaqlara qoşulmusunuzsa, bu, bir az vaxt apara bilər</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">İlkin sinxronizasiya:
+\nDəvət olunmuş otaqların idxalı</string>
+    <string name="initial_sync_start_importing_account_left_rooms">İlkin sinxronizasiya:
+\nTərk olunmuş otaqların idxalı</string>
+    <string name="initial_sync_start_importing_account_data">İlkin sinxronizasiya:
+\nHesab məlumatlarının idxalı</string>
+    <string name="event_status_sending_message">Mesaj göndərilir…</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s-nin dəvəti. Səbəb: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s dəvət olunmuş %2$s. Səbəb: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s sizi dəvət etdi. Səbəb: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s qoşuldu. Səbəb: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s qalıb. Səbəb: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s dəvəti rədd etdi. Səbəb: %2$s</string>
+    <string name="notice_room_remove_with_reason">%1$s %2$s-i xaric etdi. Səbəb: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s blokdan açdı %2$s. Səbəb: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s blokladı %2$s. Səbəb: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s üçün dəvəti qəbul etdi. Səbəb: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s %2$s dəvətini geri götürdü. Səbəb: %3$s</string>
+    <string name="notice_room_created_by_you">Otağ yaratdınız</string>
+    <string name="denied_permission_camera">Bu əməliyyatı yerinə yetirmək üçün sistem tənzimləmələrindən Kameraya icazə verin.</string>
+    <string name="title_activity_settings">Tənzimləmələr</string>
+    <string name="notice_direct_room_join">%1$s qoşuldu</string>
+    <string name="notice_room_join_by_you">Otağa qoşuldunuz</string>
+    <string name="notice_room_invite_by_you">%1$s-ı dəvət etdiniz</string>
+    <string name="notice_direct_room_created_by_you">Müzakirə yaratdınız</string>
+    <string name="notice_room_created">%1$s otağı yaratdı</string>
+    <string name="notification_noisy_notifications">Səsli bildirişlər</string>
+    <string name="notification_listening_for_notifications">Bildirişləri dinləmək</string>
+    <string name="create_spaces_default_public_room_name">Ümumi</string>
+    <string name="settings_general_title">Ümumi</string>
+    <string name="room_participants_action_ignore_prompt_msg">Bu istifadəçiyə məhəl qoymamaq onun mesajlarını paylaşdığınız otaqlardan siləcək.
+\n
+\nBu əməliyyatı istənilən vaxt ümumi tənzimləmələrdə geri qaytara bilərsiniz.</string>
+    <string name="denied_permission_generic">Bu tələbi yerinə yetirmək üçün bəzi icazələr yoxdur, lütfən, sistem tənzimləmələrindən icazələr verin.</string>
+    <string name="notice_room_avatar_removed_by_you">Otaq avatarını sildiniz</string>
+    <string name="notice_room_avatar_removed">%1$s otaq avatarını sildi</string>
+    <string name="notice_room_topic_removed_by_you">Otaq mövzusunu sildiniz</string>
+    <string name="notice_room_name_removed_by_you">Otağın adını sildiniz</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Bütün serverlərin iştirakı qadağandır! Bu otaq artıq istifadə edilə bilməz.</string>
+    <string name="notice_room_server_acl_updated_no_change">Dəyişiklik yoxdur.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Bu otaq üçün server ACL-lərini dəyişdirdiniz.</string>
+    <string name="notice_room_server_acl_set_banned">• %s ilə uyğunlaşan serverlər qadağan edilib.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Bu otaq üçün server ACL-lərini təyin etdiniz.</string>
+    <string name="notice_room_server_acl_set_title">%s bu otaq üçün server ACL-lərini təyin etdi.</string>
+    <string name="notice_direct_room_update_by_you">Burada təkmilləşdirdiniz.</string>
+    <string name="notice_direct_room_update">%s burada təkmilləşdi.</string>
+    <string name="notice_room_update_by_you">Bu otağı təkmilləşdirdiniz.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Gələcək mesajları %1$s üçün görünən etdiniz</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s gələcək mesajları %2$s üçün görünən etdi</string>
+    <string name="notice_made_future_room_visibility_by_you">Gələcək otaq tarixçəsini %1$s üçün görünən etdiniz</string>
+    <string name="notice_ended_call_by_you">Zəngi bitirdiniz.</string>
+    <string name="notice_answered_call_by_you">Zəngə cavab verdiniz.</string>
+    <string name="notice_call_candidates_by_you">Zəngi qurmaq üçün məlumat göndərdiniz.</string>
+    <string name="notice_call_candidates">%s zəngi qurmaq üçün məlumat göndərdi.</string>
+    <string name="notice_placed_voice_call_by_you">Səsli zəng etdiniz.</string>
+    <string name="notice_placed_video_call_by_you">Video zəng etdiniz.</string>
+    <string name="notice_room_name_changed_by_you">Otağın adını buna dəyişdiniz: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Otaq avatarını dəyişdiniz</string>
+    <string name="notice_room_avatar_changed">%1$s otaq avatarını dəyişdi</string>
+    <string name="notice_room_topic_changed_by_you">Mövzunu buna dəyişdiniz: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Ekran adınızı sildiniz (bu, %1$s idi)</string>
+    <string name="notice_display_name_changed_from_by_you">%1$s ekran adınızı %2$s olaraq dəyişdiniz</string>
+    <string name="notice_display_name_set_by_you">Ekran adınızı %1$s qoydunuz</string>
+    <string name="notice_avatar_url_changed_by_you">Avatarınızı dəyişdirmisiniz</string>
+    <string name="notice_room_withdraw_by_you">%1$s dəvətini geri götürdünüz</string>
+    <string name="notice_room_ban_by_you">%1$s adlı istifadəçini qadağan etdiniz</string>
+    <string name="notice_room_unban_by_you">%1$s adlı istifadəçini qadağan etdiniz</string>
+    <string name="notice_room_remove_by_you">%1$s adlı istifadəçini qovdunuz</string>
+    <string name="notice_room_reject_by_you">Dəvəti rədd etdiniz</string>
+    <string name="notice_direct_room_leave_by_you">Otağı tərk etdiniz</string>
+    <string name="notice_direct_room_leave">%1$s otaqdan çıxdı</string>
+    <string name="notice_room_leave_by_you">Otağı tərk etdiniz</string>
+    <string name="notice_direct_room_join_by_you">Qoşuldunuz</string>
+    <string name="notice_direct_room_created">%1$s müzakirə yaratdı</string>
+    <string name="notice_room_invite_no_invitee_by_you">Sizin dəvətiniz</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d seçildi</item>
+        <item quantity="other">%1$d seçildi</item>
+    </plurals>
+    <string name="notice_direct_room_third_party_invite">%1$s, %2$s-ı dəvət etdi</string>
+    <string name="notice_room_third_party_invite_by_you">Otağa qoşulmaq üçün %1$s-a dəvət göndərdiniz</string>
+    <string name="notice_room_server_acl_updated_title">%s, bu otaq üçün server ACL-lərini dəyişdi.</string>
+    <string name="notice_room_server_acl_set_allowed">• %s ilə uyğunlaşan serverlərə icazə verildi.</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Siz %1$s üçün otağa qoşulmaq dəvətin ləğv etdiniz</string>
+    <string name="notice_direct_room_third_party_invite_by_you">%1$s-ı dəvət etdiniz</string>
+    <string name="rich_text_editor_full_screen_toggle">Tam ekran rejimini dəyiş</string>
+    <string name="message_reply_to_prefix">buna cavab olaraq</string>
+    <string name="message_reply_to_sender_sent_file">fayl göndərdi.</string>
+    <string name="message_reply_to_sender_sent_audio_file">səs faylı göndərdi.</string>
+    <string name="message_reply_to_sender_sent_voice_message">səsli mesaj göndərdi.</string>
+    <string name="message_reply_to_sender_sent_image">şəkil göndərdi.</string>
+    <string name="message_reply_to_sender_sent_video">video göndərdi.</string>
+    <string name="message_reply_to_sender_sent_sticker">stiker göndərdi.</string>
+    <string name="message_reply_to_sender_created_poll">sorğu yaratdı.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Digər cihazda giriş ləğv edildi.</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Ev serveri QR kodu ilə daxil olmağı dəstəkləmir.</string>
+    <string name="qr_code_login_new_device_instruction_1">Tətbiqi digər cihazınızda açın</string>
+    <string name="qr_code_login_new_device_instruction_2">Tənzimləmələr -&gt; Təhlükəsizlik &amp; Məxfilik bölməsinə keç</string>
+    <string name="qr_code_login_new_device_instruction_3">\'QR kodunu göstər\' seç</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Giriş ekranında başlat</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">\'QR kodu ilə daxil ol\' seç</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Giriş ekranında başlat</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">\'QR kodunu skan et\' seç</string>
+    <string name="qr_code_login_show_qr_code_button">QR kodunu bu cihazda göstər</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Mobil cihazda daxil olursunuz\?</string>
+    <string name="qr_code_login_scan_qr_code_button">QR kodunu skan et</string>
+    <string name="qr_code_login_connecting_to_device">Cihaza qoşulur</string>
+    <string name="qr_code_login_signing_in">Daxil olursunuz</string>
+    <string name="qr_code_login_status_no_match">Uyğunluq yoxdur\?</string>
+    <string name="qr_code_login_try_again">Bir daha cəhd et</string>
+    <string name="qr_code_login_confirm_security_code">Təsdiqlə</string>
+    <string name="qr_code_login_confirm_security_code_description">Bu kodun mənbəyini bildiyinizə əmin olun. Cihazları əlaqələndirməklə siz kiməsə hesabınıza tam giriş imkanı təmin edəcəksiniz.</string>
+    <string name="rich_text_editor_format_bold">Qalın format tətbiq et</string>
+    <string name="rich_text_editor_format_italic">Kursiv formatını tətbiq et</string>
+    <string name="rich_text_editor_format_underline">Alt xətt formatını tətbiq et</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Bu otaq üçün əsas ünvanı sildiniz.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s, %2$s əlavə etdi və %3$s-nı bu otaq üçün ünvan kimi sildi.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Bu otaq üçün ünvan kimi %1$s-nı sildiniz.</item>
+        <item quantity="other">Bu otaq üçün ünvan kimi %1$s-nı sildiniz.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s, bu otaq üçün %2$s ünvanını sildi.</item>
+        <item quantity="other">%1$s, bu otaq üçün %2$s ünvanını sildi.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Bu otaq üçün ünvan olaraq %1$s əlavə etdiniz.</item>
+        <item quantity="other">Bu otaq üçün ünvan olaraq %1$s əlavə etdiniz.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s, bu otaq üçün %2$s ünvanını əlavə etdi.</item>
+        <item quantity="other">%1$s, bu otaq üçün %2$s ünvanını əlavə etdi.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">%1$s-ın⁴ dəvətini geri götürdünüz. Səbəb: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">%1$s üçün dəvəti qəbul etdiniz. Səbəb: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">%1$s-ı qadağan etdiniz. Səbəb: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Siz %1$s qadağanını sildiniz. Səbəb: %2$s</string>
+    <string name="notice_room_remove_with_reason_by_you">%1$s-ı sildiniz. Səbəb: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Siz dəvəti rədd etdiniz. Səbəb: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Siz getdiniz. Səbəb: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s tərk etdi. Səbəb: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Otağı tərk etdiniz. Səbəb: %1$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Siz qoşuldunuz. Əsas: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s qoşuldu. Əsas: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Otağa qoşuldunuz. Əsas: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">%1$s-ı dəvət etdiniz. Əsas: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Sizin dəvətiniz. Əsas: %1$s</string>
+    <string name="event_status_sent_message">Mesaj göndərildi</string>
+    <string name="initial_sync_request_reason_unignored_users">- Bəzi istifadəçilər nəzərə alınmayıb</string>
+    <string name="initial_sync_request_content">${app_name} aşağıdakı səbəbə görə:
+\n%s 
+\n
+\nGüncəl olmaq üçün təmiz keşi yerinə yetirməlidir.
+\nNəzərə alın ki, bu əməliyyat tətbiqi yenidən işə salacaq və bir az vaxt apara bilər.</string>
+    <string name="initial_sync_request_title">İlkin sinxronizasiya sorğusu</string>
+    <string name="initial_sync_start_downloading">İlkin sinxronizasiya:
+\nMəlumat endirilir…</string>
+    <string name="initial_sync_start_server_computing">İlkin sinxronizasiya:
+\n Server cavabı gözlənilir…</string>
+    <string name="room_displayname_empty_room_was">Boş otaq (%s idi)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s və digər %4$d</item>
+        <item quantity="other">%1$s, %2$s, %3$s və digər %4$d</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s və %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s və %3$s</string>
+    <string name="room_error_access_unauthorized">Bu otağa qoşulmağa icazəniz yoxdur</string>
+    <string name="a11y_expand_space_children">%s uşağı yay</string>
+    <string name="a11y_collapse_space_children">%s uşağı yığışdır</string>
+    <string name="explore_rooms">Otaqları Araşdır</string>
+    <string name="change_space">Yeri Dəyiş</string>
+    <string name="create_room">Otaq Yarat</string>
+    <string name="start_chat">Söhbət Başlat</string>
+    <string name="all_chats">Bütün Söhbətlər</string>
+    <string name="notice_voice_broadcast_ended_by_you">Səsli yayımı bitirdiniz.</string>
+    <string name="notice_voice_broadcast_ended">%1$s səsli yayımı bitirdi.</string>
+    <string name="notice_power_level_diff">%1$s, %2$s - %3$s</string>
+    <string name="notice_power_level_changed">%1$s, %2$s üçün güc səviyyəsini dəyişdi.</string>
+    <string name="notice_power_level_changed_by_you">Siz %1$s üçün güc səviyyəsini dəyişdirdiniz.</string>
+    <string name="power_level_custom_no_value">Xüsusi</string>
+    <string name="power_level_custom">Fərdi (%1$d)</string>
+    <string name="power_level_default">Defolt</string>
+    <string name="power_level_moderator">Münsif</string>
+    <string name="power_level_admin">Müdir</string>
+    <string name="notice_widget_modified_by_you">%1$s vidcetini dəyişdirdiniz</string>
+    <string name="notice_widget_modified">%1$s, %2$s vidcetini dəyişdirdi</string>
+    <string name="notice_widget_removed_by_you">%1$s vidcetini sildiniz</string>
+    <string name="notice_widget_removed">%1$s, %2$s vidcetini sildi</string>
+    <string name="notice_widget_added_by_you">%1$s vidceti əlavə etdiniz</string>
+    <string name="notice_widget_added">%1$s, %2$s vidceti əlavə etdi</string>
+    <string name="notice_room_third_party_registered_invite_by_you">%1$s üçün dəvəti qəbul etdiniz</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">%1$s üçün dəvəti ləğv etdiniz</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s, %2$s üçün dəvəti ləğv etdi</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• IP literallarına uyğunlaşan serverlər indi qadağan edilib.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• IP literalları uyğunlaşan serverlərə indi icazə verilir.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• %s ilə uyğunlaşan serverlər icazə verilən siyahıdan təmizləndi.</string>
+    <string name="notice_room_server_acl_updated_allowed">• %s ilə uyğunlaşan serverlərə indi icazə verilir.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• %s ilə uyğunlaşan serverlər qadağa siyahısından təmizləndi.</string>
+    <string name="notice_room_server_acl_updated_banned">• %s ilə uyğunlaşan serverlər indi qadağan edilib.</string>
+    <plurals name="notice_room_server_acl_changes">
+        <item quantity="one">%d server ACLs dəyişiklik</item>
+        <item quantity="other">%d server ACLs dəyişiklik</item>
+    </plurals>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• IP literallarına uyğunlaşan serverlər qadağan edildi.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• IP literallarına uyğunlaşan serverlərə icazə verilir.</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-az/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-az/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-az/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-az/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/library/ui-strings/src/main/res/values-b+sr+Latn/strings.xml
similarity index 99%
rename from vector/src/main/res/values-b+sr+Latn/strings.xml
rename to library/ui-strings/src/main/res/values-b+sr+Latn/strings.xml
index 7d1e61137f..4f734ac224 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/library/ui-strings/src/main/res/values-b+sr+Latn/strings.xml
@@ -89,8 +89,6 @@
     <string name="auth_invalid_email">Ovo ne izgleda kao validna adresa elektronske pošte</string>
     <string name="auth_email_already_defined">Ova adresa elektronske pošte je već definisana.</string>
     <string name="auth_forgot_password">Zaboravili ste lozinku\?</string>
-    <string name="auth_reset_password_missing_email">Morate uneti adresu elektronske pošte povezane sa vašim nalogom.</string>
-
     <string name="login_error_limit_exceeded">Poslato je previše zahteva</string>
 
 
diff --git a/vector/src/main/res/values-b+sr+Latn/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-b+sr+Latn/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-b+sr+Latn/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-b+sr+Latn/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-bg/strings.xml b/library/ui-strings/src/main/res/values-bg/strings.xml
similarity index 99%
rename from vector/src/main/res/values-bg/strings.xml
rename to library/ui-strings/src/main/res/values-bg/strings.xml
index 96e719f29f..d3e9e599bc 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/library/ui-strings/src/main/res/values-bg/strings.xml
@@ -52,8 +52,6 @@
 \nИмпортиране на стаи, към които съм поканен</string>
     <string name="initial_sync_start_importing_account_left_rooms">Начална синхронизация.
 \nИмпортиране на стаи, които съм напуснал</string>
-    <string name="initial_sync_start_importing_account_groups">Начална синхронизация.
-\nИмпортиране на общности</string>
     <string name="initial_sync_start_importing_account_data">Начална синхронизация.
 \nИмпортиране на данни за профила</string>
     <string name="notice_room_update">%s обнови тази стая.</string>
@@ -246,7 +244,6 @@
     <string name="matrix_only_filter">Само потребители на Matrix</string>
     <string name="no_result_placeholder">Няма резултати</string>
     <string name="rooms_header">Стаи</string>
-    <string name="groups_header">Общности</string>
     <string name="send_bug_report_include_logs">Изпращане на логове</string>
     <string name="send_bug_report_include_crash_logs">Изпращане на логове за забивания</string>
     <string name="send_bug_report_include_screenshot">Изпращане на снимка на екрана</string>
@@ -279,7 +276,6 @@
     <string name="auth_email_already_defined">Този имейл адрес е вече използван.</string>
     <string name="auth_forgot_password">Забравена парола?</string>
     <string name="auth_recaptcha_message">Този Home сървър би искал да се увери, че не сте робот</string>
-    <string name="auth_reset_password_missing_email">Имейл адресът, свързан с профила Ви, трябва да бъде въведен.</string>
     <string name="auth_reset_password_error_unauthorized">Неуспешно потвърждаване на имейл адреса: уверете се, че сте кликнали върху връзката в имейла</string>
     <string name="send_bug_report_progress">Напредък (%s%%)</string>
     <string name="login_error_invalid_home_server">Въведете валиден URL адрес</string>
@@ -400,7 +396,7 @@
     <string name="settings_theme">Тема</string>
     <string name="encryption_information_decryption_error">Грешка при разшифроване</string>
     <string name="encryption_information_device_name">Публично име</string>
-    <string name="encryption_information_device_id">Сесийно ID</string>
+    <string name="device_manager_session_details_session_id">Сесийно ID</string>
     <string name="encryption_information_device_key">Ключ на устройство</string>
     <string name="encryption_export_e2e_room_keys">Експортирай E2E ключове за стая</string>
     <string name="encryption_export_room_keys">Експортиране на ключове за стая</string>
@@ -833,7 +829,6 @@
     <string name="action_change">Промени</string>
     <string name="change_room_directory_network">Промени мрежата</string>
     <string name="please_wait">Изчакайте…</string>
-    <string name="group_all_communities">Всички общности</string>
     <string name="room_preview_no_preview">Тази стая не може да бъде прегледана</string>
     <string name="fab_menu_create_room">Стаи</string>
     <string name="fab_menu_create_chat">Директни съобщения</string>
diff --git a/vector/src/main/res/values-bg/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-bg/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-bg/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-bg/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-bn-rBD/strings.xml b/library/ui-strings/src/main/res/values-bn-rBD/strings.xml
similarity index 99%
rename from vector/src/main/res/values-bn-rBD/strings.xml
rename to library/ui-strings/src/main/res/values-bn-rBD/strings.xml
index 5913cb5e11..7897da934e 100644
--- a/vector/src/main/res/values-bn-rBD/strings.xml
+++ b/library/ui-strings/src/main/res/values-bn-rBD/strings.xml
@@ -360,7 +360,6 @@
     <string name="auth_accept_policies">পর্যালোচনা করুন এবং এই হোমসার্ভার এর নীতিগুলি গ্রহণ করুন:</string>
 
     <string name="auth_reset_password_error_unauthorized">ইমেল ঠিকানা যাচাই করতে ব্যর্থ: ইমেলটিতে লিঙ্কে আপনি ক্লিক করেছেন তা নিশ্চিত করুন</string>
-    <string name="auth_reset_password_missing_email">আপনার অ্যাকাউন্টের সাথে যুক্ত ইমেল ঠিকানা প্রবেশ করা আবশ্যক।</string>
     <string name="auth_recaptcha_message">এই হোম সার্ভার আপনি একটি রোবট না সেটা নিশ্চিত করবে</string>
 
     <string name="auth_forgot_password">পাসওয়ার্ড ভুলে গেছেন\?</string>
@@ -417,8 +416,6 @@
     <string name="send_bug_report_include_screenshot">স্ক্রিনশট পাঠান</string>
     <string name="send_bug_report_include_crash_logs">ক্র্যাশ লগগুলি পাঠান</string>
     <string name="send_bug_report_include_logs">লগগুলি পাঠান</string>
-    <string name="groups_header">সম্প্রদায়গুলি</string>
-
     <string name="rooms_header">রুমগুলি</string>
     <string name="no_result_placeholder">কোন ফলাফল নেই</string>
     <string name="matrix_only_filter">শুধুমাত্র ম্যাট্রিক্সের যোগাযোগগুলি</string>
@@ -679,8 +676,6 @@
     <string name="event_status_sending_message">বার্তা প্রেরণ করা হচ্ছে …</string>
     <string name="initial_sync_start_importing_account_data">প্রাথমিক সিঙ্ক:
 \nঅ্যাকাউন্ট ডেটা আমদানি করা হচ্ছে</string>
-    <string name="initial_sync_start_importing_account_groups">প্রাথমিক সিঙ্ক:
-\nসম্প্রদায়গুলি আমদানি করা হচ্ছে</string>
     <string name="initial_sync_start_importing_account_left_rooms">প্রাথমিক সিঙ্ক:
 \nছেড়ে দেওয়া কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
     <string name="initial_sync_start_importing_account_invited_rooms">প্রাথমিক সিঙ্ক:
@@ -794,7 +789,7 @@
     <string name="encryption_export_room_keys">রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
     <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
     <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>
-    <string name="encryption_information_device_id">আইডি</string>
+    <string name="device_manager_session_details_session_id">আইডি</string>
     <string name="encryption_information_device_name">সর্বজনীন নাম</string>
     <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
     <string name="settings_theme">থিম</string>
diff --git a/vector/src/main/res/values-bn-rBD/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-bn-rBD/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-bn-rBD/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-bn-rBD/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/library/ui-strings/src/main/res/values-bn-rIN/strings.xml
similarity index 99%
rename from vector/src/main/res/values-bn-rIN/strings.xml
rename to library/ui-strings/src/main/res/values-bn-rIN/strings.xml
index 18f122b2cd..56bde36977 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/library/ui-strings/src/main/res/values-bn-rIN/strings.xml
@@ -102,8 +102,6 @@
 \nআমন্ত্রিত করা কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
     <string name="initial_sync_start_importing_account_left_rooms">প্রাথমিক সিঙ্ক:
 \nছেড়ে দেওয়া কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
-    <string name="initial_sync_start_importing_account_groups">প্রাথমিক সিঙ্ক:
-\nসম্প্রদায়গুলি আমদানি করা হচ্ছে</string>
     <string name="initial_sync_start_importing_account_data">প্রাথমিক সিঙ্ক:
 \nঅ্যাকাউন্ট ডেটা আমদানি করা হচ্ছে</string>
     <string name="event_status_sending_message">বার্তা প্রেরণ করা হচ্ছে …</string>
@@ -238,9 +236,6 @@
 
     <string name="rooms_header">রুমগুলি</string>
 
-
-    <string name="groups_header">সম্প্রদায়গুলি</string>
-
     <string name="send_bug_report_include_logs">লগগুলি পাঠান</string>
     <string name="send_bug_report_include_crash_logs">ক্র্যাশ লগগুলি পাঠান</string>
     <string name="send_bug_report_include_screenshot">স্ক্রিনশট পাঠান</string>
@@ -293,7 +288,6 @@
     <string name="auth_forgot_password">পাসওয়ার্ড ভুলে গেছেন\?</string>
 
     <string name="auth_recaptcha_message">এই হোম সার্ভার আপনি একটি রোবট না সেটা নিশ্চিত করবে</string>
-    <string name="auth_reset_password_missing_email">আপনার অ্যাকাউন্টের সাথে যুক্ত ইমেল ঠিকানা প্রবেশ করা আবশ্যক।</string>
     <string name="auth_reset_password_error_unauthorized">ইমেল ঠিকানা যাচাই করতে ব্যর্থ: ইমেলটিতে লিঙ্কে আপনি ক্লিক করেছেন তা নিশ্চিত করুন</string>
 
     <string name="auth_accept_policies">পর্যালোচনা করুন এবং এই হোমসার্ভার এর নীতিগুলি গ্রহণ করুন:</string>
@@ -699,7 +693,7 @@
     <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
 
     <string name="encryption_information_device_name">সর্বজনীন নাম</string>
-    <string name="encryption_information_device_id">আইডি</string>
+    <string name="device_manager_session_details_session_id">আইডি</string>
     <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>
 
     <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
diff --git a/vector/src/main/res/values-bn-rIN/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-bn-rIN/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-bn-rIN/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-bn-rIN/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-bn/strings.xml b/library/ui-strings/src/main/res/values-bn/strings.xml
similarity index 100%
rename from vector/src/main/res/values-bn/strings.xml
rename to library/ui-strings/src/main/res/values-bn/strings.xml
diff --git a/vector/src/main/res/values-bs/strings.xml b/library/ui-strings/src/main/res/values-bs/strings.xml
similarity index 99%
rename from vector/src/main/res/values-bs/strings.xml
rename to library/ui-strings/src/main/res/values-bs/strings.xml
index 0fdb091ed6..583286f27d 100644
--- a/vector/src/main/res/values-bs/strings.xml
+++ b/library/ui-strings/src/main/res/values-bs/strings.xml
@@ -78,7 +78,6 @@
     <string name="auth_forgot_password">Zaboravljena lozinka?</string>
 
     <string name="auth_recaptcha_message">Ovaj lokalni server provjerava da niste robot</string>
-    <string name="auth_reset_password_missing_email">Email adresa povezana sa vašim računom mora biti unešena.</string>
     <string name="auth_reset_password_error_unauthorized">Neuspješna verifikacija email adrese: provjerite da li ste kliknuli link u emailu</string>
 
     <string name="login_error_invalid_home_server">Unesite ispravan URL</string>
@@ -211,4 +210,4 @@ Da li ste sigurani?</string>
     <string name="settings_password_updated">Vaša lozinka je ažurirana</string>
     <string name="settings_unignore_user">Prikaži sve poruke iz %s?</string>
     <string name="settings_select_country">Izaberite zemlju</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-bs/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-bs/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-bs/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-bs/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-ca/strings.xml b/library/ui-strings/src/main/res/values-ca/strings.xml
similarity index 89%
rename from vector/src/main/res/values-ca/strings.xml
rename to library/ui-strings/src/main/res/values-ca/strings.xml
index f7366b7dd3..b86a834a27 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/library/ui-strings/src/main/res/values-ca/strings.xml
@@ -112,8 +112,6 @@
     <string name="event_status_sending_message">Enviant missatge…</string>
     <string name="initial_sync_start_importing_account_data">Sincronització inicial:
 \nImportant dades del compte</string>
-    <string name="initial_sync_start_importing_account_groups">Sincronització inicial:
-\nImportant comunitats</string>
     <string name="initial_sync_start_importing_account_left_rooms">Sincronització inicial:
 \nImportant sales que n\'has marxat</string>
     <string name="initial_sync_start_importing_account">Sincronització inicial:
@@ -269,7 +267,6 @@
     <string name="matrix_only_filter">Només contactes de Matrix</string>
     <string name="no_result_placeholder">Sense resultats</string>
     <string name="rooms_header">Sales</string>
-    <string name="groups_header">Comunitats</string>
     <string name="send_bug_report_include_logs">Envia els registres</string>
     <string name="send_bug_report_include_crash_logs">Envia els registres de fallada</string>
     <string name="send_bug_report_include_screenshot">Envia una captura de pantalla</string>
@@ -302,7 +299,6 @@
     <string name="auth_email_already_defined">Aquest correu electrònic ja existeix.</string>
     <string name="auth_forgot_password">Contrasenya oblidada\?</string>
     <string name="auth_recaptcha_message">Aquest servidor vol assegurar-se que no ets cap robot</string>
-    <string name="auth_reset_password_missing_email">Heu d\'introduir el correu electrònic associat al vostre compte.</string>
     <string name="auth_reset_password_error_unauthorized">No s\'ha pogut verificar l\'adreça del correu electrònic: assegureu-vos que heu fet clic a l\'enllaç del correu electrònic</string>
     <string name="login_error_invalid_home_server">Introduïu una URL vàlida</string>
     <string name="login_error_bad_json">JSON mal format</string>
@@ -385,7 +381,7 @@
     <string name="settings_version">Versió</string>
     <string name="settings_olm_version">Versió d\'OLM</string>
     <string name="settings_app_term_conditions">Termes i condicions</string>
-    <string name="settings_third_party_notices">Avisos de terceres parts</string>
+    <string name="settings_third_party_notices">Avisos de tercers</string>
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Política de privacitat</string>
     <string name="settings_clear_cache">Esborra la memòria cau</string>
@@ -452,7 +448,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Error al desxifrar</string>
     <string name="encryption_information_device_name">Nom públic</string>
-    <string name="encryption_information_device_id">ID de sessió</string>
+    <string name="device_manager_session_details_session_id">ID de sessió</string>
     <string name="encryption_information_device_key">Clau de sessió</string>
     <string name="encryption_export_e2e_room_keys">Exporta les claus de la sala E2E</string>
     <string name="encryption_export_room_keys">Exporta les claus de la sala</string>
@@ -877,7 +873,6 @@
     <string name="action_change">Canviar</string>
     <string name="change_room_directory_network">Canvia de xarxa</string>
     <string name="please_wait">Espereu, si us plau…</string>
-    <string name="group_all_communities">Totes les comunitats</string>
     <string name="room_preview_no_preview">Aquesta sala no es pot pre-visualitzar</string>
     <string name="fab_menu_create_room">Sales</string>
     <string name="fab_menu_create_chat">Xats directes</string>
@@ -896,7 +891,7 @@
     <string name="room_participants_remove_reason">Motiu de l\'expulsió</string>
     <string name="room_participants_remove_title">Expulsa usuari</string>
     <string name="login_signin_sso">Continua amb SSO</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Per a la teva pròpia privadesa, ${app_name} només admet l\'enviament del \"hash\" de correus electrònics i números de telèfon.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Per a la teva pròpia privadesa, ${app_name} només admet l\'enviament del \'hash\' d\'adreces de correu electrònic i números de telèfon.</string>
     <string name="command_description_discard_session_not_handled">Només admès en sales xifrades</string>
     <string name="encryption_unknown_algorithm_tile_description">El xifrat que utilitza aquesta sala no és compatible</string>
     <string name="login_registration_not_supported">L\'aplicació no ha pogut crear un compte en aquest servidor.
@@ -983,7 +978,7 @@
     <string name="login_error_ssl_other">Error SSL.</string>
     <string name="call_failed_no_connection">La trucada d\'${app_name} ha fallat</string>
     <string name="login_reset_password_on">Restableix la contrasenya a %1$s</string>
-    <string name="login_login_with_email_error">Aquest correu electrònic no està associat amb cap compte.</string>
+    <string name="login_login_with_email_error">Aquesta adreça de correu electrònic no està associada a cap compte.</string>
     <string name="login_registration_disabled">Ho sentim, aquest servidor no accepta comptes nous.</string>
     <string name="login_sso_error_message">S\'ha produït un error en carregar la pàgina: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">Introdueix l\'adreça del servidor que vulguis utilitzar</string>
@@ -1007,10 +1002,10 @@
     <string name="settings_discovery_consent_action_give_consent">Dóna consentiment</string>
     <string name="settings_discovery_consent_action_revoke">Revoca el meu consentiment</string>
     <string name="settings_discovery_consent_title">Envia correus i números de telèfon</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">T\'hem enviat un correu de confirmació a %s, primer revisa el correu i fes clic a l\'enllaç de confirmació</string>
-    <string name="settings_discovery_confirm_mail">T\'hem enviat un correu de confirmació a %s, revisa\'l i fes clic a l\'enllaç de confirmació</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Hem enviat un correu electrònic a %s, primer revisa el correu i fes clic a l\'enllaç de confirmació</string>
+    <string name="settings_discovery_confirm_mail">Hem enviat un correu electrònic a %s, revisa\'l i fes clic a l\'enllaç de confirmació</string>
     <string name="settings_discovery_no_msisdn">Les opcions de descobriment apareixeran quan hagis afegit un número de telèfon.</string>
-    <string name="settings_discovery_no_mails">Les opcions de descobriment apareixeran quan hagis afegit un correu.</string>
+    <string name="settings_discovery_no_mails">Les opcions de descobriment apareixeran quan hagis afegit una adreça de correu electrònic.</string>
     <string name="disconnect_identity_server">Desconnecta el servidor d\'identitat</string>
     <string name="add_identity_server">Configura el servidor d\'identitat</string>
     <string name="change_identity_server">Canvia el servidor d\'identitat</string>
@@ -1105,7 +1100,7 @@
     <string name="room_settings_alias_subtitle">Revisa i gestiona les adreces d\'aquesta sala i la seva visibilitat al directori de sales.</string>
     <string name="room_settings_alias_title">Adreces de la sala</string>
     <string name="room_settings_room_access_title">Accés a la sala</string>
-    <string name="settings_emails_and_phone_numbers_summary">Gestiona els correus i els números de telèfon vinculats amb el teu compte de Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Gestiona les adreces de correu electrònic i els números de telèfon vinculats amb el teu compte de Matrix</string>
     <string name="settings_emails_and_phone_numbers_title">Correus i números de telèfon</string>
     <string name="disabled_integration_dialog_content">Activa \'Permet integracions\' a la configuració per poder fer això.</string>
     <string name="disabled_integration_dialog_title">Les integracions estan desactivades</string>
@@ -1159,7 +1154,7 @@
     <string name="error_threepid_auth_failed">Assegura\'t de que has clicat a l\'enllaç del correu que t\'hem enviat.</string>
     <string name="settings_remove_three_pid_confirmation_content">Elimina %s\?</string>
     <string name="settings_phone_numbers">Números de telèfon</string>
-    <string name="settings_emails_empty">No s\'ha afegit cap correu electrònic al teu compte</string>
+    <string name="settings_emails_empty">No s\'ha afegit cap adreça de correu electrònic al teu compte</string>
     <string name="settings_phone_number_empty">No s\'ha afegit cap número de telèfon al teu compte</string>
     <string name="search_banned_user_hint">Filtra usuaris vetats</string>
     <string name="room_settings_topic_hint">Tema</string>
@@ -1203,9 +1198,9 @@
     <string name="login_reset_password_success_notice_2">Se t\'ha desconnectat de totes les teves sessions i no rebràs més notificacions. Per reactivar les notificacions, torna a iniciar sessió a cada dispositiu.</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="push_gateway_item_url">Url:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_device_name">Àlies de la sessió:</string>
+    <string name="push_gateway_item_push_key">Clau \'push\':</string>
+    <string name="push_gateway_item_app_id">ID d\'aplicació:</string>
     <string name="alert_push_are_disabled_description">Revisa la configuració per activar les notificacions</string>
     <string name="settings_troubleshoot_test_push_notification_content">Estàs veient la notificació! Clica\'m!</string>
     <string name="member_banned_by">Vetat per %1$s</string>
@@ -1254,7 +1249,7 @@
     <string name="room_list_quick_actions_settings">Configuració</string>
     <string name="message_ignore_user">Ignora usuari</string>
     <string name="rotate_and_crop_screen_title">Gira i retalla</string>
-    <string name="login_set_email_notice">Estableix un correu per a la recuperació del compte. Posterior i opcionalment, pots permetre que els usuaris que coneixes et puguin trobar a partir del correu electrònic.</string>
+    <string name="login_set_email_notice">Estableix una adreça de correu electrònic per recuperar el teu compte. Posterior i opcionalment, pots permetre que els usuaris que coneixes et puguin trobar a partir d\'aquesta adreça.</string>
     <string name="login_set_msisdn_submit">Següent</string>
     <string name="login_set_msisdn_optional_hint">Número de telèfon (opcional)</string>
     <string name="login_set_msisdn_mandatory_hint">Número de telèfon</string>
@@ -1267,7 +1262,7 @@
     <string name="autodiscover_well_known_error">No s\'ha pogut trobar un servidor local vàlid. Comprova l\'identificador</string>
     <string name="settings_agree_to_terms">Accepta els termes de servei del servidor d\'identitat (%s) per poder ser trobat mitjançant l\'adreça de correu electrònic o el número de telèfon.</string>
     <string name="settings_discovery_enter_identity_server">Introdueix l\'URL d\'un servidor d\'identitat</string>
-    <string name="settings_discovery_consent_notice_on">Has donat el teu consentiment per poder enviar correus electrònics i números de telèfon a aquest servidor d\'identitat per trobar altres usuaris dels teus contactes.</string>
+    <string name="settings_discovery_consent_notice_on">Has donat el teu consentiment per poder enviar adreces de correu electrònic i números de telèfon a aquest servidor d\'identitat per trobar altres usuaris dels teus contactes.</string>
     <string name="settings_discovery_msisdn_title">Números de telèfon perquè et trobin</string>
     <string name="settings_discovery_disconnect_identity_server_info">Si et desconnectes del servidor d\'identitat no podràs ser trobat per altres usuaris ni convidar-los mitjançant el correu electrònic o el número de telèfon.</string>
     <string name="settings_discovery_emails_title">Correus electrònics perquè et puguin trobar</string>
@@ -1381,7 +1376,7 @@
     <string name="room_participants_unban_prompt_msg">Si treus el vet a un usuari podrà tornar a unir-se a la sala.</string>
     <string name="failed_to_unban">No s\'ha pogut treure el vet a l\'usuari</string>
     <string name="room_participants_unban_title">Treu el vet a l\'usuari</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Àlies de l\'aplicació:</string>
     <string name="room_widget_permission_display_name">El teu àlies</string>
     <string name="room_settings_set_avatar">Estableix la foto</string>
     <string name="room_widget_permission_avatar_url">URL de la teva foto</string>
@@ -1475,7 +1470,7 @@
         <item quantity="one">%d sessió activa</item>
         <item quantity="other">%d sessions actives</item>
     </plurals>
-    <string name="settings_active_sessions_verified_device_desc">Aquesta sessió és de confiança per a xats segurs ja que l\'has verificada tu:</string>
+    <string name="settings_active_sessions_verified_device_desc">Aquesta sessió és de confiança per a missatges segurs ja que l\'has verificada tu:</string>
     <string name="settings_active_sessions_signout_device">Desconnecta aquesta sessió</string>
     <string name="settings_active_sessions_manage">Gestió de sessions</string>
     <string name="settings_active_sessions_show_all">Veure totes les sessions</string>
@@ -1616,7 +1611,7 @@
     <string name="login_reset_password_mail_confirmation_notice_2">Fes clic a l\'enllaç per confirmar la nova contrasenya. Quan hagis anat a l\'enllaç que conté, fes clic a sota.</string>
     <string name="login_reset_password_mail_confirmation_notice">S\'ha enviat un correu de verificació a %1$s.</string>
     <string name="login_reset_password_mail_confirmation_title">Revisa la teva safata d\'entrada</string>
-    <string name="login_reset_password_error_not_found">Aquest correu no està vinculat amb cap compte</string>
+    <string name="login_reset_password_error_not_found">Aquesta adreça de correu electrònic no està vinculada a cap compte</string>
     <string name="login_reset_password_warning_submit">Continua</string>
     <string name="login_reset_password_warning_title">Atenció!</string>
     <string name="login_reset_password_password_hint">Nova contrasenya</string>
@@ -1635,7 +1630,7 @@
     <string name="default_message_emote_snow">ha enviat una nevada ❄️</string>
     <string name="user_code_my_code">El meu codi</string>
     <string name="user_code_share">Comparteix el meu codi</string>
-    <string name="user_code_scan">Escaneja un codi QR</string>
+    <string name="user_code_scan">Escaneja codi QR</string>
     <string name="not_a_valid_qr_code">No és un codi QR de Matrix vàlid</string>
     <string name="settings_failed_to_get_crypto_device_info">No hi ha informació criptogràfica disponible</string>
     <string name="verification_conclusion_ok_self_notice">La nova sessió s\'ha verificat. Tindrà accés als teus missatges xifrats i es mostrarà de confiança per als altres usuaris.</string>
@@ -1849,7 +1844,7 @@
     <string name="choose_locale_other_locales_title">Altres idiomes disponibles</string>
     <string name="choose_locale_current_locale_title">Idioma actual</string>
     <string name="delete_event_dialog_reason_hint">Motiu de l\'eliminació</string>
-    <string name="verification_profile_device_verified_because">Aquesta sessió és de confiança per a xats segurs ja que %1$s (%2$s) l\'ha verificat:</string>
+    <string name="verification_profile_device_verified_because">Aquesta sessió és de confiança per a missatges segurs ja que %1$s (%2$s) l\'ha verificat:</string>
     <string name="bootstrap_progress_compute_curve_key">Obtenint clau de corba</string>
     <string name="create_room_dm_failure">No s\'ha pogut crear el xat. Comprova els usuaris que vols convidar i torna-ho a provar.</string>
     <string name="cross_signing_verify_by_text">Verifica manualment mitjançant text</string>
@@ -2125,8 +2120,8 @@
     <string name="create_spaces_invite_public_header_desc">Assegura\'t que les persones adequades tinguin accés a %s. Pots convidar-ne més després.</string>
     <string name="create_spaces_make_sure_access">Assegura\'t que les persones adequades tinguin accés a %s.</string>
     <string name="send_images_and_video_with_original_size">Envia multimèdia a mida real</string>
-    <string name="identity_server_consent_dialog_content_3">Per descobrir contactes existents, s\'ha d\'enviar informació de contacte (correus i números de telèfon) al servidor d\'identitat utilitzat. Es fa un \'hash\' de les dades abans d\'enviar-les per privacitat.</string>
-    <string name="identity_server_consent_dialog_title_2">Envia correus i números de telèfon a %s</string>
+    <string name="identity_server_consent_dialog_content_3">Per descobrir contactes existents, s\'ha d\'enviar informació de contacte (adreces de correu electrònic i números de telèfon) al servidor d\'identitat utilitzat. Es fa un \'hash\' de les dades abans d\'enviar-les per privacitat.</string>
+    <string name="identity_server_consent_dialog_title_2">Envia adreces de correu electrònic i números de telèfon a %s</string>
     <string name="settings_discovery_consent_notice_off_2">Els teus contactes són privats. Per descobrir els usuaris dels teus contactes, necessitem permís per enviar informació dels contactes al servidor d\'identitat que estiguis utilitzant.</string>
     <string name="send_feedback_space_info">Estàs utilitzant una versió beta dels espais. Els teus comentaris ajudaran a les properes versions. S\'anotaran la teva plataforma i nom d\'usuari per poder utilitzar els teus comentaris tant bé com puguem.</string>
     <string name="room_settings_room_access_restricted_description">Qualsevol a un espai amb aquesta sala podrà trobar-la i unir-s\'hi. Només els administradors d\'aquesta sala poden afegir-la a un espai.</string>
@@ -2155,7 +2150,7 @@
     <string name="location_activity_title_static_sharing">Comparteix ubicació</string>
     <string name="restart_the_application_to_apply_changes">Reinicia l\'aplicació per aplicar els canvis.</string>
     <string name="labs_enable_latex_maths">Activa format matemàtic amb LaTeX</string>
-    <string name="link_this_email_settings_link">Enllaça aquest correu amb el teu compte</string>
+    <string name="link_this_email_settings_link">Enllaça aquesta adreça de correu electrònic al teu compte</string>
     <string name="audio_message_file_size">(%1$s)</string>
     <string name="audio_message_reply_content">%1$s (%2$s)</string>
     <string name="error_audio_message_unable_to_play">No s\'ha pogut reproduir %1$s</string>
@@ -2208,7 +2203,6 @@
     <string name="create_spaces_details_public_header">Afegeix alguns detalls per ajudar a destacar-lo. Pots canviar-ho en qualsevol moment.</string>
     <string name="create_spaces_private_teammates">Un espai privat per tu i els teus</string>
     <string name="space_type_public_desc">Obert a tothom, perfecte per a comunitats</string>
-    <string name="ftue_display_name_subtitle">Es mostrarà quan enviïs missatges.</string>
     <string name="ftue_display_name_title">Escull un àlies</string>
     <string name="ftue_account_created_subtitle">El teu compte %s s\'ha creat</string>
     <string name="ftue_account_created_congratulations_title">Felicitats!</string>
@@ -2231,7 +2225,7 @@
     <string name="ftue_auth_carousel_control_body">Tria on es desen les teves converses, et dona control i independència. Connectat a través de Matrix.</string>
     <string name="ftue_auth_carousel_secure_body">Comunicació segura i independent que t\'ofereix el mateix nivell de privadesa que una conversa cara a cara a casa teva.</string>
     <string name="ftue_auth_carousel_workplace_title">Missatgeria pel teu equip.</string>
-    <string name="ftue_auth_carousel_encrypted_title">Missatgeria segura.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Missatges segurs.</string>
     <string name="ftue_auth_carousel_secure_title">Ets propietari de les teves converses.</string>
     <string name="ftue_auth_carousel_control_title">Tu tens el control.</string>
     <string name="call_tile_voice_call_has_ended">Trucada finalitzada • %1$s</string>
@@ -2444,7 +2438,7 @@
     <string name="settings_notification_other">Altres</string>
     <string name="settings_notification_mentions_and_keywords">Mencions i paraules clau</string>
     <string name="settings_notification_default">Notificacions per defecte</string>
-    <string name="settings_notification_emails_no_emails">Per rebre notificacions per correu, has d\'associar un correu electrònic amb el teu compte de Matrix</string>
+    <string name="settings_notification_emails_no_emails">Per rebre notificacions per correu, has d\'associar una adreça de correu electrònic al teu compte de Matrix</string>
     <string name="shortcut_disabled_reason_sign_out">S\'ha tancat la sessió!</string>
     <string name="shortcut_disabled_reason_room_left">La sala ha estat abandonada!</string>
     <string name="room_settings_none">Cap</string>
@@ -2485,7 +2479,6 @@
     <string name="labs_enable_live_location_summary">Implementació temporal: les ubicacions persisteixen a l\'històric de la sala</string>
     <string name="space_leave_radio_buttons_title">Coses en aquest espai</string>
     <string name="settings_autoplay_animated_images_summary">Reprodueix immediatament les imatges animades a la cronologia</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Deixa de compartir</string>
     <string name="labs_enable_live_location">Activa la compartició d\'ubicació en directe</string>
     <string name="location_share_live_remaining_time">%1$s restants</string>
     <string name="location_share_live_until">En directe fins %1$s</string>
@@ -2603,4 +2596,247 @@
     </plurals>
     <string name="search_space_two_parents">%1$s i %2$s</string>
     <string name="auth_reset_password_error_unverified">Correu no verificat, mira la teva safata d\'entrada</string>
+    <string name="location_share_loading_map_error">No s\'ha pogut carregar el mapa
+\nPotser el servidor utilitzat no està configurat per mostrar mapes.</string>
+    <string name="a11y_open_settings">Obre configuració</string>
+    <string name="all_chats">Tots els xats</string>
+    <string name="home_layout_preferences">Preferències de disseny</string>
+    <string name="explore_rooms">Explora sales</string>
+    <string name="device_manager_sessions_other_description">Per estar més segur, verifica les teves sessions i tanca qualsevol sessió que no reconeguis o ja no utilitzis.</string>
+    <string name="device_manager_sessions_other_title">Altres sessions</string>
+    <string name="settings_sessions_list">Sessions</string>
+    <string name="a11y_open_spaces">Obre la llista d\'espais</string>
+    <string name="a11y_create_message">Crea un nou xat o sala</string>
+    <string name="room_list_filter_people">Gent</string>
+    <string name="room_list_filter_favourites">Preferits</string>
+    <string name="room_list_filter_unreads">No llegits</string>
+    <string name="room_list_filter_all">Tot</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Activitat</string>
+    <string name="home_layout_preferences_sort_by">Ordena per</string>
+    <string name="home_layout_preferences_recents">Mostra recents</string>
+    <string name="home_layout_preferences_filters">Mostra filtres</string>
+    <string name="create_room">Crea sala</string>
+    <string name="start_chat">Inicia xat</string>
+    <string name="device_manager_other_sessions_description_verified">Verificada · Última activitat %1$s</string>
+    <string name="device_manager_other_sessions_description_unverified">No verificada · Última activitat %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Veure-ho tot (%1$d)</string>
+    <string name="device_manager_view_details">Veure detalls</string>
+    <string name="device_manager_verify_session">Verifica sessió</string>
+    <string name="device_manager_verification_status_unverified">Sessió no verificada</string>
+    <string name="device_manager_verification_status_verified">Sessió verificada</string>
+    <string name="a11y_device_manager_device_type_unknown">Tipus de dispositiu desconegut</string>
+    <string name="a11y_device_manager_device_type_desktop">Ordinador</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mòbil</string>
+    <string name="timeline_error_room_not_found">Aquesta sala no s\'ha trobat.
+\nTorna-ho a provar més tard.%s</string>
+    <string name="invites_title">Invitacions</string>
+    <string name="home_empty_no_rooms_title">${app_name}
+\nHola, %s.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Nova visualització!</string>
+    <string name="onboarding_new_app_layout_button_try">Prova-ho</string>
+    <string name="onboarding_new_app_layout_spaces_title">Entra a espais</string>
+    <string name="home_empty_no_rooms_message">L\'aplicació de xats segurs tot en un. Per a equips, amics i organitzacions. Crea un xat o uneix-te a una sala existent per començar.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Pensa en tancar sessió de les sessions antigues (%1$d dia o més) que ja no utilitzis.</item>
+        <item quantity="other">Pensa en tancar sessió de les sessions antigues (%1$d dies o més) que ja no utilitzis.</item>
+    </plurals>
+    <string name="onboarding_new_app_layout_feedback_message">Prem la part superior dreta per veure l\'opció d\'enviar comentaris.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Envia comentaris</string>
+    <string name="home_empty_no_unreads_message">Aquí es mostraran els teus missatges no llegits, quan en tinguis.</string>
+    <string name="home_empty_no_unreads_title">Sense novetats.</string>
+    <string name="device_manager_unverified_sessions_description">Verifica les sessions o tanca\'n la sessió si no estan verificades.</string>
+    <string name="onboarding_new_app_layout_welcome_message">Per simplificar ${app_name}, les pestanyes ara son opcionals. Gestiona-les mitjançant el menú de la part superior dreta.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nsembla una mica buit.</string>
+    <string name="device_manager_inactive_sessions_title">Sessions inactives</string>
+    <string name="device_manager_unverified_sessions_title">Sessions no verificades</string>
+    <string name="device_manager_header_section_security_recommendations_description">Millora la seguretat del teu compte seguint aquestes recomanacions.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Recomanacions de seguretat</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Actiu fa %1$d dia (%2$s)</item>
+        <item quantity="other">Actiu fa més de %1$d dies (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Aquí és on apareixeran les teves sol·licituds i invitacions.</string>
+    <string name="invites_empty_title">Res de nou.</string>
+    <string name="onboarding_new_app_layout_spaces_message">Accedeix als teus espais (part inferior dreta) més ràpid i fàcilment.</string>
+    <string name="home_empty_space_no_rooms_message">Els espais són una nova manera d\'agrupar sales i gent. Afegeix una sala o crea\'n una de nova mitjançant el botó de la part inferior dreta.</string>
+    <string name="space_list_empty_message">Els espais són una nova manera d\'agrupar sales i gent. Crea\'n un per començar.</string>
+    <string name="space_list_empty_title">Cap espai, encara.</string>
+    <string name="a11y_collapse_space_children">Amaga els continguts de %s</string>
+    <string name="a11y_expand_space_children">Mostra el contingut de %s</string>
+    <string name="change_space">Canvia espai</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifica les teves sessions per obtenir missatges segurs millorats o tanca les sessions que no reconeguis o ja no utilitzis.</string>
+    <string name="device_manager_filter_option_unverified_description">No llest per a missatges segurs</string>
+    <string name="device_manager_filter_option_verified_description">Llest per a missatges segurs</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Aquesta sessió està llesta per a missatges segurs.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">La teva sessió actual està llesta per a missatges segurs.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifica la teva sessió actual obtenir missatges segurs millorats.</string>
+    <string name="labs_enable_deferred_dm_summary">Crea missatge directe només al primer missatge</string>
+    <string name="labs_enable_deferred_dm_title">Activa missatges directes programats</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verifica o tanca aquesta sessió per estar més segur.</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Per estar més segur, tanca qualsevol sessió que no reconeguis o ja no utilitzis.</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">No s\'han trobat sessions inactives.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">No s\'han trobat sessions no verificades.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">No s\'han trobat sessions verificades.</string>
+    <string name="device_manager_session_details_title">Detalls de sessió</string>
+    <string name="device_manager_other_sessions_clear_filter">Esborra filtre</string>
+    <string name="device_manager_session_details_session_last_activity">Última activitat</string>
+    <string name="device_manager_session_details_session_name">Nom de la sessió</string>
+    <string name="device_manager_session_details_description">Informació d\'aplicació, dispositiu i activitat.</string>
+    <string name="device_manager_session_details_device_ip_address">Adreça IP</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Pensa en tancar sessió de les sessions antigues (%1$d dia o més) que ja no utilitzis.</item>
+        <item quantity="other">Pensa en tancar sessió de les sessions antigues (%1$d dies o més) que ja no utilitzis.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inactiu</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">No verificat</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Verificat</string>
+    <string name="a11y_device_manager_filter">Filtra</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Inactiu durant %1$d dia o més</item>
+        <item quantity="other">Inactiu durant %1$d dies o més</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inactiu</string>
+    <string name="device_manager_filter_option_unverified">No verificat</string>
+    <string name="device_manager_filter_option_verified">Verificat</string>
+    <string name="device_manager_filter_option_all_sessions">Totes les sessions</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filtre</string>
+    <string name="device_manager_session_last_activity">Última activitat %1$s</string>
+    <string name="device_manager_device_title">Dispositiu</string>
+    <string name="device_manager_session_title">Sessió</string>
+    <string name="device_manager_current_session_title">Sessió actual</string>
+    <string name="labs_enable_new_app_layout_summary">Element simplificat amb pestanyes opcionals</string>
+    <string name="labs_enable_new_app_layout_title">Activa la nova visualització</string>
+    <string name="device_manager_learn_more_sessions_inactive">Les sessions inactives son sessions que no has utilitzat durant un temps, però continuen rebent claus de xifrat.
+\n
+\nL\'eliminació de sessions inactives millora la seguretat i el rendiment, i et pot ajudar a identificar sessions noves sospitoses.</string>
+    <string name="device_manager_session_overview_signout">Tanca aquesta sessió</string>
+    <string name="command_description_devtools">Obre la pantalla d\'eines per a desenvolupadors</string>
+    <string name="device_manager_learn_more_session_rename">Els usuaris dels xats directes i sales al les quals t\'hagis unit poden veure la llista completa de les teves sessions.
+\n
+\nAixò els pot proporcionar més confiança de que realment parlen amb tu però, poden veure el nom de sessió que introdueixis.</string>
+    <string name="device_manager_learn_more_sessions_verified">Les sessions verificades son sessions en què has iniciat sessió amb les teves credencials i s\'han verificat utilitzant una frase de seguretat o mitjançant la verificació creuada.
+\n
+\nAixò vol dir que contenen claus de xifrat dels teus missatges anteriors i confirmen als altres usuaris amb qui parles, que aquestes sessions son realment teves.</string>
+    <string name="device_manager_learn_more_sessions_unverified">Les sessions no verificades son sessions en què has iniciat sessió amb les teves credencials però s\'hi ha fet una verificació creuada.
+\n
+\nAssegura\'t que reconeixes aquestes sessions especialment, ja que podrien representar un ús no autoritzat del teu compte.</string>
+    <string name="device_manager_learn_more_session_rename_title">Canvi de nom de sessions</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sessions verificades</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sessions no verificades</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sessions inactives</string>
+    <string name="device_manager_session_rename_warning">Tingues en compte que els noms de sessió son visibles per les persones amb qui parlis.</string>
+    <string name="device_manager_session_rename_description">Els noms de sessió personalitzats et permeten identificar els teus dispositius més fàcilment.</string>
+    <string name="device_manager_session_rename_edit_hint">Nom de la sessió</string>
+    <string name="device_manager_session_rename">Canvia el nom de la sessió</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">No verificada · Sessió actual</string>
+    <string name="key_authenticity_not_guaranteed">L\'autenticitat d\'aquest missatge xifrat no ha pogut ser garantida en aquest dispositiu.</string>
+    <string name="command_description_table_flip">Afegeix (╯°□°）╯︵ ┻━┻ abans d\'un missatge de text</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Hi ha dispositius no verificats en aquesta sala, no podran desxifrat els missatges que enviïs.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">No enviïs mai missatges xifrats a sessions no verificades d\'aquesta sala.</string>
+    <string name="action_got_it">D\'acord</string>
+    <string name="attachment_type_voice_broadcast">Transmissió de veu</string>
+    <string name="tooltip_attachment_voice_broadcast">Inicia una transmissió de veu</string>
+    <string name="settings_security_incognito_keyboard_summary">Sol·licita que no es desi cap dada personalitzada del teclat en funció del que escrius a les converses (per exemple l\'historial d\'escriptura o el diccionari). Tingues en compte que alguns teclats poden no respectar aquesta configuració.</string>
+    <string name="settings_security_incognito_keyboard_title">Teclat incògnit</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Has activat el xifrat a només en sessions verificades a totes les sales, a Configuració &gt; Seguretat.</string>
+    <string name="device_manager_verification_status_unknown">Estat de verificació desconegut</string>
+    <string name="login_scan_qr_code">Escaneja codi QR</string>
+    <string name="push_gateway_item_device_id">ID de sessió:</string>
+    <string name="permissions_rationale_msg_notification">${app_name} necessita permís per mostrar notificacions. Les notificacions poden mostrar missatges, invitacions, etc.
+\n
+\nConcedeix els permisos a les següents finestres emergents per poder veure les notificacions correctament.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">S\'ha detectat un problema de seguretat en configurar la missatgeria segura. Algun dels següents elements pot estar compromès: el servidor que utilitzes; alguna de les teves connexions a Internet; algun dels teus dispositius;</string>
+    <string name="qr_code_login_header_connected_description">Comprova el dispositiu amb la sessió iniciada, s\'hauria de mostrar el codi de sota. Verifica que el codi de sota coincideix amb el del dispositiu:</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Comença a la pantalla d\'inici de sessió</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Comença a la pantalla d\'inici de sessió</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Iniciant sessió a un dispositiu mòbil\?</string>
+    <string name="qr_code_login_show_qr_code_button">Mostra codi QR</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Selecciona \'Escaneja codi QR\'</string>
+    <string name="qr_code_login_new_device_instruction_3">Selecciona \'Mostra codi QR\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Ves a Configuració -&gt; Seguretat i privadesa</string>
+    <string name="qr_code_login_new_device_instruction_1">Obre l\'aplicació en l\'altre dispositiu</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Inici de sessió cancel·lat per l\'altre dispositiu.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">El codi QR és invàlid.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">L\'altre dispositiu ha d\'haver iniciat sessió.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">L\'altre dispositiu ja ha iniciat sessió.</string>
+    <string name="qr_code_login_header_failed_other_description">Ha fallat la petició.</string>
+    <string name="qr_code_login_header_failed_denied_description">Petició denegada per l\'altre dispositiu.</string>
+    <string name="qr_code_login_header_failed_timeout_description">La vinculació no s\'ha completat en el temps permès.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">La vinculació amb aquest dispositiu no està admesa.</string>
+    <string name="qr_code_login_header_failed_title">Connexió sense èxit</string>
+    <string name="qr_code_login_header_connected_title">Connexió segura establerta</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Escaneja el codi QR de sota amb el dispositiu amb la sessió tancada.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Utilitza el dispositiu amb la sessió iniciada per escanejar el codi QR següent:</string>
+    <string name="qr_code_login_try_again">Torna-ho a provar</string>
+    <string name="qr_code_login_status_no_match">No coincideix\?</string>
+    <string name="qr_code_login_signing_in">Iniciant sessió</string>
+    <string name="qr_code_login_connecting_to_device">Connectant al dispositiu</string>
+    <string name="qr_code_login_scan_qr_code_button">Escaneja codi QR</string>
+    <string name="qr_code_login_confirm_security_code">Confirma</string>
+    <string name="qr_code_login_confirm_security_code_description">Assegura\'t que coneixes l\'origen d\'aquest codi. L\'enllaç de dispositius, proporciona a algú accés complet al teu compte.</string>
+    <string name="rich_text_editor_format_underline">Aplica subratllat</string>
+    <string name="rich_text_editor_format_strikethrough">Ratlla-ho</string>
+    <string name="rich_text_editor_format_bold">Aplica negreta</string>
+    <string name="rich_text_editor_format_italic">Aplica cursiva</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Selecciona \'Inicia sessió amb codi QR\'</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">El servidor no és compatible amb l\'inici de sessió mitjançant codi QR.</string>
+    <string name="qr_code_login_header_show_qr_code_title">Inicia sessió amb codi QR</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Utilitza la càmera d\'aquest dispositiu per escanejar el codi QR que es mostra a l\'altre dispositiu:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Escaneja codi QR</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="labs_enable_voice_broadcast_summary">Permet enregistrar i enviar emissions de veu dins una sala.</string>
+    <string name="labs_enable_voice_broadcast_title">Activa l\'emissió de veu</string>
+    <string name="labs_enable_client_info_recording_title">Activa la gravació d\'informació de client</string>
+    <string name="labs_enable_client_info_recording_summary">Desa el nom de client, la versió i l\'URL per reconèixer les sessions més fàcilment dins el gestor de sessions.</string>
+    <string name="labs_enable_session_manager_summary">Obté un millor control i visibilitat de totes les teves sessions.</string>
+    <string name="labs_enable_session_manager_title">Activa el nou gestor de sessions</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Pots utilitzar aquest dispositiu per iniciar la sessió amb un codi QR a un dispositiu mòbil o web. Ho pots fer de dues maneres:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Inicia sessió amb codi QR</string>
+    <string name="device_manager_session_details_device_operating_system">Sistema operatiu</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Navegador</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versió</string>
+    <string name="device_manager_session_details_application_name">Nom</string>
+    <string name="device_manager_session_details_application">Aplicació</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifica la teva sessió actual per mostrar l\'estat de verificació d\'aquesta sessió.</string>
+    <string name="push_gateway_item_enabled">Activat:</string>
+    <string name="error_check_network">Alguna cosa ha anat malament. Comprova la teva connexió i torna-ho a provar.</string>
+    <string name="grant_permission">Concedir permís</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} necessita permís per mostrar notificacions.
+\nSi us plau, concedeix-li el permís.</string>
+    <string name="labs_enable_rich_text_editor_summary">Prova l\'editor de text enriquit (el mode text pla arribarà aviat)</string>
+    <string name="labs_enable_rich_text_editor_title">Activa l\'editor de text enriquit</string>
+    <string name="device_manager_push_notifications_description">Rep notificacions en aquesta sessió.</string>
+    <string name="device_manager_push_notifications_title">Notificacions</string>
+    <string name="a11y_voice_broadcast_buffering">Carregant</string>
+    <string name="a11y_pause_voice_broadcast">Pausa l\'emissió de veu</string>
+    <string name="a11y_play_voice_broadcast">Reprodueix o reprèn l\'emissió de veu</string>
+    <string name="a11y_stop_voice_broadcast_record">Atura l\'enregistrament d\'emissió de veu</string>
+    <string name="a11y_pause_voice_broadcast_record">Pausa l\'enregistrament d\'emissió de veu</string>
+    <string name="a11y_resume_voice_broadcast_record">Reprèn l\'enregistrament d\'emissió de veu</string>
+    <string name="voice_broadcast_live">En directe</string>
+    <string name="action_deselect_all">Deselecciona-ho tot</string>
+    <string name="action_select_all">Selecciona-ho tot</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d seleccionat</item>
+        <item quantity="other">%1$d seleccionats</item>
+    </plurals>
+    <string name="attachment_type_selector_poll">Enquestes</string>
+    <string name="device_manager_other_sessions_select">Selecciona sessions</string>
+    <string name="attachment_type_selector_contact">Contacte</string>
+    <string name="attachment_type_selector_camera">Càmera</string>
+    <string name="attachment_type_selector_location">Ubicació</string>
+    <string name="attachment_type_selector_voice_broadcast">Emissió de veu</string>
+    <string name="attachment_type_selector_file">Adjunts</string>
+    <string name="attachment_type_selector_sticker">Adhesius</string>
+    <string name="attachment_type_selector_gallery">Galeria</string>
+    <string name="attachment_type_selector_text_formatting">Format de text</string>
+    <string name="a11y_voice_broadcast_fast_backward">Enrere 30 segons</string>
+    <string name="a11y_voice_broadcast_fast_forward">Avança 30 segons</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ca/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-ca/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-ca/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-ca/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-cs/strings.xml b/library/ui-strings/src/main/res/values-cs/strings.xml
similarity index 87%
rename from vector/src/main/res/values-cs/strings.xml
rename to library/ui-strings/src/main/res/values-cs/strings.xml
index 5733fde468..0a7998deaa 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/library/ui-strings/src/main/res/values-cs/strings.xml
@@ -52,8 +52,6 @@
 \nPokud jste se připojili k mnoha místnostem, může to chvíli trvat</string>
     <string name="initial_sync_start_importing_account_left_rooms">Úvodní synchronizace:
 \nImportuji místnost, jež jste opustili</string>
-    <string name="initial_sync_start_importing_account_groups">Úvodní synchronizace:
-\nImportuji skupiny</string>
     <string name="initial_sync_start_importing_account_data">Úvodní synchronizace:
 \nImportuji data účtu</string>
     <string name="event_status_sending_message">Odesílám zprávu…</string>
@@ -279,7 +277,6 @@
     <string name="matrix_only_filter">Pouze kontakty Matrix</string>
     <string name="no_result_placeholder">Žádné výsledky</string>
     <string name="rooms_header">Místnosti</string>
-    <string name="groups_header">Komunity</string>
     <string name="send_bug_report_include_logs">Odeslat záznamy</string>
     <string name="send_bug_report_include_crash_logs">Odeslat záznamy zřícení</string>
     <string name="send_bug_report_include_screenshot">Odeslat screenshot</string>
@@ -311,7 +308,6 @@
     <string name="auth_email_already_defined">Tato e-mailová adresa je již zadána.</string>
     <string name="auth_forgot_password">Zapomenuté heslo?</string>
     <string name="auth_recaptcha_message">Tento domovský server by se rád přesvědčil, že nejste robot</string>
-    <string name="auth_reset_password_missing_email">Musíte zadat e-mailovou adresu spojenou s vaším účtem.</string>
     <string name="auth_reset_password_error_unauthorized">E-mailovou adresu se nepodařilo ověřit. Přesvědčte se, že jste klepli na zaslaný odkaz</string>
     <string name="login_error_invalid_home_server">Prosím, zadejte platné URL</string>
     <string name="login_error_bad_json">Poškozený JSON</string>
@@ -355,7 +351,7 @@
     <string name="call_in_progress">Hovor probíhá…</string>
     <string name="call_error_user_not_responding">Protější strana hovor nepřijala.</string>
     <string name="permissions_rationale_popup_title">Informace</string>
-    <string name="permissions_rationale_msg_record_audio">${app_name} potřebuje oprávnění pro přístup k Vašemu mikrofonu pro uskutečnění hlasových hovorů.</string>
+    <string name="permissions_rationale_msg_record_audio">${app_name} potřebuje oprávnění pro přístup k vašemu mikrofonu pro uskutečnění hlasových hovorů.</string>
     <string name="yes">ANO</string>
     <string name="no">NE</string>
     <string name="_continue">Pokračovat</string>
@@ -415,12 +411,12 @@
     <string name="done">Hotovo</string>
     <string name="action_sign_out_confirmation_simple">Opravdu se chcete odhlásit\?</string>
     <string name="video_call_in_progress">Video hovor probíhá…</string>
-    <string name="permissions_rationale_msg_camera_and_audio">${app_name} potřebuje oprávnění pro přístup k Vaší kameře a mikrofonu pro uskutečnění video hovoru.
+    <string name="permissions_rationale_msg_camera_and_audio">${app_name} potřebuje oprávnění pro přístup k vaší kameře a mikrofonu pro uskutečnění video hovoru.
 \n
 \nProsím, povolte přístup na následující hlášce abyste mohli uskutečnit hovor.</string>
     <string name="room_participants_power_level_prompt">Tuto změnu nelze zvrátit, protože povyšujete uživatele na stejnou úroveň, jakou máte vy.
 \nOpravdu to chcete udělat\?</string>
-    <string name="ssl_cert_not_trust">Toto by mohlo znamenat, že někdo škodlivě zachytává Vaši komunikaci nebo že Váš telefon nedůvěřuje certifikátu poskytnutému vzdáleným serverem.</string>
+    <string name="ssl_cert_not_trust">Toto by mohlo znamenat, že někdo škodlivě zachytává vaši komunikaci nebo že Váš telefon nedůvěřuje certifikátu poskytnutému vzdáleným serverem.</string>
     <string name="ssl_cert_new_account_expl">Pokud administrátor serveru řekl, že toto je předpokládané, ujistěte se, že otisk níže se shoduje s otiskem který Vám poskytl.</string>
     <string name="ssl_unexpected_existing_expl">Certifikát se změnil z toho, kterému Váš telefon důvěřoval. Toto je VELMI NEOBVYKLÉ. Je doporučeno, abyste NEPŘIJALI tento nový certifikát.</string>
     <string name="ssl_expected_existing_expl">Certifikát se změnil z původně důvěryhodného na nyní nedůvěryhodný. Server patrně obnovil svůj certifikát. Kontaktujte administrátora kvůli očekávanému otisku.</string>
@@ -445,7 +441,7 @@
     <string name="none">Žádný</string>
     <string name="action_revoke">Zrušit</string>
     <string name="auth_login_sso">Přihlásit se se single sign-on</string>
-    <string name="login_error_no_homeserver_found">To není platná adresa Matrix serveru</string>
+    <string name="login_error_no_homeserver_found">Toto není platná adresa Matrix serveru</string>
     <string name="login_error_homeserver_not_found">Domovský server není dostupný na této adrese, zkontrolujte ji prosím</string>
     <string name="settings_notification_troubleshoot">Odstraňování problémů s oznámeními</string>
     <string name="settings_troubleshoot_diagnostic">Řešit diagnostiku</string>
@@ -582,7 +578,7 @@
     <string name="settings_deactivate_account_section">Deaktivace účtu</string>
     <string name="settings_deactivate_my_account">Deaktivovat můj účet</string>
     <string name="settings_discovery_category">Objevování</string>
-    <string name="settings_discovery_manage">Správa Vašich nastavení pro objevování.</string>
+    <string name="settings_discovery_manage">Správa vašich nastavení pro objevování.</string>
     <string name="settings_analytics">Analýza</string>
     <string name="settings_opt_in_of_analytics">Odeslat analytická data</string>
     <string name="settings_opt_in_of_analytics_summary">${app_name} sbírá anonymní analytická data pro vylepšení aplikace.</string>
@@ -639,7 +635,7 @@
     <string name="settings_theme">Motiv vzhledu</string>
     <string name="encryption_information_decryption_error">Chyba dešifrování</string>
     <string name="encryption_information_device_name">Veřejné jméno</string>
-    <string name="encryption_information_device_id">ID relace</string>
+    <string name="device_manager_session_details_session_id">ID relace</string>
     <string name="encryption_information_device_key">Klíč relace</string>
     <string name="encryption_export_e2e_room_keys">Export E2E klíčů místností</string>
     <string name="encryption_export_room_keys">Export klíčů místností</string>
@@ -652,8 +648,8 @@
     <string name="encryption_import_room_keys">Import klíčů místností</string>
     <string name="encryption_import_room_keys_summary">Import klíčů z místního souboru</string>
     <string name="encryption_import_import">Import</string>
-    <string name="encryption_never_send_to_unverified_devices_title">Šifruj pouze do ověřených relací</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Nikdy neposílejte šifrované zprávy do neověřených relací z této relace.</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Šifrovat pouze do ověřených relací</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Nikdy neposílat šifrované zprávy do neověřených relací z této relace.</string>
     <string name="encryption_information_not_verified">Není ověřeno</string>
     <string name="encryption_information_verified">Potvrzeno</string>
     <string name="encryption_information_unknown_ip">neznámá ip</string>
@@ -852,7 +848,7 @@
     <string name="keys_backup_setup">Začít používat zálohu klíčů</string>
     <string name="keys_backup_setup_step1_advanced">(Pokročilé)</string>
     <string name="keys_backup_setup_step2_text_title">Zabezpečit zálohu přístupovou frází.</string>
-    <string name="keys_backup_setup_step2_text_description">Uložíme zašifrovanou kopii Vašich klíčů na Vašem domovském serveru. Chraňte svoji zálohu přístupovou frází, abyste ji udrželi v bezpečí.
+    <string name="keys_backup_setup_step2_text_description">Uložíme zašifrovanou kopii vašich klíčů na Vašem domovském serveru. Chraňte svoji zálohu přístupovou frází, abyste ji udrželi v bezpečí.
 \n
 \nZ důvodu nejvyšší bezpečnosti by se měla lišit od hesla účtu.</string>
     <string name="keys_backup_setup_step2_button_title">Nastavit přístupovou frází</string>
@@ -860,7 +856,7 @@
     <string name="keys_backup_setup_step1_recovery_key_alternative">Nebo zabezpečte svoji zálohu pomocí klíče obnovy, uloženého někde v bezpečí.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Pokročilé) Nastavit s klíčem obnovy</string>
     <string name="keys_backup_setup_step3_success_title">Podařilo se!</string>
-    <string name="keys_backup_setup_step3_text_line2">Váš klíč obnovy je záchranná síť - lze jej použít pro obnovu Vašich šifrovaných zpráv, pokud zapomenete svou přístupovou frázi.
+    <string name="keys_backup_setup_step3_text_line2">Váš klíč obnovy je záchranná síť - lze jej použít pro obnovu vašich šifrovaných zpráv, pokud zapomenete svou přístupovou frázi.
 \nUchovávejte svůj klíč obnovy velmi bezpečně, např. ve správci hesel (nebo trezoru)</string>
     <string name="keys_backup_setup_step3_text_line2_no_passphrase">Uchovávejte svůj klíč obnovy velmi bezpečně, např. ve správci hesel (nebo trezoru)</string>
     <string name="keys_backup_setup_step3_button_title">Hotovo</string>
@@ -948,7 +944,6 @@
     <string name="action_change">Změnit</string>
     <string name="change_room_directory_network">Změnit síť</string>
     <string name="please_wait">Prosím, čekejte…</string>
-    <string name="group_all_communities">Všechny komunity</string>
     <string name="room_preview_no_preview">Nelze provést náhled této místnosti</string>
     <string name="fab_menu_create_room">Místnosti</string>
     <string name="fab_menu_create_chat">Přímé zprávy</string>
@@ -967,16 +962,16 @@
     <string name="settings_push_rules">Push pravidla</string>
     <string name="settings_push_rules_no_rules">Žádná push pravidla nejsou definována</string>
     <string name="settings_push_gateway_no_pushers">Žádné push brány nejsou registrovány</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_id">ID aplikace:</string>
+    <string name="push_gateway_item_push_key">Klíč push:</string>
+    <string name="push_gateway_item_app_display_name">Zobrazovaný název aplikace:</string>
+    <string name="push_gateway_item_device_name">Název relace:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formát:</string>
     <string name="preference_voice_and_video">Hlas a video</string>
     <string name="preference_root_help_about">Nápověda a O aplikaci</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Registrovat token</string>
-    <string name="send_suggestion">Učinit návrh</string>
+    <string name="send_suggestion">Poslat návrh</string>
     <string name="send_suggestion_content">Prosím, zapište svůj návrh níže.</string>
     <string name="send_suggestion_report_placeholder">Popište svůj návrh tady</string>
     <string name="send_suggestion_sent">Děkujeme, návrh byl úspěšně odeslán</string>
@@ -1016,7 +1011,7 @@
     <string name="settings_discovery_no_msisdn">Volby pro nalezení se ukážou, jakmile doplníte telefonní číslo.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Odpojení od serveru identit bude znamenat, že Vás jiní uživatelé nebudou moci najít a Vy nebudete moci pozvat druhé pomocí emailu nebo telefonního čísla.</string>
     <string name="settings_discovery_msisdn_title">Telefonní čísla pro nalezení</string>
-    <string name="settings_discovery_confirm_mail">Poslali jsme Vám potvrzovací email na %s, podívejte se do emailu a klikněte na protvrzovací odkaz</string>
+    <string name="settings_discovery_confirm_mail">Poslali jsme vám email na %s, podívejte se do něj a klikněte na protvrzovací odkaz</string>
     <string name="settings_discovery_enter_identity_server">Zadejte URL serveru pro identity</string>
     <string name="settings_discovery_bad_identity_server">Nemohl jsem se spojit se serverem pro identity</string>
     <string name="settings_discovery_please_enter_server">Prosím, zadejte url serveru pro identity</string>
@@ -1028,7 +1023,7 @@
     <string name="labs_allow_extended_logging">Zapnout podrobné záznamy.</string>
     <string name="labs_allow_extended_logging_summary">Podrobné záznamy pomohou vývojářům mnoha podrobnostmi, odešlete-li RageShake. I když jsou zapnuty, aplikace nezaznamenává obsah zpráv nebo jakákoli soukromá data.</string>
     <string name="error_terms_not_accepted">Prosím, opakujte, jakmile jste přijali všeobecné podmínky svého domovského serveru.</string>
-    <string name="error_network_timeout">Vypadá to, že serveru dlouho trvá odpovědět, to může být způsobeno buď slabým spojením nebo chybou na serveru. Prosím, opakujte za chvíli.</string>
+    <string name="error_network_timeout">Vypadá to, že serveru trvá příliš dlouho, než odpoví, což může být způsobeno buď špatným připojením, nebo chybou serveru. Zkuste to prosím za chvíli znovu.</string>
     <string name="send_attachment">Poslat přílohu</string>
     <string name="a11y_open_drawer">Otevřít navigační zásuvku</string>
     <string name="a11y_create_menu_open">Otevřít menu založení místnosti</string>
@@ -1084,12 +1079,12 @@
     <string name="no_ignored_users">Neignorujete žádné uživatele</string>
     <string name="help_long_click_on_room_for_more_options">Více možností po dlouhém stisku na místnost</string>
     <string name="room_join_rules_public">%1$s učinil místnost veřejnou pro kohokoli znalého odkazu.</string>
-    <string name="room_join_rules_invite">%1$s nastavil místnost jen pro pozvané.</string>
+    <string name="room_join_rules_invite">%1$s nastavil místnost jako pouze pro pozvané.</string>
     <string name="timeline_unread_messages">Nepřečtené zprávy</string>
     <string name="login_splash_title">Je to Vaše konverzace. Vlastněte ji.</string>
     <string name="login_splash_text1">Chatujte s lidmi přímo nebo ve skupinách</string>
     <string name="login_splash_text2">Udržujte konverzace soukromé pomocí šifrování</string>
-    <string name="login_splash_text3">Rozšiřte a upravte si svůj zážitek</string>
+    <string name="login_splash_text3">Rozšiřte a upravte si možnosti</string>
     <string name="login_splash_submit">Můžeme začít</string>
     <string name="login_server_title">Vybrat server</string>
     <string name="login_server_text">Jako email, účty mají jeden domov, ačkoli můžete mluvit s kýmkoli</string>
@@ -1111,7 +1106,7 @@
     <string name="login_server_url_form_modular_text">Prémiový hosting pro organizace</string>
     <string name="login_server_url_form_modular_notice">Zadejte adresu Modular Element nebo serveru, který chcete použít</string>
     <string name="login_sso_error_message">Při načítání stránky došlo k chybě: %1$s (%2$d)</string>
-    <string name="login_mode_not_supported">Aplikace se nemůže přihlásit k tomuto homeserveru. Homeserver podporuje následující typy přihlášení: %1$s.
+    <string name="login_mode_not_supported">Aplikace se nemůže přihlásit k tomuto domovskému serveru. Domovský server podporuje následující typy přihlášení: %1$s.
 \n
 \nChcete se přihlásit webovým klientem\?</string>
     <string name="login_registration_disabled">Omlouváme se, tento server již nepřijímá nové účty.</string>
@@ -1141,7 +1136,7 @@
 \n
 \nZastavit proces změny hesla\?</string>
     <string name="login_set_email_title">Nastavit emailovou adresu</string>
-    <string name="login_set_email_notice">Nastavte emailovou adresu pro obnově svého účtu. Později můžete volitelně dovolit lidem, které znáte, aby Vás podle emailu nalezli.</string>
+    <string name="login_set_email_notice">Nastavte e-mailovou adresu pro obnovení účtu. Později můžete volitelně povolit svým známým, aby vás podle této adresy nalezli.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (volitelné)</string>
     <string name="login_set_email_submit">Dále</string>
@@ -1223,7 +1218,7 @@
     <string name="settings_developer_mode_fail_fast_summary">${app_name} může spadnout častěji, když se objeví neočekávané chyby</string>
     <string name="command_description_shrug">Předsune ¯\\_(ツ)_/¯ do textové zprávy</string>
     <string name="create_room_encryption_title">Zapnout šifrování</string>
-    <string name="create_room_encryption_description">Jakmile zapnuto, šifrování nelze vypnout.</string>
+    <string name="create_room_encryption_description">Po zapnutí šifrování ho není možné vypnout.</string>
     <string name="login_error_threepid_denied">Vaše emailová doména není autorizována registrovat se na tomto serveru</string>
     <string name="verification_conclusion_warning">Nedůvěryhodné přihlášení</string>
     <string name="verification_sas_match">Shodují se</string>
@@ -1284,7 +1279,7 @@
     <string name="rendering_event_error_type_of_event_not_handled">${app_name} neobstarává události typu \'%1$s\'</string>
     <string name="rendering_event_error_exception">${app_name} narazil na chybu při převádění obsahu události s id \'%1$s\'</string>
     <string name="unignore">Odignorovat</string>
-    <string name="verify_cannot_cross_sign">Tato relace nemůže sdílet toto ověření s jinými z Vašich relací.
+    <string name="verify_cannot_cross_sign">Tato relace nemůže sdílet toto ověření s jinými z vašich relací.
 \nToto ověření bude uloženo místně a sdíleno v budoucí verzi aplikace.</string>
     <string name="command_description_rainbow">Odešle danou zprávu zabarvenou jako duha</string>
     <string name="command_description_rainbow_emote">Odešle daný emote zabarvený jako duha</string>
@@ -1302,15 +1297,15 @@
     <string name="verification_conclusion_ok_self_notice">Vaše nová relace je nyní ověřena. Má přístup k Vašim zašifrovaným zprávám a ostatní uživatelé ji uvidi jako důvěryhodnou.</string>
     <string name="encryption_information_cross_signing_state">Křížové podepisování</string>
     <string name="encryption_information_dg_xsigning_complete">Křížové podpisování je zapnuto.
-\nPrivátní klíče v zařízení.</string>
+\nSoukromé klíče v zařízení.</string>
     <string name="encryption_information_dg_xsigning_trusted">Křížové podpisování je zapnuto
 \nKlíče jsou důvěryhodné.
-\nPrivátní klíče nejsou známy</string>
+\nSoukromé klíče nejsou známy</string>
     <string name="encryption_information_dg_xsigning_not_trusted">Křížové podpisování je zapnuto.
 \nKlíče nejsou důvěryhodné</string>
     <string name="encryption_information_dg_xsigning_disabled">Křížové podpisování není zapnuto</string>
     <string name="settings_active_sessions_list">Aktivní relace</string>
-    <string name="settings_active_sessions_show_all">Ukázat všechny relace</string>
+    <string name="settings_active_sessions_show_all">Zobrazit všechny relace</string>
     <string name="settings_active_sessions_manage">Správa relací</string>
     <string name="settings_active_sessions_signout_device">Odhlásit se z této relace</string>
     <string name="settings_failed_to_get_crypto_device_info">Žádná kryptografická informace není k dispozici</string>
@@ -1445,7 +1440,7 @@
     <string name="event_redacted">Zpráva smazána</string>
     <string name="settings_show_redacted">Ukázat odstraněné zprávy</string>
     <string name="settings_show_redacted_summary">Zobrazit zástupný symbol za odstraněné zprávy</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Poslali jsme Vám potvrzovací email na %s, podívejte se nejdříve do emailu a klikněte na protvrzovací odkaz</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Poslali jsme vám email na %s, podívejte se nejdříve do emailu a klikněte na protvrzovací odkaz</string>
     <string name="settings_text_message_sent_wrong_code">Ověřovací kód není správný.</string>
     <string name="uploads_media_title">MÉDIA</string>
     <string name="uploads_media_no_result">V této místnosti nejsou žádná média</string>
@@ -1480,7 +1475,7 @@
     <string name="cross_signing_verify_by_text">Manuálně ověřit textem</string>
     <string name="crosssigning_verify_session">Ověřit přihlášení</string>
     <string name="cross_signing_verify_by_emoji">Interaktivně ověřit pomocí Emoji</string>
-    <string name="confirm_your_identity">Potvrďte svou identitu ověřením tohoto přihlášení v některé z Vašich dalších relacích a udělte přístup k zašifrovaným zprávám.</string>
+    <string name="confirm_your_identity">Potvrďte svou identitu ověřením tohoto přihlášení v některé z vašich dalších relacích a udělte přístup k zašifrovaným zprávám.</string>
     <string name="error_empty_field_choose_user_name">Zvolte si, prosím, uživatelské jméno.</string>
     <string name="error_empty_field_choose_password">Prosím, zvolte heslo.</string>
     <string name="external_link_confirmation_title">Překontrolovat tento odkaz</string>
@@ -1522,7 +1517,7 @@
     <string name="no_permissions_to_start_conf_call">Nemáte povolení zahájit konferenční hovor v této místnosti</string>
     <string name="video_meeting">Zahájit video schůzku</string>
     <string name="audio_meeting">Zahájit hlasovou schůzku</string>
-    <string name="audio_video_meeting_description">Schůzky používají pravidla zabezpečení a přístupu Jitsi. Všichni lidé nyní v místnosti uvidí pozvánku k připojení, zatímco Vaše schůzka probíhá.</string>
+    <string name="audio_video_meeting_description">Schůzky používají pravidla zabezpečení a přístupu Jitsi. Všichni lidé nyní v místnosti uvidí pozvánku k připojení, zatímco vaše schůzka probíhá.</string>
     <string name="cannot_call_yourself">Nemůžete zahájit hovor se sebou</string>
     <string name="cannot_call_yourself_with_invite">Nemůžete zahájit hovor se sebou, počkejte, až účastníci přijmou pozvánku</string>
     <string name="failed_to_add_widget">Přidání widgetu se nezdařilo</string>
@@ -1572,9 +1567,9 @@
     <string name="room_participants_ban_reason">Důvod k vykázání</string>
     <string name="room_participants_unban_title">Zrušit vykázání uživatele</string>
     <string name="room_participants_unban_prompt_msg">Zrušení vykázání uživatele jim opět umožní vstoupit do místnosti.</string>
-    <string name="settings_phone_number_empty">Žádné telefonní číslo nebylo zadáno do Vašeho účtu</string>
+    <string name="settings_phone_number_empty">Žádné telefonní číslo nebylo zadáno do vašeho účtu</string>
     <string name="settings_emails">Emailová adresa</string>
-    <string name="settings_emails_empty">Žádná emailová adresa nebyla zadána do Vašeho účtu</string>
+    <string name="settings_emails_empty">Žádná emailová adresa nebyla zadána do vašeho účtu</string>
     <string name="settings_phone_numbers">Telefonní čísla</string>
     <string name="settings_remove_three_pid_confirmation_content">Ostranit %s\?</string>
     <string name="error_threepid_auth_failed">Ujistěte se, že kliknete na odkaz v e-mailu, který jsme Vám poslali.</string>
@@ -1582,7 +1577,7 @@
     <string name="settings_secure_backup_setup">Vytvořit bezpečnou zálohu</string>
     <string name="settings_secure_backup_reset">Resetovat bezpečnou zálohu</string>
     <string name="settings_secure_backup_enter_to_setup">Nastavit na tomto zařízení</string>
-    <string name="settings_secure_backup_section_info">Ochrana před ztrátou přístupu k šifrovaným zprávám a datům pomocí zálohy šifrovacích klíčů na Vašem serveru.</string>
+    <string name="settings_secure_backup_section_info">Ochrana před ztrátou přístupu k šifrovaným zprávám a datům pomocí zálohy šifrovacích klíčů na vašem serveru.</string>
     <string name="reset_secure_backup_title">Generovat nový bezpečnostní klíč nebo nastavit novou bezpečnostní frázi pro existující zálohu.</string>
     <string name="reset_secure_backup_warning">To nahradí Váš nynější klíč nebo frázi.</string>
     <string name="disabled_integration_dialog_title">Integrace jsou vypnuty</string>
@@ -1646,7 +1641,7 @@
     <string name="a11y_stop_camera">Zastavit fotoaparát</string>
     <string name="a11y_start_camera">Spustit fotoaparát</string>
     <string name="bottom_sheet_setup_secure_backup_title">Bezpečná záloha</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">Ochrana před ztrátou přístupu k šifrovaným zprávám a datům pomocí zálohy šifrovacích klíčů na Vašem serveru.</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Ochrana před ztrátou přístupu k šifrovaným zprávám a datům pomocí zálohy šifrovacích klíčů na vašem serveru.</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Nastavit</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Použít bezpečnostní klíč</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Generovat bezpečnostní klíč k uložení na bezpečném místě např. správci hesel nebo sejfu.</string>
@@ -2024,20 +2019,20 @@
     <string name="create_space_error_empty_field_space_name">Dejte prostoru jméno a pokračujte.</string>
     <string name="create_spaces_details_public_header">Doplňte nějaké podrobnosti, aby zaujal. Můžete je kdykoli změnit.</string>
     <string name="activity_create_space_title">Vytvořit prostor</string>
-    <string name="space_type_private_desc">Pouze na pozvání, nejlepší pro Vás nebo týmy</string>
-    <string name="space_type_private">Privátní</string>
+    <string name="space_type_private_desc">Pouze na pozvání, nejlepší pro vás nebo týmy</string>
+    <string name="space_type_private">Soukromý</string>
     <string name="space_type_public_desc">Otevřený pro všechny, nejlepší pro komunity</string>
     <string name="space_type_public">Veřejný</string>
-    <string name="create_spaces_private_teammates">Privátní prostor pro Vás a Vaše kolegy</string>
+    <string name="create_spaces_private_teammates">Soukromý prostor pro vás a vaše kolegy</string>
     <string name="create_spaces_me_and_teammates">Já a kolegové</string>
-    <string name="create_spaces_organise_rooms">Privátní prostor k organizaci Vašich místností</string>
+    <string name="create_spaces_organise_rooms">Soukromý prostor pro uspořádání vašich místností</string>
     <string name="create_spaces_just_me">Jen já</string>
     <string name="create_spaces_make_sure_access">Ujistěte se, že ti správní lidé mají přístup do %s.</string>
     <string name="create_spaces_who_are_you_working_with">S kým pracujete\?</string>
     <string name="create_spaces_join_info_help">Ke vstupu do existujícího prostoru potřebujete pozvání.</string>
     <string name="create_spaces_you_can_change_later">Můžete změnit později</string>
     <string name="create_spaces_choose_type_label">Jaký typ prostoru chcete vytvořit\?</string>
-    <string name="your_private_space">Váš privátní prostor</string>
+    <string name="your_private_space">Váš soukromý prostor</string>
     <string name="your_public_space">Váš veřejný prostor</string>
     <string name="add_space">Přidat prostor</string>
     <string name="command_description_leave_room">Opustit místnost s daným id (nebo nynější místnost pokud prázdné)</string>
@@ -2049,7 +2044,7 @@
     <string name="room_settings_room_access_public_description">Kdokoliv může místnost najít a připojit se do ní</string>
     <string name="room_settings_room_access_public_title">Veřejný</string>
     <string name="room_settings_room_access_private_description">Pouze pozvaní mohou místnost najít a vstoupit do ní</string>
-    <string name="room_settings_room_access_private_title">Privátní</string>
+    <string name="room_settings_room_access_private_title">Soukromý</string>
     <string name="room_settings_room_access_entry_unknown">Neznámé nastavení přístupu (%s)</string>
     <string name="room_settings_room_access_entry_knock">Každý může na místnost zaklepat, členové pak mohou přijmout či odmítnout</string>
     <string name="room_settings_guest_access_title">Dovolit hostům vstoupit</string>
@@ -2109,13 +2104,13 @@
     <string name="space_settings_alias_subtitle">Prohlédnout a spravovat adresy tohoto prostoru.</string>
     <string name="space_settings_alias_title">Adresy prostorů</string>
     <string name="room_upgrade_to_recommended_version">Aktualizujte na doporučenou verzi místnosti</string>
-    <string name="room_using_unstable_room_version">Tato místnost používá místnost verze %s, kterou homeserver označil za nestabilní.</string>
+    <string name="room_using_unstable_room_version">Tato místnost používá verzi místnosti %s, kterou domovský server označil za nestabilní.</string>
     <string name="upgrade_room_no_power_to_manage">K aktualizaci místnosti potřebujete oprávnění</string>
     <string name="upgrade_room_update_parent_space">Automaticky aktualizovat mateřský prostor</string>
     <string name="upgrade_room_auto_invite">Automaticky pozvat uživatele</string>
     <string name="upgrade_public_room_from_to">Budete aktualizovat tuto místnost z %1$s na %2$s.</string>
-    <string name="upgrade_room_warning">Aktualizace místnosti je pokročilá akce a obvykle se doporučuje tehdy, je-li místnost nestabilní kvůli chybám, chybějícím funkcím nebo slabým místům v zabezpečení.
-\nObvykle má vliv pouze na to, jak server místnost zpracovává.</string>
+    <string name="upgrade_room_warning">Aktualizace místnosti je pokročilá akce a obvykle se doporučuje, pokud je místnost nestabilní kvůli chybám, chybějícím funkcím nebo bezpečnostním zranitelnostem.
+\nObvykle ovlivňuje pouze způsob zpracování místnosti na serveru.</string>
     <string name="upgrade_private_room">Aktualizovat soukromou místnost</string>
     <string name="upgrade_public_room">Aktualizovat veřejnou místnost</string>
     <string name="upgrade">Aktualizace</string>
@@ -2129,7 +2124,7 @@
     <string name="verification_scan_self_emoji_subtitle">Raději ověřit porovnáním emoji</string>
     <string name="verification_scan_with_this_device">Oskenovat tímto zařízením</string>
     <string name="verification_scan_self_notice">Oskenujte kód svým dalším zařízením nebo přepněte a oskenujte tímto zařízením</string>
-    <string name="hs_client_url">URL API Homeserveru</string>
+    <string name="hs_client_url">URL API domovského serveru</string>
     <string name="missing_permissions_title">Chybějící oprávnění</string>
     <string name="denied_permission_camera">Pro provedení této akce udělte, prosím, oprávnění Fotoaparát v systémových nastaveních.</string>
     <string name="denied_permission_generic">Některá z oprávnění potřebných k provedení akce chybí, prosím, udělte oprávnění v systémových nastaveních.</string>
@@ -2170,7 +2165,7 @@
     <string name="spaces_which_can_access">Prostory, které mají přístup</string>
     <string name="allow_space_member_to_find_and_access">Umožněte členům prostoru ho najít a zpřístupnit.</string>
     <string name="room_create_member_of_space_name_can_join">Členové prostoru %s mohou vyhledávat, prohlížet a připojovat se.</string>
-    <string name="room_settings_room_access_private_invite_only_title">Soukromý (pouze pro pozvané)</string>
+    <string name="room_settings_room_access_private_invite_only_title">Soukromý (jen pro pozvané)</string>
     <string name="denied_permission_voice_message">Chcete-li odesílat hlasové zprávy, povolte oprávnění mikrofonu.</string>
     <string name="settings_room_upgrades">Aktualizace místnosti</string>
     <string name="settings_messages_by_bot">Zprávy od bota</string>
@@ -2479,7 +2474,6 @@
     <string name="ftue_profile_picture_title">Přidat profilový obrázek</string>
     <string name="ftue_display_name_entry_footer">Později to můžete změnit</string>
     <string name="ftue_display_name_entry_title">Zobrazované jméno</string>
-    <string name="ftue_display_name_subtitle">Toto se zobrazí při odesílání zpráv.</string>
     <string name="ftue_display_name_title">Zvolte si zobrazované jméno</string>
     <string name="ftue_account_created_subtitle">Váš účet %s byl založen</string>
     <string name="ftue_account_created_congratulations_title">Gratulujeme!</string>
@@ -2529,7 +2523,6 @@
     <string name="a11y_presence_busy">Zaneprázdněn</string>
     <string name="keys_backup_settings_signature_from_this_user">Záloha má platný podpis tohoto uživatele.</string>
     <string name="live_location_bottom_sheet_last_updated_at">Aktualizována před %1$s</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Ukončit sdílení</string>
     <string name="labs_enable_live_location_summary">Dočasná implementace: polohy přetrvávají v historii místností</string>
     <string name="labs_enable_live_location">Povolit sdílení polohy živě</string>
     <string name="location_share_live_remaining_time">zbývá %1$s</string>
@@ -2653,4 +2646,304 @@
     </plurals>
     <string name="search_space_two_parents">%1$s a %2$s</string>
     <string name="auth_reset_password_error_unverified">E-mail nebyl ověřen, zkontrolujte si schránku</string>
+    <string name="location_share_loading_map_error">Nelze načíst mapu
+\nTento domovský server nemusí být nakonfigurován pro zobrazování map.</string>
+    <string name="a11y_open_settings">Otevřít nastavení</string>
+    <string name="all_chats">Všechny konverzace</string>
+    <string name="device_manager_sessions_other_description">V zájmu co nejlepšího zabezpečení ověřujte své relace a odhlašujte se ze všech relací, které již nepoznáváte nebo nepoužíváte.</string>
+    <string name="device_manager_sessions_other_title">Ostatní relace</string>
+    <string name="settings_sessions_list">Relace</string>
+    <string name="a11y_open_spaces">Seznam otevřených prostorů</string>
+    <string name="a11y_create_message">Vytvořit novou konverzaci nebo místnost</string>
+    <string name="room_list_filter_people">Lidé</string>
+    <string name="room_list_filter_favourites">Oblíbené</string>
+    <string name="room_list_filter_unreads">Nepřečtené</string>
+    <string name="room_list_filter_all">Všechny</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Aktivita</string>
+    <string name="home_layout_preferences_sort_by">Seřadit podle</string>
+    <string name="home_layout_preferences_recents">Zobrazit nedávné</string>
+    <string name="home_layout_preferences_filters">Zobrazit filtry</string>
+    <string name="home_layout_preferences">Předvolby uspořádání</string>
+    <string name="explore_rooms">Prozkoumat místnosti</string>
+    <string name="create_room">Vytvořit místnost</string>
+    <string name="start_chat">Zahájit konverzaci</string>
+    <string name="device_manager_other_sessions_description_unverified">Neověřeno · Poslední aktivita %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Ověřeno · Poslední aktivita %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Zobrazit všechny (%1$d)</string>
+    <string name="device_manager_view_details">Zobrazit podrobnosti</string>
+    <string name="device_manager_verify_session">Ověřit relaci</string>
+    <string name="device_manager_verification_status_unverified">Neověřená relace</string>
+    <string name="device_manager_verification_status_verified">Ověřená relace</string>
+    <string name="a11y_device_manager_device_type_unknown">Neznámý typ zařízení</string>
+    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobil</string>
+    <string name="timeline_error_room_not_found">Je nám líto, tato místnost nebyla nalezena.
+\nZkuste to prosím později.%s</string>
+    <string name="invites_title">Pozvánky</string>
+    <string name="onboarding_new_app_layout_button_try">Vyzkoušejte to</string>
+    <string name="onboarding_new_app_layout_feedback_message">Klepnutím vpravo nahoře zobrazíte možnost zpětné vazby.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Poskytněte zpětnou vazbu</string>
+    <string name="onboarding_new_app_layout_spaces_message">Přístup k vašim prostorům (vpravo dole) je rychlejší a snazší než kdykoli předtím.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Přístup do prostorů</string>
+    <string name="onboarding_new_app_layout_welcome_message">Pro zjednodušení aplikace ${app_name} jsou nyní karty nepovinné. Spravujte je pomocí nabídky vpravo nahoře.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Vítejte v novém zobrazení!</string>
+    <string name="home_empty_no_unreads_message">Zde se zobrazí nepřečtené zprávy, pokud nějaké máte.</string>
+    <string name="home_empty_no_unreads_title">Nic k nahlášení.</string>
+    <string name="home_empty_no_rooms_message">Univerzální zabezpečená chatovací aplikace pro týmy, přátele a organizace. Vytvořte si chat nebo se připojte k existující místnosti a začněte.</string>
+    <string name="home_empty_no_rooms_title">Vítejte v aplikaci ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Prostory představují nový způsob seskupování místností a osob. Pomocí tlačítka vpravo dole můžete přidat stávající místnost nebo vytvořit novou.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nvypadá trochu prázdně.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Zvažte odhlášení ze starých relací (%1$d den nebo více), které již nepoužíváte.</item>
+        <item quantity="few">Zvažte odhlášení ze starých relací (%1$d dny nebo více), které již nepoužíváte.</item>
+        <item quantity="other">Zvažte odhlášení ze starých relací (%1$d dnů nebo více), které již nepoužíváte.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Neaktivní relace</string>
+    <string name="device_manager_unverified_sessions_description">Ověřte nebo se odhlaste z neověřených relací.</string>
+    <string name="device_manager_unverified_sessions_title">Neověřené relace</string>
+    <string name="device_manager_header_section_security_recommendations_description">Zlepšete zabezpečení svého účtu dodržováním těchto doporučení.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Bezpečnostní doporučení</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Neaktivní po dobu %1$d+ dne (%2$s)</item>
+        <item quantity="few">Neaktivní po dobu %1$d+ dnů (%2$s)</item>
+        <item quantity="other">Neaktivní po dobu %1$d+ dnů (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Zde se budou nacházet vaše nové žádosti a pozvánky.</string>
+    <string name="invites_empty_title">Nic nového.</string>
+    <string name="space_list_empty_message">Prostory představují nový způsob seskupování místností a osob. Vytvořte si prostor a začněte.</string>
+    <string name="space_list_empty_title">Zatím žádné prostory.</string>
+    <string name="a11y_collapse_space_children">Sbalit podprostory %s</string>
+    <string name="a11y_expand_space_children">Rozbalit podprostory %s</string>
+    <string name="change_space">Změnit prostor</string>
+    <string name="device_manager_session_details_device_ip_address">IP adresa</string>
+    <string name="device_manager_session_details_session_last_activity">Poslední aktivita</string>
+    <string name="device_manager_session_details_session_name">Název relace</string>
+    <string name="device_manager_session_details_description">Informace o aplikacích, zařízeních a aktivitách.</string>
+    <string name="device_manager_session_details_title">Podrobnosti o relaci</string>
+    <string name="device_manager_other_sessions_clear_filter">Vyčistit filtr</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Nebyly nalezeny žádné neaktivní relace.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Nebyly nalezeny žádné neověřené relace.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Nebyly nalezeny žádné ověřené relace.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Zvažte odhlášení ze starých relací (%1$d den nebo více), které již nepoužíváte.</item>
+        <item quantity="few">Zvažte odhlášení ze starých relací (%1$d dny nebo více), které již nepoužíváte.</item>
+        <item quantity="other">Zvažte odhlášení ze starých relací (%1$d dnů nebo více), které již nepoužíváte.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Neaktivní</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Ověřte své relace pro vylepšené bezpečné zasílání zpráv nebo se odhlaste z těch, které již nepoznáváte nebo nepoužíváte.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Neověřeno</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Pro nejlepší zabezpečení se odhlaste z každé relace, kterou již nepoznáváte nebo nepoužíváte.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Ověřeno</string>
+    <string name="a11y_device_manager_filter">Filtr</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Neaktivní po dobu %1$d dne nebo déle</item>
+        <item quantity="few">Neaktivní po dobu %1$d dnů nebo déle</item>
+        <item quantity="other">Neaktivní po dobu %1$d dnů nebo déle</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Neaktivní</string>
+    <string name="device_manager_filter_option_unverified_description">Není připraveno na bezpečné zasílání zpráv</string>
+    <string name="device_manager_filter_option_unverified">Neověřeno</string>
+    <string name="device_manager_filter_option_verified_description">Připraveno na bezpečné zasílání zpráv</string>
+    <string name="device_manager_filter_option_verified">Ověřeno</string>
+    <string name="device_manager_filter_option_all_sessions">Všechny relace</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filtr</string>
+    <string name="device_manager_session_last_activity">Poslední aktivita %1$s</string>
+    <string name="device_manager_device_title">Zařízení</string>
+    <string name="device_manager_session_title">Relace</string>
+    <string name="device_manager_current_session_title">Aktuální relace</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Pro nejlepší zabezpečení a spolehlivost tuto relaci ověřte nebo se z ní odhlaste.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Ověřte svou aktuální relaci pro vylepšené bezpečené zasílání zpráv.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Tato relace je připravena pro bezpečné zasílání zpráv.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Vaše aktuální relace je připravena pro bezpečné zasílání zpráv.</string>
+    <string name="labs_enable_deferred_dm_summary">Vytvořit přímou zprávu pouze při první zprávě</string>
+    <string name="labs_enable_deferred_dm_title">Povolit odložené přímé zprávy</string>
+    <string name="labs_enable_new_app_layout_summary">Zjednodušený Element s volitelnými kartami</string>
+    <string name="labs_enable_new_app_layout_title">Zapnout nové uspořádání</string>
+    <string name="device_manager_learn_more_session_rename">Ostatní uživatelé v přímých zprávách a místnostech, ke kterým se připojíte, si mohou prohlédnout úplný seznam vašich relací.
+\n
+\nTo jim poskytuje jistotu, že s vámi skutečně mluví, ale také to znamená, že mohou vidět název relace, který zde zadáte.</string>
+    <string name="device_manager_learn_more_session_rename_title">Přejmenování relací</string>
+    <string name="device_manager_learn_more_sessions_verified">Ověřené relace se přihlásily pomocí vašich přihlašovacích údajů a poté byly ověřeny buď pomocí vaší zabezpečené přístupové fráze, nebo křížovým ověřením.
+\n
+\nTo znamená, že uchovávají šifrovací klíče pro vaše předchozí zprávy a potvrzují ostatním uživatelům, se kterými komunikujete, že tyto relace jste skutečně vy.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Ověřené relace</string>
+    <string name="device_manager_learn_more_sessions_unverified">Neověřené relace jsou relace, které se přihlásily pomocí vašich přihlašovacích údajů, ale nebyly křížově ověřeny.
+\n
+\nMěli byste si být obzvláště jisti, že tyto relace rozpoznáte, protože by mohly představovat neoprávněné použití vašeho účtu.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Neověřené relace</string>
+    <string name="device_manager_learn_more_sessions_inactive">Neaktivní relace jsou relace, které jste po určitou dobu nepoužili, ale nadále dostávají šifrovací klíče.
+\n
+\nOdstranění neaktivních relací zvyšuje zabezpečení a výkon a usnadňuje identifikaci podezřelé nové relace.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Neaktivní relace</string>
+    <string name="device_manager_session_rename_warning">Uvědomte si, že jména relací jsou viditelná i pro osoby, se kterými komunikujete.</string>
+    <string name="device_manager_session_rename_description">Vlastní názvy relací vám pomohou snadněji rozpoznat vaše zařízení.</string>
+    <string name="device_manager_session_rename_edit_hint">Název relace</string>
+    <string name="device_manager_session_rename">Přejmenovat relaci</string>
+    <string name="device_manager_session_overview_signout">Odhlásit se z této relace</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Neověřeno · Vaše aktuální relace</string>
+    <string name="tooltip_attachment_voice_broadcast">Zahájit hlasové vysílání</string>
+    <string name="key_authenticity_not_guaranteed">Pravost této šifrované zprávy nelze v tomto zařízení zaručit.</string>
+    <string name="settings_security_incognito_keyboard_summary">Požadujte, aby klávesnice neaktualizovala žádné personalizované údaje, jako je historie psaní a slovník, na základě toho, co jste napsali v konverzacích. Upozorňujeme, že některé klávesnice nemusí toto nastavení respektovat.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognito klávesnice</string>
+    <string name="command_description_table_flip">Přidá znaky (╯°□°）╯︵ ┻━┻ před zprávy ve formátu prostého textu</string>
+    <string name="attachment_type_voice_broadcast">Hlasové vysílání</string>
+    <string name="command_description_devtools">Otevřít nástroje pro vývojáře</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 V nastavení zabezpečení jste povolili šifrování pouze do ověřených relací pro všechny místnosti.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ V této místnosti jsou neověřená zařízení, která nebudou schopna dešifrovat odeslané zprávy.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Nikdy neodesílat šifrované zprávy do neověřených relací v této místnosti.</string>
+    <string name="action_got_it">Rozumím</string>
+    <string name="rich_text_editor_format_underline">Použít podtržení</string>
+    <string name="rich_text_editor_format_strikethrough">Použít přeškrtnutí</string>
+    <string name="rich_text_editor_format_bold">Použít tučný text</string>
+    <string name="rich_text_editor_format_italic">Použít kurzívu</string>
+    <string name="labs_enable_client_info_recording_summary">Zaznamenávat název, verzi a url pro snadnější rozpoznání relací ve správci relací.</string>
+    <string name="labs_enable_client_info_recording_title">Povolit záznamenávání informací o klientu</string>
+    <string name="labs_enable_session_manager_summary">Získejte lepší přehled a kontrolu nad všemi relacemi.</string>
+    <string name="labs_enable_session_manager_title">Použít nový správce relací</string>
+    <string name="device_manager_session_details_device_operating_system">Operační systém</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Prohlížeč</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Verze</string>
+    <string name="device_manager_session_details_application_name">Název</string>
+    <string name="device_manager_session_details_application">Aplikace</string>
+    <string name="device_manager_push_notifications_description">Přijímat push oznámení v této relaci.</string>
+    <string name="device_manager_push_notifications_title">Push oznámení</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Ověřením aktuální relace zjistíte stav ověření této relace.</string>
+    <string name="device_manager_verification_status_unknown">Neznámý stav ověření</string>
+    <string name="push_gateway_item_enabled">Zapnuto:</string>
+    <string name="push_gateway_item_device_id">ID relace:</string>
+    <string name="error_check_network">Něco se pokazilo. Zkontrolujte prosím síťové připojení a zkuste to znovu.</string>
+    <string name="grant_permission">Udělit oprávnění</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} potřebuje oprávnění k zobrazování oznámení.
+\nUdělte prosím toto oprávnění.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} potřebuje oprávnění k zobrazování oznámení. Oznámení mohou zobrazovat vaše zprávy, pozvánky atd.
+\n
+\nPro zobrazování oznámení povolte přístup na dalších vyskakovacích oknech.</string>
+    <string name="labs_enable_rich_text_editor_summary">Vyzkoušejte editor formátovaného textu (režim prostého textu již brzy)</string>
+    <string name="labs_enable_rich_text_editor_title">Povolit editor formátovaného textu</string>
+    <string name="qr_code_login_confirm_security_code_description">Ujistěte se, že znáte původ tohoto kódu. Propojením zařízení poskytnete někomu plný přístup ke svému účtu.</string>
+    <string name="qr_code_login_confirm_security_code">Potvrdit</string>
+    <string name="qr_code_login_try_again">Zkuste to znovu</string>
+    <string name="qr_code_login_status_no_match">Neshoduje se\?</string>
+    <string name="qr_code_login_signing_in">Probíhá přihlašování</string>
+    <string name="qr_code_login_connecting_to_device">Připojování k zařízení</string>
+    <string name="qr_code_login_scan_qr_code_button">Naskenujte QR kód</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Přihlašování na mobilním zařízením\?</string>
+    <string name="qr_code_login_show_qr_code_button">Zobrazit QR kód na tomto zařízení</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Vyberte možnost \"Naskenovat QR kód\"</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Začněte na přihlašovací obrazovce</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Vyberte možnost \"Přihlásit se pomocí QR kódu\"</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Začněte na přihlašovací obrazovce</string>
+    <string name="qr_code_login_new_device_instruction_3">Vyberte možnost \"Zobrazit QR kód\"</string>
+    <string name="qr_code_login_new_device_instruction_2">Přejděte do Nastavení -&gt; Zabezpečení a soukromí</string>
+    <string name="qr_code_login_new_device_instruction_1">Otevřete aplikaci na vašem druhém zařízení</string>
+    <string name="qr_code_login_header_failed_denied_description">Žádost byla na druhém zařízení zamítnuta.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Propojení nebylo dokončeno v požadovaném čase.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Propojení s tímto zařízením není podporováno.</string>
+    <string name="qr_code_login_header_failed_title">Neúspěšné připojení</string>
+    <string name="qr_code_login_header_connected_description">Zkontrolujte vaše přihlášené zařízení, měl by se zobrazit níže uvedený kód. Zkontrolujte, zda níže uvedený kód odpovídá danému zařízení:</string>
+    <string name="qr_code_login_header_connected_title">Zabezpečené připojení navázáno</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Pomocí odhlášeného zařízení naskenujte níže uvedený QR kód.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Pomocí přihlášeného zařízení naskenujte níže uvedený QR kód:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Přihlásit se pomocí QR kódu</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Pomocí fotoaparátu na tomto zařízení naskenujte QR kód zobrazený na druhém zařízení:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Naskenovat QR kód</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Pomocí tohoto zařízení se můžete přihlásit do mobilního nebo webového zařízení pomocí QR kódu. Můžete to provést dvěma způsoby:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Přihlásit se pomocí QR kódu</string>
+    <string name="login_scan_qr_code">Naskenovat QR kód</string>
+    <string name="labs_enable_voice_broadcast_summary">Možnost nahrávat a odesílat hlasové vysílání na časové ose místnosti.</string>
+    <string name="labs_enable_voice_broadcast_title">Povolit hlasové vysílání (v aktivním vývoji)</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Domovský server nepodporuje přihlášení pomocí QR kódu.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Přihlášení bylo na druhém zařízení zrušeno.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Tento QR kód je neplatný.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Druhé zařízení musí být přihlášeno.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Druhé zařízení je již přihlášeno.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Při nastavování zabezpečeného zasílání zpráv se vyskytl problém se zabezpečením. Může být napadena jedna z následujících věcí: váš domovský server; vaše internetové připojení; vaše zařízení;</string>
+    <string name="qr_code_login_header_failed_other_description">Žádost se nezdařila.</string>
+    <string name="a11y_voice_broadcast_buffering">Ukládání do vyrovnávací paměti…</string>
+    <string name="a11y_pause_voice_broadcast">Pozastavit hlasové vysílání</string>
+    <string name="a11y_play_voice_broadcast">Přehrát nebo obnovit hlasové vysílání</string>
+    <string name="a11y_stop_voice_broadcast_record">Ukončit záznam hlasového vysílání</string>
+    <string name="a11y_pause_voice_broadcast_record">Pozastavit záznam hlasového vysílání</string>
+    <string name="a11y_resume_voice_broadcast_record">Obnovit záznam hlasového vysílání</string>
+    <string name="voice_broadcast_live">Živě</string>
+    <string name="device_manager_other_sessions_select">Vybrat relace</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Fotoaparát</string>
+    <string name="attachment_type_selector_location">Poloha</string>
+    <string name="attachment_type_selector_poll">Hlasování</string>
+    <string name="attachment_type_selector_voice_broadcast">Hlasové vysílání</string>
+    <string name="attachment_type_selector_file">Přílohy</string>
+    <string name="attachment_type_selector_sticker">Nálepky</string>
+    <string name="attachment_type_selector_gallery">Knihovna fotografií</string>
+    <string name="action_deselect_all">Zrušit výběr všech</string>
+    <string name="action_select_all">Vybrat všechny</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d vybraný</item>
+        <item quantity="few">%1$d vybrané</item>
+        <item quantity="other">%1$d vybraných</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">Přepnutí režimu celé obrazovky</string>
+    <string name="attachment_type_selector_text_formatting">Formátování textu</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Již nahráváte hlasové vysílání. Ukončete prosím aktuální hlasové vysílání a zahajte nové.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Hlasové vysílání už nahrává někdo jiný. Počkejte, až jeho hlasové vysílání skončí, a zahajte nové.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Nemáte potřebná oprávnění k zahájení hlasového vysílání v této místnosti. Obraťte se na správce místnosti, aby vám zvýšil oprávnění.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Nelze zahájit nové hlasové vysílání</string>
+    <string name="a11y_voice_broadcast_fast_backward">Přetočení o 30 sekund zpět</string>
+    <string name="a11y_voice_broadcast_fast_forward">Přetočení o 30 sekund dopředu</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Ověřené relace jsou všude tam, kde tento účet používáte po zadání přístupové fráze nebo po potvrzení své totožnosti jinou ověřenou relací.
+\n
+\nTo znamená, že máte všechny klíče potřebné k odemknutí zašifrovaných zpráv a potvrzení ostatním uživatelům, že této relaci důvěřujete.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Odhlásit se z %1$d relace</item>
+        <item quantity="few">Odhlásit se ze %1$d relací</item>
+        <item quantity="other">Odhlásit se z %1$d relací</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Odhlásit se</string>
+    <string name="voice_broadcast_recording_time_left">zbývá %1$s</string>
+    <string name="message_reply_to_sender_created_poll">vytvořil hlasování.</string>
+    <string name="message_reply_to_sender_sent_sticker">poslal nálepku.</string>
+    <string name="message_reply_to_sender_sent_video">poslal video.</string>
+    <string name="message_reply_to_sender_sent_image">poslal obrázek.</string>
+    <string name="message_reply_to_sender_sent_voice_message">poslal hlasovou zprávu.</string>
+    <string name="message_reply_to_sender_sent_audio_file">poslal zvukový soubor.</string>
+    <string name="message_reply_to_sender_sent_file">odeslal soubor.</string>
+    <string name="message_reply_to_prefix">V odpovědi na</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Skrýt IP adresu</string>
+    <string name="device_manager_other_sessions_show_ip_address">Zobrazit IP adresu</string>
+    <string name="quoting">Citace</string>
+    <string name="replying_to">Odpovídám na %s</string>
+    <string name="editing">Úpravy</string>
+    <string name="settings_enable_direct_share_summary">Zobrazit poslední chaty v nabídce sdílení systému</string>
+    <string name="settings_enable_direct_share_title">Povolit přímé sdílení</string>
+    <string name="review_unverified_sessions_description">Zkontrolujte, zda je váš účet v bezpečí</string>
+    <string name="review_unverified_sessions_title">Máte neověřené relace</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Tato relace nepodporuje šifrování, takže ji nelze ověřit.
+\n
+\nPři použití této relace se nebudete moci účastnit místností, kde je šifrování povoleno.
+\n
+\nPro dosažení nejlepšího zabezpečení a soukromí se doporučuje používat klienty Matrix, které šifrování podporují.</string>
+    <string name="device_manager_signout_all_other_sessions">Odhlásit se ze všech ostatních relací</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Tato relace nepodporuje šifrování, a proto ji nelze ověřit.</string>
+    <string name="settings_nightly_build_update">Získejte nejnovější sestavení (poznámka: můžete mít potíže s přihlášením)</string>
+    <string name="settings_nightly_build">Noční sestavení</string>
+    <string name="voice_broadcast_live_broadcast">Živé vysílání</string>
+    <string name="notice_voice_broadcast_ended_by_you">Ukončili jste hlasové vysílání.</string>
+    <string name="notice_voice_broadcast_ended">%1$s ukončil(a) hlasové vysílání.</string>
+    <string name="stop_voice_broadcast_content">Jste si jisti, že chcete ukončit živé vysílání\? Tím se vysílání ukončí a v místnosti bude k dispozici celý záznam.</string>
+    <string name="stop_voice_broadcast_dialog_title">Zastavit živé vysílání\?</string>
+    <string name="action_stop">Ano, zastavit</string>
+    <string name="set_link_edit">Upravit odkaz</string>
+    <string name="set_link_create">Vytvořit odkaz</string>
+    <string name="set_link_link">Odkaz</string>
+    <string name="set_link_text">Text</string>
+    <string name="rich_text_editor_link">Nastavit odkaz</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-cs/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-cs/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-cs/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-cs/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-cy/strings.xml b/library/ui-strings/src/main/res/values-cy/strings.xml
similarity index 100%
rename from vector/src/main/res/values-cy/strings.xml
rename to library/ui-strings/src/main/res/values-cy/strings.xml
diff --git a/vector/src/main/res/values-cy/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-cy/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-cy/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-cy/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-da/strings.xml b/library/ui-strings/src/main/res/values-da/strings.xml
similarity index 99%
rename from vector/src/main/res/values-da/strings.xml
rename to library/ui-strings/src/main/res/values-da/strings.xml
index 8fc117ac4e..13d53b7bb2 100644
--- a/vector/src/main/res/values-da/strings.xml
+++ b/library/ui-strings/src/main/res/values-da/strings.xml
@@ -112,7 +112,6 @@
     <string name="auth_forgot_password">Glemt adgangskode?</string>
 
     <string name="auth_recaptcha_message">Denne Home Server vil gerne være sikker på du ikke er en robot</string>
-    <string name="auth_reset_password_missing_email">Emailadressen forbundet til din konto skal skrives.</string>
     <string name="auth_reset_password_error_unauthorized">Kunne ikke verificere emailadresse: vær sikker på du klikkede på linket i emailen</string>
 
     <string name="login_error_invalid_home_server">Skriv gyldig URL</string>
@@ -180,7 +179,6 @@ Er du sikker?</string>
     <string name="ssl_expected_existing_expl">Certifikatet er ændret fra et tidligere betroet, til et der ikke er betroet. Serveren kan have fornyet sit certifikat. Kontakt server administratoren for det forventede fingeraftryk.</string>
     <string name="ssl_only_accept">Accepter kun certifikatet hvis server administratoren har publiceret et fingeraftryk der matcher det ovenstående.</string>
     <string name="loading">Loader…</string>
-    <string name="groups_header">Communities</string>
     <string name="start_voice_call_prompt_msg">Er du sikker på, at du ønsker at starte et opkald?</string>
     <string name="start_video_call_prompt_msg">Er du sikker på, at du ønsker at starte et videoopkald\?</string>
     <plurals name="membership_changes">
@@ -293,4 +291,4 @@ Er du sikker?</string>
     <string name="notice_room_created">%1$s oprettede rummet</string>
     <string name="notice_room_invite_no_invitee_by_you">Din invitation</string>
     <string name="link_this_email_settings_link">Forbind denne email med din konto</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-da/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-da/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-da/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-da/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
similarity index 77%
rename from vector/src/main/res/values-de/strings.xml
rename to library/ui-strings/src/main/res/values-de/strings.xml
index fa42cc44a1..3f2ea694ca 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -20,7 +20,7 @@
     <string name="notice_placed_voice_call">%s hat einen Sprachanruf getätigt.</string>
     <string name="notice_answered_call">%s hat den Anruf angenommen.</string>
     <string name="notice_ended_call">%s hat den Anruf beendet.</string>
-    <string name="notice_made_future_room_visibility">%1$s hat den zukünftigen Chatverlauf sichtbar gemacht für %2$s</string>
+    <string name="notice_made_future_room_visibility">%1$s hat den zukünftigen Nachrichtenverlauf sichtbar gemacht für %2$s</string>
     <string name="notice_room_visibility_invited">alle Mitglieder, ab Einladung.</string>
     <string name="notice_room_visibility_joined">alle Mitglieder, ab Beitritt.</string>
     <string name="notice_room_visibility_shared">alle Mitglieder.</string>
@@ -40,9 +40,9 @@
     <string name="room_displayname_two_members">%1$s und %2$s</string>
     <string name="room_displayname_empty_room">Leerer Raum</string>
     <string name="notice_room_update">%s hat diesen Raum aufgewertet.</string>
-    <string name="event_status_sending_message">Sende eine Nachricht…</string>
+    <string name="event_status_sending_message">Sende eine Nachricht …</string>
     <string name="initial_sync_start_importing_account">Erste Synchronisation:
-\nImportiere Benutzerkonto…</string>
+\nImportiere Konto …</string>
     <string name="initial_sync_start_importing_account_crypto">Erste Synchronisation:
 \nImportiere Kryptoschlüssel</string>
     <string name="initial_sync_start_importing_account_rooms">Erste Synchronisation:
@@ -54,12 +54,10 @@
 \nImportiere eingeladene Räume</string>
     <string name="initial_sync_start_importing_account_left_rooms">Erste Synchronisation:
 \nImportiere verlassene Räume</string>
-    <string name="initial_sync_start_importing_account_groups">Erste Synchronisation:
-\nImportiere Communities</string>
     <string name="initial_sync_start_importing_account_data">Erste Synchronisation:
 \nImportiere Benutzerdaten</string>
     <string name="notice_room_third_party_revoked_invite">%1$s hat die Einladung an %2$s, den Raum zu betreten, zurückgezogen</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s\'s Einladung. Grund: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Einladung von %1$s. Grund: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s hat %2$s eingeladen. Grund: %3$s</string>
     <string name="notice_room_invite_you_with_reason">%1$s hat dich eingeladen. Grund: %2$s</string>
     <string name="notice_room_join_with_reason">%1$s ist dem Raum beigetreten. Grund: %2$s</string>
@@ -69,7 +67,7 @@
     <string name="notice_room_unban_with_reason">%1$s hat Sperre von %2$s aufgehoben. Grund: %3$s</string>
     <string name="notice_room_ban_with_reason">%1$s hat %2$s verbannt. Grund: %3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s hat die Einladung für %2$s angenommen. Grund: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s hat Einladung für %2$s verworfen. Grund: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s hat die Einladung für %2$s zurückgezogen. Grund: %3$s</string>
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s fügt %2$s als eine Adresse für diesen Raum hinzu.</item>
         <item quantity="other">%1$s fügt %2$s als Adressen für diesen Raum hinzu.</item>
@@ -105,7 +103,7 @@
     <string name="notice_room_avatar_changed_by_you">Du hast das Bild des Raumes geändert</string>
     <string name="notice_room_name_changed_by_you">Du hast den Raumnamen zu %1$s geändert</string>
     <string name="notice_placed_video_call_by_you">Du hast einen Videoanruf gestartet.</string>
-    <string name="notice_placed_voice_call_by_you">Du hast einen Audioanruf gestartet.</string>
+    <string name="notice_placed_voice_call_by_you">Du hast einen Sprachanruf gestartet.</string>
     <string name="notice_answered_call_by_you">Du hast den Anruf angenommen.</string>
     <string name="notice_ended_call_by_you">Du hast den Anruf beendet.</string>
     <string name="notice_made_future_room_visibility_by_you">Du hast den zukünftigen Nachrichtenverlauf für %1$s sichtbar gemacht</string>
@@ -265,13 +263,13 @@
     <string name="matrix_only_filter">Nur Matrix-Kontakte</string>
     <string name="no_result_placeholder">Keine Ergebnisse</string>
     <string name="rooms_header">Räume</string>
-    <string name="send_bug_report_include_logs">Logdateien übermitteln</string>
+    <string name="send_bug_report_include_logs">Sende Protokolle</string>
     <string name="send_bug_report_include_crash_logs">Absturzberichte übermitteln</string>
-    <string name="send_bug_report_include_screenshot">Screenshot übermitteln</string>
+    <string name="send_bug_report_include_screenshot">Bildschirmfoto übermitteln</string>
     <string name="send_bug_report">Problem melden</string>
     <string name="send_bug_report_description">Bitte beschreibe das Problem. Was hast du genau gemacht\? Was sollte passieren\? Was ist tatsächlich passiert\?</string>
     <string name="send_bug_report_placeholder">Problembeschreibung</string>
-    <string name="send_bug_report_logs_description">Um Probleme diagnostizieren zu können, werden Protokolle des Clients zusammen mit dem Fehlerbericht übermittelt. Dieser Fehlerbericht wird, wie die Protokolle und der Screenshot, nicht öffentlich sichtbar sein. Wenn du nur den oben eingegebenen Text senden möchtest, die nachfolgenden Haken entsprechend entfernen:</string>
+    <string name="send_bug_report_logs_description">Um Probleme diagnostizieren zu können, werden Protokolle der Anwendung zusammen mit dem Fehlerbericht übermittelt. Dieser Fehlerbericht wird, inklusive der Protokolle und des Bildschirmfotos, nicht öffentlich sichtbar sein. Wenn du nur den oben eingegebenen Text senden möchtest, entferne die Häkchen:</string>
     <string name="send_bug_report_alert_message">Du scheinst dein Telefon frustriert zu schütteln. Möchtest du das Fenster zum Senden eines Fehlerberichts öffnen\?</string>
     <string name="send_bug_report_sent">Dein Fehlerbericht wurde erfolgreich übermittelt</string>
     <string name="send_bug_report_failed">Der Fehlerbericht konnte nicht übermittelt werden (%s)</string>
@@ -280,7 +278,7 @@
     <string name="join_room">Raum betreten</string>
     <string name="username">Benutzername</string>
     <string name="logout">Abmelden</string>
-    <string name="hs_url">Heimserver-Adresse</string>
+    <string name="hs_url">Heim-Server-Adresse</string>
     <string name="search">Suchen</string>
     <string name="start_voice_call">Sprachanruf starten</string>
     <string name="start_video_call">Videoanruf starten</string>
@@ -293,7 +291,6 @@
     <string name="auth_email_already_defined">Diese E-Mail-Adresse wird bereits verwendet.</string>
     <string name="auth_forgot_password">Passwort vergessen?</string>
     <string name="auth_recaptcha_message">Dieser Homeserver möchte sicherstellen, dass du kein Roboter bist</string>
-    <string name="auth_reset_password_missing_email">Die E-Mail-Adresse, die mit deinem Account verknüpft ist, muss eingegeben werden.</string>
     <string name="auth_reset_password_error_unauthorized">Verifizierung der E-Mail-Adresse ist fehlgeschlagen. Stelle sicher, dass du den Link in der E-Mail geöffnet hast</string>
     <string name="login_error_invalid_home_server">Bitte eine gültige URL eingeben</string>
     <string name="login_error_bad_json">Fehlerhaftes JSON</string>
@@ -303,15 +300,15 @@
     <string name="compression_opt_list_large">Groß</string>
     <string name="compression_opt_list_medium">Mittel</string>
     <string name="compression_opt_list_small">Klein</string>
-    <string name="call_connecting">Verbindungsaufbau…</string>
+    <string name="call_connecting">Verbindungsaufbau …</string>
     <string name="call_ended">Anruf beendet</string>
     <string name="incoming_video_call">Eingehender Videoanruf</string>
     <string name="incoming_voice_call">Eingehender Sprachanruf</string>
-    <string name="call_in_progress">Anruf aktiv…</string>
+    <string name="call_in_progress">Anruf aktiv …</string>
     <string name="call_error_user_not_responding">Die Gegenseite hat den Anruf nicht angenommen.</string>
     <string name="permissions_rationale_popup_title">Information</string>
     <string name="permissions_rationale_msg_record_audio">${app_name} benötigt die Berechtigung, auf dein Mikrofon zugreifen zu können, um (Sprach-)Anrufe tätigen zu können.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">${app_name} benötigt die Berechtigung, auf Kamera und Mikrofon zu zugreifen, um Video-Anrufe durchzuführen.
+    <string name="permissions_rationale_msg_camera_and_audio">${app_name} benötigt die Berechtigung, auf Kamera und Mikrofon zuzugreifen, um Videoanrufe durchzuführen.
 \n
 \nBitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen.</string>
     <string name="yes">Ja</string>
@@ -323,7 +320,7 @@
     <string name="room_jump_to_first_unread">Zu ungelesenen Nachrichten springen</string>
     <string name="room_participants_leave_prompt_title">Raum verlassen</string>
     <string name="room_participants_leave_prompt_msg">Raum wirklich verlassen\?</string>
-    <string name="room_participants_header_direct_chats">DIREKT-CHATS</string>
+    <string name="room_participants_header_direct_chats">Direktnachrichten</string>
     <string name="room_participants_action_invite">Einladen</string>
     <string name="room_participants_action_ban">Verbannen</string>
     <string name="room_participants_action_unban">Verbannung aufheben</string>
@@ -332,9 +329,9 @@
     <string name="room_participants_action_mention">Erwähnen</string>
     <string name="room_participants_power_level_prompt">Du wirst diese Änderung nicht rückgängig machen können, da die Person dieselbe Berechtigungsstufe wie du erhalten wird.
 \nBist du sicher\?</string>
-    <string name="room_one_user_is_typing">%s schreibt…</string>
-    <string name="room_two_users_are_typing">%1$s und %2$s schreiben…</string>
-    <string name="room_many_users_are_typing">%1$s, %2$s und andere schreiben…</string>
+    <string name="room_one_user_is_typing">%s tippt …</string>
+    <string name="room_two_users_are_typing">%1$s und %2$s tippen …</string>
+    <string name="room_many_users_are_typing">%1$s, %2$s und andere tippen …</string>
     <string name="room_do_not_have_permission_to_post">Du bist nicht berechtigt, in diesen Raum zu schreiben.</string>
     <string name="ssl_trust">Vertrauen</string>
     <string name="ssl_do_not_trust">Nicht vertrauen</string>
@@ -354,12 +351,12 @@
     <string name="settings_display_name">Anzeigename</string>
     <string name="settings_add_email_address">E-Mail-Adresse hinzufügen</string>
     <string name="settings_add_phone_number">Telefonnummer hinzufügen</string>
-    <string name="settings_app_info_link_summary">Appinfo in den Systemeinstellungen öffnen.</string>
-    <string name="settings_app_info_link_title">App-Info</string>
-    <string name="settings_enable_all_notif">Benachrichtigungen für diesen Account</string>
+    <string name="settings_app_info_link_summary">Anwendungsinformationen in den Systemeinstellungen anzeigen.</string>
+    <string name="settings_app_info_link_title">Anwendungsinformationen</string>
+    <string name="settings_enable_all_notif">Benachrichtigungen für dieses Konto</string>
     <string name="settings_enable_this_device">Benachrichtigungen für diese Sitzung</string>
     <string name="settings_messages_in_one_to_one">Direktnachrichten</string>
-    <string name="settings_messages_in_group_chat">Gruppenchats</string>
+    <string name="settings_messages_in_group_chat">Gruppenunterhaltungen</string>
     <string name="settings_invited_to_room">Einladungen</string>
     <string name="settings_call_invitations">Anrufe</string>
     <string name="settings_messages_sent_by_bot">Nachrichten von Bots</string>
@@ -369,7 +366,7 @@
     <string name="settings_version">Version</string>
     <string name="settings_olm_version">OLM-Version</string>
     <string name="settings_app_term_conditions">Nutzungsbedingungen</string>
-    <string name="settings_third_party_notices">Nutzungshinweise von Drittanbietern</string>
+    <string name="settings_third_party_notices">Drittanbieter-Lizenzen</string>
     <string name="settings_copyright">Urheberrechtserklärung</string>
     <string name="settings_privacy_policy">Datenschutzerklärung</string>
     <string name="settings_clear_cache">Cache leeren</string>
@@ -393,8 +390,8 @@
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_title">Authentifizierung</string>
     <string name="settings_logged_in">Angemeldet als</string>
-    <string name="settings_home_server">Heimserver</string>
-    <string name="settings_identity_server">Identitätsserver</string>
+    <string name="settings_home_server">Heim-Server</string>
+    <string name="settings_identity_server">Identitäts-Server</string>
     <string name="account_email_validation_message">Bitte prüfe deinen E-Mail-Posteingang und klicke auf den in der E-Mail enthaltenen Link. Klicke anschließend auf Fortsetzen.</string>
     <string name="account_email_already_used_error">Diese E-Mail-Adresse wird bereits verwendet.</string>
     <string name="account_phone_number_already_used_error">Diese Telefonnummer wird bereits verwendet.</string>
@@ -406,22 +403,22 @@
     <string name="settings_unignore_user">Alle Nachrichten von %s anzeigen\?</string>
     <string name="settings_select_country">Wähle ein Land</string>
     <string name="room_settings_topic">Thema</string>
-    <string name="room_settings_room_read_history_rules_pref_title">Lesbarkeit des Chatverlaufs</string>
-    <string name="room_settings_room_read_history_rules_pref_dialog_title">Wer kann den Chatverlauf lesen?</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Lesbarkeit des Verlaufs</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Wer kann den Verlauf lesen\?</string>
     <string name="room_settings_read_history_entry_anyone">Alle</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Nur Mitglieder</string>
     <string name="room_settings_read_history_entry_members_only_invited">Nur Mitglieder (ab Einladung)</string>
-    <string name="room_settings_read_history_entry_members_only_joined">Nur Mitglieder (ab Beitreten)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Nur Mitglieder (ab Betreten)</string>
     <string name="room_settings_banned_users_title">Verbannte Benutzer</string>
     <string name="room_settings_category_advanced_title">Erweitert</string>
     <string name="room_settings_room_internal_id">Interne ID dieses Raumes</string>
-    <string name="room_settings_labs_pref_title">Experimentelle Einstellungen</string>
-    <string name="room_settings_labs_warning_message">Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können. Mit Vorsicht zu verwenden.</string>
+    <string name="room_settings_labs_pref_title">Labor</string>
+    <string name="room_settings_labs_warning_message">Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können. Verwende sie mit Vorsicht.</string>
     <string name="room_settings_set_main_address">Als Hauptadresse setzen</string>
     <string name="room_settings_unset_main_address">Als Hauptadresse aufheben</string>
     <string name="encryption_information_decryption_error">Entschlüsselungsfehler</string>
     <string name="encryption_information_device_name">Öffentlicher Name</string>
-    <string name="encryption_information_device_id">Sitzungs-ID</string>
+    <string name="device_manager_session_details_session_id">Sitzungs-ID</string>
     <string name="encryption_information_device_key">Sitzungsschlüssel</string>
     <string name="encryption_export_e2e_room_keys">Ende-zu-Ende-Raumschlüssel exportieren</string>
     <string name="encryption_export_room_keys">Raumschlüssel exportieren</string>
@@ -434,15 +431,15 @@
     <string name="encryption_import_room_keys_summary">Schlüssel aus lokaler Datei importieren</string>
     <string name="encryption_import_import">Importieren</string>
     <string name="encryption_never_send_to_unverified_devices_title">Nur zu verifizierten Sitzungen verschlüsseln</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Von dieser Sitzung aus keine verschlüsselten Nachrichten an nicht-verifizierte Sitzungen senden.</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen senden.</string>
     <string name="encryption_information_not_verified">Nicht verifiziert</string>
     <string name="encryption_information_verified">Verifiziert</string>
     <string name="encryption_information_verify">Bestätigen</string>
     <string name="encryption_information_verify_device_warning">Vergleiche die folgenden Zeichen mit den Einstellungen in der Sitzung des anderen Nutzers und bestätige:</string>
     <string name="encryption_information_verify_device_warning2">Falls sie nicht übereinstimmen, wurde die Kommunikation vielleicht kompromittiert.</string>
     <string name="select_room_directory">Raumverzeichnis auswählen</string>
-    <string name="directory_server_placeholder">Server-Name</string>
-    <string name="directory_server_all_rooms_on_server">Alle Räume auf dem %s-Server</string>
+    <string name="directory_server_placeholder">Name des Servers</string>
+    <string name="directory_server_all_rooms_on_server">Alle Räume auf %s</string>
     <string name="directory_server_native_rooms">Alle nativen %s-Räume</string>
     <string name="settings_user_interface">Bedienoberfläche</string>
     <string name="settings_interface_language">Sprache</string>
@@ -450,7 +447,7 @@
     <string name="settings_start_on_boot">Starte beim Systemstart</string>
     <string name="settings_clear_media_cache">Medien-Cache leeren</string>
     <string name="settings_keep_media">Medien behalten</string>
-    <string name="settings_always_show_timestamps">Für alle Nachrichten Zeitstempel anzeigen</string>
+    <string name="settings_always_show_timestamps">Zeitstempel für alle Nachrichten</string>
     <string name="media_saving_period_3_days">3 Tage</string>
     <string name="media_saving_period_1_week">1 Woche</string>
     <string name="media_saving_period_1_month">1 Monat</string>
@@ -470,20 +467,20 @@
     <string name="widget_integration_positive_power_level">Berechtigungslevel muss eine positive ganze Zahl sein.</string>
     <string name="widget_integration_must_be_in_room">Du bist nicht Mitglied in diesem Raum.</string>
     <string name="widget_integration_no_permission_in_room">Du hast keine Berechtigung, diese Aktion in diesem Raum auszuführen.</string>
-    <string name="widget_integration_missing_room_id">Anfrage beinhaltet keine Raum-ID.</string>
+    <string name="widget_integration_missing_room_id">room_id fehlt in der Anfrage.</string>
     <string name="widget_integration_room_not_visible">Raum %s ist nicht sichtbar.</string>
     <string name="room_add_matrix_apps">Integrationen hinzufügen</string>
     <string name="settings_notification_ringtone">Benachrichtigungston</string>
-    <string name="widget_integration_failed_to_send_request">Anfrage konnte nicht gesendet werden.</string>
-    <string name="widget_integration_missing_user_id">Anfrage enthält keine user_id.</string>
+    <string name="widget_integration_failed_to_send_request">Übertragung der Anfrage fehlgeschlagen.</string>
+    <string name="widget_integration_missing_user_id">user_id fehlt in der Anfrage.</string>
     <string name="light_theme">Helles Design</string>
     <string name="dark_theme">Dunkles Design</string>
     <string name="black_theme">Schwarzes Design</string>
     <string name="notification_listening_for_events">Auf Ereignisse lauschen</string>
     <string name="settings_containing_my_display_name">Nachrichten mit meinem Anzeigenamen</string>
     <string name="settings_containing_my_user_name">Nachrichten mit meinen Benutzernamen</string>
-    <string name="you_added_a_new_device">Du hast die neue Sitzung \'%s\' hinzugefügt, die jetzt Verschlüsselungs-Schlüssel anfordert.</string>
-    <string name="your_unverified_device_requesting">Deine bislang nicht verifiziertes Sitzung \'%s\' fordert Verschlüsselungs-Schlüssel an.</string>
+    <string name="you_added_a_new_device">Du hast die neue Sitzung „%s“ hinzugefügt, die jetzt Verschlüsselungs-Schlüssel anfordert.</string>
+    <string name="your_unverified_device_requesting">Deine bislang nicht verifizierte Sitzung „%s“ fordert Verschlüsselungs-Schlüssel an.</string>
     <string name="start_verification">Verifizierung beginnen</string>
     <string name="call">Anruf</string>
     <string name="notification_noisy_notifications">Laute Benachrichtigungen</string>
@@ -498,13 +495,12 @@
     <string name="notification_off">Aus</string>
     <string name="notification_noisy">Laut</string>
     <string name="encrypted_message">Verschlüsselte Nachricht</string>
-    <string name="loading">Lädt…</string>
-    <string name="groups_header">Communities</string>
+    <string name="loading">Lädt …</string>
     <string name="start_voice_call_prompt_msg">Sicher, dass du einen Sprachanruf starten möchtest\?</string>
     <string name="start_video_call_prompt_msg">Sicher, dass du einen Videoanruf starten möchtest\?</string>
     <string name="room_participants_ban_prompt_msg">Die Verbannung einer Person entfernt sie aus diesem Raum und hindert sie am erneuten Beitritt.</string>
     <string name="room_settings_all_messages">Alle Nachrichten</string>
-    <string name="settings_inline_url_preview">URL-Vorschau im Chat</string>
+    <string name="settings_inline_url_preview">URL-Vorschau</string>
     <string name="settings_vibrate_on_mention">Vibriere beim Erwähnen eines Nutzers</string>
     <string name="create">Erstellen</string>
     <string name="group_details_home">Startseite</string>
@@ -547,21 +543,21 @@
     <string name="no_sticker_application_dialog_content">Du hast aktuell keine Stickerpakete aktiviert.
 \n
 \nMöchtest du welche hinzufügen\?</string>
-    <string name="settings_deactivate_account_section">Account deaktivieren</string>
-    <string name="settings_deactivate_my_account">Meinen Account deaktivieren</string>
+    <string name="settings_deactivate_account_section">Konto deaktivieren</string>
+    <string name="settings_deactivate_my_account">Mein Konto deaktivieren</string>
     <string name="settings_opt_in_of_analytics">Sende Analysedaten</string>
     <string name="settings_opt_in_of_analytics_summary">${app_name} sammelt anonyme Analysedaten um uns zu helfen, die App zu verbessern.</string>
     <string name="widget_integration_missing_parameter">Ein benötigter Parameter fehlt.</string>
     <string name="dialog_user_consent_content">Um %1$s weiter zu verwenden, musst die Geschäftsbedingungen begutachten und ihnen zustimmen.</string>
     <string name="dialog_user_consent_submit">Jetzt prüfen</string>
-    <string name="deactivate_account_title">Account deaktivieren</string>
-    <string name="deactivate_account_content">Dies wird dein Konto permanent unbenutzbar machen. Du wirst dich nicht anmelden können und keiner wird denselben Nutzernamen erneut registrieren können. Du verlässt automatisch alle Räume, in denen du bist, und deine Kontoangaben werden vom Identitätsserver gelöscht. <b>Diese Aktion ist unumkehrbar</b>.
+    <string name="deactivate_account_title">Konto deaktivieren</string>
+    <string name="deactivate_account_content">Dies wird dein Konto permanent unbenutzbar machen. Du wirst dich nicht anmelden können und keiner wird denselben Nutzernamen erneut registrieren können. Du verlässt automatisch alle Räume, in denen du bist, und deine Kontoangaben werden vom Identitäts-Server gelöscht. <b>Diese Aktion ist unumkehrbar</b>.
 \n
-\nDie Deaktivierung deines Konto wird standardmäßig <b>keine deiner gesendeten Nachrichten löschen</b>. Wenn du möchtest, dass auch deine Nachrichten gelöscht werden, wähle zusätzlich die Option unten.
+\nDie Deaktivierung deines Kontos wird standardmäßig <b>keine deiner gesendeten Nachrichten löschen</b>. Wenn du möchtest, dass auch deine Nachrichten gelöscht werden, wähle zusätzlich die Option unten.
 \n
 \nDie Sichtbarkeit deiner Nachrichten ist ähnlich wie bei E-Mails: Wenn deine Nachrichten gelöscht werden, bedeutet dies, dass von dir verschickte Nachrichten nicht mit neuen oder unregistrierten Nutzer geteilt werden. Aber registrierte Nutzer, die bereits Zugang zu diesen Nachrichten haben, behalten weiterhin Zugriff auf ihre Kopie.</string>
     <string name="deactivate_account_delete_checkbox">Bitte alle Nachrichten, die ich gesendet habe, löschen, wenn mein Konto deaktiviert wird (Warnung: Unterhaltungen werden für zukünftige Nutzer unvollständig erscheinen)</string>
-    <string name="deactivate_account_submit">Account deaktivieren</string>
+    <string name="deactivate_account_submit">Konto deaktivieren</string>
     <string name="action_download">Download</string>
     <string name="e2e_re_request_encryption_key">Schlüssel von deinen anderen Sitzungen erneut anfordern.</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Bitte öffne ${app_name} auf einem anderen Gerät, das die Nachricht entschlüsseln kann, damit es die Schlüssel an diese Sitzung senden kann.</string>
@@ -576,7 +572,7 @@
     <string name="command_description_op_user">Bestimmt das Berechtigungslevel des Benutzers</string>
     <string name="command_description_deop_user">Setzt Berechtigungen des Benutzers zurück</string>
     <string name="command_description_invite_user">Lädt Benutzer mit angegebener Kennung in den aktuellen Raum ein</string>
-    <string name="command_description_join_room">Raum mit angegebener Adresse beitreten</string>
+    <string name="command_description_join_room">Raum mit angegebener Adresse betreten</string>
     <string name="command_description_part_room">Verlasse Raum</string>
     <string name="command_description_topic">Raumthema ändern</string>
     <string name="command_description_remove_user">Entfernt die Person angegebener ID</string>
@@ -608,17 +604,17 @@
     <string name="merged_events_collapse">zusammenklappen</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="x_plus">+%d</string>
-    <string name="room_participants_action_remove">Entfernen</string>
-    <string name="settings_inline_url_preview_summary">Linkvorschau im Chat aktivieren, falls dein Homeserver diese Funktion unterstützt.</string>
+    <string name="room_participants_action_remove">Aus Unterhaltung entfernen</string>
+    <string name="settings_inline_url_preview_summary">Link-Vorschau im Chat aktivieren, falls dein Heim-Server diese Funktion unterstützt.</string>
     <string name="settings_send_typing_notifs">Schreibbenachrichtigungen senden</string>
     <string name="settings_send_typing_notifs_summary">Lasse andere Benutzer wissen, dass du tippst.</string>
     <string name="settings_send_markdown">Markdown-Formatierung</string>
-    <string name="settings_send_markdown_summary">Formatiere Nachrichten mittels Markdown-Syntax, bevor sie gesendet werden. Dies erlaubt erweiterte Formatierungen wie Sternchen (*), um kursiven Text anzuzeigen.</string>
+    <string name="settings_send_markdown_summary">Formatiere Nachrichten mittels Markdown-Syntax, bevor sie gesendet werden. Dies erlaubt erweiterte Formatierungen wie Sternchen, um kursiven Text anzuzeigen.</string>
     <string name="settings_show_read_receipts">Lesebestätigungen zeigen</string>
     <string name="settings_show_read_receipts_summary">Klicke auf die Lesebestätigungen für eine detailliertere Liste.</string>
     <string name="settings_show_join_leave_messages_summary">Einladungen, Entfernungen und Verbannungen bleiben sichtbar.</string>
     <string name="settings_password">Passwort</string>
-    <string name="settings_labs_native_camera_summary">Starte die System-Kamera anstelle der angepassten Kamera.</string>
+    <string name="settings_labs_native_camera_summary">Starte die Kamera des Systems anstelle der selbstdefinierten.</string>
     <string name="command_problem_with_parameters">Das Kommando \"%s\" braucht mehr Parameter oder einige Parameter sind inkorrekt.</string>
     <string name="markdown_has_been_enabled">Markdown wurde aktiviert.</string>
     <string name="markdown_has_been_disabled">Markdown wurde deaktiviert.</string>
@@ -630,9 +626,9 @@
     <string name="settings_call_ringtone_title">Klingelton für eingehende Anrufe</string>
     <string name="settings_call_ringtone_dialog_title">Wähle Klingelton für Anrufe:</string>
     <string name="action_accept">Akzeptieren</string>
-    <string name="auth_accept_policies">Bitte lese und akzeptiere die Richtlinien dieses Homeservers:</string>
+    <string name="auth_accept_policies">Bitte lese und akzeptiere die Richtlinien dieses Heim-Servers:</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Tests ausführen</string>
-    <string name="settings_troubleshoot_diagnostic_running_status">Läuft… (%1$d von %2$d)</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">Läuft … (%1$d von %2$d)</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Einer oder mehrere Tests sind fehlgeschlagen. Versuche vorgeschlagene Lösung(en).</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Einer oder mehrere Tests sind fehlgeschlagen. Bitte sende einen Fehlerbericht, damit dies untersucht werden kann.</string>
     <string name="settings_troubleshoot_test_system_settings_title">Systemeinstellungen.</string>
@@ -641,7 +637,7 @@
 \nBitte überprüfe die Systemeinstellungen.</string>
     <string name="open_settings">Öffne Einstellungen</string>
     <string name="settings_troubleshoot_test_account_settings_title">Kontoeinstellungen.</string>
-    <string name="settings_troubleshoot_test_account_settings_success">Benachrichtigungen sind für dein Konto eingeschaltet.</string>
+    <string name="settings_troubleshoot_test_account_settings_success">Benachrichtigungen sind für dein Konto aktiviert.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Benachrichtigungen sind für dein Konto deaktiviert.
 \nBitte überprüfe die Kontoeinstellungen.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Aktiviere</string>
@@ -650,7 +646,7 @@
     <string name="settings_troubleshoot_test_device_settings_failed">Benachrichtigungen sind für diese Sitzung nicht aktiviert.
 \nBitte überprüfe die Einstellungen für ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Aktiviere</string>
-    <string name="settings_troubleshoot_test_play_services_failed">${app_name} benutzt Google-Play-Dienste um Push-Nachrichten zu übermitteln, doch scheinen sie nicht korrekt konfiguriert zu sein:
+    <string name="settings_troubleshoot_test_play_services_failed">${app_name} benutzt Google-Play-Dienste, um Push-Nachrichten zu übermitteln, allerdings scheint dies nicht korrekt konfiguriert zu sein:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Repariere Play-Dienste</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase-Token</string>
@@ -683,20 +679,20 @@
     <string name="settings_troubleshoot_test_battery_failed">Wenn ein Benutzer ein abgestecktes Gerät mit ausgeschaltetem Bildschirm eine Weile nicht bewegt, wechselt es in den Bereitschaftsmodus. Dies hindert Apps daran, auf das Netzwerk zuzugreifen und verzögert die Ausführung von Aufgaben, Synchronisierungen und Standard-Alarmen.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignoriere Optimierungen</string>
     <string name="no_valid_google_play_services_apk">Keine validen Google-Play-Dienste gefunden. Benachrichtigungen könnten nicht richtig funktionieren.</string>
-    <string name="video_call_in_progress">Videogespräch aktiv…</string>
+    <string name="video_call_in_progress">Videogespräch aktiv …</string>
     <string name="title_activity_keys_backup_setup">Schlüsselsicherung</string>
     <string name="title_activity_keys_backup_restore">Schlüsselsicherung verwenden</string>
     <string name="action_skip">Überspringen</string>
     <string name="done">Fertig</string>
     <string name="settings_notification_advanced">Erweiterte Benachrichtigungseinstellungen</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Angepasste Einstellungen.</string>
-    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Beachte, dass einige Nachrichtentypen leise sind (erzeugen eine Benachrichtigung aber keinen Ton).</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Beachte, dass einige Nachrichtentypen leise sind (erzeugen eine Benachrichtigung, aber keinen Ton).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Einige Benachrichtigungen sind in deinen erweiterten Einstellungen deaktiviert.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Konto hinzufügen</string>
     <string name="settings_noisy_notifications_preferences">Laute Benachrichtigungen einstellen</string>
     <string name="settings_call_notifications_preferences">Anrufbenachrichtigung einstellen</string>
     <string name="settings_silent_notifications_preferences">Stumme Benachrichtigungen einstellen</string>
-    <string name="settings_system_preferences_summary">LED-Farbe, Vibration, Ton usw. wählen</string>
+    <string name="settings_system_preferences_summary">Wähle LED-Farbe, Vibration, Ton …</string>
     <string name="notification_silent">Stumm</string>
     <string name="passphrase_empty_error_message">Bitte eine Passphrase eingeben</string>
     <string name="passphrase_passphrase_too_weak">Passphrase ist zu schwach</string>
@@ -707,16 +703,16 @@
     <string name="keys_backup_setup_step3_copy_button_title">Wiederherstellungsschlüssel speichern</string>
     <string name="keys_backup_setup_step3_save_button_title">Sichere als Datei</string>
     <string name="keys_backup_setup_step3_please_make_copy">Bitte mache eine Kopie</string>
-    <string name="keys_backup_setup_step3_share_intent_chooser_title">Wiederherstellungsschlüssel teilen mit…</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Wiederherstellungsschlüssel teilen mit …</string>
     <string name="recovery_key">Wiederherstellungsschlüssel</string>
     <string name="unexpected_error">Unerwarteter Fehler</string>
     <string name="keys_backup_setup_skip_title">Bist du sicher\?</string>
     <string name="keys_backup_restore_key_enter_hint">Wiederherstellungsschlüssel eingeben</string>
-    <string name="keys_backup_restoring_waiting_message">Stelle Backup wieder her:</string>
+    <string name="keys_backup_restoring_waiting_message">Stelle Sicherung wieder her:</string>
     <string name="keys_backup_unlock_button">Historie entschlüsseln</string>
     <string name="keys_backup_settings_restore_backup_button">Von Sicherung wiederherstellen</string>
-    <string name="keys_backup_settings_delete_backup_button">Sicherung löschen</string>
-    <string name="keys_backup_settings_deleting_backup">Lösche Sicherung…</string>
+    <string name="keys_backup_settings_delete_backup_button">Lösche Sicherung</string>
+    <string name="keys_backup_settings_deleting_backup">Lösche Sicherung …</string>
     <string name="keys_backup_settings_delete_confirm_title">Lösche Sicherung</string>
     <string name="settings_notification_by_event">Präferenz der Benachrichtigungen nach Ereignis</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
@@ -725,18 +721,18 @@
 \nDieser Fehler liegt nicht unter der Kontrolle von ${app_name}. Er kann aus verschiedenen Gründen auftreten. Vielleicht wird es funktionieren, wenn du es später noch einmal probierst. Außerdem kannst Du prüfen, ob die Datennutzung der Google-Play-Dienste unbeschränkt ist und die Geräteuhr richtig eingestellt ist. Der Fehler kann aber auch unter Custom-ROMs auftreten.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nDieser Fehler ist außerhalb von ${app_name} passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.</string>
-    <string name="settings_cryptography_manage_keys">Verwaltung der Kryptoschlüssel</string>
-    <string name="encryption_settings_manage_message_recovery_summary">Schlüssel-Sicherung verwalten</string>
+    <string name="settings_cryptography_manage_keys">Verwaltung der Verschlüsselungs-Schlüssel</string>
+    <string name="encryption_settings_manage_message_recovery_summary">Schlüsselsicherung verwalten</string>
     <string name="keys_backup_setup_step1_description">Nachrichten in verschlüsselten Räumen sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der Empfänger haben die Schlüssel um diese Nachrichten zu lesen.
 \n
 \nSichere deine Schlüssel, um sie nicht zu verlieren.</string>
     <string name="keys_backup_setup_step3_generating_key_status">Wiederherstellungsschlüssel aus Passphrase generieren. Dies kann mehrere Sekunden brauchen.</string>
     <string name="keys_backup_setup_skip_msg">Du verlierst möglicherweise den Zugang zu deinen Nachrichten, wenn du dich abmeldest oder das Gerät verlierst.</string>
-    <string name="keys_backup_restore_is_getting_backup_version">Rufe Backup-Version ab…</string>
-    <string name="keys_backup_restore_with_passphrase">Nutze deine Wiederherstellungspassphrase, um deinen verschlüsselten Chatverlauf lesen zu können</string>
+    <string name="keys_backup_restore_is_getting_backup_version">Rufe Sicherungsversion ab …</string>
+    <string name="keys_backup_restore_with_passphrase">Nutze deine Wiederherstellungs-Passphrase, um deinen verschlüsselten Nachrichtenverlauf lesen zu können</string>
     <string name="keys_backup_restore_use_recovery_key">nutze deinen Wiederherstellungsschlüssel</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Wenn du deine Wiederherstellungspassphrase nicht weist, kannst du %s.</string>
-    <string name="keys_backup_restore_with_recovery_key">Nutze deinen Wiederherstellungsschlüssel, um deinen verschlüsselten Chatverlauf lesen zu können</string>
+    <string name="keys_backup_restore_with_recovery_key">Nutze deinen Wiederherstellungsschlüssel, um deinen verschlüsselten Nachrichtenverlauf lesen zu können</string>
     <string name="keys_backup_restore_with_key_helper">Hast du deinen Wiederherstellungsschlüssel verloren\? Du kannst einen neuen in den Einstellungen einrichten.</string>
     <string name="keys_backup_passphrase_error_decrypt">Sicherung konnte mit dieser Passphrase nicht entschlüsselt werden. Bitte stelle sicher, dass du die korrekte Wiederherstellungspassphrase eingegeben hast.</string>
     <string name="keys_backup_recovery_code_empty_error_message">Gib deinen Wiederherstellungsschlüssel ein</string>
@@ -761,16 +757,16 @@
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Die Sicherung hat eine ungültige Signatur von der verifizierten Sitzung %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Die Sicherung hat eine ungültige Signatur von der nicht verifizierten Sitzung %s</string>
     <string name="keys_backup_settings_untrusted_backup">Um die Schlüsselsicherung für diese Sitzung zu verwenden, stelle sie jetzt mit deiner Passphrase oder deinem Wiederherstellungsschlüssel wieder her.</string>
-    <string name="keys_backup_settings_delete_confirm_message">Deine gesicherten Schlüssel vom Server löschen\? Du wirst deinen Wiederherstellungsschlüssel nicht mehr nutzen können, um deinen verschlüsselten Chatverlauf zu lesen.</string>
+    <string name="keys_backup_settings_delete_confirm_message">Deine gesicherten Schlüssel vom Server löschen\? Du wirst deinen Wiederherstellungsschlüssel nicht mehr nutzen können, um deinen verschlüsselten Nachrichtenverlauf zu lesen.</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Beim Abmelden gehen deine verschlüsselten Nachrichten verloren</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">Schlüssel-Sicherung wird durchgeführt. Wenn du dich jetzt abmeldest, gehen deine verschlüsselten Nachrichten verloren.</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Schlüsselsicherung läuft. Wenn du dich jetzt abmeldest, verlierst du den Zugriff auf deine verschlüsselten Nachrichten.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Schlüsselsicherung sollte bei allen Sitzungen aktiviert sein, um den Verlust verschlüsselter Nachrichten zu verhindern.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Ich möchte meine verschlüsselten Nachrichten nicht</string>
-    <string name="sign_out_bottom_sheet_backing_up_keys">Sichere Schlüssel…</string>
-    <string name="are_you_sure">Sicher\?</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Sichere Schlüssel …</string>
+    <string name="are_you_sure">Bist du sicher\?</string>
     <string name="backup">Sicherung</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Alle verschlüsselten Nachrichten gehen verloren, wenn Du dich abmeldest ohne die Schlüssel gesichert zu haben.</string>
-    <string name="action_sign_out_confirmation_simple">Wirklich abmelden\?</string>
+    <string name="action_sign_out_confirmation_simple">Bist du sicher, dass du dich abmelden möchtest\?</string>
     <string name="encryption_message_recovery">Wiederherstellung verschlüsselter Nachrichten</string>
     <string name="error_empty_field_enter_user_name">Bitte gib einen Benutzernamen ein.</string>
     <string name="keys_backup_setup">Richte Schlüsselsicherung ein</string>
@@ -785,27 +781,27 @@
     <string name="keys_backup_setup_step2_skip_button_title">(Erweitert) Wiederherstellungsschlüssel einrichten</string>
     <string name="keys_backup_setup_step3_success_title">Erfolg!</string>
     <string name="keys_backup_setup_step3_text_line1">Deine Schlüssel wurden gesichert.</string>
-    <string name="keys_backup_setup_step3_text_line2">Dein Wiederherstellungsschlüssel ist ein Sicherungsnetz - du kannst es benutzen um den Zugriff auf deine verschlüsselten Nachrichten wiederherzustellen, falls du deine Passphrase vergisst.
+    <string name="keys_backup_setup_step3_text_line2">Dein Wiederherstellungsschlüssel ist ein Sicherungsnetz – du kannst es benutzen, um den Zugriff auf deine verschlüsselten Nachrichten wiederherzustellen, falls du deine Passphrase vergisst.
 \nVerwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie einem Passwortmanager (oder Safe)</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort auf, wie z.B. einem Passwortmanager (oder Tresor) auf</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie einem Passwortmanager (oder Safe) auf</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">Ich habe eine Kopie angefertigt</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Teilen</string>
     <string name="keys_backup_banner_recover_line1">Verliere nie wieder verschlüsselte Nachrichten</string>
     <string name="keys_backup_banner_recover_line2">Benutze Schlüsselsicherung</string>
     <string name="keys_backup_banner_update_line1">Neue sichere Schlüssel für Nachrichten</string>
     <string name="keys_backup_banner_update_line2">Verwalte Schlüsselsicherung</string>
-    <string name="keys_backup_banner_in_progress">Sichere Schlüssel…</string>
+    <string name="keys_backup_banner_in_progress">Sichere deine Schlüssel. Dies könnte einige Minuten dauern …</string>
     <string name="keys_backup_info_keys_all_backup_up">Alle Schlüssel sind gesichert</string>
     <plurals name="keys_backup_info_keys_backing_up">
-        <item quantity="one">Sichere %d Schlüssel…</item>
-        <item quantity="other">Sichere %d Schlüssel…</item>
+        <item quantity="one">Sichere einen Schlüssel …</item>
+        <item quantity="other">Sichere %d Schlüssel …</item>
     </plurals>
     <string name="keys_backup_info_title_version">Version</string>
     <string name="keys_backup_info_title_algorithm">Algorithmus</string>
     <string name="keys_backup_info_title_signature">Signatur</string>
-    <string name="keys_backup_restoring_computing_key_waiting_message">Berechne Wiederherstellungsschlüssel…</string>
-    <string name="keys_backup_restoring_downloading_backup_waiting_message">Lade Schlüssel herunter…</string>
-    <string name="keys_backup_restoring_importing_keys_waiting_message">Importiere Schlüssel…</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Berechne Wiederherstellungsschlüssel …</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">Lade Schlüssel herunter …</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">Importiere Schlüssel …</string>
     <string name="action_ignore">Ignorieren</string>
     <string name="auth_login_sso">Mit Single-Sign-On anmelden</string>
     <string name="settings_send_message_with_enter">Nachricht mit Eingabetaste senden</string>
@@ -838,9 +834,9 @@
 \nSitzungsname: %1$s
 \nZuletzt gesehen: %2$s
 \nWenn du nicht mit einer anderen Sitzung angemeldet bist, ignoriere diese Anfrage.</string>
-    <string name="your_unverified_device_requesting_with_info">Eine unverifizierte Sitzung fordert Verschlüsselungs-Schlüssel an. 
-\nSitzungsname: %1$s 
-\nZuletzt gesehen: %2$s 
+    <string name="your_unverified_device_requesting_with_info">Eine nicht verifizierte Sitzung fordert Verschlüsselungs-Schlüssel an.
+\nSitzungsname: %1$s
+\nZuletzt gesehen: %2$s
 \nWenn du nicht eine andere Sitzung angemeldet hast, ignoriere diese Anfrage.</string>
     <string name="share_without_verifying_short_label">Teilen</string>
     <string name="ignore_request_short_label">Ignorieren</string>
@@ -874,15 +870,14 @@
     <string name="error_no_network">Kein Netzwerk. Bitte überprüfe deine Internetverbindung.</string>
     <string name="action_change">Ändern</string>
     <string name="change_room_directory_network">Netzwerk wechseln</string>
-    <string name="please_wait">Bitte warten…</string>
-    <string name="group_all_communities">Alle Communities</string>
+    <string name="please_wait">Bitte warten …</string>
     <string name="room_preview_no_preview">Für diesen Raum kann keine Vorschau angezeigt werden</string>
     <string name="fab_menu_create_room">Räume</string>
     <string name="fab_menu_create_chat">Direktnachrichten</string>
     <string name="create_room_action_create">ERSTELLEN</string>
     <string name="create_room_name_hint">Name</string>
     <string name="create_room_public_title">Öffentlich</string>
-    <string name="create_room_public_description">Jeder wird diesem Raum beitreten können</string>
+    <string name="create_room_public_description">Jeder wird diesen Raum betreten können</string>
     <string name="settings_integration_manager">Integrationsmanager</string>
     <string name="key_share_request">Schlüsselaustausch anfragen</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Es sieht so aus, als hättest du bereits ein Setup-Schlüssel-Backup von einer anderen Sitzung. Möchtest du es durch das, was du gerade erstellt hast, ersetzen\?</string>
@@ -894,7 +889,7 @@
     <string name="settings_other_third_party_notices">Sonstige Hinweise Dritter</string>
     <string name="navigate_to_room_when_already_in_the_room">Du siehst diesen Raum bereits!</string>
     <string name="settings_general_title">Allgemein</string>
-    <string name="settings_preferences">Einstellungen</string>
+    <string name="settings_preferences">Optionen</string>
     <string name="settings_security_and_privacy">Sicherheit und Privatsphäre</string>
     <string name="settings_push_rules">Push-Regeln</string>
     <string name="settings_push_rules_no_rules">Keine Push-Regeln definiert</string>
@@ -907,17 +902,17 @@
     <string name="send_suggestion_report_placeholder">Beschreibe hier deine Anmerkung</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Versteckte Ereignisse in der Zeitleiste anzeigen</string>
     <string name="bottom_action_people_x">Direktnachrichten</string>
-    <string name="send_file_step_idle">Warten…</string>
-    <string name="send_file_step_encrypting_thumbnail">Miniaturbild wird verschlüsselt…</string>
-    <string name="send_file_step_encrypting_file">Datei wird verschlüsselt…</string>
+    <string name="send_file_step_idle">Warten …</string>
+    <string name="send_file_step_encrypting_thumbnail">Vorschaubild wird verschlüsselt …</string>
+    <string name="send_file_step_encrypting_file">Verschlüssle Datei …</string>
     <string name="edited_suffix">(bearbeitet)</string>
     <string name="message_edits">Nachrichtenbearbeitung</string>
     <string name="no_message_edits_found">Keine Änderungen gefunden</string>
-    <string name="room_filtering_filter_hint">Gespräche filtern…</string>
+    <string name="room_filtering_filter_hint">Konversationen filtern …</string>
     <string name="room_filtering_footer_create_new_direct_message">Sende eine neue Direktnachricht</string>
     <string name="room_filtering_footer_open_room_directory">Das Raumverzeichnis anzeigen</string>
     <string name="link_copied_to_clipboard">Link in die Zwischenablage kopiert</string>
-    <string name="creating_direct_room">Raum erstellen…</string>
+    <string name="creating_direct_room">Erstelle Raum …</string>
     <string name="message_view_edit_history">Bearbeitungsverlauf anzeigen</string>
     <string name="import_e2e_keys_from_file">E2E-Schlüssel aus der Datei \"%1$s\" importieren.</string>
     <string name="send_suggestion_sent">Vielen Dank, der Vorschlag wurde erfolgreich gesendet</string>
@@ -939,7 +934,7 @@
     <string name="settings_background_fdroid_sync_mode_disabled">Keine Hintergrundsynchronisation</string>
     <string name="settings_discovery_category">Auffindbarkeit</string>
     <string name="widget_integration_review_terms">Um fortzufahren, musst du die Nutzungsbedingungen akzeptieren.</string>
-    <string name="identity_server_not_defined">Du verwendest keinen Identitätsserver</string>
+    <string name="identity_server_not_defined">Du verwendest keinen Identitäts-Server</string>
     <string name="error_user_already_logged_in">Du versuchst anscheinend, eine Verbindung zu einem anderen Homeserver herzustellen. Möchtest du dich abmelden\?</string>
     <string name="push_gateway_item_push_key">Push-Key:</string>
     <string name="push_gateway_item_app_display_name">App-Anzeigename:</string>
@@ -947,13 +942,13 @@
     <string name="terms_of_service">Nutzungsbedingungen</string>
     <string name="terms_description_for_identity_server">Für andere auffindbar sein</string>
     <string name="terms_description_for_integration_manager">Verwende Bots, Bridges, Widgets und Sticker-Pakete</string>
-    <string name="identity_server">Identitätsserver</string>
-    <string name="disconnect_identity_server">Verbindung zum Identitätsserver trennen</string>
-    <string name="add_identity_server">Identitätsserver konfigurieren</string>
-    <string name="change_identity_server">Identitätsserver ändern</string>
+    <string name="identity_server">Identitäts-Server</string>
+    <string name="disconnect_identity_server">Verbindung zum Identitäts-Server trennen</string>
+    <string name="add_identity_server">Identitäts-Server konfigurieren</string>
+    <string name="change_identity_server">Identitäts-Server ändern</string>
     <string name="settings_discovery_emails_title">Auffindbare E-Mail-Adressen</string>
-    <string name="settings_discovery_no_mails">Erkennungsoptionen werden angezeigt, sobald du eine E-Mail hinzugefügt hast.</string>
-    <string name="settings_discovery_enter_identity_server">Gib einen neuen Identitätsserver ein</string>
+    <string name="settings_discovery_no_mails">Entdeckungsoptionen werden angezeigt, sobald du eine E-Mail-Adresse hinzugefügt hast.</string>
+    <string name="settings_discovery_enter_identity_server">Gib eine Identitäts-Server-Adresse ein</string>
     <string name="settings_discovery_bad_identity_server">Konnte keine Verbindung zum Homeserver herstellen</string>
     <string name="login_error_no_homeserver_found">Dies ist keine Adresse eines Matrixservers</string>
     <string name="login_error_homeserver_not_found">Kann Homeserver nicht unter dieser URL erreichen. Bitte überprüfen</string>
@@ -991,25 +986,25 @@
     <string name="push_gateway_item_device_name">Sitzungsname:</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="settings_discovery_identity_server_info">Du nutzt aktuell %1$s um vorhandene Kontakte zu finden und um von dir bekannten Kontakten gefunden zu werden.</string>
-    <string name="settings_discovery_identity_server_info_none">Du benutzt aktuell keinen Identitätsserver. Um zu entdecken und um von dir bekannten Kontakten entdeckt zu werden, richte unten einen ein.</string>
+    <string name="settings_discovery_identity_server_info_none">Aktuell nutzt du keinen Identitäts-Server. Richte einen ein, um andere zu finden und selbst auffindbar zu sein.</string>
     <string name="settings_discovery_msisdn_title">Auffindbare Telefonnummern</string>
-    <string name="settings_discovery_please_enter_server">Bitte gib die Adresse des Identitätsservers ein</string>
-    <string name="settings_discovery_no_terms_title">Identitätsserver hat keine Nutzungsbedingungen</string>
-    <string name="settings_discovery_no_terms">Der Identitätsserver den du ausgewählt hast, hat keine Nutzungsbedingungen. Fahre nur fort, wenn du dem Besitzer des Dienstes vertraust</string>
+    <string name="settings_discovery_please_enter_server">Bitte gib die Adresse des Identitäts-Servers ein</string>
+    <string name="settings_discovery_no_terms_title">Identitäts-Server hat keine Nutzungsbedingungen</string>
+    <string name="settings_discovery_no_terms">Der Identitäts-Server, den du ausgewählt hast, hat keine Nutzungsbedingungen. Fahre nur fort, wenn du den Betreibenden des Dienstes vertraust</string>
     <string name="settings_text_message_sent">Eine Textnachricht wurde an %s gesendet. Bitte gib den Verifizierungscode ein, den sie enthält.</string>
     <string name="labs_allow_extended_logging">Aktiviere ausführliche Logs.</string>
-    <string name="labs_allow_extended_logging_summary">Ausführliche Logs werden der Entwicklung der App dadurch helfen, dass mehr Informationen übertragen werden, wenn du einen Fehlerbericht sendest. Auch wenn dies aktiviert ist, werden keine Nachrichteninhalte oder andere privaten Daten aufgezeichnet.</string>
-    <string name="error_terms_not_accepted">Bitte erneut versuchen, nachdem du die Nutzungsbedingungen deines Homeservers akzeptiert hast.</string>
+    <string name="labs_allow_extended_logging_summary">Ausführliche Protokolle werden bei der Entwicklung der App helfen. Auch wenn dies aktiviert ist, werden keine Nachrichteninhalte oder andere privaten Daten aufgezeichnet.</string>
+    <string name="error_terms_not_accepted">Bitte erneut versuchen, nachdem du die Nutzungsbedingungen deines Heim-Servers akzeptiert hast.</string>
     <string name="room_widget_permission_webview_shared_info_title">Bei Benutzung könnten Cookies gesetzt werden und es könnten Daten mit %s geteilt werden:</string>
     <string name="room_widget_permission_shared_info_title">Bei Benutzung könnten Daten mit %s geteilt werden:</string>
-    <string name="settings_discovery_no_msisdn">Optionen zum Finden werden erscheinen, sobald du eine Telefonnummer hinzugefügt hast.</string>
-    <string name="settings_discovery_confirm_mail">Wir haben dir eine Bestätigungsmail an %s gesendet. Prüfe dein Postfach und klicke auf den Bestätigungslink</string>
+    <string name="settings_discovery_no_msisdn">Entdeckungsoptionen werden angezeigt, sobald du eine Telefonnummer hinzugefügt hast.</string>
+    <string name="settings_discovery_confirm_mail">Wir haben eine E-Mail an %s gesendet. Prüfe deine E-Mails und klicke auf den Bestätigungslink</string>
     <string name="error_network_timeout">Es sieht aus, als würde der Server zu viel Zeit benötigen, um zu antworten. Der Grund kann eine schlechte Verbindung oder ein Fehler mit dem Server sein. Bitte versuche es später erneut.</string>
     <string name="send_attachment">Anhang senden</string>
     <string name="a11y_open_drawer">Navigationsmenü öffnen</string>
     <string name="a11y_create_menu_open">Raumerstellungsmenü öffnen</string>
-    <string name="a11y_create_menu_close">Schließe das Raumerstellungsmenü…</string>
-    <string name="a11y_create_direct_message">Starte einen neuen Privatchat</string>
+    <string name="a11y_create_menu_close">Schließe das Raumerstellungsmenü …</string>
+    <string name="a11y_create_direct_message">Erstelle eine neue Direktnachricht</string>
     <string name="a11y_create_room">Erstelle einen neuen Raum</string>
     <string name="a11y_close_keys_backup_banner">Schließe Key-Backup-Einblendung</string>
     <string name="a11y_jump_to_bottom">Zum Ende springen</string>
@@ -1027,23 +1022,23 @@
     <string name="attachment_type_sticker">Sticker</string>
     <string name="report_content_spam">Es ist Spam</string>
     <string name="report_content_inappropriate">Es ist unangebracht</string>
-    <string name="report_content_custom">Benutzerdefinierte Meldung…</string>
+    <string name="report_content_custom">Benutzerdefinierte Meldung …</string>
     <string name="report_content_custom_title">Diesen Inhalt melden</string>
-    <string name="report_content_custom_hint">Meldegrund</string>
+    <string name="report_content_custom_hint">Grund für Meldung des Inhalts</string>
     <string name="report_content_custom_submit">MELDEN</string>
     <string name="block_user">NUTZER IGNORIEREN</string>
     <string name="content_reported_title">Inhalt gemeldet</string>
     <string name="content_reported_content">Dieser Inhalt wurde gemeldet.
 \n
-\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.</string>
+\nWenn du keine weiteren Inhalte dieser Person sehen möchtest, kannst sie ignorieren, um ihre Nachrichten auszublenden.</string>
     <string name="content_reported_as_spam_title">Als Spam gemeldet</string>
     <string name="content_reported_as_spam_content">Dieser Inhalt wurde als Spam gemeldet.
 \n
-\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.</string>
+\nWenn du keine weiteren Inhalte dieser Person sehen möchtest, kannst sie ignorieren, um ihre Nachrichten auszublenden.</string>
     <string name="content_reported_as_inappropriate_title">Als unangebracht gemeldet</string>
     <string name="content_reported_as_inappropriate_content">Dieser Inhalt wurde als unangebracht gemeldet.
 \n
-\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.</string>
+\nWenn du keine weiteren Inhalte dieser Person sehen möchtest, kannst sie ignorieren, um ihre Nachrichten auszublenden.</string>
     <string name="message_ignore_user">Nutzer ignorieren</string>
     <string name="room_list_quick_actions_notifications_all_noisy">Alle Nachrichten (laut)</string>
     <string name="room_list_quick_actions_notifications_all">Alle Nachrichten</string>
@@ -1057,7 +1052,7 @@
     <string name="help_long_click_on_room_for_more_options">Halte auf einem Raum um mehr Optionen anzuzeigen</string>
     <string name="room_join_rules_public">%1$s hat den Raum für jeden, der den Link hat, öffentlich gemacht.</string>
     <string name="timeline_unread_messages">Ungelesene Nachrichten</string>
-    <string name="login_splash_text1">Privat oder in Gruppen mit Leuten chatten</string>
+    <string name="login_splash_text1">Schreibe privat oder in Gruppen</string>
     <string name="login_splash_text2">Halte Gespräche mittels Verschlüsselung privat</string>
     <string name="login_splash_submit">Los geht\'s</string>
     <string name="login_server_title">Wähle einen Server</string>
@@ -1068,11 +1063,11 @@
     <string name="login_server_other_title">Andere</string>
     <string name="login_server_other_text">Benutzerdefinierte und erweiterte Einstellungen</string>
     <string name="login_continue">Fortfahren</string>
-    <string name="settings_discovery_disconnect_identity_server_info">Eine Trennung von deinem Identitätsserver würde bedeuten, dass du weder von anderen Nutzern gefunden werden, noch diese per E-Mail oder Telefonnummer einladen kannst.</string>
-    <string name="settings_discovery_disconnect_with_bound_pid">Du teilst deine E-Mail-Adressen oder Telefonnummern momentan auf dem Identitätsserver %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.</string>
-    <string name="settings_agree_to_terms">Stimme den Nutzungsbedingungen des Identitätsservers (%s) zu, um zu erlauben per E-Mail oder Telefonnummer gefunden zu werden.</string>
-    <string name="error_handling_incoming_share">Zu teilende Daten nicht verarbeitbar</string>
-    <string name="login_splash_text3">Erweitere und individualisiere dein Benutzererlebnis</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Eine Trennung von deinem Identitäts-Server würde bedeuten, dass du weder von anderen gefunden werden, noch diese per E-Mail oder Telefonnummer einladen kannst.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Du teilst deine E-Mail-Adressen oder Telefonnummern momentan auf dem Identitäts-Server %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.</string>
+    <string name="settings_agree_to_terms">Stimme den Nutzungsbedingungen des Identitäts-Servers (%s) zu, um per E-Mail-Adresse oder Telefonnummer auffindbar zu sein zu können.</string>
+    <string name="error_handling_incoming_share">Konnte zu teilende Daten nicht verarbeiten</string>
+    <string name="login_splash_text3">Erweitere und personalisiere deine Erfahrung</string>
     <string name="login_connect_to">Mit %1$s verbinden</string>
     <string name="login_connect_to_modular">Mit Element Matrix Services verbinden</string>
     <string name="login_connect_to_a_custom_server">Mit einem anderen Server verbinden</string>
@@ -1086,18 +1081,18 @@
     <string name="login_registration_disabled">Es tut uns leid. Dieser Server akzeptiert keine neuen Benutzerkonten.</string>
     <string name="login_registration_not_supported">Die Anwendung kann kein neues Benutzerkonto auf diesem Server erstellen.
 \n
-\nMöchtest du dich über eine Web-Anwendung anmelden\?</string>
-    <string name="login_login_with_email_error">Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft.</string>
+\nMöchtest du dich mit einer Web-Anwendung anmelden\?</string>
+    <string name="login_login_with_email_error">Diese E-Mail-Adresse ist mit keinem Konto verknüpft.</string>
     <string name="login_reset_password_on">Passwort auf %1$s zurücksetzen</string>
     <string name="login_reset_password_email_hint">E-Mail</string>
     <string name="login_reset_password_password_hint">Neues Passwort</string>
     <string name="login_reset_password_warning_title">Achtung!</string>
-    <string name="login_reset_password_warning_content">Eine Änderung deines Passworts wird alle Ende-zu-Ende-Schlüssel zurücksetzen. Dein verschlüsselter Chatverlauf wird dadurch unlesbar. Richte die Schlüsselsicherung ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzt.</string>
+    <string name="login_reset_password_warning_content">Eine Änderung deines Passworts wird alle Ende-zu-Ende-Schlüssel zurücksetzen. Dein verschlüsselter Verlauf wird dadurch unlesbar. Richte die Schlüsselsicherung ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzt.</string>
     <string name="login_reset_password_warning_submit">Fortfahren</string>
-    <string name="login_reset_password_error_not_found">Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft</string>
+    <string name="login_reset_password_error_not_found">Diese E-Mail-Adresse ist mit keinem Konto verknüpft</string>
     <string name="login_reset_password_mail_confirmation_title">Prüfe deinen Posteingang</string>
     <string name="login_reset_password_mail_confirmation_notice">Eine Bestätigungsmail wurde an %1$s versendet.</string>
-    <string name="login_reset_password_mail_confirmation_notice_2">Klicke auf den Link um dein neues Passwort zu bestätigen. Sobald du dem enthaltenen Link gefolgt bist, klicke unten.</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Tippe auf den Link um dein neues Passwort zu bestätigen. Sobald du dem enthaltenen Link gefolgt bist, klicke unten.</string>
     <string name="login_reset_password_mail_confirmation_submit">Ich habe meine E-Mail-Adresse bestätigt</string>
     <string name="login_reset_password_success_title">Erfolgreich!</string>
     <string name="login_reset_password_success_notice">Dein Passwort wurde zurückgesetzt.</string>
@@ -1131,21 +1126,21 @@
     <string name="login_splash_title">Es ist deine Konversation. Mache sie dir zu eigen.</string>
     <string name="login_server_url_form_modular_text">Premium-Hosting für Organisationen</string>
     <string name="login_server_url_form_modular_notice">Gib die Adresse des Modular Element oder Servers ein, den du verwenden möchtest</string>
-    <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Homeserver anmelden. Der Homeserver unterstützt die folgenden Anmeldemöglichkeiten: %1$s.
+    <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Heim-Server anmelden. Der Heim-Server unterstützt die folgenden Anmeldemöglichkeiten: %1$s.
 \n
-\nMöchtest du dich mit einem Webclient anmelden\?</string>
+\nMöchtest du dich mit einer Web-Anwendung anmelden\?</string>
     <string name="login_reset_password_notice">Dir wird eine Bestätigungsmail gesendet, um dein neues Passwort zu bestätigen.</string>
     <string name="login_reset_password_submit">Weiter</string>
     <string name="login_reset_password_success_notice_2">Du wurdest von allen Sitzungen abgemeldet und erhältst keine Push-Benachrichtigungen mehr. Um Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.</string>
     <string name="login_reset_password_cancel_confirmation_title">Warnung</string>
-    <string name="login_set_email_notice">Lege eine E-Mail-Adresse fest, um dein Konto wiederherzustellen. Später kannst du optional zulassen, dass Personen dich anhand dieser E-Mail-Adresse entdecken.</string>
+    <string name="login_set_email_notice">Lege eine E-Mail-Adresse fest, um dein Konto wiederherzustellen. Später kannst du optional zulassen, dass Personen dich anhand dieser E-Mail-Adresse entdecken können.</string>
     <string name="login_set_email_submit">Weiter</string>
     <string name="login_set_msisdn_title">Lege Telefonnummer fest</string>
     <string name="login_set_msisdn_notice">Lege eine Telefonnummer fest, damit Personen dich anhand dieser entdecken können.</string>
     <string name="login_set_msisdn_notice2">Bitte verwende das internationale Format.</string>
     <string name="login_set_msisdn_submit">Weiter</string>
     <string name="login_msisdn_confirm_submit">Weiter</string>
-    <string name="login_msisdn_error_not_international">Internationale Telefonnummern müssen mit \'+\' beginnen</string>
+    <string name="login_msisdn_error_not_international">Internationale Telefonnummern müssen mit „+“ beginnen</string>
     <string name="login_msisdn_error_other">Die Telefonnummer scheint ungültig zu sein. Bitte prüfen</string>
     <string name="login_signup_to">Registrieren bei %1$s</string>
     <string name="login_signup_username_hint">Benutzername</string>
@@ -1154,8 +1149,8 @@
     <string name="login_a11y_captcha_container">Bitte löse das Captcha</string>
     <string name="login_error_outdated_homeserver_title">Veralteter Homeserver</string>
     <plurals name="login_error_limit_exceeded_retry_after">
-        <item quantity="one">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunde…</item>
-        <item quantity="other">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunden…</item>
+        <item quantity="one">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunde …</item>
+        <item quantity="other">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunden …</item>
     </plurals>
     <string name="seen_by">Gesehen von</string>
     <string name="signed_out_title">Du bist abgemeldet</string>
@@ -1186,7 +1181,7 @@
 \nBitte zuerst die Daten löschen und dann erneut anmelden.</string>
     <string name="permalink_malformed">matrix.to-Link fehlerhaft</string>
     <string name="bug_report_error_too_short">Die Beschreibung ist zu kurz</string>
-    <string name="notification_initial_sync">Initiale Synchronisierung…</string>
+    <string name="notification_initial_sync">Initiale Synchronisierung …</string>
     <string name="settings_advanced_settings">Erweiterte Einstellungen</string>
     <string name="settings_developer_mode">Entwicklermodus</string>
     <string name="settings_developer_mode_summary">Der Entwicklermodus aktiviert versteckte Funktionen und kann die Anwendung weniger stabil machen. Nur für Entwickler!</string>
@@ -1197,7 +1192,7 @@
     <string name="settings">Einstellungen</string>
     <string name="devices_current_device">Aktuelle Sitzung</string>
     <string name="devices_other_devices">Andere Sitzungen</string>
-    <string name="autocomplete_limited_results">Zeigt nur die ersten Ergebnisse, gib mehr Buchstaben ein…</string>
+    <string name="autocomplete_limited_results">Zeigt nur die ersten Ergebnisse, gib weitere Zeichen ein …</string>
     <string name="settings_developer_mode_fail_fast_title">Ausfallsicher</string>
     <string name="settings_developer_mode_fail_fast_summary">${app_name} kann häufiger abstürzen, wenn ein unerwarteter Fehler auftritt</string>
     <string name="command_description_shrug">Stellt einer Klartextnachricht ¯\\_(ツ)_/¯ voran</string>
@@ -1218,22 +1213,22 @@
     <string name="sent_an_image">Bild.</string>
     <string name="sent_an_audio_file">Audio</string>
     <string name="sent_a_file">Datei</string>
-    <string name="verification_request_waiting">Warten…</string>
+    <string name="verification_request_waiting">Warte …</string>
     <string name="verification_request_other_cancelled">%s brach ab</string>
-    <string name="verification_request_you_cancelled">Du hast abgebrochen</string>
+    <string name="verification_request_you_cancelled">Du brachst ab</string>
     <string name="verification_request_other_accepted">%s hat akzeptiert</string>
     <string name="verification_request_you_accepted">Du hast akzeptiert</string>
     <string name="verification_sent">Verifizierung gesendet</string>
     <string name="verification_request">Verifizierung angefragt</string>
     <string name="verification_verify_device">Verifiziere diese Sitzung</string>
-    <string name="verification_scan_notice">Scanne den Code mit dem Gerät des Gegenüber für eine gegenseitige Überprüfung</string>
+    <string name="verification_scan_notice">Lasse den Code mit dem Gerät deines Gegenüber für eine gegenseitige Verifizierung einlesen</string>
     <string name="verification_scan_their_code">Scanne Code des Anderen</string>
-    <string name="verification_scan_emoji_title">Kann nicht scannen</string>
-    <string name="verification_scan_emoji_subtitle">Wenn ihr nicht am selben Ort seid, vergleicht Emoji stattdessen</string>
+    <string name="verification_scan_emoji_title">Kann nicht einlesen</string>
+    <string name="verification_scan_emoji_subtitle">Wenn ihr nicht am selben Ort seid, vergleicht stattdessen Emoji</string>
     <string name="verification_no_scan_emoji_title">Verifizieren via Emoji-Vergleich</string>
     <string name="verification_verify_user">%s verifizieren</string>
     <string name="verification_verified_user">%s verifiziert</string>
-    <string name="verification_request_waiting_for">Warte auf %s…</string>
+    <string name="verification_request_waiting_for">Warte auf %s …</string>
     <string name="room_profile_not_encrypted_subtitle">Nachrichten in diesem Raum sind nicht Ende-zu-Ende-verschlüsselt.</string>
     <string name="room_profile_encrypted_subtitle">Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt.
 \n
@@ -1249,7 +1244,7 @@
     </plurals>
     <string name="room_profile_section_more_uploads">Hochgeladene Dateien</string>
     <string name="room_profile_section_more_leave">Raum verlassen</string>
-    <string name="room_profile_leaving_room">Verlasse den Raum…</string>
+    <string name="room_profile_leaving_room">Verlasse den Raum …</string>
     <string name="room_member_power_level_admins">Administratoren</string>
     <string name="room_member_power_level_moderators">Moderatoren</string>
     <string name="room_member_power_level_custom">Benutzerdefiniert</string>
@@ -1258,8 +1253,8 @@
     <string name="room_member_power_level_admin_in">Administrator in %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderator in %1$s</string>
     <string name="room_member_jump_to_read_receipt">Springen und als gelesen markieren</string>
-    <string name="rendering_event_error_type_of_event_not_handled">${app_name} kann keine Ereignisse vom Typ \'%1$s\'</string>
-    <string name="rendering_event_error_exception">${app_name} ist beim Verarbeiten des Ereignisinhalts mit der ID \'%1$s\' auf ein Problem gestoßen</string>
+    <string name="rendering_event_error_type_of_event_not_handled">${app_name} unterstützt keine Ereignisse vom Typ „%1$s“</string>
+    <string name="rendering_event_error_exception">${app_name} ist beim Verarbeiten des Ereignisinhalts mit der ID „%1$s“ auf ein Problem gestoßen</string>
     <string name="unignore">Nicht ignorieren</string>
     <string name="verify_cannot_cross_sign">Diese Sitzung kann diese Verifizierung nicht mit deinen anderen Sitzungen teilen.
 \nDie Überprüfung wird lokal gespeichert und in einer zukünftigen Version der App freigegeben.</string>
@@ -1267,31 +1262,31 @@
     <string name="command_description_rainbow_emote">Sendet das angegebene Emote in Regenbogenfarben</string>
     <string name="settings_category_timeline">Zeitleiste</string>
     <string name="settings_category_composer">Nachrichteneditor</string>
-    <string name="room_settings_enable_encryption">Ende-zu-Ende-Verschlüsselung aktivieren…</string>
+    <string name="room_settings_enable_encryption">Aktiviere Ende-zu-Ende-Verschlüsselung …</string>
     <string name="room_settings_enable_encryption_dialog_title">Verschlüsselung aktivieren\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Nach der Aktivierung kann die Verschlüsselung für den Raum nicht deaktiviert werden. Nachrichten können nicht vom Server gesehen werden, nur von den Teilnehmenden des Raums. Möglicherweise funktionieren danach einige Bots und Bridges nicht mehr ordnungsgemäß.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Verschlüsselung aktivieren</string>
     <string name="verification_request_notice">Um sicher zu gehen, verifiziere %s, indem ein einmaliger Code überprüft wird.</string>
     <string name="verification_request_start_notice">Um sicher zu sein, tut dies persönlich oder verwendet einen anderen Kommunikationsweg.</string>
     <string name="verification_emoji_notice">Vergleiche die einzigartigen Emoji und stell sicher, dass sie in derselben Reihenfolge angezeigt werden.</string>
-    <string name="verification_code_notice">Vergleiche den Code mit dem Code auf dem Bildschirm deines Gegenübers.</string>
-    <string name="verification_conclusion_ok_notice">Nachrichten mit diesem Gegenüber sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.</string>
+    <string name="verification_code_notice">Vergleiche den Code mit dem Code auf dem Bildschirm deines Gegenüber.</string>
+    <string name="verification_conclusion_ok_notice">Nachrichten mit dieser Person sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.</string>
     <string name="verification_conclusion_ok_self_notice">Deine neue Sitzung ist jetzt verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an.</string>
-    <string name="encryption_information_cross_signing_state">Cross-Signing</string>
-    <string name="encryption_information_dg_xsigning_complete">Cross-Signing ist aktiviert
-\nPrivate Schlüssel auf dem Gerät.</string>
-    <string name="encryption_information_dg_xsigning_trusted">Cross-Signing ist aktiviert
+    <string name="encryption_information_cross_signing_state">Quersignierung</string>
+    <string name="encryption_information_dg_xsigning_complete">Quersignierung ist aktiviert,
+\nprivate Schlüssel auf dem Gerät.</string>
+    <string name="encryption_information_dg_xsigning_trusted">Quersignierung ist aktiviert,
 \nSchlüssel sind vertrauenswürdig.
 \nPrivate Schlüssel sind nicht bekannt</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">Cross-Signing ist aktiviert
+    <string name="encryption_information_dg_xsigning_not_trusted">Quersignierung ist aktiviert,
 \nSchlüssel sind nicht vertrauenswürdig</string>
-    <string name="encryption_information_dg_xsigning_disabled">Cross-Signing ist nicht aktiviert</string>
+    <string name="encryption_information_dg_xsigning_disabled">Quersignierung ist nicht aktiviert</string>
     <string name="settings_active_sessions_list">Aktive Sitzungen</string>
     <string name="settings_active_sessions_show_all">Alle Sitzungen anzeigen</string>
     <string name="settings_active_sessions_manage">Sitzungen verwalten</string>
-    <string name="settings_active_sessions_signout_device">Diese Sitzung abmelden</string>
+    <string name="settings_active_sessions_signout_device">Von dieser Sitzung abmelden</string>
     <string name="settings_failed_to_get_crypto_device_info">Keine kryptografischen Informationen verfügbar</string>
-    <string name="settings_active_sessions_verified_device_desc">Diese Sitzung ist für sichere Nachrichtenübertragung vertrauenswürdig, da du sie überprüft hast:</string>
+    <string name="settings_active_sessions_verified_device_desc">Diese Sitzung ist für sichere Kommunikation vertrauenswürdig, da du sie überprüft hast:</string>
     <string name="settings_active_sessions_unverified_device_desc">Verifiziere diese Sitzung, um sie als vertrauenswürdig zu markieren, und gewähren ihr Zugriff auf verschlüsselte Nachrichten. Wenn du dich nicht bei dieser Sitzung angemeldet hast, ist dein Konto möglicherweise gefährdet:</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">Eine aktive Sitzung</item>
@@ -1306,10 +1301,10 @@
     <string name="room_member_profile_sessions_section_title">Sitzungen</string>
     <string name="trusted">Vertraut</string>
     <string name="not_trusted">Nicht vertraut</string>
-    <string name="verification_profile_device_verified_because">Diese Sitzung ist für sichere Nachrichtenübertragung vertrauenswürdig, weil %1$s (%2$s) sie verifiziert hat:</string>
+    <string name="verification_profile_device_verified_because">Diese Sitzung ist für sichere Kommunikation vertrauenswürdig, weil %1$s (%2$s) sie verifiziert hat:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) hat sich in einer neuen Sitzung angemeldet:</string>
     <string name="verification_profile_device_untrust_info">Bis dieser Benutzer dieser Sitzung vertraut, werden an und von ihm gesendete Nachrichten mit Warnungen gekennzeichnet. Alternativ kannst du dies manuell überprüfen.</string>
-    <string name="initialize_cross_signing">Initialisiere Cross-Signing</string>
+    <string name="initialize_cross_signing">Quersignierung initialisieren</string>
     <string name="reset_cross_signing">Schlüssel zurücksetzen</string>
     <string name="a11y_qr_code_for_verification">QR-Code</string>
     <string name="qr_code_scanned_by_other_notice">Fast geschafft! Zeigt %s ein Häkchen\?</string>
@@ -1321,7 +1316,7 @@
     <string name="verification_cannot_access_other_session">Nutze eine Wiederherstellungsmethode</string>
     <string name="verification_use_passphrase">Wenn du auf keine existierende Sitzung zugreifen kannst</string>
     <string name="enter_secret_storage_invalid">Kann keine Geheimnisse im Speicher finden</string>
-    <string name="message_action_item_redact">Entfernen…</string>
+    <string name="message_action_item_redact">Entferne …</string>
     <string name="share_confirm_room">Möchtest du diesen Anhang an %1$s senden\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Sende Bild in Originalgröße</item>
@@ -1378,26 +1373,26 @@
     <string name="error_failed_to_import_keys">Import der Schlüssel fehlgeschlagen</string>
     <string name="settings_notification_configuration">Benachrichtigungskonfiguration</string>
     <string name="settings_messages_at_room">Nachrichten mit \"@room\"</string>
-    <string name="settings_messages_in_e2e_group_chat">Verschlüsselte Gruppenchats</string>
-    <string name="command_description_plain">Sendet eine Nachricht als einfachen Text, ohne sie als Markdown zu interpretieren</string>
+    <string name="settings_messages_in_e2e_group_chat">Verschlüsselte Gruppenunterhaltungen</string>
+    <string name="command_description_plain">Sendet eine Nachricht als Klartext, ohne sie als Markdown darzustellen</string>
     <string name="auth_invalid_login_param_space_in_password">Inkorrekter Benutzername und/oder Passwort. Das eingegebene Passwort beginnt oder endet mit Leerzeichen, bitte kontrolliere es.</string>
     <string name="message_key">Nachrichtenschlüssel</string>
     <string name="recovery_passphrase">Wiederherstellungs-Passphrase</string>
     <string name="bootstrap_crosssigning_print_it">Druck es aus und speichere es an einem sicheren Ort</string>
     <string name="bootstrap_crosssigning_save_cloud">Kopier es in deinen persönlichen Cloud-Speicher</string>
     <string name="encryption_not_enabled">Verschlüsselung ist nicht aktiviert</string>
-    <string name="settings_when_rooms_are_upgraded">Raumupgrades</string>
+    <string name="settings_when_rooms_are_upgraded">Raumaktualisierung</string>
     <string name="encryption_enabled">Verschlüsselung aktiviert</string>
     <string name="encryption_enabled_tile_description">Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Erfahre mehr und verifiziere Benutzer in deren Profil.</string>
     <string name="encryption_unknown_algorithm_tile_description">Die Verschlüsselung in diesem Raum wird nicht unterstützt</string>
-    <string name="qr_code_scanned_verif_waiting">Warte auf %s…</string>
+    <string name="qr_code_scanned_verif_waiting">Warte auf %s …</string>
     <string name="settings_troubleshoot_title">Fehlerbehebung</string>
     <string name="room_created_summary_item">%s hat den Raum erstellt und konfiguriert.</string>
     <string name="qr_code_scanned_self_verif_notice">Fast geschafft! Zeigt das andere Gerät ein Häkchen an\?</string>
-    <string name="qr_code_scanned_verif_waiting_notice">Fast geschafft! Warte auf Bestätigung…</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Fast geschafft! Warte auf Bestätigung …</string>
     <string name="settings_messages_in_e2e_one_to_one">Verschlüsselte Direktnachrichten</string>
-    <string name="room_message_placeholder">Nachricht…</string>
-    <string name="security_prompt_text">Verifiziere dich und andere, um eure Chats zu schützen</string>
+    <string name="room_message_placeholder">Nachricht …</string>
+    <string name="security_prompt_text">Verifiziere dich und andere, um eure Unterhaltungen zu schützen</string>
     <string name="bootstrap_enter_recovery">Gib zum Fortfahren deinen %s ein</string>
     <string name="use_file">Datei benutzen</string>
     <string name="bootstrap_invalid_recovery_key">Dies ist kein gültiger Wiederherstellungsschlüssel</string>
@@ -1414,15 +1409,15 @@
     <string name="bootstrap_migration_use_recovery_key">nutze deinen Schlüsselbackup-Wiederherstellungsschlüssel</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Wenn du dein Schlüsselbackup-Passwort nicht weißt, kannst du %s.</string>
     <string name="bootstrap_migration_backup_recovery_key">Schlüsselbackup-Wiederherstellungsschlüssel</string>
-    <string name="settings_security_prevent_screenshots_title">Screenshots innerhalb der Anwendung verhindern</string>
-    <string name="settings_security_prevent_screenshots_summary">Das Aktivieren dieser Einstellung setzt das FLAG_SECURE in allen Aktivitäten. Starte die Anwendung neu, damit die Änderung wirksam wird.</string>
-    <string name="change_password_summary">Neues Benutzerpasswort festlegen…</string>
-    <string name="use_other_session_content_description">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} für Android oder einen anderen cross-signing-fähigen Matrix-Client</string>
+    <string name="settings_security_prevent_screenshots_title">Bildschirmfotos der Anwendung verhindern</string>
+    <string name="settings_security_prevent_screenshots_summary">Das Aktivieren dieser Einstellung setzt FLAG_SECURE in allen Aktivitäten. Starte die Anwendung neu, damit die Änderung wirksam wird.</string>
+    <string name="change_password_summary">Lege ein neues Kontopasswort fest …</string>
+    <string name="use_other_session_content_description">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} für Android oder eine andere Matrix-Anwendung, die Quersignierung unterstützt</string>
     <string name="app_desktop_web">${app_name} Web
 \n${app_name} Desktop</string>
     <string name="app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capable_client">oder einen anderen cross-signing-fähigen Matrix Client</string>
+    <string name="or_other_mx_capable_client">oder eine andere Matrix-Anwendung, die Quersignierung unterstützt</string>
     <string name="use_latest_app">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten:</string>
     <string name="command_description_discard_session">Erzwingt das Verwerfen der aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum</string>
     <string name="command_description_discard_session_not_handled">Wird nur in verschlüsselten Räumen unterstützt</string>
@@ -1431,7 +1426,7 @@
     <string name="enter_secret_storage_input_key">Wähle deinen Wiederherstellungsschlüssel, gib ihn ein oder füge ihn aus der Zwischenablage ein</string>
     <string name="failed_to_access_secure_storage">Konnte nicht auf gesicherten Speicher zugreifen</string>
     <string name="unencrypted">Unverschlüsselt</string>
-    <string name="encrypted_unverified">Verschlüsselt von einem unbekannten Gerät</string>
+    <string name="encrypted_unverified">Verschlüsselt von einem nicht verifiziertem Gerät</string>
     <string name="review_logins">Überprüfe, wo du angemeldet bist</string>
     <string name="verify_other_sessions">Verifiziere alle deine Sitzungen, um sicherzustellen, dass dein Konto und deine Nachrichten sicher sind</string>
     <string name="verify_this_session">Bestätige neue Anmeldung zu deinem Konto: %1$s</string>
@@ -1450,7 +1445,7 @@
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
     <string name="add_members_to_room">Mitglieder hinzufügen</string>
     <string name="invite_users_to_room_action_invite">EINLADEN</string>
-    <string name="inviting_users_to_room">Benutzer werden eingeladen…</string>
+    <string name="inviting_users_to_room">Lade Benutzer ein …</string>
     <string name="invite_users_to_room_title">Personen einladen</string>
     <string name="invitation_sent_to_one_user">Einladung gesendet an %1$s</string>
     <string name="invitations_sent_to_two_users">Einladungen gesendet an %1$s und %2$s</string>
@@ -1466,7 +1461,7 @@
     <string name="action_dismiss">Ablehnen</string>
     <string name="dialog_title_success">Erfolg</string>
     <string name="call_failed_no_connection_description">Echtzeitverbindung konnte nicht hergestellt werden.
-\nBitte den Administrator deines Homeservers, einen TURN-Server zu konfigurieren, dass Anrufe zuverlässig funktionieren.</string>
+\nBitte den Administrator deines Heim-Servers, einen TURN-Server zu konfigurieren, damit Anrufe zuverlässig funktionieren.</string>
     <string name="call_select_sound_device">Audiogerät auswählen</string>
     <string name="sound_device_phone">Telefon</string>
     <string name="sound_device_speaker">Lautsprecher</string>
@@ -1499,16 +1494,16 @@
     <string name="room_participants_ban_title">Benutzer bannen</string>
     <string name="room_participants_ban_reason">Grund für den Bann</string>
     <string name="room_participants_unban_title">Bann des Benutzers aufheben</string>
-    <string name="room_participants_unban_prompt_msg">Das Aufheben des Bannes wird dem Benutzer erlauben dem Raum wieder beizutreten.</string>
-    <string name="settings_secure_backup_section_title">Sicheres Backup</string>
-    <string name="settings_secure_backup_setup">Backup einrichten</string>
-    <string name="settings_secure_backup_reset">Backup zurücksetzen</string>
+    <string name="room_participants_unban_prompt_msg">Wenn du die Person entbannst, kann sie den Raum wieder betreten.</string>
+    <string name="settings_secure_backup_section_title">Verschlüsselte Sicherung</string>
+    <string name="settings_secure_backup_setup">Sicherung einrichten</string>
+    <string name="settings_secure_backup_reset">Sicherung zurücksetzen</string>
     <string name="settings_secure_backup_enter_to_setup">Auf diesem Gerät einrichten</string>
-    <string name="settings_secure_backup_section_info">Verlust verschlüsselter Nachrichten und Daten verhindern, indem die Schlüssel für die Entschlüsselung auf dem Server gesichert werden.</string>
+    <string name="settings_secure_backup_section_info">Verhindere, den Zugriff auf verschlüsselte Nachrichten und Daten zu verlieren, indem du die Verschlüsselungs-Schlüssel auf deinem Server sicherst.</string>
     <string name="reset_secure_backup_title">Generiere einen neuen Sicherheitsschlüssel oder setze eine neue Sicherheitspassphrase für dein existierendes Backup.</string>
     <string name="reset_secure_backup_warning">Dieses wird deinen aktuellen Schlüssel oder deine aktuelle Phrase ersetzen.</string>
     <string name="disabled_integration_dialog_title">Integrationen sind deaktiviert</string>
-    <string name="disabled_integration_dialog_content">Aktiviere \'Erlaube Integrationen\' in den Einstellungen um dies zu machen.</string>
+    <string name="disabled_integration_dialog_content">Aktiviere hierfür „Integrationen erlauben“ in den Einstellungen.</string>
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">%d gebannter Benutzer</item>
         <item quantity="other">%d gebannte Benutzer</item>
@@ -1517,14 +1512,14 @@
     <string name="active_widget_view_action">ANSICHT</string>
     <string name="active_widgets_title">Aktive Widgets</string>
     <string name="recovery_key_export_saved">Der Sicherheitsschlüssel ist gespeichert worden.</string>
-    <string name="secure_backup_banner_setup_line1">Backup</string>
+    <string name="secure_backup_banner_setup_line1">Verschlüsselte Sicherung</string>
     <string name="secure_backup_banner_setup_line2">Absicherung gegen den Verlust verschlüsselter Nachrichten</string>
-    <string name="secure_backup_setup">Richte Backup ein</string>
+    <string name="secure_backup_setup">Sicherung einrichten</string>
     <string name="event_redacted">Nachricht entfernt</string>
     <string name="settings_show_redacted">Gelöschte Nachrichten zeigen</string>
     <string name="settings_show_redacted_summary">Zeigt einen Platzhalter für gelöschte Nachrichten an</string>
     <string name="labs_show_unread_notifications_as_tab">Dedizierten Tab für ungelesene Nachrichten zur Hauptansicht hinzufügen</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Wir haben dir eine Bestätigungsmail an %s gesendet. Bitte prüfe deine E-Mails und klicke auf den Bestätigungslink</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Wir haben eine E-Mail an %s gesendet. Bitte prüfe deine E-Mails und klicke auf den Bestätigungslink</string>
     <string name="settings_text_message_sent_wrong_code">Der Verifizierungscode ist nicht korrekt.</string>
     <string name="uploads_media_title">MEDIEN</string>
     <string name="uploads_media_no_result">Es gibt in diesem Raum keine Medien</string>
@@ -1539,10 +1534,10 @@
     <string name="login_server_url_form_common_notice">Gib die Adresse des Servers ein, den du benutzen möchtest</string>
     <string name="login_connect_using_matrix_id_submit">Einloggen mit Matrix-ID</string>
     <string name="login_signin_matrix_id_title">Einloggen mit Matrix-ID</string>
-    <string name="login_signin_matrix_id_notice">Wenn du einen Account auf einem Homeserver eingerichtet hast, benutze deine Matrix-ID (z.B. @benutzer:domain.com) und Passwort.</string>
+    <string name="login_signin_matrix_id_notice">Falls du ein Konto auf einem Heim-Server eingerichtet hast, verwende nachstehend deine Matrix-ID (z. B. @benutzer:domain.com) und dein Passwort.</string>
     <string name="login_signin_matrix_id_hint">Matrix-ID</string>
     <string name="login_signin_matrix_id_password_notice">Wenn du dein Passwort nicht weißt, gehe zurück um es zurücksetzen zu lassen.</string>
-    <string name="login_signin_matrix_id_error_invalid_matrix_id">Dies ist keine gültige Benutzerkennung. Erwartetes Format: \'@benutzer:homeserver.org\'</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Dies ist keine gültige Benutzerkennung. Erwartetes Format: „@benutzer:homeserver.org“</string>
     <string name="autodiscover_well_known_error">Es konnte kein gültiger Homeserver gefunden werden. Bitte prüfe deine Kennung</string>
     <string name="send_a_sticker">Sticker</string>
     <string name="room_profile_section_admin">Administrative Aktionen</string>
@@ -1552,42 +1547,42 @@
     <string name="bootstrap_info_text_2">Gib eine Sicherheitsphrase ein, die nur du kennst. Diese wird benutzt um deine Daten auf dem Server geheim zu halten.</string>
     <string name="bootstrap_cancel_text">Wenn du jetzt abbrichst und den Zugriff zu deinen Sitzungen verlierst, kannst du verschlüsselte Nachrichten und Daten verlieren.
 \n
-\nDu kannst auch ein Backup einrichten und deine Schlüssel in den Einstellungen verwalten.</string>
+\nDu kannst auch eine Sicherung einrichten und deine Schlüssel in den Einstellungen verwalten.</string>
     <string name="room_created_summary_item_by_you">Du hast den Raum erstellt und konfiguriert.</string>
     <string name="auth_invalid_login_deactivated_account">Dieser Account ist deaktiviert worden.</string>
     <string name="error_saving_media_file">Konnte Mediendatei nicht speichern</string>
     <string name="choose_locale_current_locale_title">Aktuelle Sprache</string>
     <string name="choose_locale_other_locales_title">Andere verfügbare Sprachen</string>
-    <string name="choose_locale_loading_locales">Lade verfügbare Sprachen…</string>
+    <string name="choose_locale_loading_locales">Lade verfügbare Sprachen …</string>
     <string name="open_terms_of">Öffne AGBs von %s</string>
-    <string name="disconnect_identity_server_dialog_content">Trenne Verbindung zu Identitätsserver %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Dieser Identitätsserver ist veraltet. ${app_name} unterstützt nur API V2.</string>
+    <string name="disconnect_identity_server_dialog_content">Verbindung zu Identitäts-Server %s trennen\?</string>
+    <string name="identity_server_error_outdated_identity_server">Dieser Identitäts-Server ist veraltet. ${app_name} unterstützt nur API V2.</string>
     <string name="identity_server_error_outdated_home_server">Diese Operation ist nicht möglich. Der Homeserver ist veraltet.</string>
-    <string name="identity_server_error_no_identity_server_configured">Bitte konfiguriere zuerst einen Identitätsserver.</string>
-    <string name="identity_server_error_terms_not_signed">Bitte akzeptiere zuerst die AGB des Identitätsservers in den Einstellungen.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Deiner Privatsphäre wegen unterstützt ${app_name} nur das Senden gehashter E-Mail-Adressen und Telefonnummern.</string>
+    <string name="identity_server_error_no_identity_server_configured">Bitte konfiguriere zuerst einen Identitäts-Server.</string>
+    <string name="identity_server_error_terms_not_signed">Bitte akzeptiere zuerst die AGB des Identitäts-Servers in den Einstellungen.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Deiner Privatsphäre wegen unterstützt ${app_name} nur das Senden von E-Mail-Adressen und Telefonnummern als Streuwert (Hash).</string>
     <string name="identity_server_error_binding_error">Die Assoziierung ist fehlgeschlagen.</string>
     <string name="identity_server_error_no_current_binding_error">Für diese Kennung gibt es aktuell keine Zuordnung.</string>
-    <string name="identity_server_set_default_notice">Dein Homeserver (%1$s) schlägt %2$s als Identitätsserver vor</string>
+    <string name="identity_server_set_default_notice">Dein Heim-Server (%1$s) schlägt %2$s als Identitäts-Server vor</string>
     <string name="identity_server_set_default_submit">Benutze %1$s</string>
-    <string name="identity_server_set_alternative_notice">Alternativ kannst du die URL eines beliebigen anderen Identitätsservers angeben</string>
-    <string name="identity_server_set_alternative_notice_no_default">Gib die URL von einem Identitätsserver ein</string>
-    <string name="identity_server_set_alternative_submit">Bestätigen</string>
-    <string name="power_level_edit_title">Lege Rolle fest</string>
+    <string name="identity_server_set_alternative_notice">Alternativ kannst du die URL eines beliebigen anderen Identitäts-Servers angeben</string>
+    <string name="identity_server_set_alternative_notice_no_default">Gib die Adresse eines Identitäts-Servers ein</string>
+    <string name="identity_server_set_alternative_submit">Absenden</string>
+    <string name="power_level_edit_title">Rolle festlegen</string>
     <string name="power_level_title">Rolle</string>
-    <string name="a11y_open_chat">Öffne Chat</string>
+    <string name="a11y_open_chat">Unterhaltung öffnen</string>
     <string name="a11y_mute_microphone">Stelle Mikrophon stumm</string>
     <string name="a11y_unmute_microphone">Aktiviere Mikrophon</string>
     <string name="a11y_stop_camera">Stoppe Kamera</string>
     <string name="a11y_start_camera">Starte Kamera</string>
-    <string name="bottom_sheet_setup_secure_backup_title">Backup</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">Verlust verschlüsselter Nachrichten und Daten verhindern, indem die Schlüssel für die Entschlüsselung am Server gesichert werden.</string>
+    <string name="bottom_sheet_setup_secure_backup_title">Verschlüsselte Sicherung</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Verhindere, den Zugriff auf verschlüsselte Nachrichten und Daten zu verlieren, indem du die Verschlüsselungs-Schlüssel auf deinem Server sicherst.</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Sicherheitsschlüssel benutzen</string>
-    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Generiere einen Sicherheitsschlüssel, welcher z.B. in einem Passwortmanager oder in einem Tresor sicher aufbewahrt werden sollte.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Generiere einen Sicherheitsschlüssel, den du in einem Passwort-Manager oder Tresor sicher aufbewahren solltest.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Eine Sicherheitsphrase benutzen</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Gib eine geheime Phrase ein, die nur du kennst und generiere einen Schlüssel als Backup.</string>
     <string name="bottom_sheet_save_your_recovery_key_title">Speichere deinen Sicherheitsschlüssel</string>
-    <string name="bottom_sheet_save_your_recovery_key_content">Bewahre deinen Sicherheitsschlüssel irgendwo sicher auf, wie z.B. in einem Passwortmanager oder in einem Tresor.</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Bewahre deinen Sicherheitsschlüssel in einem Passwort-Manager oder Tresor sicher auf.</string>
     <string name="set_a_security_phrase_title">Sicherheitsphrase setzen</string>
     <string name="set_a_security_phrase_notice">Gib eine Sicherheitsphrase ein, welche nur du kennst und deine Daten auf dem Server geheim halten soll.</string>
     <string name="set_a_security_phrase_hint">Sicherheitsphrase</string>
@@ -1597,7 +1592,7 @@
     <string name="room_settings_save_success">Du hast die Raumeinstellungen erfolgreich geändert</string>
     <string name="notice_crypto_unable_to_decrypt_final">Du kannst auf diese Nachricht nicht zugreifen</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Warte auf diese Nachricht. Das könnte eine Weile dauern</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Wegen der Ende-zu-Ende-Verschlüsselung könnte es sein, dass du auf jemandes Nachricht warten musst, weil die Schlüssel nicht ordnungsgemäß gesendet worden sind.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Wegen der Ende-zu-Ende-Verschlüsselung könnte es sein, dass du auf jemandes Nachricht warten musst, weil die Schlüssel nicht ordnungsgemäß gesendet wurden.</string>
     <string name="crypto_error_withheld_blacklisted">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender dich blockiert hat</string>
     <string name="crypto_error_withheld_unverified">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender deiner Sitzung nicht vertraut</string>
     <string name="crypto_error_withheld_generic">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender absichtlich die Schlüssel nicht gesendet hat</string>
@@ -1607,7 +1602,7 @@
     <string name="disclaimer_negative_button">VERSTANDEN</string>
     <string name="disclaimer_positive_button">MEHR ERFAHREN</string>
     <string name="save_recovery_key_chooser_hint">Speichere Wiederherstellungsschlüssel in</string>
-    <string name="loading_contact_book">Ermittle deine Kontakte…</string>
+    <string name="loading_contact_book">Ermittle deine Kontakte …</string>
     <string name="empty_contact_book">Deine Kontaktliste ist leer</string>
     <string name="contacts_book_title">Kontaktliste</string>
     <string name="three_pid_revoke_invite_dialog_title">Einladung zurücknehmen</string>
@@ -1625,13 +1620,13 @@
     <string name="auth_pin_new_pin_action">Neue PIN</string>
     <string name="auth_pin_reset_content">Um deine PIN zurückzusetzen, musst du dich erneut anmelden und eine neue erstellen.</string>
     <string name="settings_security_pin_code_title">Aktiviere PIN</string>
-    <string name="settings_security_pin_code_summary">Wenn du deine PIN zurücksetzen möchtest, tippe \"PIN vergessen\" um dich abzumelden und sie anschließend zurückzusetzen.</string>
+    <string name="settings_security_pin_code_summary">Wenn du deine PIN zurücksetzen möchtest, tippe auf „PIN vergessen“, um dich abzumelden und sie zurückzusetzen.</string>
     <string name="settings_call_show_confirmation_dialog_title">Versehentliche Anrufe verhindern</string>
     <string name="settings_call_show_confirmation_dialog_summary">Bitte um Bestätigung, bevor du einen Anruf tätigst</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Einrichten</string>
     <string name="no_permissions_to_start_conf_call">Dir fehlt die Berechtigung in diesem Raum eine Konferenz zu starten</string>
-    <string name="video_meeting">Starte eine Videokonferenz</string>
-    <string name="audio_meeting">Starte eine Audiokonferenz</string>
+    <string name="video_meeting">Beginne eine Videokonferenz</string>
+    <string name="audio_meeting">Beginne eine Audiokonferenz</string>
     <string name="audio_video_meeting_description">Konferenzen nutzen die Jitsi-Sicherheits- und Berechtigungsrichtlinien. Alle im Raum Anwesenden können während der Konferenz beitreten.</string>
     <string name="cannot_call_yourself">Du kannst dich nicht selbst anrufen</string>
     <string name="cannot_call_yourself_with_invite">Du kannst dich nicht selbst anrufen, warte bis Teilnehmer die Einladung annehmen</string>
@@ -1655,21 +1650,21 @@
         <item quantity="other">Falscher Code, %d verbleibende Versuche</item>
     </plurals>
     <string name="wrong_pin_message_last_remaining_attempt">Warnung! Letzter Versuch bevor du ausgeloggt wirst!</string>
-    <string name="too_many_pin_failures">Zu viele Fehler. Du wurdest ausgeloggt</string>
+    <string name="too_many_pin_failures">Zu viele Fehler, du wurdest abgemeldet</string>
     <string name="auth_msisdn_already_defined">Diese Telefonnummer ist bereits registriert.</string>
     <string name="settings_phone_number_empty">Deinem Konto wurde keine Telefonnummer hinzugefügt</string>
     <string name="settings_emails">E-Mail-Adressen</string>
-    <string name="settings_emails_empty">Deinem Konto wurde keine E-Mail hinzugefügt</string>
+    <string name="settings_emails_empty">Deinem Konto wurde keine E-Mail-Adresse hinzugefügt</string>
     <string name="settings_phone_numbers">Telefonnummern</string>
     <string name="settings_remove_three_pid_confirmation_content">%s entfernen\?</string>
     <string name="error_threepid_auth_failed">Stelle sicher, dass du auf den Link in der E-Mail geklickt hast, die wir dir gesendet haben.</string>
     <string name="settings_emails_and_phone_numbers_title">E-Mail und Telefon</string>
-    <string name="settings_emails_and_phone_numbers_summary">Verwalte E-Mails und Telefonnummern, die mit deinem Matrix-Konto verknüpft sind</string>
+    <string name="settings_emails_and_phone_numbers_summary">Verwalte E-Mail-Adressen und Telefonnummern, die mit deinem Matrix-Konto verknüpft sind</string>
     <string name="settings_text_message_sent_hint">Code</string>
-    <string name="login_msisdn_notice">Verwende das internationale Format (Telefonnummer muss mit \'+\' beginnen)</string>
+    <string name="login_msisdn_notice">Bitte nutze das internationale Format (muss mit „+“ beginnen)</string>
     <string name="confirm_your_identity_quad_s">Bestätige deine Identität, indem du dieses Login verifizierst, um Zugriff auf verschlüsselte Nachrichten zu erhalten.</string>
-    <string name="error_opening_banned_room">Raum, indem du gebannt wurdest, kann nicht geöffnet werden.</string>
-    <string name="room_error_not_found">Raum kann nicht gefunden werden. Stelle sicher, dass er existiert.</string>
+    <string name="error_opening_banned_room">Ein Raum, aus dem du verbannt wurdest, kann nicht geöffnet werden.</string>
+    <string name="room_error_not_found">Kann diesen Raum nicht finden. Stelle sicher, dass er existiert.</string>
     <plurals name="seconds">
         <item quantity="one">%d Sekunde</item>
         <item quantity="other">%d Sekunden</item>
@@ -1677,7 +1672,7 @@
     <string name="sent_a_poll">Umfrage</string>
     <string name="sent_a_reaction">Reagierte mit: %s</string>
     <string name="universal_link_malformed">Der Link war fehlerhaft</string>
-    <string name="no_permissions_to_start_webrtc_call">Du bist nicht berechtigt, einen Anruf in diesem Raum zu starten</string>
+    <string name="no_permissions_to_start_webrtc_call">Du bist nicht berechtigt, einen Anruf in diesem Raum zu beginnen</string>
     <string name="sent_verification_conclusion">Ergebnis der Überprüfung</string>
     <string name="delete_account_data_warning">Kontodaten vom Typ %1$s löschen\?
 \n
@@ -1688,12 +1683,12 @@
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Die Applikation wartet auf den PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_title">Push testen</string>
     <string name="search_banned_user_hint">Gebannte Nutzer filtern</string>
-    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du bist nicht berechtigt einen Anruf zu starten</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du bist nicht berechtigt einen Anruf zu beginnen</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Du hast keine Berechtigung ein Konferenzgespräch zu starten</string>
     <string name="settings_security_pin_code_notifications_summary_on">Details wie Raumnamen und Nachrichteninhalt zeigen.</string>
     <string name="settings_security_pin_code_notifications_title">Inhalt in Benachrichtigungen anzeigen</string>
     <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-Code ist die einzige Möglichkeit ${app_name} zu entsperren.</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_on">Aktiviere Gerät-spezifische Biometrie wie Fingerabdrücke und Gesichtserkennung.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Aktiviere gerätespezifische Biometrie wie Fingerabdrücke und Gesichtserkennung.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Biometrie aktivieren</string>
     <string name="settings_security_application_protection_screen_title">Schutz konfigurieren</string>
     <string name="settings_security_application_protection_title">Zugriffsschutz</string>
@@ -1709,7 +1704,7 @@
     <string name="bad_passphrase_key_reset_all_action">Alle Wiederherstellungsoptionen vergessen oder verloren\? Alles zurücksetzen</string>
     <string name="direct_room_created_summary_item_by_you">Du bist beigetreten.</string>
     <string name="direct_room_created_summary_item">%s ist beigetreten.</string>
-    <string name="direct_room_encryption_enabled_tile_description">Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Nachrichten in dieser Unterhaltung sind Ende-zu-Ende-verschlüsselt.</string>
     <string name="direct_room_profile_section_more_leave">Verlassen</string>
     <string name="direct_room_profile_section_more_settings">Einstellungen</string>
     <string name="direct_room_profile_encrypted_subtitle">Nachrichten hier sind Ende-zu-Ende-verschlüsselt.
@@ -1731,10 +1726,10 @@
     <string name="settings_troubleshoot_test_push_notification_content">Du siehst die Benachrichtigung! Klick mich!</string>
     <string name="settings_troubleshoot_test_notification_title">Benachrichtigungsanzeige</string>
     <string name="settings_security_pin_code_grace_period_summary_off">Bei jedem Öffnen von ${app_name} ist der PIN-Code erforderlich.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN-Code ist erforderlich, nachdem ${app_name} 2 Minuten lang nicht verwendet wurde.</string>
-    <string name="settings_security_pin_code_grace_period_title">Fordere PIN nach 2 Minuten an</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">PIN-Code ist erforderlich, nachdem ${app_name} zwei Minuten lang nicht verwendet wurde.</string>
+    <string name="settings_security_pin_code_grace_period_title">Erfrage PIN nach zwei Minuten</string>
     <string name="settings_security_pin_code_notifications_summary_off">Nur die Anzahl ungelesener Nachrichten in der Benachrichtigung zeigen.</string>
-    <string name="attachment_type_dialog_title">Bild hinzufügen mit</string>
+    <string name="attachment_type_dialog_title">Füge Bild hinzu per</string>
     <string name="warning_room_not_created_yet">Der Raum ist noch nicht erstellt. Raumerstellung abbrechen\?</string>
     <string name="room_list_quick_actions_low_priority_add">Zu niedrige Priorität hinzufügen</string>
     <string name="create_room_topic_hint">Thema</string>
@@ -1747,17 +1742,17 @@
     <string name="create_room_name_section">Raumname</string>
     <string name="settings_export_trail">Prüfung exportieren</string>
     <string name="room_member_open_or_create_dm">Direktnachricht</string>
-    <string name="send_bug_report_include_key_share_history">Verlauf der Anfragen von Schlüsselfreigaben senden</string>
+    <string name="send_bug_report_include_key_share_history">Schlüsselfreigabe-Anfragen übermitteln</string>
     <string name="no_more_results">Keine weiteren Ergebnisse</string>
-    <string name="start_chatting">Starte die Diskussion</string>
+    <string name="start_chatting">Beginne eine Unterhaltung</string>
     <string name="settings_discovery_consent_action_give_consent">Autorisieren</string>
     <string name="settings_discovery_consent_action_revoke">Meine Zustimmung widerrufen</string>
-    <string name="settings_discovery_consent_notice_on">Du hast zugestimmt E-Mails und Telefonnummern an diesen Identitätsserver zu senden, um von anderen Nutzern entdeckt zu werden.</string>
+    <string name="settings_discovery_consent_notice_on">Du hast zugestimmt, E-Mail-Adressen und Telefonnummern an diesen Identitäts-Server zu übermitteln, um für andere auffindbar zu sein.</string>
     <string name="settings_discovery_consent_title">E-Mails und Telefonnummern senden</string>
     <string name="direct_room_user_list_suggestions_title">Vorschläge</string>
-    <string name="direct_room_user_list_known_title">Bekannte Nutzer</string>
+    <string name="direct_room_user_list_known_title">Bekannte Personen</string>
     <string name="qr_code">QR-Code</string>
-    <string name="add_by_qr_code">Hinzufügen via QR-Code</string>
+    <string name="add_by_qr_code">Per QR-Code hinzufügen</string>
     <string name="permissions_denied_add_contact">Gib die Erlaubnis, um auf die Kamera zu zugreifen.</string>
     <string name="permissions_denied_qr_code">Um den QR-Code zu scannen, muss der Zugriff auf die Kamera erlaubt werden.</string>
     <string name="room_alias_published_alias_title">Öffentliche Adressen</string>
@@ -1767,7 +1762,7 @@
     <string name="room_settings_room_read_history_dialog_subtitle">Änderungen daran, wer die Chronik lesen kann, gelten nur für kommende Nachrichten in diesem Raum. Die Sichtbarkeit der bestehenden Chronik bleibt unverändert.</string>
     <string name="action_unpublish">Zurückziehen</string>
     <string name="action_add">Hinzufügen</string>
-    <string name="share_by_text">Mit Nachricht teilen</string>
+    <string name="share_by_text">Per Nachricht teilen</string>
     <string name="hide_advanced">Erweiterte Optionen ausblenden</string>
     <string name="show_advanced">Erweiterte Optionen anzeigen</string>
     <string name="room_alias_publish_to_directory_error">Die Sichtbarkeit des Raums konnte nicht abgerufen werden (%1$s).</string>
@@ -1779,11 +1774,11 @@
     <string name="phone_book_perform_lookup">Suche nach Kontakten auf Matrix</string>
     <string name="room_settings_set_avatar">Raumbild einrichten</string>
     <string name="identity_server_user_consent_not_provided">Einverständnis wurde nicht abgegeben.</string>
-    <string name="user_code_info_text">Teile diesen Code mit Leuten, damit sie ihn scannen und mit dir chatten können.</string>
+    <string name="user_code_info_text">Teile diesen Code, damit andere ihn einlesen und mit dir schreiben können.</string>
     <string name="user_code_share">Meinen Code teilen</string>
     <string name="user_code_my_code">Mein Code</string>
-    <string name="user_code_scan">Scanne einen QR-Code</string>
-    <string name="not_a_valid_qr_code">Das ist kein korrekter QR-Code von Matrix</string>
+    <string name="user_code_scan">QR-Code einlesen</string>
+    <string name="not_a_valid_qr_code">Das ist kein korrekter Matrix-QR-Code</string>
     <string name="invite_friends_rich_title">🔐️ Komm mit zu ${app_name}</string>
     <string name="invite_friends_text">Hey, schreibe mit mir auf ${app_name}: %s</string>
     <string name="invite_friends">Freunde einladen</string>
@@ -1795,14 +1790,14 @@
     <string name="this_is_the_beginning_of_room_no_name">Das ist der Anfang dieser Konversation.</string>
     <string name="this_is_the_beginning_of_room">Das ist der Anfang von %s.</string>
     <string name="room_settings_enable_encryption_no_permission">Du hast nicht die nötigen Berechtigungen, um die Verschlüsselung in diesem Raum zu aktivieren.</string>
-    <string name="create_room_in_progress">Erstelle Raum…</string>
+    <string name="create_room_in_progress">Erstelle Raum …</string>
     <string name="create_room_alias_invalid">Manche Zeichen sind nicht zulässig</string>
     <string name="create_room_alias_empty">Bitte gib eine Raumadresse an</string>
     <string name="create_room_alias_already_in_use">Diese Adresse ist bereits vergeben</string>
-    <string name="create_room_disable_federation_description">Aktivieren, wenn der Raum nur von Mitgliedern deines Homeservers zur internen Kommunikation verwendet wird. Das kann später nicht mehr geändert werden.</string>
+    <string name="create_room_disable_federation_description">Aktivieren, wenn der Raum nur von Mitgliedern deines Heim-Servers zur internen Kommunikation verwendet wird. Das kann später nicht mehr geändert werden.</string>
     <string name="create_room_disable_federation_title">Begrenze Zugang zu diesem Raum (für immer!) auf Mitglieder von %s</string>
     <string name="attachment_viewer_item_x_of_y">%1$d von %2$d</string>
-    <string name="room_preview_no_preview_join">Keine Vorschau für diesen Raum verfügbar. Willst du direkt beitreten\?</string>
+    <string name="room_preview_no_preview_join">Keine Vorschau für diesen Raum verfügbar. Willst du ihn betreten\?</string>
     <string name="room_preview_not_found">Der Raum ist gerade nicht zugänglich.
 \nVersuche es später nochmal, oder bitte einen Raum-Admin um Hilfe.</string>
     <string name="room_alias_published_alias_add_manually">Eine neue Adresse veröffentlichen</string>
@@ -1815,7 +1810,7 @@
     <string name="room_alias_local_address_empty">Dieser Raum hat keine lokalen Adressen</string>
     <string name="room_alias_local_address_subtitle">Füge Adressen für diesen Raum hinzu, damit andere Nutzer ihn auf %1$s finden können</string>
     <string name="room_alias_local_address_title">Lokale Adresse</string>
-    <string name="room_alias_address_hint">Neue öffentliche Adresse (z.B. #alias:server)</string>
+    <string name="room_alias_address_hint">Neue öffentliche Adresse (z. B. #alias:server)</string>
     <string name="room_alias_address_empty">Noch keine weiteren öffentlichen Adressen vorhanden.</string>
     <string name="room_alias_address_empty_can_add">Noch keine weiteren öffentlichen Adressen vorhanden, füge unten eine hinzu.</string>
     <string name="room_alias_delete_confirmation">Die Adresse \"%1$s\" löschen\?</string>
@@ -1825,9 +1820,9 @@
     <string name="room_permissions_change_room_name">Raumname ändern</string>
     <string name="room_permissions_change_history_visibility">Sichtbarkeit des Verlaufs ändern</string>
     <string name="room_permissions_enable_room_encryption">Raum-Verschlüsselung aktivieren</string>
-    <string name="room_permissions_change_main_address_for_the_room">Haupt-Adresse des Raums ändern</string>
+    <string name="room_permissions_change_main_address_for_the_room">Hauptadresse des Raums ändern</string>
     <string name="room_permissions_change_room_avatar">Raumbild ändern</string>
-    <string name="room_permissions_modify_widgets">Widgets verändern</string>
+    <string name="room_permissions_modify_widgets">Widgets ändern</string>
     <string name="room_permissions_notify_everyone">Jeden benachrichtigen</string>
     <string name="room_permissions_remove_messages_sent_by_others">Von anderen gesendete Nachrichten entfernen</string>
     <string name="room_permissions_ban_users">Nutzer verbannen</string>
@@ -1835,7 +1830,7 @@
     <string name="room_permissions_change_settings">Einstellungen ändern</string>
     <string name="room_permissions_invite_users">Nutzer einladen</string>
     <string name="room_permissions_send_messages">Nachrichten senden</string>
-    <string name="room_permissions_default_role">Standard Rolle</string>
+    <string name="room_permissions_default_role">Standard-Rolle</string>
     <string name="room_permissions_title">Berechtigungen</string>
     <string name="room_settings_permissions_title">Berechtigungen</string>
     <string name="room_permissions_notice_read_only">Du hast nicht die Berechtigung zum Aktualisieren der Rollen, die zum Ändern verschiedener Teile des Raums erforderlich sind</string>
@@ -1850,11 +1845,11 @@
     <string name="login_social_sso">Einmalanmeldung</string>
     <string name="login_social_signin_with">Anmelden mit %s</string>
     <string name="login_social_signup_with">Registrieren mit %s</string>
-    <string name="login_social_continue_with">Mit %s weitermachen</string>
+    <string name="login_social_continue_with">Weiter mit %s</string>
     <string name="settings_show_emoji_keyboard_summary">Knopf zum Nachrichteneditor hinzufügen, der die Emoji-Tastatur öffnet</string>
     <string name="settings_show_emoji_keyboard">Emoji-Tastatur anzeigen</string>
     <string name="settings_chat_effects_description">Nutze /confetti oder sende Nachrichten mit ❄️ oder 🎉</string>
-    <string name="settings_chat_effects_title">Chateffekte</string>
+    <string name="settings_chat_effects_title">Effekte im Verlauf</string>
     <string name="room_permissions_change_topic">Thema ändern</string>
     <string name="room_permissions_upgrade_the_room">Raum aktualisieren</string>
     <string name="room_permissions_notice">Rollen, die zum Ändern verschiedener Teile des Raums erforderlich sind, auswählen</string>
@@ -1864,7 +1859,7 @@
     <string name="authentication_error">Authentifizierung fehlgeschlagen</string>
     <string name="re_authentication_default_confirm_text">Deine Anmeldeinformationen müssen für ${app_name} eingegeben werden, um diese Aktion auszuführen.</string>
     <string name="re_authentication_activity_title">Erneute Authentifizierung erforderlich</string>
-    <string name="failed_to_initialize_cross_signing">Cross-Signing konnte nicht eingerichtet werden</string>
+    <string name="failed_to_initialize_cross_signing">Quersignierung konnte nicht eingerichtet werden</string>
     <string name="error_unauthorized">Nicht autorisierte, fehlende gültige Authentifizierungsdaten</string>
     <string name="call_transfer_users_tab_title">Nutzer</string>
     <string name="call_transfer_failure">Beim Weiterleiten des Anrufs ist ein Fehler aufgetreten</string>
@@ -1922,18 +1917,18 @@
         <item quantity="other">%d Einträge</item>
     </plurals>
     <string name="settings_server_upload_size_unknown">Die Obergrenze ist nicht bekannt.</string>
-    <string name="settings_server_upload_size_content">Dein Homeserver akzeptiert Anhänge (wie Dateien, Medien, etc.) mit einer Größe bis zu %s.</string>
-    <string name="settings_server_upload_size_title">Datei-Upload-Obergrenze des Servers</string>
+    <string name="settings_server_upload_size_content">Dein Heim-Server akzeptiert Anhänge (wie Dateien, Medien, etc.) mit einer Größe bis zu %s.</string>
+    <string name="settings_server_upload_size_title">Dateigrößenlimit des Servers</string>
     <string name="settings_server_version">Serverversion</string>
-    <string name="settings_server_name">Servername</string>
+    <string name="settings_server_name">Server-Name</string>
     <string name="room_list_quick_actions_room_settings">Raumeinstellungen</string>
     <string name="jitsi_leave_conf_to_join_another_one_content">Derzeitige Konferenz verlassen und zu einer anderen wechseln\?</string>
     <string name="room_settings_room_version_title">Raum-Version</string>
     <string name="dialog_edit_hint">Neuer Wert</string>
     <string name="initial_sync_start_downloading">Erste Synchronisation:
-\nLade Daten herunter…</string>
+\nLade Daten herunter …</string>
     <string name="initial_sync_start_server_computing">Erste Synchronisation:
-\nWarte auf Serverantwort…</string>
+\nWarte auf Antwort vom Server …</string>
     <string name="event_status_a11y_sent">Gesendet</string>
     <string name="settings_category_room_directory">Raumverzeichnis</string>
     <string name="action_switch">Wechseln</string>
@@ -1952,9 +1947,9 @@
     <string name="space_type_public">Öffentlich</string>
     <string name="create_spaces_you_can_change_later">Du kannst dies später ändern</string>
     <string name="a11y_unchecked">Ungeprüft</string>
-    <string name="room_settings_room_access_public_description">Jeder kann den Raum finden und beitreten</string>
+    <string name="room_settings_room_access_public_description">Jeder kann den Raum finden und betreten</string>
     <string name="room_settings_room_access_public_title">Öffentlich</string>
-    <string name="room_settings_room_access_private_description">Nur Eingeladene können es finden und beitreten</string>
+    <string name="room_settings_room_access_private_description">Nur sichtbar und zu betreten für Eingeladene</string>
     <string name="room_settings_room_access_private_title">Privat</string>
     <string name="room_settings_room_access_entry_unknown">Unbekannte Zugriffseinstellung (%s)</string>
     <string name="room_settings_guest_access_title">Gästen erlauben beizutreten</string>
@@ -1962,10 +1957,10 @@
     <string name="spaces_header">Spaces</string>
     <string name="room_settings_room_access_entry_knock">Jeder kann im Raum anklopfen, Mitglieder können dann zustimmen oder ablehnen</string>
     <string name="invite_people_to_your_space_desc">Momentan bist nur du hier. Mit anderen Leuten wird %s noch viel besser.</string>
-    <string name="invite_to_space_with_name_desc">Diese werden in der Lage sein, %s zu durchsuchen</string>
-    <string name="invite_just_to_this_room_desc">Diese werden kein Teil von %s sein</string>
+    <string name="invite_to_space_with_name_desc">Sie wird in der Lage sein, %s zu durchsuchen</string>
+    <string name="invite_just_to_this_room_desc">Sie wird kein Teil von %s sein</string>
     <string name="share_space_link_message">Tritt meinem Space %1$s %2$s bei</string>
-    <string name="spaces_beta_welcome_to_spaces_desc">Mit Spaces kannst du Personen und Räume gruppieren.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Spaces sind eine neue Möglichkeit, Räume und Personen zu gruppieren.</string>
     <string name="space_add_existing_rooms">Räume oder Spaces hinzufügen</string>
     <string name="skip_for_now">Vorübergehend überspringen</string>
     <string name="create_spaces_room_public_header">Über welche Themen möchtest du dich in %s unterhalten\?</string>
@@ -1980,11 +1975,11 @@
     <string name="leave_space">Verlassen</string>
     <string name="space_add_child_title">Räume hinzufügen</string>
     <string name="space_explore_activity_title">Räume erkunden</string>
-    <string name="join_anyway">Trotzdem beitreten</string>
-    <string name="join_space">Space beitreten</string>
+    <string name="join_anyway">Dennoch betreten</string>
+    <string name="join_space">Space betreten</string>
     <string name="create_space">Space erstellen</string>
     <string name="invite_just_to_this_room">Nur zu diesem Raum</string>
-    <string name="invite_to_space_with_name">In Space \"%s\" einladen</string>
+    <string name="invite_to_space_with_name">Zu %s einladen</string>
     <string name="invite_by_link">Link teilen</string>
     <string name="invite_by_email">Mithilfe einer E-Mail-Adresse einladen</string>
     <string name="invite_people_menu">Personen einladen</string>
@@ -1993,21 +1988,21 @@
     <string name="space_type_public_desc">Offen für Jeden. Am Besten für Communities</string>
     <string name="create_spaces_private_teammates">Ein privater Space für meine Teamkameraden und mich</string>
     <string name="create_spaces_me_and_teammates">Meine Teamkameraden und ich</string>
-    <string name="create_spaces_organise_rooms">Ein privater Space um deine Räume zu organisieren</string>
+    <string name="create_spaces_organise_rooms">Ein privater Space zum Organisieren deiner Räume</string>
     <string name="create_spaces_join_info_help">Um einem bereits existierenden Space beizutreten, benötigst du eine Einladung.</string>
     <string name="your_private_space">Dein privater Space</string>
     <string name="your_public_space">Dein öffentlicher Space</string>
     <string name="command_description_join_space">Betrete einen Space mit der angegebenen ID</string>
     <string name="create_space_topic_hint">Beschreibung</string>
-    <string name="create_spaces_loading_message">Erzeuge Space…</string>
-    <string name="create_spaces_default_public_random_room_name">Irgendetwas</string>
+    <string name="create_spaces_loading_message">Erstelle Space …</string>
+    <string name="create_spaces_default_public_random_room_name">Ohne Thema</string>
     <string name="create_spaces_default_public_room_name">Allgemein</string>
     <string name="activity_create_space_title">Einen Space erstellen</string>
     <string name="create_spaces_just_me">Nur für mich</string>
     <string name="create_spaces_choose_type_label">Welche Art von Space möchtest du erstellen\?</string>
     <string name="add_space">Space erstellen</string>
     <string name="command_description_create_space">Space erstellen</string>
-    <string name="room_settings_room_access_restricted_description">Jeder, der sich in einem Space mit diesem Raum befindet, kann diesen Raum finden und ihm beitreten. Nur die Admins des Raums können diesen zu einem Space hinzufügen.</string>
+    <string name="room_settings_room_access_restricted_description">Jeder, der sich in einem Space mit diesem Raum befindet, kann diesen Raum finden und ihn betreten. Nur die Administration des Raums kann diesen zu einem Space hinzufügen.</string>
     <string name="room_settings_room_access_restricted_title">Nur Space-Mitglieder</string>
     <plurals name="space_people_you_know">
         <item quantity="one">%d Person, die du kennst, ist bereits beigetreten</item>
@@ -2033,10 +2028,10 @@
     </plurals>
     <string name="error_file_too_big_simple">Die Datei ist zu groß.</string>
     <string name="send_file_step_compressing_video">Video wird komprimiert (%d%%)</string>
-    <string name="send_file_step_compressing_image">Bild wird komprimiert…</string>
+    <string name="send_file_step_compressing_image">Komprimiere Bild …</string>
     <string name="use_as_default_and_do_not_ask_again">Als Standard festsetzen und nicht mehr fragen</string>
     <string name="option_always_ask">Jedes Mal fragen</string>
-    <string name="directory_add_a_new_server_prompt">Gib den Namen eines neuen Servers ein, den du erkunden möchtest.</string>
+    <string name="directory_add_a_new_server_prompt">Gib den Namen des neuen Servers ein, den du erkunden möchtest.</string>
     <string name="directory_add_a_new_server">Neuen Server hinzufügen</string>
     <string name="directory_your_server">Dein Server</string>
     <string name="send_feedback_space_info">Du verwendest die Betaversion von Spaces. Mit Feedback hilfst du uns, die nächsten Versionen zu verbessern. Dabei wird uns deine Platform übermittelt, damit wir deine Rückmeldung optimal nutzen können.</string>
@@ -2049,14 +2044,14 @@
     <string name="this_space_has_no_rooms">Dieser Space hat noch keine Räume</string>
     <string name="spaces_no_server_support_description">Für weitere Infos kontaktiere bitte die Administration des Homeservers</string>
     <string name="spaces_no_server_support_title">Dein Homeserver scheint Spaces noch nicht zu unterstützen</string>
-    <string name="space_leave_prompt_msg_as_admin">Du bist der einzige Admin von diesem Space. Wenn du ihn verlässt, hat niemand Kontrolle über ihn.</string>
+    <string name="space_leave_prompt_msg_as_admin">Du bist der einzige Admin dieses Spaces. Wenn du ihn verlässt, hat niemand Kontrolle über ihn.</string>
     <string name="space_leave_prompt_msg_private">Du wirst diesen Raum ohne erneute Einladung nicht betreten können.</string>
     <string name="space_leave_prompt_msg_only_you">Du bist die einzige Person hier. Wenn du den Space verlässt, ist er für immer verloren (eine lange Zeit).</string>
     <string name="invite_to_space">Einladen in %s</string>
     <string name="private_space">Privater Space</string>
     <string name="public_space">Öffentlicher Space</string>
     <string name="call_transfer_unknown_person">Unbekannte Person</string>
-    <string name="give_feedback">Feedback geben</string>
+    <string name="give_feedback">Rückmeldung geben</string>
     <string name="feedback_failed">Fehler beim Senden vom Feedback (%s)</string>
     <string name="feedback_sent">Dein Feedback wurde erfolgreich versandt. Danke!</string>
     <string name="you_may_contact_me">Mich bei Fragen kontaktieren</string>
@@ -2072,7 +2067,7 @@
     <string name="error_failed_to_join_room">Beim Versuch %s beizutreten, ist leider ein Fehler aufgetreten</string>
     <string name="room_upgrade_to_recommended_version">Zur empfohlenen Raumversion upgraden</string>
     <string name="joining_replacement_room">Ersatzraum betreten</string>
-    <string name="command_description_upgrade_room">Raum zu neuer Version upgraden</string>
+    <string name="command_description_upgrade_room">Aktualisiert den Raum auf eine neue Version</string>
     <string name="settings_server_room_version_stable">stabil</string>
     <string name="settings_server_room_version_unstable">instabil</string>
     <string name="settings_server_room_versions">Raumversionen 👓</string>
@@ -2091,11 +2086,11 @@
     <string name="a11y_pause_voice_message">Sprachnachricht pausieren</string>
     <string name="a11y_play_voice_message">Sprachnachricht abspielen</string>
     <string name="a11y_start_voice_message">Sprachnachricht aufnehmen</string>
-    <string name="room_using_unstable_room_version">Dieser Raum verwendet die Raumversion %s, die von diesem Heimserver als instabil markiert ist.</string>
+    <string name="room_using_unstable_room_version">Dieser Raum verwendet die Raumversion %s, die von diesem Heim-Server als instabil markiert ist.</string>
     <string name="upgrade_room_no_power_to_manage">Du benötigst die Berechtigung, um einen Raum upzugraden</string>
     <string name="upgrade_room_update_parent_space">Übergeordneten Space automatisch updaten</string>
     <string name="upgrade_room_auto_invite">Benutzer automatisch einladen</string>
-    <string name="upgrade_public_room_from_to">Du upgradest diesen Raum von %1$s zu %2$s.</string>
+    <string name="upgrade_public_room_from_to">Du aktualisierst diesen Raum von %1$s zu %2$s.</string>
     <string name="upgrade_room_warning">Das Raumupgrade ist eine erweiterte Option und ist empfohlen wenn sich der Raum instabil verhält, von Sicherheitslücken betroffen ist oder Features fehlen.
 \nNormalerweise ändert sich dadurch nur wie der Raum am Server verarbeitet wird.</string>
     <string name="upgrade_private_room">Privaten Raum upgraden</string>
@@ -2110,14 +2105,14 @@
     <string name="sent_a_voice_message">Sprachnachricht</string>
     <string name="decide_who_can_find_and_join">Lege fest, wer diesen Raum finden und betreten kann.</string>
     <string name="tap_to_edit_spaces">Klicke, um die Spaces zu bearbeiten</string>
-    <string name="select_spaces">Spaces auswählen</string>
+    <string name="select_spaces">Spaces wählen</string>
     <string name="room_create_member_of_space_name_can_join">Mitglieder von %s können Räume finden, betrachten und betreten.</string>
     <string name="room_settings_room_access_private_invite_only_title">Privat (Zutritt nur mit Einladung)</string>
-    <string name="settings_room_upgrades">Raumupgrades</string>
+    <string name="settings_room_upgrades">Raumaktualisierungen</string>
     <string name="settings_messages_by_bot">Nachrichten von Bots</string>
     <string name="settings_room_invitations">Raumeinladungen</string>
-    <string name="settings_encrypted_group_messages">Verschlüsselten Gruppenchats</string>
-    <string name="settings_group_messages">Gruppenchats</string>
+    <string name="settings_encrypted_group_messages">Verschlüsselte Gruppennachrichten</string>
+    <string name="settings_group_messages">Gruppennachrichten</string>
     <string name="settings_encrypted_direct_messages">Verschlüsselten Direktnachrichten</string>
     <string name="settings_messages_direct_messages">Direktnachrichten</string>
     <string name="settings_messages_containing_username">Mein Benutzername</string>
@@ -2134,7 +2129,7 @@
         <item quantity="one">Verpasster Sprachanruf</item>
         <item quantity="other">%d verpasste Sprachanrufe</item>
     </plurals>
-    <string name="hs_client_url">Heimserver API URL</string>
+    <string name="hs_client_url">Heim-Server-API-Adresse</string>
     <string name="denied_permission_voice_message">Um Sprachnachrichten zu senden, erlaube bitte Zugriff aufs Mikrofon.</string>
     <string name="denied_permission_camera">Um fortzufahren, erlaube bitte in den Systemeinstellungen Zugriff auf die Kamera.</string>
     <string name="denied_permission_generic">Für diese Aktion fehlen einige Berechtigungen, bitte erlaube diese in den Systemeinstellungen.</string>
@@ -2145,7 +2140,7 @@
     <string name="other_spaces_or_rooms_you_might_not_know">Andere Spaces oder Räume die du kennst</string>
     <string name="space_you_know_that_contains_this_room">Spaces mit diesem Raum und dir als Mitglied</string>
     <string name="room_settings_mention_and_keyword_only">Nur Erwähnungen und Schlüsselwörter</string>
-    <string name="call_remove_jitsi_widget_progress">Auflegen…</string>
+    <string name="call_remove_jitsi_widget_progress">Auflegen …</string>
     <string name="audio_call_with_participant">Sprachanruf mit %s</string>
     <string name="video_call_with_participant">Videoanruf mit %s</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Alle beigetretenen Räume werden auf der Startseite angezeigt.</string>
@@ -2162,13 +2157,13 @@
     <string name="call_tile_voice_call_has_ended">Sprachanruf beendet • %1$s</string>
     <string name="room_settings_room_notifications_notify_me">Benachrichtige mich bei</string>
     <string name="settings_mentions_at_room">\@room</string>
-    <string name="settings_notification_keyword_contains_invalid_character">Schlüsselwörter dürfen kein \"%s\" enthalten</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Schlüsselwörter dürfen kein „%s“ enthalten</string>
     <string name="settings_notification_keyword_contains_dot">Schlüsselwörter können nicht mit einem Punkt beginnen</string>
     <string name="room_settings_none">Nichts</string>
     <string name="call_ended_invite_timeout_title">Nicht erreicht</string>
     <string name="call_ended_user_busy_description">Die angerufene Person ist beschäftigt.</string>
     <string name="call_ended_user_busy_title">Person beschäftigt</string>
-    <string name="call_ringing">Klingeln…</string>
+    <string name="call_ringing">Klingeln …</string>
     <string name="spaces">Spaces</string>
     <string name="call_tile_video_missed">Verpasster Videoanruf</string>
     <string name="call_tile_voice_missed">Verpasster Sprachanruf</string>
@@ -2189,17 +2184,17 @@
     <string name="space_leave_prompt_msg_with_name">Willst du %s wirklich verlassen\?</string>
     <string name="invite_by_username_or_mail">Mit Benutzername oder E-Mail einladen</string>
     <string name="command_description_add_to_space">Zum ausgewählten Space hinzufügen</string>
-    <string name="create_space_in_progress">Erstelle Space…</string>
+    <string name="create_space_in_progress">Erstelle Space …</string>
     <string name="settings_developer_mode_show_info_on_screen_summary">Hilfreiche Informationen zur Fehlersuche anzeigen</string>
     <string name="settings_developer_mode_show_info_on_screen_title">Debug-Info anzeigen</string>
-    <string name="does_not_look_like_valid_email">Das schaut nicht nach einer gültigen E-Mail-Adresse aus</string>
-    <string name="user_directory_search_hint_2">Nach Name, ID oder E-Mail suchen</string>
+    <string name="does_not_look_like_valid_email">Das scheint keine gültige E-Mail-Adresse zu sein</string>
+    <string name="user_directory_search_hint_2">Mittels Name, ID oder E-Mail-Adresse suchen</string>
     <string name="create_new_space">Neuen Space erstellen</string>
     <string name="room_settings_space_access_title">Zugriff</string>
     <string name="room_settings_access_rules_pref_dialog_title">Wer hat Zugriff\?</string>
-    <string name="settings_notification_emails_enable_for_email">Benachrichtigungen per Email für %s aktivieren</string>
-    <string name="settings_notification_emails_no_emails">Um Benachrichtigungen per E-Mail zu empfangen, musst du einen E-Mail-Adresse hinzufügen</string>
-    <string name="settings_notification_emails_category">Emailbenachrichtigungen</string>
+    <string name="settings_notification_emails_enable_for_email">Benachrichtigungen per E-Mail für %s aktivieren</string>
+    <string name="settings_notification_emails_no_emails">Um Benachrichtigungen per E-Mail zu empfangen, musst du eine E-Mail-Adresse hinzufügen</string>
+    <string name="settings_notification_emails_category">E-Mail-Benachrichtigungen</string>
     <string name="room_permissions_upgrade_the_space">Space upgraden</string>
     <string name="room_permissions_change_space_name">Namen vom Space ändern</string>
     <string name="room_permissions_enable_space_encryption">Space verschlüsseln</string>
@@ -2207,7 +2202,7 @@
     <string name="room_permissions_change_space_avatar">Space-Icon ändern</string>
     <string name="space_permissions_notice_read_only">Du hast nicht die Berechtigung, Rollenrechte zu bearbeiten</string>
     <string name="space_settings_permissions_title">Space-Berechtigungen</string>
-    <string name="space_participants_unban_prompt_msg">Wenn du die Person entbannst, kann sie wieder beitreten.</string>
+    <string name="space_participants_unban_prompt_msg">Wenn du die Person entbannst, kann sie den Space wieder betreten.</string>
     <string name="space_participants_ban_prompt_msg">Die Verbannung einer Person entfernt sie aus diesem Space und hindert sie am erneuten Beitritt.</string>
     <string name="space_participants_remove_prompt_msg">Kicken entfernt die Person aus dem Space
 \n
@@ -2227,9 +2222,9 @@
     <string name="command_description_room_name">Ändert den Raumnamen</string>
     <string name="command_description_unignore_user">Entblockt eine Person und zeigt deren Nachrichten wieder an</string>
     <string name="command_description_ignore_user">Blockiert eine Person und versteckt deren Nachrichten</string>
-    <string name="room_settings_space_access_public_description">Jeder kann den Space finden und beitreten</string>
+    <string name="room_settings_space_access_public_description">Jeder kann den Space finden und betreten</string>
     <string name="room_settings_room_notifications_manage_notifications">Du kannst deine Benachrichtigungen in den %1$s verwalten.</string>
-    <string name="room_settings_room_notifications_encryption_notice">Beachte, dass Benachrichtigungen zu Erwähnungen und Schlüsselwörtern in verschlüsselten Räumen momentan nicht verfügbar sind.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Bitte beachte, dass Benachrichtigungen zu Erwähnungen und Schlüsselwörtern in verschlüsselten Räumen mobil nicht verfügbar sind.</string>
     <string name="space_permissions_notice">Wähle die Berechtigungen der Rollen aus</string>
     <string name="space_settings_permissions_subtitle">Rollen deren Berechtigungen einsehen und bearbeiten.</string>
     <plurals name="create_poll_not_enough_options_error">
@@ -2237,44 +2232,44 @@
         <item quantity="other">%1$s weitere Optionen benötigt</item>
     </plurals>
     <string name="create_poll_empty_question_error">Frage darf nicht leer sein</string>
-    <string name="create_poll_button">ABSTIMMUNG ERSTELLEN</string>
+    <string name="create_poll_button">Umfrage erstellen</string>
     <string name="create_poll_add_option">NEUE OPTION</string>
     <string name="create_poll_options_hint">Option %1$d</string>
     <string name="create_poll_options_title">Optionen hinzufügen</string>
     <string name="create_poll_question_hint">Frage oder Thema</string>
     <string name="create_poll_question_title">Abstimmungsthema oder Frage</string>
-    <string name="create_poll_title">Abstimmung erstellen</string>
-    <string name="attachment_type_poll">Abstimmung</string>
+    <string name="create_poll_title">Umfrage erstellen</string>
+    <string name="attachment_type_poll">Umfrage</string>
     <string name="open_discovery_settings">Auffindungseinstellungen öffnen</string>
     <string name="shortcut_disabled_reason_sign_out">Sitzung abgemeldet!</string>
     <string name="shortcut_disabled_reason_room_left">Raum verlassen!</string>
-    <string name="login_error_homeserver_from_url_not_found_enter_manual">Heimserver auswählen</string>
-    <string name="login_error_homeserver_from_url_not_found">Es konnte kein Heimserver mit der Adresse %s gefunden werden. Bitte überprüfe die Adresse oder wähle den Heimserver manuell.</string>
+    <string name="login_error_homeserver_from_url_not_found_enter_manual">Heim-Server auswählen</string>
+    <string name="login_error_homeserver_from_url_not_found">Es konnte kein Heim-Server mit der Adresse %s gefunden werden. Bitte überprüfe die Adresse oder wähle den Heim-Server manuell.</string>
     <string name="space_add_space_to_any_space_you_manage">Untergeordneten Space hinzufügen.</string>
     <string name="identity_server_consent_dialog_content_question">Bist du dir wirklich sicher, dass du diese Informationen senden willst\?</string>
-    <string name="identity_server_consent_dialog_title_2">E-Mail-Adressen und Telefonnummern an %s senden</string>
+    <string name="identity_server_consent_dialog_title_2">E-Mail-Adressen und Telefonnummern an %s übermitteln</string>
     <string name="action_not_now">Nicht jetzt</string>
     <string name="notification_listening_for_notifications">Auf Benachrichtigungen warten</string>
     <string name="legals_third_party_notices">Externe Bibliotheken</string>
     <string name="analytics_opt_in_list_item_3">Du kannst dies jederzeit in den Einstellungen deaktivieren</string>
-    <string name="analytics_opt_in_list_item_2">Wir teilen <b>keine</b> Informationen mit Drittpersonen</string>
-    <string name="analytics_opt_in_list_item_1">Wir erfassen und analysieren <b>keine</b> Accountdaten</string>
+    <string name="analytics_opt_in_list_item_2">Wir teilen <b>keine</b> Informationen mit Dritten</string>
+    <string name="analytics_opt_in_list_item_1">Wir erfassen und analysieren <b>keine</b> Kontodaten</string>
     <string name="analytics_opt_in_content">Hilf uns dabei Probleme zu identifizieren und ${app_name} zu verbessern, indem du anonyme Nutzungsdaten teilst. Um zu verstehen, wie Personen mehrere Geräte benutzen, werden wir eine zufällige Kennung generieren, die zwischen deinen Geräten geteilt wird.
 \n
 \n%s kannst du alle unsere Bedingungen lesen.</string>
     <string name="create_spaces_invite_public_header_desc">Stelle sicher, dass die richtigen Personen Zugriff auf %s haben. Du kannst jederzeit weitere Personen einladen.</string>
     <string name="create_spaces_invite_public_header">Wer ist Mitglied deines Teams\?</string>
-    <string name="settings_discovery_no_policy_provided">Der Identitätsserver gibt keine Bedingungen an</string>
-    <string name="settings_discovery_hide_identity_server_policy_title">Bedingungen des Identitätsservers ausblenden</string>
-    <string name="settings_discovery_show_identity_server_policy_title">Bedingungen des Identitätsservers anzeigen</string>
+    <string name="settings_discovery_no_policy_provided">Der Identitäts-Server gibt keine Bedingungen an</string>
+    <string name="settings_discovery_hide_identity_server_policy_title">Richtlinie des Identitäts-Servers ausblenden</string>
+    <string name="settings_discovery_show_identity_server_policy_title">Bedingungen des Identitäts-Servers anzeigen</string>
     <string name="preference_system_settings">Systemeinstellungen</string>
     <string name="preference_versions">Versionen</string>
     <string name="preference_help_summary">Erhalte Hilfe bei der Bedienung von ${app_name}</string>
     <string name="preference_help_title">Hilfe und Unterstützung</string>
     <string name="preference_help">Hilfe</string>
     <string name="preference_root_legals">Rechtliches</string>
-    <string name="decide_which_spaces_can_access">Entscheide, welche Spaces Zugriff auf den Raum haben sollen. Die Mitglieder der Spaces können diesen Räumen beitreten.</string>
-    <string name="analytics_opt_in_content_link">hier</string>
+    <string name="decide_which_spaces_can_access">Entscheide, welche Spaces Zugriff auf den Raum haben sollen. Die Mitglieder der Spaces können diesen Räumen betreten.</string>
+    <string name="analytics_opt_in_content_link">Hier</string>
     <string name="analytics_opt_in_title">Hilf mit, ${app_name} zu verbessern</string>
     <string name="action_enable">Aktivieren</string>
     <string name="room_member_override_nick_color">Farbe des Anzeigenamens ändern</string>
@@ -2299,33 +2294,33 @@
     <string name="labs_auto_report_uisi_desc">Das System sendet automatisch Protokolle, wenn ein Fehler bei der Entschlüsselung auftritt</string>
     <string name="labs_auto_report_uisi">Entschlüsselungsfehler automatisch melden.</string>
     <string name="discovery_section">Auffindbarkeit (%s)</string>
-    <string name="discovery_invite">Per E-Mail einladen, finde deine Kontakte und mehr…</string>
+    <string name="discovery_invite">Lade per E-Mail ein, finde deine Kontakte und mehr …</string>
     <string name="finish_setting_up_discovery">Schließe die Konfiguration des Auffindbarkeitsdienstes ab.</string>
-    <string name="create_space_identity_server_info_none">Du verwendest derzeit keinen Identitätsserver. Um Teammitglieder einzuladen und für sie auffindbar zu sein, müssen du einen solchen Server konfigurieren.</string>
-    <string name="login_splash_already_have_account">Ich habe schon ein Konto</string>
-    <string name="ftue_auth_carousel_encrypted_title">Sichere Nachrichtenübertragung.</string>
-    <string name="ftue_auth_carousel_secure_title">Besitze deine Konversationen.</string>
-    <string name="identity_server_consent_dialog_content_3">Um bestehende Kontakte ermitteln zu können, müsst du Kontaktinformationen (E-Mails und Telefonnummern) an Ihren Identitätsserver senden. Wir verschlüsseln deine Daten vor dem Senden, um den Datenschutz zu gewährleisten.</string>
-    <string name="settings_discovery_consent_notice_off_2">Deine Kontakte sind privat. Um in deinen Kontakten Benutzer erkennen zu können, benötigen wir deine Erlaubnis, Kontaktinformationen an deinen Identitätsserver zu senden.</string>
+    <string name="create_space_identity_server_info_none">Du verwendest derzeit keinen Identitäts-Server. Um Team-Mitglieder einzuladen und für sie auffindbar zu sein, konfiguriere zunächst einen.</string>
+    <string name="login_splash_already_have_account">Ich habe bereits ein Konto</string>
+    <string name="ftue_auth_carousel_encrypted_title">Sichere Kommunikation.</string>
+    <string name="ftue_auth_carousel_secure_title">Besitze deine Unterhaltungen.</string>
+    <string name="identity_server_consent_dialog_content_3">Um bestehende Kontakte ermitteln zu können, musst du Kontaktinformationen (E-Mail-Adressen und Telefonnummern) an deinen Identitäts-Server übermitteln. Deine Daten werden als Streuwert (Hash) übermittelt, um den Datenschutz zu gewährleisten.</string>
+    <string name="settings_discovery_consent_notice_off_2">Deine Kontakte sind privat. Um unter deinen Kontakten Matrix-Nutzer finden zu können, benötigen wir deine Erlaubnis, Kontaktinformationen an deinen Identitäts-Server zu übermitteln.</string>
     <string name="legals_no_policy_provided">Dieser Server stellt keine Richtlinie bereit.</string>
-    <string name="legals_identity_server_title">Deine Identitätsserver-Richtlinie</string>
-    <string name="legals_home_server_title">Deine Heimserver Richtlinie</string>
-    <string name="legals_application_title">${app_name} Richtlinie</string>
-    <string name="tooltip_attachment_poll">Abstimmung erstellen</string>
+    <string name="legals_identity_server_title">Richtlinie deines Identitäts-Servers</string>
+    <string name="legals_home_server_title">Richtlinie deines Heim-Servers</string>
+    <string name="legals_application_title">Richtlinie von ${app_name}</string>
+    <string name="tooltip_attachment_poll">Umfrage erstellen</string>
     <string name="tooltip_attachment_contact">Kontakte öffnen</string>
     <string name="tooltip_attachment_sticker">Sticker verschicken</string>
     <string name="tooltip_attachment_file">Datei hochladen</string>
     <string name="tooltip_attachment_gallery">Verschicke Fotos und Videos</string>
     <string name="tooltip_attachment_photo">Kamera öffnen</string>
     <string name="delete_poll_dialog_content">Willst du diese Umfrage wirklich entfernen\? Du wirst sie nicht wiederherstellen können.</string>
-    <string name="delete_poll_dialog_title">Abstimmung entfernen</string>
-    <string name="poll_end_room_list_preview">Abstimmung beendet</string>
+    <string name="delete_poll_dialog_title">Umfrage entfernen</string>
+    <string name="poll_end_room_list_preview">Umfrage beendet</string>
     <string name="poll_response_room_list_preview">Stimme abgegeben</string>
-    <string name="end_poll_confirmation_approve_button">Abstimmung beenden</string>
+    <string name="end_poll_confirmation_approve_button">Umfrage beenden</string>
     <string name="end_poll_confirmation_description">Dies verhindert, dass andere Personen abstimmen können, und zeigt die Endergebnisse der Umfrage an.</string>
-    <string name="end_poll_confirmation_title">Diese Abstimmung beenden\?</string>
+    <string name="end_poll_confirmation_title">Diese Umfrage beenden\?</string>
     <string name="a11y_poll_winner_option">Gewinneroption</string>
-    <string name="poll_end_action">Abstimmung beenden</string>
+    <string name="poll_end_action">Umfrage beenden</string>
     <plurals name="poll_total_vote_count_after_ended">
         <item quantity="one">Endgültiges Ergebnis basiert auf %1$d Stimme</item>
         <item quantity="other">Endgültiges Ergebnis basiert auf %1$d Stimmen</item>
@@ -2337,18 +2332,18 @@
     <string name="location_not_available_dialog_content">${app_name} konnte nicht auf deinen Standort zugreifen. Bitte versuche es später noch einmal.</string>
     <string name="location_not_available_dialog_title">${app_name} konnte nicht auf deinen Standort zugreifen</string>
     <string name="location_activity_title_preview">Standort</string>
-    <string name="closed_poll_option_description">Ergebnisse werden erst angezeigt, wenn du die Umfrage beendest</string>
-    <string name="closed_poll_option_title">Geschlossene Umfrage</string>
-    <string name="open_poll_option_description">Ergebnisse werden direkt nach Stimmabgabe angezeigt</string>
+    <string name="closed_poll_option_description">Die Ergebnisse werden erst sichtbar, sobald du die Umfrage beendest</string>
+    <string name="closed_poll_option_title">Versteckte Umfrage</string>
+    <string name="open_poll_option_description">Abstimmende können die Ergebnisse nach Stimmabgabe sehen</string>
     <string name="open_poll_option_title">Offene Umfrage</string>
     <string name="poll_type_title">Umfragetyp</string>
     <string name="edit_poll_title">Umfrage bearbeiten</string>
     <string name="poll_no_votes_cast">Keine Stimmen abgegeben</string>
     <string name="login_splash_create_account">Konto erstellen</string>
-    <string name="ftue_auth_carousel_workplace_title">Nachrichtenaustausch für dein Team.</string>
+    <string name="ftue_auth_carousel_workplace_title">Kommunikation für dein Team.</string>
     <string name="ftue_auth_carousel_encrypted_body">Ende-zu-Ende-verschlüsselt und ohne Telefonnummer nutzbar. Keine Werbung oder Datenerfassung.</string>
-    <string name="ftue_auth_carousel_control_body">Wähle wo deine Gespräche liegen, für Kontrolle und Unabhängigkeit. Verbunden mit Matrix.</string>
-    <string name="ftue_auth_carousel_secure_body">Sichere und unabhängige Kommunikation, die für die gleiche Vertraulichkeit sorgt, wie ein Gespräch von Angesicht zu Angesicht in deinem eigenen Zuhause.</string>
+    <string name="ftue_auth_carousel_control_body">Wähle, wo deine Unterhaltungen gespeichert werden, um Kontrolle und Unabhängigkeit zu erhalten. Verbunden via Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Sichere und unabhängige Kommunikation, die für eine Vertraulichkeit sorgt, wie ein Gespräch von Angesicht zu Angesicht in deinen eigenen vier Wänden.</string>
     <string name="attachment_type_location">Standort</string>
     <string name="encryption_misconfigured">Die Verschlüsselung ist fehlerhaft konfiguriert</string>
     <string name="contact_admin_to_restore_encryption">Bitte kontaktiere einen Admin, um die Verschlüsselung zurückzusetzen.</string>
@@ -2367,11 +2362,11 @@
     <string name="ftue_auth_use_case_join_existing_server">Möchtest du einem existierenden Server beitreten\?</string>
     <string name="ftue_auth_use_case_option_three">Communities</string>
     <string name="ftue_auth_use_case_option_two">Teams</string>
-    <string name="ftue_auth_use_case_subtitle">Wir helfen dir, in Verbindung zu kommen</string>
-    <string name="ftue_auth_use_case_title">Mit wem wirst du am meisten chatten\?</string>
+    <string name="ftue_auth_use_case_subtitle">Wir helfen dir, dich zu vernetzen</string>
+    <string name="ftue_auth_use_case_title">Mit wem wirst du am meisten schreiben\?</string>
     <string name="action_thread_copy_link_to_thread">Link zu Thread kopieren</string>
     <string name="action_view_threads">Threads anzeigen</string>
-    <string name="message_bubbles">Nachrichtenblasen anzeigen</string>
+    <string name="message_bubbles">Nachrichtenblasen</string>
     <string name="location_timeline_failed_to_load_map">Laden der Karte fehlgeschlagen</string>
     <string name="a11y_static_map_image">Karte</string>
     <string name="labs_enable_thread_messages_desc">Hinweis: App wird neugestartet</string>
@@ -2404,30 +2399,30 @@
         <item quantity="other">%d Server-ACLs geändert</item>
     </plurals>
     <string name="location_share_live_stop">Beenden</string>
-    <string name="location_share_live_enabled">Live-Standort aktiviert</string>
+    <string name="location_share_live_enabled">Echtzeit-Standort aktiviert</string>
     <string name="a11y_location_share_option_pinned_icon">Standort teilen</string>
-    <string name="location_share_option_pinned">Standort teilen</string>
+    <string name="location_share_option_pinned">Diesen Standort teilen</string>
     <string name="location_share_option_user_current">Meinen Standort teilen</string>
     <string name="a11y_location_share_option_user_current_icon">Meinen Standort teilen</string>
-    <string name="a11y_location_share_option_user_live_icon">Live-Standort teilen</string>
-    <string name="location_share_option_user_live">Live-Standort teilen</string>
+    <string name="a11y_location_share_option_user_live_icon">Echtzeit-Standort freigeben</string>
+    <string name="location_share_option_user_live">Echtzeit-Standort teilen</string>
     <string name="threads_notice_migration_title">Threads nähern sich der Beta 🎉</string>
     <string name="action_disable">Deaktivieren</string>
     <string name="beta">BETA</string>
-    <string name="give_feedback_threads">Feedback geben</string>
+    <string name="give_feedback_threads">Rückmeldung geben</string>
     <string name="beta_title_bottom_sheet_action">BETA</string>
-    <string name="threads_labs_enable_notice_title">Threads Beta</string>
+    <string name="threads_labs_enable_notice_title">Threads-Beta</string>
     <string name="threads_beta_enable_notice_title">Threads Beta</string>
     <string name="call_start_screen_sharing">Bildschirm teilen</string>
-    <string name="action_try_it_out">Ausprobieren</string>
-    <string name="location_share_live_until">Live bis %1$s</string>
-    <string name="unifiedpush_getdistributors_dialog_title">Wähle Deine Benachrichtigungsmethode</string>
-    <string name="labs_enable_live_location_summary">Vorläufige Implementierung: Standorte bleiben im Nachrichtenverlauf von Räumen erhalten</string>
+    <string name="action_try_it_out">Probiere es aus</string>
+    <string name="location_share_live_until">Echtzeit bis %1$s</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Wähle deine Benachrichtigungsmethode</string>
+    <string name="labs_enable_live_location_summary">Vorläufige Implementierung: Standorte verbleiben im Raumverlauf</string>
     <string name="push_gateway_item_profile_tag">Profil-Tag:</string>
     <string name="time_unit_hour_short">h</string>
-    <string name="live_location_labs_promotion_switch_title">Standortfreigabe aktivieren</string>
-    <string name="live_location_labs_promotion_description">Bitte beachten: Dies ist eine Testfunktion mit einer vorübergehenden Implementierung. Das bedeutet, dass Du Deinen Standortverlauf nicht löschen kannst und dass fortgeschrittene Nutzer Deinen Standortverlauf auch dann noch sehen können, wenn Du Deinen Live-Standort nicht mehr mit diesem Raum teilst.</string>
-    <string name="live_location_labs_promotion_title">Live-Standortfreigabe</string>
+    <string name="live_location_labs_promotion_switch_title">Aktiviere Standortfreigabe</string>
+    <string name="live_location_labs_promotion_description">Bitte beachte: Dies ist eine experimentelle Funktion, die eine temporäre Implementierung nutzt. Das bedeutet, dass du deinen Standortverlauf nicht löschen kannst und erfahrene Nutzer ihn sehen können, selbst wenn du deinen Live-Standort nicht mehr mit diesem Raum teilst.</string>
+    <string name="live_location_labs_promotion_title">Echtzeit-Standortfreigabe</string>
     <string name="settings_troubleshoot_test_current_gateway">Aktuelles Gateway: %s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">Gateway</string>
     <string name="settings_troubleshoot_test_current_endpoint_failed">Kann den Endpunkt nicht finden.</string>
@@ -2448,18 +2443,17 @@
     <string name="screen_sharing_notification_description">Bildschirmfreigabe ist in Arbeit</string>
     <string name="screen_sharing_notification_title">${app_name} Bildschirmfreigabe</string>
     <string name="live_location_bottom_sheet_last_updated_at">Aktualisiert vor %1$s</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Teilen beenden</string>
-    <string name="labs_enable_live_location">Aktiviere Live-Standortfreigabe</string>
+    <string name="labs_enable_live_location">Aktiviere Echtzeit-Standortfreigabe</string>
     <string name="live_location_sharing_notification_description">Standortfreigabe ist in Arbeit</string>
-    <string name="live_location_sharing_notification_title">${app_name} Live-Standort</string>
+    <string name="live_location_sharing_notification_title">${app_name} Echtzeit-Standort</string>
     <string name="location_share_live_remaining_time">%1$s übrig</string>
-    <string name="location_share_live_view">Live-Standort anzeigen</string>
-    <string name="location_share_live_ended">Live-Standort beendet</string>
-    <string name="location_share_live_started">Live-Standort laden…</string>
+    <string name="location_share_live_view">Echtzeit-Standort anzeigen</string>
+    <string name="location_share_live_ended">Echtzeit-Standort beendet</string>
+    <string name="location_share_live_started">Lade Echtzeit-Standort …</string>
     <string name="location_share_live_select_duration_option_3">8 Stunden</string>
     <string name="location_share_live_select_duration_option_2">1 Stunde</string>
     <string name="location_share_live_select_duration_option_1">15 Minuten</string>
-    <string name="location_share_live_select_duration_title">Teile Deinen Live-Standort für</string>
+    <string name="location_share_live_select_duration_title">Gebe deinen Echtzeit-Standort frei für</string>
     <string name="a11y_location_share_locate_button">Auf aktuellen Standort zoomen</string>
     <string name="a11y_location_share_pin_on_map">Pin des ausgewählten Ortes auf der Karte</string>
     <string name="audio_message_file_size">(%1$s)</string>
@@ -2470,7 +2464,7 @@
     <string name="a11y_audio_playback_duration">%1$d Minuten %2$d Sekunden</string>
     <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
     <string name="settings_show_latest_profile_description">Die neuesten Profilinformationen (Avatar und Anzeigename) für alle Nachrichten anzeigen.</string>
-    <string name="settings_show_latest_profile">Aktuelle Benutzerinformationen anzeigen</string>
+    <string name="settings_show_latest_profile">Aktuelle Profilinformationen</string>
     <string name="ftue_personalize_complete_title">Sieht gut aus!</string>
     <string name="ftue_display_name_title">einen Anzeigenamen wählen</string>
     <string name="ftue_account_created_take_me_home">Zurück zum Home-Screen</string>
@@ -2486,11 +2480,11 @@
     <string name="settings_presence">Präsenz</string>
     <string name="settings_autoplay_animated_images_summary">Animierte Bilder in der Zeitleiste abspielen, sobald sie sichtbar sind</string>
     <string name="settings_autoplay_animated_images_title">Animierte Bilder automatisch abspielen</string>
-    <string name="settings_troubleshoot_test_endpoint_registration_failed">Das Endpunkt-Token konnte nicht auf dem Heimserver registriert werden:
+    <string name="settings_troubleshoot_test_endpoint_registration_failed">Das Endpunkt-Token konnte nicht auf dem Heim-Server registriert werden:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_endpoint_registration_success">Endpunkt erfolgreich beim Heimserver registriert.</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_success">Endpunkt erfolgreich beim Heim-Server registriert.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Endpunkt-Registrierung</string>
-    <string name="threads_labs_enable_notice_message">Dein Heimserver unterstützt derzeit keine Threads, daher kann diese Funktion evtl. nicht richtig funktionieren. Einige Nachrichten mit Threads sind möglicherweise nicht zuverlässig verfügbar. %sMöchtest Du Threads trotzdem aktivieren\?</string>
+    <string name="threads_labs_enable_notice_message">Dein Heim-Server unterstützt derzeit keine Threads, daher könnte diese Funktion evtl. nicht richtig funktionieren. Einige Nachrichten mit Threads sind möglicherweise nicht zuverlässig verfügbar. %sMöchtest Du Threads trotzdem aktivieren\?</string>
     <string name="threads_beta_enable_notice_message">Threads helfen dabei, Unterhaltungen beim Thema zu halten und leichter zu verfolgen. %sDie Aktivierung von Threads aktualisiert die App. Dies kann bei einigen Konten länger dauern.</string>
     <string name="threads_notice_migration_message">Wir nähern uns der Veröffentlichung einer öffentlichen Beta für Threads.
 \n
@@ -2512,8 +2506,8 @@
     <string name="a11y_presence_busy">Beschäftigt</string>
     <string name="settings_security_pin_code_use_biometrics_error">Die biometrische Authentifizierung konnte nicht aktiviert werden.</string>
     <string name="auth_biometric_key_invalidated_message">Die biometrische Authentifizierung wurde deaktiviert, weil kürzlich eine neue biometrische Authentifizierungsmethode hinzugefügt wurde. Du kannst sie in den Einstellungen wieder aktivieren.</string>
-    <string name="error_forbidden_digits_only_username">Der Heimserver akzeptiert keine Benutzernamen, die nur aus Ziffern bestehen.</string>
-    <string name="sent_live_location">teilten ihren Live-Standort</string>
+    <string name="error_forbidden_digits_only_username">Der Heim-Server akzeptiert keine Benutzernamen, die nur aus Ziffern bestehen.</string>
+    <string name="sent_live_location">Teilte den eigenen Echtzeit-Standort</string>
     <string name="ftue_personalize_skip_this_step">Schritt überspringen</string>
     <string name="ftue_personalize_submit">Speichern und fortfahren</string>
     <string name="ftue_personalize_complete_subtitle">Öffne die Einstellungen jederzeit um dein Profil zu aktualisieren</string>
@@ -2522,19 +2516,18 @@
     <string name="ftue_profile_picture_title">Profilbild hinzufügen</string>
     <string name="ftue_display_name_entry_footer">Du kannst dies später ändern</string>
     <string name="ftue_display_name_entry_title">Anzeigename</string>
-    <string name="ftue_display_name_subtitle">Dies wird angezeigt, wenn Du Nachrichten sendest.</string>
     <string name="ftue_account_created_subtitle">Dein Konto %s wurde erstellt</string>
     <string name="ftue_account_created_congratulations_title">Herzlichen Glückwunsch!</string>
     <string name="ftue_account_created_personalize">Profil personalisieren</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name} ist auch für den Arbeitsplatz geeignet. Die sichersten Organisationen der Welt vertrauen darauf.</string>
     <string name="send_feedback_threads_info">Threads sind noch in Arbeit, und es stehen neue, aufregende Funktionen an, wie z. B. verbesserte Benachrichtigungen. Wir würden uns sehr über Dein Feedback freuen!</string>
-    <string name="direct_room_encryption_enabled_tile_description_future">Nachrichten in diesem Chat werden Ende-zu-Ende-verschlüsselt.</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Nachrichten in dieser Unterhaltung werden Ende-zu-Ende-verschlüsselt.</string>
     <string name="ftue_auth_captcha_title">Bist du ein Mensch\?</string>
-    <string name="ftue_auth_terms_subtitle">Bitte lies dir %ss Bedingungen und Richtlinien durch</string>
+    <string name="ftue_auth_terms_subtitle">Bitte lies dir die Bedingungen und Richtlinien von %s durch</string>
     <string name="ftue_auth_terms_title">Server-Richtlinien</string>
     <string name="ftue_auth_email_verification_subtitle">Folge den Anweisungen, die an %s gesendet wurden</string>
     <string name="ftue_auth_email_verification_title">E-Mail bestätigen</string>
-    <string name="poll_undisclosed_not_ended">Ergebnisse sind nach Beenden der Abstimmung sichtbar</string>
+    <string name="poll_undisclosed_not_ended">Ergebnisse werden nach Abschluss der Umfrage sichtbar sein</string>
     <string name="ftue_auth_reset_password_breaker_title">Prüfe deine E-Mails.</string>
     <string name="ftue_auth_reset_password">Passwort zurücksetzen</string>
     <string name="ftue_auth_new_password_subtitle">Gib mindestens 8 Zeichen ein.</string>
@@ -2552,18 +2545,18 @@
     <string name="permalink_unsupported_groups">Kann Link nicht öffnen: Communities wurden durch Spaces ersetzt</string>
     <string name="labs_enable_msc3061_share_history">MSC3061: Raumschlüssel für vorherige Nachrichten teilen</string>
     <string name="labs_enable_msc3061_share_history_desc">Beim Einladen in einen Raum mit sichtbarem Verlauf wird der verschlüsselte Verlauf sichtbar sein.</string>
-    <string name="live_location_description">Live-Standort</string>
+    <string name="live_location_description">Echtzeit-Standort</string>
     <plurals name="room_removed_messages">
         <item quantity="one">%d Nachricht gelöscht</item>
         <item quantity="other">%d Nachrichten gelöscht</item>
     </plurals>
-    <string name="labs_enable_element_call_permission_shortcuts">Keine Element Call-Berechtigungsabfragen</string>
-    <string name="labs_enable_element_call_permission_shortcuts_summary">Bestätige automatisch Element Call-Widgets und erlaube Kamera- und Mikrofonzugriff</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Keine Element-Call-Berechtigungsabfragen</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Bestätige automatisch Element-Call-Widgets und erlaube Kamera- und Mikrofonzugriff</string>
     <string name="create_room_action_go">Los</string>
-    <string name="ftue_auth_create_account_edit_server_selection">ändern</string>
-    <string name="ftue_auth_create_account_sso_section_header">oder</string>
-    <string name="ftue_auth_sign_in_choose_server_header">Das Zuhause deiner Gespräche</string>
-    <string name="ftue_auth_create_account_choose_server_header">Das zukünftige Zuhause für deine Gespräche</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Bearbeiten</string>
+    <string name="ftue_auth_create_account_sso_section_header">Oder</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Der zukünftige Ort deiner Gespräche</string>
+    <string name="ftue_auth_create_account_choose_server_header">Der zukünftige Ort deiner Gespräche</string>
     <string name="font_size_use_system">Systemstandard nutzen</string>
     <string name="font_size_section_auto">Automatisch festlegen</string>
     <string name="font_size_title">Schriftgröße wählen</string>
@@ -2572,11 +2565,328 @@
     <string name="auth_reset_password_error_unverified">E-Mail nicht bestätigt, prüfe deinen Posteingang</string>
     <string name="ftue_auth_welcome_back_title">Willkommen zurück!</string>
     <string name="ftue_auth_forgot_password">Passwort vergessen</string>
-    <string name="ftue_auth_login_username_entry">Benutzername / E-Mail / Telefon</string>
+    <string name="ftue_auth_login_username_entry">Nutzername / E-Mail-Adresse / Telefonnummer</string>
     <string name="ftue_auth_create_account_title">Erstelle dein Konto</string>
-    <string name="ftue_auth_choose_server_entry_hint">Serveradresse</string>
-    <string name="ftue_auth_choose_server_subtitle">Wie lautet die Adresse deines Servers\? Das wird eine Art Zuhause für deine Daten</string>
+    <string name="ftue_auth_choose_server_entry_hint">Server-URL</string>
+    <string name="ftue_auth_choose_server_subtitle">Wie lautet die Adresse deines Servers\? Dies ist eine Art Zuhause für all deine Daten</string>
     <string name="ftue_auth_choose_server_sign_in_subtitle">Wie lautet die Adresse deines Servers\?</string>
     <string name="ftue_auth_create_account_password_entry_footer">Muss 8 oder mehr Zeichen umfassen</string>
     <string name="ftue_auth_choose_server_title">Wähle deinen Server</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s und %2$d anderer</item>
+        <item quantity="other">%1$s und %2$d andere</item>
+    </plurals>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Aktivität</string>
+    <string name="home_layout_preferences_sort_by">Sortierung</string>
+    <string name="home_layout_preferences_filters">Filter anzeigen</string>
+    <string name="home_layout_preferences">Layouteinstellungen</string>
+    <string name="explore_rooms">Räume erkunden</string>
+    <string name="create_room">Raum erstellen</string>
+    <string name="room_list_filter_unreads">Ungelesene</string>
+    <string name="room_list_filter_people">Personen</string>
+    <string name="send_your_first_msg_to_invite">Schreibe deine erste Nachricht, um %s zur Unterhaltung einzuladen</string>
+    <string name="device_manager_sessions_other_description">Für bestmögliche Sicherheit verifiziere deine Sitzungen und melde dich von allen ab, die du nicht erkennst oder nutzt.</string>
+    <string name="device_manager_sessions_other_title">Andere Sitzungen</string>
+    <string name="settings_sessions_list">Sitzungen</string>
+    <string name="a11y_open_spaces">Space-Liste öffnen</string>
+    <string name="a11y_create_message">Beginne ein Gespräch oder erstelle einen Raum</string>
+    <string name="room_list_filter_favourites">Favoriten</string>
+    <string name="room_list_filter_all">Alle</string>
+    <string name="location_share_loading_map_error">Karte laden nicht möglich
+\nDieser Heim-Server könnte für die Kartendarstellung nicht konfiguriert sein.</string>
+    <string name="a11y_open_settings">Einstellungen öffnen</string>
+    <string name="verify_invalid_qr_notice">Dieser QR-Code ist fehlerhaft. Bitte versuche es mit einer anderen Methode.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Du wirst deinen verschlüsselten Nachrichtenverlauf nicht abrufen können. Um neu zu beginnen, setze deine Sicherung und Verifizierungsschlüssel zurück.</string>
+    <string name="crosssigning_cannot_verify_this_session">Verifizierung dieses Gerätes nicht möglich</string>
+    <string name="updating_your_data">Aktualisiere deine Daten …</string>
+    <string name="live_location_share_location_item_share">Standort freigeben</string>
+    <string name="live_location_not_enough_permission_dialog_description">Du benötigst die entsprechenden Berechtigungen, um deinen Echtzeit-Standort in diesem Raum freizugeben.</string>
+    <string name="live_location_not_enough_permission_dialog_title">Dir fehlt die Berechtigung, deinen Echtzeit-Standort freigeben zu dürfen</string>
+    <string name="ftue_auth_password_reset_confirmation">Passwort zurückgesetzt</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">Code erneut schicken</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">Ein Code wurde an %s gesendet</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">Bestätigungscode</string>
+    <string name="ftue_auth_phone_subtitle">%s muss dein Konto verifizieren</string>
+    <string name="ftue_auth_phone_title">Gib deine Telefonnummer ein</string>
+    <string name="ftue_auth_email_subtitle">%s muss dein Konto verifizieren</string>
+    <string name="ftue_auth_choose_server_ems_cta">Kontakt aufnehmen</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) ist ein robuster und zuverlässiger Hosting-Dienst für schnelle und sichere Echtzeitkommunikation. Erfahre mehr unter <a href="${ftue_ems_url}">element.io/ems</a></string>
+    <string name="ftue_auth_choose_server_ems_title">Willst du deinen eigenen Server betreiben\?</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobil</string>
+    <string name="timeline_error_room_not_found">Entschuldigung, dieser Raum wurde nicht gefunden.
+\nBitte versuche es später erneut.%s</string>
+    <string name="invites_title">Einladungen</string>
+    <string name="device_manager_other_sessions_description_unverified">Nicht verifiziert · Neueste Aktivität %1$s</string>
+    <string name="device_manager_verification_status_unverified">Nicht verifizierte Sitzung</string>
+    <string name="device_manager_unverified_sessions_title">Nicht verifizierte Sitzungen</string>
+    <string name="device_manager_header_section_security_recommendations_description">Verbessere deine Kontosicherheit, indem du diese Empfehlungen beherzigst.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Sicherheitsempfehlungen</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inaktiv seit %1$d+ Tag (%2$s)</item>
+        <item quantity="other">Inaktiv seit %1$d+ Tagen (%2$s)</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_verified">Verifiziert · Neueste Aktivität %1$s</string>
+    <string name="device_manager_verification_status_verified">Verifizierte Sitzung</string>
+    <string name="a11y_device_manager_device_type_unknown">Unbekannter Gerätetyp</string>
+    <string name="invites_empty_title">Nichts Neues.</string>
+    <string name="space_list_empty_message">Spaces sind eine neue Möglichkeit, Räume und Personen zu gruppieren. Erstelle einen Space, um zu beginnen.</string>
+    <string name="space_list_empty_title">Noch keine Spaces.</string>
+    <string name="home_empty_no_unreads_message">Hier werden deine ungelesenen Nachrichten erscheinen, wenn du welche hast.</string>
+    <string name="home_empty_no_unreads_title">Es gibt nichts Neues.</string>
+    <string name="all_chats">Alle Unterhaltungen</string>
+    <string name="change_space">Space wechseln</string>
+    <string name="start_chat">Unterhaltung beginnen</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filter</string>
+    <string name="a11y_device_manager_filter">Filtern</string>
+    <string name="a11y_collapse_space_children">Subspaces von %s schließen</string>
+    <string name="a11y_expand_space_children">Subspaces von %s erweitern</string>
+    <string name="ftue_auth_create_account_username_entry_footer">Andere können dich als %s finden</string>
+    <string name="labs_enable_deferred_dm_summary">Erstelle Unterhaltungen mit der ersten Nachricht</string>
+    <string name="labs_enable_deferred_dm_title">Verzögerte Direktnachrichten</string>
+    <string name="home_layout_preferences_recents">Historie anzeigen</string>
+    <string name="onboarding_new_app_layout_button_try">Probiere es aus</string>
+    <string name="onboarding_new_app_layout_feedback_message">Tippe oben rechts, um eine Rückmeldung zu senden.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Rückmeldung geben</string>
+    <string name="onboarding_new_app_layout_spaces_message">Greife auf deine Spaces (unten rechts) schneller und einfacher denn je zu.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Auf Spaces zugreifen</string>
+    <string name="onboarding_new_app_layout_welcome_message">Um dein ${app_name} zu vereinfachen, sind Tabs nun optional. Verwalte sie mit dem Menü oben rechts.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Willkommen in einer neuen Übersicht!</string>
+    <string name="home_empty_no_rooms_message">Die Komplettlösung für sichere Kommunikation unter Freunden, in Gruppen oder in Organisationen. Erstelle eine Unterhaltung oder trete einem bestehenden Raum bei, um loszulegen.</string>
+    <string name="home_empty_no_rooms_title">Willkommen bei ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Spaces sind eine neue Möglichkeit, Räume und Personen zu gruppieren. Füge einen bestehenden Raum hinzu oder erstelle einen neuen mit der Schaltfläche unten rechts.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nsieht ein bisschen leer aus.</string>
+    <string name="device_manager_session_details_device_ip_address">IP-Adresse</string>
+    <string name="device_manager_session_details_session_name">Sitzungsname</string>
+    <string name="device_manager_session_details_description">Anwendung, Gerät und Aktivitätsinformationen.</string>
+    <string name="device_manager_session_details_title">Sitzungsdetails</string>
+    <string name="device_manager_other_sessions_clear_filter">Filter zurücksetzen</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Keine inaktiven Sitzungen gefunden.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Keine unverifizierten Sitzungen gefunden.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Keine verifizierten Sitzungen gefunden.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Erwäge, dich aus alten (ein Tag oder mehr), nicht mehr verwendeten Sitzungen abzumelden.</item>
+        <item quantity="other">Erwäge, dich aus alten (%1$d Tage oder mehr), nicht mehr verwendeten Sitzungen abzumelden.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inaktiv</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Für besonders sichere Kommunikation verifiziere deine Sitzungen oder melde dich von ihnen ab, falls du sie nicht mehr identifizieren kannst.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Nicht verifiziert</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Verifiziert</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Inaktiv seit %1$d Tag oder länger</item>
+        <item quantity="other">Inaktiv seit %1$d Tagen oder länger</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inaktiv</string>
+    <string name="device_manager_filter_option_unverified_description">Nicht bereit für sichere Kommunikation</string>
+    <string name="device_manager_filter_option_unverified">Nicht verifiziert</string>
+    <string name="device_manager_filter_option_verified_description">Für sichere Kommunikation bereit</string>
+    <string name="device_manager_filter_option_verified">Verifiziert</string>
+    <string name="device_manager_filter_option_all_sessions">Alle Sitzungen</string>
+    <string name="device_manager_device_title">Gerät</string>
+    <string name="device_manager_session_title">Sitzung</string>
+    <string name="device_manager_current_session_title">Aktuelle Sitzung</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Erwäge, dich aus alten (ein Tag oder mehr), nicht mehr verwendeten Sitzungen abzumelden.</item>
+        <item quantity="other">Erwäge, dich aus alten (%1$d Tage oder mehr), nicht mehr verwendeten Sitzungen abzumelden.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Inaktive Sitzungen</string>
+    <string name="device_manager_unverified_sessions_description">Nicht verifizierte Sitzungen verifizieren oder abmelden.</string>
+    <string name="device_manager_other_sessions_view_all">Alle anzeigen (%1$d)</string>
+    <string name="device_manager_verify_session">Sitzung verifizieren</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Diese Sitzung ist für sichere Kommunikation bereit.</string>
+    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="invites_empty_message">Hier erscheinen deine neuen Anfragen und Einladungen.</string>
+    <string name="labs_enable_new_app_layout_summary">Ein vereinfachtes Element mit optionalen Tabs</string>
+    <string name="labs_enable_new_app_layout_title">Neues Layout aktivieren</string>
+    <string name="device_manager_session_details_session_last_activity">Neueste Aktivität</string>
+    <string name="device_manager_session_last_activity">Neueste Aktivität %1$s</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifiziere deine aktuelle Sitzung für besonders sichere Kommunikation.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Deine aktuelle Sitzung ist für sichere Kommunikation bereit.</string>
+    <string name="device_manager_view_details">Details anzeigen</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Für bestmögliche Sicherheit und Zuverlässigkeit verifiziere diese Sitzung oder melde sie ab.</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Für bestmögliche Sicherheit, melde dich von allen Sitzungen ab, die du nicht erkennst oder benutzt.</string>
+    <string name="device_manager_learn_more_session_rename">Andere Nutzer in Direktnachrichten und Räumen, in denen du dich befindest, können eine vollständige Liste deiner Sitzungen einsehen.
+\n
+\nDies gibt ihnen die Sicherheit, dass sie auch wirklich mit dir kommunizieren. Allerdings bedeutet es auch, dass sie die Sitzungsnamen sehen können, die du hier angibst.</string>
+    <string name="device_manager_learn_more_sessions_verified">Verifizierte Sitzungen wurden mit deinen Daten angemeldet und anschließend mit deiner Sicherheitspassphrase oder durch Quersignierung verifiziert.
+\n
+\nDies bedeutet, dass sie die Verschlüsselungs-Schlüssel für deine bisherigen Nachrichten besitzen und anderen Nutzern bestätigen können, dass diese Sitzungen tatsächlich von dir stammen.</string>
+    <string name="device_manager_learn_more_session_rename_title">Sitzungen umbenennen</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Verifizierte Sitzungen</string>
+    <string name="device_manager_learn_more_sessions_unverified">Nicht verifizierte Sitzungen sind jene, die angemeldet, aber nicht quer signiert sind.
+\n
+\nDu solltest besonders sicherstellen, dass du diese Sitzungen erkennst, da sie auf eine nicht autorisierte Nutzung deines Kontos hindeuten könnten.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Nicht verifizierte Sitzungen</string>
+    <string name="device_manager_learn_more_sessions_inactive">Inaktive Sitzungen sind jene, die du einige Zeit nicht mehr verwendet hast, die aber weiterhin Verschlüsselungs-Schlüssel erhalten.
+\n
+\nDas Löschen von inaktiven Sitzungen verbessert Sicherheit und Leistung, und hilft dir zu erkennen, ob eine neue Sitzung verdächtig ist.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Inaktive Sitzungen</string>
+    <string name="device_manager_session_rename_warning">Sei dir bitte bewusst, dass Sitzungsnamen auch für Personen, mit denen du kommunizierst, sichtbar sind.</string>
+    <string name="device_manager_session_rename_description">Individuelle Sitzungsnamen können dir helfen, deine Geräte einfacher zu erkennen.</string>
+    <string name="device_manager_session_rename_edit_hint">Sitzungsname</string>
+    <string name="device_manager_session_rename">Sitzung umbenennen</string>
+    <string name="device_manager_session_overview_signout">Von dieser Sitzung abmelden</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Nicht verifiziert · Deine aktuelle Sitzung</string>
+    <string name="tooltip_attachment_voice_broadcast">Beginne eine Sprachübertragung</string>
+    <string name="key_authenticity_not_guaranteed">Die Echtheit dieser verschlüsselten Nachricht kann auf diesem Gerät nicht garantiert werden.</string>
+    <string name="settings_security_incognito_keyboard_summary">Tastatur auffordern, keine personalisierten Daten, z. B. den Tippverlauf und Wörterbücher, basierend auf deinen Konversationen zu aktualisieren. Beachte, dass einige Tastaturen diese Einstellung ignorieren werden.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognito-Tastatur</string>
+    <string name="command_description_table_flip">Stellt (╯°□°）╯︵ ┻━┻ einer Klartextnachricht voran</string>
+    <string name="attachment_type_voice_broadcast">Sprachübertragung</string>
+    <string name="command_description_devtools">Öffne die Entwicklungswerkzeuge</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Du hast in den Sicherheitseinstellungen aktiviert, dass Verschlüsselung in allen Räumen ausschließlich für verifizierte Sitzungen erlaubt ist.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Es befinden sich nicht verifizierte Geräte in diesem Raum. Sie werden deine Nachrichten nicht entschlüsseln können.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Niemals verschlüsselte Nachrichten zu unverifizierten Sitzungen in diesem Raum senden.</string>
+    <string name="action_got_it">Verstanden</string>
+    <string name="labs_enable_rich_text_editor_summary">Probiere den Textverarbeitungs-Editor (bald auch mit Klartext-Modus)</string>
+    <string name="labs_enable_rich_text_editor_title">Textverarbeitungs-Editor aktivieren</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="rich_text_editor_format_strikethrough">Durchgestrichen formatieren</string>
+    <string name="rich_text_editor_format_italic">Kursiv formatieren</string>
+    <string name="rich_text_editor_format_bold">Fett formatieren</string>
+    <string name="rich_text_editor_format_underline">Unterstrichen formatieren</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} benötigt die Berechtigung zur Anzeige von Benachrichtigungen.
+\nBitte gewähre diese Berechtigung.</string>
+    <string name="labs_enable_client_info_recording_summary">Bezeichnung, Version und URL der Anwendung registrieren, damit diese Sitzung in der Sitzungsverwaltung besser erkennbar ist.</string>
+    <string name="labs_enable_client_info_recording_title">Anwendungsinformationen erfassen</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="labs_enable_session_manager_summary">Bessere Übersicht und Kontrolle über all deine Sitzungen.</string>
+    <string name="labs_enable_session_manager_title">Aktiviere neue Sitzungsverwaltung</string>
+    <string name="device_manager_session_details_device_operating_system">Betriebssystem</string>
+    <string name="device_manager_session_details_device_model">Modell</string>
+    <string name="device_manager_session_details_application_version">Version</string>
+    <string name="device_manager_session_details_application_name">Name</string>
+    <string name="device_manager_session_details_application">Anwendung</string>
+    <string name="device_manager_push_notifications_description">Erhalte Push-Benachrichtigungen in dieser Sitzung.</string>
+    <string name="device_manager_push_notifications_title">Push-Benachrichtigungen</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifiziere deine aktuelle Sitzung, um den Verifizierungsstatus dieser Sitzung anzuzeigen.</string>
+    <string name="device_manager_verification_status_unknown">Unbekannter Verifizierungsstatus</string>
+    <string name="push_gateway_item_device_id">Sitzungs-ID:</string>
+    <string name="push_gateway_item_enabled">Aktiviert:</string>
+    <string name="error_check_network">Etwas ist schiefgelaufen. Bitte überprüfe deine Internetverbindung und versuche es erneut.</string>
+    <string name="grant_permission">Berechtigung geben</string>
+    <string name="permissions_rationale_msg_notification">${app_name} braucht die Berechtigung, um Benachrichtigungen anzuzeigen. Benachrichtigungen können deine Nachrichten, Einladungen etc. anzeigen.
+\n
+\nBitte erlaube den Zugriff im nächsten Dialog, damit Benachrichtigungen angezeigt werden können.</string>
+    <string name="qr_code_login_confirm_security_code_description">Bitte vergewissere dich, dass du den Ursprung dieses Codes kennst. Durch Verbindung neuer Geräte gewährst du vollen Zugriff auf dein Konto.</string>
+    <string name="qr_code_login_confirm_security_code">Bestätigen</string>
+    <string name="qr_code_login_try_again">Erneut versuchen</string>
+    <string name="qr_code_login_status_no_match">Keine Übereinstimmung\?</string>
+    <string name="qr_code_login_signing_in">Du wirst angemeldet</string>
+    <string name="qr_code_login_connecting_to_device">Verbinde mit Gerät</string>
+    <string name="qr_code_login_scan_qr_code_button">QR-Code einlesen</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Mobiles Gerät anmelden\?</string>
+    <string name="qr_code_login_show_qr_code_button">QR-Code auf diesem Gerät anzeigen</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Wähle „QR-Code einlesen“</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Beginne auf dem Anmeldebildschirm</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Wähle „Mit QR-Code anmelden“</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Beginne auf dem Anmeldebildschirm</string>
+    <string name="qr_code_login_new_device_instruction_3">Wähle „QR-Code anzeigen“</string>
+    <string name="qr_code_login_new_device_instruction_2">Gehe zu Einstellungen -&gt; Sicherheit und Privatsphäre</string>
+    <string name="qr_code_login_new_device_instruction_1">Öffne die App auf deinem anderen Gerät</string>
+    <string name="qr_code_login_header_failed_denied_description">Die Anfrage wurde auf dem anderen Gerät abgelehnt.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Die Verbindung konnte nicht in der erforderlichen Zeit hergestellt werden.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Verbindung mit diesem Gerät nicht unterstützt.</string>
+    <string name="qr_code_login_header_failed_title">Verbindung fehlgeschlagen</string>
+    <string name="qr_code_login_header_connected_description">Überprüfe dein angemeldetes Gerät. Der unten gezeigte Code sollte angezeigt werden. Bestätige, dass beide Codes übereinstimmen:</string>
+    <string name="qr_code_login_header_connected_title">Sichere Verbindung hergestellt</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Lese den unten angezeigten QR-Code mit deinem nicht angemeldeten Gerät ein.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Benutze dein angemeldetes Gerät um den unten angezeigten QR-Code einzulesen:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Mit QR-Code anmelden</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Benutze die Kamera auf diesem Gerät um den vom anderen Gerät angezeigten QR-Code zu scannen:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">QR-Code einlesen</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Du kannst dieses Gerät benutzen um ein anderes Gerät per QR-Code anzumelden. Dafür gibt es zwei Wege:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Mit QR-Code anmelden</string>
+    <string name="login_scan_qr_code">QR-Code einlesen</string>
+    <string name="labs_enable_voice_broadcast_summary">Zeichne Sprachnachrichten auf, während du sie in Echtzeit in den Raumverlauf sendest.</string>
+    <string name="labs_enable_voice_broadcast_title">Sprachübertragung aktivieren</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Der Heim-Server unterstützt Anmelden per QR-Code nicht.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Die Anmeldung wurde vom anderen Gerät abgebrochen.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Der QR-Code ist ungültig.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Das andere Gerät muss angemeldet sein.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Das andere Gerät ist bereits angemeldet.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Es ist ein Problem bei der Herstellung der sicheren Kommunikation aufgetreten. Eines der folgenden Dinge könnte kompromittiert sein: Dein Heim-Server; deine Internetverbindung(en); dein(e) Gerät(e);</string>
+    <string name="qr_code_login_header_failed_other_description">Die Anfrage ist fehlgeschlagen.</string>
+    <string name="a11y_play_voice_broadcast">Abspielen oder fortsetzen der Sprachübertragung</string>
+    <string name="a11y_resume_voice_broadcast_record">Fortsetzen der Sprachübertragung</string>
+    <string name="a11y_voice_broadcast_buffering">Puffere …</string>
+    <string name="a11y_pause_voice_broadcast">Pausiere Sprachübertragung</string>
+    <string name="a11y_stop_voice_broadcast_record">Stoppe Aufzeichnung der Sprachübertragung</string>
+    <string name="a11y_pause_voice_broadcast_record">Pausiere Aufzeichnung der Sprachübertragung</string>
+    <string name="voice_broadcast_live">Live</string>
+    <string name="attachment_type_selector_sticker">Sticker</string>
+    <string name="device_manager_other_sessions_select">Sitzungen auswählen</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Standort</string>
+    <string name="attachment_type_selector_poll">Umfragen</string>
+    <string name="attachment_type_selector_voice_broadcast">Sprachübertragung</string>
+    <string name="attachment_type_selector_file">Anhänge</string>
+    <string name="attachment_type_selector_gallery">Fotobibliothek</string>
+    <string name="action_deselect_all">Alle abwählen</string>
+    <string name="action_select_all">Alle auswählen</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d ausgewählt</item>
+        <item quantity="other">%1$d ausgewählt</item>
+    </plurals>
+    <string name="error_voice_broadcast_permission_denied_message">Du hast nicht die nötigen Berechtigungen, um eine Sprachübertragung in diesem Raum zu starten. Kontaktiere einen Raumadministrator, um deine Berechtigungen anzupassen.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Sprachübertragung kann nicht gestartet werden</string>
+    <string name="rich_text_editor_full_screen_toggle">Vollbildmodus umschalten</string>
+    <string name="attachment_type_selector_text_formatting">Textformatierung</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Du zeichnest bereits eine Sprachübertragung auf. Bitte beende die laufende Übertragung, um eine neue zu beginnen.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Jemand anderes nimmt bereits eine Sprachübertragung auf. Warte auf das Ende der Übertragung, bevor du eine neue startest.</string>
+    <string name="a11y_voice_broadcast_fast_forward">30 Sekunden vorspulen</string>
+    <string name="a11y_voice_broadcast_fast_backward">30 Sekunden zurückspulen</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Auf verifizierte Sitzungen kannst du überall mit deinem Konto zugreifen, wenn du deine Passphrase eingegeben oder Element mit einer anderen Sitzung verifiziert hast.
+\n
+\nDies bedeutet, dass du alle Schlüssel zum Entsperren deiner verschlüsselten Nachrichten hast und anderen bestätigst, dieser Sitzung zu vertrauen.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Von %1$d Sitzung abmelden</item>
+        <item quantity="other">Von %1$d Sitzungen abmelden</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Abmelden</string>
+    <string name="voice_broadcast_recording_time_left">%1$s übrig</string>
+    <string name="quoting">Zitieren</string>
+    <string name="editing">Bearbeiten</string>
+    <string name="message_reply_to_sender_created_poll">erstellte eine Umfrage.</string>
+    <string name="message_reply_to_sender_sent_sticker">sandte einen Sticker.</string>
+    <string name="message_reply_to_sender_sent_video">sandte ein Video.</string>
+    <string name="message_reply_to_sender_sent_image">sandte ein Bild.</string>
+    <string name="message_reply_to_sender_sent_voice_message">sandte eine Sprachnachricht.</string>
+    <string name="message_reply_to_sender_sent_audio_file">sandte eine Audiodatei.</string>
+    <string name="message_reply_to_sender_sent_file">sandte eine Datei.</string>
+    <string name="message_reply_to_prefix">Als Antwort auf</string>
+    <string name="replying_to">%s antworten</string>
+    <string name="device_manager_other_sessions_hide_ip_address">IP-Adresse ausblenden</string>
+    <string name="device_manager_other_sessions_show_ip_address">IP-Adresse anzeigen</string>
+    <string name="settings_enable_direct_share_summary">Kürzliche Unterhaltungen im Teilen-Menü des Systems anzeigen</string>
+    <string name="settings_enable_direct_share_title">Direktes Teilen aktivieren</string>
+    <string name="review_unverified_sessions_description">Überprüfe sie, um ein sicheres Konto gewährleisten zu können</string>
+    <string name="review_unverified_sessions_title">Du hast nicht verifizierte Sitzungen</string>
+    <string name="settings_nightly_build_update">Hol dir den neuesten Build (Achtung: Du kannst dich eventuell nicht anmelden)</string>
+    <string name="settings_nightly_build">Nightly-Build</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Diese Sitzung unterstützt keine Verschlüsselung, weshalb sie nicht verifiziert werden kann.
+\n
+\nDu wirst dich mit dieser Sitzung nicht an Unterhaltungen in Räumen mit aktivierter Verschlüsselung beteiligen können.
+\n
+\nAus Sicherheits- und Datenschutzgründen, wird die Nutzung von verschlüsselungsfähigen Matrix-Anwendungen empfohlen.</string>
+    <string name="device_manager_signout_all_other_sessions">Von allen anderen Sitzungen abmelden</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Diese Sitzung unterstützt keine Verschlüsselung und kann deshalb nicht verifiziert werden.</string>
+    <string name="voice_broadcast_live_broadcast">Echtzeit-Übertragung</string>
+    <string name="notice_voice_broadcast_ended_by_you">Du hast eine Sprachübertragung beendet.</string>
+    <string name="notice_voice_broadcast_ended">%1$s beendete eine Sprachübertragung.</string>
+    <string name="stop_voice_broadcast_content">Möchtest du die Übertragung wirklich beenden\? Dies wird die Übertragung beenden und die vollständige Aufnahme im Raum bereitstellen.</string>
+    <string name="stop_voice_broadcast_dialog_title">Live-Übertragung beenden\?</string>
+    <string name="action_stop">Ja, beende</string>
+    <string name="rich_text_editor_link">Link setzen</string>
+    <string name="set_link_edit">Link bearbeiten</string>
+    <string name="set_link_create">Link erstellen</string>
+    <string name="set_link_link">Link</string>
+    <string name="set_link_text">Text</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-de/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-de/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-de/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-de/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-el/strings.xml b/library/ui-strings/src/main/res/values-el/strings.xml
similarity index 99%
rename from vector/src/main/res/values-el/strings.xml
rename to library/ui-strings/src/main/res/values-el/strings.xml
index a7da13bdb3..f4973f4b95 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/library/ui-strings/src/main/res/values-el/strings.xml
@@ -92,7 +92,6 @@
     <string name="matrix_only_filter">Μόνο οι επαφές Matrix</string>
     <string name="no_result_placeholder">Δεν βρέθηκαν αποτελέσματα</string>
     <string name="rooms_header">Δωμάτια</string>
-    <string name="groups_header">Κοινότητες</string>
     <string name="send_bug_report_include_crash_logs">Αποστολή καταγραφών σφαλμάτων</string>
     <string name="send_bug_report">Αναφορά σφάλματος</string>
     <string name="send_bug_report_description_in_english">Εφόσον είναι δυνατό, παρακαλώ γράψτε την περιγραφή στα αγγλικά.</string>
@@ -173,7 +172,7 @@
     <string name="settings_theme">Θέμα</string>
     <string name="encryption_information_decryption_error">Σφάλμα αποκρυπτογράφησης</string>
     <string name="encryption_information_device_name">Όνομα συσκευής</string>
-    <string name="encryption_information_device_id">Αναγνωριστικό συσκευής</string>
+    <string name="device_manager_session_details_session_id">Αναγνωριστικό συσκευής</string>
     <string name="encryption_export_export">Εξαγωγή</string>
     <string name="encryption_import_import">Εισαγωγή</string>
     <string name="select_room_directory">Επιλέξτε ένα ευρετήριο δωματίων</string>
@@ -384,4 +383,4 @@
     <string name="location_share_external">Άνοιγμα με</string>
     <string name="tooltip_attachment_sticker">Αποστολή αυτοκόλλητου</string>
     <string name="notice_room_created">%1$s δημιούργησε το δωμάτιο</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-el/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-el/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-el/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-el/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-en-rGB/strings.xml b/library/ui-strings/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from vector/src/main/res/values-en-rGB/strings.xml
rename to library/ui-strings/src/main/res/values-en-rGB/strings.xml
diff --git a/vector/src/main/res/values-en-rGB/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-en-rGB/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-en-rGB/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-en-rGB/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-eo/strings.xml b/library/ui-strings/src/main/res/values-eo/strings.xml
similarity index 99%
rename from vector/src/main/res/values-eo/strings.xml
rename to library/ui-strings/src/main/res/values-eo/strings.xml
index 09361de4ea..f536ca00f9 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/library/ui-strings/src/main/res/values-eo/strings.xml
@@ -51,8 +51,6 @@
 \nEnportante ĉambrojn de invitoj</string>
     <string name="initial_sync_start_importing_account_left_rooms">Komenca spegulado:
 \nEnportante forlasitajn ĉambrojn</string>
-    <string name="initial_sync_start_importing_account_groups">Komenca spegulado:
-\nEnportante komunumojn</string>
     <string name="initial_sync_start_importing_account_data">Komenca spegulado:
 \nEnportante datumojn de konto</string>
     <string name="event_status_sending_message">Sendante mesaĝon…</string>
@@ -251,7 +249,6 @@
     <string name="direct_chats_header">Interparoloj</string>
     <string name="no_result_placeholder">Neniuj rezultoj</string>
     <string name="rooms_header">Ĉambroj</string>
-    <string name="groups_header">Komunumoj</string>
     <string name="send_bug_report_include_logs">Sendi protokolon</string>
     <string name="send_bug_report_include_crash_logs">Sendi protokolon pri fiasko</string>
     <string name="send_bug_report_include_screenshot">Sendi ekrankopion</string>
@@ -287,7 +284,6 @@
     <string name="auth_email_already_defined">Ĉi tiu retpoŝtadreso jam estas difinita.</string>
     <string name="auth_forgot_password">Ĉu vi forgesis pasvorton\?</string>
     <string name="auth_recaptcha_message">Ĉi tiu hejmservilo volas certiĝi, ke vi ne estas roboto</string>
-    <string name="auth_reset_password_missing_email">Necesas enigi la retpoŝtadreson ligitan al via konto.</string>
     <string name="auth_reset_password_error_unauthorized">Malsukcesis kontroli retpoŝtadreson: certiĝu, ke vi klakis la ligilon en la retletero</string>
     <string name="auth_accept_policies">Bonvolu tralegi kaj akcepti la politikojn de ĉi tiu hejmservilo:</string>
     <string name="compression_opt_list_original">Originala</string>
@@ -788,7 +784,6 @@
     <string name="fab_menu_create_chat">Individuaj ĉambroj</string>
     <string name="fab_menu_create_room">Ĉambroj</string>
     <string name="room_preview_no_preview">Ne eblas antaŭrigardi ĉi tiun ĉambron</string>
-    <string name="group_all_communities">Ĉiuj komunumoj</string>
     <string name="please_wait">Bonvolu atendi…</string>
     <string name="change_room_directory_network">Ŝanĝi reton</string>
     <string name="action_change">Ŝanĝi</string>
@@ -1089,7 +1084,7 @@
     <string name="encryption_export_room_keys">Elporti ŝlosilojn de ĉambroj</string>
     <string name="encryption_export_e2e_room_keys">Elporti tutvoje ĉifrajn ŝlosilojn de ĉambroj</string>
     <string name="encryption_information_device_key">Ŝlosilo de salutaĵo</string>
-    <string name="encryption_information_device_id">Identigilo de salutaĵo</string>
+    <string name="device_manager_session_details_session_id">Identigilo de salutaĵo</string>
     <string name="encryption_information_device_name">Publika nomo</string>
     <string name="encryption_information_decryption_error">Eraris malĉifrado</string>
     <string name="settings_theme">Haŭto</string>
diff --git a/vector/src/main/res/values-eo/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-eo/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-eo/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-eo/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/library/ui-strings/src/main/res/values-es-rMX/strings.xml
similarity index 98%
rename from vector/src/main/res/values-es-rMX/strings.xml
rename to library/ui-strings/src/main/res/values-es-rMX/strings.xml
index cdf7fa3e62..c82f9aff61 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/library/ui-strings/src/main/res/values-es-rMX/strings.xml
@@ -123,7 +123,6 @@
     <string name="auth_email_already_defined">Este correo electrónico ya está ocupado.</string>
     <string name="auth_forgot_password">¿Olvidaste tu contraseña?</string>
     <string name="auth_recaptcha_message">Este servidor quiere verificar que no seas robot</string>
-    <string name="auth_reset_password_missing_email">El correo electrónico de esta cuenta es requrido.</string>
     <string name="auth_reset_password_error_unauthorized">Falló la verificación de correo electrónico: asegúrese de haber hecho clic en el correo</string>
     <string name="login_error_invalid_home_server">Escribe un enlace válido</string>
     <string name="login_error_bad_json">JSON malformado</string>
@@ -250,7 +249,7 @@
     <string name="room_settings_unset_main_address">Desescojer como Dirección Principal</string>
     <string name="encryption_information_decryption_error">Error en descifrar</string>
     <string name="encryption_information_device_name">Nombre del dispositivo</string>
-    <string name="encryption_information_device_id">Identificación del dispositivo</string>
+    <string name="device_manager_session_details_session_id">Identificación del dispositivo</string>
     <string name="encryption_information_device_key">Clave del dispositivo</string>
     <string name="encryption_export_e2e_room_keys">Exportar claves de cifrado de extremo-a-extremo de salas</string>
     <string name="encryption_export_room_keys">Exportar claves de salas</string>
@@ -276,7 +275,6 @@
     <string name="directory_server_native_rooms">All native %s rooms</string>
     <string name="loading">Cargando…</string>
     <string name="action_download">Descargar</string>
-    <string name="groups_header">Comunidades</string>
     <string name="option_send_voice">Enviar audio</string>
     <string name="option_send_sticker">Enviar sticker</string>
     <string name="option_take_photo">Tomar foto</string>
@@ -327,4 +325,4 @@
     <string name="settings_call_ringtone_dialog_title">Elegir sonido de llamadas:</string>
     <string name="title_activity_keys_backup_setup">Copia de seguridad de la clave</string>
     <string name="title_activity_keys_backup_restore">Usar copia de seguridad de la clave</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-es-rMX/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-es-rMX/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-es-rMX/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-es-rMX/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-es/strings.xml b/library/ui-strings/src/main/res/values-es/strings.xml
similarity index 94%
rename from vector/src/main/res/values-es/strings.xml
rename to library/ui-strings/src/main/res/values-es/strings.xml
index 24909dce3b..e07c21d6a5 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/library/ui-strings/src/main/res/values-es/strings.xml
@@ -44,8 +44,6 @@
 \nImportando cuenta…</string>
     <string name="initial_sync_start_importing_account_rooms">Sincronización inicial:
 \nImportando salas</string>
-    <string name="initial_sync_start_importing_account_groups">Sincronización inicial:
-\nImportando comunidades</string>
     <string name="initial_sync_start_importing_account_data">Sincronización inicial:
 \nImportando datos de la cuenta</string>
     <string name="event_status_sending_message">Enviando mensaje…</string>
@@ -290,7 +288,6 @@
     <string name="auth_email_already_defined">Esta dirección de correo electrónico ya está definida.</string>
     <string name="auth_forgot_password">¿Olvidaste tu contraseña?</string>
     <string name="auth_recaptcha_message">Este Servidor Doméstico quiere asegurarse de que no eres un robot</string>
-    <string name="auth_reset_password_missing_email">Debes ingresar la dirección de correo electrónico vinculada a tu cuenta.</string>
     <string name="auth_reset_password_error_unauthorized">No se pudo verificar la dirección de correo electrónico: asegúrate de hacer clic en el enlace del correo electrónico</string>
     <string name="login_error_invalid_home_server">Por favor introduce una URL válida</string>
     <string name="login_error_bad_json">JSON mal formado</string>
@@ -418,7 +415,7 @@
     <string name="room_settings_unset_main_address">Dejar de Establecer como dirección principal</string>
     <string name="encryption_information_decryption_error">Error de descifrado</string>
     <string name="encryption_information_device_name">Nombre público</string>
-    <string name="encryption_information_device_id">ID de sesión</string>
+    <string name="device_manager_session_details_session_id">ID de sesión</string>
     <string name="encryption_information_device_key">Clave de sesión</string>
     <string name="encryption_export_e2e_room_keys">Exportar claves de salas con cifrado Extremo-a-Extremo</string>
     <string name="encryption_export_room_keys">Exportar claves de sala</string>
@@ -496,7 +493,6 @@
     <string name="notification_noisy">Ruidoso</string>
     <string name="encrypted_message">Mensaje cifrado</string>
     <string name="loading">Cargando…</string>
-    <string name="groups_header">Comunidades</string>
     <string name="start_voice_call_prompt_msg">¿Seguro que quieres iniciar una llamada de voz?</string>
     <string name="start_video_call_prompt_msg">¿Seguro que quieres iniciar una llamada de vídeo?</string>
     <string name="room_participants_ban_prompt_msg">Vetar un usuario lo echará de esta sala y evitará que se una nuevamente.</string>
@@ -871,7 +867,6 @@
     <string name="action_change">Cambiar</string>
     <string name="change_room_directory_network">Cambiar red</string>
     <string name="please_wait">Espere por favor…</string>
-    <string name="group_all_communities">Todas la comunidades</string>
     <string name="room_preview_no_preview">Esta sala no se puede previsualizar</string>
     <string name="fab_menu_create_room">Salas</string>
     <string name="fab_menu_create_chat">Chats</string>
@@ -2450,7 +2445,6 @@
     <string name="sent_live_location">Compartieron su localización en vivo</string>
     <string name="sent_location">Compartieron su localización</string>
     <string name="ftue_profile_picture_subtitle">Puedes cambiar esto en todo momento.</string>
-    <string name="ftue_display_name_subtitle">Esto se mostrará cuando mandes mensajes.</string>
     <string name="ftue_account_created_take_me_home">Llévame a casa</string>
     <string name="ftue_account_created_personalize">Personalizar perfil</string>
     <string name="ftue_auth_use_case_connect_to_server">Conectar a servidor</string>
@@ -2478,7 +2472,6 @@
     <string name="settings_show_latest_profile">Mostrar última información del usuario</string>
     <string name="a11y_presence_busy">Ocupado</string>
     <string name="live_location_bottom_sheet_last_updated_at">Actualizado hace %1$s</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Dejar de compartir</string>
     <string name="labs_enable_live_location_summary">Implementación temporal: las ubicaciones persisten en el historial de la sala</string>
     <string name="labs_enable_live_location">Activar compartir ubicación en tiempo real</string>
     <string name="location_share_live_remaining_time">Queda %1$s</string>
@@ -2525,4 +2518,159 @@
     <string name="settings_troubleshoot_test_endpoint_registration_success">El destino se ha registrado de forma satisfactoria al servidor doméstico.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Registración de punto final</string>
     <string name="action_next">Siguiente</string>
-</resources>
+    <string name="onboarding_new_app_layout_button_try">Pruébalo</string>
+    <string name="onboarding_new_app_layout_feedback_title">Danos tu opinión</string>
+    <string name="onboarding_new_app_layout_spaces_title">Acceder a espacios</string>
+    <string name="onboarding_new_app_layout_welcome_message">Para simplificar ${app_name}, las pestañas son opcionales. Gestiónalas usando el menú en la esquina superior derecha.</string>
+    <string name="onboarding_new_app_layout_welcome_title">¡Bienvenido a una nueva interfaz!</string>
+    <string name="home_empty_no_unreads_title">Nada que reportar.</string>
+    <string name="home_empty_no_rooms_title">Bienvenido a ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nparece un poco vacío.</string>
+    <string name="device_manager_inactive_sessions_title">Sesiones inactivas</string>
+    <string name="device_manager_unverified_sessions_description">Verifica o cierra sesión de sesiones sin verificar.</string>
+    <string name="device_manager_unverified_sessions_title">Sesiones sin verificar</string>
+    <string name="device_manager_header_section_security_recommendations_description">Mejora la seguridad de tu cuenta siguiendo estas recomendaciones.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Consejos de seguridad</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inactiva por %1$d+ día (%2$s)</item>
+        <item quantity="other">Inactiva por %1$d+ días (%2$s)</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_unverified">Sin verificar · Última actividad %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Verificada · Última actividad %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Ver todos (%1$d)</string>
+    <string name="device_manager_view_details">Ver detalles</string>
+    <string name="device_manager_verify_session">Verificar sesión</string>
+    <string name="device_manager_verification_status_unverified">Sesión sin verificar</string>
+    <string name="device_manager_verification_status_verified">Sesión verificada</string>
+    <string name="a11y_device_manager_device_type_unknown">Tipo de dispositivo desconocido</string>
+    <string name="a11y_device_manager_device_type_desktop">Escritorio</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Móvil</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Auto aprovar widgets de Element Call y dar permisos de cámara y micrófono</string>
+    <plurals name="room_removed_messages">
+        <item quantity="one">%d mensaje borrado</item>
+        <item quantity="other">%d mensajes borrados</item>
+    </plurals>
+    <string name="live_location_description">Ubicación en tiempo real</string>
+    <string name="live_location_share_location_item_share">Compartir ubicación</string>
+    <string name="live_location_not_enough_permission_dialog_description">Debes tener el permiso correspondiente para compartir ubicaciones en esta sala.</string>
+    <string name="live_location_not_enough_permission_dialog_title">No tienes permiso para compartir ubicaciones</string>
+    <string name="location_share_loading_map_error">No se pudo cargar el mapa
+\nEste servidor doméstico puede que no esté configurado para mostrar mapas.</string>
+    <string name="poll_undisclosed_not_ended">Los resultados podrán verse cuando la encuesta termine</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Compartir claves de sala para mensajes anteriores</string>
+    <string name="a11y_open_settings">Abrir ajustes</string>
+    <string name="send_your_first_msg_to_invite">Envía tu primer mensaje para invitar a %s</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Los mensajes en esta sala están encriptados de extremo a extremo.</string>
+    <string name="verify_invalid_qr_notice">Este código QR parece incorrecto. Por favor, intente verificar con otro método.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">No serás capaz de acceder al historial de mensajes encriptado. Restablece tu backup de mensajes seguro y las claves de verificación para empezar de cero.</string>
+    <string name="crosssigning_cannot_verify_this_session">No se ha podido verificar el dispositivo</string>
+    <string name="device_manager_sessions_other_description">Para más seguridad, verifica tus sesiones y cierra cualquiera que no reconozcas o hayas dejado de usar.</string>
+    <string name="device_manager_sessions_other_title">Otras sesiones</string>
+    <string name="settings_sessions_list">Sesiones</string>
+    <string name="permalink_unsupported_groups">No se puede abrir este enlace: las comunidades han sido reemplazadas por espacios</string>
+    <string name="ftue_auth_login_username_entry">Usuario / Email / Teléfono</string>
+    <string name="ftue_auth_captcha_title">¿Eres una persona\?</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Sigue las instrucciones enviadas a %s</string>
+    <string name="ftue_auth_password_reset_confirmation">Restablecer contraseña</string>
+    <string name="ftue_auth_forgot_password">Olvidé mi contraseña</string>
+    <string name="ftue_auth_email_resend_email">Volver a enviar correo</string>
+    <string name="ftue_auth_email_verification_footer">¿No recibiste ningún email\?</string>
+    <string name="ftue_auth_email_verification_subtitle">Sigue las instrucciones enviadas a %s</string>
+    <string name="ftue_auth_email_verification_title">Verifica tu email</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">Volver a enviar código</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">Código enviado a %s</string>
+    <string name="ftue_auth_phone_confirmation_title">Confirma tu número de teléfono</string>
+    <string name="ftue_auth_sign_out_all_devices">Cerrar sesión en todos los dispositivos</string>
+    <string name="ftue_auth_reset_password">Restablecer contraseña</string>
+    <string name="ftue_auth_new_password_subtitle">Asegúrate de que tiene al menos 8 caracteres.</string>
+    <string name="ftue_auth_new_password_title">Elige una nueva contraseña</string>
+    <string name="ftue_auth_new_password_entry_title">Nueva contraseña</string>
+    <string name="ftue_auth_reset_password_breaker_title">Comprueba tu email.</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s te enviará un enlace de verificación</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">Código de confirmación</string>
+    <string name="ftue_auth_phone_entry_title">Número de teléfono</string>
+    <string name="ftue_auth_phone_subtitle">%s necesita verificar tu cuenta</string>
+    <string name="ftue_auth_phone_title">Escribe tu número de teléfono</string>
+    <string name="ftue_auth_email_entry_title">Email</string>
+    <string name="ftue_auth_email_subtitle">%s necesita verificar tu cuenta</string>
+    <string name="ftue_auth_email_title">Introduce tu email</string>
+    <string name="ftue_auth_terms_subtitle">Por favor, lee las condiciones de uso de %s</string>
+    <string name="ftue_auth_terms_title">Políticas del servidor</string>
+    <string name="ftue_auth_choose_server_ems_cta">Ponte en contacto</string>
+    <string name="ftue_auth_choose_server_ems_title">¿Deseas hospedar tu propio servidor\?</string>
+    <string name="ftue_auth_choose_server_entry_hint">URL del servidor</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">¿Cuál es la dirección de tu servidor\?</string>
+    <string name="ftue_auth_choose_server_subtitle">¿Cuál es la dirección de tu servidor\? Será donde se guarden todos tus datos</string>
+    <string name="ftue_auth_choose_server_title">Selecciona un servidor</string>
+    <string name="ftue_auth_welcome_back_title">¡Hola de nuevo!</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Editar</string>
+    <string name="ftue_auth_create_account_sso_section_header">O</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Dónde se guardarán tus conversaciones</string>
+    <string name="ftue_auth_create_account_choose_server_header">Dónde se guardarán tus conversaciones</string>
+    <string name="ftue_auth_create_account_password_entry_footer">Debe tener al menos 8 caracteres</string>
+    <string name="ftue_auth_create_account_username_entry_footer">Otros pueden buscarte como %s</string>
+    <string name="ftue_auth_create_account_title">Crea tu cuenta</string>
+    <string name="a11y_open_spaces">Abrir lista de espacios</string>
+    <string name="a11y_create_message">Crear una nueva conversación o sala</string>
+    <string name="create_room_action_go">Ir</string>
+    <string name="updating_your_data">Actualizando tus datos…</string>
+    <string name="room_list_filter_people">Personas</string>
+    <string name="room_list_filter_favourites">Favoritos</string>
+    <string name="room_list_filter_unreads">Sin leer</string>
+    <string name="room_list_filter_all">Todo</string>
+    <string name="timeline_error_room_not_found">Lo sentimos, esta sala no se ha encontrado.
+\nPor favor, inténtelo de nuevo.%s</string>
+    <string name="font_size_use_system">Usar ajustes por defecto del sistema</string>
+    <string name="font_size_section_manually">Escoger manualmente</string>
+    <string name="font_size_section_auto">Tamaño automático de fuente</string>
+    <string name="font_size_title">Escoger tamaño de la fuente</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s y %2$d otro</item>
+        <item quantity="other">%1$s y %2$d otros</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s y %2$s</string>
+    <string name="auth_reset_password_error_unverified">Correo electrónico no verificado, comprueba tu bandeja de entrada</string>
+    <string name="invites_empty_message">Aquí es donde se encontrarán tus nuevas solicitudes e invitaciones.</string>
+    <string name="invites_empty_title">Nada nuevo.</string>
+    <string name="invites_title">Invitaciones</string>
+    <string name="space_list_empty_message">Los espacios son una nueva forma de agrupar salas y personas. Crea un espacio para empezar.</string>
+    <string name="space_list_empty_title">No hay espacios aún.</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Actividad</string>
+    <string name="home_layout_preferences_sort_by">Ordenar por</string>
+    <string name="home_layout_preferences_recents">Mostrar recientes</string>
+    <string name="home_layout_preferences_filters">Mostrar filtros</string>
+    <string name="home_layout_preferences">Ajustes de disposición</string>
+    <string name="explore_rooms">Explorar salas</string>
+    <string name="change_space">Cambiar espacio</string>
+    <string name="create_room">Crear sala</string>
+    <string name="start_chat">Iniciar conversación</string>
+    <string name="all_chats">Todas las conversaciones</string>
+    <string name="action_select_all">Seleccionar todo</string>
+    <string name="action_got_it">De acuerdo</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d seleccionado</item>
+        <item quantity="other">%1$d seleccionados</item>
+    </plurals>
+    <string name="settings_enable_direct_share_title">Habilitar compartición directa</string>
+    <string name="grant_permission">Otorgar permiso</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} necesita permiso para mostrar notificaciones.
+\nPor favor, otórgalo.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} necesita permisos para mostrar notificaciones. Las notificaciones pueden mostrar tus mensajes, invitaciones, etc.
+\n
+\nPor favor, permite el acceso en las siguientes ventanas emergentes para poder visualizar notificaciones.</string>
+    <string name="labs_enable_rich_text_editor_summary">Prueba el editor de texto enriquecido (pronto llegará la opción de texto sin formato plain text)</string>
+    <string name="labs_enable_rich_text_editor_title">Habilitar editor de texto enriquecido (rich text)</string>
+    <string name="labs_enable_deferred_dm_summary">Crear MD únicamente al primer mensaje</string>
+    <string name="labs_enable_new_app_layout_summary">Una versión simplificada de Element con pestañas opcionales</string>
+    <string name="labs_enable_new_app_layout_title">Habilitar nueva disposición</string>
+    <string name="action_stop">Sí, Parar</string>
+    <string name="action_deselect_all">Deseleccionar todo</string>
+    <string name="a11y_collapse_space_children">Ocultar los hijos de %s</string>
+    <string name="a11y_expand_space_children">Mostrar los hijos de %s</string>
+    <string name="notice_voice_broadcast_ended_by_you">Has finalizado una transmisión de voz.</string>
+    <string name="notice_voice_broadcast_ended">%1$s ha finalizado una transmisión de voz.</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-es/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-es/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-es/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-es/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-et/strings.xml b/library/ui-strings/src/main/res/values-et/strings.xml
similarity index 88%
rename from vector/src/main/res/values-et/strings.xml
rename to library/ui-strings/src/main/res/values-et/strings.xml
index 124ca1eae7..490145b5cc 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/library/ui-strings/src/main/res/values-et/strings.xml
@@ -52,8 +52,6 @@
 \nImpordin kutsutud jututubasid</string>
     <string name="initial_sync_start_importing_account_left_rooms">Esmane laadimine:
 \nImpordin lahkutud jututubasid</string>
-    <string name="initial_sync_start_importing_account_groups">Esmane laadimine:
-\nImpordin kogukondi</string>
     <string name="initial_sync_start_importing_account_data">Esmane laadimine:
 \nImpordin kontoandmeid</string>
     <string name="event_status_sending_message">Saadan sõnumit…</string>
@@ -295,7 +293,6 @@
     <string name="matrix_only_filter">Vaid need, kellel on Matrixi konto</string>
     <string name="no_result_placeholder">Tulemusi ei ole</string>
     <string name="rooms_header">Jututoad</string>
-    <string name="groups_header">Kogukonnad</string>
     <string name="send_bug_report_include_logs">Saada logikirjed</string>
     <string name="send_bug_report_include_crash_logs">Saada kokkujooksmise logikirjed</string>
     <string name="send_bug_report_include_screenshot">Saada ekraanipilt</string>
@@ -336,7 +333,6 @@
     <string name="auth_email_already_defined">Selline e-posti aadress on juba kasutusel.</string>
     <string name="auth_forgot_password">Kas unustasid oma salasõna\?</string>
     <string name="auth_recaptcha_message">See koduserver soovib olla kindel, et sa ei ole robot</string>
-    <string name="auth_reset_password_missing_email">Sinu kontoga seotud e-posti aadress peab olema sisestatud.</string>
     <string name="auth_reset_password_error_unauthorized">E-posti aadressi verifitseerimine ei õnnestunud. Palun kontrolli, et sa avasid kirjas leidunud lingi</string>
     <string name="auth_accept_policies">Palun loe läbi ja nõustu koduserveri kasutusjuhendiga:</string>
     <string name="login_error_invalid_home_server">Palun sisesta korrektne URL</string>
@@ -519,7 +515,6 @@
     <string name="action_change">Muuda</string>
     <string name="change_room_directory_network">Vaheta võrku</string>
     <string name="please_wait">Palun oota…</string>
-    <string name="group_all_communities">Kõik kogukonnad</string>
     <string name="room_preview_no_preview">Sellel jututoal puudub eelvaade</string>
     <string name="fab_menu_create_room">Jututoad</string>
     <string name="fab_menu_create_chat">Isiklikud sõnumid</string>
@@ -617,7 +612,7 @@
     <string name="room_settings_labs_warning_message">Need on alles katsejärgus olevad funktsionaalsused. Ole kasutamisel ettevaatlik.</string>
     <string name="encryption_information_decryption_error">Dekrüptimise viga</string>
     <string name="encryption_information_device_name">Avalik nimi</string>
-    <string name="encryption_information_device_id">Sessiooni tunnus</string>
+    <string name="device_manager_session_details_session_id">Sessiooni tunnus</string>
     <string name="encryption_information_device_key">Sessiooni võti</string>
     <string name="encryption_export_e2e_room_keys">Ekspordi jututubade läbiva krüptimise võtmed</string>
     <string name="encryption_export_room_keys">Ekspordi jututoa võtmed</string>
@@ -1083,7 +1078,7 @@
     <string name="unexpected_error">Ootamatu viga</string>
     <string name="keys_backup_setup_skip_title">Kas sa oled kindel\?</string>
     <string name="keys_backup_setup_skip_msg">Kui sa logid välja või kaotad seadme, siis sa ei saa enam lugeda oma krüptitud sõnumeid.</string>
-    <string name="keys_backup_restore_is_getting_backup_version">Laen varukoopia versiooni…</string>
+    <string name="keys_backup_restore_is_getting_backup_version">Laadin varukoopia versiooni…</string>
     <string name="keys_backup_restore_with_passphrase">Selleks, et krüptitud sõnumite ajalugu lukust lahti võtta, kasuta oma taastamiseks mõeldud paroolifraasi</string>
     <string name="keys_backup_restore_use_recovery_key">kasuta oma taastevõtit</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Kas sa ei tea oma taastamiseks mõeldud paroolifraasi\? Siis sa võid %s.</string>
@@ -1163,10 +1158,10 @@
     <string name="settings_push_rules">Tõuketeavituste reeglid</string>
     <string name="settings_push_rules_no_rules">Tõuketeavituste reegleid pole kirjeldatud</string>
     <string name="settings_push_gateway_no_pushers">Tõuketeavituste võrguväravaid pole registreeritud</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_id">Rakenduse ID:</string>
+    <string name="push_gateway_item_push_key">Tõuketeenuse võti:</string>
+    <string name="push_gateway_item_app_display_name">Rakenduse kuvatav nimi:</string>
+    <string name="push_gateway_item_device_name">Sessiooni nimi:</string>
     <string name="push_gateway_item_url">URL:</string>
     <string name="push_gateway_item_format">Vorming:</string>
     <string name="preference_voice_and_video">Heli ja video</string>
@@ -1202,8 +1197,8 @@
     <string name="settings_discovery_disconnect_identity_server_info">Isikutuvastusserveri kasutamise lõpetamine tähendab, et sa ei ole leitav teiste kasutajate poolt ega sulle ei saa telefoninumbri või e-posti aadressi alusel kutset saata. Küll aga saab kutset saata Matrix\'i kasutajatunnuse alusel.</string>
     <string name="settings_discovery_msisdn_title">Leitavad telefoninumbrid</string>
     <string name="labs_show_unread_notifications_as_tab">Lisa avaekraanile eraldi sakk lugemata teavituste jaoks.</string>
-    <string name="settings_discovery_confirm_mail">Saatsime kinnituskirja e-posti aadressile %s. Palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Saatsime kinnituskirja e-posti aadressile %s. Esmalt palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
+    <string name="settings_discovery_confirm_mail">Saatsime kirja e-posti aadressile %s. Palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Saatsime kirja e-posti aadressile %s. Esmalt palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
     <string name="settings_agree_to_terms">Selleks, et sind võiks leida e-posti aadressi või telefoninumbri alusel, nõustu isikutuvastusserveri (%s) kasutustingimustega.</string>
     <string name="labs_allow_extended_logging">Lülita sisse detailsete logide salvestamine.</string>
     <string name="no_ignored_users">Sa parasjagu ei eira ühtegi kasutajat</string>
@@ -1341,7 +1336,7 @@
     <string name="disconnect_identity_server_dialog_content">Kas katkestame ühenduse isikutuvastusserveriga %s\?</string>
     <string name="identity_server_error_no_identity_server_configured">Palun esmalt seadista isikutuvastusserver.</string>
     <string name="identity_server_error_terms_not_signed">Palun esmalt nõustu seadistustes isikutuvastusserveri kasutustingimustega.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Sinu privaatsuse nimel saadab ${app_name} e-posti aadressid ja telefoninumbrid serverisse vaid räsituna.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Sinu privaatsuse nimel saadab ${app_name} e-posti aadressid ja telefoninumbrid serverisse vaid räsidena.</string>
     <string name="identity_server_error_binding_error">Seoste loomine ei õnnestunud.</string>
     <string name="identity_server_error_no_current_binding_error">Selle tunnusega ei ole hetkel ühtegi seost.</string>
     <string name="identity_server_set_default_notice">Sinu koduserver (%1$s) soovitab kasutada sinu isikutuvastusserverina %2$s teenust</string>
@@ -1384,7 +1379,7 @@
     <string name="disclaimer_negative_button">Selge lugu</string>
     <string name="disclaimer_positive_button">Vaata lisateavet</string>
     <string name="save_recovery_key_chooser_hint">Salvesta taastevõti järgnevalt</string>
-    <string name="loading_contact_book">Laen sinu kontaktide loendit…</string>
+    <string name="loading_contact_book">Laadin sinu kontaktide loendit…</string>
     <string name="empty_contact_book">Sinu kontaktide loend on tühi</string>
     <string name="contacts_book_title">Sinu kontaktide loend</string>
     <string name="three_pid_revoke_invite_dialog_title">Tühista kutse</string>
@@ -1783,7 +1778,7 @@
     <string name="not_a_valid_qr_code">See ei ole korralik Matrix\'i QR-kood</string>
     <string name="settings_discovery_consent_action_give_consent">Nõustu</string>
     <string name="settings_discovery_consent_action_revoke">Tühista minu nõusolek</string>
-    <string name="settings_discovery_consent_notice_on">Selleks, et leida Matrixikasutajaid oma kontaktide hulgast, oled sa andnud nõusoleku saata e-posti aadresse ja telefoninumbreid sellele isikutuvastusserverile.</string>
+    <string name="settings_discovery_consent_notice_on">Selleks, et leida Matrixikasutajaid oma kontaktide hulgast, oled sa andnud nõusoleku e-posti aadresside ja telefoninumbrite saatmiseks sellele isikutuvastusserverile.</string>
     <string name="settings_discovery_consent_title">Saada e-posti aadresse ja telefoninumbreid</string>
     <string name="direct_room_user_list_suggestions_title">Soovitused</string>
     <string name="direct_room_user_list_known_title">Tuttavad kasutajad</string>
@@ -2216,7 +2211,7 @@
     <string name="room_settings_space_access_title">Ligipääs siia kogukonda</string>
     <string name="room_settings_access_rules_pref_dialog_title">Kes pääsevad ligi siia jututuppa\?</string>
     <string name="settings_notification_emails_enable_for_email">Saada teavitusi %s e-posti aadressile</string>
-    <string name="settings_notification_emails_no_emails">Kui soovi e-posti teel saada teavitusi, siis palun seosta oma e-posti aadress oma Matrix\'i kasutajakontoga</string>
+    <string name="settings_notification_emails_no_emails">Kui soovid e-posti teel saada teavitusi, siis palun seosta oma e-posti aadress oma Matrix\'i kasutajakontoga</string>
     <string name="settings_notification_emails_category">E-posti teel saadetavad teavitused</string>
     <string name="room_permissions_upgrade_the_space">Uuenda kogukonda</string>
     <string name="room_permissions_change_space_name">Muuda kogukonna nime</string>
@@ -2432,7 +2427,6 @@
     <string name="ftue_profile_picture_title">Lisa profiilipilt</string>
     <string name="ftue_display_name_entry_footer">Sa võid seda hiljem muuta</string>
     <string name="ftue_display_name_entry_title">Kuvatav nimi</string>
-    <string name="ftue_display_name_subtitle">Seda näidatakse sõnumite saatmisel.</string>
     <string name="ftue_display_name_title">Vali kuvatav nimi</string>
     <string name="ftue_account_created_subtitle">Sinu kasutajakonto %s on nüüd olemas</string>
     <string name="ftue_account_created_congratulations_title">Õnnitlused!</string>
@@ -2482,7 +2476,6 @@
     <string name="a11y_presence_busy">Hõivatud</string>
     <string name="keys_backup_settings_signature_from_this_user">Varukoopial on kehtiv allkiri sellelt kasutajalt.</string>
     <string name="live_location_bottom_sheet_last_updated_at">Uuendamise välp: %1$s</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Lõpeta asukoha jagamine</string>
     <string name="labs_enable_live_location_summary">Tegemist on ajutise ja esialgse lahendusega: asukohad on jututoa ajaloos näha</string>
     <string name="labs_enable_live_location">Luba asukohta jagada reaalajas</string>
     <string name="location_share_live_remaining_time">Jäänud on %1$s</string>
@@ -2594,4 +2587,298 @@
     </plurals>
     <string name="search_space_two_parents">%1$s ja %2$s</string>
     <string name="auth_reset_password_error_unverified">E-posti aadress on kinnitamata, palun vaata oma saabunud e-kirju</string>
+    <string name="location_share_loading_map_error">Kaardi laadimine ei õnnestu.
+\nSee koduserver ei pruugi olla seadistatud kuvama kaarte.</string>
+    <string name="a11y_open_settings">Ava seadistused</string>
+    <string name="all_chats">Kõik vestlused</string>
+    <string name="device_manager_sessions_other_description">Parima turvalisuse nimel verifitseeri kõik oma sessioonid ning logi välja neist, mida sa enam ei kasuta.</string>
+    <string name="device_manager_sessions_other_title">Muud sessioonid</string>
+    <string name="settings_sessions_list">Sessioonid</string>
+    <string name="a11y_open_spaces">Ava kogukondade loend</string>
+    <string name="a11y_create_message">Alusta uut vestlust või loo uus jututuba</string>
+    <string name="room_list_filter_people">Inimesed</string>
+    <string name="room_list_filter_favourites">Lemmikud</string>
+    <string name="room_list_filter_unreads">Lugemata</string>
+    <string name="room_list_filter_all">Kõik</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Aktiivsuse alusel</string>
+    <string name="home_layout_preferences_sort_by">Järjestamisviis</string>
+    <string name="home_layout_preferences_recents">Näita hiljutisi sõnumeid</string>
+    <string name="home_layout_preferences_filters">Näita otsinguvalikuid</string>
+    <string name="home_layout_preferences">Paigutuse seadistused</string>
+    <string name="explore_rooms">Tutvu jututubadega</string>
+    <string name="create_room">Loo jututuba</string>
+    <string name="start_chat">Alusta vestlust</string>
+    <string name="device_manager_other_sessions_description_unverified">Verifitseerimata · Viimati kasutusel %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Verifitseeritud · Viimati kasutusel %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Näita kõiki (%1$d)</string>
+    <string name="device_manager_view_details">Vaata lisateavet</string>
+    <string name="device_manager_verify_session">Verifitseeri sessioon</string>
+    <string name="device_manager_verification_status_unverified">Verifitseerimata sessioon</string>
+    <string name="device_manager_verification_status_verified">Verifitseeritud sessioon</string>
+    <string name="a11y_device_manager_device_type_unknown">Tundmatu seadme tüüp</string>
+    <string name="a11y_device_manager_device_type_desktop">Töölauarakendus</string>
+    <string name="a11y_device_manager_device_type_web">Veebiliides</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobiiltelefon</string>
+    <string name="timeline_error_room_not_found">Vabandust, aga seda jututuba ei õnnestu leida.
+\nPalun proovi hiljem uuesti.%s</string>
+    <string name="invites_title">Kutsed</string>
+    <string name="invites_empty_title">Uut teavet ei leidu.</string>
+    <string name="space_list_empty_message">Kogukonnad on viis jututubade ja inimeste ühendamiseks. Alustamiseks võid luua uue kogukonna.</string>
+    <string name="space_list_empty_title">Siin veel pole kogukondi.</string>
+    <string name="change_space">Vaheta kogukonda</string>
+    <string name="onboarding_new_app_layout_button_try">Proovi nüüd</string>
+    <string name="onboarding_new_app_layout_feedback_message">Tagasiside valikute nägemiseks klõpsi ülal paremal.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Jaga tagasisidet</string>
+    <string name="onboarding_new_app_layout_spaces_message">Kogukonnad leiad alt paremalt kiiremini ja lihtsamini, kui varem.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Ligipääs kogukondadele</string>
+    <string name="onboarding_new_app_layout_welcome_message">Et ${app_name}\'i kasutamine oleks lihtsam, siis kaardid on nüüd valikulised. Neid saad hallata ülal paremal avanevast menüüst.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Meie liidesel on nüüd uus vaade!</string>
+    <string name="home_empty_no_unreads_message">Kui sul on lugemata sõnumeid, siis nad on siit leitavad.</string>
+    <string name="home_empty_no_unreads_title">Hetkel siin polegi midagi põnevat.</string>
+    <string name="home_empty_no_rooms_message">Paljude võimalustega turvaline suhtlusrakendus sõprade, kogukondade ja tiimide jaoks. Alustamiseks loo mõni uus vestlus või liitu olemasoleva jututoaga.</string>
+    <string name="home_empty_no_rooms_title">%s,
+\ntere tulemast ${app_name} kasutajaks.</string>
+    <string name="home_empty_space_no_rooms_message">Kogukonnad on võimalus jututubade ja inimeste ühendamiseks. Kasutades all paremal olevat nuppu lisa mõni olemasolev jututuba või loo uus.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\ntundub olema tühjavõitu.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Logi välja sellisest vanast sessioonist (vanem kui %1$d päev), mida sa enam ei kasuta.</item>
+        <item quantity="other">Logi välja sellistest vanadest sessioonidest (vanemad kui %1$d päeva), mida sa enam ei kasuta.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Mitteaktiivsed sessioonid</string>
+    <string name="device_manager_unverified_sessions_description">Logi verifitseerimata sessioonidest välja või verifitseeri nad.</string>
+    <string name="device_manager_unverified_sessions_title">Verifitseerimata sessioonid</string>
+    <string name="device_manager_header_section_security_recommendations_description">Kui järgid neid soovitusi, siis sa parandad oma kasutajakonto turvalisust.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Turvalisusega seotud soovitused</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Pole olnud kasutusel %1$d+ päeva (%2$s)</item>
+        <item quantity="other">Pole olnud kasutusel %1$d+ päeva (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Siin saavad olema sinu tulevased päringud ja kutsed.</string>
+    <string name="a11y_collapse_space_children">Ahenda %s alamkogukonnad</string>
+    <string name="a11y_expand_space_children">Näita %s alamkogukondi</string>
+    <string name="device_manager_session_details_device_ip_address">IP-aadress</string>
+    <string name="device_manager_session_details_session_last_activity">Viimati kasutusel</string>
+    <string name="device_manager_session_details_session_name">Sessiooni nimi</string>
+    <string name="device_manager_session_details_description">Rakendus, seade ja kasutamise teave.</string>
+    <string name="device_manager_session_details_title">Sessiooni teave</string>
+    <string name="device_manager_other_sessions_clear_filter">Eemalda filter</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Ei leidu sessioone, mis pole aktiivses kasutuses.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Verifitseerimata sessioone ei leidu.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Verifitseeritud sessioone ei leidu.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Kaalu vanadest ja kasutamata sessioonidest väljalogimist (vanemad kui %1$d või enam päeva).</item>
+        <item quantity="other">Kaalu vanadest ja kasutamata sessioonidest väljalogimist (vanemad kui %1$d või enam päeva).</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Pole pidevas kasutuses</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Turvalise sõnumvahetuse nimel verifitseeri kõik oma sessioonid ning logi neist välja, mida sa enam ei kasuta või ei tunne enam ära.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Verifitseerimata</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Parima turvalisuse nimel logi välja neist sessioonidest, mida sa enam ei kasuta või ei tunne ära.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Verifitseeritud</string>
+    <string name="a11y_device_manager_filter">Filtreeri</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Pole olnud kasutusel %1$d või enam päeva</item>
+        <item quantity="other">Pole olnud kasutusel %1$d või enam päeva</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Pole pidevas kasutuses</string>
+    <string name="device_manager_filter_option_unverified_description">Pole valmis turvaliseks sõnumivahetuseks</string>
+    <string name="device_manager_filter_option_unverified">Verifitseerimata</string>
+    <string name="device_manager_filter_option_verified_description">Valmis turvaliseks sõnumivahetuseks</string>
+    <string name="device_manager_filter_option_verified">Verifitseeritud</string>
+    <string name="device_manager_filter_option_all_sessions">Kõik sessioonid</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filtreeri</string>
+    <string name="device_manager_session_last_activity">Viimati kasutusel %1$s</string>
+    <string name="device_manager_device_title">Seade</string>
+    <string name="device_manager_session_title">Sessioon</string>
+    <string name="device_manager_current_session_title">Praegune sessioon</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Parima turvalisuse ja töökindluse nimel verifitseeri see sessioon või logi ta võrgust välja.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Turvalise sõnumivahetuse nimel palun verifitseeri oma praegune sessioon.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">See sessioon on valmis turvaliseks sõnumivahetuseks.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Sinu praegune sessioon on valmis turvaliseks sõnumivahetuseks.</string>
+    <string name="labs_enable_deferred_dm_summary">Alusta otsevestlust esimese sõnumiga</string>
+    <string name="labs_enable_deferred_dm_title">Võta kasutusele viivitusega otsevestlused</string>
+    <string name="labs_enable_new_app_layout_summary">Lihtsustatud Element valikuliste kaartidega</string>
+    <string name="labs_enable_new_app_layout_title">Võta kasutusele rakenduse uus välimus</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Sa oled rakenduse turvaseadistustes määranud, et krüptimine kehtib vaid verifitseeritud sessioonidele.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Selles jututoas on verifitseerimata seadmeid, mis ei saa sinu saadetud sõnumeid dekrüptida.</string>
+    <string name="device_manager_learn_more_session_rename">Teised osapooled nii otsesõnumites kui jututubades näevad sinu kõikide sessioonide loendit.
+\n
+\nSee tähendab, et nad võivad uskuda, et tegemist on tõesti sinuga. Samal ajal näevad ka siin sisestatud sessiooninime.</string>
+    <string name="device_manager_learn_more_session_rename_title">Sessioonide nimede muutmine</string>
+    <string name="device_manager_learn_more_sessions_verified">Verifitseeritud sessioonid on sellised, kuhu sa oled oma kasutajanime ja salasõnaga sisse loginud ning mille puhul oled risttunnustamise läbi teinud või paroolifraasi abil ta turvaliseks märkinud.
+\n
+\nSee tähendab, et nendes sessioonides on olemas sinu varasemate sõnumite krüptovõtmed ja teistele osapooltele on nad tuvastatavad nii, et tegemist on tõesti sinuga.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Verifitseeritud sessioonid</string>
+    <string name="device_manager_learn_more_sessions_unverified">Verifitseerimata sessioonid on sellised, kuhu sa oled oma kasutajanime ja salasõnaga sisse loginud, kuid mille puhul on risttunnustamine tegemata.
+\n
+\nPalun kontrolli, et need on sulle teadaolevad sessioonid. Vastasel korral võib olla tegemist sinu kasutajakonto lubamatu kasutamisega.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Verifitseerimata sessioonid</string>
+    <string name="device_manager_learn_more_sessions_inactive">Sessioonid, mida sa pole mõnda aega kasutanud, saavad jätkuvalt pärida sinu krüptovõtmeid.
+\n
+\nSelliste sessioonide eemaldamine parandab jõudlust ja turvalisust ning sul on lihtsam märgata, kui loendisse tekib midagi kahtlast.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Mitteaktiivsed sessioonid</string>
+    <string name="device_manager_session_rename_warning">Palun arvesta, et sessioonide nimed on näha ka kõikidele osapooltele, kellega sa suhtled.</string>
+    <string name="device_manager_session_rename_description">Sinu enda kirjutatud sessiooninimede alusel on sul oma seadmeid lihtsam ära tunda.</string>
+    <string name="device_manager_session_rename_edit_hint">Sessiooni nimi</string>
+    <string name="device_manager_session_rename">Muuda sessiooni nime</string>
+    <string name="device_manager_session_overview_signout">Logi sellest sessioonist välja</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Verifitseerimata · Sinu praegune sessioon</string>
+    <string name="tooltip_attachment_voice_broadcast">Alusta ringhäälingukõnet</string>
+    <string name="key_authenticity_not_guaranteed">Selle krüptitud sõnumi autentsus pole selles seadmes tagatud.</string>
+    <string name="settings_security_incognito_keyboard_summary">Väldi sisetuste ja muude isikustatud andmete edastamist väljaspoole seda rakendust. Palun arvesta, et kõik klaviatuurirakendused ei pruugi seda seadistust tunnistada.</string>
+    <string name="settings_security_incognito_keyboard_title">Privaatne klahvistik</string>
+    <string name="command_description_table_flip">Lisab vormindamata sõnumi ette (╯°□°）╯︵ ┻━┻</string>
+    <string name="attachment_type_voice_broadcast">Ringhäälingukõne</string>
+    <string name="command_description_devtools">Ava arendaja töövahendite vaade</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Ära iialgi saada selles jututoas krüptitud sõnumeid verifitseerimata sessioonidesse.</string>
+    <string name="action_got_it">Selge lugu</string>
+    <string name="labs_enable_rich_text_editor_summary">Proovi vormindatud teksti alusel töötavat tekstitoimetit (varsti lisandub ka vormindamata teksti režiim)</string>
+    <string name="labs_enable_rich_text_editor_title">Võta kasutusele vormindatud teksti pruukiv tekstitoimeti</string>
+    <string name="qr_code_login_header_connected_description">Vaata seadet, kus sa oled Matrix\'i võtku loginud - seal peaks nüüd kuvatama QR-koodi. Kinnita, et allpool toodud QR-kood on sama kui tolles seadmes kuvatav kood:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Sa võid seda seadet kasutada nutiseadme või veebirakenduse sisselogimiseks QR-koodi alusel. Sa saad seda teha kahel moel:</string>
+    <string name="rich_text_editor_format_underline">Kasuta allajoonitud kirja</string>
+    <string name="rich_text_editor_format_strikethrough">Kasuta läbijoonitud kirja</string>
+    <string name="rich_text_editor_format_italic">Kasuta kaldkirja</string>
+    <string name="rich_text_editor_format_bold">Kasuta paksu kirja</string>
+    <string name="qr_code_login_confirm_security_code_description">Palun vaata, et sa kindlasti tead, kust see QR-kood kuvatakse. Sellisel viisil seadmete sidumisel sa annad oma kasutajakontole täiemahulise ligipääsu.</string>
+    <string name="qr_code_login_confirm_security_code">Kinnita</string>
+    <string name="qr_code_login_try_again">Proovi uuesti</string>
+    <string name="qr_code_login_status_no_match">Ei klapi\?</string>
+    <string name="qr_code_login_signing_in">Logime sind võrku</string>
+    <string name="qr_code_login_connecting_to_device">Loon ühendust seadmega</string>
+    <string name="qr_code_login_scan_qr_code_button">Loe QR-koodi</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Kas logid sisse nutiseadmest\?</string>
+    <string name="qr_code_login_show_qr_code_button">Näita selles seadmes QR-koodi</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Vali „Loe QR-koodi“</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Alusta sisselogimisvaatest</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Vali „Logi võrku QR-koodi abil“</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Alusta sisselogimisvaatest</string>
+    <string name="qr_code_login_new_device_instruction_3">Vali „Näita QR-koodi“</string>
+    <string name="qr_code_login_new_device_instruction_2">Ava Seadistused -&gt; Turvalisus ja privaatsus</string>
+    <string name="qr_code_login_new_device_instruction_1">Ava sama rakendus oma teises seades</string>
+    <string name="qr_code_login_header_failed_denied_description">Teine seade lükkas päringu tagasi.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Sidumine ei lõppenud etteantud aja jooksul.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Sidumine selle seadmega ei ole toetatud.</string>
+    <string name="qr_code_login_header_failed_title">Seoste loomine ei õnnestunud</string>
+    <string name="qr_code_login_header_connected_title">Turvaline ühendus on olemas</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Loe QR-koodi seadmega, kus sa oled Matrix\'i võrgust välja loginud.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Järgneva QR-koodi skaneerimiseks kasuta seadet, kus sa oled Matrix\'i võrku loginud:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Logi sisse QR-koodi abil</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Kasuta selle seadme kaamerat ja logi sisse teises seadmes kuvatud QR-koodi alusel:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Loe QR-koodi</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="labs_enable_client_info_recording_summary">Sessioonide paremaks tuvastamiseks saad nüüd sessioonihalduris salvestada klientrakenduse nime, versiooni ja aadressi.</string>
+    <string name="labs_enable_client_info_recording_title">Luba klientrakenduse teabe salvestamine</string>
+    <string name="labs_enable_session_manager_summary">Sellega saad parema ülevaate oma sessioonidest ja võimaluse neid mugavasti hallata.</string>
+    <string name="labs_enable_session_manager_title">Kasuta uut sessioonihaldurit</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Logi sisse QR-koodi abil</string>
+    <string name="device_manager_session_details_device_operating_system">Operatsioonisüsteem</string>
+    <string name="device_manager_session_details_device_model">Mudel</string>
+    <string name="device_manager_session_details_device_browser">Brauser</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versioon</string>
+    <string name="device_manager_session_details_application_name">Nimi</string>
+    <string name="device_manager_session_details_application">Rakendus</string>
+    <string name="device_manager_push_notifications_description">Luba selles sessioonis tõuketeavitused.</string>
+    <string name="device_manager_push_notifications_title">Tõuketeavitused</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Selle sessiooni olekut ei saa tuvastada enne kui oled ta verifitseerinud.</string>
+    <string name="device_manager_verification_status_unknown">Verifitseerimise olek on määratlemata</string>
+    <string name="login_scan_qr_code">Loe QR-koodi</string>
+    <string name="push_gateway_item_enabled">Kasutusel:</string>
+    <string name="push_gateway_item_device_id">Sessiooni tunnus:</string>
+    <string name="error_check_network">Midagi läks nüüd sassi. Palun kontrolli oma seadme võrguühendust ja proovi uuesti.</string>
+    <string name="grant_permission">Anna õigused</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} vajab teavituste näitamiseks õigusi.
+\nPalun luba vastavad õigused.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} vajab teavituste näitamiseks õigusi. Teavituste sisuks võivad olla sulle saadetud sõnumid, kutsed ja muud olulist.
+\n
+\nJärgmistes vaadetes palun anna sellele rakendusele teavituste kuvamiseks vajalikud õigused.</string>
+    <string name="labs_enable_voice_broadcast_summary">Võimalus salvestada ja postitada ringhäälingukõnesid jututoa ajajoonele.</string>
+    <string name="labs_enable_voice_broadcast_title">Võta kasutusele ringhäälingukõned</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Koduserver ei toeta muude seadmete võrku logimise võimalust.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Sisselogimine katkestati teises seadmes.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">See QR-kood on vigane.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Teine seade peab olema võrku loginud.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Teine seade on juba võrku loginud.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Turvalise sõnumivahetuse ülesseadmisel tekkis turvaviga. Üks kolmest võib olla sattunud vale osapoole kontrolli alla: sinu koduserver, sinu internetiühendus või sinu seade;</string>
+    <string name="qr_code_login_header_failed_other_description">Päring ei õnnestunud.</string>
+    <string name="a11y_voice_broadcast_buffering">Andmed on puhverdamisel…</string>
+    <string name="a11y_play_voice_broadcast">Alusta või jätka ringhäälingukõne esitamist</string>
+    <string name="a11y_stop_voice_broadcast_record">Lõpeta ringhäälingukõne salvestamine</string>
+    <string name="a11y_pause_voice_broadcast_record">Peata ringhäälingukõne salvestamine</string>
+    <string name="a11y_resume_voice_broadcast_record">Jätka ringhäälingukõne salvestamist</string>
+    <string name="a11y_pause_voice_broadcast">Peata ringhäälingukõne esitamine</string>
+    <string name="voice_broadcast_live">Otse eetris</string>
+    <string name="device_manager_other_sessions_select">Vali sessioonid</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Kaamera</string>
+    <string name="attachment_type_selector_location">Asukoht</string>
+    <string name="attachment_type_selector_poll">Küsitlused</string>
+    <string name="attachment_type_selector_voice_broadcast">Ringhäälingukõne</string>
+    <string name="attachment_type_selector_file">Manused</string>
+    <string name="attachment_type_selector_sticker">Kleepsud</string>
+    <string name="attachment_type_selector_gallery">Fotode kogu</string>
+    <string name="action_deselect_all">Eemalda kõik valikud</string>
+    <string name="action_select_all">Vali kõik</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d valitud</item>
+        <item quantity="other">%1$d valitud</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">Lülita täisekraanivaade sisse/välja</string>
+    <string name="attachment_type_selector_text_formatting">Tekstivorming</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Sa juba salvestad ringhäälingukõnet. Uue alustamiseks palun lõpeta eelmine salvestus.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Keegi juba salvestab ringhäälingukõnet. Uue ringhäälingukõne salvestamiseks palun oota, kuni see teine ringhäälingukõne on lõppenud.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Sul pole piisavalt õigusi selles jututoas ringhäälingukõne algatamiseks. Õiguste lisamiseks palun võta ühendust jututoa haldajaga.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Uue ringhäälingukõne alustamine pole võimalik</string>
+    <string name="a11y_voice_broadcast_fast_backward">Keri tagasi 30 sekundi kaupa</string>
+    <string name="a11y_voice_broadcast_fast_forward">Keri edasi 30 sekundi kaupa</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Verifitseeritud sessioonideks loetakse Element\'is või mõnes muus Matrix\'i rakenduses selliseid sessioone, kus sa kas oled sisestanud oma salafraasi või tuvastanud end mõne teise oma verifitseeritud sessiooni abil.
+\n
+\nSee tähendab, et selles sessioonis on ka kõik vajalikud võtmed krüptitud sõnumite lugemiseks ja teistele kasutajatele kinnitamiseks, et sa usaldad seda sessiooni.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Logi välja %1$d\'st sessioonist</item>
+        <item quantity="other">Logi välja %1$d\'st sessioonist</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Logi välja</string>
+    <string name="voice_broadcast_recording_time_left">jäänud %1$s</string>
+    <string name="editing">Muudan sõnumit</string>
+    <string name="replying_to">Vastan sõnumile %s</string>
+    <string name="quoting">Tsiteerides</string>
+    <string name="device_manager_other_sessions_show_ip_address">Näita IP-aadressi</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Peida IP-aadress</string>
+    <string name="message_reply_to_prefix">Vastuseks kasutajale</string>
+    <string name="message_reply_to_sender_sent_file">saatis faili.</string>
+    <string name="message_reply_to_sender_sent_audio_file">saatis helifaili.</string>
+    <string name="message_reply_to_sender_sent_voice_message">saatis häälsõnumi.</string>
+    <string name="message_reply_to_sender_sent_image">saatis pildi.</string>
+    <string name="message_reply_to_sender_sent_video">saatis video.</string>
+    <string name="message_reply_to_sender_sent_sticker">saatis kleepsu.</string>
+    <string name="message_reply_to_sender_created_poll">koostas küsitluse.</string>
+    <string name="settings_enable_direct_share_title">Kasuta otsejagamist</string>
+    <string name="settings_enable_direct_share_summary">Näita viimaseid vestlusi süsteemses jagamisvaates</string>
+    <string name="review_unverified_sessions_description">Tagamaks, et su konto on sinu kontrolli all, vaata andmed üle</string>
+    <string name="review_unverified_sessions_title">Sul on verifitseerimata sessioone</string>
+    <string name="settings_nightly_build">Igaöine arendusversioon</string>
+    <string name="settings_nightly_build_update">Kasuta viimast arendusversiooni (aga võib tekkida erinevaid vigu, sealhulgas sisselogimisega)</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Seda sessiooni ei saa verifitseerida, sest seal puudub krüptimise tugi.</string>
+    <string name="device_manager_signout_all_other_sessions">Logi välja kõikidest oma muudest sessioonidest</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Seda sessiooni ei saa verifitseerida, sest seal puudub krüptimise tugi.
+\n
+\nSelle sessiooniga ei saa sa osaleda krüptitud jututubades.
+\n
+\nParima turvalisuse ja privaatsuse nimel palun kasuta selliseid Matrix\'i kliente, mis toetavad krüptimist.</string>
+    <string name="voice_broadcast_live_broadcast">Ringhäälingukõne on eetris</string>
+    <string name="notice_voice_broadcast_ended_by_you">Sa lõpetasid ringhäälingukõne.</string>
+    <string name="notice_voice_broadcast_ended">%1$s lõpetas ringhäälingukõne.</string>
+    <string name="stop_voice_broadcast_content">Kas sa oled kindel, et soovid otseeetri lõpetada\? Sellega ringhäälingukõne salvestamine lõppeb ja salvestis on kättesaadav kõigile jututoas.</string>
+    <string name="stop_voice_broadcast_dialog_title">Kas lõpetame otseeetri\?</string>
+    <string name="action_stop">Jah, lõpetame</string>
+    <string name="rich_text_editor_link">Seadista linki</string>
+    <string name="set_link_text">Tekst</string>
+    <string name="set_link_link">Link</string>
+    <string name="set_link_create">Loo link</string>
+    <string name="set_link_edit">Muuda linki</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-et/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-et/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-et/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-et/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-eu/strings.xml b/library/ui-strings/src/main/res/values-eu/strings.xml
similarity index 99%
rename from vector/src/main/res/values-eu/strings.xml
rename to library/ui-strings/src/main/res/values-eu/strings.xml
index f1465684e2..f1f834ee04 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/library/ui-strings/src/main/res/values-eu/strings.xml
@@ -67,8 +67,6 @@
 \nGonbidatutako gelak inportatzen</string>
     <string name="initial_sync_start_importing_account_left_rooms">Hasierako sinkronizazioa:
 \nUtzitako gelak inportatzen</string>
-    <string name="initial_sync_start_importing_account_groups">Hasierako sinkronizazioa:
-\nKomunitateak inportatzen</string>
     <string name="initial_sync_start_importing_account_data">Hasierako sinkronizazioa:
 \nKontuaren datuak inportatzen</string>
 
@@ -194,7 +192,6 @@
     <string name="auth_forgot_password">Pasahitza ahaztuta\?</string>
 
     <string name="auth_recaptcha_message">Hasiera zerbitzari honek robot bat ez zarela egiaztatu nahi du</string>
-    <string name="auth_reset_password_missing_email">Zure kontura gehitutako e-mail helbidea sartu behar da.</string>
     <string name="auth_reset_password_error_unauthorized">Huts egin du e-mail helbidearen egiaztaketak, egin klik e-mailean zetorren estekan</string>
 
     <string name="login_error_invalid_home_server">Sartu baliozko URL bat</string>
@@ -409,7 +406,7 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="encryption_information_decryption_error">Deszifratze errorea</string>
 
     <string name="encryption_information_device_name">Izen publikoa</string>
-    <string name="encryption_information_device_id">IDa</string>
+    <string name="device_manager_session_details_session_id">IDa</string>
     <string name="encryption_information_device_key">Saioaren gakoa</string>
 
     <string name="encryption_export_e2e_room_keys">Esportatu E2E geletako gakoak</string>
@@ -504,11 +501,6 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="call">Deia</string>
 
     <string name="loading">Kargatzen…</string>
-
-
-
-    <string name="groups_header">Komunitateak</string>
-
     <string name="start_voice_call_prompt_msg">Ziur ahots-dei bat hasi nahi duzula?</string>
     <string name="start_video_call_prompt_msg">Ziur bideo-dei bat hasi nahi duzula?</string>
 
@@ -1045,8 +1037,6 @@ Errore hau ${app_name}-en kontroletik kanpo dago. Ez dago Google konturik gailua
     <string name="action_change">Aldatu</string>
     <string name="change_room_directory_network">Aldatu sarea</string>
     <string name="please_wait">Itxaron mesedez…</string>
-    <string name="group_all_communities">Komunitate guztiak</string>
-
     <string name="room_preview_no_preview">Gela hau ezin da aurreikusi</string>
 
     <string name="fab_menu_create_room">Gelak</string>
diff --git a/vector/src/main/res/values-eu/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-eu/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-eu/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-eu/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-fa/strings.xml b/library/ui-strings/src/main/res/values-fa/strings.xml
similarity index 88%
rename from vector/src/main/res/values-fa/strings.xml
rename to library/ui-strings/src/main/res/values-fa/strings.xml
index 591ae21198..56dbe912c1 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/library/ui-strings/src/main/res/values-fa/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="notice_room_invite_no_invitee">دعوت %s</string>
     <string name="notice_room_invite">‫%1$s، %2$s را دعوت کرد</string>
     <string name="notice_room_invite_you">%1$s دعوتتان کرد</string>
@@ -54,8 +54,6 @@
 \nدرون‌ریزی اتاق‌های دعوت‌شده</string>
     <string name="initial_sync_start_importing_account_left_rooms">همگام‌سازی نخستین:
 \nدرون‌ریزی اتاق‌های ترک شده</string>
-    <string name="initial_sync_start_importing_account_groups">همگام‌سازی نخستین:
-\nدرون‌ریزی اجتماع‌ها</string>
     <string name="initial_sync_start_importing_account_data">همگام‌سازی نخستین:
 \nدرون‌ریزی داده‌های حساب</string>
     <string name="event_status_sending_message">در حال فرستادن پیام…</string>
@@ -157,7 +155,7 @@
     <string name="notice_room_guest_access_can_join_by_you">به میهمانان اجازهٔ پیوستن به گروه دادید.</string>
     <string name="notice_room_guest_access_forbidden_by_you">میمهانان را از پیوستن به گروه بازداشتید.</string>
     <string name="notice_end_to_end_ok_by_you">رمزنگاری سرتاسری را روشن کردید.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">رمزنگاری سرتاسری را روشن کردید (الگوریتم ناشناخته %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">رمزنگاری سرتاسری را روشن کردید (الگوریتم تشخیص‌داده‌نشده %1$s).</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">مهمان‌ها را از پیوستن به اتاق بازداشتید.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s مهمان‌ها را از پیوستن به اتاق بازداشت.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">به مهمان‌ها اجازه دادید به این‌جا بپیوندند.</string>
@@ -249,7 +247,6 @@
     <string name="system_alerts_header">هشدارهای سیستمی</string>
     <string name="matrix_only_filter">فقط آشنایان ماتریکس</string>
     <string name="no_result_placeholder">نتیجه‌ای نیست</string>
-    <string name="groups_header">انجمن‌ها</string>
     <string name="send_bug_report_include_logs">ارسال رخدادنگارها</string>
     <string name="send_bug_report_include_crash_logs">ارسال رخدادنگارهای خطا</string>
     <string name="send_bug_report_include_screenshot">ارسال تصویر صفحه</string>
@@ -438,7 +435,6 @@
     <string name="action_change">تغییر</string>
     <string name="change_room_directory_network">تغییر شبکه</string>
     <string name="please_wait">لطفاً شکیبایی کنید…</string>
-    <string name="group_all_communities">تمام اجتماع‌ها</string>
     <string name="room_preview_no_preview">این اتاق نمی‌تواند پیش‌نمایش یابد</string>
     <string name="fab_menu_create_room">اتاق‌ها</string>
     <string name="fab_menu_create_chat">پیام‌های مستقیم</string>
@@ -505,7 +501,6 @@
     <string name="settings_dev_tools">ابزارهای توسعه</string>
     <string name="none">هیچ</string>
     <string name="action_revoke">ابطال</string>
-    <string name="auth_reset_password_missing_email">باید نشانی رایانامهٔ پیوسته به حسابتان وارد شود.</string>
     <string name="auth_reset_password_error_unauthorized">شکست در تأیید نشانی رایانامه: مطمئن شوید که پیوند درون رایانامه را کلیک کرده‌اید</string>
     <string name="auth_accept_policies">لطفاً سیاست‌های این کارساز خانگی را بررسی کرده و بپذیرید:</string>
     <string name="login_error_invalid_home_server">لطفا یک نشانی معتبر وارد کنید</string>
@@ -664,7 +659,7 @@
     <string name="settings_discovery_manage">مدیریت تنظیمات کشفتان.</string>
     <string name="settings_unignore_user">نمایش همهٔ پیام‌ها از %s؟</string>
     <string name="settings_emails_and_phone_numbers_title">رایانامه‌ها و شماره تلفن‌ها</string>
-    <string name="settings_emails_and_phone_numbers_summary">مدیریت رایانامه‌ها و شماره تلفن‌های پیوسته به حساب ماتریکستان</string>
+    <string name="settings_emails_and_phone_numbers_summary">مدیریت نشانی‌های رایانامه و شماره تلفن‌های پیوسته به حساب ماتریکستان</string>
     <string name="media_saving_period_3_days">۳ روز</string>
     <string name="media_saving_period_1_week">۱ هفته</string>
     <string name="media_saving_period_1_month">۱ ماه</string>
@@ -683,7 +678,7 @@
     <string name="room_settings_labs_warning_message">این‌ها ویژگی‌های آزمایشی‌ای هستند که ممکن است به روش‌های نامنتظره‌ای حراب شوندا. با احتیاط استفاده کنید.</string>
     <string name="room_settings_set_main_address">تنظیم به عنوان نشانی اصلی</string>
     <string name="encryption_information_device_name">نام عمومی</string>
-    <string name="encryption_information_device_id">شناسهٔ نشست</string>
+    <string name="device_manager_session_details_session_id">شناسهٔ نشست</string>
     <string name="encryption_information_device_key">کلید نشست</string>
     <string name="encryption_export_e2e_room_keys">برون‌ریزی کلید‌های اتاق‌های سرتاسری</string>
     <string name="encryption_export_room_keys">برون‌ریزی کلید‌های اتاق‌ها</string>
@@ -827,7 +822,7 @@
     <string name="add_identity_server">پیکربندی کارساز هویت</string>
     <string name="change_identity_server">تغییر کارساز هویت</string>
     <string name="settings_discovery_emails_title">نشانی‌های رایانامهٔ قابل‌کشف</string>
-    <string name="settings_discovery_no_mails">گزینه‌های کشف به محض افزودن یک رایانامه، ظاهر خواهند شد.</string>
+    <string name="settings_discovery_no_mails">گزینه‌های کشف به محض افزودن یک نشانی رایانامه، ظاهر خواهند شد.</string>
     <string name="settings_discovery_no_msisdn">گزینه‌های کشف به محض افزودن یک شماره تلفن، ظاهر خواهند شد.</string>
     <string name="settings_discovery_msisdn_title">شماره تلفن‌های قابل‌کشف</string>
     <string name="labs_allow_extended_logging">به کار انداختن گزارش‌های پرگو.</string>
@@ -948,7 +943,7 @@
 \n
 \nپیام‌هایتان با قفل‌هایی امن شده‌اند و فقط شما و گیرندگان دیگر، کلیدهای یکتا را برای قفل‌گشاییشان دارید.</string>
     <string name="room_profile_section_security">امنیت</string>
-    <string name="room_profile_section_security_learn_more">بثیش‌تر بدانید</string>
+    <string name="room_profile_section_security_learn_more">بیش‌تر بدانید</string>
     <string name="room_profile_section_more">بیش‌تر</string>
     <string name="room_profile_section_admin">کنش‌های مدیر</string>
     <string name="room_profile_section_more_settings">تنظمیات اتاق</string>
@@ -1239,7 +1234,7 @@
     <string name="error_threepid_auth_failed">مطمئن شوید لینک فعال‌سازی‌ای را که به ایمیل شما ارسال شده، باز کرده‌اید.</string>
     <string name="settings_remove_three_pid_confirmation_content">برداشتن %s؟</string>
     <string name="settings_phone_numbers">شماره تلفن‌ها</string>
-    <string name="settings_emails_empty">هیچ رایانامه‌ای به حسابتان افزوده نشده</string>
+    <string name="settings_emails_empty">هیچ نشانی رایانامه‌ای به حسابتان افزوده نشده</string>
     <string name="settings_emails">نشانی‌های رایانامه</string>
     <string name="settings_phone_number_empty">هیچ شماره تلفنی به حسابتان افزوده نشده</string>
     <string name="search_no_results">نتیجه‌ای در پی نداشت</string>
@@ -1402,7 +1397,7 @@
     <string name="login_signup_to">ثبت نام در %1$s</string>
     <string name="login_msisdn_error_other">شماره تلفن نامعتبر است. لطفا آن را بررسی کنید</string>
     <string name="login_msisdn_confirm_notice">ما یک کد فعال‌سازی به %1$s ارسال کردیم. لطفا آن را وارد کنید.</string>
-    <string name="login_set_email_notice">برای بازیابی حساب خود یک ایمیل تنظیم کنید. بعداً، در صورتی که تمایل داشتید می‌توانید به افراد اجازه دهید با ایمیل، شما را پیدا کنند.</string>
+    <string name="login_set_email_notice">برای بازیابی حسابتان، نشانی رایانامه‌ای تنظیم کنید. بعداً می‌توانید بگذارید افرادی که می‌شناسید، با این نشانی بیابندتان.</string>
     <string name="login_set_msisdn_notice">یک شماره تلفن تنظیم کنید تا در صورتی که تمایل دارید، به افراد اجازه پیدا کردن شما را با استفاده از آن بدهد.</string>
     <string name="login_reset_password_cancel_confirmation_content">گذرواژه شما هنوز تغییر نکرده‌است.
 \n
@@ -1412,12 +1407,12 @@
     <string name="login_reset_password_mail_confirmation_notice_2">برای تایید گذرواژه جدید لینک ارسالی را باز کرده، سپس روی متن زیر کلیک کنید.</string>
     <string name="login_reset_password_mail_confirmation_notice">یک ایمیل تائید به %1$s ارسال شد.</string>
     <string name="login_reset_password_mail_confirmation_title">صندوق ایمیل خود را بررسی کنید</string>
-    <string name="login_reset_password_error_not_found">این ایمیل به هیچ حسابی متصل نشده‌است</string>
+    <string name="login_reset_password_error_not_found">این نشانی رایانامه به هیچ حسابی پیوند داده نشده</string>
     <string name="login_reset_password_warning_content">با تغییر گذرواژه ، کلیدهای رمزگذاری سرتاسر در تمام نشست‌های شما تغییر کرده و تاریخچه گفتگوی رمزشده‌ی شما غیرقابل خواندن می‌شود. قبل از تغییر گذرواژه، کلید امنیتی یا کلید پشتیبان را وارد کرده و یا کلیدهای اتاق خود را از نشست دیگری استخراج کنید.</string>
     <string name="login_reset_password_submit">بعدی</string>
     <string name="login_reset_password_notice">برای تأیید تنظیم گذرواژه‌ی جدید ، یک ایمیل تأیید به آدرس ایمیل شما ارسال خواهد شد.</string>
     <string name="login_reset_password_on">بازنشانی گذرواژه در %1$s</string>
-    <string name="login_login_with_email_error">این ایمیل به هیچ حسابی مرتبط نیست.</string>
+    <string name="login_login_with_email_error">این نشانی رایانامه به هیچ حسابی مرتبط نیست.</string>
     <string name="login_registration_not_supported">برنامه قادر به ایجاد حساب در این سرور نیست.
 \n
 \nآیا می خواهید با استفاده از مرورگر حساب کاربری بسازید؟</string>
@@ -1432,7 +1427,7 @@
     <string name="login_server_text">درست مانند ایمیل، حساب‌های کاربری یک خانه دارند؛ اگرچه می توانید با هر کسی که دوست دارید، صحبت کنید</string>
     <string name="login_server_title">کارسازی برگزینید</string>
     <string name="login_splash_submit">شروع کنید</string>
-    <string name="login_splash_text3">تجارب خود را گسترش داده و شخصی‌سازی کنید</string>
+    <string name="login_splash_text3">تجربه‌هایتان را گسترش داده و شخصی‌سازی کنید</string>
     <string name="login_splash_text2">گفتگوهای خصوصی خود را با رمزگذاری محافظت کنید</string>
     <string name="login_splash_text1">با افراد به صورت مستقیم و یا در قالب گروه گپ بزنید</string>
     <string name="login_splash_title">صاحب گفتگوهای خود باشید.</string>
@@ -1489,18 +1484,18 @@
     <string name="settings_discovery_please_enter_server">لطفاً نشانی کارساز هویت را وارد کنید</string>
     <string name="settings_discovery_bad_identity_server">نتوانست به کارساز هویت وصل شود</string>
     <string name="settings_discovery_enter_identity_server">یک نشانی کارساز هویت وارد کنید</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">ما یک ایمیل تأیید به %s ارسال کردیم، ابتدا ایمیل خود را بررسی کرده و روی لینک تأیید کلیک کنید</string>
-    <string name="settings_discovery_confirm_mail">ما یک ایمیل تأیید به %s ارسال کردیم، ایمیل خود را بررسی کرده و روی لینک تأیید کلیک کنید</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">رایانامه‌ای به %s فرستادیم. لطفاً نخست رایانامه‌تان را بررسی کرده و روی پیوند تأیید کلیک کنید</string>
+    <string name="settings_discovery_confirm_mail">رایانامه‌ای به %s فرستادیم. رایانامه‌تان را بررسی کرده و روی پیوند تأیید کلیک کنید</string>
     <string name="settings_discovery_disconnect_identity_server_info">قطع ارتباط با سرور هویت‌سنجی به این معنی است که توسط کاربران دیگر قابل شناسایی نخواهید بود و نمی توانید دیگران را از طریق ایمیل یا تلفن دعوت کنید.</string>
     <string name="settings_discovery_identity_server_info_none">در حال استفاده از کارساز هویتی نیستید. برای کشق و قابل کشف بودن به دست آشنایان موجودی که می‌شناسید، یک کارساز هویت در زیر پیکربندی کنید.</string>
     <string name="settings_discovery_identity_server_info">دارید برای کشف و قابل کشف بودن به دست آشنایان موجودی که می‌شناسید از %1$s استفاده می‌کنید.</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">ثبت ژتون</string>
     <string name="push_gateway_item_format">فرمت:</string>
     <string name="push_gateway_item_url">آدرس:</string>
-    <string name="push_gateway_item_device_name">نام نشست:</string>
-    <string name="push_gateway_item_app_display_name">نام برنامه:</string>
-    <string name="push_gateway_item_push_key">کلید push:</string>
-    <string name="push_gateway_item_app_id">شناسه برنامه:</string>
+    <string name="push_gateway_item_device_name">نام نمایشی نشست:</string>
+    <string name="push_gateway_item_app_display_name">نام نمایشی کاره:</string>
+    <string name="push_gateway_item_push_key">کلید ارسال:</string>
+    <string name="push_gateway_item_app_id">شناسهٔ کاره:</string>
     <string name="settings_push_gateway_no_pushers">هیچ push gateway‌ای ثبت نشده است</string>
     <string name="settings_push_rules_no_rules">هیچ قانونی برای push تعریف نشده است</string>
     <string name="navigate_to_room_when_already_in_the_room">شما در حال مشاهده این اتاق هستید!</string>
@@ -1685,7 +1680,7 @@
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">عبارت رمزی که فقط خودتان می‌دانید را وارد کرده و کلیدی برای پشتیبان تولید کنید.</string>
     <string name="identity_server_set_alternative_notice">به هنوتم جایگزین، می‌توانید نشامی هر کارساز هویت دیگری را وارد کنید</string>
     <string name="identity_server_set_default_notice">کارساز خانگیتان (%1$s) پیشنهاد استفاده از %2$s برای کارساز هویتتان را می‌دهد</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">برای محرمانگیتان، المنت تنها از فرستادن شماره تلفن و رایانامه‌های کاربری در هم ریخته پشتیبانی می‌کند.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">برای محرمانگیتان، ${app_name} تنها از فرستادن شماره‌های تلفن و نشانی‌های رایانامهٔ کاربری در هم ریخته پشتیبانی می‌کند.</string>
     <string name="identity_server_error_outdated_home_server">این عملیات ممکن نیست. کارساز خانگی منقضی شده است.</string>
     <string name="invite_users_to_room_failure">نتوانستیم کاربران را دعوت کنیم. لطفاً کاربرانی که می‌خواهید دعوت کنید را بررسی کرده و دوباره تلاش کنید.</string>
     <string name="create_room_dm_failure">نتوانستیم پیامتان را ایجاد کنیم. لطفاً کاربرانی که می‌خواهید دعوت کنید را بررسی کرده و دوباره تلاش کنید.</string>
@@ -1752,7 +1747,7 @@
         <item quantity="one">دستگاهی را که می‌توانید با استفاده از آن‌ها خود را تایید کنید نشان بده</item>
         <item quantity="other">%d دستگاهی را که می‌توانید با استفاده از آن‌ها خود را تایید کنید نشان بده</item>
     </plurals>
-    <string name="settings_discovery_consent_notice_on">رضاییتان را برای فرستادن رایانامه‌ها و شماره‌تلفن‌ها به این کارساز هویت به منظور کشف دیگر کاربران از آشنایانتان، داده‌اید.</string>
+    <string name="settings_discovery_consent_notice_on">رضاییتان را برای فرستادن نشانی‌های رایانامه و شماره‌های تلفن به این کارساز هویت به منظور کشف دیگر کاربران از آشنایانتان، داده‌اید.</string>
     <string name="room_preview_not_found">در حال حاضر این اتاق قابل دسترسی نیست.
 \nبعدا دوباره تلاش کنید، یا از مدیر اتاق بخواهید بررسی کند که آیا دسترسی دارید.</string>
     <string name="room_alias_action_publish">انتشار این نشانی</string>
@@ -2146,7 +2141,7 @@
     <string name="settings_notification_mentions_and_keywords">اشاره‌ها و کلیدواژگان</string>
     <string name="settings_notification_default">آگاهی‌های پیش‌گزیده</string>
     <string name="link_this_email_with_your_account">%s در تنظیمات برای دریافت مستقیم دعوت‌ها در المنت.</string>
-    <string name="link_this_email_settings_link">این رایانامه را به حسابتان پیوند دهید</string>
+    <string name="link_this_email_settings_link">پیوند این نشانی رایانامه به حسابتان</string>
     <string name="this_invite_to_this_space_was_sent">این دعوت به این فضا به %s فرستاده شده که با حسابتان در ارتباط نیست</string>
     <string name="this_invite_to_this_room_was_sent">این دعوت به این اتاق به %s فرستاده شده که با حسابتان در ارتباط نیست</string>
     <string name="upgrade_public_room_from_to">این اتاق را از %1$s به %2$s ارتقا خواهید داد.</string>
@@ -2216,7 +2211,7 @@
     <string name="room_settings_space_access_title">دسترسی فضا</string>
     <string name="room_settings_access_rules_pref_dialog_title">چه کسی می‌تواند دسترسی داشته باشد؟</string>
     <string name="settings_notification_emails_enable_for_email">به کار انداختن آگاهی‌های رایانامه‌ای برای %s</string>
-    <string name="settings_notification_emails_no_emails">برای دریافت رایانامه با آگاهی، لطفاً رایانامه‌ای را به حساب ماتریکستان وصل کنید</string>
+    <string name="settings_notification_emails_no_emails">برای دریافت رایانامه با آگاهی، لطفاً نشانی رایانامه‌ای را به حساب ماتریکستان وصل کنید</string>
     <string name="settings_notification_emails_category">آگاهی رایانامه‌ای</string>
     <string name="room_permissions_upgrade_the_space">ارتقای فضا</string>
     <string name="room_permissions_change_space_name">تغییر نام فضا</string>
@@ -2263,13 +2258,13 @@
     <string name="create_poll_question_title">پرسش یا موضوع نظرسنجی</string>
     <string name="create_poll_title">ایجاد نظرسنجی</string>
     <string name="attachment_type_poll">نظرسنجی</string>
-    <string name="identity_server_consent_dialog_title_2">فرستادن رایانامه‌ّا و شماره‌های تلفن به %s</string>
+    <string name="identity_server_consent_dialog_title_2">فرستادن نشانی‌های رایانامه و شماره‌های تلفن به %s</string>
     <string name="settings_discovery_consent_notice_off_2">آشنایانتان خصوصی هستند. برای کشف کاربران از آشنایانتان، نیاز به اجازه‌تان برای فرستادن اطّلاعات آشنا به کارساز هویتتان داریم.</string>
     <string name="shortcut_disabled_reason_sign_out">نشست خارج شده است!</string>
     <string name="shortcut_disabled_reason_room_left">اتاق ترک شده است!</string>
     <string name="identity_server_consent_dialog_content_question">با فرستادن این اطّلاعات موافقید؟</string>
     <string name="action_not_now">اکنون نه</string>
-    <string name="identity_server_consent_dialog_content_3">برای کشف آشنایان موجود، لازم است اطلاعات آشنایان (رایانامه‌ها و شماره تلفن‌ها) را به کارساز هویتتان بفرستید. برای محرمانگیتان، داده‌هایتان را پیش از فرستادن، در هم می‌ریزیم.</string>
+    <string name="identity_server_consent_dialog_content_3">برای کشف آشنایان موجود، لازم است اطلاعات آشنایان (نشانی‌های رایانامه و شماره‌های تلفن) را به کارساز هویتتان بفرستید. برای محرمانگیتان، داده‌هایتان را پیش از فرستادن، در هم می‌ریزیم.</string>
     <string name="analytics_opt_in_content">با هم‌رسانی داده‌ّای استفادهٔ ناشناس، در تشخیص مشکل‌ها و بهبود المنت یاریمان کنید. برای درک چگونگی استفادهٔ مردم از چندین افزاره، شناسه‌ای کاتوره‌ای بین افزاره‌هایتان هم‌رسانی خواهیم کرد.
 \n
 \nمی‌توانید از %s قوانینمان را بخوانید.</string>
@@ -2433,7 +2428,6 @@
     <string name="ftue_profile_picture_title">افزودن یک تصویر نمایه</string>
     <string name="ftue_display_name_entry_footer">می‌توانید بعدها تغییرش دهید</string>
     <string name="ftue_display_name_entry_title">نام نمایشی</string>
-    <string name="ftue_display_name_subtitle">هنگامی که پیام می‌فرستید نشان داده خواهد شد.</string>
     <string name="ftue_account_created_subtitle">حسابتان %s ایجاد شد</string>
     <string name="ftue_account_created_congratulations_title">تبریک!</string>
     <string name="ftue_account_created_take_me_home">مرا به خانه ببر</string>
@@ -2482,7 +2476,6 @@
     <string name="a11y_presence_busy">مشغول</string>
     <string name="keys_backup_settings_signature_from_this_user">پشتیبان امضای معتبری از این کاربر دارد.</string>
     <string name="live_location_bottom_sheet_last_updated_at">%1$s پیش به‌روز شده</string>
-    <string name="live_location_bottom_sheet_stop_sharing">توقّف هم‌رسانی</string>
     <string name="labs_enable_live_location_summary">پیاده‌سازی موقّتی: موقعیت‌ها در تاریخچهٔ اتاق می‌مانند</string>
     <string name="labs_enable_live_location">به کار انداختن هم‌رسانی مکان زنده</string>
     <string name="location_share_live_remaining_time">%1$s مانده</string>
@@ -2603,4 +2596,298 @@
     </plurals>
     <string name="search_space_two_parents">%1$s و %2$s</string>
     <string name="auth_reset_password_error_unverified">رایانامه تأیید نشده. صندوق ورودیتان را بررسی کنید</string>
+    <string name="location_share_loading_map_error">ناتوان در بار کردن نقشه
+\nشاید این کارساز خانگی برای نمایش نقشه‌ها پیکربندی نشده باشد.</string>
+    <string name="a11y_open_settings">گشودن تنظیمات</string>
+    <string name="all_chats">تمامی گپ‌ها</string>
+    <string name="device_manager_sessions_other_description">برای امنیت بیش‌تر، نشست‌هایتان را تأیید و از هر نشستی که تشخیصش نمی‌دهید یا دیگر استفاده نمی‌کنید خارج شوید.</string>
+    <string name="device_manager_sessions_other_title">دیگر نشست‌ها</string>
+    <string name="settings_sessions_list">نشست‌ها</string>
+    <string name="a11y_open_spaces">گشودن سیاههٔ فضاها</string>
+    <string name="a11y_create_message">ایجاد اتاق یا گفت‌وگویی جدید</string>
+    <string name="room_list_filter_people">افراد</string>
+    <string name="room_list_filter_favourites">محبوب‌ها</string>
+    <string name="room_list_filter_unreads">نخوانده‌ها</string>
+    <string name="room_list_filter_all">همه</string>
+    <string name="home_layout_preferences_sort_name">آ - ی</string>
+    <string name="home_layout_preferences_sort_activity">فعّالیت</string>
+    <string name="home_layout_preferences_sort_by">چینش بر اساس</string>
+    <string name="home_layout_preferences_recents">نمایش تازگی‌ها</string>
+    <string name="home_layout_preferences_filters">نمایش پالایه‌ها</string>
+    <string name="home_layout_preferences">ترجیحات چینش</string>
+    <string name="explore_rooms">کاوش اتاق‌ها</string>
+    <string name="create_room">ایجاد اتاق</string>
+    <string name="start_chat">آغاز گپ</string>
+    <string name="device_manager_other_sessions_description_unverified">تأیید نشده · آخرین فعّالیت %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">تأیید شده · آخرین فعّالیت %1$s</string>
+    <string name="device_manager_other_sessions_view_all">دیدن همه (%1$d)</string>
+    <string name="device_manager_view_details">دیدن جزییات</string>
+    <string name="device_manager_verify_session">تأیید نشست</string>
+    <string name="device_manager_verification_status_unverified">نشست تأیید نشده</string>
+    <string name="device_manager_verification_status_verified">نشست تأیید شده</string>
+    <string name="a11y_device_manager_device_type_unknown">گونهٔ افزاره ناشناخته</string>
+    <string name="a11y_device_manager_device_type_desktop">میزکار</string>
+    <string name="a11y_device_manager_device_type_web">وب</string>
+    <string name="a11y_device_manager_device_type_mobile">تلفن همراه</string>
+    <string name="timeline_error_room_not_found">متأسفانه این اتاق پیدا نشد.
+\nلطفاً بعداً دوباره تلاش کنید.%s</string>
+    <string name="invites_title">دعوت‌ها</string>
+    <string name="onboarding_new_app_layout_feedback_message">زدن بالا سمت چپ برای دیدن گزینهٔ بازخورد.</string>
+    <string name="onboarding_new_app_layout_spaces_message">دسترسی به فضاهایتان (پایین سمت چپ) سریع‌تر و ساده‌تر از همیشه.</string>
+    <string name="onboarding_new_app_layout_welcome_message">برای ساده‌سازی ${app_name} زبانه‌ها اختیاری شده‌اند. مدیریت با استفاده از فهرست بالا سمت چپ.</string>
+    <string name="home_empty_no_unreads_message">این جایی است که پیام‌های ناخوانده‌تان در صورت وجود ظاهر خواهند شد.</string>
+    <string name="home_empty_no_rooms_message">کارهٔ گپ امن یکپارچه برای گروه‌ها، دوستان و سازمان‌ها. برای آغاز، گپی ساخته یا به اتاقی بپیوندید.</string>
+    <string name="home_empty_space_no_rooms_message">فضاها راهی جدید برای گروه‌بندی اتاق‌ها و افراد است. با استفاده از دکمهٔ پایین سمت چپ فضایی ساخته یا اتاقی را بیفزایید.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nکمی خالی به نظر می‌رسد.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">در نظر گرفتن خروج از نشست‌های قدیمی (۱ روز یا بیش‌تر) که دیگر استفاده نمی‌کنید.</item>
+        <item quantity="other">در نظر گرفتن خروج از نشست‌های قدیمی (%1$d روز یا بیش‌تر) که دیگر استفاده نمی‌کنید.</item>
+    </plurals>
+    <string name="device_manager_unverified_sessions_description">تأیید یا خروج از نشست‌های تأییدنشده.</string>
+    <string name="device_manager_header_section_security_recommendations_description">بهبود امنیت حسابتان با پیروی از این توصیه‌ها.</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">غیرفعّال برای بیش از %1$d روز (%2$s)</item>
+        <item quantity="other">غیرفعّال برای بیش از %1$d روز (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">این جایی است که درخواست‌ها و دعوت‌های جدیدتان خواهند بود.</string>
+    <string name="space_list_empty_message">فضاها راهی جدید برای گروه‌بندی اتاق‌ها و افراد است. برای آغاز، فضایی بسازید.</string>
+    <string name="onboarding_new_app_layout_button_try">بیازماییدش</string>
+    <string name="onboarding_new_app_layout_feedback_title">دادن بازخورد</string>
+    <string name="onboarding_new_app_layout_spaces_title">دسترسی به فضاها</string>
+    <string name="onboarding_new_app_layout_welcome_title">به نمایی جدید خوش آمدید!</string>
+    <string name="home_empty_no_unreads_title">چیزی برای گزارش نیست.</string>
+    <string name="home_empty_no_rooms_title">%s
+\nبه ${app_name} خوش آمدی.</string>
+    <string name="device_manager_inactive_sessions_title">نشست‌های غیرفعّال</string>
+    <string name="device_manager_unverified_sessions_title">نشست‌های تأیید نشده</string>
+    <string name="device_manager_header_section_security_recommendations_title">توصیه‌های امنیتی</string>
+    <string name="invites_empty_title">چیز جدیدی نیست.</string>
+    <string name="space_list_empty_title">هنوز فضایی وجود ندارد.</string>
+    <string name="a11y_collapse_space_children">جمع کردن فرزندان %s</string>
+    <string name="a11y_expand_space_children">گسترش فرزندان %s</string>
+    <string name="change_space">تغییر فضا</string>
+    <string name="device_manager_session_details_device_ip_address">نشانی آی‌پی</string>
+    <string name="device_manager_session_details_session_last_activity">واپسین فعّالیت</string>
+    <string name="device_manager_session_details_session_name">نام نشست</string>
+    <string name="device_manager_session_details_description">اطّلاعات برنامه، افزاره و فعّالیت.</string>
+    <string name="device_manager_session_details_title">جزییات نشست</string>
+    <string name="device_manager_other_sessions_clear_filter">پاک‌سازی پالایه</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">هیچ نشست غیرفعّالی پیدا نشد.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">هیچ نشست تأیید نشده‌ای پیدا نشد.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">هیچ نشست تأیید نشده‌ای پیدا نشد.</string>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">غیرفعّال</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">تأیید نشده</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">برای بهترین امنیت، از هرنشستی که تشخیصش نمی‌دهید یا دیگر استفاده نمی‌کنید، خارج شوید.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">تأیید شده</string>
+    <string name="a11y_device_manager_filter">پالایه</string>
+    <string name="device_manager_filter_option_inactive">غیرفعّال</string>
+    <string name="device_manager_filter_option_unverified_description">نا آماده برای پیام‌رسانی امن</string>
+    <string name="device_manager_filter_option_unverified">تأیید نشده</string>
+    <string name="device_manager_filter_option_verified_description">آمادهٔ پیام‌رسانی امن</string>
+    <string name="device_manager_filter_option_verified">تأیید شده</string>
+    <string name="device_manager_filter_option_all_sessions">تمامی نشست‌ها</string>
+    <string name="device_manager_filter_bottom_sheet_title">پالایه</string>
+    <string name="device_manager_session_last_activity">آخرین فعّالیت %1$s</string>
+    <string name="device_manager_device_title">افزاره</string>
+    <string name="device_manager_session_title">نشست</string>
+    <string name="device_manager_current_session_title">نشست کنونی</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">برای بهترین امنیت و اطمینان این نشست را تأیید کرده یا خارج شوید.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">تأیید نشست کنونیتان برای پیام‌رسانی امن.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">این نشست برای پیام‌رسانی امن آماده است.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">نشست کنونیتان برای پیام‌رسانی امن آماده است.</string>
+    <string name="labs_enable_deferred_dm_summary">ایجاد پیام خصوصی فقط در نخستین پیام</string>
+    <string name="labs_enable_new_app_layout_summary">المنتی ساده شده با زبانه‌های انتخابی</string>
+    <string name="labs_enable_new_app_layout_title">به کار انداختن چینش جدید</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">تأیید نشست‌هایتان برای پیام‌رسانی امن بهبود یافته یا خروج از آن‌هایی که تشخیصشان نداده یا دیگر استفاده نمی‌کنید.</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">غیرفعّال برای ۱ روز یا بیش‌تر</item>
+        <item quantity="other">غیرفعّال برای %1$d روز یا بیش‌تر</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_unverified_current_session">تأیید نشده · نشست کنونیتان</string>
+    <string name="key_authenticity_not_guaranteed">اعتبار این پیام رمز شده نمی‌تواند روی این افزاره تأیید شود.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">در این اتاق، هرگز پیام‌های رمز شده به نشست‌های تأیید نشده فرستاده نشود.</string>
+    <string name="device_manager_learn_more_session_rename_title">تغییر نام نشست‌ها</string>
+    <string name="device_manager_learn_more_sessions_verified_title">نشست‌های تأییدشده</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">نشست‌های تأییدنشده</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">نشست‌های غیرفعّال</string>
+    <string name="device_manager_session_rename_warning">لطفاً آگاه باشید که نام‌های نشست برای افرادی که با آن‌ها در تماسید نیز نشان داده می‌شود.</string>
+    <string name="device_manager_session_rename_description">نام‌های نشست شخصی به نظم دادن آسان‌تر افزاره‌هایتان کمک می‌کند.</string>
+    <string name="device_manager_session_rename_edit_hint">نام نشست</string>
+    <string name="device_manager_session_rename">تغییر نام نشست</string>
+    <string name="device_manager_session_overview_signout">خروج از این نشست</string>
+    <string name="settings_security_incognito_keyboard_title">صفحه‌کلید ناشناس</string>
+    <string name="command_description_devtools">گشودن صفحهٔ ابزارهای توسعه‌دهنده</string>
+    <string name="labs_enable_deferred_dm_title">به کار انداختن پیام‌های مستقیم تعویقی</string>
+    <string name="action_got_it">گرفتم</string>
+    <string name="tooltip_attachment_voice_broadcast">آغاز یک پخش همگانی صوتی</string>
+    <string name="command_description_table_flip">(╯°□°）╯︵ ┻━┻ را به ابتدای پیام متنی خام می‌افزاید</string>
+    <string name="attachment_type_voice_broadcast">پخش همگانی صدا</string>
+    <string name="grant_permission">اعطای دسترسی</string>
+    <string name="labs_enable_rich_text_editor_summary">ویرایشگر متن غنی را بیازمایید (حالت متن خام به زودی)</string>
+    <string name="labs_enable_rich_text_editor_title">به کار انداختن ویرایشگر متن غنی</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">برای آشکارسازی وضعیت تأیید نشست کنونیتان، تأییدش کنید.</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">کارساز خانگی از ورود با کد QR پشتیبانی نمی‌کند.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">ورود روی افزارهٔ دیگر لغو شد.</string>
+    <string name="labs_enable_session_manager_summary">دید و واپایش بیش‌تری روی نشست‌هایتان داشته باشید.</string>
+    <string name="qr_code_login_header_failed_denied_description">درخواست روی افزارهٔ دیگر رد شد.</string>
+    <string name="qr_code_login_header_failed_timeout_description">پیوند در مدّت مقرّر کامل نشد‌.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">افزارهٔ دیگر باید وارد شده باشد.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">افزارهٔ دیگر از پیش وارد شده.</string>
+    <string name="qr_code_login_new_device_instruction_2">به تنظیمات -&gt; امنیت و محرمانگی بروید</string>
+    <string name="qr_code_login_new_device_instruction_1">کاره را روی افزارهٔ دیگرتان بگشایید</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">پیوند دادن با این افزاره پشتیبانی نمی‌شود.</string>
+    <string name="labs_enable_voice_broadcast_title">به کار انداختن پخش صدا</string>
+    <string name="qr_code_login_show_qr_code_button">نمایش کد QR روی این افزاره</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">آغاز در صفحهٔ ورود</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">گزینش‌«ورود با کد QR»</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">آغاز در صفحهٔ ورود</string>
+    <string name="device_manager_push_notifications_description">گرفتن آگاهی‌های ارسالی روی این نشست.</string>
+    <string name="a11y_play_voice_broadcast">پخش یا مکث پخش صدا</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">کد QR نامعتبر است.</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">وارد شدن در افزاره‌ای همراه؟</string>
+    <string name="qr_code_login_header_show_qr_code_title">ورود با کد QR</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">ورود با کد QR</string>
+    <string name="a11y_stop_voice_broadcast_record">توقّف ضبط پخش صدا</string>
+    <string name="a11y_pause_voice_broadcast_record">مکث ضبط پخش صدا</string>
+    <string name="a11y_resume_voice_broadcast_record">از سر گیری ضبط پخش صدا</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">گزینش «نمایش کد QR»</string>
+    <string name="qr_code_login_new_device_instruction_3">گزینش «نمایش کد QR»</string>
+    <string name="labs_enable_client_info_recording_title">به کار انداختن ضبط اطّلاعات کارخواه</string>
+    <string name="labs_enable_session_manager_title">به کار انداختن مدیر نشست جدید</string>
+    <string name="a11y_pause_voice_broadcast">مکث پخش صدا</string>
+    <string name="qr_code_login_header_failed_other_description">درخواست شکست خورد.</string>
+    <string name="qr_code_login_signing_in">وارد کردنتان</string>
+    <string name="qr_code_login_connecting_to_device">وصل شدن به افزاره</string>
+    <string name="qr_code_login_scan_qr_code_button">پویش کد QR</string>
+    <string name="qr_code_login_header_connected_title">اتّصال امن برقرار شده</string>
+    <string name="qr_code_login_header_scan_qr_code_title">پویش کد QR</string>
+    <string name="login_scan_qr_code">پویش کد QR</string>
+    <string name="rich_text_editor_format_underline">اعمال قالب زیرخط‌دار</string>
+    <string name="rich_text_editor_format_strikethrough">اعمال قالب خط‌خورده</string>
+    <string name="rich_text_editor_format_italic">اعمال قالب کج</string>
+    <string name="rich_text_editor_format_bold">اعمال قالب توپر</string>
+    <string name="device_manager_verification_status_unknown">وضعیت تأیید نامعلوم</string>
+    <string name="device_manager_other_sessions_select">گزینش نشست‌ها</string>
+    <string name="attachment_type_selector_voice_broadcast">پخش صدا</string>
+    <string name="attachment_type_selector_gallery">کتابخانهٔ عکس</string>
+    <string name="qr_code_login_try_again">دوباره تلاش کنید</string>
+    <string name="qr_code_login_status_no_match">مطابق نیستند؟</string>
+    <string name="qr_code_login_header_failed_title">اتّصال ناموفّق</string>
+    <string name="device_manager_session_details_device_operating_system">سیستم‌عامل</string>
+    <string name="device_manager_push_notifications_title">آگاهی‌های ارسالی</string>
+    <string name="push_gateway_item_device_id">شناسهٔ نشست:</string>
+    <string name="attachment_type_selector_contact">آشنا</string>
+    <string name="attachment_type_selector_camera">دوربین</string>
+    <string name="attachment_type_selector_location">مکان</string>
+    <string name="attachment_type_selector_poll">نظرسنجی‌ها</string>
+    <string name="attachment_type_selector_file">پیوست‌ها</string>
+    <string name="attachment_type_selector_sticker">برچسب‌ها</string>
+    <string name="a11y_voice_broadcast_buffering">میانگیری…</string>
+    <string name="voice_broadcast_live">زنده</string>
+    <string name="qr_code_login_confirm_security_code">تأیید</string>
+    <string name="three">۳</string>
+    <string name="two">۲</string>
+    <string name="one">۱</string>
+    <string name="device_manager_session_details_device_model">مدل</string>
+    <string name="device_manager_session_details_device_browser">مرورگر</string>
+    <string name="device_manager_session_details_application_url">نشانی</string>
+    <string name="device_manager_session_details_application_version">نگارش</string>
+    <string name="device_manager_session_details_application_name">نام</string>
+    <string name="device_manager_session_details_application">برنامه</string>
+    <string name="push_gateway_item_enabled">به کار افتاده:</string>
+    <string name="action_deselect_all">ناگزینش همه</string>
+    <string name="action_select_all">گزینش همه</string>
+    <plurals name="x_selected">
+        <item quantity="one">۱ گزیده</item>
+        <item quantity="other">%1$d گزیده</item>
+    </plurals>
+    <string name="error_voice_broadcast_permission_denied_message">اجازه‌های لازم برای آغاز پخش صوتی در این اتاق را ندارید. برای ارتقای اجازه‌هایتان با یک مدیر اتاق تماس بگیرید.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">فرد دیگری در حال ضبط یک پخش صوتی است. برای آغاز یک پخش جدید، منتظر پایان پخشش بمانید.</string>
+    <string name="qr_code_login_header_connected_description">با بررسی افزاره‌های وارد شده‌تان باید کد زیر را ببینید. تأیید کنید که این کد با آن افزاره مطابق است:</string>
+    <string name="error_voice_broadcast_already_in_progress_message">دارید یک پخش صوتی ضبط می‌کنید. لطفاً برای آغاز یک پخش جدید، به پخش کنونی پایان دهید.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ افزاره‌های تأییدنشده‌ای در این اتاق وجود دارند. آن‌ها قادر به رمزگشایی پیام‌هایی که فرستاده‌اید نیستند.</string>
+    <string name="qr_code_login_header_scan_qr_code_description">استفاده از دوربین روی این افزاره برای پویش کد QR نشان داده شده روی افزارهٔ دیگرتان:</string>
+    <string name="labs_enable_client_info_recording_summary">ضبط نام کارخواه، نگارش و نشانی برای بازشناسی آسان‌تر نشست‌ها در مدیر نشست.</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 رمزگذاری به نشست‌های تأیید شده را فقط برای تمامی اتاق‌ها در تنظیمات امنیت به کار انداخته‌اید.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">خارج شدن از نشست‌های قدیمی (۱ روز یا بیش‌تر) که دیگر استفاده نمی‌کنید را در نظر داشته باشید.</item>
+        <item quantity="other">خارج شدن از نشست‌های قدیمی (%1$d روز یا بیش‌تر) که دیگر استفاده نمی‌کنید را در نظر داشته باشید.</item>
+    </plurals>
+    <string name="labs_enable_voice_broadcast_summary">توانایی ضبط و فرستادن پخش صدا در خط زمانی اتاق.</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">پویش کد QR زیر با افزاره‌ای که خارج شده.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">استفاده از افزارهٔ وارد شده‌تان برای پویش کد QR زیر:</string>
+    <string name="error_check_network">چیزی اشتباه پیش رفت. لطفاً اتّصال شبکه‌تان را بررسی و دوباره تلاش کنید.</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} برای نمایش آگاهی‌ها نیازمند اجازه است.
+\nلطفاً اجازه را اعطا کنید.</string>
+    <string name="error_voice_broadcast_unauthorized_title">نمی‌توان پخش صدایی جدید را آغاز کرد</string>
+    <string name="rich_text_editor_full_screen_toggle">تغییر حالت تمام‌صفحه</string>
+    <string name="a11y_voice_broadcast_fast_forward">۳۰ ثانیه پیش‌روی</string>
+    <string name="a11y_voice_broadcast_fast_backward">۳۰ ثانیه پس‌روی</string>
+    <string name="attachment_type_selector_text_formatting">قالب‌بندی متن</string>
+    <string name="device_manager_other_sessions_multi_signout_selection">خروج</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">خروج از ۱ نشست</item>
+        <item quantity="other">خروج از %1$d نشست</item>
+    </plurals>
+    <string name="voice_broadcast_recording_time_left">%1$s مانده</string>
+    <string name="message_reply_to_sender_sent_voice_message">پیام صوتی‌ای فرستاد.</string>
+    <string name="message_reply_to_sender_sent_audio_file">پروندهٔ صوتی‌ای فرستاد.</string>
+    <string name="message_reply_to_sender_created_poll">نظرسنجی‌ای ایجاد کرد.</string>
+    <string name="message_reply_to_sender_sent_sticker">عکس‌برگردانی فرستاد.</string>
+    <string name="message_reply_to_sender_sent_video">ویدیویی فرستاد.</string>
+    <string name="message_reply_to_sender_sent_image">تصویری فرستاد.</string>
+    <string name="message_reply_to_sender_sent_file">پرونده‌ای فرستاد.</string>
+    <string name="message_reply_to_prefix">در پاسخ به</string>
+    <string name="device_manager_other_sessions_hide_ip_address">نهفتن نشانی آی‌پی</string>
+    <string name="device_manager_other_sessions_show_ip_address">نمایش نشانی آی‌پی</string>
+    <string name="quoting">نقل کردن</string>
+    <string name="replying_to">پاسخ دادن به %s</string>
+    <string name="editing">ویرایش کردن</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">می‌توانید با یک رمز QR از این افزاره برای ورود به افزاره‌ای همراه یا روی وب استفاده کنید. دو راه برای این کار وجود دارد:</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">مشکلی امنیتی در برپایی پیام‌رسانی امن وجود داشت. ممکن است یکی از موارد زیر دستکاری شده باشند: کارساز خانیگیتان؛ اتّصال اینترنتیتان؛ افزاره(های)تان؛</string>
+    <string name="qr_code_login_confirm_security_code_description">لطفاً مطمئن شوید که مبدأ این کد را می‌دانید. با پیوند دادن افزاره‌ها، دسترسی کامل را به حسابتان می‌دهید.</string>
+    <string name="settings_enable_direct_share_summary">نمایش گپ‌های اخیر در فهرست هم رسانی سامانه</string>
+    <string name="settings_enable_direct_share_title">به کار انداختن هم‌رسانی مستقیم</string>
+    <string name="settings_security_incognito_keyboard_summary">درخواست این که صفحه‌کلید نباید هیچ دادهٔ شخصی‌ شده‌ای را مانند نوشتن تاریخچه و واژه‌نامه برپایهٔ آن‌چه در گفت‌وگوها می‌نویسید به‌روز کند. توجّه داشته باشید که ممکن است برخی صفحه‌کلیدها به این تنظیمات احترام نگذارند.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} برای نمایش آگاهی‌ها نیازمند اجازه است. آگاهی می‌تواندد پیام‌ها، دعوت‌ها و…تان را نشان دهند.
+\n
+\nلطفا در بیرون‌پریدنی بعدی اجازهٔ دسترسی بدهید تا بتوانید آگاهی‌ها را ببینید.</string>
+    <string name="device_manager_learn_more_session_rename">کاربران دیگر در پیام‌های مستقیم و اتاق‌هایی که می‌پیوندید قادر خواهند بود سیاهه‌ای کامل از نشست‌هایتان را ببینند.
+\n
+\nاین کار مطمئنشان می‌کند که دارند واقعاً با شما صحبت می‌کنند؛ ولی همچنین به این معنیست که می‌توانند نام نشست‌هایی که این‌جا وارد کرده‌اید را هم ببینند.</string>
+    <string name="device_manager_learn_more_sessions_verified_description">نشست‌های تأیید شده آن‌هاییند که پس از ورود عبارت عبورتان یا تأیید هویتتان با نشست تأیید شده‌ای دیگر، واردشان شده‌اید.
+\n
+\nیعنی تمامی کلیدهای لارم برای رمزگشایی پیام‌های رمزنگاشته‌تان را داشته و این تأیید را به دیگران می‌دهند که به این نشست اطمینان دارید.</string>
+    <string name="device_manager_learn_more_sessions_verified" tools:ignore="UnusedResources">نشست‌های تأیید شده به حسابتان وارد و با عبارت عبور امنتان یا تأیید متقابل تأیید شده‌اند.
+\n
+\nیعنی کلیدهای رمزنگاری پیام‌های پیشینتان را داشته و به دیگر کاربران این تأیید را می‌دهند که این نشست، خودتان هستید.</string>
+    <string name="device_manager_learn_more_sessions_unverified">نشست‌های تأیید نشده نشست‌هاییند که به آن‌ها وارد شده‌اید، ولی تأیید متقبالشان نکرده‌اید.
+\n
+\nباید به طور خاص مطمئن شوید که این نشست‌ها را می‌شناسید؛ چرا که می‌توانند نشان‌دهندهٔ استفادهٔ تأییدنشده از حسابتان باشند.</string>
+    <string name="device_manager_learn_more_sessions_inactive">نشست‌های غیرفعّال نشست‌هاییند که مدّتیست استفاده نکرده‌اید، ولی به دریافت کلیدهای رمزنگاری ادامه می‌دهند.
+\n
+\nبرداشتن نشست‌های غیرفعّال امنیت و کارایی را بهبود داده و تشخیص مشکوک بودن نشست‌های جدید را برایتان راحت‌تر می‌کند.</string>
+    <string name="review_unverified_sessions_description">بازبینی برای اطمینان از امن بودن حسابتان</string>
+    <string name="review_unverified_sessions_title">نسشت‌هایی تأیید نشده دارید</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">این نشست از رمزنگاری پشتیبانی نمی‌کند؛ پس نمی‌تواند تأیید شود.
+\n
+\nهنگام استفاده از اسن نشست نخواهید توانست در اتاق‌هایی که رمزنگاریشان به کار افتاده شرکت کنید.
+\n
+\nبرای بهترین امنیت و محرمانگی، پیشنهاد می‌شود از کارخواه‌های ماتریکس دارای رمزنگاری استفاده کنید.</string>
+    <string name="device_manager_signout_all_other_sessions">خروج از تمامی نشست‌های دیگر</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">این نشست از رمزنگاری پشتیبانی نکرده و بنابراین نمی‌تواند تأیید شود.</string>
+    <string name="settings_nightly_build_update">رفتن به جدیدترین ساخت (نکته: ممکن است برای ورود به مشکل بخورید)</string>
+    <string name="settings_nightly_build">ساخت شبانه</string>
+    <string name="voice_broadcast_live_broadcast">پخش زنده</string>
+    <string name="notice_voice_broadcast_ended_by_you">به پخش صوتی پایان دادید.</string>
+    <string name="notice_voice_broadcast_ended">%1$s به پخش صوتی پایان داد.</string>
+    <string name="stop_voice_broadcast_content">مطمئنید که می‌خواهید پخش زنده‌تان را قطع کنید؟ این کار پخش را پایان داده و ضبط کامل در اتاق موجود خواهد شد.</string>
+    <string name="stop_voice_broadcast_dialog_title">قطع پخش زنده؟</string>
+    <string name="action_stop">بله، متوقّف شود</string>
+    <string name="set_link_edit">ویرایش پیوند</string>
+    <string name="set_link_create">ایجاد پیوند</string>
+    <string name="set_link_link">پیوند</string>
+    <string name="set_link_text">متن</string>
+    <string name="rich_text_editor_link">تنظیم پیوند</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fa/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-fa/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-fa/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-fa/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-fi/strings.xml b/library/ui-strings/src/main/res/values-fi/strings.xml
similarity index 91%
rename from vector/src/main/res/values-fi/strings.xml
rename to library/ui-strings/src/main/res/values-fi/strings.xml
index 1a1db03232..4976f49a92 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/library/ui-strings/src/main/res/values-fi/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="notice_room_invite_no_invitee">Käyttäjän %s kutsu</string>
     <string name="notice_room_invite">%1$s kutsui käyttäjän %2$s</string>
     <string name="notice_room_invite_you">%1$s kutsui sinut</string>
@@ -52,8 +52,6 @@
 \nTuodaan kutsuttuja huoneita</string>
     <string name="initial_sync_start_importing_account_left_rooms">Alkusynkronointi:
 \nTuodaan poistuttuja huoneita</string>
-    <string name="initial_sync_start_importing_account_groups">Alkusynkronointi:
-\nTuodaan yhteisöjä</string>
     <string name="initial_sync_start_importing_account_data">Alkusynkronointi:
 \nTuodaan tilin tietoja</string>
     <string name="notice_room_update">%s päivitti tämän huoneen.</string>
@@ -240,7 +238,6 @@
     <string name="auth_email_already_defined">Tämä sähköpostiosoite on jo käytössä.</string>
     <string name="auth_forgot_password">Unohditko salasanasi?</string>
     <string name="auth_recaptcha_message">Tämä kotipalvelin haluaa varmistaa, ettet ole robotti</string>
-    <string name="auth_reset_password_missing_email">Anna tiliisi liitetty sähköpostiosoite.</string>
     <string name="auth_reset_password_error_unauthorized">Sähköpostiosoitteesi vahvistaminen epäonnistui. Varmista, että klikkasit sähköpostissa olevaa linkkiä</string>
     <string name="login_error_invalid_home_server">Syötäthän toimivan osoitteen</string>
     <string name="login_error_bad_json">Epämuotoinen JSON</string>
@@ -369,7 +366,7 @@
     <string name="room_settings_unset_main_address">Kumoa pääosoitteeksi asettaminen</string>
     <string name="encryption_information_decryption_error">Salauksenpurkuvirhe</string>
     <string name="encryption_information_device_name">Julkinen nimi</string>
-    <string name="encryption_information_device_id">Istunnon tunnus</string>
+    <string name="device_manager_session_details_session_id">Istunnon tunnus</string>
     <string name="encryption_information_device_key">Istunnon avain</string>
     <string name="encryption_export_e2e_room_keys">Vie salatun huoneen avaimet</string>
     <string name="encryption_export_room_keys">Vie huoneen avaimet</string>
@@ -404,7 +401,7 @@
     <string name="media_saving_period_1_month">1 kuukausi</string>
     <string name="media_saving_period_forever">Ikuisesti</string>
     <string name="settings_theme">Teema</string>
-    <string name="font_size">Kirjaisinkoko</string>
+    <string name="font_size">Fontin koko</string>
     <string name="tiny">Pienin</string>
     <string name="small">Pieni</string>
     <string name="normal">Normaali</string>
@@ -447,7 +444,6 @@
     <string name="notification_noisy">Äänekäs</string>
     <string name="encrypted_message">Salattu viesti</string>
     <string name="loading">Ladataan…</string>
-    <string name="groups_header">Yhteisöt</string>
     <string name="start_voice_call_prompt_msg">Haluatko varmasti aloittaa äänipuhelun\?</string>
     <string name="start_video_call_prompt_msg">Haluatko varmasti aloittaa videopuhelun\?</string>
     <string name="room_participants_ban_prompt_msg">Käyttäjän estäminen poistaa hänet tästä huoneesta ja estää häntä liittymästä huoneeseen uudelleen.</string>
@@ -815,7 +811,6 @@
     <string name="create_new_room">Luo uusi huone</string>
     <string name="error_no_network">Ei verkkoa. Tarkista internet-yhteytesi.</string>
     <string name="please_wait">Odota…</string>
-    <string name="group_all_communities">Kaikki yhteisöt</string>
     <string name="room_preview_no_preview">Tätä huonetta ei voi esikatsella</string>
     <string name="fab_menu_create_room">Huoneet</string>
     <string name="fab_menu_create_chat">Yksityisviestit</string>
@@ -960,8 +955,8 @@
     <string name="settings_push_gateway_no_pushers">Ei rekisteröityjä viesti-ilmoitusten yhdyskäytäviä</string>
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">device_name:</string>
+    <string name="push_gateway_item_app_display_name">Sovelluksen näyttönimi:</string>
+    <string name="push_gateway_item_device_name">Istunnon näyttönimi:</string>
     <string name="push_gateway_item_format">Formaatti:</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Rekisteröi tunniste</string>
     <string name="send_file_step_encrypting_thumbnail">Salataan pikkukuvaa…</string>
@@ -1044,7 +1039,7 @@
     <string name="login_registration_not_supported">Sovellus ei pysty luomaan uusia tunnuksia tälle kotipalvelimelle.
 \n
 \nHaluatko rekisteröityä web-klientillä\?</string>
-    <string name="login_login_with_email_error">Tämä sähköpostiosoite ei ole liitettynä mihinkään tunnukseen.</string>
+    <string name="login_login_with_email_error">Tämä sähköpostiosoite ei ole liitettynä mihinkään tiliin.</string>
     <string name="login_reset_password_on">Palauta salasana palvelimella %1$s</string>
     <string name="login_reset_password_notice">Sähköpostiisi lähetetään viesti uuden salananan asettamiseksi.</string>
     <string name="login_reset_password_submit">Seuraava</string>
@@ -1053,7 +1048,7 @@
     <string name="login_reset_password_warning_title">Varoitus!</string>
     <string name="login_reset_password_warning_content">Salasanan vaihtaminen nollaa kaikki osapuolten välisen salauksen avaimet kaikilla laitteillasi, joka estää sinua lukemasta vanhoja viestejä. Ota käyttöön avainten varmuuskopiointi tai vie huoneen avaimet toiselta laitteelta ennen kuin vaihdat salasanasi.</string>
     <string name="login_reset_password_warning_submit">Jatka</string>
-    <string name="login_reset_password_error_not_found">Tämä sähköposti ei ole liitettynä mihinkään tunnukseen</string>
+    <string name="login_reset_password_error_not_found">Tämä sähköposti ei ole liitettynä mihinkään tiliin</string>
     <string name="login_reset_password_mail_confirmation_title">Tarkista sähköpostisi</string>
     <string name="login_reset_password_mail_confirmation_notice">Vahvistusviesti lähetettiin osoitteeseen %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Näpäytä linkkiä vahvistaaksesi uuden salasanasi. Seurattuasi siinä olevaa linkkiä, klikkaa alapuolelta.</string>
@@ -1067,7 +1062,7 @@
 \n
 \nPeru salasananvaihtoprosessi\?</string>
     <string name="login_set_email_title">Aseta sähköpostiosoite</string>
-    <string name="login_set_email_notice">Aseta sähköpostiosoite palauttaaksesi tunnuksesi. Myöhemmin, voit antaa muiden löytää sinut sähköpostillasi.</string>
+    <string name="login_set_email_notice">Aseta sähköpostiosoite palauttaaksesi tilisi. Myöhemmin voit antaa muiden löytää sinut sähköpostiosoitettasi etsimällä.</string>
     <string name="login_set_email_mandatory_hint">Sähköposti</string>
     <string name="login_set_email_optional_hint">Sähköposti (vapaaehtoinen)</string>
     <string name="login_set_email_submit">Seuraava</string>
@@ -2070,7 +2065,6 @@
     <string name="ftue_profile_picture_title">Lisää profiilikuva</string>
     <string name="ftue_display_name_entry_footer">Voit vaihtaa tämän myöhemmin</string>
     <string name="ftue_display_name_entry_title">Näyttönimi</string>
-    <string name="ftue_display_name_subtitle">Tämä näytetään, kun lähetät viestejä.</string>
     <string name="ftue_display_name_title">Valitse näyttönimi</string>
     <string name="ftue_account_created_subtitle">Tilisi %s on luotu.</string>
     <string name="ftue_account_created_congratulations_title">Onnittelut!</string>
@@ -2122,4 +2116,197 @@
     <string name="notice_room_canonical_alias_alternative_changed">%1$s muutti tämän huoneen vaihtoehtoisia osoitteita.</string>
     <string name="initial_sync_request_title">Alkusynkronointipyyntö</string>
     <string name="room_alias_action_unpublish">Poista tämän osoitteen julkaisu</string>
-</resources>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Vahvistamaton</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Parhaan turvallisuuden takaamiseksi kirjaudu ulos istunnoista, joita et tunnista tai et enää käytä.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Vahvistetu</string>
+    <string name="a11y_device_manager_filter">Suodata</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Käyttämättä %1$d päivän tai pidempään</item>
+        <item quantity="other">Käyttämättä %1$d päivää tai pidempään</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Käyttämätön</string>
+    <string name="device_manager_filter_option_unverified_description">Ei valmis turvallista viestintää varten</string>
+    <string name="device_manager_filter_option_unverified">Vahvistamaton</string>
+    <string name="device_manager_filter_option_verified_description">Valmis turvallista viestintää varten</string>
+    <string name="device_manager_filter_option_verified">Vahvistettu</string>
+    <string name="device_manager_filter_option_all_sessions">Kaikki istunnot</string>
+    <string name="device_manager_filter_bottom_sheet_title">Suodata</string>
+    <string name="device_manager_session_last_activity">Viimeisin toiminta %1$s</string>
+    <string name="device_manager_device_title">Laite</string>
+    <string name="device_manager_session_title">Istunto</string>
+    <string name="device_manager_current_session_title">Nykyinen istunto</string>
+    <string name="device_manager_inactive_sessions_title">Käyttämättä olevat istunnot</string>
+    <string name="device_manager_unverified_sessions_description">Vahvista nämä istunnot tai kirjaudu niistä ulos.</string>
+    <string name="device_manager_unverified_sessions_title">Vahvistamattomat istunnot</string>
+    <string name="device_manager_header_section_security_recommendations_description">Paranna tilisi turvallisuutta seuraamalla näitä suosituksia.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Turvallisuussuositukset</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Käyttämättä %1$d+ päivän (%2$s)</item>
+        <item quantity="other">Käyttämättä %1$d+ päivää (%2$s)</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Vahvistamaton · Nykyinen istuntosi</string>
+    <string name="device_manager_other_sessions_description_unverified">Vahvistamaton · Viimeisin toiminta %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Vahvistettu · Viimeisin toiminta %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Näytä kaikki (%1$d)</string>
+    <string name="device_manager_view_details">Näytä tiedot</string>
+    <string name="device_manager_verify_session">Vahvista istunto</string>
+    <string name="device_manager_verification_status_unknown">Tuntematon vahvistuksen tila</string>
+    <string name="device_manager_verification_status_unverified">Vahvistamaton istunto</string>
+    <string name="device_manager_verification_status_verified">Vahvistettu istunto</string>
+    <string name="a11y_device_manager_device_type_unknown">Tuntematon laitetyyppi</string>
+    <string name="a11y_device_manager_device_type_desktop">Työpöytä</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobiili</string>
+    <string name="device_manager_sessions_other_description">Turvallisuuden vuoksi vahvista istunnot ja kirjaudu ulos niistä istunnoista, joita et tunnista tai et enää käytä.</string>
+    <string name="device_manager_sessions_other_title">Muut istunnot</string>
+    <plurals name="room_removed_messages">
+        <item quantity="one">%d viesti poistettu</item>
+        <item quantity="other">%d viestiä poistettu</item>
+    </plurals>
+    <string name="live_location_labs_promotion_switch_title">Käytä sijainnin jakamista</string>
+    <string name="settings_troubleshoot_test_current_distributor">Tällä hetkellä käytössä %s.</string>
+    <string name="settings_troubleshoot_test_current_distributor_title">Menetelmä</string>
+    <plurals name="settings_troubleshoot_test_distributors_many">
+        <item quantity="one">Löytyi %d menetelmä.</item>
+        <item quantity="other">Löytyi %d menetelmää.</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_distributors_title">Saatavilla olevat menetelmät</string>
+    <string name="settings_notification_method">Ilmoitusmenetelmä</string>
+    <string name="unifiedpush_distributor_background_sync">Taustasynkronointi</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Valitse miten ilmoitukset vastaanotetaan</string>
+    <string name="screen_sharing_notification_description">Näytönjako on päällä</string>
+    <string name="screen_sharing_notification_title">${app_name}-näytönjako</string>
+    <string name="room_message_autocomplete_notification">Huoneilmoitus</string>
+    <string name="room_message_notify_everyone">Ilmoita koko huoneelle</string>
+    <string name="live_location_share_location_item_share">Jaa sijainti</string>
+    <string name="live_location_bottom_sheet_last_updated_at">Päivitetty %1$s sitten</string>
+    <string name="location_share_live_remaining_time">%1$s jäljellä</string>
+    <string name="location_share_external">Avaa sovelluksella</string>
+    <string name="location_share_live_select_duration_option_3">8 tuntia</string>
+    <string name="location_share_live_select_duration_option_2">1 tunti</string>
+    <string name="location_share_live_select_duration_option_1">15 minuuttia</string>
+    <string name="closed_poll_option_description">Tulokset näytetään vain kun lopetat kyselyn</string>
+    <string name="poll_end_room_list_preview">Kysely lopetettu</string>
+    <string name="end_poll_confirmation_approve_button">Lopeta kysely</string>
+    <string name="end_poll_confirmation_title">Lopetetaanko tämä kysely\?</string>
+    <string name="poll_undisclosed_not_ended">Tulokset tulevat näkyviin kun kysely lopetetaan</string>
+    <string name="poll_end_action">Lopeta kysely</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Ei voi toistaa %1$s</string>
+    <string name="a11y_pause_audio_message">Keskeytä %1$s</string>
+    <string name="a11y_play_audio_message">Toista %1$s</string>
+    <string name="a11y_audio_playback_duration" tools:ignore="PluralsCandidate">%1$d minuuttia %2$d sekuntia</string>
+    <string name="space_explore_filter_no_result_title">Tuloksia ei löydy</string>
+    <string name="a11y_open_settings">Avaa asetukset</string>
+    <string name="settings_security_incognito_keyboard_title">Incognito-näppäimistö</string>
+    <string name="settings_sessions_list">Istunnot</string>
+    <string name="permalink_unsupported_groups">Tätä linkkiä ei voi avata: yhteisöt on korvattu avaruuksilla</string>
+    <string name="login_scan_qr_code">Skannaa QR-koodi</string>
+    <string name="ftue_auth_login_username_entry">Käyttäjänimi / sähköposti / puhelin</string>
+    <string name="ftue_auth_captcha_title">Olethan ihminen\?</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Seuraa sähköpostiosoitteeseen %s lähetettyjä ohjeita</string>
+    <string name="ftue_auth_password_reset_confirmation">Salasanan nollaus</string>
+    <string name="ftue_auth_forgot_password">Unohtunut salasana</string>
+    <string name="ftue_auth_email_resend_email">Lähetä sähköposti uudelleen</string>
+    <string name="ftue_auth_email_verification_footer">Etkö saanut sähköpostia\?</string>
+    <string name="ftue_auth_email_verification_subtitle">Seuraa sähköpostiosoitteeseen %s lähetettyjä ohjeita</string>
+    <string name="ftue_auth_email_verification_title">Vahvista sähköpostiosoitteesi</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">Lähetä koodi uudelleen</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">Koodi lähetettiin numeroon %s</string>
+    <string name="ftue_auth_phone_confirmation_title">Vahvista puhelinnumerosi</string>
+    <string name="ftue_auth_sign_out_all_devices">Kirjaudu ulos kaikilta laitteilta</string>
+    <string name="ftue_auth_reset_password">Nollaa salasana</string>
+    <string name="ftue_auth_new_password_subtitle">Vähintään kahdeksan merkkiä.</string>
+    <string name="ftue_auth_new_password_title">Valitse uusi salasana</string>
+    <string name="ftue_auth_new_password_entry_title">Uusi salasana</string>
+    <string name="ftue_auth_reset_password_breaker_title">Tarkista sähköpostisi.</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s lähettää sinulle vahvistuslinkin</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">Vahvistuskoodi</string>
+    <string name="ftue_auth_phone_entry_title">Puhelinnumero</string>
+    <string name="ftue_auth_phone_subtitle">%s haluaa vahvistaa tilisi</string>
+    <string name="ftue_auth_phone_title">Anna puhelinnumerosi</string>
+    <string name="ftue_auth_email_entry_title">Sähköpostiosoite</string>
+    <string name="ftue_auth_email_subtitle">%s haluaa vahvistaa tilisi</string>
+    <string name="ftue_auth_email_title">Anna sähköpostiosoitteesi</string>
+    <string name="ftue_auth_terms_subtitle">Lue palvelimen %s käyttöehdot</string>
+    <string name="ftue_auth_terms_title">Palvelimen käytännöt</string>
+    <string name="ftue_auth_choose_server_ems_title">Haluatko ylläpitää omaa palvelinta\?</string>
+    <string name="ftue_auth_choose_server_entry_hint">Palvelimen verkko-osoite</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Mikä on palvelimesi osoite\?</string>
+    <string name="ftue_auth_choose_server_subtitle">Mikä on palvelimesi osoite\? Se on kuin koti kaikille tiedoillesi</string>
+    <string name="ftue_auth_choose_server_title">Valitse palvelin</string>
+    <string name="ftue_auth_welcome_back_title">Tervetuloa takaisin!</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Muokkaa</string>
+    <string name="ftue_auth_create_account_password_entry_footer">Vähintään kahdeksan merkkiä</string>
+    <string name="ftue_auth_create_account_title">Luo tili</string>
+    <string name="ftue_account_created_take_me_home">Vie minut kotiin</string>
+    <string name="ftue_auth_use_case_join_existing_server">Aikeissa liittyä olemassa olevalle palvelimelle\?</string>
+    <string name="ftue_auth_use_case_option_three">Yhteisöt</string>
+    <string name="ftue_auth_use_case_option_two">Tiimit</string>
+    <string name="ftue_auth_use_case_option_one">Kaverit ja perhe</string>
+    <string name="a11y_open_spaces">Avaa avaruusluettelo</string>
+    <string name="a11y_create_message">Luo uusi keskustelu tai huone</string>
+    <string name="give_feedback_threads">Anna palautetta</string>
+    <string name="push_gateway_item_enabled">Käytössä:</string>
+    <string name="push_gateway_item_device_id">Istunnon ID:</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Katselet jo tätä ketjua!</string>
+    <string name="updating_your_data">Päivitetään tietojasi…</string>
+    <string name="error_check_network">Jokin meni vikaan. Tarkista verkkoyhteys ja yritä uudelleen.</string>
+    <string name="room_list_filter_people">Ihmiset</string>
+    <string name="room_list_filter_favourites">Suosikit</string>
+    <string name="room_list_filter_unreads">Lukemattomat</string>
+    <string name="room_list_filter_all">Kaikki</string>
+    <string name="font_size_use_system">Käytä järjestelmän oletusta</string>
+    <string name="font_size_section_manually">Valitse itse</string>
+    <string name="font_size_section_auto">Aseta automaattisesti</string>
+    <string name="font_size_title">Valitse fontin koko</string>
+    <string name="grant_permission">Myönnä oikeus</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s ja %2$d muu</item>
+        <item quantity="other">%1$s ja %2$d muuta</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s ja %2$s</string>
+    <string name="thread_list_empty_title">Pidä keskustelut organisoituna ketjujen avulla</string>
+    <string name="thread_list_modal_my_threads_title">Omat ketjut</string>
+    <string name="thread_list_modal_all_threads_title">Kaikki ketjut</string>
+    <string name="room_permissions_change_main_address_for_the_space">Muuta avaruuden pääosoitetta</string>
+    <string name="invites_empty_message">Täällä näkyvät uudet pyynnöt ja kutsut.</string>
+    <string name="invites_empty_title">Ei mitään uutta.</string>
+    <string name="invites_title">Kutsut</string>
+    <string name="space_list_empty_message">Avaruudet ovat uusi tapa ryhmitellä huoneita ja ihmisiä. Luo avaruus aloittaaksesi.</string>
+    <string name="space_list_empty_title">Ei avaruuksia vielä.</string>
+    <string name="action_got_it">Selvä</string>
+    <string name="action_next">Seuraava</string>
+    <string name="action_view_threads">Näytä ketjut</string>
+    <string name="onboarding_new_app_layout_spaces_message">Käytä avaruuksia (oikealla alhaalla) nopeammin ja helpommin kuin koskaan aiemmin.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Käytä avaruuksia</string>
+    <string name="explore_rooms">Selaa huoneita</string>
+    <string name="change_space">Vaihda avaruutta</string>
+    <string name="create_room">Luo huone</string>
+    <string name="start_chat">Aloita keskustelu</string>
+    <string name="all_chats">Kaikki keskustelut</string>
+    <string name="onboarding_new_app_layout_button_try">Kokeile</string>
+    <string name="onboarding_new_app_layout_feedback_message">Anna palautetta napauttamalla oikeaa yläkulmaa.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Anna palautetta</string>
+    <string name="onboarding_new_app_layout_welcome_message">${app_name}in yksinkertaistaminen asetti välilehdet valinnaiseksi. Hallitse välilehtiä oikean yläkulman valikosta.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Tervetuloa uuteen näkymään!</string>
+    <string name="labs_enable_new_app_layout_summary">Yksinkertaistettu Element valinnaisilla välilehdillä</string>
+    <string name="labs_enable_new_app_layout_title">Ota uusi asettelu käyttöön</string>
+    <string name="home_layout_preferences_sort_name">A - Ö</string>
+    <string name="home_layout_preferences_sort_activity">Aktiivisuus</string>
+    <string name="home_layout_preferences_sort_by">Järjestysperuste</string>
+    <string name="home_layout_preferences_recents">Näytä viimeisimmät</string>
+    <string name="home_layout_preferences_filters">Näytä suodattimet</string>
+    <string name="home_layout_preferences">Asettelun asetukset</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nvaikuttaa hieman tyhjältä.</string>
+    <string name="create_spaces_invite_public_header">Ketkä ovat tiimikavereitasi\?</string>
+    <string name="create_spaces_private_teammates">Yksityinen avaruus sinulle ja tiimikavereillesi</string>
+    <string name="create_spaces_me_and_teammates">Minä ja tiimikaverit</string>
+    <string name="room_permissions_upgrade_the_space">Päivitä avaruus</string>
+    <string name="room_permissions_change_space_avatar">Vaihda avaruuden kuva</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d valittu</item>
+        <item quantity="other">%1$d valittu</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fi/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-fi/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-fi/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-fi/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-fr-rCA/strings.xml b/library/ui-strings/src/main/res/values-fr-rCA/strings.xml
similarity index 99%
rename from vector/src/main/res/values-fr-rCA/strings.xml
rename to library/ui-strings/src/main/res/values-fr-rCA/strings.xml
index 2ce845a632..94db2935a7 100644
--- a/vector/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui-strings/src/main/res/values-fr-rCA/strings.xml
@@ -359,7 +359,6 @@
     <string name="room_preview_not_found">Ce salon n’est pas accessible en ce moment.
 \nRéessayez plus tard, ou demandez à un administrateur de ce salon de vérifier que vous pouvez y accéder.</string>
     <string name="room_preview_no_preview">Impossible d’avoir un aperçu de ce salon</string>
-    <string name="group_all_communities">Toutes les communautés</string>
     <string name="please_wait">Veuillez patienter…</string>
     <string name="change_room_directory_network">Changer de réseau</string>
     <string name="action_change">Changer</string>
@@ -569,7 +568,6 @@
     <string name="auth_reset_password_error_unauthorized">Impossible de vérifier l’adresse courriel : assurez-vous d’avoir cliqué sur le lien dans l’courriel</string>
     <string name="settings_emails_empty">Aucune adresse courriel n’a été ajoutée à votre compte</string>
     <string name="auth_email_already_defined">Cette adresse courriel est déjà utilisée.</string>
-    <string name="auth_reset_password_missing_email">L’adresse courriel liée à votre compte doit être saisie.</string>
     <string name="notice_crypto_unable_to_decrypt_final">Vous n’avez pas accès à ce message</string>
     <string name="room_settings_set_avatar">Définir l’avatar</string>
     <string name="room_settings_save_success">Vous avez bien changé les paramètres du salon</string>
@@ -780,7 +778,7 @@
     <string name="encryption_export_room_keys">Exporter les clés des salons</string>
     <string name="encryption_export_e2e_room_keys">Exporter les clés E2E des salons</string>
     <string name="encryption_information_device_key">Clé de la session</string>
-    <string name="encryption_information_device_id">Identifiant de session</string>
+    <string name="device_manager_session_details_session_id">Identifiant de session</string>
     <string name="encryption_information_device_name">Nom public</string>
     <string name="encryption_information_decryption_error">Erreur de déchiffrement</string>
     <string name="settings_theme">Thème</string>
@@ -1465,7 +1463,6 @@
     <string name="send_bug_report_include_key_share_history">Inclure l’historique d’échange de clés</string>
     <string name="send_bug_report_include_crash_logs">Envoyer les journaux d’erreur</string>
     <string name="send_bug_report_include_logs">Envoyer les journaux</string>
-    <string name="groups_header">Communautés</string>
     <string name="settings_room_directory_show_all_rooms_summary">Afficher tous les salons dans le répertoire, y compris ceux au contenu choquant.</string>
     <string name="settings_room_directory_show_all_rooms">Afficher les salons au contenu choquant</string>
     <string name="settings_category_room_directory">Répertoire des salons</string>
@@ -1746,8 +1743,6 @@
     <string name="event_status_sent_message">Message envoyé</string>
     <string name="initial_sync_start_importing_account_data">Synchronisation initiale :
 \nImportation des données du compte</string>
-    <string name="initial_sync_start_importing_account_groups">Synchronisation initiale :
-\nImportation des communautés</string>
     <string name="initial_sync_start_importing_account_left_rooms">Synchronisation initiale :
 \nImportation des salons que vous avez quittés</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Synchronisation initiale :
diff --git a/vector/src/main/res/values-fr-rCA/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-fr-rCA/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-fr-rCA/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-fr-rCA/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml
similarity index 88%
rename from vector/src/main/res/values-fr/strings.xml
rename to library/ui-strings/src/main/res/values-fr/strings.xml
index 07849141b6..33f1410502 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings.xml
@@ -52,8 +52,6 @@
 \nImportation des salons où vous avez été invité</string>
     <string name="initial_sync_start_importing_account_left_rooms">Synchronisation initiale :
 \nImportation des salons que vous avez quittés</string>
-    <string name="initial_sync_start_importing_account_groups">Synchronisation initiale :
-\nImportation des communautés</string>
     <string name="initial_sync_start_importing_account_data">Synchronisation initiale :
 \nImportation des données du compte</string>
     <string name="notice_room_update">%s a mis à niveau ce salon.</string>
@@ -348,7 +346,7 @@
     <string name="room_settings_unset_main_address">Désactiver comme adresse principale</string>
     <string name="encryption_information_decryption_error">Erreur de déchiffrement</string>
     <string name="encryption_information_device_name">Nom public</string>
-    <string name="encryption_information_device_id">Identifiant de session</string>
+    <string name="device_manager_session_details_session_id">Identifiant de session</string>
     <string name="encryption_information_device_key">Clé de la session</string>
     <string name="encryption_export_e2e_room_keys">Exporter les clés E2E des salons</string>
     <string name="encryption_export_room_keys">Exporter les clés des salons</string>
@@ -375,7 +373,6 @@
     <string name="auth_invalid_email">Ceci ne ressemble pas à une adresse électronique valide</string>
     <string name="auth_email_already_defined">Cette adresse électronique est déjà utilisée.</string>
     <string name="auth_recaptcha_message">Ce serveur d’accueil souhaite s’assurer que vous n’êtes pas un robot</string>
-    <string name="auth_reset_password_missing_email">L’adresse électronique liée à votre compte doit être saisie.</string>
     <string name="auth_reset_password_error_unauthorized">Impossible de vérifier l’adresse électronique : assurez-vous d’avoir cliqué sur le lien dans le courriel</string>
     <string name="login_error_limit_exceeded">Trop de requêtes ont été envoyées</string>
     <string name="action_leave">Quitter</string>
@@ -474,7 +471,6 @@
     <string name="notification_noisy">Notification sonore</string>
     <string name="encrypted_message">Message chiffré</string>
     <string name="loading">Chargement…</string>
-    <string name="groups_header">Communautés</string>
     <string name="start_voice_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel audio \?</string>
     <string name="start_video_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel vidéo \?</string>
     <string name="room_participants_ban_prompt_msg">Bannir un utilisateur va l’expulser du salon et l’empêcher de le rejoindre à nouveau.</string>
@@ -854,7 +850,6 @@
     <string name="create_new_room">Créer un nouveau salon</string>
     <string name="error_no_network">Aucun réseau. Vérifiez votre connexion Internet.</string>
     <string name="action_change">Changer</string>
-    <string name="group_all_communities">Toutes les communautés</string>
     <string name="room_preview_no_preview">Impossible d’avoir un aperçu de ce salon</string>
     <string name="fab_menu_create_room">Salons</string>
     <string name="fab_menu_create_chat">Conversations privées</string>
@@ -874,10 +869,10 @@
     <string name="settings_push_rules">Règles de notification</string>
     <string name="settings_push_rules_no_rules">Aucune règle de notification définie</string>
     <string name="settings_push_gateway_no_pushers">Aucune passerelle de notification enregistrée</string>
-    <string name="push_gateway_item_app_id">app_id :</string>
-    <string name="push_gateway_item_push_key">push_key :</string>
-    <string name="push_gateway_item_app_display_name">app_display_name :</string>
-    <string name="push_gateway_item_device_name">session_name :</string>
+    <string name="push_gateway_item_app_id">App ID :</string>
+    <string name="push_gateway_item_push_key">Clé Push :</string>
+    <string name="push_gateway_item_app_display_name">Nom d’affichage de l’application :</string>
+    <string name="push_gateway_item_device_name">Nom d’affichage de la session :</string>
     <string name="push_gateway_item_url">URL :</string>
     <string name="push_gateway_item_format">Format :</string>
     <string name="preference_voice_and_video">Voix et vidéo</string>
@@ -939,11 +934,11 @@
     <string name="settings_discovery_identity_server_info">Vous utilisez actuellement %1$s pour découvrir et être découvrable par les contacts existants que vous connaissez.</string>
     <string name="settings_discovery_identity_server_info_none">Vous n’utilisez actuellement aucun serveur d’identité. Pour découvrir et être découvrable par les contacts existants que vous connaissez, configurez-en un ci-dessous.</string>
     <string name="settings_discovery_emails_title">Adresses électronique découvrables</string>
-    <string name="settings_discovery_no_mails">Les options de découverte apparaîtront quand vous aurez ajouté un courriel.</string>
+    <string name="settings_discovery_no_mails">Les options de découverte apparaîtront quand vous aurez ajouté une adresse courriel.</string>
     <string name="settings_discovery_no_msisdn">Les options de découverte apparaîtront quand vous aurez ajouté un numéro de téléphone.</string>
     <string name="settings_discovery_disconnect_identity_server_info">La déconnexion du serveur d’identité signifie que vous ne pourrez plus être découvrable par les autres utilisateurs et que vous ne pourrez plus inviter d’autres personnes par courriel ou par téléphone.</string>
     <string name="settings_discovery_msisdn_title">Numéros de téléphone découvrables</string>
-    <string name="settings_discovery_confirm_mail">Nous vous avons envoyé un courriel de confirmation à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
+    <string name="settings_discovery_confirm_mail">Nous vous avons envoyé un courriel à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
     <string name="settings_discovery_enter_identity_server">Renseignez l’URL d’un serveur d’identité</string>
     <string name="settings_discovery_bad_identity_server">Impossible de se connecter au serveur d’identité</string>
     <string name="settings_discovery_please_enter_server">Veuillez renseigner l’URL du serveur d’identité</string>
@@ -1071,7 +1066,7 @@
     <string name="login_registration_not_supported">L’application ne peut pas créer de compte sur ce serveur d’accueil.
 \n
 \nVoulez-vous vous inscrire en utilisant un client web \?</string>
-    <string name="login_login_with_email_error">Ce courriel n’est associé à aucun compte.</string>
+    <string name="login_login_with_email_error">Cette adresse de courriel n’est associée à aucun compte.</string>
     <string name="login_reset_password_on">Réinitialiser le mot de passe sur %1$s</string>
     <string name="login_reset_password_notice">Un courriel de vérification sera envoyé à votre adresse pour confirmer la configuration de votre nouveau mot de passe.</string>
     <string name="login_reset_password_submit">Suivant</string>
@@ -1080,7 +1075,7 @@
     <string name="login_reset_password_warning_title">Attention !</string>
     <string name="login_reset_password_warning_content">Le changement de mot de passe réinitialisera toutes les clés de chiffrement sur toutes vos sessions, rendant l’historique des discussions chiffrées illisible. Configurez la sauvegarde de clés ou exportez vos clés de salon depuis une autre session avant de réinitialiser votre mot de passe.</string>
     <string name="login_reset_password_warning_submit">Poursuivre</string>
-    <string name="login_reset_password_error_not_found">Ce courriel n’est lié à aucun compte</string>
+    <string name="login_reset_password_error_not_found">Ce adresse de courriel n’est liée à aucun compte</string>
     <string name="login_reset_password_mail_confirmation_title">Vérifiez votre boîte de réception</string>
     <string name="login_reset_password_mail_confirmation_notice">Un courriel de vérification a été envoyé à %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Touchez le lien pour confirmer votre nouveau mot de passe. Après avoir suivi le lien qu’il contient, cliquez ci-dessous.</string>
@@ -1094,7 +1089,7 @@
 \n
 \nArrêter le processus de changement \?</string>
     <string name="login_set_email_title">Définir l’adresse électronique</string>
-    <string name="login_set_email_notice">Définir une adresse électronique pour récupérer votre compte. Plus tard, vous pourrez éventuellement autoriser des personnes à vous retrouver avec votre adresse électronique.</string>
+    <string name="login_set_email_notice">Définir une adresse de courriel pour récupérer votre compte. Plus tard, vous pourrez éventuellement autoriser des personnes à vous retrouver avec cette adresse.</string>
     <string name="login_set_email_mandatory_hint">Courriel</string>
     <string name="login_set_email_optional_hint">Courriel (facultatif)</string>
     <string name="login_set_email_submit">Suivant</string>
@@ -1437,7 +1432,7 @@
     <string name="event_redacted">Message supprimé</string>
     <string name="settings_show_redacted">Afficher les messages supprimés</string>
     <string name="settings_show_redacted_summary">Afficher un remplaçant pour les messages supprimés</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Nous vous avons envoyé un courriel de confirmation à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Nous vous avons envoyé un courriel à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
     <string name="settings_text_message_sent_wrong_code">Le code de vérification n’est pas correct.</string>
     <string name="uploads_media_title">MÉDIA</string>
     <string name="uploads_media_no_result">Il n’y a aucun média dans ce salon</string>
@@ -1460,7 +1455,7 @@
     <string name="identity_server_error_outdated_home_server">Cette opération n’est pas possible. Le serveur d’accueil est obsolète.</string>
     <string name="identity_server_error_no_identity_server_configured">Veuillez d’abord configurer un serveur d’identité.</string>
     <string name="identity_server_error_terms_not_signed">Veuillez d’abord accepter les termes du serveur d’identité dans les paramètres.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Pour votre vie privée, ${app_name} prend uniquement en charge l’envoi des adresses électronique et des numéros de téléphone hachés.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Pour votre vie privée, ${app_name} prend uniquement en charge l’envoi des adresses de courriel et des numéros de téléphone hachés.</string>
     <string name="identity_server_error_binding_error">L’association a échoué.</string>
     <string name="identity_server_error_no_current_binding_error">Il n’y a actuellement aucune association avec cet identifiant.</string>
     <string name="identity_server_set_default_notice">Votre serveur d’accueil (%1$s) propose d’utiliser %2$s comme serveur d’identité</string>
@@ -1674,7 +1669,7 @@
     <string name="error_threepid_auth_failed">Assurez-vous d\'avoir cliqué sur le lien envoyé par courriel.</string>
     <string name="settings_remove_three_pid_confirmation_content">Supprimer %s \?</string>
     <string name="settings_phone_numbers">Numéros de téléphone</string>
-    <string name="settings_emails_empty">Aucune adresse électronique n’a été ajoutée à votre compte</string>
+    <string name="settings_emails_empty">Aucune adresse de courriel n’a été ajoutée à votre compte</string>
     <string name="settings_emails">Adresses électroniques</string>
     <string name="settings_phone_number_empty">Aucun numéro de téléphone n’a été ajouté à votre compte</string>
     <string name="search_banned_user_hint">Filtrer les utilisateurs exclus</string>
@@ -1739,7 +1734,7 @@
     <string name="attachment_viewer_item_x_of_y">%1$d de %2$d</string>
     <string name="settings_discovery_consent_action_give_consent">Autoriser</string>
     <string name="settings_discovery_consent_action_revoke">Révoquer mon autorisation</string>
-    <string name="settings_discovery_consent_notice_on">Vous avez donné votre autorisation pour envoyer des courriels et des numéros de téléphone à ce serveur d’identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
+    <string name="settings_discovery_consent_notice_on">Vous avez donné votre autorisation pour envoyer des adresses de courriel et des numéros de téléphone à ce serveur d’identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
     <string name="settings_discovery_consent_title">Envoyer des courriels et des numéros de téléphone</string>
     <string name="direct_room_user_list_suggestions_title">Suggestions</string>
     <string name="direct_room_user_list_known_title">Utilisateurs connus</string>
@@ -2147,7 +2142,7 @@
     <string name="settings_notification_mentions_and_keywords">Mentions et mots-clés</string>
     <string name="settings_notification_default">Notifications par défaut</string>
     <string name="link_this_email_with_your_account">%s dans les paramètres pour recevoir les invitations directement dans ${app_name}.</string>
-    <string name="link_this_email_settings_link">Lier ce courriel à votre compte</string>
+    <string name="link_this_email_settings_link">Lier cette adresse de courriel à votre compte</string>
     <string name="this_invite_to_this_space_was_sent">Cette invitation à cette espace a été envoyée à %s qui n’est pas associé à votre compte</string>
     <string name="this_invite_to_this_room_was_sent">Cette invitation à ce salon a été envoyée à %s qui n’est pas associé à votre compte</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Tous les salons dans lesquels vous vous trouvez seront affichés sur l’Accueil.</string>
@@ -2263,7 +2258,7 @@
     <string name="create_poll_question_title">Question ou sujet du sondage</string>
     <string name="create_poll_title">Créer un sondage</string>
     <string name="attachment_type_poll">Sondage</string>
-    <string name="identity_server_consent_dialog_title_2">Envoyer des courriels et des numéros de téléphone à %s</string>
+    <string name="identity_server_consent_dialog_title_2">Envoyer des adresses de courriel et des numéros de téléphone à %s</string>
     <string name="settings_discovery_consent_notice_off_2">Vos contacts sont personnels et privés. Pour découvrir des utilisateurs à partir de vos contacts, nous avons besoin de votre permission pour envoyer les informations des contacts à votre serveur d’identité.</string>
     <string name="shortcut_disabled_reason_sign_out">La session a été déconnectée !</string>
     <string name="shortcut_disabled_reason_room_left">Le salon a été quitté !</string>
@@ -2426,7 +2421,6 @@
     <string name="ftue_profile_picture_title">Ajouter une photo de profil</string>
     <string name="ftue_display_name_entry_footer">Vous pourrez le changer plus tard</string>
     <string name="ftue_display_name_entry_title">Nom d’affichage</string>
-    <string name="ftue_display_name_subtitle">Il sera affiché quand vous enverrez des messages.</string>
     <string name="ftue_display_name_title">Choisissez un nom d’affichage</string>
     <string name="ftue_account_created_subtitle">Votre compte %s a été créé</string>
     <string name="ftue_account_created_congratulations_title">Félicitations !</string>
@@ -2482,7 +2476,6 @@
 \nCette action va redémarrer l’application et pourra prendre du temps.</string>
     <string name="initial_sync_request_title">Requête de synchronisation initiale</string>
     <string name="live_location_bottom_sheet_last_updated_at">Mis-à-jour il y a %1$s</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Arrêter le partage</string>
     <string name="labs_enable_live_location_summary">Implémentation temporaire : les positions sont persistantes dans l’historique du salon</string>
     <string name="labs_enable_live_location">Activer le partage de position en continu</string>
     <string name="location_share_live_remaining_time">%1$s restant</string>
@@ -2603,4 +2596,298 @@
     </plurals>
     <string name="search_space_two_parents">%1$s et %2$s</string>
     <string name="auth_reset_password_error_unverified">Courriel non vérifié, relevez votre boîte de réception</string>
+    <string name="location_share_loading_map_error">Impossible de charger la carte
+\nCe serveur d’accueil n’a peut-être pas été configuré pour afficher les cartes.</string>
+    <string name="a11y_open_settings">Ouvrir les paramètres</string>
+    <string name="all_chats">Toutes les conversations</string>
+    <string name="device_manager_sessions_other_description">Pour une meilleure sécurité, vérifiez vos sessions et déconnectez toutes les sessions que vous ne connaissez pas ou que vous n’utilisez plus.</string>
+    <string name="device_manager_sessions_other_title">Autres sessions</string>
+    <string name="settings_sessions_list">Sessions</string>
+    <string name="a11y_open_spaces">Ouvrir la liste des espaces</string>
+    <string name="a11y_create_message">Créer une nouvelle conversation ou salon</string>
+    <string name="room_list_filter_people">Personnes</string>
+    <string name="room_list_filter_favourites">Favoris</string>
+    <string name="room_list_filter_unreads">Non lus</string>
+    <string name="room_list_filter_all">Tous</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Activité</string>
+    <string name="home_layout_preferences_sort_by">Trier par</string>
+    <string name="home_layout_preferences_recents">Afficher les récents</string>
+    <string name="home_layout_preferences_filters">Afficher les filtres</string>
+    <string name="home_layout_preferences">Préférences de présentation</string>
+    <string name="explore_rooms">Parcourir les salons</string>
+    <string name="create_room">Créer un salon</string>
+    <string name="start_chat">Commencer une discussion</string>
+    <string name="device_manager_other_sessions_description_unverified">Non vérifiée · Dernière activité %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Vérifié · Dernière activité %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Tout voir (%1$d)</string>
+    <string name="device_manager_view_details">Voir les détails</string>
+    <string name="device_manager_verify_session">Vérifier la session</string>
+    <string name="device_manager_verification_status_unverified">Session non vérifiée</string>
+    <string name="device_manager_verification_status_verified">Session vérifiée</string>
+    <string name="a11y_device_manager_device_type_unknown">Type de périphérique inconnu</string>
+    <string name="a11y_device_manager_device_type_desktop">Ordinateur</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Portable</string>
+    <string name="timeline_error_room_not_found">Désolé, impossible de trouver ce salon.
+\nVeuillez réessayer plus tard.%s</string>
+    <string name="invites_title">Invitations</string>
+    <string name="onboarding_new_app_layout_button_try">Essayez</string>
+    <string name="onboarding_new_app_layout_feedback_message">Appuyez en haut à droite pour les options des avis.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Donner mon avis</string>
+    <string name="onboarding_new_app_layout_spaces_message">Accédez à vos espaces (en bas à droite) plus rapidement et facilement qu’avant.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Accéder aux espaces</string>
+    <string name="onboarding_new_app_layout_welcome_message">Pour simplifier Element, les onglets sont désormais facultatifs. Gérez les depuis le menu en haut à droite.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Bienvenu dans une nouvelle vue !</string>
+    <string name="home_empty_no_unreads_message">C\'est ici que vos messages non-lus s’afficheront lorsque vous en aurez.</string>
+    <string name="home_empty_no_unreads_title">Rien à signaler.</string>
+    <string name="home_empty_no_rooms_message">La messagerie sécurisée tout-en-un pour les équipes, les amis, et les organisations. Créez une discussion ou rejoignez un salon pour démarrer.</string>
+    <string name="home_empty_no_rooms_title">Bienvenue dans ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Les espaces sont un nouveau moyen de grouper les salons et les gens. Ajoutez un salon, ou créez en un nouveau à l’aide du bouton en bas à droite.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\na l’air un peu vide.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Pensez à vous déconnecter des anciennes sessions (%1$d jour ou plus) que vous n’utilisez plus.</item>
+        <item quantity="other">Pensez à vous déconnecter des anciennes sessions (%1$d jours ou plus) que vous n’utilisez plus.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Sessions inactives</string>
+    <string name="device_manager_unverified_sessions_description">Vérifier ou déconnecter les sessions non vérifiées.</string>
+    <string name="device_manager_unverified_sessions_title">Sessions non vérifiées</string>
+    <string name="device_manager_header_section_security_recommendations_description">Améliorez la sécurité de votre compte à l’aide de ces recommandations.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Recommandations de sécurité</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inactif depuis %1$d+ jour (%2$s)</item>
+        <item quantity="other">Inactif depuis %1$d+ jours (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">C’est l’endroit où se trouveront vos nouvelles requêtes et invitations.</string>
+    <string name="invites_empty_title">Rien de neuf.</string>
+    <string name="space_list_empty_message">Les espaces sont un nouveau moyen de regrouper les salons et les gens. Créez un espace pour commencer.</string>
+    <string name="space_list_empty_title">Pas d’espace pour l’instant.</string>
+    <string name="a11y_collapse_space_children">Réduire %s enfants</string>
+    <string name="a11y_expand_space_children">Développer %s enfants</string>
+    <string name="change_space">Changer d’espace</string>
+    <string name="device_manager_session_details_device_ip_address">Adresse IP</string>
+    <string name="device_manager_session_details_session_last_activity">Dernière activité</string>
+    <string name="device_manager_session_details_session_name">Nom de la session</string>
+    <string name="device_manager_session_details_description">Application, appareil et information sur l’activité.</string>
+    <string name="device_manager_session_details_title">Détails de session</string>
+    <string name="device_manager_other_sessions_clear_filter">Supprimer les filtres</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Aucune session inactive n’a été trouvée.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Aucune session non vérifiée n’a été trouvée.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Aucune session vérifiée n’a été trouvée.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Pensez à vous déconnecter des anciennes sessions (%1$d jour ou plus) que vous n’utilisez plus.</item>
+        <item quantity="other">Pensez à vous déconnecter des anciennes sessions (%1$d jours ou plus) que vous n’utilisez plus.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inactif</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Vérifiez vos sessions pour améliorer la sécurité de votre messagerie, ou déconnectez celles que vous ne connaissez pas ou n’utilisez plus.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Non vérifié</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Pour une meilleure sécurité, déconnectez toutes les sessions que vous ne connaissez pas ou que vous n’utilisez plus.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Vérifié</string>
+    <string name="a11y_device_manager_filter">Filtrer</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Inactif depuis %1$d jour ou plus</item>
+        <item quantity="other">Inactif depuis %1$d jours ou plus</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inactif</string>
+    <string name="device_manager_filter_option_unverified_description">Pas prêt pour une messagerie sécurisée</string>
+    <string name="device_manager_filter_option_unverified">Non vérifié</string>
+    <string name="device_manager_filter_option_verified_description">Prêt pour une messagerie sécurisée</string>
+    <string name="device_manager_filter_option_verified">Vérifié</string>
+    <string name="device_manager_filter_option_all_sessions">Toutes les sessions</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filtrer</string>
+    <string name="device_manager_session_last_activity">Dernière activité %1$s</string>
+    <string name="device_manager_device_title">Appareil</string>
+    <string name="device_manager_session_title">Session</string>
+    <string name="device_manager_current_session_title">Cette session</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Vérifiez ou déconnectez cette session pour une meilleure sécurité et fiabilité.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Vérifiez votre session pour une sécurité accrue de votre messagerie.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Cette session est prête pour l’envoi de messages sécurisés.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Votre session est prête pour l’envoi de messages sécurisés.</string>
+    <string name="labs_enable_deferred_dm_summary">Créer la conversation seulement lors du premier message</string>
+    <string name="labs_enable_deferred_dm_title">Activer les conversations privées différées</string>
+    <string name="labs_enable_new_app_layout_summary">Un Element simplifié avec des onglets optionnels</string>
+    <string name="labs_enable_new_app_layout_title">Activer la nouvelle présentation</string>
+    <string name="device_manager_learn_more_session_rename">Les autres utilisateurs en conversations privées ou salons qui peuvent vous parler sont capables de voir la liste complète de vos sessions.
+\n
+\nCela leur fournit une preuve de confiance que c’est bien avec vous qu\'ils communiquent, mais cela veut également dire qu’ils peuvent voir le nom de la session que vous saisissez ici.</string>
+    <string name="device_manager_learn_more_session_rename_title">Renommer les sessions</string>
+    <string name="device_manager_learn_more_sessions_verified">Les sessions vérifiées sont celles qui sont identifiées avec votre mot de passe puis vérifiée, soit à l’aide de votre phrase de sécurité, ou bien par la vérification croisée.
+\n
+\nCela signifie qu’elles possèdent les clés de chiffrement de vos messages passés, et certifient aux autres utilisateurs avec qui vous communiquez que ces sessions viennent vraiment de vous.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sessions vérifiées</string>
+    <string name="device_manager_learn_more_sessions_unverified">Les sessions non vérifiées sont celles qui sont identifiées avec votre mot de passe sans avoir fait de vérification croisée.
+\n
+\nVous devriez tout particulièrement vous assurer de reconnaître ces sessions, car elles pourraient être la preuve d’un usage non autorisé de votre compte.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sessions non vérifiées</string>
+    <string name="device_manager_learn_more_sessions_inactive">Les sessions inactives sont celles que vous n’avez pas utilisées depuis un certain temps, mais qui continue de recevoir les clés de chiffrements.
+\n
+\nLa suppression des sessions inactives améliore la sécurité et la performance, et vous aide à identifier si une nouvelle session est douteuse.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sessions inactives</string>
+    <string name="device_manager_session_rename_warning">Soyez conscient que les noms de sessions sont également visibles pour les personnes avec lesquelles vous communiquez.</string>
+    <string name="device_manager_session_rename_description">Les noms de sessions personnalisés peuvent vous aider à reconnaître vos appareils plus facilement.</string>
+    <string name="device_manager_session_rename_edit_hint">Nom de la session</string>
+    <string name="device_manager_session_rename">Renommer la session</string>
+    <string name="device_manager_session_overview_signout">Se déconnecter de cette session</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Non vérifiée · Votre session actuelle</string>
+    <string name="tooltip_attachment_voice_broadcast">Démarrer une diffusion audio</string>
+    <string name="key_authenticity_not_guaranteed">L’authenticité de ce message chiffré ne peut pas être garantie sur cet appareil.</string>
+    <string name="settings_security_incognito_keyboard_summary">Demande au clavier de ne pas mettre à jour les données personnalisées, comme l’historique de la frappe et le dictionnaire composé de ce que vous avez tapé dans vos conversations. Il est possible que certains claviers ne respectent pas ce paramètre.</string>
+    <string name="settings_security_incognito_keyboard_title">Clavier incognito</string>
+    <string name="command_description_table_flip">Préfixe le message par (╯°□°）╯︵ ┻━┻</string>
+    <string name="attachment_type_voice_broadcast">Diffusion audio</string>
+    <string name="command_description_devtools">Ouvrir l’écran des outils développeurs</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Vous avez activé le chiffrement vers les sessions vérifiées uniquement, pour tous les salons, dans les paramètres Sécurité.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Il y a des appareils non vérifiés dans ce salon, ils ne pourront pas déchiffrer vos messages envoyés.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Ne jamais envoyer de messages chiffrés aux sessions non vérifiées dans ce salon.</string>
+    <string name="action_got_it">Compris</string>
+    <string name="rich_text_editor_format_underline">Souligner le texte</string>
+    <string name="rich_text_editor_format_strikethrough">Barrer le texte</string>
+    <string name="rich_text_editor_format_italic">Mettre en italique</string>
+    <string name="rich_text_editor_format_bold">Mettre en gras</string>
+    <string name="labs_enable_client_info_recording_summary">Enregistre le nom du client, sa version, et son URL pour retrouvez vos sessions plus facilement dans le gestionnaire de sessions.</string>
+    <string name="labs_enable_client_info_recording_title">Activer l’enregistrement des informations du client</string>
+    <string name="labs_enable_session_manager_summary">Ayez une meilleur visibilité et plus de contrôle sur toutes vos sessions.</string>
+    <string name="labs_enable_session_manager_title">Activer le nouveau gestionnaire de session</string>
+    <string name="device_manager_session_details_device_operating_system">Système d’exploitation</string>
+    <string name="device_manager_session_details_device_model">Modèle</string>
+    <string name="device_manager_session_details_device_browser">Navigateur</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Version</string>
+    <string name="device_manager_session_details_application_name">Nom</string>
+    <string name="device_manager_session_details_application">Application</string>
+    <string name="device_manager_push_notifications_description">Recevoir les notifications push sur cette session.</string>
+    <string name="device_manager_push_notifications_title">Notifications push</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Vérifiez votre session actuelle pour découvrir le statut de vérification de cette session.</string>
+    <string name="device_manager_verification_status_unknown">Status de vérification inconnu</string>
+    <string name="push_gateway_item_enabled">Activer :</string>
+    <string name="push_gateway_item_device_id">Identifiant de session :</string>
+    <string name="error_check_network">Quelque chose s’est mal passé. Vérifiez votre connexion réseau et réessayez.</string>
+    <string name="grant_permission">Accorder la permission</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} a besoin d’une permission pour afficher les notifications.
+\nVeuillez accorder la permission.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} a besoin de la permission pour afficher les notifications. Les notifications peuvent afficher vos messages, vos invitations, etc.
+\n
+\nVeuillez autoriser l’accès sur la prochaine fenêtre pour pouvoir voir des notifications.</string>
+    <string name="labs_enable_rich_text_editor_summary">Essayer l’éditeur de texte formaté (le mode texte brut arrive bientôt)</string>
+    <string name="labs_enable_rich_text_editor_title">Activer l’éditeur de texte formaté</string>
+    <string name="qr_code_login_confirm_security_code_description">Vérifiez l’origine de ce code. En appairant un appareil, vous lui fournissez un accès complet à votre compte.</string>
+    <string name="qr_code_login_confirm_security_code">Confirmer</string>
+    <string name="qr_code_login_try_again">Réessayez</string>
+    <string name="qr_code_login_status_no_match">Pas de correspondance \?</string>
+    <string name="qr_code_login_signing_in">Connexion</string>
+    <string name="qr_code_login_connecting_to_device">Connexion à l’appareil</string>
+    <string name="qr_code_login_scan_qr_code_button">Scanner le QR code</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Connexion sur un appareil mobile \?</string>
+    <string name="qr_code_login_show_qr_code_button">Afficher le QR code sur cet appareil</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Sélectionnez « Scanner le QR code »</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Démarrez à l’écran de connexion</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Sélectionnez « Se connecter avec un QR code »</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Démarrez à l’écran de connexion</string>
+    <string name="qr_code_login_new_device_instruction_3">Sélectionnez « Afficher le QR code »</string>
+    <string name="qr_code_login_new_device_instruction_2">Allez dans Réglages -&gt; Confidentialité et sécurité</string>
+    <string name="qr_code_login_new_device_instruction_1">Ouvrez l’application sur votre autre appareil</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Le serveur d’accueil ne prend pas en charge la connexion avec un QR code.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">La connexion a été annulée sur l’autre appareil.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Ce QR code est invalide.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">L’autre appareil doit être connecté.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">L’autre appareil est déjà connecté.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">La configuration de la messagerie sécurisée a rencontré un problème de sécurité. Un des éléments suivants pourrait être compromis : votre serveur d’accueil ; votre connexion Internet ; votre (vos) appareil(s) ;</string>
+    <string name="qr_code_login_header_failed_other_description">La requête a échoué.</string>
+    <string name="qr_code_login_header_failed_denied_description">La requête a été refusée sur l’autre appareil.</string>
+    <string name="qr_code_login_header_failed_timeout_description">L’appairage n’a pas été effectué dans le temps imparti.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">L’appairage avec cet appareil n’est pas pris en charge.</string>
+    <string name="qr_code_login_header_failed_title">Échec de la connexion</string>
+    <string name="qr_code_login_header_connected_description">Vérifiez votre appareil connecté, le code ci-dessous devrait y être affiché. Confirmez que le code ci-dessous correspond à celui de l’autre appareil :</string>
+    <string name="qr_code_login_header_connected_title">Connexion sécurisée établie</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scannez le QR code ci-dessous avec l’appareil qui n’est pas connecté.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Utilisez votre appareil connecté pour scanner le QR code ci-dessous :</string>
+    <string name="qr_code_login_header_show_qr_code_title">Se connecter avec un QR code</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Utilisez l’appareil photo de cet appareil pour scanner le QR code affiché sur votre autre appareil :</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Scanner le QR code</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="labs_enable_voice_broadcast_summary">Pouvoir enregistrer et envoyer une diffusion audio dans l’historique du salon.</string>
+    <string name="labs_enable_voice_broadcast_title">Activer la diffusion audio</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Vous pouvez utiliser cet appareil pour connecter un appareil mobile ou un client web avec un QR code. Il y a deux façons de le faire :</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Se connecter avec un QR code</string>
+    <string name="login_scan_qr_code">Scanner le QR code</string>
+    <string name="a11y_voice_broadcast_buffering">Mise en mémoire tampon…</string>
+    <string name="a11y_pause_voice_broadcast">Mettre en pause la diffusion audio</string>
+    <string name="a11y_play_voice_broadcast">Lire ou continuer la diffusion audio</string>
+    <string name="a11y_stop_voice_broadcast_record">Arrêter l’enregistrement de la diffusion audio</string>
+    <string name="a11y_pause_voice_broadcast_record">Mettre en pause l’enregistrement de la diffusion audio</string>
+    <string name="a11y_resume_voice_broadcast_record">Continuer l’enregistrement de la diffusion audio</string>
+    <string name="voice_broadcast_live">Direct</string>
+    <string name="device_manager_other_sessions_select">Sélectionner des sessions</string>
+    <string name="attachment_type_selector_contact">Contact</string>
+    <string name="attachment_type_selector_camera">Appareil photo</string>
+    <string name="attachment_type_selector_location">Position</string>
+    <string name="attachment_type_selector_poll">Sondages</string>
+    <string name="attachment_type_selector_voice_broadcast">Diffusion audio</string>
+    <string name="attachment_type_selector_file">Pièces jointes</string>
+    <string name="attachment_type_selector_sticker">Autocollants</string>
+    <string name="attachment_type_selector_gallery">Galerie photo</string>
+    <string name="action_deselect_all">Tout désélectionner</string>
+    <string name="action_select_all">Tout sélectionner</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d sélectionné</item>
+        <item quantity="other">%1$d sélectionnés</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">Basculer en mode plein écran</string>
+    <string name="attachment_type_selector_text_formatting">Formatage de texte</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Vous êtes déjà en train de réaliser une diffusion audio. Veuillez terminer votre diffusion audio actuelle pour en démarrer une nouvelle.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Une autre personne est déjà en train de réaliser une diffusion audio. Attendez que sa diffusion audio soit terminée pour en démarrer une nouvelle.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Vous n’avez pas les permissions requises pour démarrer une nouvelle diffusion audio dans ce salon. Contactez un administrateur du salon pour mettre-à-jour vos permissions.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Impossible de commencer une nouvelle diffusion audio</string>
+    <string name="a11y_voice_broadcast_fast_forward">Avance rapide de 30 secondes</string>
+    <string name="a11y_voice_broadcast_fast_backward">Retour rapide de 30 secondes</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Les sessions vérifiées sont toutes celles qui utilisent ce compte après avoir saisie la phrase de sécurité ou confirmé votre identité à l’aide d’une autre session vérifiée.
+\n
+\nCela veut dire qu’elles disposent de toutes les clés nécessaires pour lire les messages chiffrés, et confirment aux autres utilisateurs que vous faites confiance à cette session.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Déconnecter %1$d session</item>
+        <item quantity="other">Déconnecter %1$d sessions</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Déconnecter</string>
+    <string name="voice_broadcast_recording_time_left">%1$s restant</string>
+    <string name="message_reply_to_sender_created_poll">a créé un sondage.</string>
+    <string name="message_reply_to_sender_sent_sticker">a envoyé un autocollant.</string>
+    <string name="message_reply_to_sender_sent_video">a envoyé une vidéo.</string>
+    <string name="message_reply_to_sender_sent_image">a envoyé une image.</string>
+    <string name="message_reply_to_sender_sent_voice_message">envoyer un message vocal.</string>
+    <string name="message_reply_to_sender_sent_audio_file">a envoyé un fichier audio.</string>
+    <string name="message_reply_to_sender_sent_file">a envoyé un fichier.</string>
+    <string name="message_reply_to_prefix">En réponse à</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Masquer l’adresse IP</string>
+    <string name="device_manager_other_sessions_show_ip_address">Afficher l’adresse IP</string>
+    <string name="quoting">Citation de</string>
+    <string name="replying_to">Réponse à %s</string>
+    <string name="editing">Modification</string>
+    <string name="settings_enable_direct_share_summary">Affiche les conversations récentes dans le menu de partage du système</string>
+    <string name="settings_enable_direct_share_title">Activer le partage direct</string>
+    <string name="review_unverified_sessions_description">Vérifiez pour assurer la sécurité de votre compte</string>
+    <string name="review_unverified_sessions_title">Vous avez des sessions non vérifiées</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Cette session ne prend pas en charge le chiffrement, elle ne peut donc pas être vérifiée.
+\n
+\nVous ne pourrez pas participer dans les salons où le chiffrement est activé en utilisant cette session.
+\n
+\nPour de meilleures sécurité et confidentialité, il est recommandé d’utiliser des clients Matrix qui prennent en charge le chiffrement.</string>
+    <string name="device_manager_signout_all_other_sessions">Déconnecter toutes les autres sessions</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Cette session ne prend pas en charge le chiffrement, elle ne peut donc pas être vérifiée.</string>
+    <string name="voice_broadcast_live_broadcast">Diffusion en direct</string>
+    <string name="settings_nightly_build_update">Obtenir la toute dernière version (note : vous pourriez avoir des problèmes pour vous connecter)</string>
+    <string name="settings_nightly_build">Version Nightly</string>
+    <string name="notice_voice_broadcast_ended_by_you">Vous avez terminé une diffusion audio.</string>
+    <string name="notice_voice_broadcast_ended">%1$s a terminé une diffusion audio.</string>
+    <string name="stop_voice_broadcast_content">Êtes-vous sûr de vouloir arrêter votre diffusion en direct \? Cela terminera la diffusion et l’enregistrement complet sera disponible dans le salon.</string>
+    <string name="stop_voice_broadcast_dialog_title">Arrêter la diffusion en direct \?</string>
+    <string name="action_stop">Oui, arrêter</string>
+    <string name="set_link_edit">Éditer le lien</string>
+    <string name="set_link_create">Crée un lien</string>
+    <string name="set_link_link">Lien</string>
+    <string name="set_link_text">Texte</string>
+    <string name="rich_text_editor_link">Définir un lien</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fr/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-fr/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-fr/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-fr/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-fy/strings.xml b/library/ui-strings/src/main/res/values-fy/strings.xml
similarity index 99%
rename from vector/src/main/res/values-fy/strings.xml
rename to library/ui-strings/src/main/res/values-fy/strings.xml
index d218203739..02f1e6ab2a 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/library/ui-strings/src/main/res/values-fy/strings.xml
@@ -69,7 +69,6 @@
     <string name="matrix_only_filter">Allinnich Matrix-kontakten</string>
     <string name="no_result_placeholder">Gjin resultaten</string>
     <string name="rooms_header">Petearen</string>
-    <string name="groups_header">Mienskippen</string>
     <string name="send_bug_report_include_logs">Lochboek ferstjoere</string>
     <string name="send_bug_report_include_crash_logs">Ungeloklochboek ferstjoere</string>
     <string name="send_bug_report_include_screenshot">Skermôfdruk ferstjoere</string>
@@ -103,8 +102,6 @@
     <string name="event_status_sent_message">Berjocht ferstjoerd</string>
     <string name="initial_sync_start_importing_account_data">Inisjele syngronisaasje:
 \nAccountgegevens ymportearje</string>
-    <string name="initial_sync_start_importing_account_groups">Inisjele Syngronisaasje:
-\nMienskippen ymportearje</string>
     <string name="initial_sync_start_importing_account_left_rooms">Inisjele Syngronisaasje:
 \nFerlitten keamers ymportearje</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Inisjele syngronisaasje:
@@ -139,7 +136,6 @@
     <string name="notice_room_visibility_joined">alle dielnimmers, fan it momint ôf dat se de keamer ynkaam binne.</string>
     <string name="notice_room_visibility_invited">alle dielnimmers oan it petear, fan it momint ôf dat se útnûge binne.</string>
     <string name="space_type_public_desc">Iepen foar eltsenien, it beste foar mienskippen</string>
-    <string name="group_all_communities">Alle mienskippen</string>
     <string name="dialog_title_success">Sukses</string>
     <string name="room_settings_enable_encryption_no_permission">Jo hawwe gjin tastimming om fersifering yn dizze keamer yn te skeakeljen.</string>
     <string name="sound_device_phone">Telefoan</string>
@@ -231,7 +227,6 @@
     <string name="call_camera_back">Efterkant</string>
     <string name="call_camera_front">Foarkant</string>
     <string name="auth_recaptcha_message">Dizze thússerver wol der graach wis fan wêze dat jo gjin robot binne</string>
-    <string name="auth_reset_password_missing_email">It e-mailadres dat oan jo account keppele is moat ynfierd wurde.</string>
     <string name="settings_security_and_privacy">Befeiliging &amp; privacy</string>
     <string name="room_widget_resource_grant_permission">Tastean</string>
     <string name="room_settings_room_version_title">Keamerferzje</string>
diff --git a/vector/src/main/res/values-fy/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-fy/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-fy/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-fy/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-ga/strings.xml b/library/ui-strings/src/main/res/values-ga/strings.xml
similarity index 99%
rename from vector/src/main/res/values-ga/strings.xml
rename to library/ui-strings/src/main/res/values-ga/strings.xml
index 78b4f873a8..d6ee441255 100644
--- a/vector/src/main/res/values-ga/strings.xml
+++ b/library/ui-strings/src/main/res/values-ga/strings.xml
@@ -39,7 +39,6 @@
     <string name="sound_device_phone">Guthán</string>
     <string name="search">Cuardaigh</string>
     <string name="username">Ainm úsáideora</string>
-    <string name="groups_header">Pobail</string>
     <string name="rooms_header">Seomraí</string>
     <string name="direct_chats_header">Comhráite</string>
     <string name="invitations_header">Cuirí</string>
@@ -150,4 +149,4 @@
     <string name="notice_room_invite_no_invitee_by_you">Do chuireadh</string>
     <string name="notice_room_invite_no_invitee">Cuireadh %s</string>
     <string name="search_hint">Cuardaigh</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-ga/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-ga/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-ga/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-ga/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-gl/strings.xml b/library/ui-strings/src/main/res/values-gl/strings.xml
similarity index 99%
rename from vector/src/main/res/values-gl/strings.xml
rename to library/ui-strings/src/main/res/values-gl/strings.xml
index 295f0ebafb..c1e4e40a81 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/library/ui-strings/src/main/res/values-gl/strings.xml
@@ -109,8 +109,6 @@
     <string name="event_status_sending_message">Enviando mensaxe…</string>
     <string name="initial_sync_start_importing_account_data">Sincr. inicial:
 \nImportando datos da conta</string>
-    <string name="initial_sync_start_importing_account_groups">Sincr. inicial:
-\nImportando comunidades</string>
     <string name="initial_sync_start_importing_account_left_rooms">Sincr. inicial:
 \nImportando salas das que saíches</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Sincr. inicial:
@@ -273,8 +271,6 @@
     <string name="rooms_header">Salas</string>
     <string name="title_activity_choose_sticker">Enviar unha icona</string>
     <string name="action_download">Descargar</string>
-
-    <string name="groups_header">Comunidades</string>
     <string name="send_bug_report_include_logs">Enviar informes</string>
     <string name="send_bug_report_include_crash_logs">Enviar informes de fallos</string>
     <string name="send_bug_report_include_screenshot">Enviar captura de pantalla</string>
@@ -312,7 +308,6 @@
     <string name="auth_forgot_password">Esqueceu o contrasinal?</string>
 
     <string name="auth_recaptcha_message">Este servidor local quere asegurarse de que non é un robot</string>
-    <string name="auth_reset_password_missing_email">Debe introducir o correo electrónico ligado a súa conta.</string>
     <string name="auth_reset_password_error_unauthorized">Fallo na verificación do enderezo de correo: asegúrese de ter picado na ligazón do correo</string>
     <string name="call">Chamar</string>
     <string name="_continue">Continuar</string>
@@ -385,7 +380,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Fallo ao descifrar</string>
     <string name="encryption_information_device_name">Nome do dispositivo</string>
-    <string name="encryption_information_device_id">ID de sesión</string>
+    <string name="device_manager_session_details_session_id">ID de sesión</string>
     <string name="encryption_information_device_key">Chave do dispositivo</string>
     <string name="encryption_export_e2e_room_keys">Exportar chaves E2E da sala</string>
     <string name="encryption_export_room_keys">Exportar chaves da sala</string>
diff --git a/vector/src/main/res/values-gl/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-gl/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-gl/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-gl/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-hr/strings.xml b/library/ui-strings/src/main/res/values-hr/strings.xml
similarity index 99%
rename from vector/src/main/res/values-hr/strings.xml
rename to library/ui-strings/src/main/res/values-hr/strings.xml
index b47babedde..6d52e5cd96 100644
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/library/ui-strings/src/main/res/values-hr/strings.xml
@@ -69,7 +69,6 @@
     <string name="matrix_only_filter">Samo kontakti u Matrixu</string>
     <string name="no_result_placeholder">Nema rezultata</string>
     <string name="rooms_header">Sobe</string>
-    <string name="groups_header">Zajednice</string>
     <string name="send_bug_report_include_logs">Pošalji zapise</string>
     <string name="send_bug_report_include_crash_logs">Pošalji zapise o rušenju</string>
     <string name="send_bug_report_include_screenshot">Pošalji sliku zaslona</string>
@@ -110,7 +109,6 @@
     <string name="auth_email_already_defined">Ova je adresa e-pošte već određena.</string>
     <string name="auth_forgot_password">Zaboravljena lozinka\?</string>
     <string name="auth_recaptcha_message">Vaš poslužitelj želi provjeriti jeste li robot</string>
-    <string name="auth_reset_password_missing_email">Nužan je unos adrese e-pošte vezane za Vaš račun.</string>
     <string name="auth_reset_password_error_unauthorized">Neuspješna provjera adrese e-pošte: pobrinite se kliknuti na poveznicu u e-pošti</string>
     <string name="auth_accept_policies">Pročitajte i prihvatite pravila ovog poslužitelja:</string>
     <string name="login_error_invalid_home_server">Unesite ispravan URL</string>
@@ -507,7 +505,6 @@
     <string name="action_change">Promijeni</string>
     <string name="change_room_directory_network">Promijeni mrežu</string>
     <string name="please_wait">Pričekajte…</string>
-    <string name="group_all_communities">Sve zajednice</string>
     <string name="room_preview_no_preview">Nije moguće pregledati sobu</string>
     <string name="fab_menu_create_room">Sobe</string>
     <string name="fab_menu_create_chat">Izravne poruke</string>
@@ -575,7 +572,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Greška u dešifriranju</string>
     <string name="encryption_information_device_name">Javni naziv</string>
-    <string name="encryption_information_device_id">Identitet</string>
+    <string name="device_manager_session_details_session_id">Identitet</string>
     <string name="encryption_information_device_key">Ključ sesije</string>
     <string name="encryption_export_e2e_room_keys">Izvezi sobne ključeve za E2E</string>
     <string name="encryption_export_room_keys">Izvezi sobne ključeve</string>
@@ -849,4 +846,4 @@
     <string name="notice_room_created_by_you">Ti si kreirao sobu</string>
     <string name="notice_room_created">%1$s je kreirao sobu</string>
     <string name="notice_room_invite_no_invitee_by_you">Tvoja pozivnica</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-hr/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-hr/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-hr/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-hr/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-hu/strings.xml b/library/ui-strings/src/main/res/values-hu/strings.xml
similarity index 87%
rename from vector/src/main/res/values-hu/strings.xml
rename to library/ui-strings/src/main/res/values-hu/strings.xml
index 33c0044843..1be136bb39 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/library/ui-strings/src/main/res/values-hu/strings.xml
@@ -52,8 +52,6 @@
 \nMeghívott szobák betöltése</string>
     <string name="initial_sync_start_importing_account_left_rooms">Induló szinkronizáció:
 \nElhagyott szobák betöltése</string>
-    <string name="initial_sync_start_importing_account_groups">Induló szinkronizáció:
-\nKözösségek betöltése</string>
     <string name="initial_sync_start_importing_account_data">Induló szinkronizáció:
 \nFiók adatok betöltése</string>
     <string name="notice_room_update">%s frissítette ezt a szobát.</string>
@@ -159,7 +157,7 @@
     <string name="notice_room_server_acl_updated_title">%s megváltoztatta a szerver ACL-eket ehhez a szobához.</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• IP címet hosztnévként használó szerverek tiltva vannak.</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">• IP címet hosztnévként használó szerverek engedélyezve vannak.</string>
-    <string name="notice_room_server_acl_set_allowed">• Engedélyezve vannak azok a szerverek, amik illeszkednek erre: %s</string>
+    <string name="notice_room_server_acl_set_allowed">• Engedélyezve vannak azok a szerverek, amik illeszkednek erre: %s.</string>
     <string name="notice_room_server_acl_set_banned">• Tiltva vannak azok a szerverek, amik illeszkednek erre: %s</string>
     <string name="notice_room_server_acl_set_title_by_you">Beállítottad a szerver ACL-eket ehhez a szobához.</string>
     <string name="notice_room_server_acl_set_title">%s beállította a szerver ACL-eket ehhez a szobához.</string>
@@ -228,7 +226,6 @@
     <string name="auth_email_already_defined">Ez az e-mail cím már használatban van.</string>
     <string name="auth_forgot_password">Elfelejtetted a jelszavad?</string>
     <string name="auth_recaptcha_message">A Matrix-kiszolgáló szeretné ellenőrizni, hogy nem vagy robot</string>
-    <string name="auth_reset_password_missing_email">Meg kell adnod a fiókodhoz tartozó e-mail-címet.</string>
     <string name="auth_reset_password_error_unauthorized">Az e-mail-címed ellenőrzés sikertelen: győződj meg róla, hogy rákattintottál az e-mailben található hivatkozásra</string>
     <string name="login_error_invalid_home_server">Adj meg egy érvényes URL-t</string>
     <string name="login_error_bad_json">Hibás JSON</string>
@@ -354,7 +351,7 @@
     <string name="room_settings_unset_main_address">Kiszedés fő címek közül</string>
     <string name="encryption_information_decryption_error">Visszafejtés hiba</string>
     <string name="encryption_information_device_name">Nyilvános név</string>
-    <string name="encryption_information_device_id">Munkamenet-azonosító</string>
+    <string name="device_manager_session_details_session_id">Munkamenet-azonosító</string>
     <string name="encryption_information_device_key">Munkamenet kulcs</string>
     <string name="encryption_export_e2e_room_keys">E2E szoba kulcsok exportálása</string>
     <string name="encryption_export_room_keys">Szoba kulcsok exportálása</string>
@@ -434,7 +431,6 @@
     <string name="notification_noisy">Hangos</string>
     <string name="encrypted_message">Titkosított üzenet</string>
     <string name="loading">Betöltés…</string>
-    <string name="groups_header">Közösségek</string>
     <string name="start_voice_call_prompt_msg">Biztos, hogy hanghívást akarsz indítani\?</string>
     <string name="start_video_call_prompt_msg">Biztos, hogy videóhívást akarsz indítani\?</string>
     <string name="room_participants_ban_prompt_msg">A felhasználó kitiltása eltávolítja őt a szobából, és megakadályozza, hogy újra csatlakozhasson.</string>
@@ -573,7 +569,7 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="settings_troubleshoot_diagnostic_success_status">Alapszintű diagnosztika nem talált hibát. Ha még mindig nem kapsz értesítéseket, kérlek küldj egy hiba jegyet amivel segítheted a hibakeresésünket.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Egy vagy több teszt is sikertelen volt, próbáld ki a javasolt javítást, javításokat.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Egy vagy több teszt sikertelenül végződött, kérlek küldj egy hibabejelentést ami segít nekünk a problémát kivizsgálni.</string>
-    <string name="settings_troubleshoot_test_system_settings_title">Rendszer beállítások.</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Rendszerbeállítások.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Az értesítések engedélyezve vannak a rendszerbeállításokban.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Az értesítések tiltva vannak a rendszerbeállításokban.
 Kérlek ellenőrizd a rendszerbeállításokat.</string>
@@ -586,7 +582,7 @@ Kérlek ellenőrizd a fiókbeállításokat.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Munkamenet beállítások.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Az értesítések engedélyezve vannak ezen az munkameneten.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Az értesítések tiltva vannak ezen a munkameneten. Kérlek ellenőrizd a ${app_name} beállításokat.</string>
-    <string name="settings_troubleshoot_test_device_settings_quickfix">Engedélyez</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">Engedélyezés</string>
     <string name="settings_troubleshoot_test_play_services_title">Play Szolgáltatások ellenőrzése</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK elérhető és a legújabb verziójú.</string>
     <string name="settings_troubleshoot_test_play_services_failed">"${app_name} a Google Play Services-t használja  a „push” értesítések fogadásához, de úgy tűnik az nincs megfelelően beállítva:
@@ -813,7 +809,6 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="action_change">Változtat</string>
     <string name="change_room_directory_network">Hálózat megváltoztatása</string>
     <string name="please_wait">Kérlek várj…</string>
-    <string name="group_all_communities">Minden közösség</string>
     <string name="room_preview_no_preview">Ennek a szobának nincs előnézete</string>
     <string name="fab_menu_create_room">Szobák</string>
     <string name="fab_menu_create_chat">Közvetlen üzenetek</string>
@@ -829,18 +824,18 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="navigate_to_room_when_already_in_the_room">Már nézed ezt a szobát!</string>
     <string name="settings_general_title">Általános</string>
     <string name="settings_preferences">Beállítások</string>
-    <string name="settings_security_and_privacy">Biztonság &amp; Adatvédelem</string>
+    <string name="settings_security_and_privacy">Biztonság és adatvédelem</string>
     <string name="settings_push_rules">„Push” szabályok</string>
     <string name="settings_push_rules_no_rules">„Push” szabályok nincsenek</string>
     <string name="settings_push_gateway_no_pushers">„Push” átjárók nincsenek regisztrálva</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_id">Alk azon:</string>
+    <string name="push_gateway_item_push_key">Push kulcs:</string>
+    <string name="push_gateway_item_app_display_name">Alk. képernyő név:</string>
+    <string name="push_gateway_item_device_name">Munkamenet képernyő név:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formátum:</string>
-    <string name="preference_voice_and_video">Hang &amp; Videó</string>
-    <string name="preference_root_help_about">Segítség &amp; Névjegy</string>
+    <string name="preference_voice_and_video">Hang és videó</string>
+    <string name="preference_root_help_about">Súgó és névjegy</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Token regisztrálása</string>
     <string name="send_suggestion">Javaslat tétel</string>
     <string name="send_suggestion_content">A javaslatodat kérlek ír le alulra.</string>
@@ -902,7 +897,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="settings_discovery_no_msisdn">Amint hozzáadtál egy telefonszámot megjelenik a felderítési beállítási lehetőség.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Az azonosítási szerverről való lecsatlakozással nem leszel mások által megtalálható és másokat sem tudsz meghívni e-mail címmel vagy telefonszámmal.</string>
     <string name="settings_discovery_msisdn_title">Felderíthető telefonszámok</string>
-    <string name="settings_discovery_confirm_mail">Megerősítő levelet küldtünk ide: %s, ellenőrizd az e-mailedet és kattints a megerősítő hivatkozásra</string>
+    <string name="settings_discovery_confirm_mail">E-mailt küldtünk ide: %s, ellenőrizd és kattints a megerősítő hivatkozásra</string>
     <string name="settings_discovery_enter_identity_server">Add meg az azonosítási szerver URL-jét</string>
     <string name="settings_discovery_bad_identity_server">Az azonosítási szerverhez nem lehet csatlakozni</string>
     <string name="settings_discovery_please_enter_server">Kérlek add meg az azonosítási szerver url-jét</string>
@@ -1233,7 +1228,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
         <item quantity="one">%d aktív munkamenet</item>
         <item quantity="other">%d aktív munkamenet</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Munkamenet ellenőrzése</string>
+    <string name="crosssigning_verify_this_session">Az eszköz ellenőrzése</string>
     <string name="verification_open_other_to_verify">A titkosított üzenetekhez való hozzáféréshez nyiss meg egy létező munkamenetet és használd ennek a hitelesítésére.</string>
     <string name="verification_profile_verify">Ellenőriz</string>
     <string name="verification_profile_verified">Hitelesített</string>
@@ -1394,9 +1389,9 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
         <item quantity="other">Meghívó elküldve neki: %1$s és még %2$d helyre</item>
     </plurals>
     <string name="invite_users_to_room_failure">Felhasználókat nem tudtuk meghívni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.</string>
-    <string name="event_redacted">Üzenet törölve</string>
+    <string name="event_redacted">Üzenet eltávolítva</string>
     <string name="settings_show_redacted_summary">Helykitöltő mutatása a törölt szövegek helyett</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Megerősítő levelet küldtünk ide: %s, először ellenőrizd az e-mailedet és kattints a megerősítő hivatkozásra</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">E-mailt küldtünk ide: %s, először ellenőrizd és kattints a megerősítő hivatkozásra</string>
     <string name="uploads_media_title">MÉDIA</string>
     <string name="uploads_files_title">FÁJLOK</string>
     <string name="uploads_files_subtitle">%1$s itt: %2$s</string>
@@ -2432,7 +2427,6 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="ftue_profile_picture_title">Profilkép hozzáadása</string>
     <string name="ftue_display_name_entry_footer">Ezt később meg lehet változtatni</string>
     <string name="ftue_display_name_entry_title">Megjelenítendő név</string>
-    <string name="ftue_display_name_subtitle">Ez fog megjelenni amikor üzenetet küldesz.</string>
     <string name="ftue_display_name_title">Válassz egy megjelenítendő nevet</string>
     <string name="ftue_account_created_subtitle">A fiókod elkészült. A Matrix címed: %s</string>
     <string name="ftue_account_created_congratulations_title">Gratulálunk!</string>
@@ -2482,7 +2476,6 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="a11y_presence_busy">Foglalt</string>
     <string name="keys_backup_settings_signature_from_this_user">A mentésnek érvényes aláírása van ettől a felhasználótól.</string>
     <string name="live_location_bottom_sheet_last_updated_at">Frissítve ekkor: %1$s</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Megosztás megállítása</string>
     <string name="labs_enable_live_location_summary">Átmeneti megvalósítás: a helyadatok megmaradnak a szoba naplójában</string>
     <string name="labs_enable_live_location">Élő helymegosztás engedélyezése</string>
     <string name="location_share_live_remaining_time">%1$s kilépett</string>
@@ -2575,4 +2568,326 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="ftue_auth_create_account_choose_server_header">Itt lesznek tárolva a beszélgetéseid</string>
     <string name="ftue_auth_choose_server_subtitle">Mi a szervered címe\? Itt lesz tárolva az összes üzeneted</string>
     <string name="auth_reset_password_error_unverified">Az email cím nem lett ellenőrizve, kérlek nézd meg a beérkező email-jeidet</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Element Call kisalkalmazás kamera és mikrofon használatának automatikus engedélyezése</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Element Call jogosultságok engedélyezése</string>
+    <plurals name="room_removed_messages">
+        <item quantity="one">%d üzenet eltávolítva</item>
+        <item quantity="other">%d üzenet eltávolítva</item>
+    </plurals>
+    <string name="live_location_description">Élő földrajzi helyzet</string>
+    <string name="live_location_share_location_item_share">Tartózkodási hely megosztása</string>
+    <string name="live_location_not_enough_permission_dialog_description">Az élő helymegosztáshoz ebben a szobában megfelelő jogosultságokra van szükséged.</string>
+    <string name="live_location_not_enough_permission_dialog_title">Nincs jogosultságod az élő helymegosztáshoz</string>
+    <string name="location_share_loading_map_error">A térkép betöltése sikertelen
+\nEz a matrix szerver nincs beállítva, hogy térképet mutasson.</string>
+    <string name="a11y_open_settings">Beállítások megnyitása</string>
+    <string name="verify_invalid_qr_notice">Ez a QR code nem tűnik jónak. Próbáld meg az ellenőrzést másik metódussal.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">A régi titkosított üzenetekhez nem férsz majd hozzá. Állítsd be újra a Biztonságos Üzenet Mentést és ellenőrizd a kulcsokat az újrakezdéshez.</string>
+    <string name="crosssigning_cannot_verify_this_session">Ennek az eszköznek az ellenőrzése nem lehetséges</string>
+    <string name="permalink_unsupported_groups">Ez a hivatkozás nem nyitható meg: a közösségeket felváltották a terek</string>
+    <string name="ftue_auth_new_password_title">Válassz jelszót</string>
+    <string name="ftue_auth_new_password_entry_title">Új jelszó</string>
+    <string name="ftue_auth_reset_password_breaker_title">Ellenőrizd az e-mailed.</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s ellenőrző hivatkozást fog küldeni</string>
+    <string name="updating_your_data">Adatok frissítése…</string>
+    <string name="font_size_use_system">Rendszerbeállítás használata</string>
+    <string name="font_size_section_manually">Kézi beállítás</string>
+    <string name="font_size_section_auto">Automatikus beállítás</string>
+    <string name="font_size_title">Válassz betűméretet</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s és %2$d másik</item>
+        <item quantity="other">%1$s és %2$d másik</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s és %2$s</string>
+    <string name="all_chats">Minden beszélgetés</string>
+    <string name="device_manager_other_sessions_description_unverified">Nem ellenőrzött - Utolsó aktivitás %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Ellenőrzött - Utolsó tevékenység %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Összes megtekintése (%1$d)</string>
+    <string name="device_manager_view_details">Részletek megtekintése</string>
+    <string name="device_manager_verify_session">Munkamenet hitelesítése</string>
+    <string name="device_manager_verification_status_unverified">Ellenőrizetlen munkamenet</string>
+    <string name="device_manager_verification_status_verified">Ellenőrzött munkamenet</string>
+    <string name="a11y_device_manager_device_type_unknown">Ismeretlen eszköztípus</string>
+    <string name="a11y_device_manager_device_type_desktop">Asztali</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobil</string>
+    <string name="device_manager_sessions_other_description">A legjobb biztonság érdekében ellenőrizd a munkameneteket, és jelentkezz ki minden olyan munkamenetből, melyet már nem ismersz fel vagy nem használsz.</string>
+    <string name="device_manager_sessions_other_title">Más munkamenetek</string>
+    <string name="settings_sessions_list">Munkamenetek</string>
+    <string name="a11y_open_spaces">Nyitott területek listája</string>
+    <string name="a11y_create_message">Új beszélgetés vagy szoba létrehozása</string>
+    <string name="room_list_filter_people">Emberek</string>
+    <string name="room_list_filter_favourites">Kedvencek</string>
+    <string name="room_list_filter_unreads">Olvasatlan</string>
+    <string name="room_list_filter_all">Mind</string>
+    <string name="timeline_error_room_not_found">Sajnáljuk, ez a szoba nem található.
+\nKérjük, próbáld meg később újra.%s</string>
+    <string name="invites_title">Meghívók</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Aktivitás</string>
+    <string name="home_layout_preferences_sort_by">Rendezés</string>
+    <string name="home_layout_preferences_recents">Legfrissebbek megjelenítése</string>
+    <string name="home_layout_preferences_filters">Szűrők megjelenítése</string>
+    <string name="home_layout_preferences">Elrendezési beállítások</string>
+    <string name="explore_rooms">Szobák felfedezése</string>
+    <string name="create_room">Szoba létrehozása</string>
+    <string name="start_chat">Chat indítása</string>
+    <string name="onboarding_new_app_layout_button_try">Próbáld ki</string>
+    <string name="onboarding_new_app_layout_feedback_title">Visszajelzés adása</string>
+    <string name="onboarding_new_app_layout_spaces_message">A terekhez való hozzáférés (jobbra lent) gyorsabb és egyszerűbb mint valaha.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Hozzáférés a terekhez</string>
+    <string name="onboarding_new_app_layout_welcome_message">${app_name} egyszerűsítéséhez a lapok mostantól választhatók. Beállítani a jobb felső menüből lehet.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Üdv az új kinézetben!</string>
+    <string name="home_empty_no_unreads_message">Ez az a hely ahol az olvasatlan üzeneteid megjelennek, ha lesznek.</string>
+    <string name="home_empty_no_unreads_title">Nincs semmi említésre méltó.</string>
+    <string name="home_empty_no_rooms_message">A minden-egyben biztonságos csevegő alkalmazás csapatoknak, barátoknak és szervezeteknek. Kezd egy csevegést vagy lépj be egy meglévő szobába kezdésnek.</string>
+    <string name="home_empty_no_rooms_title">Üdv itt: ${app_name}!
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Szobák és emberek csoportokba rendezésének új mondja a terek használata. Létező szoba hozzáadása vagy új készítése a jobb alsó gombbal.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nkicsit üresnek tűnik.</string>
+    <string name="device_manager_inactive_sessions_title">Nem aktív munkamenetek</string>
+    <string name="device_manager_unverified_sessions_description">Ellenőrizd vagy jelentkezz ki az ellenőrizetlen munkamenetekből.</string>
+    <string name="device_manager_unverified_sessions_title">Meg nem erősített munkamenetek</string>
+    <string name="device_manager_header_section_security_recommendations_description">Javítsa a fiókja biztonságát azzal, hogy követi a következő javaslatokat.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Biztonsági javaslatok</string>
+    <string name="invites_empty_title">Semmi új.</string>
+    <string name="space_list_empty_message">Terekkel lehet szobákat és személyeket csoportokba rendezni. Készíts egyet indulásnak.</string>
+    <string name="space_list_empty_title">Nincsenek terek egyelőre.</string>
+    <string name="a11y_collapse_space_children">%s összezárása</string>
+    <string name="a11y_expand_space_children">%s kinyitása</string>
+    <string name="change_space">Tér cseréje</string>
+    <string name="onboarding_new_app_layout_feedback_message">A visszajelzési lehetőségekhez koppint jobb felső sarokba.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Fontold meg, hogy a régi már nem használt (%1$d napja vagy régebben) munkamenetből kijelentkezel.</item>
+        <item quantity="other">Fontold meg, hogy a régi már nem használt (%1$d napja vagy régebben) munkamenetből kijelentkezel.</item>
+    </plurals>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">%1$d+ napja inaktív (%2$s)</item>
+        <item quantity="other">%1$d+ napja inaktív (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Itt láthatók a meghívók és elvégzendő műveletek.</string>
+    <string name="device_manager_session_details_device_ip_address">IP cím</string>
+    <string name="device_manager_session_details_session_last_activity">Utolsó tevékenység</string>
+    <string name="device_manager_session_details_session_name">Munkamenet neve</string>
+    <string name="device_manager_session_details_description">Alkalmazás, eszköz és aktivitás információ.</string>
+    <string name="device_manager_session_details_title">Munkamenet információk</string>
+    <string name="device_manager_other_sessions_clear_filter">Szűrő törlése</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Nincs inaktív munkamenet.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Nincs ellenőrizetlen munkamenet.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Nincs ellenőrzött munkamenet.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Fontold meg, hogy kijelentkezel a régi munkamenetekből (%1$d napja vagy régebben használtál) amit már nem használsz.</item>
+        <item quantity="other">Fontold meg, hogy kijelentkezel a régi munkamenetekből (%1$d napja vagy régebben használtál) amit már nem használsz.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inaktív</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Erősítse meg a munkameneteit a még biztonságosabb csevegéshez vagy jelentkezzen ki ezekből, ha nem ismeri fel vagy már nem használja őket.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Ellenőrizetlen</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">A legjobb biztonság érdekében jelentkezz ki minden olyan munkamenetből amit nem ismersz fel vagy régen használtál már.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Hitelesített</string>
+    <string name="a11y_device_manager_filter">Szűrés</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">%1$d napja inaktív</item>
+        <item quantity="other">%1$d napja inaktív</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inaktív</string>
+    <string name="device_manager_filter_option_unverified_description">Nem áll készen a biztonságos üzenetküldésre</string>
+    <string name="device_manager_filter_option_unverified">Ellenőrizetlen</string>
+    <string name="device_manager_filter_option_verified_description">Felkészülve a biztonságos üzenetküldésre</string>
+    <string name="device_manager_filter_option_verified">Hitelesített</string>
+    <string name="device_manager_filter_option_all_sessions">Minden munkamenet</string>
+    <string name="device_manager_filter_bottom_sheet_title">Szűrés</string>
+    <string name="device_manager_session_last_activity">Utolsó aktivitás %1$s</string>
+    <string name="device_manager_device_title">Eszköz</string>
+    <string name="device_manager_session_title">Munkamenet</string>
+    <string name="device_manager_current_session_title">Jelenlegi munkamenet</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">A jobb biztonság vagy megbízhatóság érdekében ellenőrizze vagy jelentkezzen ki ebből a munkamenetből.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Ellenőrizd az aktuális munkamenetet a biztonságos üzenetküldéshez.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Ez a munkamenet beállítva a biztonságos üzenetküldéshez.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Az aktuális munkamenet készen áll a biztonságos üzenetküldésre.</string>
+    <string name="labs_enable_deferred_dm_summary">Közvetlen beszélgetés indítása csak az első üzenettel</string>
+    <string name="labs_enable_deferred_dm_title">Késleltetett közvetlen üzenetek engedélyezése</string>
+    <string name="labs_enable_new_app_layout_summary">Egyszerűsített Element opcionálisan lapokkal</string>
+    <string name="labs_enable_new_app_layout_title">Új kinézet engedélyezése</string>
+    <string name="device_manager_learn_more_session_rename">Más felhasználók akikkel közvetlenül vagy szobában beszélgetsz látják a teljes listát a munkameneteidről.
+\n
+\nEzzel ők biztosak lehetnek abban, hogy ténylegesen veled beszélgetnek. Ez azt is jelenti, hogy látják a munkamenet nevét amit itt megadsz.</string>
+    <string name="device_manager_learn_more_sessions_verified">Ellenőrzött munkamenetbe a neveddel és jelszavaddal léptek be és ellenőrizve lett vagy a biztonsági jelmondattal vagy másik munkamenetből.
+\n
+\nEz azt jelenti, hogy tartalmazzák a titkosítási kulcsokat az régi üzenetekhez, és biztosítja a többieket a kommunikációban, hogy ezt a munkamenetet tényleg te használod.</string>
+    <string name="rich_text_editor_format_underline">Aláhúzott</string>
+    <string name="rich_text_editor_format_strikethrough">Áthúzott</string>
+    <string name="rich_text_editor_format_italic">Dőlt</string>
+    <string name="rich_text_editor_format_bold">Félkövér</string>
+    <string name="labs_enable_client_info_recording_summary">Kliens neve, verziója és url felvétele a munkamenet könnyebb azonosításához a munkamenet kezelőben.</string>
+    <string name="labs_enable_client_info_recording_title">Kliens információ felvételének engedélyezése</string>
+    <string name="labs_enable_session_manager_summary">Jobb áttekintés és felügyelet a munkamenetek felett.</string>
+    <string name="labs_enable_session_manager_title">Új munkamenet kezelő engedélyezése</string>
+    <string name="device_manager_learn_more_session_rename_title">Munkamenet átnevezése</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Hitelesített munkamenetek</string>
+    <string name="device_manager_learn_more_sessions_unverified">Az ellenőrizetlen munkamenetek azok amikre a felhasználói neveddel és jelszavaddal léptek be de nem lett ellenőrizve.
+\n
+\nMindenképpen győződj meg arról, hogy felismered ezeket a munkameneteket mert lehet, hogy illetéktelenül használják a fiókodat.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Ellenőrizetlen munkamenetek</string>
+    <string name="device_manager_learn_more_sessions_inactive">Az inaktív munkamenetek azok amiket egy ideje nem használtál, de továbbra is megkapják a titkosítási kulcsokat.
+\n
+\nA nem aktív munkamenetek törlésével növelhető a biztonság és a sebesség valamint könnyebb lesz felismerni a gyanús munkameneteket.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Nem aktív munkamenetek</string>
+    <string name="device_manager_session_rename_warning">Fontos, hogy a munkamenet neve a kommunikációban résztvevők számára látható.</string>
+    <string name="device_manager_session_rename_description">Az egyedi munkamenet név segíthet az eszköz könnyebb felismerésében.</string>
+    <string name="device_manager_session_rename_edit_hint">Munkamenet neve</string>
+    <string name="device_manager_session_rename">Munkamenet átnevezése</string>
+    <string name="device_manager_session_details_device_operating_system">Operációs rendszer</string>
+    <string name="device_manager_session_details_device_model">Modell</string>
+    <string name="device_manager_session_details_device_browser">Böngésző</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Verzió</string>
+    <string name="device_manager_session_details_application_name">Név</string>
+    <string name="device_manager_session_details_application">Alkalmazás</string>
+    <string name="device_manager_push_notifications_description">Push értesítések fogadása ebben a munkamenetben.</string>
+    <string name="device_manager_push_notifications_title">Push értesítések</string>
+    <string name="device_manager_session_overview_signout">Kijelentkezés ebből a munkamenetből</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Ellenőrizetlen · A jelenlegi munkameneted</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Ellenőrizd a jelenlegi munkamenetedet, hogy ismert állapotba kerüljön.</string>
+    <string name="device_manager_verification_status_unknown">Ismeretlen ellenőrzési státusz</string>
+    <string name="tooltip_attachment_voice_broadcast">Hang közvetítés indítása</string>
+    <string name="key_authenticity_not_guaranteed">A titkosított üzenetek valódiságát ezen az eszközön nem lehet garantálni.</string>
+    <string name="settings_security_incognito_keyboard_summary">Utasítja a billentyűzetet, hogy ne mentsen személyre szabott adatokat, mint előzmények vagy szótár abból amit a beszélgetésekben írsz. Vedd figyelembe, hogy nem minden billentyűzet veszi ezt figyelembe.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognitó billentyűzet</string>
+    <string name="command_description_table_flip">(╯°□°）╯︵ ┻━┻ -t tesz a szöveg elejére</string>
+    <string name="attachment_type_voice_broadcast">Hang közvetítés</string>
+    <string name="push_gateway_item_enabled">Engedélyezve:</string>
+    <string name="push_gateway_item_device_id">Munkamenet azon.:</string>
+    <string name="error_check_network">Valami nem sikerült. Kérlek ellenőrizd a hálózati kapcsolatot és próbáld újra.</string>
+    <string name="command_description_devtools">A fejlesztői eszközök képernyő megnyitása</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Bekapcsoltad a Biztonsági beállításoknál, hogy csak ellenőrzött munkamenetek számára legyen titkosítva az üzenet bármely szobában.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Ellenőrizetlen eszközök vannak a szobában, ezek nem fogják tudni visszafejteni az általad küldött üzeneteket.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Sose küldj titkosított üzenetet ellenőrizetlen munkamenetbe ebből a munkamenetből ebben a szobában.</string>
+    <string name="grant_permission">Engedély megadása</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} alkalmazásnak értesítések megjelenítéséhez engedélyre van szüksége.
+\nKérjük, adj rá engedélyt.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} alkalmazásnak szüksége van engedélyre az értesítések megjelenítéséhez. Az értesítés megjelenítheti az üzenetet, meghívót, stb.
+\n
+\nA következő felugró ablakban adj rá engedélyt, hogy az értesítések megjelenhessenek.</string>
+    <string name="labs_enable_rich_text_editor_summary">Próbálja ki az új szövegbevitelt (hamarosan érkezik a sima szöveges üzemmód)</string>
+    <string name="labs_enable_rich_text_editor_title">Vizuális szerkesztő engedélyezése</string>
+    <string name="action_got_it">Értem</string>
+    <string name="qr_code_login_status_no_match">Nem egyezik\?</string>
+    <string name="qr_code_login_signing_in">Bejelentkeztetés</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Mobil eszközzel jelentkezel be\?</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Kezd a bejelentkező képernyőn</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Kezd a bejelentkező képernyőn</string>
+    <string name="qr_code_login_header_connected_description">Nézd meg a már bejelentkezett eszközödet, az alábbi kódot kell megjelenítenie. Erősítsd meg, hogy az alábbi kód megegyezik a másik eszközön láthatóval:</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Használd a már belépett eszközt az alábbi QR kód beolvasásához:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Ezzel az eszközzel, QR kód segítségével, bejelentkezhetsz mobil és webes munkamenetbe. Két lehetőséged is van:</string>
+    <string name="qr_code_login_confirm_security_code_description">Győződj meg a kód eredetéről. Az eszközök összekötésével esetleg valakinek teljes hozzáférést adhatsz a fiókodhoz.</string>
+    <string name="qr_code_login_confirm_security_code">Megerősítés</string>
+    <string name="qr_code_login_try_again">Próbáld újra</string>
+    <string name="qr_code_login_connecting_to_device">Csatlakozás az eszközhöz</string>
+    <string name="qr_code_login_scan_qr_code_button">QR kód beolvasása</string>
+    <string name="qr_code_login_show_qr_code_button">QR kód megjelenítése ezen az eszközön</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Válaszd ezt: „QR kód beolvasása”</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Válaszd ezt: „Belépés QR kóddal”</string>
+    <string name="qr_code_login_new_device_instruction_3">Válaszd ezt: „QR kód megjelenítése”</string>
+    <string name="qr_code_login_new_device_instruction_2">Menj a Beállítások -&gt; Biztonság és Adatvédelem</string>
+    <string name="qr_code_login_new_device_instruction_1">Nyisd meg az alkalmazást a másik eszközön</string>
+    <string name="qr_code_login_header_failed_denied_description">A kérést elutasították a másik eszközön.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Az összekötés az elvárt időn belül nem fejeződött be.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Összekötés ezzel az eszközzel nem támogatott.</string>
+    <string name="qr_code_login_header_failed_title">Kapcsolat sikertelen</string>
+    <string name="qr_code_login_header_connected_title">Biztonságos kapcsolat beállítva</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">A kijelentkezett eszközzel olvasd be a QR kódot alább.</string>
+    <string name="qr_code_login_header_show_qr_code_title">Belépés QR kóddal</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Használd a kamerát ezen az eszközön a másik eszközödön megjelenő QR kód beolvasására:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">QR kód beolvasása</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Belépés QR kóddal</string>
+    <string name="login_scan_qr_code">QR kód beolvasása</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">A matrix szerver nem támogatja más eszköz bejelentkeztetését.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">A bejelentkezés a másik eszköz által meg lett szakítva.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">QR kód érvénytelen.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">A másik eszköznek már bejelentkezve kell lennie.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">A másik eszköz már bejelentkezett.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Biztonsági probléma lépett fel a biztonságos üzenetküldés beállításánál. Valamihez illetéktelenül fértek hozzá: Matrix szervered, Internet kapcsolatod, Eszközöd,</string>
+    <string name="qr_code_login_header_failed_other_description">A kérés sikertelen.</string>
+    <string name="labs_enable_voice_broadcast_summary">Hang közvetítés felvételéhez és a szoba idővonalára küldéséhez.</string>
+    <string name="labs_enable_voice_broadcast_title">Hang közvetítés engedélyezése</string>
+    <string name="a11y_voice_broadcast_buffering">Pufferelés…</string>
+    <string name="a11y_pause_voice_broadcast">Hang közvetítés szüneteltetése</string>
+    <string name="a11y_play_voice_broadcast">Hang közvetítés lejátszása vagy lejátszás folytatása</string>
+    <string name="a11y_stop_voice_broadcast_record">Hang közvetítés felvétel leállítása</string>
+    <string name="a11y_pause_voice_broadcast_record">Hang közvetítés felvétel megállítása</string>
+    <string name="a11y_resume_voice_broadcast_record">Hang közvetítés felvétel újraindítása</string>
+    <string name="voice_broadcast_live">Élő</string>
+    <string name="device_manager_other_sessions_select">Munkamenetek kiválasztása</string>
+    <string name="attachment_type_selector_contact">Névjegy</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Földrajzi helyzet</string>
+    <string name="attachment_type_selector_poll">Szavazások</string>
+    <string name="attachment_type_selector_voice_broadcast">Hang közvetítés</string>
+    <string name="attachment_type_selector_file">Mellékletek</string>
+    <string name="attachment_type_selector_sticker">Matricák</string>
+    <string name="attachment_type_selector_gallery">Fénykép könyvtár</string>
+    <string name="action_deselect_all">Semmit nem jelöl ki</string>
+    <string name="action_select_all">Mindet kijelöli</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d kiválasztva</item>
+        <item quantity="other">%1$d kiválasztva</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">Teljes képernyő váltás</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Mindenhol ellenőrzött munkamenetek vannak ahol ezt a fiókot használva megadtad a jelmondatodat vagy egy másik már hitelesített munkamenetből megerősítetted az identitásodat.
+\n
+\nEz azt jelenti, hogy a titkosított üzenetek visszafejtéséhez rendelkezel a kulcsokkal és megerősíted a többiek felé, hogy megbízol a munkamenetben.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Kijelentkezés %1$d munkamenetből</item>
+        <item quantity="other">Kijelentkezés %1$d munkamenetből</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Kijelentkezés</string>
+    <string name="attachment_type_selector_text_formatting">Szöveg formázás</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Egy hang közvetítés már folyamatban van. Először fejezze be a jelenlegi közvetítést egy új indításához.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Valaki már elindított egy hang közvetítést. Várd meg a közvetítés végét az új indításához.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Nincs jogosultságod hang közvetítést indítani ebben a szobában. Vedd fel a kapcsolatot a szoba adminisztrátorával a szükséges jogosultság megszerzéséhez.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Az új hang közvetítés nem indítható el</string>
+    <string name="a11y_voice_broadcast_fast_forward">30 másodperccel előre</string>
+    <string name="a11y_voice_broadcast_fast_backward">30 másodperccel vissza</string>
+    <string name="voice_broadcast_recording_time_left">visszavan: %1$s</string>
+    <string name="message_reply_to_sender_created_poll">szavazás elkészítve.</string>
+    <string name="message_reply_to_sender_sent_sticker">matrica elküldve.</string>
+    <string name="message_reply_to_sender_sent_video">videót küldött.</string>
+    <string name="message_reply_to_sender_sent_image">kép elküldve.</string>
+    <string name="message_reply_to_sender_sent_voice_message">hang üzenet elküldve.</string>
+    <string name="message_reply_to_sender_sent_audio_file">hangfájl elküldve.</string>
+    <string name="message_reply_to_sender_sent_file">fájl elküldve.</string>
+    <string name="message_reply_to_prefix">Válaszolva erre</string>
+    <string name="device_manager_other_sessions_hide_ip_address">IP címek elrejtése</string>
+    <string name="device_manager_other_sessions_show_ip_address">IP címek megjelenítése</string>
+    <string name="quoting">Idézet</string>
+    <string name="replying_to">Válasz erre: %s</string>
+    <string name="editing">Szerkesztés</string>
+    <string name="review_unverified_sessions_description">Tekintsd át, hogy meggyőződj arról, hogy a fiókod biztonságban van</string>
+    <string name="review_unverified_sessions_title">Ellenőrizetlen bejelentkezéseid vannak</string>
+    <string name="settings_enable_direct_share_summary">Friss beszélgetések megjelenítése a rendszer megosztó menüjében</string>
+    <string name="settings_enable_direct_share_title">Közvetlen megosztás engedélyezése</string>
+    <string name="settings_nightly_build_update">Szerezd be a napi összeállítást (megjegyzés: lehet, hogy problémáid lesznek a bejelentkezéssel)</string>
+    <string name="settings_nightly_build">Napi összeállítás</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Ez a munkamenet nem támogatja a titkosítást, így nem lehet ellenőrizni sem.
+\n
+\nEzzel a munkamenettel nem tudsz részt venni olyan szobákban ahol a titkosítás be van kapcsolva.
+\n
+\nA biztonság és a adatbiztonsági okokból javasolt olyan Matrix kliens használata ami támogatja a titkosítást.</string>
+    <string name="device_manager_signout_all_other_sessions">Kijelentkezés minden más munkamenetből</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Ez a munkamenet nem támogatja a titkosítást, így nem lehet ellenőrizni sem.</string>
+    <string name="voice_broadcast_live_broadcast">Élő közvetítés</string>
+    <string name="notice_voice_broadcast_ended_by_you">A hang közvetítést befejezted.</string>
+    <string name="notice_voice_broadcast_ended">%1$s befejezte a hang közvetítést.</string>
+    <string name="stop_voice_broadcast_content">Biztos, hogy befejezed az élő közvetítést\? Ez befejezi a közvetítést és a felvétel az egész szoba számára elérhető lesz.</string>
+    <string name="stop_voice_broadcast_dialog_title">Megszakítod az élő közvetítést\?</string>
+    <string name="action_stop">Igen, befejez</string>
+    <string name="set_link_edit">Hivatkozás szerkesztése</string>
+    <string name="set_link_create">Hivatkozás készítése</string>
+    <string name="set_link_link">Hivatkozás</string>
+    <string name="set_link_text">Szöveg</string>
+    <string name="rich_text_editor_link">Hivatkozás beállítása</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-hu/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-hu/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-hu/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-hu/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-in/strings.xml b/library/ui-strings/src/main/res/values-in/strings.xml
similarity index 83%
rename from vector/src/main/res/values-in/strings.xml
rename to library/ui-strings/src/main/res/values-in/strings.xml
index cbe5173920..8715aa84e0 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/library/ui-strings/src/main/res/values-in/strings.xml
@@ -47,8 +47,8 @@
     <string name="matrix_only_filter">Hanya kontak Matrix</string>
     <string name="rooms_header">Ruangan</string>
     <string name="send_bug_report">Laporan kutu</string>
-    <string name="send_bug_report_app_crashed">Aplikasi gagal saat terakhir digunakan. Apakah Anda ingin membuka halaman laporan kegagalan\?</string>
-    <string name="join_room">Gabung di Ruangan</string>
+    <string name="send_bug_report_app_crashed">Aplikasi mogok saat terakhir digunakan. Apakah Anda ingin membuka halaman laporan kemogokan\?</string>
+    <string name="join_room">Bergabung ke Ruangan</string>
     <string name="start_voice_call">Mulai Panggilan Suara</string>
     <string name="auth_login">Masuk</string>
     <string name="start_video_call">Mulai Panggilan Video</string>
@@ -69,7 +69,7 @@
     <string name="no">TIDAK</string>
     <string name="_continue">Lanjut</string>
     <string name="action_remove">Hapus</string>
-    <string name="action_join">Gabung</string>
+    <string name="action_join">Bergabung</string>
     <string name="action_reject">Tolak</string>
     <string name="later">Nanti</string>
     <string name="send_bug_report_include_crash_logs">Kirim catatan gangguan</string>
@@ -88,15 +88,14 @@
     <string name="send_bug_report_include_screenshot">Kirim tampilan layar</string>
     <string name="send_bug_report_description">Mohon uraikan kutu tersebut. Apa yang Anda lakukan\? Apa yang Anda harapkan terjadi\? Apa yang sebenarnya terjadi\?</string>
     <string name="send_bug_report_logs_description">Catatan dari klien akan dikirim bersama laporan gangguan ini untuk mendalami kendala yang Anda temukan. Laporan gangguan ini, termasuk catatan dan tangkapan layar, tidak akan terlihat secara umum. Jika Anda hanya ingin mengirimkan tulisan di atas, silakan hapus centang:</string>
-    <string name="send_bug_report_alert_message">Sepertinya Anda mengguncang ponsel akibat frustrasi. Apakah Anda ingin membuka halaman laporan kutu\?</string>
+    <string name="send_bug_report_alert_message">Sepertinya Anda mengguncang ponsel akibat emosi. Apakah Anda ingin membuka halaman laporan kutu\?</string>
     <string name="send_bug_report_failed">Pengiriman laporan kutu gagal (%s)</string>
     <string name="send_bug_report_progress">Kemajuan (%s%%)</string>
     <string name="username">Nama Pengguna</string>
     <string name="auth_invalid_login_param">Nama pengguna dan/atau kata sandi salah</string>
-    <string name="auth_reset_password_missing_email">Anda perlu memasukkan alamat email yang tertaut pada akun.</string>
     <string name="auth_reset_password_error_unauthorized">Verifikasi alamat email gagal: pastikan tautan yang termuat di email telah diklik</string>
     <string name="login_error_bad_json">JSON amburadul</string>
-    <string name="login_error_not_json">Tidak berisi JSON yang sah</string>
+    <string name="login_error_not_json">Tidak berisi JSON yang absah</string>
     <string name="login_error_limit_exceeded">Pengajuan yang dikirimkan terlalu banyak</string>
     <string name="incoming_video_call">Panggilan Video Masuk</string>
     <string name="incoming_voice_call">Panggilan Suara Masuk</string>
@@ -108,14 +107,13 @@
     <string name="light_theme">Tema Terang</string>
     <string name="dark_theme">Tema Gelap</string>
     <string name="black_theme">Tema Hitam</string>
-    <string name="notification_noisy_notifications">Pemberitahuan Berisik</string>
-    <string name="notification_silent_notifications">Pemberitahuan Tenteram</string>
+    <string name="notification_noisy_notifications">Pemberitahuan berisik</string>
+    <string name="notification_silent_notifications">Pemberitahuan diam</string>
     <string name="title_activity_bug_report">Laporan Gangguan</string>
     <string name="title_activity_choose_sticker">Kirimkan Sticker</string>
     <string name="loading">Memuat…</string>
     <string name="action_download">Unduh</string>
     <string name="system_alerts_header">Peringatan Sistem</string>
-    <string name="groups_header">Komunitas</string>
     <string name="send_bug_report_description_in_english">Mohon deskripsikan dengan bahasa Inggris apabila memungkinkan.</string>
     <string name="send_bug_report_rage_shake">Guncang perangkat untuk laporan gangguan</string>
     <string name="option_send_voice">Kirim Pesan Suara</string>
@@ -124,9 +122,9 @@
     <string name="option_send_sticker">Kirim Sticker</string>
     <string name="option_take_photo">Ambil foto</string>
     <string name="option_take_video">Ambil video</string>
-    <string name="no_sticker_application_dialog_content">Saat ini Anda belum memiliki pak stiker.
+    <string name="no_sticker_application_dialog_content">Saat ini Anda belum memiliki paket stiker apa pun.
 \n
-\nMau tambah sekarang\?</string>
+\nIngin tambah sekarang\?</string>
     <string name="error_no_external_application_found">Maaf, tidak ada aplikasi eksternal yang mendukung apa yang ingin dilakukan.</string>
     <string name="e2e_re_request_encryption_key"><u>Meminta ulang kunci enkripsi</u> dari perangkat Anda yang lain.</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Jalankan ${app_name} di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
@@ -148,8 +146,8 @@
     <string name="room_participants_action_ignore">Sembunyikan semua pesan dari pengguna ini</string>
     <string name="room_participants_action_unignore">Tunjukkan semua pesan dari pengguna ini</string>
     <string name="room_participants_action_mention">Sebut</string>
-    <string name="room_participants_power_level_prompt">Anda tidak akan dapat mengembalikan perubahan ini setelah Anda mengangkat pengguna ini agar memiliki kuasa yang setara dengan Anda.
-\nApakah anda yakin untuk melanjutkan\?</string>
+    <string name="room_participants_power_level_prompt">Anda tidak akan dapat mengembalikan perubahan ini setelah Anda mengangkat pengguna ini agar memiliki daya yang setara dengan Anda.
+\nApakah Anda yakin untuk melanjutkan\?</string>
     <string name="room_participants_ban_prompt_msg">Melakukan pencekalan pengguna akan mengeluarkannya dari ruangan ini dan mencegahnya untuk kembali masuk.</string>
     <string name="call_error_user_not_responding">Gagal terjawab oleh pihak lain.</string>
     <string name="room_one_user_is_typing">%s sedang mengetik…</string>
@@ -185,8 +183,8 @@
     <string name="settings_app_info_link_summary">Tampilkan info aplikasi dalam pengaturan sistem.</string>
     <string name="settings_app_info_link_title">Info aplikasi</string>
     <string name="settings_notification_ringtone">Suara pemberitahuan</string>
-    <string name="settings_enable_all_notif">Perbolehkan pemberitahuan untuk akun ini</string>
-    <string name="settings_enable_this_device">Perbolehkan pemberitahuan untuk perangkat ini</string>
+    <string name="settings_enable_all_notif">Aktifkan pemberitahuan untuk akun ini</string>
+    <string name="settings_enable_this_device">Aktifkan pemberitahuan untuk sesi ini</string>
     <string name="settings_containing_my_display_name">Pesan yang berisikan nama layarku</string>
     <string name="settings_containing_my_user_name">Pesan berisikan nama layarku</string>
     <string name="settings_messages_in_one_to_one">Pesan percakapan empat mata</string>
@@ -212,13 +210,13 @@
     <string name="widget_integration_unable_to_create">Tidak dapat membuat widget.</string>
     <string name="widget_integration_failed_to_send_request">Gagal mengirim permohonan.</string>
     <string name="widget_integration_positive_power_level">Tingkat energi harus bilangan positif.</string>
-    <string name="widget_integration_must_be_in_room">Anda tidak tergabung dengan ruangan ini.</string>
+    <string name="widget_integration_must_be_in_room">Anda tidak di ruangan ini.</string>
     <string name="widget_integration_no_permission_in_room">Anda tidak memiliki permisi untuk melakukan itu di ruangan ini.</string>
     <string name="widget_integration_missing_room_id">Tidak ada room_id dalam permohonan.</string>
     <string name="widget_integration_missing_user_id">Tidak ada user_id dalam permohonan.</string>
     <string name="widget_integration_room_not_visible">Ruang %s tidak terlihat.</string>
     <string name="widget_integration_missing_parameter">Ada parameter penting yang hilang.</string>
-    <string name="room_add_matrix_apps">Tambahkan apps Matrix</string>
+    <string name="room_add_matrix_apps">Tambahkan aplikasi Matrix</string>
     <string name="settings_labs_native_camera">Gunakan kamera bawaan</string>
     <string name="you_added_a_new_device">Anda menambahkan perangkat baru \'%s\', yang sedang meminta kunci enkripsi.</string>
     <string name="your_unverified_device_requesting">Perangkat Anda yang belum terverifikasi \'%s\' sedang meminta kunci enkripsi.</string>
@@ -230,13 +228,13 @@
     <string name="command_description_unban_user">Menghapus cekalan pengguna dengan id berikut</string>
     <string name="command_description_op_user">Tentukan tingkat kuasa seorang pengguna</string>
     <string name="command_description_invite_user">Undang pengguna dengan id berikut bergabung ke ruangan ini</string>
-    <string name="command_description_join_room">Gabung ke ruangan dengan alamat berikut</string>
+    <string name="command_description_join_room">Bergabung ke ruangan dengan alamat berikut</string>
     <string name="command_description_part_room">Tinggalkan ruang</string>
     <string name="command_description_topic">Tentukan topik ruang</string>
     <string name="command_description_remove_user">Keluarkan pengguna dengan id berikut</string>
     <string name="command_description_nick">Ubah nama panggilan layar Anda</string>
     <string name="command_description_markdown">Mati/Nyalakan markdown</string>
-    <string name="command_description_clear_scalar_token">Untuk memperbaiki kepengurusan Apps Matrix</string>
+    <string name="command_description_clear_scalar_token">Untuk memperbaiki kepengurusan Aplikasi Matrix</string>
     <string name="notification_off">Mati</string>
     <string name="notification_noisy">Berisik</string>
     <string name="encrypted_message">Pesan terenkripsi</string>
@@ -253,10 +251,10 @@
     <string name="deactivate_account_title">Nonaktifkan Akun</string>
     <string name="deactivate_account_content">Ini akan mengakibatkan akun Anda tidak dapat digunakan secara permanen. Anda tidak akan dapat masuk dan orang lain tidak dapat mendaftar ulang dengan ID pengguna yang sama. Ini akan mengakibatkan akun Anda keluar dari semua ruangan tempat Anda berpartisipasi serta menghapus semua detail akun dari server identitas Anda. <b>Tindakan ini tidak dapat diubah</b>.
 \n
-\nMenonaktifkan akun Anda <b>tidak membuat kami melupakan pesan-pesan yang Anda kirim secara default</b>. Jika Anda ingin kami melupakan pesan-pesan Anda, mohon centang kotak berikut.
+\nMenonaktifkan akun Anda <b>tidak membuat kami melupakan pesan-pesan yang Anda kirim secara bawaan</b>. Jika Anda ingin kami melupakan pesan-pesan Anda, mohon centang kotak berikut.
 \n
 \nKeterbacaan pesan di Matrix serupa dengan email. Dengan kami melupakan pesan-pesan Anda berarti pesan-pesan yang Anda kirim tidak akan dibagikan kepada pengguna baru ataupun yang belum terdaftar, tetapi pengguna yang terdaftar yang mempunyai mengakses pesan-pesan tersebut masih dapat mengakses salinan mereka.</string>
-    <string name="deactivate_account_delete_checkbox">Mohon lupakan semua pesan yang telah saya kirim ketika akun saya dideaktivasi (Peringatan: ini akan mengakibatkan pengguna di masa depan melihat percakapan yang tidak lengkap)</string>
+    <string name="deactivate_account_delete_checkbox">Mohon lupakan semua pesan yang telah saya kirim ketika akun saya dinonaktifkan (Peringatan: ini akan mengakibatkan pengguna di masa depan melihat percakapan yang tidak lengkap)</string>
     <string name="deactivate_account_submit">Nonaktifkan Akun</string>
     <string name="error_empty_field_your_password">Mohon masukkan kata sandi Anda.</string>
     <string name="room_tombstone_versioned_description">Ruangan ini telah berubah dan tidak lagi aktif.</string>
@@ -278,7 +276,7 @@
     <string name="encryption_never_send_to_unverified_devices_summary">Jangan kirim pesan terenkripsi ke perangkat yang tidak terverifikasi dari perangkat ini.</string>
     <string name="encryption_information_not_verified">TIDAK terverifikasi</string>
     <string name="encryption_information_verify">Verifikasi</string>
-    <string name="encryption_information_verify_device_warning">Untuk memastikan perangkat dapat dipercaya, mohon kontak pengguna dengan medium lain (misalnya tatap muka atau panggilan telepon) dan tanya apakah kunci yang mereka lihat di Pengaturan Pengguna untuk perangkat ini cocok dengan kunci berikut:</string>
+    <string name="encryption_information_verify_device_warning">Konfirmasi dengan membandingkan berikut ini dengan Pengaturan Pengguna di sesi Anda yang lain:</string>
     <string name="encryption_information_verify_device_warning2">Apabila cocok, tekan tombol verifikasi berikut.
 Apabila tidak, seseorang sedang menyadap perangkat ini dan mungkin perlu diblokir.
 Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
@@ -292,7 +290,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_settings_read_history_entry_anyone">Siapa pun</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Hanya anggota (dimulai sejak opsi ini dipilih)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Hanya anggota (dimulai sejak mereka diundang)</string>
-    <string name="room_settings_read_history_entry_members_only_joined">Hanya anggota (dimulai sejak mereka bergabung)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Hanya anggota (sejak mereka bergabung)</string>
     <string name="room_settings_banned_users_title">Pengguna yang dicekal</string>
     <string name="room_settings_category_advanced_title">Lanjutan</string>
     <string name="room_settings_room_internal_id">ID internal ruangan ini</string>
@@ -303,7 +301,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Kesalahan dekripsi</string>
     <string name="encryption_information_device_name">Nama perangkat</string>
-    <string name="encryption_information_device_id">ID Sesi</string>
+    <string name="device_manager_session_details_session_id">ID Sesi</string>
     <string name="encryption_information_device_key">Kunci perangkat</string>
     <string name="encryption_export_e2e_room_keys">Ekspor kunci ruangan terenkripsi</string>
     <string name="encryption_export_room_keys">Ekspor ruangan kunci</string>
@@ -346,7 +344,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="devices_details_device_name">Nama Perangkat</string>
     <string name="devices_details_last_seen_title">Terakhir terlihat</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
-    <string name="devices_delete_dialog_title">Otentikasi</string>
+    <string name="devices_delete_dialog_title">Autentikasi</string>
     <string name="settings_logged_in">Masuk sebagai</string>
     <string name="settings_home_server">Homeserver</string>
     <string name="settings_identity_server">Server identitas</string>
@@ -380,29 +378,29 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_participants_action_remove">Keluarkan</string>
     <string name="settings_notification_troubleshoot">Periksa Keadaan Pemberitahuan</string>
     <string name="settings_troubleshoot_diagnostic">Hasil diagnosa pemeriksaan keadaan</string>
-    <string name="settings_troubleshoot_diagnostic_run_button_title">Lansungkan Ujicoba</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">Jalankan Pengujian</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Berlangsung… (%1$d of %2$d)</string>
     <string name="settings_troubleshoot_diagnostic_success_status">Diagnosa dasar berlangsung lancar. Apabila Anda masih belum dapat menerima pemberitahuan, mohon kirim laporan kutu untuk kami selidiki.</string>
-    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Satu atau beberapa ujicoba gagal, coba sugesti yang kami tawarkan.</string>
-    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Satu atau beberapa ujicoba gagal, mohon kirim laporan kutu untuk kami selidiki.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Satu atau beberapa ujian gagal, coba saran yang kami tawarkan.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Satu atau beberapa ujian gagal, mohon kirim laporan kutu untuk kami selidiki.</string>
     <string name="settings_troubleshoot_test_system_settings_title">Pengaturan Sistem.</string>
-    <string name="settings_troubleshoot_test_system_settings_success">Pemberitahuan diperbolehkan dalam pengaturan sistem.</string>
+    <string name="settings_troubleshoot_test_system_settings_success">Pemberitahuan diaktifkan dalam pengaturan sistem.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Notifikasi dinonaktifkan dalam pengaturan sistem.
 \nMohon periksa pengaturan sistem anda.</string>
     <string name="open_settings">Buka Pengaturan</string>
     <string name="settings_troubleshoot_test_account_settings_title">Pengaturan Akun.</string>
-    <string name="settings_troubleshoot_test_account_settings_success">Pemberitahuan diperbolehkan dalam pengaturan akun Anda.</string>
+    <string name="settings_troubleshoot_test_account_settings_success">Pemberitahuan diaktifkan dalam pengaturan akun Anda.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Notifikasi dinonaktifkan dalam pengaturan akun anda.
 \nMohon periksa pengaturan akun anda.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Perbolehkan</string>
     <string name="settings_troubleshoot_test_device_settings_title">Pengaturan Perangkat.</string>
-    <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diperbolehkan untuk perangkat ini.</string>
+    <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diaktifkan untuk sesi ini.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Notifikasi tidak diaktifkan pada sesi ini.
 \nMohon periksa pengaturan ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Perbolehkan</string>
     <string name="settings_troubleshoot_test_play_services_title">Pemeriksaan Layanan Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Layanan Google Play ditemukan dan telah diperbaharui.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">${app_name} menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
+    <string name="settings_troubleshoot_test_play_services_failed">${app_name} menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Perbaiki Layanan Google Play</string>
     <string name="settings_troubleshoot_test_fcm_title">Token Firebase</string>
@@ -416,10 +414,10 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \n%1$s</string>
     <string name="settings_troubleshoot_test_service_boot_title">Mulai ketika menyalakan perangkat</string>
     <string name="settings_troubleshoot_test_service_boot_success">Layanan akan dimulai ketika perangkat dinyalakan kembali.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka ${app_name}.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan sampai Anda membuka ${app_name}.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Perbolehkan memulai ketika perangkat dinyalakan</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Periksa halangan di balik layar</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Larangan background dinonaktifkan untuk ${app_name}. Percobaan ini sebaiknya dijalankan menggunakan jaringan mobile data (bukan WIFI).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Larangan latar belakang dinonaktifkan untuk ${app_name}. Percobaan ini sebaiknya dijalankan menggunakan jaringan data ponsel (bukan WiFi).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_failed">Larangan background dinonaktifkan untuk ${app_name}.
 \nAktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik layar, dan ini dapat mempengaruhi pemunculan notifikasi.
@@ -441,18 +439,18 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="done">Selesai</string>
     <string name="action_sign_out_confirmation_simple">Anda yakin ingin keluar\?</string>
     <string name="settings_notification_advanced">Pengaturan Pemberitahuan Lanjutan</string>
-    <string name="settings_notification_by_event">Urgensi pemberitahuan lewat kejadian</string>
+    <string name="settings_notification_by_event">Kepentingan pemberitahuan berdasarkan peristiwa</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Pengaturan Sesukanya.</string>
-    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Perhatikan bahwa sebagian jenis pesan tersetel diam (mengeluarkan pemberitahuan tanpa suara).</string>
-    <string name="settings_troubleshoot_test_bing_settings_failed">Sebagian pemberitahuan dimatikan dalam aturan Anda.</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Perhatikan bahwa sebagian jenis pesan disetel diam (mengeluarkan pemberitahuan tanpa suara).</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">Sebagian pemberitahuan dimatikan dalam pengaturan Anda.</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nError ini di luar kendali ${app_name} dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nError ini di luar kendali ${app_name}, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
+\nKesalahan ini di luar kendali ${app_name}, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nError ini di luar kendali ${app_name}. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Tambah Akun</string>
-    <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode Doze. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
+    <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode tidur. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Abaikan Optimisasi</string>
     <string name="settings_noisy_notifications_preferences">Kelola Pemberitahuan Berisik</string>
     <string name="settings_call_notifications_preferences">Kelola Pemberitahuan Panggilan</string>
@@ -461,7 +459,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_cryptography_manage_keys">Pengelolaan Kunci Kriptografi</string>
     <string name="settings_inline_url_preview_summary">Pratinjau tautan dalam obrolan apabila homeserver mendukung fitur ini.</string>
     <string name="settings_send_typing_notifs">Kirim pemberitahuan mengetik</string>
-    <string name="settings_send_typing_notifs_summary">Beritahu pengguna lain bahwa Anda sedang mengetik.</string>
+    <string name="settings_send_typing_notifs_summary">Beri tahu pengguna lain bahwa Anda sedang mengetik.</string>
     <string name="settings_send_markdown">Format markdown</string>
     <string name="settings_send_markdown_summary">Format pesan menggunakan sintaks markdown sebelum dikirim. Ini mengizinkan format lanjutan seperti menggunakan tanda bintang untuk menunjukkan teks miring.</string>
     <string name="settings_show_read_receipts">Tunjukkan tanda telah dibaca</string>
@@ -495,7 +493,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="notice_placed_voice_call">%s melakukan panggilan suara.</string>
     <string name="notice_placed_video_call_by_you">Anda melakukan panggilan video.</string>
     <string name="notice_placed_video_call">%s melakukan panggilan video.</string>
-    <string name="notice_room_name_changed_by_you">Anda mengubah nama kamar menjadi: %1$s</string>
+    <string name="notice_room_name_changed_by_you">Anda mengubah nama ruangan menjadi: %1$s</string>
     <string name="notice_room_name_changed">%1$s mengubah nama ruangan menjadi: %2$s</string>
     <string name="notice_room_avatar_changed_by_you">Anda mengubah avatar ruangan ini</string>
     <string name="notice_room_avatar_changed">%1$s mengubah avatar ruangan ini</string>
@@ -548,7 +546,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Aplikasi ini sedang menunggu push</string>
     <string name="settings_troubleshoot_test_push_loop_success">Aplikasi ini menerima push</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Gagal menerima push. Solusinya adalah untuk menginstal ulang aplikasi.</string>
-    <string name="settings_troubleshoot_test_push_loop_title">Percobaan Push</string>
+    <string name="settings_troubleshoot_test_push_loop_title">Percobaan Dorongan</string>
     <string name="error_threepid_auth_failed">Pastikan Anda mengeklik tautan di email yang telah kami kirimkan kepada Anda.</string>
     <string name="settings_remove_three_pid_confirmation_content">Hapus %s\?</string>
     <string name="settings_phone_number_empty">Tidak ada nomor telepon yang ditambahkan ke akun Anda</string>
@@ -567,7 +565,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_permissions_change_main_address_for_the_room">Mengubah alamat utama untuk ruangan ini</string>
     <string name="room_permissions_change_room_avatar">Mengubah avatar ruangan</string>
     <string name="room_permissions_modify_widgets">Mengubah widget</string>
-    <string name="room_permissions_notify_everyone">Beritahu semuanya</string>
+    <string name="room_permissions_notify_everyone">Beri tahu semuanya</string>
     <string name="room_permissions_remove_messages_sent_by_others">Menghapus pesan yang dikirim dari yang lain</string>
     <string name="room_permissions_change_settings">Ubah pengaturan</string>
     <string name="room_permissions_default_role">Peran bawaan</string>
@@ -580,7 +578,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_participants_unban_title">Batalkan pencekalan pengguna</string>
     <string name="room_participants_ban_reason">Alasan untuk mencekal</string>
     <string name="room_participants_ban_title">Cekal pengguna</string>
-    <string name="room_participants_remove_prompt_msg">Pengguna yang dikeluarkan akan menghilangkannya dari ruangan ini.
+    <string name="room_participants_remove_prompt_msg">Pengguna akan dikeluarkan dari ruangan ini.
 \n
 \nUntuk mencegah mereka bergabung lagi, Anda seharusnya mencekalnya.</string>
     <string name="room_participants_remove_reason">Alasan untuk mengeluarkan</string>
@@ -595,7 +593,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_participants_action_ignore_title">Abaikan pengguna</string>
     <string name="room_participants_power_level_demote">Turunkan</string>
     <string name="room_participants_power_level_demote_warning_prompt">Anda tidak akan dapat membatalkan perubahan ini karena Anda menurunkan diri sendiri, jika Anda adalah pengguna istimewa terakhir di ruangan itu akan tidak mungkin untuk mendapatkan kembali hak istimewa.</string>
-    <string name="room_participants_power_level_demote_warning_title">Turunkan dirimu\?</string>
+    <string name="room_participants_power_level_demote_warning_title">Turunkan diri Anda\?</string>
     <string name="room_participants_action_cancel_invite">Batalkan undangan</string>
     <string name="room_participants_leave_private_warning">Ruangan ini tidak umum. Anda tidak akan dapat bergabung kembali tanpa undangan.</string>
     <string name="permissions_denied_add_contact">Izinkan untuk mengakses kontak.</string>
@@ -612,11 +610,11 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     </plurals>
     <string name="settings_call_show_confirmation_dialog_summary">Meminta untuk konfirmasi sebelum memulai panggilan</string>
     <string name="settings_call_show_confirmation_dialog_title">Cegah panggilan tidak disengaja</string>
-    <string name="error_unauthorized">Tidak sah, tidak ada kredensial otentikasi yang valid</string>
+    <string name="error_unauthorized">Tidak sah, tidak ada kredensial autentikasi yang absah</string>
     <string name="login_error_ssl_other">Kesalahan SSL.</string>
     <string name="login_error_ssl_peer_unverified">Kesalahan SSL: identitas peer belum diverifikasi.</string>
     <string name="login_error_homeserver_not_found">Tidak dapat mencapai homeserver pada URL ini, silakan periksa</string>
-    <string name="login_error_no_homeserver_found">Ini bukan alamat server Matrix yang valid</string>
+    <string name="login_error_no_homeserver_found">Ini bukan alamat server Matrix yang absah</string>
     <string name="auth_msisdn_already_defined">Nomor telepon ini sudah ditentukan.</string>
     <string name="auth_login_sso">Masuk dengan single sign-on</string>
     <string name="use_as_default_and_do_not_ask_again">Gunakan sebagai bawaan dan jangan tanya lagi</string>
@@ -659,7 +657,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="failed_to_add_widget">Gagal menambahkan widget</string>
     <string name="cannot_call_yourself_with_invite">Anda tidak dapat melakukan panggilan dengan diri sendiri, tunggu untuk peserta untuk menerima undangan</string>
     <string name="cannot_call_yourself">Anda tidak dapat melakukan panggilan dengan diri sendiri</string>
-    <string name="audio_video_meeting_description">Pertemuan menggunakan kebijakan keamanan dan izin Jitsi. Semua orang saat ini berada di ruangan akan melihat undangan untuk bergabung saat pertemuan Anda sedang berlangsung.</string>
+    <string name="audio_video_meeting_description">Pertemuan menggunakan kebijakan keamanan dan perizinan Jitsi. Semua orang saat ini berada di ruangan akan melihat undangan untuk bergabung saat pertemuan Anda sedang berlangsung.</string>
     <string name="video_meeting">Mulai rapat video</string>
     <string name="audio_meeting">Mulai rapat audio</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Anda tidak memiliki izin untuk memulai panggilan</string>
@@ -677,19 +675,19 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="action_disconnect">Putuskan</string>
     <string name="action_revoke">Batalkan</string>
     <string name="none">Tidak Ada</string>
-    <string name="system_theme">Standar Sistem</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Anda mengaktifkan enkripsi ujung-ke-ujung. (algoritma tidak dikenali %1$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s mengaktifkan enkripsi ujung-ke-ujung. (algoritma tidak dikenali %2$s).</string>
-    <string name="notice_end_to_end_ok_by_you">Anda mengaktifkan enkripsi ujung-ke-ujung.</string>
-    <string name="notice_end_to_end_ok">%1$s mengaktifkan enkripsi ujung-ke-ujung.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Anda telah mencegah para tamu untuk bergabung ruangan.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s telah mencegah para tamu untuk bergabung ruangan.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Anda telah mencegah para tamu untuk bergabung ruangan.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s telah mencegah para tamu untuk bergabung ruangan.</string>
-    <string name="notice_room_guest_access_can_join">%1$s telah mengizinkan para tamu untuk bergabung ruangan.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Anda telah mengizinkan para tamu untuk bergabung ruangan.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Anda telah mengizinkan para tamu untuk bergabung disini.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s telah mengizinkan para tamu untuk bergabung disini.</string>
+    <string name="system_theme">Bawaan Sistem</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Anda mengaktifkan enkripsi ujung ke ujung. (algoritma tidak dikenali %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s mengaktifkan enkripsi ujung ke ujung. (algoritma tidak dikenali %2$s).</string>
+    <string name="notice_end_to_end_ok_by_you">Anda mengaktifkan enkripsi ujung ke ujung.</string>
+    <string name="notice_end_to_end_ok">%1$s mengaktifkan enkripsi ujung ke ujung.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Anda telah mencegah para tamu untuk bergabung ke ruangan.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s telah mencegah para tamu untuk bergabung ke ruangan.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Anda telah mencegah para tamu untuk bergabung ke ruangan.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s telah mencegah para tamu untuk bergabung ke ruangan.</string>
+    <string name="notice_room_guest_access_can_join">%1$s telah mengizinkan para tamu untuk bergabung ke ruangan.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Anda telah mengizinkan para tamu untuk bergabung ke ruangan.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Anda telah mengizinkan para tamu untuk bergabung di sini.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s telah mengizinkan para tamu untuk bergabung di sini.</string>
     <string name="notice_room_canonical_alias_no_change_by_you">Anda mengubah alamat untuk ruangan ini.</string>
     <string name="notice_room_canonical_alias_no_change">%1$s mengubah alamat untuk ruangan ini.</string>
     <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Anda mengubah alamat utama dan alamat alternatif untuk ruangan ini.</string>
@@ -742,12 +740,12 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="notice_direct_room_leave_with_reason">%1$s meninggalkan ruangan. Alasan: %2$s</string>
     <string name="notice_room_leave_with_reason_by_you">Anda meninggalkan ruangan. Alasan: %1$s</string>
     <string name="notice_room_leave_with_reason">%1$s meninggalkan ruangan. Alasan: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Anda bergabung. Alasan %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s bergabung. Alasan %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s bergabung ruangan. Alasan: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Anda bergabung. Alasan: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s bergabung. Alasan: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s bergabung ke ruangan. Alasan: %2$s</string>
     <string name="notice_room_invite_you_with_reason">%1$s mengundang Anda. Alasan: %2$s</string>
     <string name="notice_room_invite_with_reason_by_you">Anda mengundang %1$s. Alasan: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Anda bergabung ruangan. Alasan %1$s</string>
+    <string name="notice_room_join_with_reason_by_you">Anda bergabung ke ruangan. Alasan: %1$s</string>
     <string name="notice_room_invite_with_reason">%1$s mengundang %2$s. Alasan: %3$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Undangan Anda. Alasan: %1$s</string>
     <string name="notice_room_invite_no_invitee_with_reason">Undangan %1$s. Alasan: %2$s</string>
@@ -755,8 +753,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="event_status_sent_message">Pesan terkirim</string>
     <string name="initial_sync_start_importing_account_data">Sinkronisasi awal:
 \nMengimpor data akun</string>
-    <string name="initial_sync_start_importing_account_groups">Sinkronisasi awal:
-\nMengimpor komunitas</string>
     <string name="initial_sync_start_importing_account_left_rooms">Sinkronisasi Awal:
 \nMengimpor ruangan yang ditinggalkan</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Sinkronisasi awal:
@@ -804,12 +800,12 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="notice_room_third_party_registered_invite">%1$s menerima undangan untuk %2$s</string>
     <string name="notice_direct_room_third_party_revoked_invite_by_you">Anda membatalkan undangan untuk %1$s</string>
     <string name="notice_direct_room_third_party_revoked_invite">%1$s membatalkan undangan untuk %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Anda membatalkan undangan untuk %1$s untuk bergabung ruangan</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s membatalkan undangan untuk %2$s untuk bergabung ruangan</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Anda membatalkan undangan untuk %1$s untuk bergabung ke ruangan</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s membatalkan undangan untuk %2$s untuk bergabung ke ruangan</string>
     <string name="notice_direct_room_third_party_invite_by_you">Anda mengundang %1$s</string>
     <string name="notice_direct_room_third_party_invite">%1$s mengundang %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Anda mengirimkan undangan ke %1$s untuk bergabung ruangan</string>
-    <string name="notice_room_third_party_invite">%1$s mengirimkan undangan ke %2$s untuk bergabung ruangan</string>
+    <string name="notice_room_third_party_invite_by_you">Anda mengirimkan undangan ke %1$s untuk bergabung ke ruangan</string>
+    <string name="notice_room_third_party_invite">%1$s mengirimkan undangan ke %2$s untuk bergabung ke ruangan</string>
     <string name="notice_room_avatar_removed_by_you">Anda menghapus avatar ruangan</string>
     <string name="notice_room_avatar_removed">%1$s menghapus avatar ruangan</string>
     <string name="notice_room_topic_removed_by_you">Anda menghapus topik ruangan</string>
@@ -820,7 +816,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="notice_room_server_acl_allow_is_empty">🎉 Semua server dilarang untuk berpartisipasi! Ruangan ini tidak lagi dapat digunakan.</string>
     <string name="notice_room_server_acl_updated_no_change">Tidak ada berubahan.</string>
     <string name="settings_phone_numbers">Nomor telepon</string>
-    <string name="settings_emails_empty">Tidak ada email yang ditambahkan ke akun Anda</string>
+    <string name="settings_emails_empty">Tidak ada alamat email yang ditambahkan ke akun Anda</string>
     <string name="settings_emails">Surel</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Server yang cocok dengan literal IP sekarang dilarang.</string>
     <string name="notice_room_server_acl_updated_banned">• Server yang cocok dengan %s sekarang dilarang.</string>
@@ -837,8 +833,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="unknown_error">Maaf, terjadi kesalahan</string>
     <string name="error_empty_field_enter_user_name">Mohon masukkan nama pengguna.</string>
     <string name="notification_silent">Diam</string>
-    <string name="markdown_has_been_disabled">Penurunan harga telah dinonaktifkan.</string>
-    <string name="markdown_has_been_enabled">Penurunan harga telah diaktifkan.</string>
+    <string name="markdown_has_been_disabled">Markdown telah dinonaktifkan.</string>
+    <string name="markdown_has_been_enabled">Markdown telah diaktifkan.</string>
     <string name="command_problem_with_parameters">Perintah \"%s\" membutuhkan parameter tambahan, atau beberapa parameter salah.</string>
     <string name="ignore_request_short_label">Abaikan</string>
     <string name="key_share_request">Permintaan Pembagian Kunci</string>
@@ -965,17 +961,17 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_settings_room_read_history_dialog_subtitle">Perubahan siapa yang dapat membaca riwayat hanya akan berlaku untuk pesan berikutnya di ruangan ini. Visibilitas riwayat yang ada tidak akan berubah.</string>
     <string name="room_settings_room_notifications_account_settings">Pengaturan akun</string>
     <string name="room_settings_room_notifications_manage_notifications">Anda dapat mengelola notifikasi di %1$s.</string>
-    <string name="room_settings_room_notifications_encryption_notice">Harap dicatat bahwa pemberitahuan sebutan &amp; kata kunci tidak tersedia di ruangan terenkripsi di ponsel.</string>
-    <string name="room_settings_room_notifications_notify_me">Beritahu saya untuk</string>
+    <string name="room_settings_room_notifications_encryption_notice">Harap dicatat bahwa pemberitahuan sebutan &amp; kata kunci tidak tersedia dalam ruangan terenkripsi di ponsel.</string>
+    <string name="room_settings_room_notifications_notify_me">Beri tahu saya untuk</string>
     <string name="settings_play_shutter_sound">Putar suara rana</string>
     <string name="media_source_choose">Pilih</string>
-    <string name="settings_default_media_source">Sumber media default</string>
+    <string name="settings_default_media_source">Sumber media bawaan</string>
     <string name="compression_opt_list_choose">Pilih</string>
-    <string name="settings_default_compression">Kompresi default</string>
+    <string name="settings_default_compression">Kompresi bawaan</string>
     <string name="settings_media">Media</string>
-    <string name="settings_emails_and_phone_numbers_summary">Kelola email dan nomor telepon yang ditautkan ke akun Matrix Anda</string>
+    <string name="settings_emails_and_phone_numbers_summary">Kelola alamat email dan nomor telepon yang ditautkan ke akun Matrix Anda</string>
     <string name="settings_emails_and_phone_numbers_title">Email dan nomor telepon</string>
-    <string name="settings_fail_to_update_password_invalid_current_password">Sandi tidak valid</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">Kata sandi tidak absah</string>
     <string name="settings_password">Sandi</string>
     <string name="disabled_integration_dialog_content">Aktifkan \'Izinkan integrasi\' di Pengaturan untuk melakukan ini.</string>
     <string name="disabled_integration_dialog_title">Integrasi dinonaktifkan</string>
@@ -996,20 +992,20 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_chat_effects_description">Gunakan perintah /confetti atau kirim pesan yang berisi ❄️ atau 🎉</string>
     <string name="settings_chat_effects_title">Tampilkan efek chat</string>
     <string name="settings_integrations_summary">Gunakan pengelola integrasi untuk mengelola bot, jembatan, widget, dan paket stiker.
-\nPengelola integrasi menerima data konfigurasi, dan dapat memodifikasi widget, mengirim undangan ruang, dan mengatur tingkat daya dengan sepengetahuan Anda.</string>
+\nPengelola integrasi menerima data konfigurasi, dan dapat memodifikasi widget, mengirim undangan ruang, dan mengatur tingkat daya dengan pengetahuan Anda.</string>
     <string name="settings_integrations">Integrasi</string>
     <plurals name="seconds">
         <item quantity="other">%d detik</item>
     </plurals>
-    <string name="settings_background_fdroid_sync_mode_disabled_description">Anda tidak akan diberitahu tentang pesan masuk saat aplikasi berada di latar belakang.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Anda tidak akan diberi tahu tentang pesan masuk saat aplikasi berada di latar belakang.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Tidak ada sinkronisasi latar belakang</string>
     <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} akan disinkronkan di latar belakang secara berkala pada waktu yang tepat (dapat dikonfigurasi).
 \nIni akan memengaruhi penggunaan radio dan baterai, dan ada juga pemberitahuan yang ditampilkan permanen menyatakan bahwa ${app_name} sedang mendengarkan peristiwa.</string>
-    <string name="settings_mentions_and_keywords_encryption_notice">Anda tidak akan mendapatkan notifikasi untuk sebutan &amp; keyword di ruangan terenkripsi di ponsel.</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Anda tidak akan mendapatkan notifikasi untuk sebutan &amp; kata kunci dalam ruangan terenkripsi di ponsel.</string>
     <string name="settings_room_upgrades">Peningkatan ruangan</string>
     <string name="settings_messages_by_bot">Pesan dari bot</string>
     <string name="settings_room_invitations">Undangan ruangan</string>
-    <string name="settings_messages_containing_keywords">Keyword</string>
+    <string name="settings_messages_containing_keywords">Kata kunci</string>
     <string name="settings_mentions_at_room">\@room</string>
     <string name="settings_encrypted_group_messages">Pesan grup terenkripsi</string>
     <string name="settings_group_messages">Pesan grup</string>
@@ -1021,16 +1017,16 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_when_rooms_are_upgraded">Saat ruangan ditingkatkan</string>
     <string name="settings_messages_in_e2e_group_chat">Pesan terenkripsi di obrolan grup</string>
     <string name="settings_messages_in_e2e_one_to_one">Pesan terenkripsi di chat satu-ke-satu</string>
-    <string name="settings_notification_keyword_contains_invalid_character">Keyword tidak boleh berisi \'%s\'</string>
-    <string name="settings_notification_keyword_contains_dot">Keyword tidak boleh diawali dengan \'.\'</string>
-    <string name="settings_notification_new_keyword">Tambahkan keyword baru</string>
-    <string name="settings_notification_your_keywords">Keyword Anda</string>
-    <string name="settings_notification_notify_me_for">Beritahu saya untuk</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Kata kunci tidak boleh berisi \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">Kata kunci tidak boleh diawali dengan \'.\'</string>
+    <string name="settings_notification_new_keyword">Tambahkan kata kunci baru</string>
+    <string name="settings_notification_your_keywords">Kata kunci Anda</string>
+    <string name="settings_notification_notify_me_for">Beri tahu saya untuk</string>
     <string name="settings_notification_other">Lainnya</string>
-    <string name="settings_notification_mentions_and_keywords">Sebutan dan Keyword</string>
+    <string name="settings_notification_mentions_and_keywords">Sebutan dan Kata Kunci</string>
     <string name="settings_notification_default">Notifikasi Bawaan</string>
     <string name="room_settings_none">Tidak ada</string>
-    <string name="room_settings_mention_and_keyword_only">Hanya sebutan &amp; keyword</string>
+    <string name="room_settings_mention_and_keyword_only">Hanya sebutan &amp; kata kunci</string>
     <string name="call_remove_jitsi_widget_progress">Mengakhiri panggilan…</string>
     <string name="call_ended_invite_timeout_title">Tidak ada jawaban</string>
     <string name="call_ended_user_busy_description">Pengguna yang Anda panggil sedang sibuk.</string>
@@ -1039,23 +1035,23 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="video_call_with_participant">Panggilan video dengan %s</string>
     <string name="call_ringing">Panggilan berdering…</string>
     <string name="spaces">Space</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Kami mengirimi Anda email konfirmasi ke %s, mohon periksa email Anda dan klik tautan konfirmasi</string>
-    <string name="settings_discovery_no_mails">Opsi penemuan akan muncul setelah Anda menambahkan email.</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Kami mengirim Anda email konfirmasi ke %s, mohon periksa email Anda dan klik tautan konfirmasi</string>
+    <string name="settings_discovery_no_mails">Opsi penemuan akan muncul setelah Anda menambahkan sebuah alamat email.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Memutuskan sambungan dari server identitas Anda akan membuat Anda tidak dapat ditemukan oleh pengguna lain dan Anda tidak akan dapat mengundang orang lain melalui email atau nomor telepon.</string>
     <string name="settings_discovery_consent_title">Kirim email dan nomor telepon</string>
-    <string name="settings_discovery_consent_notice_on">Anda telah memberikan persetujuan untuk mengirim email dan nomor telepon ke server identitas ini untuk menemukan pengguna lain dari kontak Anda.</string>
+    <string name="settings_discovery_consent_notice_on">Anda telah memberikan persetujuan untuk mengirim alamat email dan nomor telepon ke server identitas ini untuk menemukan pengguna lain dari kontak Anda.</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Anda sedang berbagi email atau nomor telepon di server identitas %1$s. Anda harus menyambungkan kembali ke %2$s untuk berhenti membagikannya.</string>
     <string name="settings_agree_to_terms">Setujui Persyaratan Layanan server identitas (%s) agar Anda dapat ditemukan melalui email atau nomor telepon.</string>
-    <string name="settings_discovery_confirm_mail">Kami mengirimi Anda email konfirmasi ke %s, periksa email Anda dan klik tautan konfirmasi</string>
+    <string name="settings_discovery_confirm_mail">Kami mengirim Anda sebuah email ke %s, periksa email Anda dan klik tautan konfirmasi</string>
     <string name="login_reset_password_on">Setel ulang sandi di %1$s</string>
-    <string name="login_login_with_email_error">Email ini tidak terkait dengan akun apa pun.</string>
+    <string name="login_login_with_email_error">Alamat email ini tidak terkait dengan akun apa pun.</string>
     <string name="login_registration_not_supported">Aplikasi tidak dapat membuat akun di homeserver ini.
 \n
-\nApakah Anda ingin mendaftar menggunakan client web\?</string>
+\nApakah Anda ingin mendaftar menggunakan klien web\?</string>
     <string name="login_registration_disabled">Maaf, server ini tidak menerima akun baru.</string>
     <string name="login_mode_not_supported">Aplikasi tidak dapat masuk ke homeserver ini. Homeserver mendukung jenis masuk berikut: %1$s.
 \n
-\nApakah Anda ingin masuk menggunakan client web\?</string>
+\nApakah Anda ingin masuk menggunakan klien web\?</string>
     <string name="login_sso_error_message">Ada kesalahan terjadi saat memuat halaman: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">Masukkan alamat server yang ingin Anda gunakan</string>
     <string name="login_server_url_form_modular_notice">Masukkan alamat Modular Element atau Server yang ingin Anda gunakan</string>
@@ -1080,11 +1076,11 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_server_other_title">Lainnya</string>
     <string name="login_server_modular_learn_more">Pelajari lebih lanjut</string>
     <string name="login_server_modular_text">Hosting premium untuk organisasi</string>
-    <string name="login_server_matrix_org_text">Bergabunglah dengan jutaan orang secara gratis di server publik terbesar</string>
+    <string name="login_server_matrix_org_text">Bergabung dengan jutaan orang secara gratis di server publik terbesar</string>
     <string name="login_server_text">Sama seperti email, akun memiliki satu tempat, tetapi Anda dapat berkomunikasi dengan siapa saja</string>
     <string name="login_server_title">Pilih server</string>
     <string name="login_splash_submit">Mulai</string>
-    <string name="login_splash_text3">Luaskan &amp; sesuaikan pengalaman Anda</string>
+    <string name="login_splash_text3">Tingkatkan &amp; sesuaikan pengalaman Anda</string>
     <string name="login_splash_title">Ini adalah percakapan Anda. Miliki percakapan Anda.</string>
     <string name="login_splash_text2">Jaga percakapan tetap pribadi dengan enkripsi</string>
     <string name="login_splash_text1">Chat dengan orang-orang secara langsung atau dalam grup</string>
@@ -1097,7 +1093,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_join_rules_public">%1$s membuat ruangan publik untuk siapa pun yang mengetahui tautannya.</string>
     <string name="help_long_click_on_room_for_more_options">Tekan lama pada sebuah ruangan untuk melihat lebih banyak pilihan</string>
     <string name="no_ignored_users">Anda tidak mengabaikan pengguna apa pun</string>
-    <string name="reaction_search_type_hint">Ketik keyword untuk mencari reaksi.</string>
+    <string name="reaction_search_type_hint">Ketik kata kunci untuk mencari sebuah reaksi.</string>
     <string name="spoiler">Spoiler</string>
     <string name="command_description_spoiler">Mengirim pesan sebagai spoiler</string>
     <string name="notice_member_no_changes_by_you">Anda tidak membuat perubahan</string>
@@ -1152,9 +1148,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
     <string name="labs_show_unread_notifications_as_tab">Tambahkan tab terdedikasi untuk notifikasi yang belum dibaca di layar utama.</string>
     <string name="error_file_too_big_simple">File ini terlalu besar untuk diupload.</string>
-    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Cadangan mempunyai tanda tangan yang tidak valid dari sesi %s yang belum diverifikasi</string>
-    <string name="keys_backup_settings_invalid_signature_from_verified_device">Cadangan mempunyai tanda tangan yang tidak valid dari sesi %s yang terverifikasi</string>
-    <string name="keys_backup_settings_valid_signature_from_unverified_device">Cadangan mempunyai tanda tangan yang valid dari sesi %s yang belum diverifikasi</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Cadangan mempunyai tanda tangan yang tidak absah dari sesi %s yang belum diverifikasi</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Cadangan mempunyai tanda tangan yang tidak absah dari sesi %s yang terverifikasi</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Cadangan mempunyai tanda tangan yang absah dari sesi %s yang belum diverifikasi</string>
     <string name="send_file_step_sending_thumbnail">Mengirim gambar mini (%1$s / %2$s)</string>
     <plurals name="fallback_users_read">
         <item quantity="other">%d pengguna telah membaca</item>
@@ -1206,7 +1202,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="qr_code">Kode QR</string>
     <string name="add_by_qr_code">Tambah dengan kode QR</string>
     <string name="link_copied_to_clipboard">Tautan disalin ke klipboard</string>
-    <string name="labs_swipe_to_reply_in_timeline">Aktifkan geser untuk balas di linimasa</string>
+    <string name="labs_swipe_to_reply_in_timeline">Aktifkan geser untuk balas di lini masa</string>
     <string name="search_hint_room_name">Cari Nama</string>
     <string name="room_directory_search_hint">Nama atau ID (#contoh:matrix.org)</string>
     <string name="room_filtering_footer_open_room_directory">Tampilkan direktori ruangan</string>
@@ -1222,7 +1218,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="send_file_step_compressing_image">Mengompresi gambar…</string>
     <string name="send_file_step_sending_file">Mengirim file (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">Mengenkripsi file…</string>
-    <string name="settings_labs_show_hidden_events_in_timeline">Tampilkan peristiwa tersembunyi di linimasa</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">Tampilkan peristiwa tersembunyi di lini masa</string>
     <string name="send_file_step_encrypting_thumbnail">Mengenkripsi gambar mini…</string>
     <string name="send_file_step_idle">Menunggu…</string>
     <string name="bottom_action_people_x">Pesan Langsung</string>
@@ -1244,10 +1240,10 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="preference_voice_and_video">Suara &amp; Video</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="push_gateway_item_url">Url:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_device_name">Nama Tampilan Sesi:</string>
+    <string name="push_gateway_item_app_display_name">Nama Tampilan Aplikasi:</string>
+    <string name="push_gateway_item_push_key">Kunci Dorongan:</string>
+    <string name="push_gateway_item_app_id">ID Aplikasi:</string>
     <string name="settings_push_gateway_no_pushers">Tidak ada gateway dorong terdaftar</string>
     <string name="settings_push_rules_no_rules">Tidak ada aturan push yang ditentukan</string>
     <string name="settings_push_rules">Aturan Push</string>
@@ -1282,8 +1278,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="keys_backup_settings_delete_confirm_title">Hapus Cadangan</string>
     <string name="keys_backup_settings_checking_backup_state">Memeriksa status cadangan</string>
     <string name="keys_backup_settings_deleting_backup">Menghapus cadangan…</string>
-    <string name="keys_backup_settings_valid_signature_from_verified_device">Cadangan mempunyai tanda tangan yang valid dari sesi %s yang terverifikasi.</string>
-    <string name="keys_backup_settings_valid_signature_from_this_device">Cadangan mempunyai tanda tangan yang valid dari sesi ini.</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Cadangan mempunyai tanda tangan yang absah dari sesi %s yang terverifikasi.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Cadangan mempunyai tanda tangan yang absah dari sesi ini.</string>
     <string name="keys_backup_settings_signature_from_unknown_device">Cadangan mempunyai tanda tangan dari sesi tidak dikenal dengan ID %s.</string>
     <string name="keys_backup_settings_status_not_setup">Kunci Anda tidak dicadangkan dari sesi ini.</string>
     <string name="keys_backup_settings_status_ko">Cadangan Kunci belum aktif di sesi ini.</string>
@@ -1346,7 +1342,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="keys_backup_setup_step1_manual_export">Ekspor kunci secara manual</string>
     <string name="keys_backup_setup_step1_advanced">(Lanjutan)</string>
     <string name="keys_backup_setup">Mulai menggunakan Cadangan Kunci</string>
-    <string name="keys_backup_setup_step1_description">Pesan di ruangan terenkripsi diamankan dengan enkripsi ujung-ke-ujung. Hanya Anda dan penerima memiliki kunci untuk membaca pesan-pesan ini.
+    <string name="keys_backup_setup_step1_description">Pesan di ruangan terenkripsi diamankan dengan enkripsi ujung ke ujung. Hanya Anda dan penerima memiliki kunci untuk membaca pesan ini.
 \n
 \nCadangkan kunci Anda dengan aman untuk menghindari kehilangan kunci Anda.</string>
     <string name="keys_backup_setup_step1_title">Jangan pernah kehilangan pesan terenkripsi</string>
@@ -1355,7 +1351,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="passphrase_empty_error_message">Mohon masukkan frasa sandi</string>
     <string name="passphrase_passphrase_does_not_match">Frasa sandi tidak cocok</string>
     <string name="passphrase_create_passphrase">Buat frasa sandi</string>
-    <string name="no_valid_google_play_services_apk">Tidak menemukan APK Layanan Google Play yang valid. Notifikasi mungkin tidak berkerja dengan seharusnya.</string>
+    <string name="no_valid_google_play_services_apk">Tidak menemukan APK Layanan Google Play yang absah. Notifikasi mungkin tidak bekerja dengan seharusnya.</string>
     <string name="settings_security_and_privacy">Keamanan &amp; Privasi</string>
     <string name="settings_preferences">Preferensi</string>
     <string name="settings_general_title">Umum</string>
@@ -1378,11 +1374,10 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="create_room_action_create">BUAT</string>
     <string name="fab_menu_create_chat">Pesan Langsung</string>
     <string name="fab_menu_create_room">Ruangan</string>
-    <string name="room_preview_no_preview_join">Ruangan ini tidak dapat ditampilkan. Apakah Anda masih mau bergabung\?</string>
+    <string name="room_preview_no_preview_join">Ruangan ini tidak dapat ditampilkan. Apakah Anda masih ingin bergabung\?</string>
     <string name="room_preview_not_found">Ruangan ini tidak dapat di akses di waktu ini.
 \nCoba lagi nanti, atau tanya admin ruangan untuk memeriksa jika Anda punya akses.</string>
     <string name="room_preview_no_preview">Ruangan ini tidak dapat di tampilkan</string>
-    <string name="group_all_communities">Semua Komunitas</string>
     <string name="please_wait">Mohon menunggu…</string>
     <string name="change_room_directory_network">Ganti jaringan</string>
     <string name="action_change">Ganti</string>
@@ -1420,7 +1415,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="verification_profile_verified">Terverifikasi</string>
     <string name="verification_profile_verify">Verifikasi</string>
     <string name="verification_open_other_to_verify">Gunakan sesi yang ada untuk memverifikasi yang satu ini, memberikan aksesnya ke pesan terenkripsi.</string>
-    <string name="crosssigning_verify_this_session">Verifikasi login ini</string>
+    <string name="crosssigning_verify_this_session">Verifikasi perangkat ini</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="other">%d sesi aktif</item>
     </plurals>
@@ -1429,7 +1424,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_failed_to_get_crypto_device_info">Tidak ada informasi cryptographic</string>
     <string name="settings_server_room_version_unstable">unstable</string>
     <string name="settings_server_room_version_stable">stable</string>
-    <string name="settings_server_default_room_version">Versi Default</string>
+    <string name="settings_server_default_room_version">Versi Bawaan</string>
     <string name="settings_server_room_versions">Versi Ruangan 👓</string>
     <string name="settings_server_upload_size_unknown">Batas tidak diketahui.</string>
     <string name="settings_server_upload_size_content">Homeserver Anda menerima lampiran (file, media, dsb.) dengan ukuran hingga %s.</string>
@@ -1440,7 +1435,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_active_sessions_manage">Kelola Sesi</string>
     <string name="settings_active_sessions_show_all">Tampilkan Semua Sesi</string>
     <string name="settings_active_sessions_list">Sesi Aktif</string>
-    <string name="settings_hs_admin_e2e_disabled">Admin server Anda telah menonaktifkan enkripsi ujung-ke-ujung secara default di kamar pribadi &amp; pesan langsung.</string>
+    <string name="settings_hs_admin_e2e_disabled">Admin server Anda telah menonaktifkan enkripsi ujung ke ujung secara bawaan di ruangan &amp; Pesan Langsung privat.</string>
     <string name="encryption_information_dg_xsigning_disabled">Tanda Tangan Silang dinonaktifkan</string>
     <string name="encryption_information_dg_xsigning_trusted">Tanda Tangan Silang diaktifkan.
 \nKunci dipercaya.
@@ -1451,7 +1446,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \nKunci Privat di perangkat.</string>
     <string name="encryption_information_cross_signing_state">Tanda Tangan Silang</string>
     <string name="verification_conclusion_ok_self_notice">Sesi baru Anda telah diverifikasi. Ini memiliki akses ke pesan terenkripsi Anda, dan pengguna lain akan melihatnya sebagai tepercaya.</string>
-    <string name="verification_conclusion_ok_notice">Pesan dengan pengguna ini dienkripsi ujung-ke-ujung dan tidak dapat dibaca oleh pihak ketiga.</string>
+    <string name="verification_conclusion_ok_notice">Pesan dengan pengguna ini dienkripsi ujung ke ujung dan tidak dapat dibaca oleh pihak ketiga.</string>
     <string name="verification_code_notice">Bandingkan kode dengan yang ditampilkan di layar pengguna lain.</string>
     <string name="verification_emoji_notice">Bandingkan emoji yang unik, dan pastikan mereka muncul di urutan yang sama.</string>
     <string name="verification_request_start_notice">Supaya aman, lakukan secara langsung atau gunakan cara lain untuk berkomunikasi.</string>
@@ -1459,10 +1454,10 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Aktifkan enkripsi</string>
     <string name="room_settings_enable_encryption_dialog_content">Ketika diaktifkan, enkripsi tidak dapat dinonaktifkan. Pesan yang dikirim di ruangan terenkripsi tidak dapat dilihat oleh servernya, hanya anggota ruangan. Mengaktifkan enkripsi mungkin mencegah banyaknya bot dan jembatan bekerja dengan seharusnya.</string>
     <string name="room_settings_enable_encryption_dialog_title">Aktifkan enkripsi\?</string>
-    <string name="room_settings_enable_encryption_no_permission">Anda tidak memiliki izin untuk mengaktifkan enkripsi ujung-ke-ujung di ruangan ini.</string>
-    <string name="room_settings_enable_encryption">Aktifkan enkripsi ujung-ke-ujung…</string>
+    <string name="room_settings_enable_encryption_no_permission">Anda tidak memiliki izin untuk mengaktifkan enkripsi ujung ke ujung di ruangan ini.</string>
+    <string name="room_settings_enable_encryption">Aktifkan enkripsi ujung ke ujung…</string>
     <string name="settings_category_composer">Editor pesan</string>
-    <string name="settings_category_timeline">Linimasa</string>
+    <string name="settings_category_timeline">Lini Masa</string>
     <string name="command_description_rainbow_emote">Mengirim emote yang dicantum berwarna pelangi</string>
     <string name="command_description_rainbow">Mengirim pesan yang dicantum berwarna pelangi</string>
     <string name="verify_cannot_cross_sign">Sesi ini tidak dapat berbagi verifikasi ini dengan sesi Anda yang lain.
@@ -1495,14 +1490,14 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_profile_section_more">Lebih banyak</string>
     <string name="room_profile_section_security_learn_more">Pelajari lebih lanjut</string>
     <string name="room_profile_section_security">Keamanan</string>
-    <string name="direct_room_profile_encrypted_subtitle">Pesan di ruangan ini dienkripsi ujung-ke-ujung.
+    <string name="direct_room_profile_encrypted_subtitle">Pesan di ruangan ini dienkripsi secara ujung ke ujung.
 \n
 \nPesan Anda diamankan dengan kunci dan hanya Anda dan penerima memiliki kunci unik untuk mengakses mereka.</string>
-    <string name="room_profile_encrypted_subtitle">Pesan di ruangan ini dienkripsi ujung-ke-ujung.
+    <string name="room_profile_encrypted_subtitle">Pesan di ruangan ini dienkripsi secara ujung ke ujung.
 \n
 \nPesan Anda diamankan dengan kunci dan hanya Anda dan penerima memiliki kunci unik untuk mengakses mereka.</string>
-    <string name="direct_room_profile_not_encrypted_subtitle">Pesan ini tidak terenkripsi secara ujung-ke-ujung.</string>
-    <string name="room_profile_not_encrypted_subtitle">Pesan di ruangan ini tidak terenkripsi secara ujung-ke-ujung.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Pesan ini tidak terenkripsi secara ujung ke ujung.</string>
+    <string name="room_profile_not_encrypted_subtitle">Pesan di ruangan ini tidak terenkripsi secara ujung ke ujung.</string>
     <string name="verification_request_waiting_for">Menunggu untuk %s…</string>
     <string name="verification_verified_user">Diverifikasi %s</string>
     <string name="verification_verify_user">Verifikasi %s</string>
@@ -1592,8 +1587,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \n• Administrator server Anda telah menghilangkan akses Anda untuk keamanan.</string>
     <string name="signed_out_title">Anda telah keluar</string>
     <string name="seen_by">Dilihat oleh</string>
-    <string name="autodiscover_well_known_error">Tidak dapat menemukan homeserver yang valid. Mohon cek pengenal Anda</string>
-    <string name="login_signin_matrix_id_error_invalid_matrix_id">Ini bukan pengenal pengguna yang valid. Format yang diharapkan: \'@pengguna:homeserver.org\'</string>
+    <string name="autodiscover_well_known_error">Tidak dapat menemukan homeserver yang absah. Mohon cek pengenal Anda</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Ini bukan pengenal pengguna yang absah. Format yang diharapkan: \'@pengguna:homeserver.org\'</string>
     <string name="login_signin_matrix_id_password_notice">Jika Anda tidak tahu kata sandi Anda, kembali untuk mengatur ulang.</string>
     <string name="login_signin_matrix_id_hint">ID Matrix</string>
     <string name="login_signin_matrix_id_notice">Jika Anda membuat akun di sebuah homeserver, gunakan ID Matrix Anda (mis. @pengguna:domain.com) dan kata sandi dibawah.</string>
@@ -1621,7 +1616,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_signup_password_hint">Kata sandi</string>
     <string name="login_signup_username_hint">Nama pengguna</string>
     <string name="login_signin_username_hint">Nama pengguna atau email</string>
-    <string name="login_msisdn_error_other">Nomor telepon kelihatannya tidak valid. Mohon dicek lagi</string>
+    <string name="login_msisdn_error_other">Nomor telepon kelihatannya tidak absah. Mohon dicek lagi</string>
     <string name="login_msisdn_error_not_international">Nomor telepon internasional harus mulai dengan \'+\'</string>
     <string name="login_msisdn_notice">Mohon menggunakan format internasional (nomor telepon harus mulai dengan \'+\')</string>
     <string name="login_msisdn_confirm_submit">Lanjut</string>
@@ -1637,7 +1632,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_set_email_submit">Lanjut</string>
     <string name="login_set_email_optional_hint">Email (opsional)</string>
     <string name="login_set_email_mandatory_hint">Email</string>
-    <string name="login_set_email_notice">Atur sebuah email untuk memulihkan akun Anda. Nantinya, Anda dapat mengizinkan orang yang Anda tahu untuk menemukan Anda dari email secara opsional.</string>
+    <string name="login_set_email_notice">Atur sebuah alamat email untuk memulihkan akun Anda. Nantinya, Anda dapat mengizinkan orang yang Anda tahu untuk menemukan Anda dari email ini secara opsional.</string>
     <string name="login_set_email_title">Atur alamat email</string>
     <string name="login_reset_password_cancel_confirmation_content">Kata sandi Anda belum diubah.
 \n
@@ -1651,9 +1646,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Ketuk tautan untuk mengkonfirmasi kata sandi baru Anda. Setelah Anda mengikuti petunjuk yang ada di tautan, klik bawahnya.</string>
     <string name="login_reset_password_mail_confirmation_notice">Email verifikasi terkirim ke %1$s.</string>
     <string name="login_reset_password_mail_confirmation_title">Cek kotak masuk Anda</string>
-    <string name="login_reset_password_error_not_found">Email ini tidak tertaut dengan akun apa pun</string>
+    <string name="login_reset_password_error_not_found">Alamat email ini tidak tertaut dengan akun apa pun</string>
     <string name="login_reset_password_warning_submit">Lanjut</string>
-    <string name="login_reset_password_warning_content">Mengubah kata sandi Anda akan mengatur ulang kunci enkripsi ujung-ke-ujung pada semua sesi Anda, yang akan membuat riwayat obrolan terenkripsi tidak dapat dibaca. Atur Cadangan Kunci atau ekspor kunci ruangan Anda dari sesi lain sebelum mengatur ulang kata sandi Anda.</string>
+    <string name="login_reset_password_warning_content">Mengubah kata sandi Anda akan mengatur ulang kunci enkripsi ujung ke ujung pada semua sesi Anda, yang akan membuat riwayat obrolan terenkripsi tidak dapat dibaca. Atur Cadangan Kunci atau ekspor kunci ruangan Anda dari sesi lain sebelum mengatur ulang kata sandi Anda.</string>
     <string name="login_reset_password_warning_title">Peringatan!</string>
     <string name="login_reset_password_password_hint">Kata sandi baru</string>
     <string name="login_reset_password_email_hint">Email</string>
@@ -1715,7 +1710,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="space_add_existing_rooms">Tambahkan ruangan dan space yang sudah ada</string>
     <string name="space_leave_prompt_msg_as_admin">Anda adalah admin satu-satunya di space ini. Meninggalkannya berarti siapa saja tidak akan mempunyai kontrol atas space-nya.</string>
     <string name="space_leave_prompt_msg_private">Anda tidak akan dapat bergabung lagi kecuali jika Anda diundang lagi.</string>
-    <string name="space_leave_prompt_msg_only_you">Anda orang satu-satunya di sini. Jika Anda tinggalkan, siapa saja tidak dapat bergabung di masa depan, termasuk Anda.</string>
+    <string name="space_leave_prompt_msg_only_you">Anda adalah orang satu-satunya di sini. Jika Anda tinggalkan, siapa saja tidak dapat bergabung di masa depan, termasuk Anda.</string>
     <string name="space_leave_prompt_msg_with_name">Apakah Anda yakin untuk meninggalkan %s\?</string>
     <string name="leave_space">Tinggalkan</string>
     <string name="space_add_child_title">Tambahkan ruangan</string>
@@ -1765,7 +1760,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="space_type_public">Publik</string>
     <string name="create_spaces_private_teammates">Space privat untuk Anda &amp; tim Anda</string>
     <string name="create_spaces_me_and_teammates">Saya dan tim saya</string>
-    <string name="create_spaces_organise_rooms">Space yang privat untuk mengorganisir ruangan Anda</string>
+    <string name="create_spaces_organise_rooms">Space yang privat untuk mengelola ruangan Anda</string>
     <string name="create_spaces_just_me">Saya saja</string>
     <string name="create_spaces_make_sure_access">Pastikan orang yang tepat memiliki akses ke %s.</string>
     <string name="create_spaces_who_are_you_working_with">Dengan siapa Anda bekerja\?</string>
@@ -1808,9 +1803,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="dev_tools_menu_name">Alat Pengembang</string>
     <string name="a11y_public_room">Ruangan publik</string>
     <string name="a11y_view_read_receipts">Lihat laporan dibaca</string>
-    <string name="a11y_rule_notify_off">Jangan beritahu</string>
-    <string name="a11y_rule_notify_silent">Beritahu tanpa suara</string>
-    <string name="a11y_rule_notify_noisy">Beritahu dengan suara</string>
+    <string name="a11y_rule_notify_off">Jangan beri tahu</string>
+    <string name="a11y_rule_notify_silent">Beri tahu tanpa suara</string>
+    <string name="a11y_rule_notify_noisy">Beri tahu dengan suara</string>
     <string name="a11y_error_message_not_sent">Pesan tidak terkirim karena kesalahan</string>
     <string name="a11y_unchecked">Tidak dicentang</string>
     <string name="a11y_checked">Dicentang</string>
@@ -1819,7 +1814,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="warning_room_not_created_yet">Ruangannya belum dibuat. Batalkan pembuatan ruangan\?</string>
     <string name="universal_link_malformed">Tautannya cacat</string>
     <string name="qr_code_not_scanned">Kode QR tidak dipindai!</string>
-    <string name="invalid_qr_code_uri">Kode QR tidak valid (URI tidak valid)!</string>
+    <string name="invalid_qr_code_uri">Kode QR tidak absah (URI tidak absah)!</string>
     <string name="cannot_dm_self">Tidak dapat membuat pesan langsung dengan Anda sendiri!</string>
     <string name="share_by_text">Bagikan melalui teks</string>
     <string name="room_error_not_found">Tidak dapat mencari ruangan ini. Pastikan ruangannya sudah ada.</string>
@@ -1880,7 +1875,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="crypto_error_withheld_generic">Anda tidak dapat mengakses pesan ini karena pengirim telah sengaja tidak mengirim kuncinya</string>
     <string name="crypto_error_withheld_unverified">Anda tidak dapat mengakses pesan ini karena sesi Anda tidak dipercayai oleh pengirim</string>
     <string name="crypto_error_withheld_blacklisted">Anda tidak dapat mengakses pesan ini karena Anda telah diblokir oleh pengirim</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Karena enkripsi ujung-ke-ujung, Anda mungkin harus menunggu untuk pesan dari seseorang untuk datang karena kunci enkripsinya tidak dikirim secara benar ke Anda.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Karena adanya enkripsi ujung ke ujung, Anda mungkin harus menunggu untuk pesan dari seseorang untuk datang karena kunci enkripsinya tidak dikirim secara benar ke Anda.</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Menunggu untuk pesan ini, mungkin membutuhkan beberapa waktu</string>
     <string name="notice_crypto_unable_to_decrypt_final">Anda tidak dapat mengakses pesan ini</string>
     <string name="room_settings_set_avatar">Atur avatar</string>
@@ -1915,7 +1910,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="identity_server_user_consent_not_provided">Izin pengguna belum diberikan.</string>
     <string name="identity_server_error_no_current_binding_error">Tidak ada asosiasi saat ini dengan pengenal ini.</string>
     <string name="identity_server_error_binding_error">Asosiasi telah gagal.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Untuk pricvasi Anda, ${app_name} hanya mendukung pengiriman email pengguna yang telah di-hash dan nomor telepon.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Demi privasi Anda, ${app_name} hanya mendukung pengiriman email pengguna dan nomor telepon yang telah di-hash.</string>
     <string name="identity_server_error_terms_not_signed">Mohon terima ketentuan server identitas ini di pengaturan.</string>
     <string name="identity_server_error_no_identity_server_configured">Mohon konfigurasi server identitas.</string>
     <string name="identity_server_error_outdated_identity_server">Server identitas ini telah usang. ${app_name} hanya mendukung API V2.</string>
@@ -1951,7 +1946,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="create_space_error_empty_field_space_name">Beri nama untuk melanjutkan.</string>
     <string name="create_pin_confirm_failure">Gagal untuk memvalidasi PIN, mohon ketuk yang baru.</string>
     <string name="link_this_email_with_your_account">%s di Pengaturan untuk menerima undangan secara langsung di ${app_name}.</string>
-    <string name="link_this_email_settings_link">Tautkan email ini ke akun Anda</string>
+    <string name="link_this_email_settings_link">Tautkan alamat email ini ke akun Anda</string>
     <string name="this_invite_to_this_space_was_sent">Undangan space ini telah dikirim ke %s yang tidak diasosiasikan dengan akun Anda</string>
     <string name="this_invite_to_this_room_was_sent">Undangan ruangan ini telah dikirim ke %s yang tidak diasosiasikan dengan akun Anda</string>
     <string name="external_link_confirmation_title">Periksa ulang tautan ini</string>
@@ -2006,7 +2001,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="bootstrap_progress_checking_backup_with_info">Memeriksa kunci cadangan (%s)</string>
     <string name="bootstrap_progress_checking_backup">Memeriksa kunci cadangan</string>
     <string name="recovery_key_empty_error_message">Mohon masukkan sebuah kunci pemulihan</string>
-    <string name="bootstrap_invalid_recovery_key">Bukan kunci pemulihan yang valid</string>
+    <string name="bootstrap_invalid_recovery_key">Bukan kunci pemulihan yang absah</string>
     <string name="use_file">Gunakan File</string>
     <string name="bootstrap_enter_recovery">Masukkan %s Anda untuk melanjutkan</string>
     <string name="security_prompt_text">Verifikasi diri Anda dan lainnya untuk tetap membuat pesan Anda aman</string>
@@ -2020,7 +2015,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="error_failed_to_import_keys">Gagal mengimpor kunci</string>
     <string name="qr_code_scanned_verif_waiting">Menunggu untuk %s…</string>
     <string name="qr_code_scanned_verif_waiting_notice">Hampir selesai! Menunggu untuk konfirmasi…</string>
-    <string name="qr_code_scanned_self_verif_notice">Hampir selesai! Apakah perangkat yang lain menunjukkan centang yang sama\?</string>
+    <string name="qr_code_scanned_self_verif_notice">Hampir selesai! Apakah perangkat yang lain menunjukkan sebuah centang\?</string>
     <string name="topic_prefix">"Topik: "</string>
     <string name="add_a_topic_link_text">Tambahkan topik</string>
     <string name="room_created_summary_no_topic_creation_text">%s untuk memberi tahu orang-orang tentang ruangan ini.</string>
@@ -2032,8 +2027,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_created_summary_item_by_you">Anda membuat dan mengatur ruangan ini.</string>
     <string name="room_created_summary_item">%s membuat dan mengatur ruangan ini.</string>
     <string name="encryption_not_enabled">Enkripsi tidak diaktifkan</string>
-    <string name="direct_room_encryption_enabled_tile_description">Pesan di obrolan ini dienkripsi secara ujung-ke-ujung.</string>
-    <string name="encryption_enabled_tile_description">Pesan di ruangan ini dienkripsi secara ujung-ke-ujung. Pelajari lebih lanjut &amp; verifikasi pengguna di profil mereka.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Pesan di obrolan ini dienkripsi secara ujung ke ujung.</string>
+    <string name="encryption_enabled_tile_description">Pesan di ruangan ini dienkripsi secara ujung ke ujung. Pelajari lebih lanjut &amp; verifikasi pengguna di profil mereka.</string>
     <string name="encryption_enabled">Enkripsi diaktifkan</string>
     <string name="bootstrap_cancel_text">Jika Anda batalkan, Anda mungkin kehilangan pesan terenkripsi dan data Anda jika Anda kehilangan akses ke login Anda.
 \n
@@ -2048,7 +2043,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Mengsinkronisasikan Kunci Penandatanganan Diri</string>
     <string name="bootstrap_crosssigning_progress_save_usk">Mengsinkronisasikan Kunci Pengguna</string>
     <string name="bootstrap_crosssigning_progress_save_msk">Mengsinkronisasikan Kunci Utama</string>
-    <string name="bootstrap_crosssigning_progress_default_key">Mendefinisikan Kunci SSSS default</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Mendefinisikan Kunci SSSS bawaan</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">Membuat kunci aman dari frasa sandi</string>
     <string name="bootstrap_crosssigning_progress_initializing">Mempublikasikan kunci identitas yang telah dibuat</string>
     <string name="finish">Selesai</string>
@@ -2076,7 +2071,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="verify_cancel_self_verification_from_untrusted">Jika Anda batalkan, Anda tidak dapat membaca pesan terenkripsi di perangkat ini dan pengguna lain tidak akan mempercayainya</string>
     <string name="verify_new_session_compromized">Akun Anda mungkin dikompromikan</string>
     <string name="verify_new_session_was_not_me">Ini bukan saya</string>
-    <string name="new_session">Login baru. Apakah itu Anda\?</string>
+    <string name="new_session">Pemasukan baru. Apakah itu Anda\?</string>
     <string name="refresh">Segarkan</string>
     <string name="e2e_use_keybackup">Akses riwayat pesan terenkripsi</string>
     <string name="settings_export_trail">Ekspor Audit</string>
@@ -2096,13 +2091,13 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <plurals name="send_images_with_original_size">
         <item quantity="other">Kirim gambar dengan ukuran asli</item>
     </plurals>
-    <string name="share_confirm_room">Apakah Anda mau mengirim lampiran ini ke %1$s\?</string>
+    <string name="share_confirm_room">Apakah Anda ingin mengirim lampiran ini ke %1$s\?</string>
     <string name="message_action_item_redact">Hapus…</string>
     <string name="enter_secret_storage_invalid">Tidak dapat menemukan rahasia di penyimpanan</string>
     <string name="verification_use_passphrase">Jika Anda tidak dapat mengakses sesi yang sudah ada</string>
     <string name="a11y_trust_level_trusted">Peringatan tingkat kepercayaan</string>
     <string name="a11y_trust_level_warning">Level kepercayaan peringatan</string>
-    <string name="a11y_trust_level_default">Level kepercayaan default</string>
+    <string name="a11y_trust_level_default">Level kepercayaan bawaan</string>
     <string name="a11y_selected">Dipilih</string>
     <string name="a11y_video">Video</string>
     <string name="a11y_unsent_draft">mempunyai draf yang belum dikirim</string>
@@ -2113,9 +2108,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="a11y_import_key_from_file">Impor kunci dari file</string>
     <string name="a11y_open_widget">Buka widget</string>
     <string name="a11y_screenshot">Tangkap layar</string>
-    <string name="authentication_error">Gagal mengotentikasi</string>
-    <string name="re_authentication_default_confirm_text">${app_name} meminta Anda untuk memasukkan kredential untuk melakukan aksi ini.</string>
-    <string name="re_authentication_activity_title">Otentikasi Ulang Dibutuhkan</string>
+    <string name="authentication_error">Gagal mengautentikasi</string>
+    <string name="re_authentication_default_confirm_text">${app_name} meminta Anda untuk memasukkan kredensial untuk melakukan tindakan ini.</string>
+    <string name="re_authentication_activity_title">Autentikasi Ulang Dibutuhkan</string>
     <string name="call_slide_to_end_conference">Geser untuk mengakhirkan panggilan</string>
     <string name="call_transfer_unknown_person">Orang tak dikenal</string>
     <string name="call_transfer_transfer_to_title">Pindah ke %1$s</string>
@@ -2124,7 +2119,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="call_transfer_failure">Sebuah kesalahan terjadi ketika memindahkan panggilan</string>
     <string name="call_transfer_title">Pindahkan</string>
     <string name="call_transfer_connect_action">Sambungkan</string>
-    <string name="call_transfer_consult_first">Konsultasikan dulu</string>
+    <string name="call_transfer_consult_first">Konsultasi dahulu</string>
     <string name="call_tap_to_return">%1$s Ketuk untuk kembali</string>
     <string name="call_one_active">Panggilan aktif (%1$s) ·</string>
     <plurals name="call_active_status">
@@ -2160,7 +2155,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="no_connectivity_to_the_server_indicator">Koneksi ke server telah hilang</string>
     <string name="qr_code_scanned_by_other_no">Tidak</string>
     <string name="qr_code_scanned_by_other_yes">Ya</string>
-    <string name="qr_code_scanned_by_other_notice">Hampir selesai! Apakah %s menampilkan centang yang sama\?</string>
+    <string name="qr_code_scanned_by_other_notice">Hampir selesai! Apakah %s menampilkan sebuah centang\?</string>
     <string name="a11y_qr_code_for_verification">Kode QR</string>
     <string name="reset_cross_signing">Atur Ulang Kunci</string>
     <string name="initialize_cross_signing">Memulai Tanda Tangan Silang</string>
@@ -2170,7 +2165,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="create_space_in_progress">Membuat space…</string>
     <string name="settings_developer_mode_show_info_on_screen_summary">Tampilkan info yang berguna untuk membantu debugging aplikasi</string>
     <string name="settings_developer_mode_show_info_on_screen_title">Tampilkan info debug di layar</string>
-    <string name="does_not_look_like_valid_email">Tidak terlihat sebagai alamat email yang valid</string>
+    <string name="does_not_look_like_valid_email">Tidak terlihat sebagai alamat email yang absah</string>
     <string name="open_discovery_settings">Buka Pengaturan Penemuan</string>
     <string name="user_directory_search_hint_2">Cari dengan nama, ID atau email</string>
     <string name="create_new_space">Buat Space Baru</string>
@@ -2178,7 +2173,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_settings_space_access_title">Akses space</string>
     <string name="room_settings_access_rules_pref_dialog_title">Siapa yang dapat akses\?</string>
     <string name="settings_notification_emails_enable_for_email">Aktifkan notifikasi email untuk %s</string>
-    <string name="settings_notification_emails_no_emails">Untuk menerima email dengan notifikasi, mohon tautkan sebuah email ke akun Matrix Anda</string>
+    <string name="settings_notification_emails_no_emails">Untuk menerima email dengan notifikasi, mohon tautkan sebuah alamat email ke akun Matrix Anda</string>
     <string name="settings_notification_emails_category">Notifikasi email</string>
     <string name="room_permissions_upgrade_the_space">Tingkatkan space ini</string>
     <string name="room_permissions_change_space_name">Ubah nama space</string>
@@ -2191,9 +2186,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="space_settings_permissions_title">Izin space</string>
     <string name="space_participants_unban_prompt_msg">Menghapus cekalan akan mengizinkan pengguna untuk bergabung ke space lagi.</string>
     <string name="space_participants_ban_prompt_msg">Mencekal pengguna akan mengeluarkan pengguna dari space ini dan mencegah pengguna untuk bergabung lagi.</string>
-    <string name="space_participants_remove_prompt_msg">mengeluarkan pengguna akan mengeluarkannya dari space ini.
+    <string name="space_participants_remove_prompt_msg">Pengguna akan dikeluarkan dari space ini.
 \n
-\nUntuk mencegah pengguna untuk bergabung lagi, Anda seharusnya cekal pengguna itu saja.</string>
+\nUntuk mencegah mereka untuk bergabung lagi, Anda seharusnya mencekalnya.</string>
     <string name="a11y_stop_voice_message">Berhenti Merekam</string>
     <string name="command_description_lenny">Menambahkan ( ͡° ͜ʖ ͡°) ke pesan teks biasa</string>
     <string name="settings_discovery_no_policy_provided">Tidak ada kebijakan yang disediakan oleh server identitasnya</string>
@@ -2224,12 +2219,12 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="create_poll_question_title">Pertanyaan atau topik poll</string>
     <string name="create_poll_title">Buat Poll</string>
     <string name="attachment_type_poll">Poll</string>
-    <string name="identity_server_consent_dialog_title_2">Kirim email dan nomor telepon ke %s</string>
+    <string name="identity_server_consent_dialog_title_2">Kirim alamat email dan nomor telepon ke %s</string>
     <string name="settings_discovery_consent_notice_off_2">Kontak Anda privat. Untuk menemukan pengguna dari kontak Anda, kami membutuhkan izin untuk mengirim info kontak ke server identitas Anda.</string>
     <string name="shortcut_disabled_reason_sign_out">Sesinya telah dikeluarkan!</string>
     <string name="shortcut_disabled_reason_room_left">Ruangannya telah ditinggalkan!</string>
     <string name="identity_server_consent_dialog_content_question">Apakah Anda setuju untuk mengirimkan info ini\?</string>
-    <string name="identity_server_consent_dialog_content_3">Untuk menemukan kontak yang sudah ada, Anda harus mengirim info kontak (email dan nomor telepon) ke server identitas Anda. Kami meng-hash data Anda sebelum mengirim untuk privasi.</string>
+    <string name="identity_server_consent_dialog_content_3">Untuk menemukan kontak yang sudah ada, Anda harus mengirim info kontak (email dan nomor telepon) ke server identitas Anda. Kami hash data Anda sebelum mengirim demi privasi.</string>
     <string name="action_not_now">Nanti</string>
     <string name="delete_poll_dialog_content">Apakah Anda yakin untuk menghapus poll ini\? Anda tidak akan dapat memulihkannya setelah dihapus.</string>
     <string name="delete_poll_dialog_title">Hapus poll</string>
@@ -2303,23 +2298,23 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="poll_no_votes_cast">Tidak ada suara</string>
     <string name="encryption_misconfigured">Enkripsi dikonfigurasi dengan salah</string>
     <string name="room_profile_section_restore_security">Pulihkan Enkripsi</string>
-    <string name="contact_admin_to_restore_encryption">Mohon hubungi sebuah admin untuk memulihkan enkripsi ke status yang valid.</string>
+    <string name="contact_admin_to_restore_encryption">Mohon hubungi sebuah admin untuk memulihkan enkripsi ke status yang absah.</string>
     <string name="encryption_has_been_misconfigured">Enkripsi telah dikonfigurasi dengan salah.</string>
     <string name="sent_location">Membagikan lokasinya</string>
     <string name="login_splash_create_account">Buat akun</string>
     <string name="ftue_auth_carousel_workplace_title">Perpesanan untuk tim Anda.</string>
-    <string name="ftue_auth_carousel_encrypted_body">Terenkripsi secara ujung-ke-ujung dan tidak memerlukan nomor telepon. Tidak ada iklan atau penambangan data.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Terenkripsi secara ujung ke ujung dan tidak memerlukan nomor telepon. Tanpa iklan atau penambangan data.</string>
     <string name="ftue_auth_carousel_control_body">Anda pilih di mana percakapan Anda disimpan, memberikan Anda kendali dan kebebasan. Terhubung via Matrix.</string>
     <string name="ftue_auth_carousel_secure_body">Komunikasi aman dan independen yang memberikan tingkat privasi yang sama seperti percakapan wajah-ke-wajah di dalam rumah Anda sendiri.</string>
     <string name="attachment_type_location">Lokasi</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">Enkripsi telah dikonfigurasi dengan salah sehingga Anda tidak dapat mengirim pesan. Klik untuk membuka pengaturan.</string>
-    <string name="room_unsupported_e2e_algorithm">Enkripsi telah dikonfigurasi dengan salah sehingga Anda tidak dapat mengirim pesan. Mohon hubungi sebuah admin untuk memulihkan enkripsi ke status yang valid.</string>
+    <string name="room_unsupported_e2e_algorithm">Enkripsi telah dikonfigurasi dengan salah sehingga Anda tidak dapat mengirim pesan. Mohon hubungi sebuah admin untuk memulihkan enkripsi ke status yang absah.</string>
     <string name="ftue_auth_use_case_skip">Belum yakin\? %s</string>
     <string name="message_bubbles">Tampilkan gelembung pesan</string>
     <string name="location_timeline_failed_to_load_map">Gagal untuk memuat peta</string>
     <string name="a11y_static_map_image">Peta</string>
     <string name="labs_enable_thread_messages_desc">Catatan: aplikasi akan dimulai ulang</string>
-    <string name="labs_enable_thread_messages">Aktifkan Pesan Utasan</string>
+    <string name="labs_enable_thread_messages">Aktifkan pesan utasan</string>
     <string name="ftue_auth_use_case_connect_to_server">Hubungkan ke server</string>
     <string name="ftue_auth_use_case_join_existing_server">Ingin bergabung ke server yang sudah ada\?</string>
     <string name="ftue_auth_use_case_skip_partial">Lewati pertanyaan ini</string>
@@ -2349,7 +2344,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="action_view_threads">Tampilkan Utasan</string>
     <string name="room_message_autocomplete_notification">Notifikasi ruangan</string>
     <string name="room_message_autocomplete_users">Pengguna</string>
-    <string name="room_message_notify_everyone">Beritahu seluruh ruangan</string>
+    <string name="room_message_notify_everyone">Beri tahu seluruh ruangan</string>
     <plurals name="message_reaction_show_more">
         <item quantity="other">%1$d lagi</item>
     </plurals>
@@ -2387,7 +2382,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="ftue_profile_picture_title">Tambahkan sebuah foto profil</string>
     <string name="ftue_display_name_entry_footer">Anda dapat mengubahnya nanti</string>
     <string name="ftue_display_name_entry_title">Nama Tampilan</string>
-    <string name="ftue_display_name_subtitle">Ini akan ditampilkan ketika Anda mengirim pesan.</string>
     <string name="ftue_display_name_title">Pilih nama tampilan</string>
     <string name="ftue_account_created_subtitle">Akun %s Anda telah dibuat</string>
     <string name="ftue_account_created_congratulations_title">Selamat!</string>
@@ -2435,10 +2429,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_show_latest_profile_description">Tampilkan info profil (avatar dan nama tampilan) terkini untuk semua pesan.</string>
     <string name="settings_show_latest_profile">Tampilkan info pengguna terkini</string>
     <string name="a11y_presence_busy">Sibuk</string>
-    <string name="keys_backup_settings_signature_from_this_user">Cadangan memiliki tandatangan yang valid dari pengguna ini.</string>
+    <string name="keys_backup_settings_signature_from_this_user">Cadangan memiliki tandatangan yang absah dari pengguna ini.</string>
     <string name="location_share_live_until">Langsung sampai %1$s</string>
     <string name="live_location_bottom_sheet_last_updated_at">Diperbarui %1$s yang lalu</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Berhenti membagikan</string>
     <string name="labs_enable_live_location_summary">Implementasi sementara: lokasi tetap di riwayat ruangan</string>
     <string name="labs_enable_live_location">Aktifkan Pembagian Lokasi Langsung</string>
     <string name="location_share_live_remaining_time">Tinggal %1$s</string>
@@ -2449,7 +2442,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="space_leave_radio_button_none">Jangan tinggalkan apa pun</string>
     <string name="space_leave_radio_button_all">Tinggalkan semuanya</string>
     <string name="space_leave_radio_buttons_title">Hal-hal di space ini</string>
-    <string name="settings_autoplay_animated_images_summary">Mainkan gambar beranimasi di linimasa ketika muncul</string>
+    <string name="settings_autoplay_animated_images_summary">Mainkan gambar beranimasi di lini masa ketika muncul</string>
     <string name="settings_autoplay_animated_images_title">Mainkan gambar beranimasi secara otomatis</string>
     <string name="time_unit_second_short">dtk</string>
     <string name="time_unit_minute_short">mnt</string>
@@ -2474,8 +2467,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="unifiedpush_distributor_background_sync">Sinkronisasi latar belakang</string>
     <string name="unifiedpush_distributor_fcm_fallback">Layanan Google</string>
     <string name="unifiedpush_getdistributors_dialog_title">Pilih cara untuk menerima notifikasi</string>
-    <string name="settings_security_pin_code_use_biometrics_error">Tidak dapat mengaktifkan otentikasi biometrik.</string>
-    <string name="auth_biometric_key_invalidated_message">Otentikasi biometrik dinonaktifkan karena sebuah otentikasi biometrik telah ditambahkan baru-baru ini. Anda dapat mengaktifkan ulang di Pengaturan.</string>
+    <string name="settings_security_pin_code_use_biometrics_error">Tidak dapat mengaktifkan autentikasi biometrik.</string>
+    <string name="auth_biometric_key_invalidated_message">Autentikasi biometrik dinonaktifkan karena sebuah autentikasi biometrik telah ditambahkan baru-baru ini. Anda dapat mengaktifkan ulang di Pengaturan.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Atur ulang metode notifikasi</string>
     <string name="push_gateway_item_profile_tag">Tag profil:</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">Gagal mendaftarkan token endpoint ke homeserver:
@@ -2487,10 +2480,10 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="labs_enable_msc3061_share_history_desc">Ketika mengundang ke ruangan terenkripsi yang juga membagikan riwayat, riwayat terenkripsi akan dapat dilihat.</string>
     <string name="labs_enable_msc3061_share_history">MSC3061: Pembagian kunci ruangan untuk pesan lama</string>
     <string name="send_your_first_msg_to_invite">Kirim pesan pertama Anda untuk mengundang %s ke obrolan</string>
-    <string name="direct_room_encryption_enabled_tile_description_future">Pesan di obrolan ini akan dienkripsi secara ujung-ke-ujung.</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Pesan di obrolan ini akan dienkripsi secara ujung ke ujung.</string>
     <string name="create_room_action_go">Mulai</string>
     <string name="ftue_auth_password_reset_email_confirmation_subtitle">Ikuti petunjuk yang terkirim ke %s</string>
-    <string name="ftue_auth_email_verification_subtitle">Untuk mengonfirmasi email Anda, ketuk tombol dalam email yang kami kirim ke %s</string>
+    <string name="ftue_auth_email_verification_subtitle">Ikuti petunjuk yang terkirim ke %s</string>
     <plurals name="room_removed_messages">
         <item quantity="other">%d pesan dihapus</item>
     </plurals>
@@ -2504,7 +2497,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="ftue_auth_forgot_password">Lupa kata sandi</string>
     <string name="ftue_auth_email_resend_email">Kirim ulang email</string>
     <string name="ftue_auth_email_verification_footer">Belum menerima email\?</string>
-    <string name="ftue_auth_email_verification_title">Periksa email Anda untuk memverifikasi.</string>
+    <string name="ftue_auth_email_verification_title">Verifikasi email Anda</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Kirim ulang kode</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Sebuah kode terkirim ke %s</string>
     <string name="ftue_auth_phone_confirmation_title">Konfirmasi nomor telepon Anda</string>
@@ -2541,4 +2534,306 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="font_size_section_manually">Pilih secara manual</string>
     <string name="font_size_section_auto">Atur secara otomatis</string>
     <string name="font_size_title">Pilih ukuran font</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Terima akses kamera / mikrofon widget Element Call secara otomatis</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Aktifkan pintasan izin Element Call</string>
+    <string name="live_location_description">Lokasi langsung</string>
+    <string name="location_share_loading_map_error">Tidak dapat memuat peta
+\nHomeserver ini mungkin tidak diatur untuk menampilkan peta.</string>
+    <string name="a11y_open_settings">Buka pengaturan</string>
+    <string name="verify_invalid_qr_notice">Kode QR ini tampaknya tidak benar. Mohon coba verifikasi dengan metode lain.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Anda tidak akan dapat mengakses riwayat pesan terenkripsi. Atur ulang Cadangan Pesan Aman dan kunci-kunci verifikasi Anda untuk memulai secara segar.</string>
+    <string name="crosssigning_cannot_verify_this_session">Tidak dapat memverifikasi perangkat ini</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Apa alamat server Anda\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Di mana percakapan Anda tinggal</string>
+    <string name="updating_your_data">Memperbarui data Anda…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="other">%1$s dan %2$d lainnya</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s dan %2$s</string>
+    <string name="auth_reset_password_error_unverified">Email belum diverifikasi, periksa kotak masuk Anda</string>
+    <string name="all_chats">Semua Obrolan</string>
+    <string name="device_manager_sessions_other_description">Untuk keamanan terbaik, verifikasi sesi Anda dan keluarkan sesi apa pun yang Anda tidak kenal atau Anda tidak gunakan lagi.</string>
+    <string name="device_manager_sessions_other_title">Sesi lainnya</string>
+    <string name="settings_sessions_list">Sesi</string>
+    <string name="a11y_open_spaces">Buka daftar space</string>
+    <string name="a11y_create_message">Buat percakapan atau ruangan baru</string>
+    <string name="room_list_filter_people">Orang</string>
+    <string name="room_list_filter_favourites">Favorit</string>
+    <string name="room_list_filter_unreads">Belum dibaca</string>
+    <string name="room_list_filter_all">Semua</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Aktivitas</string>
+    <string name="home_layout_preferences_sort_by">Urutkan berdasarkan</string>
+    <string name="home_layout_preferences_recents">Tampilkan terkini</string>
+    <string name="home_layout_preferences_filters">Tampilkan saringan</string>
+    <string name="home_layout_preferences">Preferensi tata letak</string>
+    <string name="explore_rooms">Jelajahi Ruangan</string>
+    <string name="create_room">Buat Ruangan</string>
+    <string name="start_chat">Mulai Obrolan</string>
+    <string name="timeline_error_room_not_found">Maaf, ruangan ini tidak ditemukan.
+\nMohon coba lagi nanti.%s</string>
+    <string name="device_manager_other_sessions_description_unverified">Belum diverifikasi · Aktivitas terakhir %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Terverifikasi · Aktivitas terakhir %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Tampilkan Semua (%1$d)</string>
+    <string name="device_manager_view_details">Tampilkan Detail</string>
+    <string name="device_manager_verify_session">Verifikasi Sesi</string>
+    <string name="device_manager_verification_status_unverified">Sesi belum diverifikasi</string>
+    <string name="device_manager_verification_status_verified">Sesi terverifikasi</string>
+    <string name="a11y_device_manager_device_type_unknown">Tipe perangkat tidak diketahui</string>
+    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Ponsel</string>
+    <string name="invites_title">Undangan</string>
+    <string name="onboarding_new_app_layout_button_try">Coba</string>
+    <string name="onboarding_new_app_layout_feedback_message">Ketuk kanan atas untuk melihat opsi untuk memberikan masukan.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Beri Masukan</string>
+    <string name="home_empty_no_rooms_message">Aplikasi obrolan aman untuk tim, teman, dan organisasi. Buat sebuah obrolan, atau bergabung ke ruangan yang sudah ada, untuk memulai.</string>
+    <string name="onboarding_new_app_layout_spaces_message">Akses Space Anda (di kanan bawah) dengan lebih cepat dan lebih mudah dari sebelumnya.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Akses Space</string>
+    <string name="onboarding_new_app_layout_welcome_message">Untuk membuat ${app_name} Anda lebih sederhana, fitur tab sekarang opsional. Kelola menggunakan menu kanan atas.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Selamat datang di tampilan yang baru!</string>
+    <string name="home_empty_no_unreads_message">Ini di mana pesan Anda yang belum dibaca akan ditampilkan, ketika Anda menerimanya.</string>
+    <string name="home_empty_no_unreads_title">Tidak ada untuk dilaporkan.</string>
+    <string name="home_empty_no_rooms_title">Selamat datang di ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Space adalah cara baru untuk mengelompokkan ruangan dan orang. Tambahkan ruangan yang sudah ada, atau buat yang baru, dengan tombol di kanan bawah.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nkelihatannya masih kosong.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="other">Pertimbangkan untuk mengeluarkan sesi lawas (%1$d hari atau lebih) yang Anda tidak gunakan lagi.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Sesi yang tidak aktif</string>
+    <string name="device_manager_unverified_sessions_description">Verifikasi atau keluarkan sesi yang belum diverifikasi.</string>
+    <string name="device_manager_unverified_sessions_title">Sesi yang belum diverifikasi</string>
+    <string name="device_manager_header_section_security_recommendations_description">Perbaiki keamanan akun Anda dengan mengikuti saran berikut.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Saran keamanan</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="other">Tidak aktif selama %1$d+ hari (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Ini di mana permintaan dan undangan baru Anda akan berada.</string>
+    <string name="invites_empty_title">Belum ada yang baru.</string>
+    <string name="space_list_empty_message">Space adalah cara baru untuk mengelompokkan ruangan dan orang. Buat sebuah space untuk memulai.</string>
+    <string name="space_list_empty_title">Belum ada space.</string>
+    <string name="a11y_collapse_space_children">Tutup %s anak</string>
+    <string name="a11y_expand_space_children">Buka %s anak</string>
+    <string name="change_space">Ubah Space</string>
+    <string name="device_manager_session_details_device_ip_address">Alamat IP</string>
+    <string name="device_manager_session_details_session_last_activity">Aktivitas terakhir</string>
+    <string name="device_manager_session_details_session_name">Nama sesi</string>
+    <string name="device_manager_session_details_description">Informasi aplikasi, perangkat, dan aktivitas.</string>
+    <string name="device_manager_session_details_title">Detail sesi</string>
+    <string name="device_manager_other_sessions_clear_filter">Hapus Saringan</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Tidak ditemukan sesi yang tidak aktif.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Tidak ditemukan sesi yang belum diverifikasi.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Tidak ditemukan sesi yang terverifikasi.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="other">Pertimbangkan untuk mengeluarkan sesi lawas (%1$d hari atau lebih) yang Anda tidak gunakan lagi.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Tidak aktif</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifikasi sesi Anda untuk perpesanan aman yang terbaik atau keluarkan sesi yang Anda tidak kenal atau gunakan lagi.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Belum diverifikasi</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Untuk keamanan yang terbaik, keluarkan sesi yang Anda tidak kenal atau gunakan lagi.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Terverifikasi</string>
+    <string name="a11y_device_manager_filter">Saring</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="other">Tidak aktif selama %1$d hari atau lebih</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Tidak aktif</string>
+    <string name="device_manager_filter_option_unverified_description">Belum siap untuk perpesanan aman</string>
+    <string name="device_manager_filter_option_unverified">Belum diverifikasi</string>
+    <string name="device_manager_filter_option_verified_description">Siap untuk perpesanan aman</string>
+    <string name="device_manager_filter_option_verified">Terverifikasi</string>
+    <string name="device_manager_filter_option_all_sessions">Semua sesi</string>
+    <string name="device_manager_filter_bottom_sheet_title">Saring</string>
+    <string name="device_manager_session_last_activity">Aktivitas terakhir %1$s</string>
+    <string name="device_manager_device_title">Perangkat</string>
+    <string name="device_manager_session_title">Sesi</string>
+    <string name="device_manager_current_session_title">Sesi saat ini</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verifikasi atau keluarkan sesi ini untuk keamanan dan keandalan yang terbaik.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifikasi sesi Anda saat ini untuk perpesanan aman yang baik.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Sesi ini siap untuk perpesanan aman.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Sesi Anda saat ini siap untuk perpesanan aman.</string>
+    <string name="labs_enable_deferred_dm_summary">Buat pesan langsung hanya pada pesan pertama</string>
+    <string name="labs_enable_deferred_dm_title">Aktifkan pesan langsung tangguhan</string>
+    <string name="labs_enable_new_app_layout_summary">Sebuah Element yang sederhana dengan fitur tab opsional</string>
+    <string name="labs_enable_new_app_layout_title">Aktifkan tata letak baru</string>
+    <string name="device_manager_learn_more_session_rename">Pengguna lain dalam pesan langsung dan ruangan yang Anda bergabung dapat melihat daftar sesi Anda yang lengkap.
+\n
+\nIni memberikan mereka kepastian bahwa mereka berbicara dengan Anda, tetapi ini juga berarti bahwa mereka dapat melihat nama sesi yang Anda masukkan di sini.</string>
+    <string name="device_manager_learn_more_session_rename_title">Mengubah nama sesi</string>
+    <string name="device_manager_learn_more_sessions_verified">Sesi yang terverifikasi telah masuk dengan kredensial Anda dan juga telah diverifikasi, menggunakan frasa sandi atau memverifikasi secara silang.
+\n
+\nIni berarti mereka memegang kunci enkripsi ke pesan Anda sebelumnya, dan mengonfirmasi pengguna lain yang Anda berkomunikasi bahwa sesi ini memang Anda.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sesi tidak aktif</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sesi belum diverifikasi</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sesi terverifikasi</string>
+    <string name="device_manager_learn_more_sessions_unverified">Sesi yang belum diverifikasi adalah sesi yang telah masuk dengan kredensial Anda tetapi belum diverifikasi secara silang.
+\n
+\nAnda seharusnya yakin bahwa Anda mengenal sesi ini karena mereka bisa saja berarti seseorang menggunakan akun Anda secara tidak sah.</string>
+    <string name="device_manager_learn_more_sessions_inactive">Sesi yang tidak aktif adalah sesi yang Anda tidak gunakan dalam beberapa waktu, tetapi mereka masih mendapatkan kunci enkripsi.
+\n
+\nMenghapus sesi yang sudah tidak aktif meningkatkan keamanan dan performa, dan membuatnya lebih mudah untuk mengenal jika sebuah sesi baru mencurigakan.</string>
+    <string name="device_manager_session_rename_warning">Harap diketahui bahwa nama sesi juga terlihat ke orang-orang yang Anda berkomunikasi.</string>
+    <string name="device_manager_session_rename_description">Nama sesi khusus dapat membantu Anda mengenal perangkat Anda dengan lebih mudah.</string>
+    <string name="device_manager_session_rename_edit_hint">Nama sesi</string>
+    <string name="device_manager_session_rename">Ubah nama sesi</string>
+    <string name="device_manager_session_overview_signout">Keluar dari sesi ini</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Belum diverifikasi · Sesi Anda saat ini</string>
+    <string name="tooltip_attachment_voice_broadcast">Mulai sebuah siaran suara</string>
+    <string name="key_authenticity_not_guaranteed">Keaslian pesan terenkripsi ini tidak dapat dijamin pada perangkat ini.</string>
+    <string name="settings_security_incognito_keyboard_summary">Minta papan ketik untuk tidak memperbarui data yang dipersonalisasi seperti riwayat pengetikan dan kamus berdasarkan apa yang Anda ketik dalam percakapan. Dicatat bahwa beberapa papan ketik mungkin tidak menghormati pengaturan ini.</string>
+    <string name="settings_security_incognito_keyboard_title">Papan ketik samaran</string>
+    <string name="command_description_table_flip">Menambahkan (╯°□°）╯︵ ┻━┻ ke pesan teks biasa</string>
+    <string name="attachment_type_voice_broadcast">Siaran Suara</string>
+    <string name="command_description_devtools">Buka layar alat pengembang</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Anda telah mengaktifkan enkripsi ke sesi yang terverifikasi hanya untuk semua ruangan di Pengaturan Keamanan.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Ada perangkat yang belum diverifikasi di ruangan ini, mereka tidak akan mendekripsikan pesan yang Anda kirim.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Jangan kirim pesan terenkripsi ke sesi yang belum diverifikasi di ruangan ini.</string>
+    <string name="action_got_it">Saya mengerti</string>
+    <string name="rich_text_editor_format_underline">Terapkan format garis bawah</string>
+    <string name="rich_text_editor_format_strikethrough">Terapkan format coret</string>
+    <string name="rich_text_editor_format_italic">Terapkan format miring</string>
+    <string name="rich_text_editor_format_bold">Terapkan format tebal</string>
+    <string name="labs_enable_client_info_recording_summary">Rekam nama klien, versi, dan URL untuk lebih mudah mengenal sesi di pengelola sesi.</string>
+    <string name="labs_enable_client_info_recording_title">Aktifkan perekaman info klien</string>
+    <string name="labs_enable_session_manager_summary">Miliki keterlihatan dan kendali yang lebih baik pada semua sesi Anda.</string>
+    <string name="labs_enable_session_manager_title">Aktifkan pengelola sesi baru</string>
+    <string name="device_manager_session_details_device_operating_system">Sistem operasi</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Peramban</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versi</string>
+    <string name="device_manager_session_details_application_name">Nama</string>
+    <string name="device_manager_session_details_application">Aplikasi</string>
+    <string name="device_manager_push_notifications_description">Terima notifikasi dorongan di sesi ini.</string>
+    <string name="device_manager_push_notifications_title">Notifikasi dorongan</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifikasi sesi Anda saat ini untuk menampilkan status verifikasi sesi ini.</string>
+    <string name="device_manager_verification_status_unknown">Status verifikasi tidak diketahui</string>
+    <string name="push_gateway_item_enabled">Diaktifkan:</string>
+    <string name="push_gateway_item_device_id">ID Sesi:</string>
+    <string name="error_check_network">Ada sesuatu yang salah. Mohon periksa koneksi jaringan Anda dan coba lagi.</string>
+    <string name="grant_permission">Berikan Izin</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} membutuhkan izin untuk menampilkan notifikasi.
+\nMohon berikan izin itu.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} membutuhkan izin untuk menampilkan notifikasi. Notifikasi dapat menampilkan pesan Anda, undangan Anda, dll.
+\n
+\nMohon perbolehkan akses di munculan berikutnya untuk dapat melihat notifikasi.</string>
+    <string name="labs_enable_rich_text_editor_summary">Coba editor teks kaya (mode teks biasa akan datang)</string>
+    <string name="labs_enable_rich_text_editor_title">Aktifkan editor teks kaya</string>
+    <string name="qr_code_login_confirm_security_code_description">Pastikan Anda tahu asal kode ini. Dengan menautkan perangkat, Anda akan memberikan seseorang akses penuh ke akun Anda.</string>
+    <string name="qr_code_login_confirm_security_code">Konfirmasi</string>
+    <string name="qr_code_login_try_again">Coba lagi</string>
+    <string name="qr_code_login_status_no_match">Tidak cocok\?</string>
+    <string name="qr_code_login_signing_in">Memasukkan Anda</string>
+    <string name="qr_code_login_connecting_to_device">Menghubungkan ke perangkat</string>
+    <string name="qr_code_login_scan_qr_code_button">Pindai kode QR</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Ingin masuk di perangkat ponsel\?</string>
+    <string name="qr_code_login_show_qr_code_button">Tampilkan kode QR di perangkat ini</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Pilih \'Pindai kode QR\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Mulai dari layar masuk</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Pilih \'Masuk dengan kode QR\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Mulai dari layar masuk</string>
+    <string name="qr_code_login_new_device_instruction_3">Pilih \'Tampilkan kode QR\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Pergi ke Pengaturan → Keamanan &amp; Privasi</string>
+    <string name="qr_code_login_new_device_instruction_1">Buka aplikasi di perangkat Anda yang lain</string>
+    <string name="qr_code_login_header_failed_denied_description">Permintaan ditolak di perangkat lain.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Penautan tidak selesai dalam waktu yang dibutuhkan.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Penautan dengan perangkat ini tidak didukung.</string>
+    <string name="qr_code_login_header_failed_title">Koneksi tidak berhasil</string>
+    <string name="qr_code_login_header_connected_description">Periksa perangkat yang masuk, kode di bawah seharusnya ditampilkan. Konfirmasi bahwa kode di bawah cocok dengan perangkat itu:</string>
+    <string name="qr_code_login_header_connected_title">Koneksi aman dibuat</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Pindai kode QR di bawah dengan perangkat Anda yang telah keluar dari akun.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Gunakan perangkat yang sudah masuk untuk memindai kode QR di bawah:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Masuk dengan kode QR</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Gunakan kamera pada perangkat ini untuk memindai kode QR yang ditampilkan pada perangkat Anda yang lain:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Pindai kode QR</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Anda dapat menggunakan perangkat ini untuk masuk ke perangkat ponsel atau web dengan sebuah kode QR. Ada dua cara untuk melalukan ini:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Masuk dengan Kode QR</string>
+    <string name="login_scan_qr_code">Pindai kode QR</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Sebuah masalah keamanan ditemukan ketika menyiapkan perpesanan aman. Salah satu dari berikut mungkin dikompromikan: homeserver Anda; koneksi internet Anda; perangkat Anda;</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Pemasukan dibatalkan di perangkat yang lain.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Kode QR tidak absah.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Perangkat yang lain harus masuk.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Perangkat yang lain sudah masuk.</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Homeserver tidak mendukung masuk dengan kode QR.</string>
+    <string name="qr_code_login_header_failed_other_description">Permintaan gagal.</string>
+    <string name="labs_enable_voice_broadcast_summary">Memungkinkan untuk merekam dan mengirim siaran suara dalam lini masa ruangan.</string>
+    <string name="labs_enable_voice_broadcast_title">Aktifkan siaran suara</string>
+    <string name="a11y_voice_broadcast_buffering">Memuat…</string>
+    <string name="a11y_pause_voice_broadcast">Jeda siaran suara</string>
+    <string name="a11y_play_voice_broadcast">Mainkan atau lanjutkan siaran suara</string>
+    <string name="a11y_stop_voice_broadcast_record">Hentikan rekaman siaran suara</string>
+    <string name="a11y_pause_voice_broadcast_record">Jeda rekaman siaran suara</string>
+    <string name="a11y_resume_voice_broadcast_record">Lanjutkan rekaman siaran suara</string>
+    <string name="voice_broadcast_live">Langsung</string>
+    <string name="device_manager_other_sessions_select">Pilih sesi</string>
+    <string name="attachment_type_selector_contact">Kontak</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Lokasi</string>
+    <string name="attachment_type_selector_poll">Pemungutan suara</string>
+    <string name="attachment_type_selector_voice_broadcast">Siaran suara</string>
+    <string name="attachment_type_selector_file">Lampiran</string>
+    <string name="attachment_type_selector_sticker">Stiker</string>
+    <string name="attachment_type_selector_gallery">Pustaka foto</string>
+    <string name="action_deselect_all">Batalkan semua pilihan</string>
+    <string name="action_select_all">Pilih semua</string>
+    <plurals name="x_selected">
+        <item quantity="other">%1$d dipilih</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">Ubah mode layar penuh</string>
+    <string name="attachment_type_selector_text_formatting">Format teks</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Anda sedang merekam sebuah siaran suara. Mohon akhiri siaran suara Anda saat ini untuk memulai yang baru.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Orang lain sedang merekam sebuah siaran suara. Tunggu untuk siaran suara berakhir untuk memulai yang baru.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Anda tidak memiliki izin yang dibutuhkan untuk memulai sebuah siaran suara di ruangan ini. Hubungi sebuah administrator ruangan untuk meningkatkan izin Anda.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Tidak dapat memulai siaran suara baru</string>
+    <string name="a11y_voice_broadcast_fast_forward">Maju cepat 30 detik</string>
+    <string name="a11y_voice_broadcast_fast_backward">Mundur cepat 30 detik</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Sesi terverifikasi ada di mana pun Anda menggunakan Element setelah memasukkan frasa sandi atau mengonfirmasi identitas Anda dengan sesi terverifikasi lainnya.
+\n
+\nIni berarti Anda memiliki semua kunci yang diperlukan untuk membuka kunci pesan terenkripsi dan mengonfirmasi kepada pengguna lain bahwa Anda memercayai sesi ini.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="other">Keluarkan %1$d sesi</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Keluarkan</string>
+    <string name="voice_broadcast_recording_time_left">%1$s tersisa</string>
+    <string name="message_reply_to_sender_created_poll">membuat pemungutan suara.</string>
+    <string name="message_reply_to_sender_sent_sticker">mengirim stiker.</string>
+    <string name="message_reply_to_sender_sent_video">mengirim video.</string>
+    <string name="message_reply_to_sender_sent_image">mengirim gambar.</string>
+    <string name="message_reply_to_sender_sent_file">mengirim file.</string>
+    <string name="message_reply_to_sender_sent_audio_file">mengirim file audio.</string>
+    <string name="message_reply_to_sender_sent_voice_message">mengirim pesan suara.</string>
+    <string name="message_reply_to_prefix">Membalas ke</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Sembunyikan alamat IP</string>
+    <string name="quoting">Mengutip</string>
+    <string name="editing">Mengedit</string>
+    <string name="device_manager_other_sessions_show_ip_address">Tampilkan alamat IP</string>
+    <string name="replying_to">Membalas ke %s</string>
+    <string name="settings_enable_direct_share_summary">Tampilkan obrolan terkini dalam menu pembagian sistem</string>
+    <string name="settings_enable_direct_share_title">Aktifkan pembagian langsung</string>
+    <string name="review_unverified_sessions_description">Periksa untuk memastikan akun Anda aman</string>
+    <string name="review_unverified_sessions_title">Anda memilki sesi yang belum diverifikasi</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Sesi ini tidak mendukung enkripsi, jadi ini tidak dapat diverifikasi.
+\n
+\nAnda tidak akan dapat berpartisipasi dalam ruangan di mana enkripsi diaktifkan ketika menggunakan sesi ini.
+\n
+\nUntuk keamanan dan privasi yang terbaik, kami menyarankan untuk menggunakan klien Matrix yang mendukung enkripsi.</string>
+    <string name="device_manager_signout_all_other_sessions">Keluarkan semua sesi lain</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Sesi ini tidak mendukung enkripsi dan tidak dapat diverifikasi.</string>
+    <string name="settings_nightly_build_update">Dapatkan bangunan terkini (catatan: Anda mungkin memiliki masalah saat masuk)</string>
+    <string name="settings_nightly_build">Bangunan nightly</string>
+    <string name="voice_broadcast_live_broadcast">Siaran langsung</string>
+    <string name="notice_voice_broadcast_ended_by_you">Anda mengakhiri sebuah siaran suara.</string>
+    <string name="notice_voice_broadcast_ended">%1$s mengakhiri sebuah siaran suara.</string>
+    <string name="stop_voice_broadcast_content">Apakah Anda ingin menghentikan siaran langsung Anda\? Ini akan mengakhiri siaran dan rekaman lengkap akan tersedia dalam ruangan.</string>
+    <string name="stop_voice_broadcast_dialog_title">Hentikan siaran langsung\?</string>
+    <string name="action_stop">Ya, Hentikan</string>
+    <string name="set_link_edit">Sunting tautan</string>
+    <string name="set_link_create">Buat sebuah tautan</string>
+    <string name="set_link_link">Tautan</string>
+    <string name="set_link_text">Teks</string>
+    <string name="rich_text_editor_link">Atur tautan</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-in/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-in/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-in/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-in/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-is/strings.xml b/library/ui-strings/src/main/res/values-is/strings.xml
similarity index 87%
rename from vector/src/main/res/values-is/strings.xml
rename to library/ui-strings/src/main/res/values-is/strings.xml
index 53af7bff5c..ceb4d614de 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/library/ui-strings/src/main/res/values-is/strings.xml
@@ -152,7 +152,7 @@
     <string name="settings_version">Útgáfa</string>
     <string name="settings_olm_version">Útgáfa olm</string>
     <string name="settings_app_term_conditions">Skilmálar og kvaðir</string>
-    <string name="settings_third_party_notices">Athugasemdir frá þriðja aðila</string>
+    <string name="settings_third_party_notices">Tilkynningar frá utanaðkomandi aðilum</string>
     <string name="settings_copyright">Höfundarréttur</string>
     <string name="settings_privacy_policy">Meðferð persónuupplýsinga</string>
     <string name="settings_clear_cache">Hreinsa skyndiminni</string>
@@ -193,7 +193,7 @@
     <string name="settings_theme">Þema</string>
     <string name="encryption_information_decryption_error">Afkóðunarvilla</string>
     <string name="encryption_information_device_name">Heiti tækis</string>
-    <string name="encryption_information_device_id">Auðkenni setu</string>
+    <string name="device_manager_session_details_session_id">Auðkenni setu</string>
     <string name="encryption_information_device_key">Dulritunarlykill setu</string>
     <string name="encryption_export_export">Flytja út</string>
     <string name="passphrase_enter_passphrase">Settu inn lykilsetningu</string>
@@ -236,7 +236,6 @@
     <string name="action_quick_reply">Snöggt svar</string>
     <string name="home_filter_placeholder_home">Leita að spjallrásum</string>
     <string name="matrix_only_filter">Einungis tengiliðir í Matrix</string>
-    <string name="groups_header">Samfélög</string>
     <string name="send_bug_report_progress">Framvinda (%s%%)</string>
     <string name="auth_invalid_email">Þetta lítur ekki út eins og gilt tölvupóstfang</string>
     <string name="auth_email_already_defined">Þetta tölvupóstfang er nú þegar skráð.</string>
@@ -316,7 +315,6 @@
     <string name="send_bug_report_sent">Það tókst að senda villuskýrsluna</string>
     <string name="send_bug_report_failed">Mistókst að senda villuskýrsluna (%s)</string>
     <string name="auth_recaptcha_message">Þessi heimavefþjónn vill ganga úr skugga um að þú sért ekki vélmenni</string>
-    <string name="auth_reset_password_missing_email">Það þarf að setja inn tölvupóstfangið sem tengt er notandaaðgangnum þínum.</string>
     <string name="auth_reset_password_error_unauthorized">Gat ekki sannprófað tölvupóstfang: gakktu úr skugga um að þú hafir smellt á tengilinn í tölvupóstinum</string>
     <string name="room_participants_power_level_prompt">Þú getur ekki afturkallað þessa aðgerð, þar sem þú ert að gefa notandanum jafn mikil völd og þú hefur sjálf/ur.
 \nErtu alveg viss\?</string>
@@ -535,8 +533,6 @@
     <string name="notice_room_invite_no_invitee_with_reason">Boð um þátttöku til %1$s. Ástæða: %2$s</string>
     <string name="initial_sync_start_importing_account_data">Upphaf samstillingar:
 \nFlyt inn gögn úr notandaaðgangi</string>
-    <string name="initial_sync_start_importing_account_groups">Upphaf samstillingar:
-\nFlyt inn samfélög</string>
     <string name="initial_sync_start_importing_account_left_rooms">Upphaf samstillingar:
 \nFlyt inn yfirgefnar spjallrásir</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Upphaf samstillingar:
@@ -822,7 +818,6 @@
     <string name="send_file_step_compressing_image">Þjappa mynd…</string>
     <string name="send_file_step_sending_file">Sendi skrá (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">Dulrita skrá…</string>
-    <string name="group_all_communities">Öll samfélög</string>
     <string name="settings_show_redacted">Sýna fjarlægð skilaboð</string>
     <string name="room_list_catchup_empty_body">Þú átt engin fleiri ólesin skilaboð</string>
     <string name="invited_by">Boðið af %s</string>
@@ -1223,7 +1218,7 @@
     <string name="room_list_quick_actions_notifications_all_noisy">Öll skilaboð (hávært)</string>
     <string name="content_reported_as_inappropriate_title">Tilkynnt sem óviðeigandi</string>
     <string name="content_reported_as_spam_title">Tilkynnt sem ruslpóstur</string>
-    <string name="content_reported_title">Efni tilkynnt</string>
+    <string name="content_reported_title">Efni kært</string>
     <string name="report_content_custom_submit">KÆRA</string>
     <string name="report_content_custom_hint">Ástæður fyrir kæru á þessu efni</string>
     <string name="report_content_custom_title">Kæra þetta efni</string>
@@ -1541,7 +1536,7 @@
     <string name="external_link_confirmation_title">Yfirfarðu þennan tengil</string>
     <string name="secure_backup_reset_if_you_reset_all">Ef þú frumstillir allt</string>
     <string name="qr_code_scanned_verif_waiting_notice">Næstum því búið! Bíð eftir staðfestingu…</string>
-    <string name="add_a_topic_link_text">Bæta við umræðuefni</string>
+    <string name="add_a_topic_link_text">Bættu við umræðuefni</string>
     <string name="crosssigning_verify_this_session">Sannprófa þessa innskráningu</string>
     <string name="settings_active_sessions_signout_device">Skrá út úr þessari setu</string>
     <string name="verification_conclusion_ok_notice">Skilaboð við þennan notanda eru enda-í-enda dulrituð þannig að enginn annar getur lesið þau.</string>
@@ -1756,7 +1751,7 @@
     <string name="settings_developer_mode">Forritarahamur</string>
     <string name="soft_logout_clear_data_title">Hreinsa persónuleg gögn</string>
     <string name="login_server_matrix_org_text">Taktu þátt ókeypis ásamt milljónum annarra á stærsta almenningsþjóninum</string>
-    <string name="ftue_auth_use_case_skip_partial">sleppt þessari spurningu</string>
+    <string name="ftue_auth_use_case_skip_partial">Sleppa þessari spurningu</string>
     <string name="ftue_auth_carousel_encrypted_title">Örugg skilaboð.</string>
     <string name="settings_discovery_bad_identity_server">Gat ekki tengst við auðkennisþjón</string>
     <string name="keys_backup_settings_status_not_setup">Dulritunarlyklarnir þínir eru ekki öryggisafritaðir úr þessari setu.</string>
@@ -1995,10 +1990,10 @@
     <string name="seen_by">Séð af</string>
     <string name="ftue_personalize_skip_this_step">Sleppa þessu skrefi</string>
     <string name="ftue_personalize_submit">Vista og halda áfram</string>
-    <string name="ftue_personalize_complete_subtitle">Kjörstillingarnar þínar hafa verið vistaðar.</string>
+    <string name="ftue_personalize_complete_subtitle">Farðu hvenær sem er í stillingarnar til að breyta notandasniðinu þínu</string>
     <string name="ftue_personalize_complete_title">Nú ertu tilbúin(n)!</string>
     <string name="ftue_personalize_lets_go">Hefjumst handa</string>
-    <string name="ftue_profile_picture_subtitle">Þú getur breytt þessu hvenær sem er.</string>
+    <string name="ftue_profile_picture_subtitle">Þú getur breytt þessu hvenær sem er</string>
     <string name="ftue_profile_picture_title">Bættu við auðkennismynd</string>
     <string name="ftue_display_name_entry_footer">Þú getur breytt þessu síðar</string>
     <string name="ftue_display_name_entry_title">Birtingarnafn</string>
@@ -2017,4 +2012,255 @@
     <string name="action_try_it_out">Prófaðu það</string>
     <string name="action_disable">Gera óvirkt</string>
     <string name="initial_sync_request_title">Upphafleg samstillingarbeiðni</string>
+    <string name="onboarding_new_app_layout_welcome_title">Velkomin í nýja sýn!</string>
+    <string name="location_share_live_view">Skoða staðsetningu í rauntíma</string>
+    <string name="space_explore_filter_no_result_description">Sumar niðurstöður gætu verið faldar þar sem þær eru einkamál, þá þarftu boð til að geta séð þær.</string>
+    <string name="space_leave_prompt_msg_as_admin">Þú ert eini stjórnandi þessa svæðis. Ef þú yfirgefur það verður enginn annar sem er með stjórn yfir því.</string>
+    <string name="space_leave_prompt_msg_private">Þú munt ekki geta tekið þátt aftur nema þér verði boðið aftur.</string>
+    <string name="space_leave_radio_button_none">Yfirgefa ekkert</string>
+    <string name="space_leave_radio_button_all">Yfirgefa allt</string>
+    <string name="space_leave_radio_buttons_title">Efni á þessu svæði</string>
+    <string name="room_alias_preview_not_found">Þetta samnefni er ekki aðgengilegt í augnablikinu.
+\nPrófaðu aftur síðar, eða spurðu einhvern stjórnanda hvort þú hafir aðgang.</string>
+    <string name="command_description_leave_room">Fara af spjallrás með uppgefið auðkenni (eða fyrirliggjandi spjallrás ef þetta er núll)</string>
+    <string name="command_description_join_space">Taka þátt í svæði með uppgefið auðkenni</string>
+    <string name="settings_security_pin_code_use_biometrics_error">Gat ekki virkjað auðkenningu með lífkennum.</string>
+    <string name="identity_server_set_alternative_notice">Annars geturðu sett inn slóð á hvaða auðkennisþjón sem er</string>
+    <string name="identity_server_set_default_notice">Heimaþjónninn þinn (%1$s) stingur upp á að nota %2$s sem auðkenningarþjón fyrir þig</string>
+    <string name="identity_server_user_consent_not_provided">Samþykki notandans hefur ekki verið gefið.</string>
+    <string name="identity_server_error_no_identity_server_configured">Stilltu fyrst auðkennisþjón.</string>
+    <string name="identity_server_error_outdated_home_server">Þessi aðgerð er ekki möguleg. Heimaþjónninn er úreltur.</string>
+    <string name="user_code_info_text">Deildu þessum kóða með fólki svo viðkomandi geti skannað hann, bætt þér við og byrjað að spjalla.</string>
+    <string name="error_forbidden_digits_only_username">Heimaþjónn notandans samþykkir ekki notendanöfn einungis með tölustöfum.</string>
+    <string name="settings_security_prevent_screenshots_title">Hindra skjámyndatöku af forritinu</string>
+    <string name="settings_notification_configuration">Uppsetning tilkynninga</string>
+    <string name="error_failed_to_import_keys">Mistókst að flytja inn lykla</string>
+    <string name="qr_code_scanned_self_verif_notice">Næstum því búið! Sýnir hitt tækið gátmerki\?</string>
+    <string name="room_created_summary_no_topic_creation_text">%s svo fólk viti að um hvað málin snúist.</string>
+    <string name="send_your_first_msg_to_invite">Sendu fyrstu skilaboðin þín til að bjóða %s að spjalla</string>
+    <string name="this_is_the_beginning_of_room_no_name">Þetta er upphafið á þessu samtali.</string>
+    <string name="this_is_the_beginning_of_room">Þetta er upphafið á %s.</string>
+    <string name="room_created_summary_item">%s bjó til og stillti spjallrásina.</string>
+    <string name="encryption_unknown_algorithm_tile_description">Dulritunin sem notuð er í þessari spjallrás er ekki studd</string>
+    <string name="encryption_misconfigured">Dulritun er rangt stillt</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Skilaboð í þessu spjalli verða enda-í-enda dulrituð.</string>
+    <string name="encryption_enabled_tile_description">Skilaboð í þessari spjallrás eru enda-í-enda dulrituð. Lærðu meira um þetta og yfirfarðu notendur í notandasniðum þeirra.</string>
+    <string name="bootstrap_cancel_text">Ef þú hættir við núna, geturðu tapað dulrituðum skilaboðum og gögnum ef þú missir aðgang að innskráningum þínum.
+\n
+\nÞú getur víka sett upp örugga afritun og sýslað með dulritunarlyklana þína í stillingunum.</string>
+    <string name="bootstrap_crosssigning_progress_initializing">Gef út útbúna auðkennislykla</string>
+    <string name="bootstrap_loading_title">Set upp endurheimtu.</string>
+    <string name="bootstrap_dont_reuse_pwd">Ekki nota lykilorðið fyrir aðganginn þinn.</string>
+    <string name="message_key">Lykill skilaboða</string>
+    <string name="verify_new_session_was_not_me">Þetta var ekki ég</string>
+    <string name="settings_key_requests">Beiðnir um lykla</string>
+    <string name="login_default_session_public_name">${app_name} fyrir Android</string>
+    <string name="qr_code_scanned_by_other_notice">Næstum því búið! Sýnir %s gátmerki\?</string>
+    <string name="room_member_profile_failed_to_get_devices">Mistókst að ná í setur</string>
+    <plurals name="settings_active_sessions_count">
+        <item quantity="one">%d virk seta</item>
+        <item quantity="other">%d virkar setur</item>
+    </plurals>
+    <string name="settings_failed_to_get_crypto_device_info">Engar dulkóðunarupplýsingar tiltækar</string>
+    <string name="room_settings_enable_encryption_no_permission">Þú hefur ekki heimild til að virkja dulritun á þessari spjallrás.</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">Kóði var sendur til: %s</string>
+    <string name="ftue_auth_phone_confirmation_title">Staðfestu símanúmerið þitt</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">Staðfestingarkóði</string>
+    <string name="ftue_auth_choose_server_ems_title">Viltu hýsa þinn eigin netþjón\?</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Hvert er vistfang netþjónsins þíns\?</string>
+    <string name="ftue_auth_choose_server_subtitle">Hvert er vistfang netþjónsins þíns\? Þetta er staður sem geymir öll gögnin þín</string>
+    <string name="ftue_auth_choose_server_title">Veldu netþjón fyrir þig</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Þar sem samtölin þín eru</string>
+    <string name="ftue_auth_create_account_choose_server_header">Þar sem samtölin þín verða</string>
+    <string name="ftue_auth_create_account_password_entry_footer">Verður að vera að minnsta kosti 8 stafir</string>
+    <string name="ftue_auth_create_account_username_entry_footer">Aðrir geta fundið þig %s</string>
+    <string name="ftue_account_created_subtitle">%s aðgangur þinn hefur verið útbúinn</string>
+    <string name="ftue_account_created_take_me_home">Fara á forsíðuna</string>
+    <string name="ftue_account_created_personalize">Persónugera notandasnið</string>
+    <string name="ftue_auth_use_case_join_existing_server">Ætlarðu að ganga til liðs við fyrirliggjandi netþjón\?</string>
+    <string name="ftue_auth_use_case_skip">Ekki ennþá viss\? %s</string>
+    <string name="ftue_auth_use_case_title">Við hverja muntu helst spjalla\?</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} er líka frábært fyrir vinnustaðinn. Heimsins öruggustu samtök treysta því.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Enda-í-enda dulritað og ekkert símanúmer nauðsynlegt. Engar auglýsingar eða gagnasöfnun.</string>
+    <string name="ftue_auth_carousel_control_body">Veldu hvar á að geyma samtölin þín, sem gefur þér stjórnina og algert sjálfstæði. Tengt í gegnum Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Örugg og óháð samskipti sem gefa þér færi á að ræða málin í friði rétt eins og þetta sé maður á mann í heimahúsi.</string>
+    <string name="ftue_auth_carousel_workplace_title">Skilaboð fyrir teymið þitt.</string>
+    <string name="reaction_search_type_hint">Skrifaðu stikkorð til að finna viðbrögð.</string>
+    <string name="a11y_open_spaces">Opna svæðalista</string>
+    <string name="room_preview_no_preview_join">Ekki er hægt að forskoða þessa spjallrás. Viltu taka þátt í henni\?</string>
+    <string name="room_preview_not_found">Þessi spjallrás er ekki aðgengileg í augnablikinu.
+\nPrófaðu aftur síðar, eða spurðu einhvern stjórnanda hvort þú hafir aðgang.</string>
+    <string name="malformed_message">Rangt sniðinn atburður, get ekki birt hann</string>
+    <string name="event_redacted_by_user_reason">Atburði eytt af notanda</string>
+    <string name="keys_backup_banner_update_line1">Nýjir lyklar fyrir örugg skilaboð</string>
+    <string name="analytics_opt_in_content">Hjálpaðu okkur við að greina vandamál og bæta ${app_name} með því að deila nafnlausum gögnum varðandi notkun. Til að skilja hvernig fólk notar saman mörg tæki, munum við útbúa tilviljanakennt auðkenni, sem tækin þín deila.
+\n
+\nÞú getur lesið alla skilmála okkar %s.</string>
+    <string name="settings_autoplay_animated_images_title">Spila hreyfimyndir sjálfvirkt</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_failed">Mistókst að skrá endapunkt á heimaþjóninn:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_success">Það tókst að skrá endapunkt á heimaþjóninn.</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_title">Skráning endapunkts</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s og %2$d í viðbót</item>
+        <item quantity="other">%1$s og %2$d í viðbót</item>
+    </plurals>
+    <string name="space_settings_permissions_subtitle">Skoða og uppfæra hlutverk sem krafist er til að breyta ýmsum þáttum svæðisins.</string>
+    <string name="room_settings_permissions_subtitle">Skoða og uppfæra hlutverk sem krafist er til að breyta ýmsum þáttum spjallrásarinnar.</string>
+    <string name="auth_reset_password_error_unverified">Tölvupóstfang ekki staðfest, athugaðu pósthólfið þitt</string>
+    <string name="invites_empty_title">Ekkert nýtt.</string>
+    <string name="space_list_empty_title">Engin svæði ennþá.</string>
+    <string name="labs_enable_new_app_layout_summary">Einfaldað Element með valkvæðum flipum</string>
+    <string name="labs_enable_new_app_layout_title">Virkja nýja framsetningu</string>
+    <string name="home_layout_preferences">Kjörstillingar framsetningar</string>
+    <string name="change_space">Skipta um svæði</string>
+    <string name="all_chats">Allar spjallrásir</string>
+    <string name="onboarding_new_app_layout_button_try">Prófaðu það</string>
+    <string name="onboarding_new_app_layout_feedback_title">Gefðu umsögn</string>
+    <string name="device_manager_session_details_device_ip_address">IP-vistfang</string>
+    <string name="device_manager_session_details_session_last_activity">Síðasta virkni</string>
+    <string name="device_manager_session_details_session_name">Nafn á setu</string>
+    <string name="device_manager_session_details_title">Nánar um setuna</string>
+    <string name="device_manager_other_sessions_clear_filter">Hreinsa síu</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Engar óvirkar setur fundust.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Engar óstaðfestar setur fundust.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Engar staðfestar setur fundust.</string>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Óvirkt</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Óstaðfest</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Staðfest</string>
+    <string name="a11y_device_manager_filter">Sía</string>
+    <string name="device_manager_filter_option_inactive">Óvirkt</string>
+    <string name="device_manager_filter_option_unverified">Óstaðfest</string>
+    <string name="device_manager_filter_option_verified">Staðfest</string>
+    <string name="device_manager_filter_option_all_sessions">Allar setur</string>
+    <string name="device_manager_filter_bottom_sheet_title">Sía</string>
+    <string name="device_manager_session_last_activity">Síðasta virkni %1$s</string>
+    <string name="device_manager_device_title">Tæki</string>
+    <string name="device_manager_session_title">Seta</string>
+    <string name="device_manager_current_session_title">Núverandi seta</string>
+    <string name="device_manager_unverified_sessions_title">Óstaðfestar setur</string>
+    <string name="device_manager_other_sessions_view_all">Skoða allt (%1$d)</string>
+    <string name="device_manager_view_details">Skoða nánar</string>
+    <string name="device_manager_verify_session">Sannprófa setu</string>
+    <string name="device_manager_verification_status_unverified">Óstaðfest seta</string>
+    <string name="device_manager_verification_status_verified">Staðfest seta</string>
+    <string name="a11y_device_manager_device_type_unknown">Óþekkt tegund tækis</string>
+    <string name="a11y_device_manager_device_type_desktop">Skjáborð</string>
+    <string name="a11y_device_manager_device_type_web">Vefur</string>
+    <string name="a11y_device_manager_device_type_mobile">Farsími</string>
+    <string name="live_location_labs_promotion_switch_title">Virkja deilingu staðsetninga</string>
+    <string name="settings_troubleshoot_test_current_gateway_title">Netgátt</string>
+    <string name="settings_troubleshoot_test_current_distributor_title">Aðferð</string>
+    <string name="unifiedpush_distributor_background_sync">Samstilling í bakgrunni</string>
+    <string name="unifiedpush_distributor_fcm_fallback">Google þjónustur</string>
+    <string name="live_location_share_location_item_share">Deila staðsetningu</string>
+    <string name="location_share_live_remaining_time">%1$s hætti</string>
+    <string name="poll_undisclosed_not_ended">Niðurstöður birtast einungis eftir að könnuninni hefur lokið</string>
+    <string name="space_explore_filter_no_result_title">Engar niðurstöður fundust</string>
+    <string name="a11y_open_settings">Opna stillingar</string>
+    <string name="bootstrap_crosssigning_save_cloud">Afritaðu hann á einkageymslu sem þú átt í tölvuskýi</string>
+    <string name="bootstrap_crosssigning_save_usb">Vistaðu hann á USB-lykil eða öryggisdisk</string>
+    <string name="bootstrap_crosssigning_print_it">Prentaðu hann og geymdu á öruggum stað</string>
+    <string name="bootstrap_info_text_2">Settu inn öryggisfrasa sem aðeins þú þekkir, þetta er notað til að verja leyndarmálin sem þú geymir á netþjóninum þínum.</string>
+    <string name="enter_account_password">Settu inn %s til að halda áfram.</string>
+    <string name="crosssigning_cannot_verify_this_session">Tókst ekki að sannreyna þetta tæki</string>
+    <string name="device_manager_sessions_other_title">Aðrar setur</string>
+    <string name="settings_sessions_list">Setur</string>
+    <string name="ftue_auth_login_username_entry">Notandanafn / tölvupóstfang / símanúmer</string>
+    <string name="ftue_auth_captcha_title">Ertu mannvera\?</string>
+    <string name="ftue_auth_password_reset_confirmation">Endurstilling lykilorðs</string>
+    <string name="ftue_auth_forgot_password">Gleymt lykilorð</string>
+    <string name="ftue_auth_email_resend_email">Senda tölvupóst aftur</string>
+    <string name="ftue_auth_email_verification_title">Skoðaðu tölvupóstinn þinn</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">Endursenda kóða</string>
+    <string name="ftue_auth_sign_out_all_devices">Skrá út öll tæki</string>
+    <string name="ftue_auth_reset_password">Endurstilla lykilorð</string>
+    <string name="ftue_auth_new_password_title">Veldu nýtt lykilorð</string>
+    <string name="ftue_auth_new_password_entry_title">Nýtt lykilorð</string>
+    <string name="ftue_auth_reset_password_breaker_title">Athugaðu tölvupóstinn þinn.</string>
+    <string name="ftue_auth_phone_entry_title">Símanúmer</string>
+    <string name="ftue_auth_phone_title">Settu inn símanúmerið þitt</string>
+    <string name="ftue_auth_email_entry_title">Tölvupóstur</string>
+    <string name="ftue_auth_email_title">Settu inn tölvupóstfangið þitt</string>
+    <string name="ftue_auth_choose_server_ems_cta">Hafðu samband</string>
+    <string name="ftue_auth_choose_server_entry_hint">Slóð netþjóns</string>
+    <string name="ftue_auth_welcome_back_title">Velkomin(n) aftur!</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Breyta</string>
+    <string name="ftue_auth_create_account_sso_section_header">Eða</string>
+    <string name="ftue_auth_create_account_title">Búa til aðganginn þinn</string>
+    <string name="ftue_auth_use_case_subtitle">Við munum hjálpa þér að tengjast</string>
+    <string name="create_room_action_go">Fara</string>
+    <string name="room_preview_no_preview">Þessa spjallrás er ekki hægt að forskoða</string>
+    <string name="updating_your_data">Uppfæri gögnin þín…</string>
+    <string name="room_list_filter_people">Fólk</string>
+    <string name="room_list_filter_favourites">Eftirlæti</string>
+    <string name="room_list_filter_unreads">Ólesið</string>
+    <string name="room_list_filter_all">Allt</string>
+    <string name="font_size_use_system">Nota sjálfgefnar kerfisstillingar</string>
+    <string name="font_size_section_manually">Velja handvirkt</string>
+    <string name="font_size_section_auto">Setja sjálfvirkt</string>
+    <string name="font_size_title">Veldu leturstærð</string>
+    <string name="search_space_two_parents">%1$s og %2$s</string>
+    <string name="invites_title">Boðsgestir</string>
+    <string name="home_layout_preferences_sort_name">A-Ö</string>
+    <string name="home_layout_preferences_sort_activity">Virkni</string>
+    <string name="home_layout_preferences_sort_by">Raða eftir</string>
+    <string name="home_layout_preferences_recents">Birta nýlegt</string>
+    <string name="home_layout_preferences_filters">Sýna síur</string>
+    <string name="action_next">Næsta</string>
+    <string name="time_unit_second_short">sek</string>
+    <string name="time_unit_minute_short">mín</string>
+    <string name="time_unit_hour_short">klst</string>
+    <string name="explore_rooms">Kanna spjallrásir</string>
+    <string name="create_room">Búa til spjallrás</string>
+    <string name="start_chat">Hefja spjall</string>
+    <string name="settings_discovery_no_terms">Auðkennisþjónninn sem þú valdir er ekki með neina þjónustuskilmála. Ekki halda áfram nema þú treystir eiganda netþjónsins</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">Mistókst að skrá FCM-teikn á heimaþjóninn:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_success">Það tókst að skrá FCM-teikn á heimaþjóninn.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Ein eða fleiri prófanir mistókust, prófaðu tillögur að lagfæringum.</string>
+    <string name="error_threepid_auth_failed">Gakktu úr skugga um að þú hafir smellt á tengilinn í tölvupóstinum sem við sendum þér.</string>
+    <string name="space_permissions_notice_read_only">Þú hefur ekki heimild til að uppfæra þau hlutverk sem krafist er til að breyta ýmsum þáttum svæðisins</string>
+    <string name="room_permissions_notice_read_only">Þú hefur ekki heimild til að uppfæra þau hlutverk sem krafist er til að breyta ýmsum þáttum spjallrásarinnar</string>
+    <string name="space_permissions_notice">Veldu þau hlutverk sem krafist er til að breyta ýmsum þáttum svæðisins</string>
+    <string name="room_permissions_notice">Veldu þau hlutverk sem krafist er til að breyta ýmsum þáttum spjallrásarinnar</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">Dulritun er rangt stillt þannig að þú getur ekki sent skilaboð. Smelltu til að opna stillingar.</string>
+    <string name="room_unsupported_e2e_algorithm">Dulritun er rangt stillt þannig að þú getur ekki sent skilaboð. Hafðu samband við einhvern stjórnanda til að koma dulritun í lag.</string>
+    <string name="space_participants_unban_prompt_msg">Afbönnun á þessum notanda mun gera viðkomandi kleift að taka þátt aftur í svæðinu.</string>
+    <string name="room_participants_unban_prompt_msg">Afbönnun á þessum notanda mun gera viðkomandi kleift að taka þátt aftur í spjallrásinni.</string>
+    <string name="space_participants_ban_prompt_msg">Bann á notanda mun henda honum út af þessu svæði og koma í veg fyrir að viðkomandi komi aftur.</string>
+    <string name="space_participants_remove_prompt_msg">Notandinn verður fjarlægður af þessu svæði.
+\n
+\nTil koma í veg fyrir að viðkomandi komi aftur, ætti frekar að banna hann.</string>
+    <string name="room_participants_remove_prompt_msg">Notandinn verður fjarlægður af þessari spjallrás.
+\n
+\nTil koma í veg fyrir að viðkomandi komi aftur, ætti frekar að banna hann.</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Ertu viss um að þú viljir hætta við boðið til þessa notanda\?</string>
+    <string name="room_participants_action_unignore_prompt_msg">Afhunsun á þessum notanda mun sýna öll skilaboð frá viðkomandi aftur.</string>
+    <string name="room_participants_action_ignore_prompt_msg">Að hunsa þennan notanda mun fjarlægja skilaboð frá viðkomandi í þeim spjallrásum sem þið eigið sameiginlegar.
+\n
+\nÞú getur afturkallað þessa aðgerð hvenær sem er í almennu stillingunum.</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Þú getur ekki afturkallað þessa aðgerð, þar sem þú ert að lækka sjálfa/n þig í tign, og ef þú ert síðasti notandinn með nógu mikil völd á þessari spjallrás, verður ómögulegt að ná aftur stjórn á henni.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Ræstu ${app_name} á öðru tæki sem getur afkóðað skilaboðin og síðan sent dulritunarlyklana yfir í þessa setu.</string>
+    <string name="e2e_re_request_encryption_key">Biðja aftur um dulritunarlykla frá hinum setunum þínum.</string>
+    <string name="invites_empty_message">Þetta er þar sem nýjar beiðnir og boðsgestir birtast.</string>
+    <string name="space_list_empty_message">Svæði eru ný leið til að hópa fólk og spjallrásir. Útbúðu svæði til að komast í gang.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Öryggisafritun dulritunarlykla ætti að vera virk í öllum setunum þínum til að koma í veg fyrir að þú getir tapað aðgangi að dulrituðu skilaboðunum þínum.</string>
+    <string name="initial_sync_request_reason_unignored_users">- Sumir tengiliðir hafa verið afhunsaðir</string>
+    <string name="initial_sync_request_content">${app_name} þarf að hreinsa skyndiminnið til að haldast uppfært, af eftirfarandi ástæðu:
+\n%s\?
+\n
+\nAthugaðu að þessi aðgerð mun endurræsa forritið og það getur tekið nokkurn tíma.</string>
+    <string name="a11y_collapse_space_children">Fella saman undirsvæði %s</string>
+    <string name="a11y_expand_space_children">Fella út undirsvæði %s</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Farðu eftir leiðbeiningunum sem sendar voru á %s</string>
+    <string name="ftue_auth_email_verification_footer">Fékkstu ekki tölvupóst\?</string>
+    <string name="ftue_auth_email_verification_subtitle">Farðu eftir leiðbeiningunum sem sendar voru á %s</string>
+    <string name="ftue_auth_new_password_subtitle">Hafðu það að minnsta kosti 8 stafa langt.</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s mun senda þér staðfestingartengil</string>
+    <string name="ftue_auth_phone_subtitle">%s þarf að sannreyna notandaaðganginn þinn</string>
+    <string name="ftue_auth_email_subtitle">%s þarf að sannreyna notandaaðganginn þinn</string>
+    <string name="ftue_auth_terms_subtitle">Endilega lestu í gegnum stefnur og skilmála fyrir %s</string>
+    <string name="ftue_auth_terms_title">Stefnur netþjónsins</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) er afkastamikil og áreiðanleg hýsingarþjónusta fyrir hraðvirk og örugg samskipti í rauntíma. Skoðaðu hvernig við förum að því á <a href="${ftue_ems_url}">element.io/ems</a></string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-is/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-is/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-is/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-is/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-it/strings.xml b/library/ui-strings/src/main/res/values-it/strings.xml
similarity index 88%
rename from vector/src/main/res/values-it/strings.xml
rename to library/ui-strings/src/main/res/values-it/strings.xml
index 46bb5453a8..b1721449ad 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/library/ui-strings/src/main/res/values-it/strings.xml
@@ -52,8 +52,6 @@
 \nImportazione stanze con invito</string>
     <string name="initial_sync_start_importing_account_left_rooms">Sincronizzazione iniziale:
 \nImportazione stanze abbandonate</string>
-    <string name="initial_sync_start_importing_account_groups">Sincronizzazione iniziale:
-\nImportazione delle comunità</string>
     <string name="initial_sync_start_importing_account_data">Sincronizzazione iniziale:
 \nImportazione dati account</string>
     <string name="notice_room_update">%s ha aggiornato questa stanza.</string>
@@ -157,7 +155,7 @@
     <string name="notice_room_guest_access_can_join_by_you">Hai permesso l\'accesso alla stanza per gli ospiti.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza per gli ospiti.</string>
     <string name="notice_end_to_end_ok_by_you">Hai attivato la crittografia end-to-end.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Hai attivato la crittografia E2E (algoritmo %1$s sconosciuto).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Hai attivato la crittografia E2E (algoritmo %1$s non riconosciuto).</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza agli ospiti.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s ha impedito l\'accesso alla stanza agli ospiti.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">Hai permesso l\'accesso agli ospiti.</string>
@@ -293,7 +291,6 @@
     <string name="auth_email_already_defined">L\'indirizzo email è già stato impostato.</string>
     <string name="auth_forgot_password">Hai dimenticato la password\?</string>
     <string name="auth_recaptcha_message">Questo homeserver vuole assicurarsi che tu non sia un robot</string>
-    <string name="auth_reset_password_missing_email">Va inserito l\'indirizzo email associato al tuo account.</string>
     <string name="auth_reset_password_error_unauthorized">La verifica del tuo indirizzo email è fallita: assicurati di aver cliccato sul link contenuto nella mail</string>
     <string name="login_error_invalid_home_server">Inserisci un URL valido</string>
     <string name="login_error_bad_json">JSON malformato</string>
@@ -433,7 +430,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Errore di decriptazione</string>
     <string name="encryption_information_device_name">Nome pubblico</string>
-    <string name="encryption_information_device_id">ID sessione</string>
+    <string name="device_manager_session_details_session_id">ID sessione</string>
     <string name="encryption_information_device_key">Chiave sessione</string>
     <string name="encryption_export_e2e_room_keys">Esporta le chiavi di crittografia E2E delle stanze</string>
     <string name="encryption_export_room_keys">Esporta le chiavi delle stanze</string>
@@ -488,7 +485,6 @@
     <string name="call">Chiama</string>
     <string name="encrypted_message">Messaggio criptato</string>
     <string name="loading">Caricamento…</string>
-    <string name="groups_header">Comunità</string>
     <string name="send_bug_report_rage_shake">Per segnalare un errore agita il dispositivo con rabbia</string>
     <string name="start_voice_call_prompt_msg">Sicuro di voler fare una chiamata audio\?</string>
     <string name="start_video_call_prompt_msg">Sicuro di voler fare una videochiamata\?</string>
@@ -874,7 +870,6 @@
     <string name="action_change">Cambia</string>
     <string name="change_room_directory_network">Cambia rete</string>
     <string name="please_wait">Attendere prego…</string>
-    <string name="group_all_communities">Tutte le comunità</string>
     <string name="room_preview_no_preview">Anteprima non disponibile per questa stanza</string>
     <string name="fab_menu_create_room">Stanze</string>
     <string name="fab_menu_create_chat">Messaggi diretti</string>
@@ -894,10 +889,10 @@
     <string name="settings_push_rules">Regole di push</string>
     <string name="settings_push_rules_no_rules">Nessuna regola di push definita</string>
     <string name="settings_push_gateway_no_pushers">Nessun gateway di push registrato</string>
-    <string name="push_gateway_item_app_id">id_app:</string>
-    <string name="push_gateway_item_push_key">chiave_push:</string>
-    <string name="push_gateway_item_app_display_name">nome_visualizzato_app:</string>
-    <string name="push_gateway_item_device_name">nome_sessione:</string>
+    <string name="push_gateway_item_app_id">ID app:</string>
+    <string name="push_gateway_item_push_key">Chiave push:</string>
+    <string name="push_gateway_item_app_display_name">Nome mostrato app:</string>
+    <string name="push_gateway_item_device_name">Nome mostrato sessione:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formato:</string>
     <string name="preference_voice_and_video">Audio e Video</string>
@@ -960,11 +955,11 @@
     <string name="settings_discovery_identity_server_info">Attualmente stai usando %1$s per trovare altri utenti ed essere a tua volta rintracciabile da loro.</string>
     <string name="settings_discovery_identity_server_info_none">Attualmente non stai usando alcun server d\'identità. Per trovare e farti rintracciare dagli altri utenti, configurane uno qua sotto.</string>
     <string name="settings_discovery_emails_title">Indirizzi email visibili pubblicamente</string>
-    <string name="settings_discovery_no_mails">Le opzioni su come farsi trovare appariranno dopo che avrai aggiunto un\'email.</string>
+    <string name="settings_discovery_no_mails">Le opzioni su come farsi trovare appariranno dopo che avrai aggiunto un indirizzo email.</string>
     <string name="settings_discovery_no_msisdn">Le opzioni su come farsi trovare appariranno dopo che avrai aggiunto un numero di telefono.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Se ti disconnetti dal server d\'identità gli altri utenti non potranno trovarti e tu non potrai invitarli tramite le loro email o numeri di telefono.</string>
     <string name="settings_discovery_msisdn_title">Numeri di telefono visibili pubblicamente</string>
-    <string name="settings_discovery_confirm_mail">Abbiamo inviato un\'email di conferma a %s, controlla la tua posta e clicca sul link di conferma</string>
+    <string name="settings_discovery_confirm_mail">Abbiamo inviato un\'email a %s, controlla la tua posta e clicca sul link di conferma</string>
     <string name="settings_discovery_enter_identity_server">Inserisci un URL di un server d\'identità</string>
     <string name="settings_discovery_bad_identity_server">Impossibile connettersi al server d\'identità</string>
     <string name="settings_discovery_please_enter_server">Inserisci l\'URL del server d\'identità</string>
@@ -1092,7 +1087,7 @@
     <string name="login_registration_not_supported">L\'applicazione non riesce a creare un account su questo Home Server.
 \n
 \nVuoi registrarti usando un client web\?</string>
-    <string name="login_login_with_email_error">Questa email non è associata ad alcun account.</string>
+    <string name="login_login_with_email_error">Questo indirizzo email non è associato ad alcun account.</string>
     <string name="login_reset_password_on">Reimposta la password su %1$s</string>
     <string name="login_reset_password_notice">Per confermare la nuova password ti verrà inviata un\'email di verifica.</string>
     <string name="login_reset_password_submit">Avanti</string>
@@ -1101,7 +1096,7 @@
     <string name="login_reset_password_warning_title">Attenzione!</string>
     <string name="login_reset_password_warning_content">Cambiando la password verranno reimpostate le chiavi crittografiche E2E di tutte le tue sessioni rendendo illeggibile la cronologia delle chat criptate. Prima di reimpostare la password imposta il Backup delle Chiavi o esporta le chiavi della tua stanza da un\'altra sessione.</string>
     <string name="login_reset_password_warning_submit">Continua</string>
-    <string name="login_reset_password_error_not_found">Questa email non è collegata ad alcun account</string>
+    <string name="login_reset_password_error_not_found">Questo indirizzo email non è collegato ad alcun account</string>
     <string name="login_reset_password_mail_confirmation_title">Controlla la tua posta</string>
     <string name="login_reset_password_mail_confirmation_notice">Un\'email di verifica è stata inviata a %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Clicca sul link per confermare la tua nuova password. Una volta fatto, clicca sotto.</string>
@@ -1115,7 +1110,7 @@
 \n
 \nFermare il processo di cambio password\?</string>
     <string name="login_set_email_title">Imposta indirizzo email</string>
-    <string name="login_set_email_notice">Imposta un\'email per recuperare il tuo account. Più tardi potrai decidere se permettere alle persone che conosci di trovarti tramite questa email.</string>
+    <string name="login_set_email_notice">Imposta un indirizzo email per recuperare il tuo account. Più tardi potrai decidere se permettere alle persone che conosci di trovarti tramite questo indirizzo.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (facoltativa)</string>
     <string name="login_set_email_submit">Avanti</string>
@@ -1453,7 +1448,7 @@
     <string name="event_redacted">Messaggio rimosso</string>
     <string name="settings_show_redacted">Mostra messaggi rimossi</string>
     <string name="settings_show_redacted_summary">Mostra un segnaposto per i messaggi rimossi</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Ti abbiamo inviato un\'email di conferma a %s, controlla la tua posta e clicca il link di conferma</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Abbiamo inviato un\'email a %s, controlla la tua posta e clicca il link di conferma</string>
     <string name="settings_text_message_sent_wrong_code">Il codice di verifica non è corretto.</string>
     <string name="uploads_media_title">MEDIA</string>
     <string name="uploads_media_no_result">In questa stanza non ci sono file multimediali</string>
@@ -1476,7 +1471,7 @@
     <string name="identity_server_error_outdated_home_server">Questa operazione non è possibile. L\'Home Server è obsoleto.</string>
     <string name="identity_server_error_no_identity_server_configured">Prima configura un server d\'identità.</string>
     <string name="identity_server_error_terms_not_signed">Prima accetta le condizioni del server d\'identità nelle impostazioni.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Per la tua privacy, ${app_name} supporta solo l\'invio di email e numeri di telefono degli utenti in modalità oscurata (hash).</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Per la tua privacy, ${app_name} supporta solo l\'invio di hash degli indirizzi email e dei numeri di telefono degli utenti.</string>
     <string name="identity_server_error_binding_error">L\'associazione è fallita.</string>
     <string name="identity_server_error_no_current_binding_error">Non c\'è alcuna associazione con questo identificativo.</string>
     <string name="identity_server_set_default_notice">Il tuo home server (%1$s) propone di usare %2$s come tuo server d\'identità</string>
@@ -1650,12 +1645,12 @@
     <string name="auth_msisdn_already_defined">Questo numero di telefono è già definito.</string>
     <string name="settings_phone_number_empty">Nessun numero di telefono aggiunto al tuo account</string>
     <string name="settings_emails">Indirizzi email</string>
-    <string name="settings_emails_empty">Nessuna email aggiunta al tuo account</string>
+    <string name="settings_emails_empty">Nessun indirizzo email aggiunto al tuo account</string>
     <string name="settings_phone_numbers">Numeri di telefono</string>
     <string name="settings_remove_three_pid_confirmation_content">Rimuovere %s\?</string>
     <string name="error_threepid_auth_failed">Assicurati di avere cliccato il link nell\'email che ti abbiamo inviato.</string>
     <string name="settings_emails_and_phone_numbers_title">Email e numeri di telefono</string>
-    <string name="settings_emails_and_phone_numbers_summary">Gestisci le email e i numeri di telefono collegati al tuo account Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Gestisci gli indirizzi email e i numeri di telefono collegati al tuo account Matrix</string>
     <string name="settings_text_message_sent_hint">Codice</string>
     <string name="login_msisdn_notice">Si prega di usare il formato internazionale (il numero deve iniziare con \'+\')</string>
     <string name="confirm_your_identity_quad_s">Conferma la tua identità verificando questo accesso, dandogli l\'accesso ai messaggi cifrati.</string>
@@ -1774,7 +1769,7 @@
     <string name="attachment_viewer_item_x_of_y">%1$d di %2$d</string>
     <string name="settings_discovery_consent_action_give_consent">Dai il consenso</string>
     <string name="settings_discovery_consent_action_revoke">Revoca il mio consenso</string>
-    <string name="settings_discovery_consent_notice_on">Hai acconsentito ad inviare email e numeri di telefono a questo server d\'identità per poter rintracciare altri utenti tra i tuoi contatti.</string>
+    <string name="settings_discovery_consent_notice_on">Hai acconsentito ad inviare indirizzi email e numeri di telefono a questo server d\'identità per poter rintracciare altri utenti tra i tuoi contatti.</string>
     <string name="settings_discovery_consent_title">Invia email e numeri di telefono</string>
     <string name="direct_room_user_list_suggestions_title">Suggerimenti</string>
     <string name="direct_room_user_list_known_title">Utenti conosciuti</string>
@@ -1983,7 +1978,7 @@
     <string name="space_type_public">Pubblico</string>
     <string name="create_spaces_private_teammates">Uno Spazio privato per te e i tuoi compagni</string>
     <string name="create_spaces_me_and_teammates">Io e i miei compagni</string>
-    <string name="create_spaces_organise_rooms">Uno Spazio privato per organizzare le tue stanze</string>
+    <string name="create_spaces_organise_rooms">Uno spazio privato per organizzare le tue stanze</string>
     <string name="create_spaces_just_me">Solo io</string>
     <string name="create_spaces_make_sure_access">Assicurati che le persone giuste abbiano accesso a %s.</string>
     <string name="create_spaces_who_are_you_working_with">Con chi stai lavorando\?</string>
@@ -2138,7 +2133,7 @@
     <string name="settings_notification_mentions_and_keywords">Menzioni e parole chiave</string>
     <string name="settings_notification_default">Notifiche predefinite</string>
     <string name="link_this_email_with_your_account">%s nella impostazioni per ricevere inviti direttamente in ${app_name}.</string>
-    <string name="link_this_email_settings_link">Collega questa email con il tuo account</string>
+    <string name="link_this_email_settings_link">Collega questo indirizzo email con il tuo account</string>
     <string name="this_invite_to_this_space_was_sent">Questo invito per questo spazio è stato inviato a %s, la quale non è associata al tuo account</string>
     <string name="this_invite_to_this_room_was_sent">Questo invito per questa stanza è stato inviato a %s, la quale non è associata al tuo account</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Tutte le stanze in cui sei appariranno nella pagina principale.</string>
@@ -2254,12 +2249,12 @@
     <string name="create_poll_question_title">Domanda o argomento del sondaggio</string>
     <string name="create_poll_title">Crea sondaggio</string>
     <string name="attachment_type_poll">Sondaggio</string>
-    <string name="identity_server_consent_dialog_title_2">Invia email e numeri di telefono a %s</string>
+    <string name="identity_server_consent_dialog_title_2">Invia indirizzi email e numeri di telefono a %s</string>
     <string name="settings_discovery_consent_notice_off_2">I tuoi contatti sono privati. Per trovare utenti dai tuoi contatti, ci serve l\'autorizzazione per inviare le informazioni dei contatti al tuo server d\'identità.</string>
     <string name="shortcut_disabled_reason_sign_out">La sessione è stata disconnessa!</string>
     <string name="shortcut_disabled_reason_room_left">La stanza è stata lasciata!</string>
     <string name="identity_server_consent_dialog_content_question">Sei d\'accordo con l\'invio di queste informazioni\?</string>
-    <string name="identity_server_consent_dialog_content_3">Per trovare i contatti esistenti, devi inviare le informazioni dei contatti (email e numeri di telefono) al tuo server d\'identità. Facciamo un hash dei dati prima di inviarli per privacy.</string>
+    <string name="identity_server_consent_dialog_content_3">Per trovare i contatti esistenti, devi inviare le informazioni dei contatti (indirizzi email e numeri di telefono) al tuo server d\'identità. Facciamo un hash dei dati prima di inviarli per privacy.</string>
     <string name="action_not_now">Non ora</string>
     <string name="delete_poll_dialog_content">Vuoi davvero rimuovere questo sondaggio\? Non potrai recuperarlo una volta rimosso.</string>
     <string name="delete_poll_dialog_title">Rimuovi sondaggio</string>
@@ -2424,7 +2419,6 @@
     <string name="ftue_profile_picture_title">Aggiungi un\'immagine del profilo</string>
     <string name="ftue_display_name_entry_footer">Puoi cambiarlo in seguito</string>
     <string name="ftue_display_name_entry_title">Nome da mostrare</string>
-    <string name="ftue_display_name_subtitle">Verrà mostrato quando invii messaggi.</string>
     <string name="ftue_display_name_title">Scegli un nome da mostrare</string>
     <string name="ftue_account_created_subtitle">Il tuo account %s è stato creato</string>
     <string name="ftue_account_created_congratulations_title">Congratulazioni!</string>
@@ -2474,7 +2468,6 @@
     <string name="keys_backup_settings_signature_from_this_user">Il backup ha una firma valida da questo utente.</string>
     <string name="labs_enable_live_location_summary">Implementazione temporanea: le posizioni restano nella cronologia della stanza</string>
     <string name="live_location_bottom_sheet_last_updated_at">Aggiornato %1$s fa</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Ferma condivisione</string>
     <string name="labs_enable_live_location">Attiva condivisione posizione in tempo reale</string>
     <string name="location_share_live_remaining_time">%1$s rimasti</string>
     <string name="location_share_live_until">In tempo reale fino alle %1$s</string>
@@ -2594,4 +2587,298 @@
     </plurals>
     <string name="search_space_two_parents">%1$s e %2$s</string>
     <string name="auth_reset_password_error_unverified">Email non verificata, controlla la posta in arrivo</string>
+    <string name="location_share_loading_map_error">Impossibile caricare la mappa
+\nQuesto homeserver potrebbe non essere configurato per mostrare mappe.</string>
+    <string name="a11y_open_settings">Apri le impostazioni</string>
+    <string name="all_chats">Tutte le chat</string>
+    <string name="device_manager_sessions_other_description">Per una maggiore sicurezza, verifica le tue sessioni e disconnetti quelle che non riconosci o che non usi più.</string>
+    <string name="device_manager_sessions_other_title">Altre sessioni</string>
+    <string name="settings_sessions_list">Sessioni</string>
+    <string name="a11y_open_spaces">Apri elenco spazi</string>
+    <string name="a11y_create_message">Crea una nuova conversazione o stanza</string>
+    <string name="room_list_filter_people">Persone</string>
+    <string name="room_list_filter_favourites">Preferiti</string>
+    <string name="room_list_filter_unreads">Non lette</string>
+    <string name="room_list_filter_all">Tutte</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Attività</string>
+    <string name="home_layout_preferences_sort_by">Ordina per</string>
+    <string name="home_layout_preferences_recents">Mostra recenti</string>
+    <string name="home_layout_preferences_filters">Mostra filtri</string>
+    <string name="home_layout_preferences">Preferenze disposizione</string>
+    <string name="explore_rooms">Esplora le stanze</string>
+    <string name="create_room">Crea una stanza</string>
+    <string name="start_chat">Inizia una chat</string>
+    <string name="device_manager_other_sessions_description_unverified">Non verificata · Ultima attività %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Verificata · Ultima attività %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Vedi tutte (%1$d)</string>
+    <string name="device_manager_view_details">Vedi dettagli</string>
+    <string name="device_manager_verify_session">Verifica la sessione</string>
+    <string name="device_manager_verification_status_unverified">Sessione non verificata</string>
+    <string name="device_manager_verification_status_verified">Sessione verificata</string>
+    <string name="a11y_device_manager_device_type_unknown">Tipo di dispositivo sconosciuto</string>
+    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobile</string>
+    <string name="timeline_error_room_not_found">Spiacenti, questa stanza non è stata trovata.
+\nRiprova più tardi.%s</string>
+    <string name="invites_title">Inviti</string>
+    <string name="onboarding_new_app_layout_button_try">Provalo</string>
+    <string name="onboarding_new_app_layout_feedback_message">Tocca in alto a destra per vedere l\'opzione feedback.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Invia un feedback</string>
+    <string name="onboarding_new_app_layout_spaces_message">Accedi ai tuoi spazi (in basso a destra) più velocemente e più facilmente che mai.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Accedi agli spazi</string>
+    <string name="onboarding_new_app_layout_welcome_message">Per semplificare ${app_name}, le schede ora sono opzionali. Gestiscile usando il menu in alto a destra.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Benvenuti ad una nuova panoramica!</string>
+    <string name="home_empty_no_unreads_message">Qui è dove verranno mostrati i messaggi non letti, quando ne avrai qualcuno.</string>
+    <string name="home_empty_no_unreads_title">Niente da segnalare.</string>
+    <string name="home_empty_no_rooms_message">L\'app di chat tutto-in-uno per team, amici e organizzazioni. Inizia una conversazione o entra in una stanza esistente per cominciare.</string>
+    <string name="home_empty_no_rooms_title">Benvenuto/a in ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Gli spazi sono un modo nuovo di raggruppare stanze e persone. Aggiungi una stanza esistente, o creane una nuova usando il pulsante in basso a destra.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nsembra un po\' vuoto.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Considera di disconnettere le sessioni vecchie (%1$d giorno o più) che non usi più.</item>
+        <item quantity="other">Considera di disconnettere le sessioni vecchie (%1$d giorni o più) che non usi più.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Sessioni inattive</string>
+    <string name="device_manager_unverified_sessions_description">Verifica o disconnetti le sessioni non verificate.</string>
+    <string name="device_manager_unverified_sessions_title">Sessioni non verificate</string>
+    <string name="device_manager_header_section_security_recommendations_description">Migliora la sicurezza del tuo account seguendo questi consigli.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Consigli di sicurezza</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inattivo da %1$d+ giorno (%2$s)</item>
+        <item quantity="other">Inattivo da %1$d+ giorni (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Qui è dove troverai le nuove richieste e gli inviti.</string>
+    <string name="invites_empty_title">Niente di nuovo.</string>
+    <string name="space_list_empty_message">Gli spazi sono un modo nuovo di raggruppare stanze e persone. Crea uno spazio per iniziare.</string>
+    <string name="space_list_empty_title">Ancora nessuno spazio.</string>
+    <string name="a11y_collapse_space_children">Riduci contenuto di %s</string>
+    <string name="a11y_expand_space_children">Espandi contenuto di %s</string>
+    <string name="change_space">Cambia spazio</string>
+    <string name="device_manager_session_details_device_ip_address">Indirizzo IP</string>
+    <string name="device_manager_session_details_session_last_activity">Ultima attività</string>
+    <string name="device_manager_session_details_session_name">Nome sessione</string>
+    <string name="device_manager_session_details_description">Applicazione, dispositivo e informazioni di attività.</string>
+    <string name="device_manager_session_details_title">Dettagli sessione</string>
+    <string name="device_manager_other_sessions_clear_filter">Annulla filtro</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Nessuna sessione inattiva trovata.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Nessuna sessione non verificata trovata.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Nessuna sessione verificata trovata.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Considera di disconnettere le sessioni vecchie (%1$d giorno o più) che non usi più.</item>
+        <item quantity="other">Considera di disconnettere le sessioni vecchie (%1$d giorni o più) che non usi più.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inattivo</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifica le tue sessioni per avere conversazioni più sicure o disconnetti quelle che non riconosci o che non usi più.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Non verificato</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Per una maggiore sicurezza, disconnetti tutte le sessioni che non riconosci o che non usi più.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Verificato</string>
+    <string name="a11y_device_manager_filter">Filtra</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Inattivo da %1$d giorno o più</item>
+        <item quantity="other">Inattivo da %1$d giorni o più</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inattivo</string>
+    <string name="device_manager_filter_option_unverified_description">Non pronto per messaggi sicuri</string>
+    <string name="device_manager_filter_option_unverified">Non verificato</string>
+    <string name="device_manager_filter_option_verified_description">Pronto per messaggi sicuri</string>
+    <string name="device_manager_filter_option_verified">Verificato</string>
+    <string name="device_manager_filter_option_all_sessions">Tutte le sessioni</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filtra</string>
+    <string name="device_manager_session_last_activity">Ultima attività %1$s</string>
+    <string name="device_manager_device_title">Dispositivo</string>
+    <string name="device_manager_session_title">Sessione</string>
+    <string name="device_manager_current_session_title">Sessione attuale</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verifica o disconnetti questa sessione per una migliore sicurezza e affidabilità.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifica la tua sessione attuale per messaggi più sicuri.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Questa sessione è pronta per i messaggi sicuri.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">La tua sessione attuale è pronta per i messaggi sicuri.</string>
+    <string name="labs_enable_deferred_dm_title">Attiva messaggi diretti differiti</string>
+    <string name="labs_enable_deferred_dm_summary">Crea messaggio diretto solo al primo messaggio</string>
+    <string name="labs_enable_new_app_layout_summary">Un Element semplificato con schede opzionali</string>
+    <string name="labs_enable_new_app_layout_title">Attiva nuova disposizione</string>
+    <string name="device_manager_learn_more_session_rename">Gli altri utenti nei messaggi diretti e nelle stanze in cui entri, possono vedere una lista completa delle tue sessioni.
+\n
+\nIn questo modo hanno la certezza che stanno parlando davvero con te, ma significa anche che possono vedere il nome della sessione che inserisci qui.</string>
+    <string name="device_manager_learn_more_session_rename_title">Rinominare le sessioni</string>
+    <string name="device_manager_learn_more_sessions_verified">Le sessioni verificate hanno effettuato l\'accesso con le tue credenziali e sono state verificate, usando la frase di sicurezza o la verifica incrociata.
+\n
+\nCiò significa che hanno le tue chiavi di crittografia per i messaggi passati, e confermano agli altri utenti con cui comunichi che queste sessioni sono usate da te.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sessioni verificate</string>
+    <string name="device_manager_learn_more_sessions_unverified">Le sessioni non verificate sono quelle in cui è stato fatto l\'accesso con le tue credenziali, ma che non sono state verificate.
+\n
+\nDovresti essere particolarmente sicuro di riconoscere queste sessioni dato che potrebbero rappresentare un uso non autorizzato del tuo account.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sessioni non verificate</string>
+    <string name="device_manager_learn_more_sessions_inactive">Le sessioni inattive sono quelle che non usi da un po\' di tempo, ma che continuano a ricevere chiavi di crittografia.
+\n
+\nLa rimozione di sessioni inattive migliora la sicurezza e le prestazioni, e ti rende più facile capire se una sessione nuova è sospetta.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sessioni inattive</string>
+    <string name="device_manager_session_rename_warning">Ricorda che i nomi di sessione sono anche visibili alle persone con cui comunichi.</string>
+    <string name="device_manager_session_rename_description">I nomi di sessione personalizzati possono aiutarti a riconoscere i tuoi dispositivi più facilmente.</string>
+    <string name="device_manager_session_rename_edit_hint">Nome sessione</string>
+    <string name="device_manager_session_rename">Rinomina sessione</string>
+    <string name="device_manager_session_overview_signout">Disconnetti questa sessione</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Non verificata · La sessione attuale</string>
+    <string name="tooltip_attachment_voice_broadcast">Inizia una trasmissione vocale</string>
+    <string name="key_authenticity_not_guaranteed">L\'autenticità di questo messaggio cifrato non può essere garantita su questo dispositivo.</string>
+    <string name="settings_security_incognito_keyboard_summary">Richiedi che la tastiera non debba aggiornare dati personalizzati come la cronologia di digitazione e il dizionario in base a cosa digiti nelle conversazioni. Nota che alcune tastiere potrebbero non rispettare questa impostazione.</string>
+    <string name="settings_security_incognito_keyboard_title">Tastiera incognito</string>
+    <string name="command_description_table_flip">Antepone (╯°□°）╯︵ ┻━┻ ad un messaggio di testo</string>
+    <string name="attachment_type_voice_broadcast">Trasmissione vocale</string>
+    <string name="command_description_devtools">Apri la schermata degli strumenti per sviluppatori</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Hai attivato la crittografia solo per sessioni verificate in tutte le stanze nelle impostazioni di sicurezza.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Ci sono dispositivi non verificati in questa stanza, non potranno decifrare i messaggi che invii.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Non inviare mai messaggi cifrati a sessioni non verificate in questa stanza.</string>
+    <string name="action_got_it">Capito</string>
+    <string name="rich_text_editor_format_underline">Applica formato sottolineato</string>
+    <string name="rich_text_editor_format_strikethrough">Applica formato sbarrato</string>
+    <string name="rich_text_editor_format_italic">Applica formato corsivo</string>
+    <string name="rich_text_editor_format_bold">Applica formato grassetto</string>
+    <string name="labs_enable_client_info_recording_summary">Registra il nome, la versione e l\'url del client per riconoscere le sessioni più facilmente nel gestore di sessioni.</string>
+    <string name="labs_enable_client_info_recording_title">Attiva registrazione info client</string>
+    <string name="labs_enable_session_manager_summary">Maggiore visibilità e controllo su tutte le tue sessioni.</string>
+    <string name="labs_enable_session_manager_title">Attiva il nuovo gestore di sessioni</string>
+    <string name="device_manager_session_details_device_operating_system">Sistema operativo</string>
+    <string name="device_manager_session_details_device_model">Modello</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versione</string>
+    <string name="device_manager_session_details_application_name">Nome</string>
+    <string name="device_manager_session_details_application">Applicazione</string>
+    <string name="device_manager_push_notifications_description">Ricevi notifiche push in questa sessione.</string>
+    <string name="device_manager_push_notifications_title">Notifiche push</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifica l\'attuale sessione per rivelare lo stato di verifica di questa sessione.</string>
+    <string name="device_manager_verification_status_unknown">Stato di verifica sconosciuto</string>
+    <string name="push_gateway_item_enabled">Attivato:</string>
+    <string name="push_gateway_item_device_id">ID sessione:</string>
+    <string name="error_check_network">Qualcosa è andato storto. Controlla la tua connessione di rete e riprova.</string>
+    <string name="grant_permission">Concedi l\'autorizzazione</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} chiede l\'autorizzazione per mostrare notifiche.
+\nConcedi l\'autorizzazione.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} chiede l\'autorizzazione per mostrare notifiche. Le notifiche possono mostrare i messaggi, gli inviti, ecc.
+\n
+\nConsenti l\'accesso nelle prossime schermate per potere vedere la notifica.</string>
+    <string name="labs_enable_rich_text_editor_summary">Prova l\'editor in rich text (il testo semplice è in arrivo)</string>
+    <string name="labs_enable_rich_text_editor_title">Attiva editor in rich text</string>
+    <string name="qr_code_login_confirm_security_code_description">Assicurati di conoscere l\'origine di questo codice. Collegando i dispositivi, fornirai a qualcuno l\'accesso totale al tuo account.</string>
+    <string name="qr_code_login_confirm_security_code">Conferma</string>
+    <string name="qr_code_login_try_again">Riprova</string>
+    <string name="qr_code_login_status_no_match">Non corrisponde\?</string>
+    <string name="qr_code_login_signing_in">Accesso in corso</string>
+    <string name="qr_code_login_connecting_to_device">Connessione al dispositivo</string>
+    <string name="qr_code_login_scan_qr_code_button">Scansiona codice QR</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Effettuare l\'accesso in un dispositivo mobile\?</string>
+    <string name="qr_code_login_show_qr_code_button">Mostra codice QR in questo dispositivo</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Seleziona \'Scansiona codice QR\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Inizia nella schermata di accesso</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Seleziona ‘Accedi con codice QR’</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Inizia nella schermata di accesso</string>
+    <string name="qr_code_login_new_device_instruction_3">Seleziona ‘Mostra codice QR’</string>
+    <string name="qr_code_login_new_device_instruction_2">Vai in Impostazioni -&gt; Sicurezza e privacy</string>
+    <string name="qr_code_login_new_device_instruction_1">Apri l\'app sull\'altro dispositivo</string>
+    <string name="qr_code_login_header_failed_denied_description">La richiesta è stata negata sull\'altro dispositivo.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Il collegamento non è stato completato nel tempo previsto.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Il collegamento con questo dispositivo non è supportato.</string>
+    <string name="qr_code_login_header_failed_title">Connessione non riuscita</string>
+    <string name="qr_code_login_header_connected_description">Controlla il dispositivo che ha l\'accesso, dovresti vedere il codice sotto. Conferma che il codice corrisponda con quel dispositivo:</string>
+    <string name="qr_code_login_header_connected_title">Connessione sicura stabilita</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scansiona il codice QR sottostante con il dispositivo che è disconnesso.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Usa il dispositivo che ha l\'accesso per scansionare il codice QR sotto:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Accedi con codice QR</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Usa la fotocamera di questo dispositivo per scansionare il codice QR mostrato nell\'altro dispositivo:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Scansiona codice QR</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Puoi usare questo dispositivo per accedere in un dispositivo mobile o web con un codice QR. Ci sono due modi:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Accedi con codice QR</string>
+    <string name="login_scan_qr_code">Scansiona codice QR</string>
+    <string name="labs_enable_voice_broadcast_summary">Registra e invia trasmissioni vocali nella linea temporale della stanza.</string>
+    <string name="labs_enable_voice_broadcast_title">Attiva trasmissione vocale</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">L\'homeserver non supporta l\'accesso con codice QR.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">L\'accesso è stato annullato sull\'altro dispositivo.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Quel codice QR non è valido.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">L\'altro dispositivo deve fare l\'accesso.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">L\'altro dispositivo ha già fatto l\'accesso.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Si è verificato un problema di sicurezza configurando i messaggi sicuri. Una delle seguenti cose potrebbe essere compromessa: il tuo homeserver; la/e connessione/i internet; il/i dispositivo/i;</string>
+    <string name="qr_code_login_header_failed_other_description">La richiesta è fallita.</string>
+    <string name="a11y_voice_broadcast_buffering">Buffer…</string>
+    <string name="a11y_pause_voice_broadcast">Sospendi trasmissione vocale</string>
+    <string name="a11y_play_voice_broadcast">Avvia o riprendi trasmissione vocale</string>
+    <string name="a11y_stop_voice_broadcast_record">Ferma registrazione trasmissione vocale</string>
+    <string name="a11y_pause_voice_broadcast_record">Sospendi registrazione trasmissione vocale</string>
+    <string name="a11y_resume_voice_broadcast_record">Riprendi registrazione trasmissione vocale</string>
+    <string name="voice_broadcast_live">In diretta</string>
+    <string name="device_manager_other_sessions_select">Seleziona sessioni</string>
+    <string name="attachment_type_selector_contact">Contatto</string>
+    <string name="attachment_type_selector_camera">Fotocamera</string>
+    <string name="attachment_type_selector_location">Posizione</string>
+    <string name="attachment_type_selector_poll">Sondaggi</string>
+    <string name="attachment_type_selector_voice_broadcast">Trasmissione vocale</string>
+    <string name="attachment_type_selector_file">Allegati</string>
+    <string name="attachment_type_selector_sticker">Adesivi</string>
+    <string name="attachment_type_selector_gallery">Album di foto</string>
+    <string name="action_deselect_all">Deseleziona tutto</string>
+    <string name="action_select_all">Seleziona tutto</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d selezionato</item>
+        <item quantity="other">%1$d selezionati</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">Attiva/disattiva schermo intero</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Le sessioni verificate sono ovunque usi questo account dopo l\'inserimento della password o la conferma della tua identità con un\'altra sessione verificata.
+\n
+\nCiò significa che hai tutte le chiavi necessarie per sbloccare i tuoi messaggi cifrati e per confermare agli altri utenti che ti fidi di questa sessione.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Disconnetti da %1$d sessione</item>
+        <item quantity="other">Disconnetti da %1$d sessioni</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Disconnetti</string>
+    <string name="attachment_type_selector_text_formatting">Formattazione testo</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Stai già registrando una trasmissione vocale. Termina quella in corso per iniziarne una nuova.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Qualcun altro sta già registrando una trasmissione vocale. Aspetta che finisca prima di iniziarne una nuova.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Non hai l\'autorizzazione necessaria per iniziare una trasmissione vocale in questa stanza. Contatta un amministratore della stanza per aggiornare le tue autorizzazioni.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Impossibile iniziare una nuova trasmissione vocale</string>
+    <string name="a11y_voice_broadcast_fast_forward">Manda avanti di 30 secondi</string>
+    <string name="a11y_voice_broadcast_fast_backward">Manda indietro di 30 secondi</string>
+    <string name="voice_broadcast_recording_time_left">%1$s rimasti</string>
+    <string name="message_reply_to_sender_created_poll">creato un sondaggio.</string>
+    <string name="message_reply_to_sender_sent_sticker">inviato un adesivo.</string>
+    <string name="message_reply_to_sender_sent_video">inviato un video.</string>
+    <string name="message_reply_to_sender_sent_image">inviata un\'immagine.</string>
+    <string name="message_reply_to_sender_sent_voice_message">inviato un messaggio vocale.</string>
+    <string name="message_reply_to_sender_sent_audio_file">inviato un file audio.</string>
+    <string name="message_reply_to_sender_sent_file">inviato un file.</string>
+    <string name="message_reply_to_prefix">In risposta a</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Nascondi indirizzo IP</string>
+    <string name="device_manager_other_sessions_show_ip_address">Mostra indirizzo IP</string>
+    <string name="quoting">Citazione</string>
+    <string name="replying_to">Risposta a %s</string>
+    <string name="editing">Modifica</string>
+    <string name="settings_enable_direct_share_summary">Mostra chat recenti nel menu di condivisione di sistema</string>
+    <string name="settings_enable_direct_share_title">Attiva condivisione diretta</string>
+    <string name="review_unverified_sessions_description">Controlla per assicurarti che l\'account sia sicuro</string>
+    <string name="review_unverified_sessions_title">Hai sessioni non verificate</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Questa sessione non supporta la crittografia, perciò non può essere verificata.
+\n
+\nNon potrai partecipare in stanze dove la crittografia è attiva mentre usi questa sessione.
+\n
+\nPer maggiore sicurezza e privacy, è consigliabile usare i client di Matrix che supportano la crittografia.</string>
+    <string name="device_manager_signout_all_other_sessions">Disconnetti da tutte le altre sessioni</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Questa sessione non supporta la crittografia, perciò non può essere verificata.</string>
+    <string name="voice_broadcast_live_broadcast">Trasmissione in diretta</string>
+    <string name="settings_nightly_build_update">Ottieni la build più recente (nota: potresti avere problemi nell\'accesso)</string>
+    <string name="settings_nightly_build">Nightly build</string>
+    <string name="notice_voice_broadcast_ended_by_you">Hai terminato una trasmissione vocale.</string>
+    <string name="notice_voice_broadcast_ended">%1$s ha terminato una trasmissione vocale.</string>
+    <string name="stop_voice_broadcast_content">Vuoi davvero fermare la tua trasmissione in diretta\? Verrà terminata la trasmissione e la registrazione completa sarà disponibile nella stanza.</string>
+    <string name="stop_voice_broadcast_dialog_title">Fermare la trasmissione in diretta\?</string>
+    <string name="action_stop">Sì, ferma</string>
+    <string name="set_link_edit">Modifica collegamento</string>
+    <string name="set_link_create">Crea un collegamento</string>
+    <string name="set_link_link">Collegamento</string>
+    <string name="set_link_text">Testo</string>
+    <string name="rich_text_editor_link">Imposta collegamento</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-it/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-it/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-it/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-it/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-iw/strings.xml b/library/ui-strings/src/main/res/values-iw/strings.xml
similarity index 99%
rename from vector/src/main/res/values-iw/strings.xml
rename to library/ui-strings/src/main/res/values-iw/strings.xml
index be02a1e772..b9f81ae446 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/library/ui-strings/src/main/res/values-iw/strings.xml
@@ -114,7 +114,6 @@
     <string name="send_bug_report_include_key_share_history">שלח היסטוריית בקשות לשיתוף מפתח</string>
     <string name="send_bug_report_include_crash_logs">שלח יומני תקלות</string>
     <string name="send_bug_report_include_logs">שלח יומנים</string>
-    <string name="groups_header">קהילות</string>
     <string name="login_error_limit_exceeded">יותר מדי בקשות נשלחו</string>
     <string name="login_error_not_json">לא מכיל JSON חוקי</string>
     <string name="login_error_bad_json">JSON פגום</string>
@@ -125,7 +124,6 @@
     <string name="login_error_invalid_home_server">אנא הכנס כתובת תקינה</string>
     <string name="auth_accept_policies">אנא עיין וקבל את המדיניות של שרת בית זה:</string>
     <string name="auth_reset_password_error_unauthorized">אימות כתובת הדוא\"ל נכשל: ודא שלחצת על הקישור בדוא\"ל</string>
-    <string name="auth_reset_password_missing_email">יש להזין את כתובת הדוא\"ל המקושרת לחשבונך.</string>
     <string name="auth_recaptcha_message">שרת הבית רוצה לוודא שאתה לא רובוט</string>
     <string name="auth_forgot_password">שכחת סיסמה\?</string>
     <string name="auth_msisdn_already_defined">מספר הטלפון הזה כבר קיים ומעודכן במערכת.</string>
@@ -544,7 +542,7 @@
     <string name="encryption_export_room_keys">יצא מפתחות חדר</string>
     <string name="encryption_export_e2e_room_keys">ייצא מפתחות חדר E2E</string>
     <string name="encryption_information_device_key">מזהה מפתח</string>
-    <string name="encryption_information_device_id">מזהה מושב</string>
+    <string name="device_manager_session_details_session_id">מזהה מושב</string>
     <string name="encryption_information_device_name">שם ציבורי</string>
     <string name="encryption_information_decryption_error">שגיאת פענוח</string>
     <string name="settings_theme">ערכת נושא</string>
@@ -863,9 +861,7 @@
     <string name="login_a11y_choose_other">בחר שרת בית מותאם אישית</string>
     <string name="login_a11y_choose_modular">בחר שירותי מטריקס אלמנט</string>
     <string name="login_a11y_choose_matrix_org">בחר matrix.org</string>
-    <string name="login_signup_cancel_confirmation_content">חשבונך טרם נוצר.
-\n
-\nלהפסיק את תהליך ההרשמה\?</string>
+    <string name="login_signup_cancel_confirmation_content">חשבונך טרם נוצר. להפסיק את תהליך ההרשמה\?</string>
     <string name="login_signup_cancel_confirmation_title">אזהרה</string>
     <string name="login_signup_error_user_in_use">שם המשתמש הזה תפוס</string>
     <string name="login_signup_submit">הבא</string>
@@ -1155,7 +1151,6 @@
     <string name="room_preview_not_found">בשלב זה אין גישה לחדר זה.
 \nנסה שוב מאוחר יותר, או בקש ממנהל החדר לבדוק אם יש לך גישה.</string>
     <string name="room_preview_no_preview">לא ניתן להציג תצוגה מקדימה של חדר זה</string>
-    <string name="group_all_communities">כל הקהילות</string>
     <string name="please_wait">אנא המתינו…</string>
     <string name="change_room_directory_network">שנה רשת</string>
     <string name="action_change">שנה</string>
@@ -1769,8 +1764,6 @@
     <string name="event_status_sent_message">הודעה נשלחה</string>
     <string name="initial_sync_start_importing_account_data">סנכרון ראשוני:
 \nייבוא נתוני חשבון</string>
-    <string name="initial_sync_start_importing_account_groups">סנכרון ראשוני:
-\nייבוא קהילות</string>
     <string name="initial_sync_start_importing_account_left_rooms">סנכרון ראשוני:
 \nייבוא חדרים עזובים</string>
     <string name="initial_sync_start_importing_account_invited_rooms">סנכרון ראשוני:
@@ -2309,7 +2302,7 @@
     <string name="ftue_auth_use_case_option_three">קהילות</string>
     <string name="ftue_auth_use_case_option_two">צוותים</string>
     <string name="ftue_auth_use_case_option_one">חברים ומשפחה</string>
-    <string name="ftue_auth_use_case_subtitle">נעזור לך להתחבר.</string>
+    <string name="ftue_auth_use_case_subtitle">נעזור לך להתחבר</string>
     <string name="ftue_auth_use_case_title">עם מי תדברו הכי הרבה\?</string>
     <string name="ftue_auth_carousel_encrypted_body">מוצפן מקצה לקצה ואין צורך במספר טלפון. ללא פרסומות או עיבוד נתונים.</string>
     <string name="ftue_auth_carousel_control_body">בחר היכן השיחות שלך נשמרות, נותן לך שליטה ועצמאות. מחובר דרך Matrix.</string>
@@ -2513,4 +2506,4 @@
 \nזה יהיה מעבר חד פעמי שכן שרשורים הם כעת חלק ממפרט Matrix.</string>
     <string name="screen_sharing_notification_title">שיתוף מסך של ${app_name}</string>
     <string name="screen_sharing_notification_description">המסך משותף כרגע</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-iw/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-iw/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-iw/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-iw/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-ja/strings.xml b/library/ui-strings/src/main/res/values-ja/strings.xml
similarity index 95%
rename from vector/src/main/res/values-ja/strings.xml
rename to library/ui-strings/src/main/res/values-ja/strings.xml
index 0aef5124c9..11ab6ee857 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/library/ui-strings/src/main/res/values-ja/strings.xml
@@ -197,7 +197,7 @@
     <string name="room_settings_labs_warning_message">これらは予期しない不具合が生じるかもしれない実験的機能です。慎重に使用してください。</string>
     <string name="room_settings_set_main_address">メインアドレスとして設定</string>
     <string name="room_settings_unset_main_address">メインアドレスとしての設定を解除</string>
-    <string name="encryption_information_device_id">セッションID</string>
+    <string name="device_manager_session_details_session_id">セッションID</string>
     <string name="font_size">文字の大きさ</string>
     <string name="tiny">とても小さい</string>
     <string name="small">小さい</string>
@@ -218,7 +218,6 @@
     <string name="logout">サインアウト</string>
     <string name="auth_submit">送信</string>
     <string name="auth_recaptcha_message">このホームサーバーは、あなたがロボットではないことの確認を求めています</string>
-    <string name="auth_reset_password_missing_email">アカウントに登録されたメールアドレスの入力が必要です。</string>
     <string name="auth_reset_password_error_unauthorized">メールアドレスの認証に失敗しました：電子メールのリンクをクリックしたことを確認してください</string>
     <string name="login_error_bad_json">不正な形式のJSON</string>
     <string name="login_error_not_json">有効なJSONを含んでいませんでした</string>
@@ -334,7 +333,6 @@
     <string name="notification_noisy">音量大</string>
     <string name="encrypted_message">暗号化されたメッセージ</string>
     <string name="loading">読み込んでいます…</string>
-    <string name="groups_header">コミュニティー</string>
     <string name="start_voice_call_prompt_msg">音声通話を開始してよろしいですか？</string>
     <string name="start_video_call_prompt_msg">ビデオ通話を開始してよろしいですか？</string>
     <string name="room_participants_ban_prompt_msg">ユーザーをブロックすると、ユーザーはこのルームから追放され、二度と参加できなくなります。</string>
@@ -500,7 +498,6 @@
     <string name="create_new_room">新しいルームを作成</string>
     <string name="action_change">変更</string>
     <string name="change_room_directory_network">ネットワークを変更</string>
-    <string name="group_all_communities">全てのコミュニティー</string>
     <string name="fab_menu_create_room">ルーム</string>
     <string name="fab_menu_create_chat">ダイレクトメッセージ</string>
     <string name="create_room_action_create">作成</string>
@@ -899,8 +896,6 @@
     <string name="event_status_sent_message">メッセージを送りました</string>
     <string name="initial_sync_start_importing_account_data">初期同期：
 \nアカウントデータをインポートしています</string>
-    <string name="initial_sync_start_importing_account_groups">初期同期：
-\nコミュニティーをインポートしています</string>
     <string name="initial_sync_start_importing_account_rooms">初期同期：
 \nルームをインポートしています</string>
     <string name="initial_sync_start_importing_account_crypto">初期同期：
@@ -992,7 +987,7 @@
     <string name="settings_troubleshoot_test_push_loop_title">プッシュ通知のテスト</string>
     <string name="settings_troubleshoot_test_token_registration_failed">FCMトークンのホームサーバーへの登録に失敗しました:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_token_registration_success">FCMトークンのホームサーバーへの登録が成功しました。</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCMトークンがホームサーバーに登録されました。</string>
     <string name="settings_troubleshoot_test_token_registration_title">トークンの登録</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">アカウントを追加</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
@@ -1238,7 +1233,7 @@
     <string name="login_terms_title">続行するには利用規約を承認してください</string>
     <string name="error_terms_not_accepted">ホームサーバーの利用規約を承認したら、再試行してください。</string>
     <string name="login_signup_submit">次に</string>
-    <string name="login_msisdn_confirm_submit">次に</string>
+    <string name="login_msisdn_confirm_submit">次へ</string>
     <string name="login_set_msisdn_submit">次に</string>
     <string name="login_set_email_submit">次に</string>
     <string name="login_reset_password_submit">次に</string>
@@ -1287,9 +1282,9 @@
     <string name="send_suggestion_failed">提案の送信に失敗しました(%s)</string>
     <string name="send_suggestion_sent">ありがとうございます、提案は正常に送信されました</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">トークンの登録</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_display_name">アプリケーションの表示名:</string>
+    <string name="push_gateway_item_app_id">App ID:</string>
+    <string name="push_gateway_item_push_key">Push Key:</string>
     <string name="settings_push_gateway_no_pushers">登録されたプッシュゲートウェイはありません</string>
     <string name="settings_push_rules_no_rules">プッシュ通知に関するルールが定義されていません</string>
     <string name="settings_push_rules">プッシュ通知に関するルール</string>
@@ -1388,8 +1383,8 @@
     <string name="settings_discovery_consent_action_revoke">同意を撤回</string>
     <string name="settings_discovery_consent_notice_on">あなたの連絡先から他のユーザーを発見するために、メールアドレスや電話番号をこのIDサーバーに送信することに同意しています。</string>
     <string name="settings_discovery_consent_title">メールと電話番号を送信</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">%sに確認メールを送りました。まず、メールを確認してリンクをクリックしてください</string>
-    <string name="settings_discovery_confirm_mail">%sに確認のためのメールを送りました。メールにて確認リンクをクリックしてください</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">%sにメールを送りました。メールを確認してリンクをクリックしてください</string>
+    <string name="settings_discovery_confirm_mail">%sにメールを送りました。メールの確認リンクをクリックしてください</string>
     <string name="settings_discovery_msisdn_title">発見可能な電話番号</string>
     <string name="settings_discovery_disconnect_identity_server_info">IDサーバーとの接続を解除すると、他のユーザーによって発見されなくなり、また、メールアドレスや電話で他のユーザーを招待することができなくなります。</string>
     <string name="settings_discovery_no_msisdn">電話番号を追加すると、発見可能に設定する電話番号を選択できるようになります。</string>
@@ -1417,7 +1412,7 @@
     <string name="send_suggestion">提案する</string>
     <string name="push_gateway_item_format">フォーマット:</string>
     <string name="push_gateway_item_url">URL:</string>
-    <string name="push_gateway_item_device_name">セッション名:</string>
+    <string name="push_gateway_item_device_name">セッションの表示名:</string>
     <string name="verify_not_me_self_verification">以下のうちいずれかが流出、あるいはハッキングされた恐れがあります。
 \n
 \n- あなたのパスワード
@@ -1701,7 +1696,7 @@
     <string name="room_message_placeholder">メッセージを送る…</string>
     <string name="error_file_too_big_simple">このファイルは大きすぎてアップロードできません。</string>
     <string name="identity_server_consent_dialog_content_question">この情報の送信に同意しますか？</string>
-    <string name="identity_server_consent_dialog_content_3">連絡先を発見するには、連絡先のデータ（電話番号や電子メール）をあなたのIDサーバーに送信する必要があります。プライバシーの保護のため、データは送信前にハッシュ化されます。</string>
+    <string name="identity_server_consent_dialog_content_3">連絡先を発見するには、連絡先のデータ（メールアドレスと電話番号）をあなたのIDサーバーに送信する必要があります。プライバシーの保護のため、データは送信前にハッシュ化されます。</string>
     <string name="identity_server_consent_dialog_title_2">メールアドレスと電話番号を%sに送信</string>
     <string name="settings_discovery_no_policy_provided">このIDサーバーは運営方針を提供していません</string>
     <string name="settings_discovery_hide_identity_server_policy_title">IDサーバーの運営方針を隠す</string>
@@ -2344,7 +2339,6 @@
     <string name="ftue_profile_picture_title">プロフィール画像を追加</string>
     <string name="ftue_display_name_entry_footer">これは後から変更できます</string>
     <string name="ftue_display_name_entry_title">表示名</string>
-    <string name="ftue_display_name_subtitle">メッセージを送信する際に表示されます。</string>
     <string name="a11y_location_share_option_pinned_icon">この位置情報を共有</string>
     <string name="location_share_option_pinned">この位置情報を共有</string>
     <string name="a11y_location_share_option_user_live_icon">位置情報（ライブ）を共有</string>
@@ -2365,4 +2359,118 @@
     <string name="beta_title_bottom_sheet_action">ベータ版</string>
     <string name="beta">ベータ版</string>
     <string name="action_try_it_out">試す</string>
-</resources>
+    <string name="settings_presence_user_always_appears_offline">オフラインモード</string>
+    <string name="invites_empty_title">新着はありません。</string>
+    <string name="initial_sync_request_reason_unignored_users">- ユーザーの無視が解除されました</string>
+    <string name="onboarding_new_app_layout_button_try">試してみる</string>
+    <string name="onboarding_new_app_layout_feedback_message">右上をタップするとフィードバックを送信するオプションが表示されます。</string>
+    <string name="onboarding_new_app_layout_feedback_title">フィードバックを送信</string>
+    <string name="onboarding_new_app_layout_spaces_message">右下からスペースにより早く簡単にアクセスできます。</string>
+    <string name="onboarding_new_app_layout_spaces_title">スペースにアクセス</string>
+    <string name="onboarding_new_app_layout_welcome_message">${app_name}をシンプルにするために、タブはオプションになりました。右上のメニューから管理できます。</string>
+    <string name="onboarding_new_app_layout_welcome_title">新しいレイアウトにようこそ！</string>
+    <string name="settings_autoplay_animated_images_title">アニメーション画像を自動再生</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_failed">エンドポイントのホームサーバーへの登録に失敗しました:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_success">エンドポイントがホームサーバーに登録されました。</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_title">エンドポイントの登録</string>
+    <string name="grant_permission">権限を与える</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name}は通知の表示に権限が必要です。
+\n権限を与えてください。</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="other">%1$sと他%2$d名</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$sと%2$s</string>
+    <string name="threads_labs_enable_notice_message">ホームサーバーがサポートしていないため、スレッド機能は不安定かもしれません。スレッドのメッセージは安定して表示されないおそれがあります。%sスレッド機能を有効にしてよろしいですか？</string>
+    <string name="threads_labs_enable_notice_title">スレッド（ベータ版）</string>
+    <string name="threads_beta_enable_notice_message">スレッドを用いると、会話のテーマを保ったり、会話を追跡したりするのが容易になります。%sスレッドを有効にするとアプリケーションが再起動します。再起動には時間がかかる可能性があります。</string>
+    <string name="threads_beta_enable_notice_title">スレッド（ベータ版）</string>
+    <string name="permissions_rationale_msg_notification">${app_name}は通知を表示するために許可を必要としています。通知にはメッセージや招待などが表示されます。
+\n
+\n通知を表示するには、次のポップアップでアクセスを許可してください。</string>
+    <string name="auth_reset_password_error_unverified">メールアドレスが認証されていません。メールボックスを確認してください</string>
+    <string name="call_stop_screen_sharing">画面共有を停止</string>
+    <string name="call_start_screen_sharing">画面を共有</string>
+    <string name="invites_title">招待</string>
+    <string name="device_manager_push_notifications_title">プッシュ通知</string>
+    <string name="device_manager_session_rename_edit_hint">セッション名</string>
+    <string name="device_manager_session_rename">セッションを改名</string>
+    <string name="device_manager_session_details_device_ip_address">IPアドレス</string>
+    <string name="device_manager_session_details_device_operating_system">オペレーティングシステム</string>
+    <string name="device_manager_session_details_device_model">形式</string>
+    <string name="device_manager_session_details_device_browser">ブラウザー</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">バージョン</string>
+    <string name="device_manager_session_details_application_name">名称</string>
+    <string name="device_manager_session_details_application">アプリケーション</string>
+    <string name="ftue_personalize_skip_this_step">このステップをスキップ</string>
+    <string name="ftue_personalize_complete_title">問題ありません！</string>
+    <string name="ftue_personalize_lets_go">進みましょう</string>
+    <string name="ftue_auth_login_username_entry">ユーザー名 / メールアドレス / 電話番号</string>
+    <string name="ftue_auth_captcha_title">あなたは人間ですか？</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">%sに送信された手順に従ってください</string>
+    <string name="ftue_auth_password_reset_confirmation">パスワードを再設定</string>
+    <string name="ftue_auth_forgot_password">パスワードを忘れた場合</string>
+    <string name="ftue_auth_email_resend_email">電子メールを再送信</string>
+    <string name="ftue_auth_email_verification_footer">電子メールが届いていませんか？</string>
+    <string name="ftue_auth_email_verification_subtitle">%sに送信された手順に従ってください</string>
+    <string name="ftue_auth_email_verification_title">メールアドレスを認証</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">コードを再送信</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">コードが%sに送信されました</string>
+    <string name="ftue_auth_phone_confirmation_title">電話番号を確認してください</string>
+    <string name="ftue_auth_sign_out_all_devices">全ての端末からサインアウト</string>
+    <string name="ftue_auth_reset_password">パスワードを再設定</string>
+    <string name="ftue_auth_new_password_subtitle">パスワードは8文字以上に設定してください。</string>
+    <string name="ftue_auth_new_password_title">パスワードを選択</string>
+    <string name="ftue_auth_new_password_entry_title">新しいパスワード</string>
+    <string name="ftue_auth_reset_password_breaker_title">電子メールを確認してください。</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%sは認証リンクを送信します</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">確認コード</string>
+    <string name="ftue_auth_phone_entry_title">電話番号</string>
+    <string name="ftue_auth_phone_subtitle">%sはアカウントの認証が必要です</string>
+    <string name="ftue_auth_phone_title">電話番号を入力してください</string>
+    <string name="ftue_auth_email_entry_title">メールアドレス</string>
+    <string name="ftue_auth_email_subtitle">%sはアカウントの認証が必要です</string>
+    <string name="labs_enable_rich_text_editor_title">リッチテキストエディターを有効にする</string>
+    <string name="labs_enable_deferred_dm_summary">最初のメッセージを送信する際にダイレクトメッセージを作成</string>
+    <string name="labs_enable_deferred_dm_title">遅延DMを有効にする</string>
+    <string name="space_list_empty_title">スペースがありません。</string>
+    <string name="labs_enable_new_app_layout_title">新しいレイアウトを有効にする</string>
+    <string name="home_layout_preferences_sort_activity">アクティビティー順</string>
+    <string name="home_layout_preferences_sort_name">アルファベット順</string>
+    <string name="home_layout_preferences_sort_by">並び替え</string>
+    <string name="home_layout_preferences_filters">フィルターを表示</string>
+    <string name="home_layout_preferences">レイアウトの設定</string>
+    <string name="action_got_it">了解</string>
+    <string name="action_next">次へ</string>
+    <string name="action_learn_more">詳しく知る</string>
+    <string name="time_unit_second_short">秒</string>
+    <string name="time_unit_minute_short">分</string>
+    <string name="time_unit_hour_short">時</string>
+    <string name="initial_sync_request_content">${app_name}は以下の理由で、キャッシュを消去して最新の状態にする必要があります。
+\n%s
+\n
+\nアプリケーションが再起動します。再起動には時間がかかる可能性があります。</string>
+    <string name="initial_sync_request_title">初期同期のリクエスト</string>
+    <string name="a11y_collapse_space_children">%sの子スペースを折りたたむ</string>
+    <string name="a11y_expand_space_children">%sの子スペースを展開</string>
+    <string name="explore_rooms">ルームを探索</string>
+    <string name="change_space">スペースを変更</string>
+    <string name="create_room">ルームを作成</string>
+    <string name="start_chat">チャットを開始</string>
+    <string name="all_chats">全ての会話</string>
+    <string name="home_empty_no_rooms_title">${app_name}にようこそ、
+\n%s。</string>
+    <string name="device_manager_learn_more_sessions_verified_title">認証済のセッション</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">QRコードでサインイン</string>
+    <string name="labs_enable_session_manager_title">新しいセッションマネージャーを有効にする</string>
+    <string name="qr_code_login_header_show_qr_code_title">QRコードでサインイン</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="qr_code_login_header_failed_other_description">リクエストが失敗しました。</string>
+    <string name="qr_code_login_scan_qr_code_button">QRコードをスキャン</string>
+    <string name="login_scan_qr_code">QRコードをスキャン</string>
+    <string name="qr_code_login_header_scan_qr_code_title">QRコードをスキャン</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">QRコードが不正です。</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ja/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-ja/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-ja/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-ja/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-kaa/strings.xml b/library/ui-strings/src/main/res/values-kaa/strings.xml
similarity index 100%
rename from vector/src/main/res/values-kaa/strings.xml
rename to library/ui-strings/src/main/res/values-kaa/strings.xml
diff --git a/vector/src/main/res/values-kab/strings.xml b/library/ui-strings/src/main/res/values-kab/strings.xml
similarity index 99%
rename from vector/src/main/res/values-kab/strings.xml
rename to library/ui-strings/src/main/res/values-kab/strings.xml
index 15b96813c8..353fb99f53 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/library/ui-strings/src/main/res/values-kab/strings.xml
@@ -103,8 +103,6 @@
 \nAktar n texxamin iɣer tettwanecdeḍ</string>
     <string name="initial_sync_start_importing_account_left_rooms">Amtawi n tazwara:
 \nAktar n texxamin i teǧǧiḍ</string>
-    <string name="initial_sync_start_importing_account_groups">Amtawi n tazwara:
-\nAktar n tmezdagnutin</string>
     <string name="initial_sync_start_importing_account_data">Amtawi n tazwara:
 \nAktar n yisefka n umiḍan</string>
     <string name="event_status_sending_message">Tuzzna n yizen…</string>
@@ -208,7 +206,6 @@
     <string name="system_alerts_header">Ilɣa n unagraw</string>
     <string name="no_result_placeholder">Ulac igmad</string>
     <string name="rooms_header">Tixxamin</string>
-    <string name="groups_header">Tamɣiwnin</string>
     <string name="send_bug_report_include_logs">Azen iɣmisen</string>
     <string name="join_room">Rnu ɣer texxamt</string>
     <string name="username">Isem n useqdac</string>
@@ -294,7 +291,7 @@
     <string name="room_settings_category_advanced_title">Talqayt</string>
     <string name="room_settings_labs_pref_title">Tinarimin</string>
     <string name="settings_theme">Asentel</string>
-    <string name="encryption_information_device_id">Asulay n tqimit</string>
+    <string name="device_manager_session_details_session_id">Asulay n tqimit</string>
     <string name="encryption_information_device_key">Tasarut n tɣimit</string>
     <string name="encryption_export_e2e_room_keys">Sifeḍ tisura n texxamt E2E</string>
     <string name="encryption_export_room_keys">Sifeḍ tisura n texxamt</string>
@@ -547,7 +544,6 @@
     <string name="auth_email_already_defined">Tansa-a n yimayl tettuseqdec yakan.</string>
     <string name="auth_forgot_password">Tettuḍ awal uffir\?</string>
     <string name="auth_recaptcha_message">Aqeddac-a agejdan yesra ad iẓer ma mačči d aṛubut i telliḍ</string>
-    <string name="auth_reset_password_missing_email">Tansa n yimayl i icudden ɣer umiḍan-ik·im ilaq ad tettwasekcem.</string>
     <string name="auth_accept_policies">Ttxil-k·m senqed syen qbel tisertiyin n uqeddac-a agejdan:</string>
     <string name="login_error_invalid_home_server">Ttxil-k·m sekcem URL ameɣtu</string>
     <string name="login_error_no_homeserver_found">Tagi mačči d tansa n uqeddac n Matrix ameɣtu</string>
@@ -710,7 +706,6 @@
     <string name="action_agree">Qbel</string>
     <string name="create_new_room">Rnu taxxamt tamaynut</string>
     <string name="change_room_directory_network">Snifel azeṭṭa</string>
-    <string name="group_all_communities">Meṛṛa timɣiwnin</string>
     <string name="create_room_action_create">RNU</string>
     <string name="create_room_name_hint">Isem</string>
     <string name="create_room_public_description">Yal yiwen yezmer ad yernu ɣer texxamt-a</string>
diff --git a/vector/src/main/res/values-kab/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-kab/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-kab/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-kab/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-ko/strings.xml b/library/ui-strings/src/main/res/values-ko/strings.xml
similarity index 96%
rename from vector/src/main/res/values-ko/strings.xml
rename to library/ui-strings/src/main/res/values-ko/strings.xml
index 5d07800726..11e870f581 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/library/ui-strings/src/main/res/values-ko/strings.xml
@@ -47,13 +47,12 @@
     <string name="initial_sync_start_importing_account_rooms">초기 동기화:
 \n방 가져오는 중</string>
     <string name="initial_sync_start_importing_account_joined_rooms">초기 동기화:
-\n들어간 방 가져오는 중</string>
+\n대화 가져오는 중
+\n많은 방에 참여하신 경우, 오래 걸릴 수 있습니다</string>
     <string name="initial_sync_start_importing_account_invited_rooms">초기 동기화:
 \n초대받은 방 가져오는 중</string>
     <string name="initial_sync_start_importing_account_left_rooms">초기 동기화:
 \n떠난 방 가져오는 중</string>
-    <string name="initial_sync_start_importing_account_groups">초기 동기화:
-\n커뮤니티 가져오는 중</string>
     <string name="initial_sync_start_importing_account_data">초기 동기화:
 \n계정 데이터 가져오는 중</string>
     <string name="event_status_sending_message">메시지 보내는 중…</string>
@@ -133,7 +132,6 @@
     <string name="done">완료</string>
     <string name="action_sign_out_confirmation_simple">정말 로그아웃하시겠습니까\?</string>
     <string name="action_mark_room_read">읽음으로 표시</string>
-    <string name="groups_header">커뮤니티</string>
     <string name="send_bug_report_app_crashed">최근에 애플리케이션이 충돌한 것 같습니다. 충돌 보고서를 열까요\?</string>
     <string name="username">사용자 이름</string>
     <string name="option_send_voice">음성 보내기</string>
@@ -165,7 +163,6 @@
     <string name="auth_login_sso">통합 인증으로 로그인</string>
     <string name="auth_email_already_defined">이 이메일 주소는 이미 정의되었습니다.</string>
     <string name="auth_recaptcha_message">이 홈서버는 당신이 로봇인지 아닌 지를 확인하고 싶습니다</string>
-    <string name="auth_reset_password_missing_email">계정에 연결된 이메일 주소를 입력해야 합니다.</string>
     <string name="auth_reset_password_error_unauthorized">이메일 주소를 확인할 수 없습니다: 이메일에 있는 링크를 클릭했는 지 확인하세요</string>
     <string name="auth_accept_policies">이 홈서버의 규칙을 숙지한 후 수락하세요:</string>
     <string name="login_error_invalid_home_server">올바른 URL을 입력하세요</string>
@@ -435,7 +432,7 @@
     <string name="settings_theme">테마</string>
     <string name="encryption_information_decryption_error">암호 복호화 오류</string>
     <string name="encryption_information_device_name">공개 이름</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="device_manager_session_details_session_id">ID</string>
     <string name="encryption_information_device_key">기기 키</string>
     <string name="encryption_export_e2e_room_keys">종단간 암호화 방 키 내보내기</string>
     <string name="encryption_export_room_keys">방 키 내보내기</string>
@@ -700,7 +697,6 @@
     <string name="action_change">변경</string>
     <string name="change_room_directory_network">네트워크 변경</string>
     <string name="please_wait">기다려주세요…</string>
-    <string name="group_all_communities">모든 커뮤니티</string>
     <string name="room_preview_no_preview">이 방은 미리 볼 수 없습니다</string>
     <string name="fab_menu_create_room">방</string>
     <string name="fab_menu_create_chat">다이렉트 메시지</string>
@@ -963,4 +959,39 @@
     <string name="notice_room_name_changed_by_you">방 이름을 바꾸었습니다: %1$s</string>
     <string name="notice_room_avatar_changed_by_you">방 사진을 바꾸었습니다</string>
     <string name="notice_room_avatar_changed">%1$s님이 방 사진을 바꾸었습니다</string>
-</resources>
+    <string name="initial_sync_request_title">초기 동기화 요청</string>
+    <string name="initial_sync_start_downloading">초기 동기화:
+\n데이터 내려받는 중…</string>
+    <string name="initial_sync_start_server_computing">초기 동기화:
+\n서버 응답을 기다리는 중…</string>
+    <string name="room_displayname_empty_room_was">빈 방 (기존 %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="other">%1$s님, %2$s님, %3$s님과 %4$d님 등</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s님, %2$s님, %3$s님과 %4$s님</string>
+    <string name="room_displayname_3_members">%1$s님, %2$s님과 %3$s님</string>
+    <string name="room_error_access_unauthorized">이 방에 참여할 수 없습니다</string>
+    <string name="explore_rooms">방 둘러보기</string>
+    <string name="create_room">방 만들기</string>
+    <string name="start_chat">채팅 시작</string>
+    <string name="all_chats">모든 채팅</string>
+    <string name="power_level_moderator">중재자</string>
+    <string name="power_level_admin">관리자</string>
+    <string name="notice_widget_modified_by_you">%1$s위젯을 수정했습니다</string>
+    <string name="notice_widget_modified">%1$s님이 %2$s위젯을 수정했습니다</string>
+    <string name="notice_widget_removed_by_you">%1$s위젯을 삭제했습니다</string>
+    <string name="notice_widget_removed">%1$s님이 %2$s위젯을 삭제했습니다</string>
+    <string name="notice_widget_added_by_you">%1$s위젯을 추가했습니다</string>
+    <string name="notice_widget_added">%1$s님이 %2$s위젯을 추가했습니다</string>
+    <string name="notice_room_third_party_registered_invite_by_you">%1$s님의 초대를 수락했습니다</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">%1$s님 초대를 취소했습니다</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s님이 %2$s님 초대를 취소했습니다</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">%1$s님에게 방에 참가하라고 보낸 초대를 취소했습니다</string>
+    <string name="notice_direct_room_third_party_invite_by_you">%1$s님을 초대했습니다</string>
+    <string name="notice_direct_room_third_party_invite">%1$s님이 %2$s님을 초대했습니다</string>
+    <string name="notice_room_third_party_invite_by_you">%1$s님에게 방 초대를 보냈습니다</string>
+    <string name="notice_room_avatar_removed_by_you">방 아바타를 삭제했습니다</string>
+    <string name="notice_room_avatar_removed">%1$s님이 방 아바타를 삭제했습니다</string>
+    <string name="notice_room_topic_removed_by_you">방 주제를 삭제했습니다</string>
+    <string name="notice_room_name_removed_by_you">방 이름을 삭제했습니다</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ko/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-ko/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-ko/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-ko/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-ku/strings.xml b/library/ui-strings/src/main/res/values-ku/strings.xml
similarity index 100%
rename from vector/src/main/res/values-ku/strings.xml
rename to library/ui-strings/src/main/res/values-ku/strings.xml
diff --git a/vector/src/main/res/values-ku/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-ku/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-ku/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-ku/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-lo/strings.xml b/library/ui-strings/src/main/res/values-lo/strings.xml
similarity index 99%
rename from vector/src/main/res/values-lo/strings.xml
rename to library/ui-strings/src/main/res/values-lo/strings.xml
index 5af621359f..a92adb0225 100644
--- a/vector/src/main/res/values-lo/strings.xml
+++ b/library/ui-strings/src/main/res/values-lo/strings.xml
@@ -259,7 +259,6 @@
     <string name="login_error_invalid_home_server">ກະລຸນາໃສ່ URL ທີ່ຖືກຕ້ອງ</string>
     <string name="auth_accept_policies">ກະລຸນາກວດເບິ່ງ ແລະຍອມຮັບນະໂຍບາຍຂອງ homeserver ນີ້:</string>
     <string name="auth_reset_password_error_unauthorized">ການກວດສອບທີ່ຢູ່ອີເມວບໍ່ສຳເລັດ: ໃຫ້ແນ່ໃຈວ່າທ່ານໄດ້ກົດໃສ່ການເຊື່ອມຕໍ່ໃນອີເມວ</string>
-    <string name="auth_reset_password_missing_email">ຕ້ອງໃສ່ອິເມວທີ່ເຊື່ອມຕໍ່ກັບບັນຊີຂອງທ່ານ.</string>
     <string name="auth_recaptcha_message">homeserver ນີ້ຕ້ອງການໃຫ້ແນ່ໃຈວ່າທ່ານບໍ່ແມ່ນຫຸ່ນຍົນ</string>
     <string name="auth_forgot_password">ລືມລະຫັດຜ່ານ\?</string>
     <string name="auth_msisdn_already_defined">ເບີໂທລະສັບນີ້ຖືກກໍານົດໄວ້ແລ້ວ.</string>
@@ -320,7 +319,6 @@
     <string name="send_bug_report_include_crash_logs">ສົ່ງບັນທຶກການຂັດຂ້ອງ</string>
     <string name="send_bug_report_include_logs">ສົ່ງບັນທຶກ</string>
     <string name="spaces_header">ພື້ນທີ່</string>
-    <string name="groups_header">ຊຸມຊົນ</string>
     <string name="settings_room_directory_show_all_rooms_summary">ສະແດງໃຫ້ເຫັນຫ້ອງທັງຫມົດໃນລະບົບຫ້ອງ, ລວມທັງຫ້ອງທີ່ມີເນື້ອຫາຊັດເຈນ.</string>
     <string name="settings_room_directory_show_all_rooms">ສະແດງຫ້ອງທີ່ມີເນື້ອຫາບໍ່ຈະແຈ້ງ</string>
     <string name="rooms_header">ຫ້ອງ</string>
@@ -515,8 +513,6 @@
     <string name="event_status_sent_message">ຂໍ້ຄວາມຖືກສົ່ງ</string>
     <string name="initial_sync_start_importing_account_data">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
 \nການນໍາເຂົ້າຂໍ້ມູນບັນຊີ</string>
-    <string name="initial_sync_start_importing_account_groups">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
-\nຊຸມຊົນນໍາເຂົ້າ</string>
     <string name="initial_sync_start_importing_account_left_rooms">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
 \nການນໍາເຂົ້າຫ້ອງຊ້າຍ</string>
     <string name="initial_sync_start_importing_account_invited_rooms">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
@@ -737,7 +733,6 @@
     <string name="room_preview_not_found">ຫ້ອງນີ້ບໍ່ສາມາດເຂົ້າເຖິງໄດ້ໃນເວລານີ້.
 \nລອງໃໝ່ໃນພາຍຫຼັງ, ຫຼືຖາມຜູ້ເບິ່ງແຍງຫ້ອງເພື່ອກວດເບິ່ງວ່າທ່ານມີການເຂົ້າເຖິງຫຼືບໍ່.</string>
     <string name="room_preview_no_preview">ຫ້ອງນີ້ບໍ່ສາມາດເບິ່ງຕົວຢ່າງໄດ້</string>
-    <string name="group_all_communities">ຊຸມຊົນທັງໝົດ</string>
     <string name="please_wait">ກະລຸນາລໍຖ້າ…</string>
     <string name="change_room_directory_network">ປ່ຽນເຄືອຂ່າຍ</string>
     <string name="error_no_network">ບໍ່ມີເຄືອຂ່າຍ. ກະລຸນາກວດເບິ່ງການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງທ່ານ.</string>
@@ -914,7 +909,7 @@
     <string name="encryption_export_room_keys">ສົ່ງອອກກະແຈຫ້ອງ</string>
     <string name="encryption_export_e2e_room_keys">ສົ່ງອອກກະແຈຫ້ອງ E2E</string>
     <string name="encryption_information_device_key">ລະຫັດລະບົບ</string>
-    <string name="encryption_information_device_id">ID ລະບົບ</string>
+    <string name="device_manager_session_details_session_id">ID ລະບົບ</string>
     <string name="encryption_information_device_name">ຊື່ສາທາລະນະ</string>
     <string name="encryption_information_decryption_error">ການຖອດລະຫັດຜິດພາດ</string>
     <string name="settings_theme">ຫົວຂໍ້</string>
@@ -2243,7 +2238,6 @@
     <string name="direct_room_profile_section_more_leave">ອອກໄປ</string>
     <string name="room_profile_section_more_leave">ອອກຈາກຫ້ອງ</string>
     <string name="room_profile_section_more_uploads">ອັບໂຫຼດ</string>
-    <string name="ftue_display_name_subtitle">ສິ່ງນີ້ຈະຖືກສະແດງເມື່ອທ່ານສົ່ງຂໍ້ຄວາມ.</string>
     <string name="ftue_display_name_title">ເລືອກຊື່ທີ່ຈະສະແດງ</string>
     <string name="ftue_account_created_subtitle">ບັນຊີຂອງທ່ານ%sໄດ້ຖືກສ້າງຂື້ນແລ້ວ.</string>
     <string name="ftue_account_created_congratulations_title">ຊົມເຊີຍ!</string>
diff --git a/vector/src/main/res/values-lo/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-lo/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-lo/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-lo/strings_no_weblate.xml
diff --git a/library/ui-strings/src/main/res/values-lt/strings.xml b/library/ui-strings/src/main/res/values-lt/strings.xml
new file mode 100644
index 0000000000..aeba3d53e6
--- /dev/null
+++ b/library/ui-strings/src/main/res/values-lt/strings.xml
@@ -0,0 +1,2186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="notice_room_invite_no_invitee">Naudotojo %s pakvietimas</string>
+    <string name="notice_room_join_by_you">Jūs prisijungėte prie kambario</string>
+    <string name="notice_room_join">%1$s prisijungė prie kambario</string>
+    <string name="notice_room_invite_you">%1$s pakvietė jus</string>
+    <string name="notice_room_invite_by_you">Jūs pakvietėte naudotoją %1$s</string>
+    <string name="notice_room_invite">%1$s pakvietė naudotoją %2$s</string>
+    <string name="notice_direct_room_created_by_you">Jūs sukūrėte diskusiją</string>
+    <string name="notice_direct_room_created">%1$s sukūrė diskusiją</string>
+    <string name="notice_room_created_by_you">Jūs sukūrėte kambarį</string>
+    <string name="notice_room_created">%1$s sukūrė kambarį</string>
+    <string name="notice_room_invite_no_invitee_by_you">Jūsų pakvietimas</string>
+    <string name="notice_room_withdraw_by_you">Jūs atšaukėte %1$s pakvietimą</string>
+    <string name="notice_room_withdraw">%1$s atšaukė naudotojo %2$s pakvietimą</string>
+    <string name="notice_room_ban_by_you">Jūs užblokavote %1$s</string>
+    <string name="notice_room_ban">%1$s užblokavo naudotoją %2$s</string>
+    <string name="notice_room_unban_by_you">Jūs atblokavote %1$s</string>
+    <string name="notice_room_unban">%1$s atblokavo naudotoją %2$s</string>
+    <string name="notice_room_remove_by_you">Jūs išmetėte %1$s</string>
+    <string name="notice_room_remove">%1$s išmetė naudotoją %2$s</string>
+    <string name="notice_room_reject_by_you">Jūs atmetėte pakvietimą</string>
+    <string name="notice_room_reject">%1$s atmetė pakvietimą</string>
+    <string name="notice_direct_room_leave_by_you">Jūs išėjote iš kambario</string>
+    <string name="notice_direct_room_leave">%1$s išėjo iš kambario</string>
+    <string name="notice_room_leave_by_you">Jūs išėjote iš kambario</string>
+    <string name="notice_room_leave">%1$s išėjo iš kambario</string>
+    <string name="notice_direct_room_join_by_you">Jūs prisijungėte</string>
+    <string name="notice_direct_room_join">%1$s prisijungė</string>
+    <string name="settings_notifications">Pranešimai</string>
+    <string name="settings_version">Versija</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">Įjungti</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">Įjungti</string>
+    <string name="ssl_logout_account">Atsijungti</string>
+    <string name="room_participants_action_ignore">Ignoruoti</string>
+    <string name="room_participants_action_unban">Atblokuoti</string>
+    <string name="room_participants_action_ban">Užblokuoti</string>
+    <string name="room_participants_action_invite">Pakviesti</string>
+    <string name="action_reject">Atmesti</string>
+    <string name="action_join">Prisijungti</string>
+    <string name="action_remove">Pašalinti</string>
+    <string name="_continue">Tęsti</string>
+    <string name="no">NE</string>
+    <string name="yes">TAIP</string>
+    <string name="permissions_rationale_popup_title">Informacija</string>
+    <string name="call">Skambutis</string>
+    <string name="settings_call_category">Skambučiai</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Jūs pakvietėte %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s pakvietė %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Jūs išsiuntėte pakvietimą %1$s prisijungti prie kambario</string>
+    <string name="notice_room_avatar_removed_by_you">Jūs pašalinote kambario nuotrauką</string>
+    <string name="notice_room_avatar_removed">%1$s pašalino kambario nuotrauka</string>
+    <string name="notice_room_topic_removed_by_you">Jūs pašalinote kambario tema</string>
+    <string name="notice_room_topic_removed">%1$s pašalino kambario temą</string>
+    <string name="notice_room_name_removed_by_you">Jūs pašalinote kambario pavadinimą</string>
+    <string name="notice_room_name_removed">%1$s pašalino kambario pavadinimą</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Visiem serveriam yra uždrausta dalyvauti! Šiuo kambariu nebegalima naudotis.</string>
+    <string name="notice_room_update_by_you">Jūs atnaujinote šį kambarį.</string>
+    <string name="notice_room_update">%s atnaujino šį kambarį.</string>
+    <string name="notice_room_visibility_world_readable">bet kas.</string>
+    <string name="notice_room_visibility_shared">Visi kambario dalyviai.</string>
+    <string name="notice_room_visibility_invited">Visi kambario dalyviai, nuo tada, kai jie yra pakviesti.</string>
+    <string name="notice_ended_call">%s baigė skambutį.</string>
+    <string name="notice_answered_call_by_you">Jūs atsiliepėte į skambutį.</string>
+    <string name="notice_answered_call">%s atsiliepė į skambutį.</string>
+    <string name="notice_placed_voice_call">%s pradėjo balso skambutį.</string>
+    <string name="notice_placed_video_call_by_you">Jūs pradėjote vaizdo skambutį.</string>
+    <string name="notice_placed_video_call">%s pradėjo vaizdo skambutį.</string>
+    <string name="notice_room_name_changed">%1$s pakeitė kambario pavadinimą į %2$s</string>
+    <string name="notice_room_avatar_changed_by_you">Jūs pakeitėte kambario nuotrauką</string>
+    <string name="notice_room_topic_changed_by_you">Jūs pakeitėte temą į %1$s</string>
+    <string name="notice_room_topic_changed">%1$s pakeitė temą į: %2$s</string>
+    <string name="notice_display_name_changed_from_by_you">Jūs pakeitėte savo vardą iš %1$s į %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s pakeitė savo vardą iš %2$s į %3$s</string>
+    <string name="notice_display_name_set_by_you">Jūs pakeitėte savo vardą į %1$s</string>
+    <string name="notice_display_name_set">%1$s pakeitė savo vardą į %2$s</string>
+    <string name="notice_avatar_url_changed_by_you">Jūs pakeitėte savo profilio nuotrauką</string>
+    <string name="notice_avatar_url_changed">%1$s pakeitė savo profilio nuotrauką</string>
+    <string name="or">arba</string>
+    <string name="no_more_results">Daugiau rezultatų nėra</string>
+    <string name="no_result_placeholder">Rezultatų nėra</string>
+    <string name="notice_call_candidates">%s išsiuntė duomenis pokalbio nustatymui.</string>
+    <string name="notice_room_name_changed_by_you">Jūs pakeitėte kambario pavadinimą į: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Jūs pakvietėte %1$s. Priežastis: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s pakvietė %2$s. Priežastis: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Jūsų pakvietimas. Priežastis: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s\'s pakvietimas. Priežastis: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s pakvietė jus. Priežastis: %2$s</string>
+    <string name="notice_avatar_changed_too">(profilio nuotrauka taip pat buvo pakeista)</string>
+    <string name="notice_display_name_removed_by_you">Jūs pašalinote savo vardą (buvo %1$s)</string>
+    <string name="notice_display_name_removed">%1$s pašalino savo vardą (buvo %2$s)</string>
+    <string name="notice_room_visibility_joined">Visi kambario dalyviai, nuo tada, kai jie prisijungė prie kambario.</string>
+    <string name="notice_ended_call_by_you">Jūs baigėte skambutį.</string>
+    <string name="notice_placed_voice_call_by_you">Jūs pradėjote balso skambutį.</string>
+    <string name="notice_room_avatar_changed">%1$s pakeitė kambario nuotrauką</string>
+    <string name="option_always_ask">Visada klausti</string>
+    <string name="sound_device_wireless_headset">Belaidės ausinės</string>
+    <string name="sound_device_headset">Ausinės</string>
+    <string name="sound_device_speaker">Garsiakalbis</string>
+    <string name="sound_device_phone">Telefonas</string>
+    <string name="call_failed_no_connection_description">Nepavyko užmegzti realaus laiko ryšio.
+\nKad skambučiai veiktų patikimai, paprašykite namų serverio administratoriaus sukonfigūruoti TURN serverį.</string>
+    <string name="call_failed_no_connection">${app_name} Skambutis nepavyko</string>
+    <string name="start_video_call_prompt_msg">Ar tikrai norite pradėti vaizdo skambutį\?</string>
+    <string name="start_voice_call_prompt_msg">Ar tikrai norite pradėti balso skambutį\?</string>
+    <string name="option_send_voice">Siųsti balsą</string>
+    <string name="start_video_call">Pradėti vaizdo skambutį</string>
+    <string name="start_voice_call">Pradėti balso skambutį</string>
+    <string name="search">Ieškoti</string>
+    <string name="hs_client_url">Namų serverio API URL adresas</string>
+    <string name="hs_url">Namų serverio URL adresas</string>
+    <string name="logout">Atsijungti</string>
+    <string name="username">Slapyvardis</string>
+    <string name="join_room">Jungtis prie kambario</string>
+    <string name="send_bug_report_progress">Progresas (%s%%)</string>
+    <string name="send_bug_report_failed">Nepavyko išsiųsti pranešimo apie klaidą (%s)</string>
+    <string name="send_bug_report_sent">Pranešimas apie klaidą sėkmingai išsiųstas</string>
+    <string name="send_bug_report_rage_shake">Piktai purtykite telefoną kad pranešti apie klaidą</string>
+    <string name="send_bug_report_app_crashed">Paskutinį kartą programa sugedo. Ar norite atidaryti sutrikimo ataskaitos ekraną\?</string>
+    <string name="send_bug_report_alert_message">Atrodo, kad nusivylę purtote telefoną. Ar norėtumėte atidaryti pranešimo apie klaidas ekraną\?</string>
+    <string name="send_bug_report_logs_description">Norint diagnozuoti problemas, kartu su šiuo pranešimu apie klaidą bus siunčiami šio kliento žurnalai. Ši klaidos ataskaita, įskaitant žurnalus ir ekrano nuotrauką, nebus viešai matoma. Jei pageidaujate siųsti tik pirmiau pateiktą tekstą, panaikinkite žymėjimą:</string>
+    <string name="send_bug_report_placeholder">Apibūdinkite savo problemą čia</string>
+    <string name="send_bug_report_description_in_english">Jei įmanoma, aprašymą rašykite anglų kalba.</string>
+    <string name="send_bug_report_description">Aprašykite klaidą. Ką padarėte\? Ko tikėjotės, kad įvyks\? Kas iš tikrųjų nutiko\?</string>
+    <string name="send_bug_report">Pranešti apie klaidą</string>
+    <string name="send_bug_report_include_screenshot">Siųsti ekrano nuotrauką</string>
+    <string name="send_bug_report_include_key_share_history">Siųsti raktų bendrinimo užklausų istoriją</string>
+    <string name="send_bug_report_include_crash_logs">Siųsti sutrikimų žurnalus</string>
+    <string name="send_bug_report_include_logs">Siųsti žurnalus</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Rodyti visus kambarių kataloge esančius kambarius, įskaitant kambarius su eksplicitiniu turiniu.</string>
+    <string name="settings_room_directory_show_all_rooms">Rodyti eksplicitinio turinio kambarius</string>
+    <string name="settings_category_room_directory">Kambarių katalogas</string>
+    <string name="rooms_header">Kambariai</string>
+    <string name="matrix_only_filter">Tik Matrix kontaktai</string>
+    <string name="direct_chats_header">Pokalbiai</string>
+    <string name="suggested_header">Siūlomi kambariai</string>
+    <string name="system_alerts_header">Sistemos perspėjimai</string>
+    <string name="low_priority_header">Žemo prioriteto</string>
+    <string name="invitations_header">Pakvietimai</string>
+    <string name="home_filter_placeholder_home">Filtruoti kambarių pavadinimus</string>
+    <string name="bottom_action_rooms">Kambariai</string>
+    <string name="bottom_action_people">Žmonės</string>
+    <string name="bottom_action_favourites">Parankiniai</string>
+    <string name="bottom_action_notification">Pranešimai</string>
+    <string name="dialog_edit_hint">Nauja reikšmė</string>
+    <string name="dialog_title_success">Sėkmė</string>
+    <string name="dialog_title_error">Klaida</string>
+    <string name="dialog_title_warning">Įspėjimas</string>
+    <string name="dialog_title_confirmation">Patvirtinimas</string>
+    <string name="action_thread_copy_link_to_thread">Kopijuoti nuorodą į temą</string>
+    <string name="action_thread_view_in_room">Peržiūrėti kambaryje</string>
+    <string name="copied_to_clipboard">Nukopijuota į iškarpinę</string>
+    <string name="action_learn_more">Sužinoti daugiau</string>
+    <string name="action_reset">Nustatyti iš naujo</string>
+    <string name="action_dismiss">Atmesti</string>
+    <string name="action_play">Paleisti</string>
+    <string name="action_disconnect">Atjungti</string>
+    <string name="action_revoke">Panaikinti</string>
+    <string name="action_rename">Pervadinti</string>
+    <string name="action_delete">Ištrinti</string>
+    <string name="action_share">Bendrinti</string>
+    <string name="action_download">Atsisiųsti</string>
+    <string name="action_quote">Cituoti</string>
+    <string name="action_send">Siųsti</string>
+    <string name="action_leave">Išeiti</string>
+    <string name="action_save">Išsaugoti</string>
+    <string name="action_cancel">Atšaukti</string>
+    <string name="action_invite">Pakviesti</string>
+    <string name="action_decline">Atmesti</string>
+    <string name="action_ignore">Ignoruoti</string>
+    <string name="action_skip">Praleisti</string>
+    <string name="action_accept">Priimti</string>
+    <string name="action_change">Keisti</string>
+    <string name="action_agree">Sutinku</string>
+    <string name="action_try_it_out">Išbandyti</string>
+    <string name="action_not_now">Ne dabar</string>
+    <string name="action_disable">Išjungti</string>
+    <string name="action_enable">Įjungti</string>
+    <string name="action_unpublish">Atšaukti publikavimą</string>
+    <string name="action_switch">Perjungti</string>
+    <string name="action_add">Pridėti</string>
+    <string name="action_copy">Kopijuoti</string>
+    <string name="action_close">Uždaryti</string>
+    <string name="action_open">Atidaryti</string>
+    <string name="action_mark_room_read">Pažymėti kaip perskaitytą</string>
+    <string name="action_quick_reply">Greitas atsakymas</string>
+    <string name="action_mark_all_as_read">Pažymėti visus kaip perskaitytus</string>
+    <string name="action_view_threads">Peržiūrėti temas</string>
+    <string name="action_video_call">Vaizdo skambutis</string>
+    <string name="action_voice_call">Balso skambutis</string>
+    <string name="action_sign_out_confirmation_simple">Ar tikrai norite atsijungti\?</string>
+    <string name="action_sign_out">Atsijungti</string>
+    <string name="call_notification_hangup">Padėti ragelį</string>
+    <string name="call_notification_reject">Atmesti</string>
+    <string name="call_notification_answer">Priimti</string>
+    <string name="done">Baigta</string>
+    <string name="failed_to_remove_widget">Nepavyko pašalinti valdiklio</string>
+    <string name="failed_to_add_widget">Nepavyko pridėti valdiklio</string>
+    <string name="cannot_call_yourself_with_invite">Negalite skambinti patys sau, laukite, kol dalyviai priims kvietimą</string>
+    <string name="cannot_call_yourself">Negalite skambinti patys sau</string>
+    <string name="audio_video_meeting_description">Susitikimuose naudojamos \"Jitsi\" saugumo ir leidimų politikos. Visi šiuo metu kambaryje esantys žmonės matys kvietimą prisijungti, kol vyks jūsų susitikimas.</string>
+    <string name="audio_meeting">Pradėti garso susitikimą</string>
+    <string name="video_meeting">Pradėti vaizdo susitikimą</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Neturite leidimo pradėti skambutį</string>
+    <string name="no_permissions_to_start_webrtc_call">Neturite leidimo pradėti skambutį šiame kambaryje</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Neturite leidimo pradėti konferencinį skambutį</string>
+    <string name="no_permissions_to_start_conf_call">Neturite leidimo pradėti konferencinį skambutį šiame kambaryje</string>
+    <string name="denied_permission_voice_message">Jei norite siųsti balso žinutes, suteikite mikrofono leidimą.</string>
+    <string name="denied_permission_camera">Norėdami atlikti šį veiksmą, sistemos nustatymuose suteikite fotoaparato leidimą.</string>
+    <string name="missing_permissions_title">Trūkstami leidimai</string>
+    <string name="denied_permission_generic">Šiam veiksmui atlikti trūksta kai kurių leidimų, suteikite juos sistemos nustatymuose.</string>
+    <string name="time_unit_second_short">sek</string>
+    <string name="start_chatting">Pradėti pokalbį</string>
+    <string name="report_content">Pranešti turinį</string>
+    <string name="none">Nėra</string>
+    <string name="view_decrypted_source">Peržiūrėti iššifruotą šaltinį</string>
+    <string name="view_source">Peržiūrėti šaltinį</string>
+    <string name="permalink">Nuolatinė nuoroda</string>
+    <string name="later">Vėliau</string>
+    <string name="ok">GERAI</string>
+    <string name="loading">Įkeliama…</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Prarasite prieigą prie užšifruotų žinučių, jei prieš atsijungdami nepadarysite atsarginės raktų kopijos.</string>
+    <string name="backup">Atsarginė kopija</string>
+    <string name="are_you_sure">Ar esate tikri\?</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Darome atsarginę raktų kopiją…</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Nenoriu savo užšifruotų žinučių</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Kad neprarastumėte prieigos prie užšifruotų žinučių, saugi raktų atsarginė kopija turėtų būti aktyvi visose jūsų sesijose.</string>
+    <string name="title_activity_keys_backup_setup">Raktų atsarginė kopija</string>
+    <string name="title_activity_keys_backup_restore">Naudoti atsarginę raktų kopiją</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Atliekama atsarginė raktų kopija. Jei dabar atsijungsite, neteksite prieigos prie užšifruotų žinučių.</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Jei dabar atsijungsite, prarasite užšifruotas žinutes</string>
+    <string name="title_activity_choose_sticker">Siųsti lipduką</string>
+    <string name="title_activity_bug_report">Pranešti apie klaidą</string>
+    <string name="title_activity_settings">Nustatymai</string>
+    <string name="notification_silent_notifications">Tylūs pranešimai</string>
+    <string name="notification_noisy_notifications">Garsūs pranešimai</string>
+    <string name="notification_listening_for_events">Laukiama įvykių</string>
+    <string name="notification_listening_for_notifications">Laukiama pranešimų</string>
+    <string name="black_theme">Juoda tema</string>
+    <string name="dark_theme">Tamsi tema</string>
+    <string name="light_theme">Šviesi tema</string>
+    <string name="system_theme">Sistemos numatytoji</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Įjungėte visapusį šifravimą (neatpažintas algoritmas %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s įjungė visapusį šifravimą (neatpažintas algoritmas %2$s).</string>
+    <string name="notice_end_to_end_ok_by_you">Įjungėte visapusį šifravimą.</string>
+    <string name="notice_end_to_end_ok">%1$s įjungė visapusį šifravimą.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Uždraudėte svečiams patekti į kambarį.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s uždraudė svečiams prisijungti prie kambario.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Uždraudėte svečiams patekti į kambarį.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s uždraudė svečiams prisijungti prie kambario.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Leidote čia prisijungti svečiams.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s leido svečiams prisijungti čia.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Leidote svečiams prisijungti prie kambario.</string>
+    <string name="notice_room_guest_access_can_join">%1$s leido svečiams prisijungti prie kambario.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Pakeitėte šio kambario adresus.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s pakeitė šio kambario adresus.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Pakeitėte pagrindinį ir alternatyvius šio kambario adresus.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s pakeitė pagrindinį ir alternatyvų šio kambario adresus.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Pakeitėte alternatyvius šio kambario adresus.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Dėl visapusio šifravimo gali tekti laukti, kol bus gauta kieno nors žinutė, nes šifravimo raktai nebuvo tinkamai išsiųsti.</string>
+    <string name="crypto_error_withheld_blacklisted">Jūs negalite pasiekti šios žinutės, nes siuntėjas jus užblokavo</string>
+    <string name="crypto_error_withheld_unverified">Jūs negalite pasiekti šios žinutės, nes siuntėjas nepasitiki jūsų sesija</string>
+    <string name="crypto_error_withheld_generic">Jūs negalite pasiekti šios žinutės, nes siuntėjas tyčia neatsiuntė raktų</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Laukiama šifravimo istorijos</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Laukiame šios žinutės, tai gali užtrukti</string>
+    <string name="notice_crypto_unable_to_decrypt_final">Jūs negalite pasiekti šios žinutės</string>
+    <string name="set_a_security_phrase_again_notice">Dar kartą įveskite saugumo frazę, kad ją patvirtintumėte.</string>
+    <string name="set_a_security_phrase_notice">Įveskite tik jums žinomą saugumo frazę, naudojamą apsaugoti paslaptis serveryje.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Sugeneruokite saugumo raktą, kurį laikykite saugioje vietoje, pvz., slaptažodžių tvarkyklėje arba seife.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Naudoti saugumo frazę</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Įveskite tik jums žinomą slaptą frazę ir sugeneruokite atsarginės kopijos raktą.</string>
+    <string name="bottom_sheet_save_your_recovery_key_title">Išsaugokite saugumo raktą</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Saugumo raktą laikykite saugioje vietoje, pavyzdžiui, slaptažodžių tvarkyklėje arba seife.</string>
+    <string name="set_a_security_phrase_title">Nustatyti saugumo frazę</string>
+    <string name="set_a_security_phrase_hint">Saugumo frazė</string>
+    <string name="bottom_sheet_setup_secure_backup_title">Saugi atsarginė kopija</string>
+    <string name="a11y_unmute_microphone">Įjungti mikrofoną</string>
+    <string name="a11y_mute_microphone">Išjungti mikrofoną</string>
+    <string name="a11y_stop_camera">Išjungti kamerą</string>
+    <string name="a11y_start_camera">Įjungti kamerą</string>
+    <string name="power_level_edit_title">Nustatyti rolę</string>
+    <string name="power_level_title">Rolė</string>
+    <string name="a11y_open_chat">Atidaryti pokalbį</string>
+    <string name="identity_server_set_alternative_submit">Pateikti</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Nustatyti</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Naudoti saugumo raktą</string>
+    <string name="room_settings_save_success">Sėkmingai pakeitėte kambario nustatymus</string>
+    <string name="room_settings_topic_hint">Tema</string>
+    <string name="room_settings_name_hint">Kambario pavadinimas</string>
+    <string name="disclaimer_positive_button">SUŽINOTI DAUGIAU</string>
+    <string name="room_settings_set_avatar">Nustatyti avatarą</string>
+    <string name="disclaimer_negative_button">SUPRATAU</string>
+    <string name="wrong_pin_message_last_remaining_attempt">Įspėjimas! Paskutinis likęs bandymas prieš atjungimą!</string>
+    <string name="too_many_pin_failures">Per daug klaidų, buvote atjungti</string>
+    <string name="create_pin_title">Pasirinkti PIN kodą saugumui</string>
+    <string name="create_pin_confirm_title">Patvirtinti PIN kodą</string>
+    <string name="create_pin_confirm_failure">Nepavyko patvirtinti PIN kodo, bakstelėkite naują.</string>
+    <string name="auth_pin_title">Įveskite PIN kodą</string>
+    <string name="auth_pin_forgot">Pamiršote PIN kodą\?</string>
+    <string name="auth_pin_reset_title">Iš naujo nustatyti PIN kodą</string>
+    <string name="auth_pin_new_pin_action">Naujas PIN kodas</string>
+    <string name="auth_pin_reset_content">Norėdami iš naujo nustatyti PIN kodą, turėsite iš naujo prisijungti ir sukurti naują PIN kodą.</string>
+    <string name="settings_security_application_protection_title">Apsaugoti prieigą</string>
+    <string name="settings_security_application_protection_summary">Apsaugoti prieigą su PIN kodu ir biometriniais duomenimis.</string>
+    <string name="settings_security_application_protection_screen_title">Konfigūruoti apsaugą</string>
+    <string name="settings_security_pin_code_title">Įjungti PIN kodą</string>
+    <string name="settings_security_pin_code_summary">Jei norite iš naujo nustatyti PIN kodą, bakstelėkite Pamiršau PIN kodą, kad atsijungtumėte ir nustatytumėte iš naujo.</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Įgalinti biometrinius duomenis</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Įgalinti konkrečiam įrenginiui būdingus biometrinius duomenis, pvz., pirštų atspaudus ir veido atpažinimą.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN kodas yra vienintelis būdas atrakinti ${app_name}.</string>
+    <string name="settings_security_pin_code_notifications_title">Rodyti turinį pranešimuose</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Rodyti išsamią informaciją, pvz., kambarių pavadinimus ir žinučių turinį.</string>
+    <string name="settings_security_pin_code_notifications_summary_off">Rodyti tik neperskaitytų žinučių skaičių paprastame pranešime.</string>
+    <string name="settings_security_pin_code_grace_period_title">Reikalauti PIN kodo po 2 min.</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">PIN kodas reikalingas po 2 minučių ${app_name} nenaudojimo.</string>
+    <string name="settings_security_pin_code_grace_period_summary_off">PIN kodas reikalingas kiekvieną kartą, atidarant ${app_name}.</string>
+    <string name="settings_security_pin_code_change_pin_title">Keisti PIN kodą</string>
+    <string name="settings_security_pin_code_change_pin_summary">Pakeisti dabartinį PIN kodą</string>
+    <string name="error_opening_banned_room">Negalite atidaryti kambario, kuriame esate užblokuoti.</string>
+    <string name="room_error_not_found">Nepavyko rasti šio kambario. Įsitikinkite, kad jis egzistuoja.</string>
+    <string name="share_by_text">Bendrinti tekstu</string>
+    <string name="cannot_dm_self">Negalima rašyti sau!</string>
+    <string name="invalid_qr_code_uri">Neteisingas QR kodas (neteisingas URI)!</string>
+    <string name="qr_code_not_scanned">QR kodas nenuskaitytas!</string>
+    <string name="universal_link_malformed">Nuoroda buvo netinkamai suformuota</string>
+    <string name="warning_room_not_created_yet">Kambarys dar nesukurtas. Atšaukti kambario kūrimą\?</string>
+    <string name="warning_unsaved_change">Yra neišsaugotų pakeitimų. Atmesti pakeitimus\?</string>
+    <string name="warning_unsaved_change_discard">Atmesti pakeitimus</string>
+    <string name="call_tile_you_declined_this_call">Jūs atmetėte šį skambutį</string>
+    <string name="call_tile_other_declined">%1$s atmetė šį skambutį</string>
+    <string name="call_tile_ended">Šis skambutis baigėsi</string>
+    <string name="call_tile_call_back">Perskambinti</string>
+    <string name="call_tile_voice_incoming">Gaunamas balso skambutis</string>
+    <string name="call_tile_video_incoming">Gaunamas vaizdo skambutis</string>
+    <string name="call_tile_voice_active">Aktyvus balso skambutis</string>
+    <string name="call_tile_video_active">Aktyvus vaizdo skambutis</string>
+    <string name="call_tile_voice_call_has_ended">Balso skambutis baigtas • %1$s</string>
+    <string name="call_tile_video_call_has_ended">Vaizdo skambutis baigtas • %1$s</string>
+    <string name="a11y_rule_notify_silent">Pranešti be garso</string>
+    <string name="a11y_error_some_message_not_sent">Kai kurios žinutės nebuvo išsiųstos</string>
+    <string name="a11y_change_avatar">Keisti avatarą</string>
+    <string name="a11y_delete_avatar">Ištrinti avatarą</string>
+    <string name="a11y_unchecked">Nepatikrinta</string>
+    <string name="a11y_checked">Patikrinta</string>
+    <string name="a11y_error_message_not_sent">Žinutė neišsiųsta dėl klaidos</string>
+    <string name="a11y_rule_notify_noisy">Pranešti su garsu</string>
+    <string name="a11y_unsent_draft">turi neišsiųstą juodraštį</string>
+    <string name="a11y_open_widget">Atidaryti valdiklius</string>
+    <string name="a11y_import_key_from_file">Importuoti raktą iš failo</string>
+    <string name="authentication_error">Nepavyko patvirtinti tapatybės</string>
+    <string name="a11y_screenshot">Ekrano nuotrauka</string>
+    <string name="a11y_image">Nuotrauka</string>
+    <string name="a11y_selected">Pasirinktas</string>
+    <string name="a11y_rule_notify_off">Nepranešti</string>
+    <string name="a11y_presence_unavailable">Nutolęs</string>
+    <string name="a11y_presence_busy">Užsiėmęs</string>
+    <string name="a11y_presence_offline">Atsijungęs</string>
+    <string name="a11y_public_room">Viešas kambarys</string>
+    <string name="a11y_presence_online">Prisijungęs</string>
+    <string name="command_description_upgrade_room">Atnaujina kambarį į naują versiją</string>
+    <string name="event_status_a11y_sending">Siunčiama</string>
+    <string name="event_status_a11y_sent">Išsiųsta</string>
+    <string name="event_status_a11y_failed">Nepavyko</string>
+    <string name="event_status_a11y_delete_all">Ištrinti visas nepavykusias žinutes</string>
+    <string name="event_status_cancel_sending_dialog_message">Ar norite atšaukti žinutės siuntimą\?</string>
+    <string name="event_status_failed_messages_warning">Nepavyko išsiųsti žinučių</string>
+    <string name="event_status_delete_all_failed_dialog_title">Ištrinti neišsiųstas žinutes</string>
+    <string name="space_type_public">Vieša</string>
+    <string name="space_type_public_desc">Atvira visiems, geriausiai tinka bendruomenėms</string>
+    <string name="space_type_private">Privati</string>
+    <string name="space_type_private_desc">Tik su kvietimais, geriausia sau arba komandoms</string>
+    <string name="invite_people_menu">Pakviesti žmonių</string>
+    <string name="invite_to_space">Pakviesti į %s</string>
+    <string name="invite_people_to_your_space_desc">Šiuo metu esate tik jūs. %s bus dar geriau su kitais.</string>
+    <string name="invite_by_email">Pakviesti paštu</string>
+    <string name="invite_by_username_or_mail">Pakviesti slapyvardžiu arba paštu</string>
+    <string name="invite_by_link">Bendrinti nuorodą</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d pažįstamas asmuo jau prisijungė</item>
+        <item quantity="few">%d pažįstami asmenys jau prisijungė</item>
+        <item quantity="other">%d pažįstamų asmenų jau prisijungė</item>
+    </plurals>
+    <string name="space_explore_activity_title">Naršyti kambarius</string>
+    <string name="space_add_child_title">Pridėti kambarius</string>
+    <string name="leave_space">Išeiti</string>
+    <string name="you_are_invited">Esate kviečiami</string>
+    <string name="preference_show_all_rooms_in_home">Rodyti visus kambarius pradžioje</string>
+    <string name="voice_message_release_to_send_toast">Laikykite, kad įrašytumėte, atleiskite, kad išsiųstumėte</string>
+    <string name="a11y_delete_recorded_voice_message">Ištrinti įrašą</string>
+    <string name="a11y_recording_voice_message">Balso žinutė įrašoma</string>
+    <string name="voice_message_slide_to_cancel">Pastumkite, kad atšauktumėte</string>
+    <string name="a11y_play_voice_message">Paleisti balso žinutę</string>
+    <string name="a11y_pause_voice_message">Pristabdyti balso žinutę</string>
+    <string name="a11y_stop_voice_message">Stabdyti įrašymą</string>
+    <string name="a11y_start_voice_message">Įrašyti balso žinutę</string>
+    <string name="upgrade_room_auto_invite">Automatiškai pakviesti narius</string>
+    <string name="voice_message_tap_to_stop_toast">Bakstelėkite įrašą, kad sustabdytumėte arba klausytumėte</string>
+    <string name="error_voice_message_unable_to_play">Negalima paleisti šios balso žinutės</string>
+    <string name="error_voice_message_unable_to_record">Negalima įrašyti balso žinutės</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Negalima atsakyti ar redaguoti, kol veikia balso žinutė</string>
+    <string name="voice_message_reply_content">Balso žinutė (%1$s)</string>
+    <string name="link_this_email_settings_link">Susieti šį el. paštą su savo paskyra</string>
+    <plurals name="create_poll_not_enough_options_error">
+        <item quantity="one">Bent %1$s pasirinkimas yra būtinas</item>
+        <item quantity="few">Bent %1$s pasirinkimai yra būtini</item>
+        <item quantity="other">Bent %1$s pasirinkimų yra būtini</item>
+    </plurals>
+    <plurals name="poll_option_vote_count">
+        <item quantity="one">%1$d balsas</item>
+        <item quantity="few">%1$d balsai</item>
+        <item quantity="other">%1$d balsų</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_before_ended_and_voted">
+        <item quantity="one">Pagal %1$d balsą</item>
+        <item quantity="few">Pagal %1$d balsus</item>
+        <item quantity="other">Pagal %1$d balsų</item>
+    </plurals>
+    <string name="end_poll_confirmation_title">Baigti šią apklausą\?</string>
+    <string name="create_poll_empty_question_error">Klausimas negali būti tuščias</string>
+    <string name="create_poll_question_title">Apklausos klausimas arba tema</string>
+    <string name="create_poll_question_hint">Klausimas arba tema</string>
+    <string name="create_poll_options_title">Kurti pasirinkimus</string>
+    <string name="create_poll_options_hint">Pasirinkimas %1$d</string>
+    <string name="create_poll_add_option">PRIDĖTI PASIRINKIMĄ</string>
+    <string name="create_poll_button">KURTI APKLAUSĄ</string>
+    <string name="create_poll_title">Kurti apklausą</string>
+    <plurals name="poll_total_vote_count_after_ended">
+        <item quantity="one">Galutinis rezultatas pagal %1$d balsą</item>
+        <item quantity="few">Galutinis rezultatas pagal %1$d balsus</item>
+        <item quantity="other">Galutinis rezultatas pagal %1$d balsus</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_before_ended_and_not_voted">
+        <item quantity="one">%1$d surinktas balsas. Balsuokite, kad pamatytumėte rezultatus</item>
+        <item quantity="few">%1$d surinkti balsai. Balsuokite, kad pamatytumėte rezultatus</item>
+        <item quantity="other">%1$d surinktų balsų. Balsuokite, kad pamatytumėte rezultatus</item>
+    </plurals>
+    <string name="poll_end_action">Baigti apklausą</string>
+    <string name="location_activity_title_static_sharing">Bendrinti vietą</string>
+    <string name="location_activity_title_preview">Vieta</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Padarėte būsimas žinutes matomas %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s padarė būsimas žinutes matomas %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Būsimą kambario istoriją padarėte matomą %1$s</string>
+    <string name="notice_made_future_room_visibility">%1$s padarė būsimą kambario istoriją matomą %2$s</string>
+    <plurals name="missed_audio_call">
+        <item quantity="one">%d praleistas balso skambutis</item>
+        <item quantity="few">%d praleisti balso skambučiai</item>
+        <item quantity="other">%d praleistų balso skambučių</item>
+    </plurals>
+    <string name="call_ended">Skambutis baigtas</string>
+    <string name="permissions_rationale_msg_record_audio">${app_name} reikia leidimo prieiti prie jūsų mikrofono, kad galėtumėte atlikti garso skambučius.</string>
+    <string name="call_remove_jitsi_widget_progress">Baigiamas skambutis…</string>
+    <string name="call_error_user_not_responding">Nuotolinio ryšio pusėje nepavyko prisijungti.</string>
+    <string name="call_ended_invite_timeout_title">Jokio atsakymo</string>
+    <string name="call_ended_user_busy_description">Naudotojas, kuriam skambinote, yra užimtas.</string>
+    <string name="call_ended_user_busy_title">Naudotojas užimtas</string>
+    <string name="call_held_by_you">Sulaikėte skambutį</string>
+    <string name="call_held_by_user">%s sulaikė skambutį</string>
+    <string name="call_hold_action">Sulaikyti</string>
+    <string name="call_resume_action">Tęsti</string>
+    <string name="audio_call_with_participant">Balso skambutis su %s</string>
+    <string name="video_call_with_participant">Vaizdo skambutis su %s</string>
+    <string name="video_call_in_progress">Vaizdo skambutis vyksta…</string>
+    <string name="call_in_progress">Skambutis vyksta…</string>
+    <string name="incoming_voice_call">Įeinantis balso skambutis</string>
+    <string name="incoming_video_call">Įeinantis vaizdo skambutis</string>
+    <plurals name="missed_video_call">
+        <item quantity="one">Praleistas vaizdo skambutis</item>
+        <item quantity="few">%d praleisti vaizdo skambučiai</item>
+        <item quantity="other">%d praleistų vaizdo skambučių</item>
+    </plurals>
+    <string name="call_ringing">Skambutis skamba…</string>
+    <string name="call_connecting">Jungiamasi prie skambučio…</string>
+    <string name="settings_call_ringtone_dialog_title">Pasirinkite skambučių melodiją:</string>
+    <string name="settings_call_ringtone_title">Įeinančio skambučio melodija</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Įeinantiems skambučiams naudoti numatytąją ${app_name} melodiją</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Prieš pradedant skambutį prašyti patvirtinimo</string>
+    <string name="settings_call_show_confirmation_dialog_title">Užkirsti kelią atsitiktiniam skambučiui</string>
+    <string name="compression_opt_list_small">Mažas</string>
+    <string name="compression_opt_list_medium">Vidutinis</string>
+    <string name="compression_opt_list_large">Didelis</string>
+    <string name="compression_opt_list_original">Originalas</string>
+    <plurals name="membership_changes">
+        <item quantity="one">%d narystės pokytis</item>
+        <item quantity="few">%d narystės pokyčiai</item>
+        <item quantity="other">%d narystės pokyčių</item>
+    </plurals>
+    <string name="e2e_re_request_encryption_key_dialog_content">Prašome paleisti ${app_name} kitame įrenginyje, kuris gali iššifruoti žinutę, kad galėtų išsiųsti raktus į šią sesiją.</string>
+    <string name="e2e_re_request_encryption_key">Pakartotinai paprašykite šifravimo raktų iš kitų seansų.</string>
+    <string name="login_error_limit_exceeded">Išsiųsta per daug užklausų</string>
+    <string name="login_error_not_json">Nebuvo tinkamo JSON</string>
+    <string name="login_error_bad_json">Klaidingas JSON</string>
+    <string name="error_unauthorized">Neautorizuotas, trūksta galiojančių tapatumo duomenų</string>
+    <string name="login_error_ssl_other">SSL klaida.</string>
+    <string name="login_error_ssl_peer_unverified">SSL klaida: bendrakeleivio tapatybė nepatvirtinta.</string>
+    <string name="login_error_homeserver_from_url_not_found_enter_manual">Pasirinkti namų serverį</string>
+    <string name="login_error_homeserver_from_url_not_found">Nepavyko pasiekti namų serverio URL adresu %s. Patikrinkite nuorodą arba pasirinkite namų serverį rankiniu būdu.</string>
+    <string name="login_error_homeserver_not_found">Nepavyko pasiekti namų serverio šiuo URL adresu, prašome jį patikrinti</string>
+    <string name="login_error_no_homeserver_found">Tai nėra galiojantis \"Matrix\" serverio adresas</string>
+    <string name="login_error_invalid_home_server">Prašome įvesti tinkamą URL adresą</string>
+    <string name="auth_accept_policies">Peržiūrėkite ir sutikite su šio namų serverio taisyklėmis:</string>
+    <string name="notice_room_leave_with_reason">%1$s išėjo iš kambario. Priežastis: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Prisijungėte. Priežastis: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s prisijungė. Priežastis: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Prisijungėte prie kambario. Priežastis: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s prisijungė prie kambario. Priežastis: %2$s</string>
+    <string name="event_status_sending_message">Siunčiama žinutė…</string>
+    <string name="event_status_sent_message">Žinutė išsiųsta</string>
+    <string name="initial_sync_request_reason_unignored_users">- Kai kurie naudotojai nebeignoruojami</string>
+    <string name="initial_sync_request_content">${app_name} turi išvalyti talpyklą, kad ji būtų atnaujinta dėl šios priežasties:
+\n%s
+\n
+\nAtkreipkite dėmesį, kad atlikus šį veiksmą programa bus paleista iš naujo ir tai gali šiek tiek užtrukti.</string>
+    <string name="initial_sync_request_title">Pradinio sinchronizavimo užklausa</string>
+    <string name="initial_sync_start_importing_account_data">Pradinė sinchronizacija:
+\nImportuojame paskyros duomenis</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Pradinė sinchronizacija:
+\nImportuojame išeitus kambarius</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Pradinė sinchronizacija:
+\nImportuojame kambarių kvietimus</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Pradinė sinchronizacija:
+\nĮkeliame jūsų pokalbius
+\nJei prisijungėte prie daugybės kambarių, tai gali užtrukti</string>
+    <string name="initial_sync_start_importing_account_rooms">Pradinė sinchronizacija:
+\nImportuojame kambarius</string>
+    <string name="initial_sync_start_importing_account_crypto">Pradinė sinchronizacija:
+\nImportuojame kriptografija</string>
+    <string name="initial_sync_start_importing_account">Pradinė sinchronizacija:
+\nImportuojame paskyrą…</string>
+    <string name="initial_sync_start_server_computing">Pradinė sinchronizacija:
+\nLaukiame serverio atsakymo…</string>
+    <string name="initial_sync_start_downloading">Pradinė sinchronizacija:
+\nAtsisiunčiame duomenis…</string>
+    <string name="room_displayname_empty_room_was">Tuščias kambarys (buvo %s)</string>
+    <string name="room_displayname_empty_room">Tuščias kambarys</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s ir %4$d kitas</item>
+        <item quantity="few">%1$s, %2$s, %3$s ir %4$d kiti</item>
+        <item quantity="other">%1$s, %2$s, %3$s ir %4$d kitų</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s ir %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s ir %3$s</string>
+    <string name="room_displayname_two_members">%1$s ir %2$s</string>
+    <string name="room_displayname_room_invite">Kvietimas į kambarį</string>
+    <string name="medium_phone_number">Telefono numeris</string>
+    <string name="medium_email">El. pašto adresas</string>
+    <string name="room_error_access_unauthorized">Jums neleidžiama prisijungti prie šio kambario</string>
+    <string name="create_room">Sukurti kambarį</string>
+    <string name="explore_rooms">Naršyti kambarius</string>
+    <string name="notice_direct_room_update_by_you">Jūs atnaujinote čia.</string>
+    <string name="auth_reset_password_error_unverified">El. paštas nepatvirtintas, patikrinkite savo pašto dėžutę</string>
+    <string name="auth_reset_password_error_unauthorized">Nepavyko patvirtinti el. pašto adreso: įsitikinkite, kad paspaudėte el. laiške esančią nuorodą</string>
+    <string name="auth_recaptcha_message">Šis namų serveris norėtų įsitikinti, kad nesate robotas</string>
+    <string name="auth_forgot_password">Pamiršote slaptažodį\?</string>
+    <string name="auth_msisdn_already_defined">Šis telefono numeris jau yra įrašytas.</string>
+    <string name="auth_email_already_defined">Šis el. pašto adresas jau yra įrašytas.</string>
+    <string name="auth_invalid_email">Tai neatrodo kaip tinkamas el. pašto adresas</string>
+    <string name="auth_invalid_login_param">Neteisingas naudotojo vardas ir (arba) slaptažodis</string>
+    <string name="auth_submit">Pateikti</string>
+    <string name="auth_login_sso">Prisijungimas vienkartiniu prisijungimu</string>
+    <string name="auth_login">Prisijungti</string>
+    <string name="error_no_external_application_found">Atsiprašome, nerastos jokios išorinės programos šiam veiksmui atlikti.</string>
+    <string name="no_sticker_application_dialog_content">Šiuo metu nėra įjungti jokie lipdukų paketai.
+\n
+\nAr norite pridėti keletą dabar\?</string>
+    <string name="use_as_default_and_do_not_ask_again">Naudoti kaip numatytąjį ir daugiau neklausti</string>
+    <string name="option_take_video">Filmuoti</string>
+    <string name="option_take_photo">Fotografuoti</string>
+    <string name="option_take_photo_video">Fotografuoti arba filmuoti</string>
+    <string name="option_send_sticker">Siųsti lipduką</string>
+    <string name="option_send_files">Siųsti failus</string>
+    <string name="call_stop_screen_sharing">Sustabdyti ekrano bendrinimą</string>
+    <string name="call_start_screen_sharing">Bendrinti ekraną</string>
+    <string name="call_format_turn_hd_on">Įjungti HD</string>
+    <string name="call_format_turn_hd_off">Išjungti HD</string>
+    <string name="call_camera_back">Atgalinė</string>
+    <string name="call_camera_front">Priekinė</string>
+    <string name="call_switch_camera">Perjungti kamerą</string>
+    <string name="call_select_sound_device">Pasirinkite garso įrenginį</string>
+    <string name="invites_title">Kvietimai</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Veikla</string>
+    <string name="home_layout_preferences_sort_by">Rikiuoti pagal</string>
+    <string name="home_layout_preferences_recents">Rodyti naujausius</string>
+    <string name="home_layout_preferences_filters">Rodyti filtrus</string>
+    <string name="home_layout_preferences">Išdėstymo parinktys</string>
+    <string name="action_next">Kitas</string>
+    <string name="time_unit_minute_short">min</string>
+    <string name="time_unit_hour_short">val</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s pakeitė alternatyvius šio kambario adresus.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Pašalinote alternatyvų šio kambario adresą %1$s.</item>
+        <item quantity="few">Pašalinote alternatyvius šio kambario adresus %1$s.</item>
+        <item quantity="other">Pašalinote alternatyvius šio kambario adresus %1$s.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s pašalino alternatyvų šio kambario adresą %2$s.</item>
+        <item quantity="few">%1$s pašalino alternatyvius šio kambario adresus %2$s.</item>
+        <item quantity="other">%1$s pašalino alternatyvius šio kambario adresus %2$s.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Pridėjote alternatyvų šio kambario adresą %1$s.</item>
+        <item quantity="few">Pridėjote alternatyvius šio kambario adresus %1$s.</item>
+        <item quantity="other">Pridėjote alternatyvius šio kambario adresus %1$s.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s pridėjo alternatyvų šio kambario adresą %2$s.</item>
+        <item quantity="few">%1$s pridėjo alternatyvius šio kambario adresus %2$s.</item>
+        <item quantity="other">%1$s pridėjo alternatyvius šio kambario adresus %2$s.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset_by_you">Pašalinote pagrindinį šio kambario adresą.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s pašalino pagrindinį šio kambario adresą.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Nustatėte pagrindinį šio kambario adresą į %1$s.</string>
+    <string name="notice_room_canonical_alias_set">%1$s nustatė pagrindinį šio kambario adresą į %2$s.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Pridėjote %1$s ir pašalinote %2$s kaip šio kambario adresus.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s pridėjo %2$s ir pašalino %3$s kaip šio kambario adresus.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Pašalinote %1$s kaip šio kambario adresą.</item>
+        <item quantity="few">Pašalinote %1$s iš šio kambario adresų.</item>
+        <item quantity="other">Pašalinote %1$s iš šio kambario adresų.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s pašalino %2$s kaip šio kambario adresą.</item>
+        <item quantity="few">%1$s pašalino %2$s iš šio kambario adresų.</item>
+        <item quantity="other">%1$s pašalino %2$s iš šio kambario adresų.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Pridėjote %1$s kaip šio kambario adresą.</item>
+        <item quantity="few">Pridėjote %1$s kaip šio kambario adresus.</item>
+        <item quantity="other">Pridėjote %1$s kaip šio kambario adresus.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s pridėjo %2$s kaip šio kambario adresą.</item>
+        <item quantity="few">%1$s pridėjo %2$s kaip šio kambario adresus.</item>
+        <item quantity="other">%1$s pridėjo %2$s kaip šio kambario adresus.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">Atšaukėte %1$s kvietimą. Priežastis: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s atšaukė %2$s kvietimą. Priežastis: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Priėmėte %1$s kvietimą. Priežastis: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s priėmė %2$s kvietimą. Priežastis: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Jūs užblokavote %1$s. Priežastis: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s užblokavo %2$s. Priežastis: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Atblokavote %1$s. Priežastis: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s atblokavo %2$s. Priežastis: %3$s</string>
+    <string name="notice_room_remove_with_reason_by_you">Pašalinote %1$s. Priežastis: %2$s</string>
+    <string name="notice_room_remove_with_reason">%1$s pašalino %2$s. Priežastis: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Kvietimą atmetėte. Priežastis: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s atmetė kvietimą. Priežastis: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Išėjote. Priežastis: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s išėjo. Priežastis: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Išėjote iš kambario. Priežastis: %1$s</string>
+    <string name="all_chats">Visi pokalbiai</string>
+    <string name="matrix_error">Matricos klaida</string>
+    <string name="unable_to_send_message">Nepavyksta išsiųsti žinutės</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Siuntėjo įrenginys neatsiuntė mums šios žinutės raktų.</string>
+    <string name="notice_crypto_unable_to_decrypt">** Nepavyksta iššifruoti: %s **</string>
+    <string name="notice_power_level_diff">%1$s nuo %2$s iki %3$s</string>
+    <string name="notice_power_level_changed">%1$s pakeitė %2$s galios lygį.</string>
+    <string name="notice_power_level_changed_by_you">Pakeitėte %1$s galios lygį.</string>
+    <string name="power_level_custom_no_value">Pasirinktinis</string>
+    <string name="power_level_custom">Pasirinktinis (%1$d)</string>
+    <string name="power_level_default">Standartinis</string>
+    <string name="power_level_moderator">Moderatorius</string>
+    <string name="power_level_admin">Adminas</string>
+    <string name="notice_widget_modified_by_you">Pakeitėte %1$s valdiklį</string>
+    <string name="notice_widget_modified">%1$s pakeitė %2$s valdiklį</string>
+    <string name="notice_widget_removed_by_you">Pašalinote %1$s valdiklį</string>
+    <string name="notice_widget_removed">%1$s pašalino %2$s valdiklį</string>
+    <string name="notice_widget_added_by_you">Pridėjote %1$s valdiklį</string>
+    <string name="notice_widget_added">%1$s pridėjo %2$s valdiklį</string>
+    <string name="notice_room_third_party_invite">%1$s išsiuntė kvietimą %2$s prisijungti prie kambario</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s atšaukė %2$s pakvietimą prisijungti prie kambario</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Priėmėte kvietimą į %1$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s priėmė kvietimą į %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Atšaukėte kvietimą %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s atšaukė %2$s kvietimą</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Atšaukėte %1$s pakvietimą prisijungti prie kambario</string>
+    <string name="notice_room_server_acl_updated_no_change">Pakeitimų nėra.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Serveriai atitinkantys %s buvo pašalinti iš leidžiamų sąrašo.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Serveriai atitinkantys %s dabar yra leidžiami.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Serveriai atitinkantys %s buvo pašalinti iš draudimų sąrašo.</string>
+    <string name="notice_room_server_acl_updated_banned">• Serveriai atitinkantys %s dabar yra uždrausti.</string>
+    <string name="notice_room_server_acl_set_allowed">• Serveriai atitinkantys %s yra leidžiami.</string>
+    <string name="notice_room_server_acl_set_banned">• Serveriai atitinkantys %s yra uždrausti.</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Siųsti m.room.server_acl įvykius</string>
+    <string name="room_participants_ban_title">Užblokuoti naudotoją</string>
+    <string name="room_participants_remove_prompt_msg">Naudotojas bus pašalintas iš šio kambario.
+\n
+\nKad jis negalėtų prisijungti dar kartą, turėtumėte jį užblokuoti.</string>
+    <string name="room_participants_remove_reason">Pašalinimo priežastis</string>
+    <string name="room_participants_remove_title">Pašalinti naudotoją</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Ar tikrai norite atšaukti kvietimą šiam naudotojui\?</string>
+    <string name="room_participants_action_cancel_invite_title">Atšaukti kvietimą</string>
+    <string name="room_participants_action_unignore">Nebeignoruoti</string>
+    <string name="room_participants_action_unignore_prompt_msg">Nebeignoruojant šio naudotojo, vėl bus rodomos visos jo žinutės.</string>
+    <string name="room_participants_action_unignore_title">Nebeignoruoti naudotojo</string>
+    <string name="room_participants_action_ignore_prompt_msg">Ignoruodami šį naudotoją nebematysite jo žinučių bendruose kambariuose.
+\n
+\nŠį veiksmą bet kada galite atšaukti bendruosiuose nustatymuose.</string>
+    <string name="room_participants_action_ignore_title">Ignoruoti naudotoją</string>
+    <string name="room_participants_power_level_demote">Pažeminti</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Negalėsite atšaukti šio pakeitimo, nes pažeminsite save, o jei esate paskutinis privilegijuotas naudotojas kambaryje, bus neįmanoma susigrąžinti privilegijų.</string>
+    <string name="room_participants_power_level_demote_warning_title">Nuleisti save į žemesnes pareigas\?</string>
+    <string name="room_participants_power_level_prompt">Šio pakeitimo atšaukti negalėsite, nes padidinsite naudotojo galią, kad jis turėtų tokį patį galios lygį, kaip ir jūs pats.
+\nAr esate tikri\?</string>
+    <string name="room_participants_action_mention">Paminėti</string>
+    <string name="room_participants_action_remove">Pašalinti iš pokalbio</string>
+    <string name="room_participants_action_cancel_invite">Atšaukti kvietimą</string>
+    <string name="room_participants_header_direct_chats">Tiesioginiai pokalbiai</string>
+    <string name="room_participants_leave_private_warning">Šis kambarys nėra viešas. Negalėsite vėl prisijungti be kvietimo.</string>
+    <string name="room_participants_leave_prompt_msg">Ar tikrai norite palikti kambarį\?</string>
+    <string name="room_participants_leave_prompt_title">Palikti kambarį</string>
+    <plurals name="room_title_members">
+        <item quantity="one">%d narys</item>
+        <item quantity="few">%d nariai</item>
+        <item quantity="other">%d narių</item>
+    </plurals>
+    <string name="room_jump_to_first_unread">Pereiti prie neskaitytų</string>
+    <string name="list_members">Nariai</string>
+    <string name="permissions_denied_add_contact">Suteikite leidimą prieiti prie savo kontaktų.</string>
+    <string name="permissions_denied_qr_code">Jei norite nuskaityti QR kodą, turite leisti kameros prieigą.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">${app_name} reikia leidimo prieiti prie jūsų kameros ir mikrofono, kad galėtumėte atlikti vaizdo skambučius.
+\n
+\nKad galėtumėte skambinti, kituose iškylančiuose languose leiskite prieigą.</string>
+    <string name="invites_empty_message">Čia bus pateikiamos naujos užklausos ir kvietimai.</string>
+    <string name="invites_empty_title">Nieko naujo.</string>
+    <string name="start_chat">Pradėti pokalbį</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Serveriai atitinkantys IP dabar yra užblokuoti.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Serveriai atitinkantys IP dabar yra leidžiami.</string>
+    <plurals name="notice_room_server_acl_changes">
+        <item quantity="one">%d serverių ACL pakeitimas</item>
+        <item quantity="few">%d serverių ACL pakeitimai</item>
+        <item quantity="other">%d serverių ACL pakeitimų</item>
+    </plurals>
+    <string name="notice_room_server_acl_updated_title_by_you">Pakeitėte serverių ACL šiam kambariui.</string>
+    <string name="notice_room_server_acl_updated_title">%s pakeitė serverių ACL šiam kambariui.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Serveriai atitinkantys IP yra užblokuoti.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Serveriai atitinkantys IP yra leidžiami.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Nustatėte serverių ACL šiam kambariui.</string>
+    <string name="notice_room_server_acl_set_title">%s nustatė serverių ACL šiam kambariui.</string>
+    <string name="onboarding_new_app_layout_button_try">Išbandyti</string>
+    <string name="onboarding_new_app_layout_feedback_message">Bakstelėkite viršuje dešinėje, kad pamatytumėte atsiliepimų parinktį.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Pateikite atsiliepimus</string>
+    <string name="onboarding_new_app_layout_spaces_title">Pasiekti erdves</string>
+    <string name="onboarding_new_app_layout_spaces_message">Pasiekite erdves (apačioje dešinėje) greičiau ir paprasčiau nei bet kada anksčiau.</string>
+    <string name="onboarding_new_app_layout_welcome_message">Siekiant supaprastinti jūsų ${app_name}, skirtukai dabar yra neprivalomi. Tvarkykite juos naudodami viršutinį dešinės pusės meniu.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Sveiki atvykę į naują vaizdą!</string>
+    <string name="home_empty_no_unreads_message">Čia bus rodomos jūsų neperskaitytos žinutės, kai jų turėsite.</string>
+    <string name="home_empty_no_unreads_title">Nėra apie ką pranešti.</string>
+    <string name="home_empty_no_rooms_message">\"viskas viename\" saugi pokalbių programėlė komandoms, draugams ir organizacijoms. Sukurkite pokalbį arba prisijunkite prie esamo kambario ir pradėkite.</string>
+    <string name="home_empty_no_rooms_title">Sveiki atvykę į ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Erdvės - tai naujas kambarių ir žmonių grupavimo būdas. Pridėkite esamą kambarį arba sukurkite naują naudodami apatinį dešinįjį mygtuką.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\natrodo šiek tiek tuščia.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Apsvarstykite galimybę atsijungti iš senų sesijų (%1$d diena ar daugiau), kurių nebenaudojate.</item>
+        <item quantity="few">Apsvarstykite galimybę atsijungti iš senų sesijų (%1$d dienos ar daugiau), kurių nebenaudojate.</item>
+        <item quantity="other">Apsvarstykite galimybę atsijungti iš senų sesijų (%1$d dienų ar daugiau), kurių nebenaudojate.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Neaktyvios sesijos</string>
+    <string name="device_manager_unverified_sessions_description">Patvirtinkite nepatvirtintas sesijas arba atjunkite jas.</string>
+    <string name="device_manager_unverified_sessions_title">Nepatvirtintos sesijos</string>
+    <string name="device_manager_header_section_security_recommendations_description">Pagerinkite savo paskyros saugumą laikydamiesi šių rekomendacijų.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Saugumo rekomendacijos</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Neaktyvus %1$d+ dieną (%2$s)</item>
+        <item quantity="few">Neaktyvus %1$d+ dienas (%2$s)</item>
+        <item quantity="other">Neaktyvus %1$d+ dienų (%2$s)</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_unverified">Nepatvirtinta · Paskutinė veikla %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Patvirtinta · Paskutinė veikla %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Peržiūrėti visas (%1$d)</string>
+    <string name="device_manager_view_details">Peržiūrėti detales</string>
+    <string name="device_manager_verify_session">Patvirtinti sesiją</string>
+    <string name="device_manager_verification_status_unverified">Nepatvirtinta sesija</string>
+    <string name="device_manager_verification_status_verified">Patvirtinta sesija</string>
+    <string name="a11y_device_manager_device_type_unknown">Nežinomas įrenginio tipas</string>
+    <string name="a11y_device_manager_device_type_desktop">Stalinis kompiuteris</string>
+    <string name="a11y_device_manager_device_type_web">Naršyklė</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobilus</string>
+    <plurals name="room_removed_messages">
+        <item quantity="one">%d žinutė pašalinta</item>
+        <item quantity="few">%d žinutės pašalintos</item>
+        <item quantity="other">%d žinučių pašalinta</item>
+    </plurals>
+    <string name="live_location_labs_promotion_switch_title">Įjungti vietos bendrinimą</string>
+    <string name="live_location_labs_promotion_description">Atkreipkite dėmesį, kad tai yra laboratorinė funkcija, kuri įgyvendinama laikinai. Tai reiškia, kad negalėsite ištrinti savo buvimo vietos istorijos, o pažengę naudotojai galės matyti jūsų buvimo vietos istoriją net tada, kai nustosite bendrinti savo tiesioginę buvimo vietą su šiuo kambariu.</string>
+    <string name="live_location_labs_promotion_title">Tiesioginės buvimo vietos bendrinimas</string>
+    <string name="settings_troubleshoot_test_current_gateway">Dabartiniai vartai: %s</string>
+    <string name="settings_troubleshoot_test_current_gateway_title">Vartai</string>
+    <string name="settings_troubleshoot_test_current_endpoint_failed">Nepavyksta rasti galinio taško.</string>
+    <string name="settings_troubleshoot_test_current_endpoint_success">Dabartinis galinis taškas: %s</string>
+    <string name="settings_troubleshoot_test_current_endpoint_title">Galinis taškas</string>
+    <string name="settings_troubleshoot_test_current_distributor">Šiuo metu naudojamas %s.</string>
+    <string name="settings_troubleshoot_test_current_distributor_title">Metodas</string>
+    <plurals name="settings_troubleshoot_test_distributors_many">
+        <item quantity="one">Rastas %d metodas.</item>
+        <item quantity="few">Rasti %d metodai.</item>
+        <item quantity="other">Rasti %d metodų.</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_distributors_fdroid">Nerastas joks kitas metodas, išskyrus foninį sinchronizavimą.</string>
+    <string name="settings_troubleshoot_test_distributors_gplay">Nerastas joks kitas būdas, išskyrus Google Play paslaugas.</string>
+    <string name="settings_troubleshoot_test_distributors_title">Galimi metodai</string>
+    <string name="settings_notification_method">Pranešimo metodas</string>
+    <string name="unifiedpush_distributor_background_sync">Foninis sinchronizavimas</string>
+    <string name="unifiedpush_distributor_fcm_fallback">Google Paslaugos</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Pasirinkite, kaip gauti pranešimus</string>
+    <string name="screen_sharing_notification_description">Vyksta ekrano bendrinimas</string>
+    <string name="screen_sharing_notification_title">${app_name} Ekrano bendrinimas</string>
+    <string name="room_message_autocomplete_notification">Kambario pranešimas</string>
+    <string name="room_message_autocomplete_users">Naudotojai</string>
+    <string name="room_message_notify_everyone">Pranešti visam kambariui</string>
+    <plurals name="message_reaction_show_more">
+        <item quantity="one">%1$d daugiau</item>
+        <item quantity="few">%1$d daugiau</item>
+        <item quantity="other">%1$d daugiau</item>
+    </plurals>
+    <string name="message_reaction_show_less">Rodyti mažiau</string>
+    <string name="tooltip_attachment_location">Bendrinti vietą</string>
+    <string name="tooltip_attachment_poll">Kurti apklausą</string>
+    <string name="tooltip_attachment_contact">Atidaryti kontaktus</string>
+    <string name="tooltip_attachment_sticker">Siųsti lipduką</string>
+    <string name="tooltip_attachment_file">Įkelti failą</string>
+    <string name="upgrade_required">Reikalingas atnaujinimas</string>
+    <string name="upgrade">Atnaujinti</string>
+    <string name="it_may_take_some_time">Būkite kantrūs, tai gali užtrukti.</string>
+    <string name="joining_replacement_room">Prisijungti prie pakaitinio kambario</string>
+    <string name="unnamed_room">Nepavadintas kambarys</string>
+    <string name="space_leave_prompt_msg_as_admin">Jūs esate vienintelis šios erdvės administratorius. Jei ją paliksite, tai reikš, kad niekas jos nebekontroliuos.</string>
+    <string name="space_leave_prompt_msg_private">Negalėsite prisijungti vėl, nebent būsite pakviestas iš naujo.</string>
+    <string name="space_leave_prompt_msg_only_you">Jūs esate vienintelis čia esantis asmuo. Jei paliksite, ateityje niekas, įskaitant jus, negalės prisijungti.</string>
+    <string name="space_leave_prompt_msg_with_name">Ar tikrai norite palikti %s\?</string>
+    <string name="space_leave_radio_button_none">Nepalikti nė vieno</string>
+    <string name="space_leave_radio_button_all">Palikti visus</string>
+    <string name="space_leave_radio_buttons_title">Dalykai šioje erdvėje</string>
+    <string name="join_anyway">Vistiek prisijungti</string>
+    <string name="skip_for_now">Kol kas praleisti</string>
+    <string name="finish_setting_up_discovery">Baigti nustatyti atradimą.</string>
+    <string name="room_alias_preview_not_found">Šiuo metu šis pseudonimas neprieinamas.
+\nPabandykite vėliau arba paprašykite kambario administratoriaus patikrinti, ar turite prieigą.</string>
+    <string name="discovery_section">Atradimas (%s)</string>
+    <string name="finish_setup">Užbaigti sąranka</string>
+    <string name="discovery_invite">Kvieskite el. paštu, ieškokite kontaktų ir daugiau…</string>
+    <string name="invite_just_to_this_room_desc">Jie nebus %s dalis</string>
+    <string name="invite_just_to_this_room">Tik į šį kambarį</string>
+    <string name="create_space_identity_server_info_none">Šiuo metu nenaudojate tapatybės serverio. Norėdami pakviesti komandos draugus ir būti jų atrandami, sukonfigūruokite jį toliau.</string>
+    <string name="join_space">Prisijungti prie erdvės</string>
+    <string name="create_space">Sukurti erdvę</string>
+    <string name="share_space_link_message">Prisijunkite prie mano erdvės %1$s %2$s</string>
+    <string name="invite_to_space_with_name_desc">Jie galės tyrinėti %s</string>
+    <string name="invite_to_space_with_name">Pakvietimas į %s</string>
+    <string name="invite_people_to_your_space">Kviesti žmones į savo erdvę</string>
+    <string name="create_space_topic_hint">Aprašymas</string>
+    <string name="create_spaces_loading_message">Kuriama erdvė…</string>
+    <string name="create_spaces_default_public_random_room_name">Atsitiktinis</string>
+    <string name="create_spaces_default_public_room_name">Bendra</string>
+    <string name="create_spaces_room_private_header_desc">Sukurkime kiekvienai iš jų po kambarį. Vėliau galite pridėti ir daugiau, įskaitant jau esamus.</string>
+    <string name="create_spaces_room_private_header">Su kokiais dalykais dirbate\?</string>
+    <string name="create_spaces_invite_public_header_desc">Užtikrinkite, kad prieigą prie %s kompanijos turėtų tinkami žmonės. Vėliau galite pakviesti daugiau.</string>
+    <string name="create_spaces_invite_public_header">Kas yra jūsų komandos draugai\?</string>
+    <string name="create_spaces_room_public_header_desc">Mes sukursime joms kambarius. Vėliau galėsite pridėti ir daugiau.</string>
+    <string name="create_spaces_room_public_header">Kokias diskusijas norite turėti %s\?</string>
+    <string name="create_space_error_empty_field_space_name">Suteikite jai pavadinimą, kad galėtumėte tęsti.</string>
+    <string name="create_spaces_details_private_header">Pridėkite šiek tiek detalių, kad žmonės galėtų ją atpažinti. Jas galite keisti bet kuriuo metu.</string>
+    <string name="create_spaces_details_public_header">Įtraukite keletą detalių, kurios padės išsiskirti. Jas galite keisti bet kuriuo metu.</string>
+    <string name="activity_create_space_title">Sukurti erdvę</string>
+    <string name="create_spaces_private_teammates">Privati erdvė jums &amp; jūsų komandos draugams</string>
+    <string name="create_spaces_me_and_teammates">Aš ir komandos draugai</string>
+    <string name="create_spaces_organise_rooms">Privati erdvė kambariams organizuoti</string>
+    <string name="create_spaces_just_me">Tik aš</string>
+    <string name="create_spaces_make_sure_access">Užtikrinkite, kad prieigą prie %s turėtų tinkami asmenys.</string>
+    <string name="create_spaces_who_are_you_working_with">Su kuo dirbate\?</string>
+    <string name="create_spaces_join_info_help">Norėdami prisijungti prie esamos erdvės, turite gauti kvietimą.</string>
+    <string name="create_spaces_you_can_change_later">Galite tai pakeisti vėliau</string>
+    <string name="create_spaces_choose_type_label">Kokio tipo erdvę norite sukurti\?</string>
+    <string name="your_private_space">Jūsų privati erdvė</string>
+    <string name="your_public_space">Jūsų vieša erdvė</string>
+    <string name="add_space">Pridėti erdvę</string>
+    <string name="private_space">Privati erdvė</string>
+    <string name="public_space">Vieša erdvė</string>
+    <string name="command_description_join_space">Prisijungti prie erdvės su nurodytu id</string>
+    <string name="command_description_add_to_space">Pridėti prie nurodytos erdvės</string>
+    <string name="command_description_create_space">Sukurti erdvę</string>
+    <string name="auth_invalid_login_param_space_in_password">Neteisingas naudotojo vardas ir (arba) slaptažodis. Įvestas slaptažodis prasideda arba baigiasi tarpais, patikrinkite jį.</string>
+    <string name="create_space_in_progress">Kuriama erdvė…</string>
+    <string name="create_space_alias_hint">Erdvės adresas</string>
+    <string name="permalink_unsupported_groups">Negalima atidaryti šios nuorodos: bendruomenės buvo pakeistos erdvėmis</string>
+    <string name="a11y_open_spaces">Atidaryti erdvių sąrašą</string>
+    <string name="send_feedback_space_info">Naudojate erdvių beta versiją. Jūsų atsiliepimai padės parengti kitas versijas. Jūsų platforma ir naudotojo vardas bus pažymėti, kad galėtume kuo geriau pasinaudoti jūsų atsiliepimais.</string>
+    <string name="send_feedback_space_title">Atsiliepimai apie erdves</string>
+    <string name="create_new_space">Sukurti naują erdvę</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Kitos erdvės ar kambariai, apie kuriuos galbūt nežinote</string>
+    <string name="space_you_know_that_contains_this_room">Erdvė, apie kurią žinote, kurioje yra šis kambarys</string>
+    <string name="tap_to_edit_spaces">Bakstelėkite, kad redaguoti erdves</string>
+    <string name="select_spaces">Pasirinkti erdves</string>
+    <string name="decide_which_spaces_can_access">Nuspręskite, kurios erdvės gali prieit prie šio kambario. Jei pasirinkta erdvė, jos nariai galės rasti kambario pavadinimą ir prie jo prisijungti.</string>
+    <string name="spaces_which_can_access">Erdvės, kurios gali pasiekti</string>
+    <string name="allow_space_member_to_find_and_access">Leisti erdvės nariams rasti ir pasiekti.</string>
+    <string name="room_create_member_of_space_name_can_join">Erdvės %s nariai gali rasti, peržiūrėti ir prisijungti.</string>
+    <string name="room_settings_room_access_restricted_description">Kiekvienas, esantis erdvėje, kurioje yra šis kambarys, gali jį rasti ir prie jo prisijungti. Tik šio kambario administratoriai gali jį įtraukti į erdvę.</string>
+    <string name="room_settings_room_access_restricted_title">Tik erdvės nariams</string>
+    <string name="room_settings_space_access_public_description">Bet kas gali rasti šią erdvę ir prisijungti</string>
+    <string name="space_settings_alias_subtitle">Peržiūrėti ir valdyti šios erdvės adresus.</string>
+    <string name="space_settings_alias_title">Erdvės adresai</string>
+    <string name="room_settings_space_access_title">Erdvės prieiga</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s ir %2$d kitas</item>
+        <item quantity="few">%1$s ir %2$d kiti</item>
+        <item quantity="other">%1$s ir %2$d kitų</item>
+    </plurals>
+    <string name="room_permissions_upgrade_the_space">Atnaujinti erdvę</string>
+    <string name="room_permissions_change_space_name">Keisti erdvės pavadinimą</string>
+    <string name="room_permissions_enable_space_encryption">Įjungti erdvės šifravimą</string>
+    <string name="room_permissions_change_main_address_for_the_space">Keisti erdvės pagrindinį adresą</string>
+    <string name="room_permissions_change_space_avatar">Keisti erdvės avatarą</string>
+    <string name="space_permissions_notice_read_only">Neturite leidimo atnaujinti roles, reikalingas įvairioms šios erdvės dalims keisti</string>
+    <string name="space_permissions_notice">Pasirinkite roles, reikalingas įvairioms šios erdvės dalims keisti</string>
+    <string name="space_settings_permissions_subtitle">Peržiūrėkite ir atnaujinkite roles, reikalingas įvairioms erdvės dalims keisti.</string>
+    <string name="space_settings_permissions_title">Erdvės leidimai</string>
+    <string name="space_participants_unban_prompt_msg">Atblokavus naudotoją, jis vėl galės prisijungti prie erdvės.</string>
+    <string name="space_participants_ban_prompt_msg">Užblokavus naudotoją, jis bus pašalintas iš šios erdvės ir negalės prisijungti dar kartą.</string>
+    <string name="space_participants_remove_prompt_msg">Naudotojas bus pašalintas iš šios erdvės.
+\n
+\nKad jis negalėtų prisijungti dar kartą, turėtumėte jį užblokuoti.</string>
+    <string name="spaces_header">Erdvės</string>
+    <string name="space_list_empty_message">Erdvės - tai naujas kambarių ir žmonių grupavimo būdas. Sukurkite erdvę ir pradėkite.</string>
+    <string name="space_list_empty_title">Erdvių dar nėra.</string>
+    <string name="spaces">Erdvės</string>
+    <string name="change_space">Keisti erdvę</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Atsarginė kopija turi galiojantį parašą iš nepatvirtintos sesijos %s</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Atsarginė kopija turi galiojantį parašą iš patvirtintos sesijos %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Atsarginė kopija turi galiojantį šios sesijos parašą.</string>
+    <string name="keys_backup_settings_signature_from_this_user">Atsarginė kopija turi galiojantį šio naudotojo parašą.</string>
+    <string name="keys_backup_settings_signature_from_unknown_device">Atsarginė kopija turi nežinomos sesijos parašą su ID %s.</string>
+    <string name="keys_backup_settings_status_not_setup">Jūsų raktų atsarginės kopijos iš šios sesijos nedaromos.</string>
+    <string name="keys_backup_settings_status_ko">Šioje sesijoje raktų atsarginė kopija nėra aktyvi.</string>
+    <string name="keys_backup_settings_status_ok">Šiai sesijai teisingai nustatyta atsarginė raktų kopija.</string>
+    <string name="keys_backup_settings_delete_backup_button">Ištrinti atsarginę kopiją</string>
+    <string name="keys_backup_settings_restore_backup_button">Atkurti iš atsarginės kopijos</string>
+    <string name="keys_backup_get_version_error">Nepavyko gauti naujausios atkūrimo raktų versijos (%s).</string>
+    <plurals name="keys_backup_restore_success_description_part2">
+        <item quantity="one">%d naujas raktas buvo pridėtas prie šios sesijos.</item>
+        <item quantity="few">%d nauji raktai buvo pridėti prie šios sesijos.</item>
+        <item quantity="other">%d naujų raktų buvo pridėta prie šios sesijos.</item>
+    </plurals>
+    <plurals name="keys_backup_restore_success_description_part1">
+        <item quantity="one">Atkurta atsarginė kopija su %d raktu.</item>
+        <item quantity="few">Atkurta atsarginė kopija su %d raktais.</item>
+        <item quantity="other">Atkurta atsarginė kopija su %d raktų.</item>
+    </plurals>
+    <string name="keys_backup_restore_success_title">Atkurta atsarginė kopija %s !</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Atsarginės kopijos nepavyko iššifruoti naudojant šį atkūrimo raktą: patikrinkite, ar įvedėte teisingą atkūrimo raktą.</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Įveskite atkūrimo raktą</string>
+    <string name="keys_backup_unlock_button">Atrakinti istoriją</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">Importuojami raktai…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">Atsisiunčiami raktai…</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Apskaičiuojame atkūrimo raktą…</string>
+    <string name="keys_backup_restoring_waiting_message">Atkuriama atsarginė kopija:</string>
+    <string name="keys_backup_passphrase_error_decrypt">Atsarginės kopijos nepavyko iššifruoti naudojant šią slaptafrazę: patikrinkite, ar įvedėte teisingą atkūrimo slaptafrazę.</string>
+    <string name="keys_backup_restore_with_key_helper">Pametėte atkūrimo raktą\? Galite nustatyti naują nustatymuose.</string>
+    <string name="keys_backup_restore_key_enter_hint">Įvesti atkūrimo raktą</string>
+    <string name="keys_backup_restore_with_recovery_key">Naudoti atkūrimo raktą, kad atrakinti užšifruotų žinučių istoriją</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Nežinote savo atkūrimo slaptafrazės, galite %s.</string>
+    <string name="keys_backup_restore_use_recovery_key">naudokite savo atkūrimo raktą</string>
+    <string name="keys_backup_restore_with_passphrase">Naudokite atkūrimo slaptafrazę, kad atrakintumėte užšifruotų žinučių istoriją</string>
+    <string name="keys_backup_restore_is_getting_backup_version">Gauname atsarginę versiją…</string>
+    <string name="keys_backup_setup_skip_msg">Jei atsijungsite arba prarasite šį prietaisą, galite prarasti prieigą prie savo žinučių.</string>
+    <string name="keys_backup_setup_skip_title">Ar esate tikri\?</string>
+    <string name="unexpected_error">Netikėta klaida</string>
+    <string name="recovery_key">Atkūrimo raktas</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Generuojame atkūrimo raktą naudojant slaptafrazę, šis procesas gali užtrukti kelioliką sekundžių.</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Bendrinti atkūrimo raktą su…</string>
+    <string name="keys_backup_setup_step3_please_make_copy">Prašome pasidaryti kopiją</string>
+    <string name="keys_backup_setup_override_stop">Sustabdyti</string>
+    <string name="keys_backup_setup_override_replace">Pakeisti</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Atrodo, kad jau esate sukūrę atsarginę raktų kopiją iš kitos sesijos. Ar norite ją pakeisti kuriama\?</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">Jūsų namų serveryje jau yra atsarginė kopija</string>
+    <string name="recovery_key_export_saved">Atkūrimo raktas buvo išsaugotas.</string>
+    <string name="keys_backup_setup_step3_save_button_title">Įrašyti kaip failą</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">Bendrinti</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Išsaugoti atkūrimo raktą</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Padariau kopiją</string>
+    <string name="keys_backup_setup_step3_button_title">Baigta</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Atkūrimo raktą laikykite labai saugioje vietoje, pvz., slaptažodžių tvarkyklėje (arba seife)</string>
+    <string name="keys_backup_setup_step3_text_line2">Atkūrimo raktas yra apsauginis tinklas - juo galite atkurti prieigą prie užšifruotų žinučių, jei pamiršite slaptafrazę.
+\nAtkūrimo raktą laikykite labai saugioje vietoje, pvz., slaptažodžių tvarkyklėje (arba seife)</string>
+    <string name="keys_backup_setup_step3_text_line1">Jūsų raktų atsarginė kopija yra kuriama.</string>
+    <string name="keys_backup_setup_step3_success_title">Sėkmė !</string>
+    <string name="keys_backup_setup_step2_skip_button_title">(Išplėstinė) Nustatyti su atkūrimo raktu</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Arba apsaugokite atsarginę kopiją naudodami atkūrimo raktą ir išsaugokite ją saugioje vietoje.</string>
+    <string name="keys_backup_setup_creating_backup">Atsarginės kopijos kūrimas</string>
+    <string name="keys_backup_setup_step2_button_title">Nustatyti slaptafrazę</string>
+    <string name="keys_backup_setup_step2_text_description">Jūsų namų serveryje išsaugosime šifruotą raktų kopiją. Apsaugokite atsarginę kopiją slaptafraze, kad ji būtų saugi.
+\n
+\nSiekiant maksimalaus saugumo, ji turėtų skirtis nuo jūsų paskyros slaptažodžio.</string>
+    <string name="keys_backup_setup_step2_text_title">Apsaugokite atsarginę kopiją slaptafraze.</string>
+    <string name="keys_backup_setup_step1_manual_export">Eksportuoti raktus rankiniu būdu</string>
+    <string name="keys_backup_setup_step1_advanced">(Išplėstiniai)</string>
+    <string name="keys_backup_setup">Pradėti naudoti raktų atsarginį kopijavimą</string>
+    <string name="keys_backup_setup_step1_description">Užšifruotuose kambariuose siunčiamos žinutės yra apsaugotos šifravimu nuo galo iki galo. Tik jūs ir gavėjas (-ai) turite raktus, kad galėtumėte perskaityti šias žinutes.
+\n
+\nSaugiai kurkite atsargines raktų kopijas, kad jų neprarastumėte.</string>
+    <string name="keys_backup_setup_step1_title">Niekada nepraraskite užšifruotų žinučių</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Ištrinkite slaptafrazę, jei norite, kad ${app_name} sugeneruotų atkūrimo raktą.</string>
+    <string name="passphrase_passphrase_too_weak">Slaptafrazė yra per silpna</string>
+    <string name="passphrase_empty_error_message">Įveskite slaptafrazę</string>
+    <string name="passphrase_passphrase_does_not_match">Slaptafrazė nesutampa</string>
+    <string name="passphrase_enter_passphrase">Įvesti slaptafrazę</string>
+    <string name="passphrase_confirm_passphrase">Patvirtinti slaptafrazę</string>
+    <string name="passphrase_create_passphrase">Sukurti slaptafrazę</string>
+    <string name="no_valid_google_play_services_apk">Nerastas galiojantis Google Play Paslaugų APK. Pranešimai gali neveikti tinkamai.</string>
+    <string name="x_plus">+%d</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="merged_events_collapse">suskleisti</string>
+    <string name="merged_events_expand">išplėsti</string>
+    <string name="unknown_error">Atsiprašome, įvyko klaida</string>
+    <string name="resource_limit_hard_contact">Jei norite toliau naudotis šia paslauga, prašome %s.</string>
+    <string name="resource_limit_soft_contact">Prašome %s kad padidinti šią ribą.</string>
+    <string name="resource_limit_hard_mau">Šis namų serveris pasiekė savo mėnesio aktyviųjų naudotojų limitą.</string>
+    <string name="resource_limit_soft_mau"> Šis namų serveris pasiekė mėnesio aktyviųjų naudotojų limitą, todėl <b>kai kurie naudotojai negalės prisijungti</b>.</string>
+    <string name="resource_limit_hard_default">Šis namų serveris viršijo vieną iš savo išteklių limitų.</string>
+    <string name="resource_limit_soft_default">Šis namų serveris viršijo vieną iš savo išteklių limitų, todėl <b>kai kurie naudotojai negalės prisijungti</b>.</string>
+    <string name="resource_limit_contact_admin">kreipkitės į savo paslaugų administratorių</string>
+    <string name="room_tombstone_predecessor_link">Spustelėkite čia, kad pamatytumėte senesnes žinutes</string>
+    <string name="room_tombstone_continuation_description">Šis kambarys yra kito pokalbio tęsinys</string>
+    <string name="room_tombstone_continuation_link">Pokalbis tęsiamas čia</string>
+    <string name="room_tombstone_versioned_description">Šis kambarys buvo pakeistas ir nebėra aktyvus.</string>
+    <string name="error_empty_field_your_password">Įveskite savo slaptažodį.</string>
+    <string name="error_empty_field_enter_user_name">Įveskite naudotojo vardą.</string>
+    <string name="deactivate_account_submit">Deaktyvuoti paskyrą</string>
+    <string name="deactivate_account_delete_checkbox">Prašau pamiršti visas mano išsiųstas žinutes, kai mano paskyra bus deaktyvuota (Įspėjimas: dėl to būsimi naudotojai matys nepilną pokalbių vaizdą)</string>
+    <string name="deactivate_account_content">Dėl to jūsų paskyra visam laikui taps netinkama naudoti. Negalėsite prisijungti ir niekas negalės iš naujo užregistruoti to paties naudotojo ID. Dėl to jūsų paskyra išeis iš visų kambarių, kuriuose dalyvauja, ir iš jūsų tapatybės serverio bus pašalinti jūsų paskyros duomenys. <b>Šis veiksmas yra negrįžtamas</b>.
+\n
+\nDeaktyvavus paskyrą <b>pagal numatytuosius nustatymus nepamirštame jūsų išsiųstų žinučių</b>. Jei norite, kad pamirštume jūsų žinutes, pažymėkite toliau esantį langelį.
+\n
+\nŽinučių matomumas Matrix sistemoje yra panašus į el. pašto matomumą. Mūsų jūsų žinučių užmiršimas reiškia, kad jūsų išsiųstomis žinutėmis nebus dalijamasi su jokiais naujais ar neregistruotais naudotojais, tačiau registruoti naudotojai, kurie jau turi prieigą prie šių žinučių, vis tiek turės prieigą prie jų kopijos.</string>
+    <string name="deactivate_account_title">Deaktyvuoti paskyrą</string>
+    <string name="dialog_user_consent_submit">Peržiūrėti dabar</string>
+    <string name="dialog_user_consent_content">Norėdami toliau naudoti %1$s namų serverį, turite peržiūrėti ir sutikti su nuostatomis ir sąlygomis.</string>
+    <string name="avatar">Avataras</string>
+    <string name="reason_colon">Priežastis: %1$s</string>
+    <string name="has_been_banned">%2$s jus užblokavo iš %1$s</string>
+    <string name="has_been_removed">%2$s jus pašalino iš %1$s</string>
+    <string name="invited">Pakviestas</string>
+    <string name="rooms">Kambariai</string>
+    <string name="group_details_home">Pradžia</string>
+    <string name="create">Sukurti</string>
+    <string name="encrypted_message">Šifruota žinutė</string>
+    <string name="notification_noisy">Triukšmingas</string>
+    <string name="notification_silent">Tylus</string>
+    <string name="widget_integration_no_permission_in_room">Jūs neturite leidimo tai daryti šiame kambaryje.</string>
+    <string name="widget_integration_must_be_in_room">Jūs nesate šiame kambaryje.</string>
+    <string name="room_add_matrix_apps">Pridėti Matrix programėlių</string>
+    <string name="widget_integration_missing_parameter">Trūksta reikalingo parametro.</string>
+    <string name="widget_integration_room_not_visible">Kambarys %s nėra matomas.</string>
+    <string name="room_widget_resource_decline_permission">Blokuoti visus</string>
+    <string name="room_widget_resource_grant_permission">Leisti</string>
+    <string name="room_widget_permission_room_id">Kambario ID</string>
+    <string name="room_widget_webview_access_microphone">Naudoti mikrofoną</string>
+    <string name="room_widget_webview_access_camera">Naudoti kamerą</string>
+    <string name="room_manage_integrations">Tvarkyti integracijas</string>
+    <string name="your_unverified_device_requesting">Jūsų nepatvirtinta sesija \'%s\' prašo šifravimo raktų.</string>
+    <string name="you_added_a_new_device_with_info">Nauja sesija prašo šifravimo raktų.
+\nSesijos pavadinimas: %1$s
+\nPaskutinį kartą matyta: %2$s
+\nJei neprisijungėte prie kitos sesijos, ignoruokite šią užklausą.</string>
+    <string name="you_added_a_new_device">Pridėjote naują sesiją \'%s\', kuri prašo šifravimo raktų.</string>
+    <string name="your_unverified_device_requesting_with_info">Nepatvirtinta sesija prašo šifravimo raktų.
+\nSesijos pavadinimas: %1$s
+\nPaskutinį kartą matyta: %2$s
+\nJei neprisijungėte prie kitos sesijos, ignoruokite šią užklausą.</string>
+    <string name="command_description_op_user">Nustatyti naudotojo galios lygį</string>
+    <string name="command_description_unignore_user">Nustoja ignoruoti naudotoją ir rodo jo žinutes nuo dabar</string>
+    <string name="command_description_ignore_user">ignoruoja naudotoją, slepiant jo žinutes nuo jūsų</string>
+    <string name="command_description_unban_user">Atblokuoja naudotoją su nurodytu id</string>
+    <string name="command_description_ban_user">Užblokuoja naudotoją su nurodytu id</string>
+    <string name="command_description_emote">Rodo veiksmą</string>
+    <string name="command_description_join_room">Prisijungia prie kambario su nurodytu adresu</string>
+    <string name="command_description_invite_user">Pakviečia naudotoją su nurodytu id į šį kambarį</string>
+    <string name="command_description_room_name">Nustato kambario pavadinimą</string>
+    <string name="markdown_has_been_disabled">Markdown buvo išjungtas.</string>
+    <string name="markdown_has_been_enabled">Markdown buvo įjungtas.</string>
+    <string name="command_description_whois">Rodo informaciją apie naudotoją</string>
+    <string name="command_description_room_avatar">Pakeičia šio kambario avatarą</string>
+    <string name="command_description_nick_for_room">Pakeičia jūsų rodomą slapyvardį tik šiame kambaryje</string>
+    <string name="command_description_avatar_for_room">Pakeičia jūsų avatarą tik šiame kambaryje</string>
+    <string name="command_description_nick">Pakeičia jūsų rodomą slapyvardį</string>
+    <string name="command_description_remove_user">Pašalina naudotoją su nurodytu id iš šio kambario</string>
+    <string name="command_description_topic">Nustatyti kambario temą</string>
+    <string name="command_description_part_room">Palikti kambarį</string>
+    <string name="unrecognized_command">Neatpažinta komanda: %s</string>
+    <string name="start_verification">Pradėti patvirtinimą</string>
+    <string name="command_error">Komandos klaida</string>
+    <string name="ignore_request_short_label">Ignoruoti</string>
+    <string name="share_without_verifying_short_label">Bendrinti</string>
+    <string name="command_not_supported_in_threads">Komanda \"%s\" atpažįstama, bet nepalaikoma temose.</string>
+    <string name="command_problem_with_parameters">Komandai \"%s\" reikia daugiau parametrų arba kai kurie parametrai yra neteisingi.</string>
+    <plurals name="room_details_selected">
+        <item quantity="one">%d pasirinktas</item>
+        <item quantity="few">%d pasirinkti</item>
+        <item quantity="other">%d pasirinktų</item>
+    </plurals>
+    <string name="room_permissions_change_topic">Keisti temą</string>
+    <string name="room_permissions_upgrade_the_room">Atnaujinti kambarį</string>
+    <string name="room_permissions_default_role">Numatyta rolė</string>
+    <string name="room_permissions_notice_read_only">Neturite leidimo atnaujinti roles, reikalingas įvairioms kambario dalims keisti</string>
+    <string name="room_permissions_notice">Pasirinkite roles, reikalingas įvairioms kambario dalims keisti</string>
+    <string name="room_permissions_title">Leidimai</string>
+    <string name="room_settings_permissions_subtitle">Peržiūrėti ir atnaujinti roles, reikalingas įvairioms kambario dalims keisti.</string>
+    <string name="room_settings_permissions_title">Kambario leidimai</string>
+    <string name="ssl_only_accept">Sertifikatą priimkite tik tuo atveju, jei serverio administratorius yra paskelbęs antspaudą, atitinkantį pirmiau nurodytą.</string>
+    <string name="ssl_expected_existing_expl">Sertifikatas pakeistas iš anksčiau patikimo į nepatikimą. Serveris galėjo atnaujinti savo sertifikatą. Kreipkitės į serverio administratorių dėl numatyto antspaudo.</string>
+    <string name="ssl_unexpected_existing_expl">Sertifikatas pakeistas iš to, kuriuo pasitikėjo jūsų telefonas. Tai LABAI NEĮPRASTA. Rekomenduojama NEPATVIRTINTI šio naujo sertifikato.</string>
+    <string name="ssl_cert_new_account_expl">Jei serverio administratorius nurodė, kad to tikimasi, įsitikinkite, kad toliau pateiktas antspaudas atitinka jo pateiktą antspaudą.</string>
+    <string name="ssl_cert_not_trust">Tai gali reikšti, kad kažkas piktavališkai perima jūsų duomenų srautą arba kad telefonas nepasitiki nuotolinio serverio pateiktu sertifikatu.</string>
+    <string name="ssl_could_not_verify">Nepavyko patvirtinti nuotolinio serverio tapatybės.</string>
+    <string name="ssl_fingerprint_hash">Antspaudas (%s):</string>
+    <string name="ssl_remain_offline">Ignoruoti</string>
+    <string name="ssl_do_not_trust">Nepasitikėti</string>
+    <string name="ssl_trust">Pasitikėti</string>
+    <plurals name="room_new_messages_notification">
+        <item quantity="one">%d nauja žinutė</item>
+        <item quantity="few">%d naujos žinutės</item>
+        <item quantity="other">%d naujų žinučių</item>
+    </plurals>
+    <string name="room_unsupported_e2e_algorithm_as_admin">Šifravimas buvo neteisingai sukonfigūruotas, todėl negalite siųsti žinučių. Spustelėkite, kad atidarytumėte nustatymus.</string>
+    <string name="room_unsupported_e2e_algorithm">Šifravimas buvo neteisingai sukonfigūruotas, todėl negalite siųsti žinučių. Susisiekite su administratoriumi, kad būtų atkurta galiojanti šifravimo būsena.</string>
+    <string name="room_do_not_have_permission_to_post">Jūs neturite leidimo rašyti šiame kambaryje.</string>
+    <string name="room_notification_more_than_two_users_are_typing">%1$s, %2$s ir kiti</string>
+    <string name="room_notification_two_users_are_typing">%1$s ir %2$s</string>
+    <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; kiti rašo…</string>
+    <string name="room_two_users_are_typing">%1$s &amp; %2$s rašo…</string>
+    <string name="room_one_user_is_typing">%s rašo…</string>
+    <string name="room_participants_unban_prompt_msg">Atblokavus naudotoją, jis vėl galės prisijungti prie kambario.</string>
+    <string name="room_participants_ban_prompt_msg">Užblokavus naudotoją, jis bus pašalintas iš šio kambario ir negalės prisijungti dar kartą.</string>
+    <string name="room_participants_unban_title">Atblokuoti naudotoją</string>
+    <string name="room_participants_ban_reason">Priežastis užblokavimui</string>
+    <string name="settings_advanced">Išplėstiniai</string>
+    <string name="settings_other">Kita</string>
+    <string name="settings_ignored_users">Ignoruojami naudotojai</string>
+    <string name="settings_user_settings">Naudotojo nustatymai</string>
+    <string name="settings_clear_media_cache">Išvalyti medijos talpyklą</string>
+    <string name="settings_clear_cache">Išvalyti talpyklą</string>
+    <string name="settings_keep_media">Saugoti mediją</string>
+    <string name="settings_privacy_policy">Privatumo politika</string>
+    <string name="settings_copyright">Autorinės teisės</string>
+    <string name="settings_third_party_notices">Trečiųjų šalių pastabos</string>
+    <string name="settings_app_term_conditions">Terminai ir sąlygos</string>
+    <plurals name="seconds">
+        <item quantity="one">%d sekundė</item>
+        <item quantity="few">%d sekundės</item>
+        <item quantity="other">%d sekundžių</item>
+    </plurals>
+    <string name="settings_set_sync_delay">Uždelsimas tarp kiekvieno sinchronizavimo</string>
+    <string name="settings_set_sync_timeout">Sinchronizavimo užklausos laiko limitas</string>
+    <string name="settings_start_on_boot">Paleisti sistemos paleidimo metu</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Kai programėlė yra fone, apie gautus pranešimus nebūsite informuojami.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Nėra foninio sinchronizavimo</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} sinchronizuosis fone periodiškai tiksliai nustatytu laiku (galima konfigūruoti).
+\nTai turės įtakos radijo ryšio ir baterijos naudojimui, bus rodomas nuolatinis pranešimas, kad ${app_name} klausosi įvykių.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimizuotas realiajam laikui</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">${app_name} bus sinchronizuojama fone taip, kad būtų tausojami riboti įrenginio ištekliai (akumuliatorius).
+\nPriklausomai nuo įrenginio išteklių būklės, operacinė sistema gali atidėti sinchronizavimą.</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimizuotas akumuliatoriui</string>
+    <string name="settings_background_fdroid_sync_mode">Foninio sinchronizavimo režimas</string>
+    <string name="settings_background_sync">Foninis sinchronizavimas</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Mobiliuosiuose įrenginiuose negausite pranešimų apie užšifruotuose kambariuose esančius paminėjimus ir raktažodžius.</string>
+    <string name="settings_room_upgrades">Kambario atnaujinimai</string>
+    <string name="settings_messages_by_bot">Boto žinutės</string>
+    <string name="settings_call_invitations">Kvietimai skambinti</string>
+    <string name="settings_room_invitations">Kvietimai į kambarį</string>
+    <string name="settings_messages_containing_keywords">Raktažodžiai</string>
+    <string name="settings_mentions_at_room">\@kambarys</string>
+    <string name="settings_encrypted_group_messages">Šifruotos grupių žinutės</string>
+    <string name="settings_group_messages">Grupių žinutės</string>
+    <string name="settings_encrypted_direct_messages">Šifruotos tiesioginės žinutės</string>
+    <string name="settings_messages_direct_messages">Tiesioginės žinutės</string>
+    <string name="settings_messages_containing_username">Mano naudotojo vardas</string>
+    <string name="settings_messages_containing_display_name">Mano rodomas vardas</string>
+    <string name="settings_messages_at_room">Žinutės, kuriose yra @room</string>
+    <string name="settings_messages_sent_by_bot">Boto išsiųstos žinutės</string>
+    <string name="settings_invited_to_room">Kai mane pakviečia į kambarį</string>
+    <string name="settings_messages_in_group_chat">Žinutės grupiniuose pokalbiuose</string>
+    <string name="settings_messages_in_one_to_one">Žinutės pokalbiuose vienas su vienu</string>
+    <string name="settings_containing_my_user_name">Žinutės, kuriose yra mano naudotojo vardas</string>
+    <string name="settings_containing_my_display_name">Žinutės, kuriose yra mano rodomas vardas</string>
+    <string name="settings_when_rooms_are_upgraded">Kai kambariai atnaujinami</string>
+    <string name="settings_messages_in_e2e_group_chat">Šifruotos žinutės grupiniuose pokalbiuose</string>
+    <string name="settings_messages_in_e2e_one_to_one">Šifruotos žinutės pokalbiuose vienas su vienu</string>
+    <string name="settings_system_preferences_summary">Pasirinkti LED spalvą, vibraciją, garsą…</string>
+    <string name="settings_silent_notifications_preferences">Tyliųjų pranešimų konfigūravimas</string>
+    <string name="settings_call_notifications_preferences">Skambučių pranešimų konfigūravimas</string>
+    <string name="settings_noisy_notifications_preferences">Triukšmingų pranešimų konfigūravimas</string>
+    <string name="settings_enable_this_device">Įjungti pranešimus šiai sesijai</string>
+    <string name="settings_enable_all_notif">Įjungti pranešimus šiai paskyrai</string>
+    <string name="settings_notification_ringtone">Pranešimo garsas</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Ignoruoti optimizavimą</string>
+    <string name="settings_troubleshoot_test_battery_failed">Jei naudotojas kurį laiką palieka prietaisą atjungtą nuo elektros tinklo ir nejudantį, su išjungtu ekranu, prietaisas įjungia \"Doze\" režimą. Tai neleidžia programoms prisijungti prie tinklo ir atideda jų darbus, sinchronizavimą ir standartinius žadintuvus.</string>
+    <string name="settings_troubleshoot_test_battery_success">Akumuliatoriaus optimizavimas neįtakoja ${app_name}.</string>
+    <string name="settings_troubleshoot_test_battery_title">Akumuliatoriaus optimizavimas</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Išjungti apribojimus</string>
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Įjungti foniniai apribojimai ${app_name}.
+\nDarbas, kurį programa bando atlikti, bus agresyviai ribojamas, kol ji yra fone, ir tai gali turėti įtakos pranešimams.
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">Fono apribojimai išjungti ${app_name}. Šis testas turėtų būti atliekamas naudojant mobiliuosius duomenis (be WIFI).
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_title">Patikrinti fono apribojimus</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">Įjungti paleidimą sistemos paleidimo metu</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Paslauga nebus paleista iš naujo paleidus įrenginį, pranešimų negausite, kol vieną kartą nebus atidaryta ${app_name}.</string>
+    <string name="settings_troubleshoot_test_service_boot_success">Paslauga bus paleista iš naujo paleidus įrenginį.</string>
+    <string name="settings_troubleshoot_test_service_boot_title">Paleisti sistemos paleidimo metu</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">Pranešimas buvo paspaustas!</string>
+    <string name="settings_troubleshoot_test_notification_notice">Spustelėkite pranešimą. Jei pranešimo nematote, patikrinkite sistemos nustatymus.</string>
+    <string name="settings_troubleshoot_test_notification_title">Pranešimo rodymas</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Jūs žiūrite pranešimą! Spausk ant manęs!</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">Kai kurie pranešimai yra išjungti pasirinktiniuose nustatymuose.</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Atkreipkite dėmesį, kad kai kurie pranešimų tipai nustatyti kaip tylūs (pranešimas bus be garso).</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">Pasirinktiniai nustatymai.</string>
+    <string name="settings_troubleshoot_test_device_settings_failed">Šioje sesijoje pranešimai neįjungti.
+\nPatikrinkite ${app_name} nustatymus.</string>
+    <string name="settings_troubleshoot_test_device_settings_success">Šioje sesijoje pranešimai yra įjungti.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">Sesijos nustatymai.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Pranešimai jūsų paskyroje yra išjungti.
+\nPatikrinkite paskyros nustatymus.</string>
+    <string name="settings_troubleshoot_test_account_settings_success">Jūsų paskyroje pranešimai yra įjungti.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">Paskyros nustatymai.</string>
+    <string name="open_settings">Atidaryti nustatymus</string>
+    <string name="settings_troubleshoot_test_system_settings_failed">Sistemos nustatymuose pranešimai yra išjungti.
+\nPatikrinkite sistemos nustatymus.</string>
+    <string name="settings_troubleshoot_test_system_settings_success">Pranešimai yra įjungti sistemos nustatymuose.</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Sistemos nustatymai.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Vienas ar daugiau testų nepavyko, pateikite pranešimą apie klaidą ir padėkite mums ją ištirti.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Vienas ar daugiau testų nepavyko, išbandykite siūlomą (-us) pataisymą (-us).</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">Pagrindinė diagnostika yra gera. Jei vis dar negaunate pranešimų, pateikite pranešimą apie klaidą ir padėkite mums ją ištirti.</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">Vykdoma… (%1$d iš %2$d)</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">Atlikti bandymus</string>
+    <string name="settings_troubleshoot_diagnostic">Trikčių diagnostika</string>
+    <string name="settings_notification_troubleshoot">Pranešimų trikčių šalinimas</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Raktažodžiai negali turėti \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">Raktažodžiai negali prasidėti su \'.\'</string>
+    <string name="settings_notification_new_keyword">Pridėti naują raktažodį</string>
+    <string name="settings_notification_your_keywords">Jūsų raktažodžiai</string>
+    <string name="settings_notification_notify_me_for">Praneškite man apie</string>
+    <string name="settings_notification_other">Kita</string>
+    <string name="settings_notification_mentions_and_keywords">Paminėjimai ir raktažodžiai</string>
+    <string name="settings_notification_default">Numatyti pranešimai</string>
+    <string name="settings_notification_emails_enable_for_email">Įjungti pranešimus el. paštu %s</string>
+    <string name="settings_notification_emails_no_emails">Norėdami gauti pranešimą el. paštu, susiekite el. paštą su savo Matrix paskyra</string>
+    <string name="settings_notification_emails_category">Pranešimas el. paštu</string>
+    <string name="settings_notification_by_event">Pranešimo svarba pagal įvykį</string>
+    <string name="settings_notification_advanced">Išplėstiniai pranešimų nustatymai</string>
+    <string name="error_threepid_auth_failed">Įsitikinkite, kad paspaudėte jums atsiųstame el. laiške esančią nuorodą.</string>
+    <string name="settings_remove_three_pid_confirmation_content">Pašalinti %s\?</string>
+    <string name="settings_phone_numbers">Telefono numeriai</string>
+    <string name="settings_emails_empty">Prie jūsų paskyros nepridėtas joks el. paštas</string>
+    <string name="settings_emails">El. pašto adresai</string>
+    <string name="settings_app_info_link_summary">Rodyti programos informaciją sistemos nustatymuose.</string>
+    <string name="settings_app_info_link_title">Programos informacija</string>
+    <string name="settings_add_phone_number">Pridėti telefono numerį</string>
+    <string name="settings_phone_number_empty">Prie jūsų paskyros nepridėtas joks telefono numeris</string>
+    <string name="settings_add_email_address">Pridėti el. pašto adresą</string>
+    <string name="settings_display_name">Rodomas vardas</string>
+    <string name="settings_profile_picture">Profilio nuotrauka</string>
+    <string name="shortcut_disabled_reason_sign_out">Sesija buvo atjungta!</string>
+    <string name="search_space_two_parents">%1$s ir %2$s</string>
+    <string name="search_no_results">Nėra rezultatų</string>
+    <string name="search_banned_user_hint">Filtruoti užblokuotus narius</string>
+    <string name="search_members_hint">Filtruoti kambario narius</string>
+    <string name="search_hint">Ieškoti</string>
+    <string name="shortcut_disabled_reason_room_left">Kambarys buvo paliktas!</string>
+    <string name="room_settings_add_homescreen_shortcut">Pridėti prie pagrindinio ekrano</string>
+    <string name="room_settings_none">Nėra</string>
+    <string name="room_settings_mention_and_keyword_only">Tik paminėjimai &amp; raktažodžiai</string>
+    <string name="room_settings_all_messages">Visos žinutės</string>
+    <string name="room_threads_filter">Filtruoti temas kambaryje</string>
+    <string name="threads_notice_migration_title">Temos artėja prie beta versijos 🎉</string>
+    <string name="tooltip_attachment_gallery">Siųsti nuotraukas ir vaizdo įrašus</string>
+    <string name="tooltip_attachment_photo">Atidaryti fotoaparatą</string>
+    <string name="message_bubbles">Rodyti žinučių burbulus</string>
+    <string name="live_location_description">Tiesioginė buvimo vieta</string>
+    <string name="live_location_share_location_item_share">Bendrinti vietą</string>
+    <string name="live_location_not_enough_permission_dialog_description">Norėdami bendrinti tiesioginę buvimo vietą šiame kambaryje, turite turėti tinkamus leidimus.</string>
+    <string name="live_location_not_enough_permission_dialog_title">Neturite leidimo bendrinti tiesioginę buvimo vietą</string>
+    <string name="live_location_bottom_sheet_last_updated_at">Atnaujinta prieš %1$s</string>
+    <string name="labs_enable_live_location_summary">Laikinas pritaikymas: vietos išlieka kambario istorijoje</string>
+    <string name="labs_enable_live_location">Įjungti tiesioginį buvimo vietos bendrinimą</string>
+    <string name="live_location_sharing_notification_description">Bendrinama buvimo vieta</string>
+    <string name="live_location_sharing_notification_title">${app_name} tiesioginė buvimo vieta</string>
+    <string name="location_share_live_remaining_time">%1$s liko</string>
+    <string name="location_share_live_stop">Sustabdyti</string>
+    <string name="location_share_live_until">Tiesiogiai iki %1$s</string>
+    <string name="location_share_live_view">Žiūrėti tiesioginę buvimo vietą</string>
+    <string name="location_share_live_ended">Tiesioginė buvimo vieta baigėsi</string>
+    <string name="location_share_live_started">Įkeliama tiesioginė vieta…</string>
+    <string name="location_share_live_enabled">Tiesioginė buvimo vieta įjungta</string>
+    <string name="location_share_loading_map_error">Nepavyksta įkelti žemėlapio
+\nŠis namų serveris gali būti nesukonfigūruotas rodyti žemėlapius.</string>
+    <string name="location_timeline_failed_to_load_map">Nepavyko įkelti žemėlapio</string>
+    <string name="location_share_external">Atidaryti per</string>
+    <string name="location_not_available_dialog_content">${app_name} negalėjo pasiekti jūsų vietos. Prašome pabandyti vėliau.</string>
+    <string name="location_not_available_dialog_title">${app_name} negalėjo pasiekti jūsų vietos</string>
+    <string name="location_share_live_select_duration_option_3">8 valandas</string>
+    <string name="location_share_live_select_duration_option_2">1 valandą</string>
+    <string name="location_share_live_select_duration_option_1">15 minučių</string>
+    <string name="location_share_live_select_duration_title">Bendrinti savo tiesioginę buvimo vietą</string>
+    <string name="a11y_location_share_option_pinned_icon">Bendrinti šią vietą</string>
+    <string name="location_share_option_pinned">Bendrinti šią vietą</string>
+    <string name="a11y_location_share_option_user_live_icon">Bendrinti tiesioginę buvimo vietą</string>
+    <string name="location_share_option_user_live">Bendrinti tiesioginę buvimo vietą</string>
+    <string name="a11y_location_share_option_user_current_icon">Bendrinti mano dabartinę vietą</string>
+    <string name="location_share_option_user_current">Bendrinti mano dabartinę vietą</string>
+    <string name="a11y_location_share_locate_button">Priartinti esamą vietą</string>
+    <string name="a11y_location_share_pin_on_map">Pasirinktos vietos smeigtukas žemėlapyje</string>
+    <string name="a11y_static_map_image">Žemėlapis</string>
+    <string name="closed_poll_option_description">Rezultatai atskleidžiami tik tada, kai baigiate apklausą</string>
+    <string name="closed_poll_option_title">Uždaryta apklausa</string>
+    <string name="open_poll_option_description">Balsuotojai mato rezultatus iškart po balsavimo</string>
+    <string name="open_poll_option_title">Atidaryti apklausą</string>
+    <string name="poll_type_title">Apklausos tipas</string>
+    <string name="edit_poll_title">Redaguoti apklausą</string>
+    <string name="delete_poll_dialog_content">Ar tikrai norite pašalinti šią apklausą\? Pašalinę ją negalėsite susigrąžinti.</string>
+    <string name="end_poll_confirmation_description">Tai neleis žmonėms balsuoti ir bus rodomi galutiniai apklausos rezultatai.</string>
+    <string name="delete_poll_dialog_title">Pašalinti apklausą</string>
+    <string name="poll_end_room_list_preview">Apklausa baigėsi</string>
+    <string name="poll_response_room_list_preview">Prabalsuota</string>
+    <string name="end_poll_confirmation_approve_button">Baigti apklausą</string>
+    <string name="a11y_poll_winner_option">laimėtojo parinktis</string>
+    <string name="poll_undisclosed_not_ended">Rezultatai bus matomi pasibaigus apklausai</string>
+    <string name="poll_no_votes_cast">Nėra balsų</string>
+    <string name="restart_the_application_to_apply_changes">Iš naujo paleiskite programą, kad pakeitimas įsigaliotų.</string>
+    <string name="labs_enable_latex_maths">Įjungti LaTeX matematika</string>
+    <string name="link_this_email_with_your_account">%s nustatymuose, kad gautumėte kvietimus tiesiogiai į ${app_name}.</string>
+    <string name="this_invite_to_this_space_was_sent">Kvietimas į šią erdvę buvo išsiųstas į %s, kuris nėra susijęs su jūsų paskyra</string>
+    <string name="this_invite_to_this_room_was_sent">Kvietimas į šį kambarį buvo išsiųstas į %s, kuris nėra susijęs su jūsų paskyra</string>
+    <string name="upgrade_room_for_restricted_note">Atkreipkite dėmesį, kad atnaujinus bus sukurta nauja kambario versija. Visos dabartinės žinutės liks šiame archyvuotame kambaryje.</string>
+    <string name="upgrade_room_for_restricted">Kiekvienas iš %s galės rasti šį kambarį ir prisijungti prie jo - nereikės visų kviesti rankiniu būdu. Tai galėsite bet kada pakeisti kambario nustatymuose.</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Nepavyko paleisti %1$s</string>
+    <string name="a11y_pause_audio_message">Pristabdyti %1$s</string>
+    <string name="a11y_play_audio_message">Paleisti %1$s</string>
+    <string name="a11y_audio_playback_duration" tools:ignore="PluralsCandidate">%1$d minutės %2$d sekundės</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="voice_message_n_seconds_warning_toast">%1$ds liko</string>
+    <string name="error_failed_to_join_room">Atsiprašome, bandant prisijungti įvyko klaida: %s</string>
+    <string name="room_upgrade_to_recommended_version">Atnaujinti į rekomenduojamą kambario versiją</string>
+    <string name="room_using_unstable_room_version">Šiame kambaryje naudojama kambario versija %s, kurią šis namų serveris pažymėjo kaip nestabilią.</string>
+    <string name="upgrade_room_no_power_to_manage">Norint atnaujinti kambarį, reikia leidimo</string>
+    <string name="upgrade_public_room_from_to">Jūs atnaujinsite šį kambarį iš %1$s į %2$s.</string>
+    <string name="upgrade_room_warning">Kambario atnaujinimas yra išplėstinis veiksmas ir paprastai rekomenduojamas, kai kambarys yra nestabilus dėl klaidų, trūkstamų funkcijų ar saugumo spragų.
+\nPaprastai tai turi įtakos tik tam, kaip kambarys apdorojamas serveryje.</string>
+    <string name="upgrade_private_room">Atnaujinti privatų kambarį</string>
+    <string name="upgrade_public_room">Atnaujinti viešą kambarį</string>
+    <string name="this_space_has_no_rooms_admin">Kai kurie kambariai gali būti paslėpti, nes yra privatūs ir į juos reikia pakvietimo.</string>
+    <string name="this_space_has_no_rooms_not_admin">Kai kurie kambariai gali būti paslėpti, nes yra privatūs ir į juos reikia pakvietimo.
+\nJūs neturite leidimo pridėti kambarių.</string>
+    <string name="this_space_has_no_rooms">Šioje erdvėje nėra kambarių</string>
+    <string name="spaces_no_server_support_description">Dėl papildomos informacijos kreipkitės į savo namų serverio administratorių</string>
+    <string name="spaces_no_server_support_title">Atrodo, kad jūsų namų serveris dar nepalaiko erdvių</string>
+    <string name="spaces_feeling_experimental_subspace">Norite eksperimentuoti\?
+\nĮ erdvę galite įtraukti esamas erdves.</string>
+    <string name="all_rooms_youre_in_will_be_shown_in_home">Visi kambariai kuriuose esate, bus rodomi pradžioje.</string>
+    <string name="space_manage_rooms_and_spaces">Valdyti kambarius ir erdves</string>
+    <string name="space_mark_as_not_suggested">Pažymėti kaip nesiūlomą</string>
+    <string name="space_mark_as_suggested">Pažymėti kaip siūlomą</string>
+    <string name="space_suggested">Siūlomas</string>
+    <string name="space_settings_manage_rooms">Valdyti kambarius</string>
+    <string name="looking_for_someone_not_in_space">Ieškote ko nors ne iš %s\?</string>
+    <string name="user_invites_you">%s kviečia tave</string>
+    <string name="settings_show_latest_profile_description">Rodyti naujausią profilio informaciją (avatarą ir rodomą vardą) visose žinutėse.</string>
+    <string name="settings_show_latest_profile">Rodyti naujausią naudotojo informaciją</string>
+    <string name="labs_enable_thread_messages_desc">Pastaba: programa bus paleista iš naujo</string>
+    <string name="labs_enable_thread_messages">Įjungti temų žinutes</string>
+    <string name="labs_auto_report_uisi_desc">Jūsų sistema automatiškai išsiųs žurnalus, kai įvyks negalėjimo iššifruoti klaida</string>
+    <string name="labs_auto_report_uisi">Automatiškai pranešti apie iššifravimo klaidas.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Erdvės - tai naujas kambarių ir žmonių grupavimo būdas.</string>
+    <string name="space_add_space_to_any_space_you_manage">Įtraukite erdvę į bet kurią valdomą erdvę.</string>
+    <string name="space_add_existing_spaces">Pridėti esamas erdves</string>
+    <string name="space_add_existing_rooms_only">Pridėti esamus kambarius</string>
+    <string name="space_add_existing_rooms">Pridėti esamus kambarius ir erdvę</string>
+    <string name="space_explore_filter_no_result_description">Kai kurie rezultatai gali būti paslėpti, nes jie yra privatūs ir į juos reikia pakvietimo.</string>
+    <string name="space_explore_filter_no_result_title">Rezultatų nerasta</string>
+    <string name="search_thread_from_a_thread">Iš temos</string>
+    <string name="thread_list_empty_notice">Patarimas: Ilgai bakstelėkite žinutę ir naudokite “%s”.</string>
+    <string name="thread_list_empty_subtitle">Temos padeda išlaikyti pokalbių temą ir lengviau juos sekti.</string>
+    <string name="thread_list_empty_title">Išlaikykite diskusijas organizuotas su temomis</string>
+    <string name="thread_list_modal_my_threads_subtitle">Rodo visas temas, kuriose dalyvavote</string>
+    <string name="thread_list_modal_my_threads_title">Mano temos</string>
+    <string name="thread_list_modal_all_threads_subtitle">Rodo visas temas iš dabartinio kambario</string>
+    <string name="thread_list_modal_all_threads_title">Visos temos</string>
+    <string name="thread_list_modal_title">Filtras</string>
+    <string name="thread_list_title">Visos temos</string>
+    <string name="thread_timeline_title">Tema</string>
+    <string name="room_permissions_change_permissions">Keisti leidimus</string>
+    <string name="room_permissions_change_main_address_for_the_room">Keisti pagrindinį kambario adresą</string>
+    <string name="room_permissions_change_room_avatar">Keisti kambario avatarą</string>
+    <string name="room_permissions_modify_widgets">Keisti valdiklius</string>
+    <string name="room_permissions_notify_everyone">Pranešti visiems</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Pašalinti kitų išsiųstas žinutes</string>
+    <string name="room_permissions_ban_users">Užblokuoti naudotojus</string>
+    <string name="room_permissions_remove_users">Pašalinti naudotojus</string>
+    <string name="room_permissions_change_settings">Keisti nustatymus</string>
+    <string name="room_permissions_invite_users">Kviesti naudotojus</string>
+    <string name="room_permissions_send_messages">Siųsti žinutes</string>
+    <string name="room_permissions_enable_room_encryption">Įjungti kambario šifravimą</string>
+    <string name="room_permissions_change_room_name">Keisti kambario pavadinimą</string>
+    <string name="room_permissions_change_history_visibility">Keisti istorijos matomumą</string>
+    <string name="notice_direct_room_update">%s atnaujino čia.</string>
+    <string name="login_a11y_captcha_container">Atlikite captcha iššūkį</string>
+    <string name="login_a11y_choose_other">Pasirinkti pasirinktinį namų serverį</string>
+    <string name="login_a11y_choose_modular">Pasirinkti Element Matrix Services</string>
+    <string name="login_a11y_choose_matrix_org">Pasirinkti matrix.org</string>
+    <string name="login_signup_cancel_confirmation_content">Jūsų paskyra dar nesukurta. Sustabdyti registracijos procesą\?</string>
+    <string name="login_signup_cancel_confirmation_title">Perspėjimas</string>
+    <string name="login_signup_error_user_in_use">Šis vartotojo vardas yra užimtas</string>
+    <string name="login_signup_submit">Toliau</string>
+    <string name="login_signup_password_hint">Slaptažodis</string>
+    <string name="login_signup_username_hint">Naudotojo vardas</string>
+    <string name="login_signin_username_hint">Naudotojo vardas arba el. pašto adresas</string>
+    <string name="login_msisdn_confirm_submit">Toliau</string>
+    <string name="login_msisdn_confirm_send_again">Siųsti vėl</string>
+    <string name="login_msisdn_confirm_hint">Įvesti kodą</string>
+    <string name="login_msisdn_confirm_notice">Ką tik išsiuntėme kodą į %1$s. Įveskite jį toliau, kad patvirtintumėte, kad tai jūs.</string>
+    <string name="login_set_msisdn_title">Nustatyti telefono numerį</string>
+    <string name="does_not_look_like_valid_email">Neatrodo kaip tinkamas el. pašto adresas</string>
+    <string name="login_set_email_submit">Toliau</string>
+    <string name="login_msisdn_confirm_title">Patvirtinkite telefono numerį</string>
+    <string name="login_set_email_optional_hint">El. pašto adresas (nebūtinas)</string>
+    <string name="login_set_email_mandatory_hint">El. pašto adresas</string>
+    <string name="login_set_msisdn_submit">Toliau</string>
+    <string name="login_set_msisdn_optional_hint">Telefono numeris (nebūtinas)</string>
+    <string name="login_reset_password_success_notice">Jūsų slaptažodis buvo nustatytas iš naujo.</string>
+    <string name="login_reset_password_success_title">Sėkmė!</string>
+    <string name="login_reset_password_mail_confirmation_submit">Patvirtinau savo el. pašto adresą</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Bakstelėkite nuorodą ir patvirtinkite naująjį slaptažodį. Paspaudę joje esančią nuorodą, spustelėkite žemiau.</string>
+    <string name="login_reset_password_mail_confirmation_notice">Patvirtinimo el. laiškas buvo išsiųstas į %1$s.</string>
+    <string name="login_reset_password_mail_confirmation_title">Patikrinkite savo pašto dėžutę</string>
+    <string name="login_reset_password_error_not_found">Šis el. paštas nėra susietas su jokia paskyra</string>
+    <string name="login_reset_password_warning_submit">Tęsti</string>
+    <string name="login_reset_password_warning_content">Pakeitus slaptažodį bus iš naujo nustatyti visų jūsų sesijų visapusiško šifravimo raktai, todėl užšifruotų pokalbių istorijos nebus galima perskaityti. Prieš iš naujo nustatydami slaptažodį, sukurkite raktų atsarginę kopiją arba eksportuokite kambario raktus iš kitos sesijos.</string>
+    <string name="login_reset_password_warning_title">Perspėjimas!</string>
+    <string name="login_reset_password_password_hint">Naujas slaptažodis</string>
+    <string name="login_reset_password_email_hint">El. paštas</string>
+    <string name="login_reset_password_submit">Toliau</string>
+    <string name="login_reset_password_notice">Į jūsų pašto dėžutę bus išsiųstas patvirtinimo el. laiškas, naujo slaptažodžio nustatymo patvirtinimui.</string>
+    <string name="login_reset_password_on">Iš naujo nustatyti slaptažodį %1$s</string>
+    <string name="login_login_with_email_error">Šis el. paštas nesusijęs su jokia paskyra.</string>
+    <string name="login_registration_not_supported">Programa negali sukurti paskyros šiame namų serveryje.
+\n
+\nAr norite užsiregistruoti naudodami žiniatinklio klientą\?</string>
+    <string name="login_registration_disabled">Atsiprašome, šis serveris nepriima naujų paskyrų.</string>
+    <string name="login_mode_not_supported">Programa negali prisijungti prie šio namų serverio. Namų serveris palaiko šiuos prisijungimo tipus: %1$s.
+\n
+\nAr norite prisijungti naudodami žiniatinklio klientą\?</string>
+    <string name="login_sso_error_message">Įkeliant puslapį įvyko klaida: %1$s (%2$d)</string>
+    <string name="login_server_url_form_common_notice">Įveskite norimo naudoti serverio adresą</string>
+    <string name="login_server_url_form_modular_notice">Įveskite adresą Modular Element arba serverio kurį norite naudoti</string>
+    <string name="login_server_url_form_modular_text">Aukščiausios kokybės talpinimas organizacijoms</string>
+    <string name="login_server_url_form_other_hint">Adresas</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services Adresas</string>
+    <string name="login_clear_homeserver_history">Išvalyti istoriją</string>
+    <string name="login_signin_sso">Tęsti su vienkartiniu prisijungimu</string>
+    <string name="login_signin">Prisijungti</string>
+    <string name="login_signup">Registruotis</string>
+    <string name="login_signin_to">Prisijungti prie %1$s</string>
+    <string name="login_connect_to_a_custom_server">Prisijungti prie pasirinktinio serverio</string>
+    <string name="login_connect_to_modular">Prisijungti prie Element Matrix Services</string>
+    <string name="login_connect_to">Prisijungti prie %1$s</string>
+    <string name="login_continue">Tęsti</string>
+    <string name="login_social_sso">vienkartinis prisijungimas</string>
+    <string name="login_social_signin_with">Prisijungti su %s</string>
+    <string name="login_social_signup_with">Užsiregistruoti su %s</string>
+    <string name="login_social_continue_with">Tęsti su %s</string>
+    <string name="login_social_continue">Arba</string>
+    <string name="login_server_other_text">Pasirinktiniai &amp; išplėstiniai nustatymai</string>
+    <string name="login_server_other_title">Kitas</string>
+    <string name="login_server_modular_learn_more">Sužinoti daugiau</string>
+    <string name="login_server_modular_text">Aukščiausios kokybės talpinimas organizacijoms</string>
+    <string name="login_server_matrix_org_text">Nemokamai prisijunkite prie milijonų žmonių didžiausiame viešajame serveryje</string>
+    <string name="login_server_text">Kaip ir el. paštas, paskyros turi vienus namus, nors galite bendrauti su bet kuo</string>
+    <string name="login_server_title">Pasirinkti serverį</string>
+    <string name="login_splash_already_have_account">Aš jau turiu paskyrą</string>
+    <string name="login_splash_create_account">Sukurti paskyrą</string>
+    <string name="login_splash_submit">Pradėkite</string>
+    <string name="login_splash_text3">Išplėskite ir pritaikykite savo patirtį</string>
+    <string name="login_splash_text2">Saugokite pokalbių privatumą naudodami šifravimą</string>
+    <string name="login_splash_text1">Bendraukite su žmonėmis tiesiogiai arba grupėse</string>
+    <string name="login_splash_title">Tai jūsų pokalbis. Priklauso jums.</string>
+    <string name="ftue_personalize_skip_this_step">Praleisti šį žingsnį</string>
+    <string name="ftue_personalize_submit">Išsaugoti ir tęsti</string>
+    <string name="ftue_personalize_complete_subtitle">Bet kada eikite į nustatymus norint atnaujinti savo profilį</string>
+    <string name="ftue_personalize_complete_title">Atrodo gerai!</string>
+    <string name="ftue_personalize_lets_go">Pirmyn</string>
+    <string name="ftue_profile_picture_subtitle">Laikas prie vardo pridėti veidą</string>
+    <string name="ftue_profile_picture_title">Pridėti profilio nuotrauką</string>
+    <string name="ftue_display_name_entry_footer">Jūs tai galite pakeisti vėliau</string>
+    <string name="ftue_display_name_entry_title">Rodomas vardas</string>
+    <string name="ftue_display_name_title">Pasirinkite rodomą vardą</string>
+    <string name="ftue_auth_login_username_entry">Vartotojo vardas / el. paštas / telefonas</string>
+    <string name="ftue_auth_captcha_title">Ar esate žmogus\?</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Vykdykite nurodymus, išsiųstus adresu %s</string>
+    <string name="ftue_auth_forgot_password">Pamiršau slaptažodį</string>
+    <string name="ftue_auth_password_reset_confirmation">Slaptažodžio nustatymas iš naujo</string>
+    <string name="ftue_auth_email_resend_email">Iš naujo siųsti el. laišką</string>
+    <string name="ftue_auth_email_verification_footer">Negavote el. laiško\?</string>
+    <string name="ftue_auth_email_verification_subtitle">Vykdykite nurodymus, išsiųstus adresu %s</string>
+    <string name="ftue_auth_email_verification_title">Patvirtinkite savo el. pašto adresą</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">Iš naujo siųsti kodą</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">Kodas buvo išsiųstas į %s</string>
+    <string name="ftue_auth_phone_confirmation_title">Patvirtinkite savo telefono numerį</string>
+    <string name="ftue_auth_sign_out_all_devices">Atjungti visus prietaisus</string>
+    <string name="ftue_auth_reset_password">Iš naujo nustatyti slaptažodį</string>
+    <string name="ftue_auth_use_case_option_one">Draugai ir šeima</string>
+    <string name="ftue_auth_use_case_subtitle">Padėsime jums užmegzti ryšį</string>
+    <string name="ftue_auth_use_case_title">Su kuo daugiausiai bendrausite\?</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} taip pat puikiai tinka darbo vietoje. Ja pasitiki saugiausios pasaulio organizacijos.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Visapusiškai užšifruota ir nereikia telefono numerio. Jokių reklamų ar duomenų rinkimo.</string>
+    <string name="ftue_auth_carousel_control_body">Pasirinkite, kur bus saugomi jūsų pokalbiai, taip suteikdami jums galimybę kontroliuoti ir būti nepriklausomiems. Sujungta naudojant Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Saugus ir nepriklausomas bendravimas, suteikiantis tiek pat privatumo, kiek ir pokalbis akis į akį jūsų namuose.</string>
+    <string name="error_terms_not_accepted">Bandykite dar kartą, kai sutiksite su savo namų serverio nuostatomis ir sąlygomis.</string>
+    <string name="labs_allow_extended_logging_summary">Išsamūs žurnalai padės kūrėjams, nes siųsdami piktą purtymą pateiksite daugiau žurnalų. Net ir įjungus šią funkciją, programa nerenka žinučių turinio ar kitų privačių duomenų.</string>
+    <string name="labs_allow_extended_logging">Įjungti išsamius žurnalus.</string>
+    <string name="settings_agree_to_terms">Sutikite su tapatybės serverio (%s) paslaugų teikimo sąlygomis, kad galėtumėte būti atrandami pagal el. pašto adresą arba telefono numerį.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Šiuo metu bendrinate el. pašto adresus arba telefono numerius tapatybės serveryje %1$s. Norėdami nustoti juos bendrinti, turėsite iš naujo prisijungti prie %2$s.</string>
+    <string name="settings_text_message_sent">Tekstinė žinutė buvo išsiųsta adresu %s. Įveskite joje esantį patvirtinimo kodą.</string>
+    <string name="settings_discovery_no_terms">Pasirinktame tapatybės serveryje nėra jokių paslaugų teikimo sąlygų. Tęskite tik tuo atveju, jei pasitikite paslaugos savininku</string>
+    <string name="settings_discovery_no_terms_title">Tapatybės serveris neturi paslaugų teikimo sąlygų</string>
+    <string name="settings_discovery_please_enter_server">Įveskite tapatybės serverio url</string>
+    <string name="settings_discovery_bad_identity_server">Nepavyko prisijungti prie tapatybės serverio</string>
+    <string name="settings_discovery_enter_identity_server">Įveskite tapatybės serverio URL</string>
+    <string name="identity_server_consent_dialog_content_question">Ar sutinkate siųsti šią informaciją\?</string>
+    <string name="identity_server_consent_dialog_content_3">Jei norite atrasti esamus kontaktus, į tapatybės serverį reikia nusiųsti kontaktinę informaciją (el. paštus ir telefono numerius). Prieš išsiunčiant duomenis, siekiant užtikrinti privatumą, juos sutriname.</string>
+    <string name="give_feedback_threads">Pateikti atsiliepimą</string>
+    <string name="give_feedback" tools:ignore="UnusedResources">Pateikti atsiliepimą</string>
+    <string name="feedback_failed">Atsiliepimo nepavyko išsiųsti (%s)</string>
+    <string name="feedback_sent">Ačiū, jūsų atsiliepimas sėkmingai išsiųstas</string>
+    <string name="you_may_contact_me">Jei turite papildomų klausimų, galite susisiekti su manimi</string>
+    <string name="feedback">Atsiliepimas</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="send_suggestion_failed">Pasiūlymo nepavyko išsiųsti (%s)</string>
+    <string name="send_suggestion_sent">Ačiū, pasiūlymas sėkmingai išsiųstas</string>
+    <string name="send_suggestion_report_placeholder">Aprašykite savo pasiūlymą čia</string>
+    <string name="send_suggestion_content">Žemiau parašykite savo pasiūlymą.</string>
+    <string name="send_suggestion">Pateikti pasiūlymą</string>
+    <string name="preference_versions">Versijos</string>
+    <string name="preference_help_summary">Gaukite pagalbos naudojant ${app_name}</string>
+    <string name="preference_help_title">Pagalba ir parama</string>
+    <string name="preference_help">Pagalba</string>
+    <string name="preference_root_legals">Teisės aktai</string>
+    <string name="preference_root_help_about">Pagalba &amp; Apie</string>
+    <string name="preference_voice_and_video">Balsas &amp; Vaizdas</string>
+    <string name="push_gateway_item_profile_tag">Profilio žyma:</string>
+    <string name="push_gateway_item_format">Formatas:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Jūs jau žiūrite šią temą!</string>
+    <string name="navigate_to_room_when_already_in_the_room">Jūs jau žiūrite šį kambarį!</string>
+    <string name="import_e2e_keys_from_file">Importuoti šifravimo raktus iš failo \"%1$s\".</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">Įvyko klaida gaunant raktų atsarginės kopijos duomenis</string>
+    <string name="keys_backup_unable_to_get_trust_info">Įvyko klaida gaunant pasitikėjimo informaciją</string>
+    <string name="create_room_federation_error">Kambarys sukurtas, tačiau kai kurie kvietimai nebuvo išsiųsti dėl šios priežasties:
+\n
+\n%s</string>
+    <string name="create_room_public_description">Kiekvienas galės prisijungti prie šio kambario</string>
+    <string name="create_room_public_title">Viešas</string>
+    <string name="create_room_topic_hint">Tema</string>
+    <string name="create_room_topic_section">Kambario tema (nebūtina)</string>
+    <string name="create_room_name_hint">Pavadinimas</string>
+    <string name="create_room_name_section">Kambario pavadinimas</string>
+    <string name="create_room_action_go">Eiti</string>
+    <string name="create_room_action_create">SUKURTI</string>
+    <string name="fab_menu_create_chat">Tiesioginės žinutės</string>
+    <string name="fab_menu_create_room">Kambariai</string>
+    <string name="room_preview_no_preview_join">Šio kambario negalima peržiūrėti. Ar norite prie jo prisijungti\?</string>
+    <string name="room_preview_not_found">Šiuo metu į šį kambarį patekti negalima.
+\nPabandykite vėliau arba paprašykite kambario admino patikrinti, ar turite prieigą.</string>
+    <string name="room_preview_no_preview">Šio kambario negalima peržiūrėti</string>
+    <string name="updating_your_data">Atnaujinami jūsų duomenys…</string>
+    <string name="please_wait">Prašome palaukti…</string>
+    <string name="change_room_directory_network">Keisti tinklą</string>
+    <string name="error_no_network">Tinklo nėra. Patikrinkite interneto ryšį.</string>
+    <string name="create_new_room">Sukurti naują kambarį</string>
+    <string name="malformed_message">Neteisingai suformuotas įvykis, negalima rodyti</string>
+    <string name="event_redacted_by_admin_reason">Įvykis moderuotas kambario admino</string>
+    <string name="event_redacted_by_user_reason">Naudotojo ištrintas įvykis</string>
+    <string name="event_redacted">Žinutė pašalinta</string>
+    <string name="reactions">Reakcijos</string>
+    <string name="message_view_reaction">Peržiūrėti reakcijas</string>
+    <string name="message_add_reaction">Pridėti reakciją</string>
+    <string name="title_activity_emoji_reaction_picker">Reakcijos</string>
+    <string name="room_list_filter_people">Žmonės</string>
+    <string name="room_list_filter_favourites">Parankiniai</string>
+    <string name="room_list_filter_unreads">Neperskaityti</string>
+    <string name="room_list_filter_all">Visi</string>
+    <string name="room_list_rooms_empty_body">Čia bus rodomi jūsų kambariai. Bakstelėkite \"+\" apačioje dešinėje, kad rastumėte esamus kambarius arba pradėtumėte kurti savo.</string>
+    <string name="room_list_rooms_empty_title">Kambariai</string>
+    <string name="room_list_people_empty_body">Jūsų tiesioginių žinučių pokalbiai bus rodomi čia. Bakstelėkite \"+\" apačioje dešinėje, kad pradėtumėte keletą.</string>
+    <string name="room_list_people_empty_title">Pokalbiai</string>
+    <string name="room_list_catchup_empty_body">Neturite daugiau neperskaitytų žinučių</string>
+    <string name="room_list_catchup_empty_title">Jūs viską pasivijote!</string>
+    <string name="invited_by">Pakvietė %s</string>
+    <string name="send_you_invite">Išsiuntė jums kvietimą</string>
+    <string name="global_retry">Pakartoti</string>
+    <string name="view_in_room">Peržiūrėti kambaryje</string>
+    <string name="reply_in_thread">Atsakyti temoje</string>
+    <string name="reply">Atsakyti</string>
+    <string name="edit">Redaguoti</string>
+    <string name="error_user_already_logged_in">Atrodo, kad bandote prisijungti prie kito namų serverio. Ar norite atsijungti\?</string>
+    <string name="identity_server_not_defined">Jūs nenaudojate jokio tapatybės serverio</string>
+    <string name="sas_error_unknown">Nežinoma klaida</string>
+    <string name="sas_incoming_request_notif_content">%s nori patvirtinti jūsų sesiją</string>
+    <string name="sas_incoming_request_notif_title">Patvirtinimo užklausa</string>
+    <string name="sas_got_it">Supratau</string>
+    <string name="sas_verified">Patvirtinta!</string>
+    <string name="keys_backup_info_title_signature">Parašas</string>
+    <string name="keys_backup_info_title_algorithm">Algoritmas</string>
+    <string name="keys_backup_info_title_version">Versija</string>
+    <plurals name="keys_backup_info_keys_backing_up">
+        <item quantity="one">Kuriama atsarginė %d rakto kopija…</item>
+        <item quantity="few">Kuriama atsarginė %d raktų kopija…</item>
+        <item quantity="other">Kuriama atsarginė %d raktų kopija…</item>
+    </plurals>
+    <string name="keys_backup_info_keys_all_backup_up">Visų raktų atsarginė kopija sukurta</string>
+    <string name="secure_backup_setup">Nustatyti saugią atsarginę kopiją</string>
+    <string name="keys_backup_banner_in_progress">Kuriama raktų atsarginė kopija. Tai gali užtrukti kelias minutes…</string>
+    <string name="keys_backup_banner_update_line2">Valdyti raktų atsarginėje kopijoje</string>
+    <string name="keys_backup_banner_update_line1">Nauji saugių žinučių raktai</string>
+    <string name="keys_backup_banner_recover_line2">Naudoti raktų atsarginę kopiją</string>
+    <string name="keys_backup_banner_recover_line1">Niekada nepraraskite užšifruotų žinučių</string>
+    <string name="secure_backup_banner_setup_line2">Apsisaugokite nuo užšifruotų žinučių ir duomenų praradimo</string>
+    <string name="secure_backup_banner_setup_line1">Saugi atsarginė kopija</string>
+    <string name="notification_off">Išjungta</string>
+    <string name="command_description_clear_scalar_token">Kad ištaisyti Matrix programėlių valdymą</string>
+    <string name="command_description_markdown">Įj./Išj. markdown</string>
+    <string name="key_share_request">Prašymas dalytis raktais</string>
+    <string name="timeline_error_room_not_found">Atsiprašome, šis kambarys nerastas.
+\nPrašome bandyti vėliau.%s</string>
+    <string name="widget_integration_review_terms">Jei norite tęsti, turite sutikti su šios paslaugos sąlygomis.</string>
+    <string name="room_no_active_widgets">Nėra aktyvių valdiklių</string>
+    <string name="widget_integration_missing_user_id">Užklausoje trūksta user_id.</string>
+    <string name="widget_integration_missing_room_id">Užklausoje trūksta room_id.</string>
+    <string name="widget_integration_positive_power_level">Galios lygis turi būti teigiamas sveikasis skaičius.</string>
+    <string name="widget_integration_failed_to_send_request">Nepavyko išsiųsti užklausos.</string>
+    <string name="widget_integration_unable_to_create">Nepavyko sukurti valdiklio.</string>
+    <string name="room_widget_webview_read_protected_media">Skaityti DRM apsaugotą mediją</string>
+    <string name="room_widget_resource_permission_title">Šis valdiklis nori naudoti šiuos išteklius:</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Palikti dabartinę konferenciją ir pereiti į kitą\?</string>
+    <string name="error_jitsi_join_conf">Atsiprašome, bandant prisijungti prie konferencijos įvyko klaida</string>
+    <string name="error_jitsi_not_supported_on_old_device">Atsiprašome, konferenciniai skambučiai su Jitsi nepalaikomi senuose įrenginiuose (įrenginiuose su žemesne nei 6.0 Android OS)</string>
+    <string name="room_widget_permission_widget_id">Valdiklio ID</string>
+    <string name="room_widget_permission_theme">Jūsų tema</string>
+    <string name="room_widget_permission_user_id">Jūsų naudotojo ID</string>
+    <string name="room_widget_permission_avatar_url">Jūsų avataro URL</string>
+    <string name="room_widget_permission_display_name">Jūsų rodomas vardas</string>
+    <string name="room_widget_revoke_access">Atšaukti prieigą man</string>
+    <string name="room_widget_open_in_browser">Atidaryti naršyklėje</string>
+    <string name="room_widget_reload">Iš naujo įkelti valdiklį</string>
+    <string name="room_widget_failed_to_load">Nepavyko įkelti valdiklio.
+\n%s</string>
+    <string name="room_widget_permission_shared_info_title">Naudojant jį duomenys gali būti bendrinami su %s:</string>
+    <string name="room_widget_permission_webview_shared_info_title">Naudojant jį gali būti nustatyti slapukai ir bendrinami duomenys su %s:</string>
+    <string name="room_widget_permission_added_by">Šį valdiklį pridėjo:</string>
+    <string name="room_widget_permission_title">Įkelti valdiklį</string>
+    <string name="room_widget_activity_title">Valdiklis</string>
+    <string name="active_widgets_title">Aktyvūs valdikliai</string>
+    <string name="active_widget_view_action">PERŽIŪRĖTI</string>
+    <plurals name="active_widgets">
+        <item quantity="one">%d aktyvus valdiklis</item>
+        <item quantity="few">%d aktyvūs valdikliai</item>
+        <item quantity="other">%d aktyvių valdiklių</item>
+    </plurals>
+    <string name="widget_delete_message_confirmation">Ar tikrai norite ištrinti valdiklį iš šio kambario\?</string>
+    <string name="huge">Milžiniškas</string>
+    <string name="largest">Didžiausias</string>
+    <string name="larger">Didesnis</string>
+    <string name="large">Didelis</string>
+    <string name="normal">Vidutinis</string>
+    <string name="small">Mažas</string>
+    <string name="tiny">Mažytis</string>
+    <string name="font_size">Šrifto dydis</string>
+    <string name="font_size_use_system">Naudoti sistemos numatytąjį</string>
+    <string name="font_size_section_manually">Pasirinkti rankiniu būdu</string>
+    <string name="font_size_section_auto">Nustatyti automatiškai</string>
+    <string name="font_size_title">Pasirinkti šrifto dydį</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_inline_reply_failed">** Nepavyko išsiųsti - atidarykite kambarį</string>
+    <string name="notification_sender_me">Aš</string>
+    <string name="notification_new_invitation">Naujas pakvietimas</string>
+    <string name="notification_new_messages">Naujos žinutės</string>
+    <string name="notification_unknown_room_name">Kambarys</string>
+    <string name="notification_unknown_new_event">Naujas įvykis</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s ir %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s esantys %2$s ir %3$s</string>
+    <string name="notification_unread_notified_messages_in_room">%1$s esantys %2$s</string>
+    <plurals name="notification_compat_summary_title">
+        <item quantity="one">%d pranešimas</item>
+        <item quantity="few">%d pranešimai</item>
+        <item quantity="other">%d pranešimų</item>
+    </plurals>
+    <plurals name="notification_compat_summary_line_for_room">
+        <item quantity="one">%1$s: %2$d žinutė</item>
+        <item quantity="few">%1$s: %2$d žinutės</item>
+        <item quantity="other">%1$s: %2$d žinučių</item>
+    </plurals>
+    <plurals name="notification_invitations">
+        <item quantity="one">%d pakvietimas</item>
+        <item quantity="few">%d pakvietimai</item>
+        <item quantity="other">%d pakvietimų</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages_in_room_rooms">
+        <item quantity="one">%d kambarys</item>
+        <item quantity="few">%d kambariai</item>
+        <item quantity="other">%d kambarių</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages">
+        <item quantity="one">%d neperskaityta pranešta žinutė</item>
+        <item quantity="few">%d neperskaitytos praneštos žinutės</item>
+        <item quantity="other">%d neperskaitytų praneštų žinučių</item>
+    </plurals>
+    <string name="directory_add_a_new_server_error_already_added">Šis serveris jau yra sąraše</string>
+    <string name="directory_add_a_new_server_error">Negalima rasti šio serverio arba jo kambarių sąrašo</string>
+    <string name="directory_add_a_new_server_prompt">Įveskite naujo serverio, kurį norite patyrinėti, pavadinimą.</string>
+    <string name="directory_add_a_new_server">Pridėti naują serverį</string>
+    <string name="directory_your_server">Jūsų serveris</string>
+    <string name="directory_server_native_rooms">Visi vietiniai %s kambariai</string>
+    <string name="directory_server_all_rooms_on_server">Visi kambariai %s serveryje</string>
+    <string name="directory_server_placeholder">Serverio pavadinimas</string>
+    <string name="select_room_directory">Pasirinkti kambarių katalogą</string>
+    <string name="encryption_information_verify_device_warning2">Jei jie nesutampa, gali kilti pavojus jūsų komunikacijos saugumui.</string>
+    <string name="encryption_information_verify">Patvirtinti</string>
+    <string name="encryption_information_unknown_ip">nežinomas ip</string>
+    <string name="encryption_information_verified">Patvirtinta</string>
+    <string name="encryption_information_not_verified">Nepatvirtinta</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d raktas importuotas sėkmingai.</item>
+        <item quantity="few">%1$d/%2$d raktai importuoti sėkmingai.</item>
+        <item quantity="other">%1$d/%2$d raktų importuota sėkmingai.</item>
+    </plurals>
+    <string name="encryption_never_send_to_unverified_devices_summary">Niekada nesiųsti užšifruotų žinučių į nepatvirtintas sesijas iš šios sesijos.</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Šifruoti tik į patvirtintas sesijas</string>
+    <string name="encryption_import_import">Importuoti</string>
+    <string name="encryption_import_room_keys_summary">Importuoti raktus iš vietinio failo</string>
+    <string name="encryption_import_room_keys">Importuoti kambarių raktus</string>
+    <string name="encryption_import_e2e_room_keys">Importuoti šifruotų kambarių raktus</string>
+    <string name="encryption_message_recovery">Užšifruotų žinučių atkūrimas</string>
+    <string name="encryption_exported_successfully">Raktai sėkmingai eksportuoti</string>
+    <string name="encryption_export_notice">Sukurkite slaptafrazę eksportuojamiems raktams užšifruoti. Norėdami importuoti raktus, turėsite įvesti tą pačią slaptafrazę.</string>
+    <string name="encryption_export_export">Eksportuoti</string>
+    <string name="encryption_export_room_keys_summary">Eksportuoti raktus į vietinį failą</string>
+    <string name="encryption_export_room_keys">Eksportuoti kambarių raktus</string>
+    <string name="encryption_export_e2e_room_keys">Eksportuoti šifruotų kambarių raktus</string>
+    <string name="encryption_information_device_key">Sesijos raktas</string>
+    <string name="encryption_information_device_name">Viešas pavadinimas</string>
+    <string name="encryption_information_decryption_error">Iššifravimo klaida</string>
+    <string name="decide_who_can_find_and_join">Nuspręskite, kas gali rasti ir prisijungti prie šio kambario.</string>
+    <string name="room_alias_publish_to_directory_error">Nepavyko gauti dabartinio kambarių katalogo matomumo (%1$s).</string>
+    <string name="room_alias_publish_to_directory">Paskelbti šį kambarį viešai %1$s kambarių kataloge\?</string>
+    <string name="room_alias_action_unpublish">Panaikinti šio adreso skelbimą</string>
+    <string name="room_alias_action_publish">Paskelbti šį adresą</string>
+    <string name="room_alias_local_address_add">Pridėti vietinį adresą</string>
+    <string name="room_alias_local_address_empty">Šis kambarys neturi vietinių adresų</string>
+    <string name="room_alias_local_address_subtitle">Nustatykite šio kambario adresus, kad naudotojai galėtų rasti šį kambarį per jūsų namų serverį (%1$s)</string>
+    <string name="room_alias_local_address_title">Vietiniai adresai</string>
+    <string name="room_alias_address_hint">Naujas skelbiamas adresas (pvz., #pseudonimas:serveris)</string>
+    <string name="room_alias_address_empty">Kitų paskelbtų adresų dar nėra.</string>
+    <string name="room_alias_address_empty_can_add">Kitų paskelbtų adresų dar nėra, pridėkite juos žemiau.</string>
+    <string name="room_alias_delete_confirmation">Ištrinti adresą \"%1$s\"\?</string>
+    <string name="room_alias_unpublish_confirmation">Panaikinti adreso \"%1$s\" skelbimą\?</string>
+    <string name="room_alias_published_alias_add_manually_submit">Paskelbti</string>
+    <string name="room_alias_published_alias_add_manually">Paskelbti naują adresą rankiniu būdu</string>
+    <string name="room_alias_published_other">Kiti paskelbti adresai:</string>
+    <string name="room_alias_published_alias_main">Tai yra pagrindinis adresas</string>
+    <string name="room_alias_published_alias_subtitle">Paskelbtus adresus gali naudoti bet kas bet kuriame serveryje, prisijungimui prie jūsų kambario. Norint paskelbti adresą, pirmiausia nustatykite jį kaip vietinį adresą.</string>
+    <string name="room_alias_published_alias_title">Paskelbti adresai</string>
+    <string name="settings_troubleshoot_test_token_registration_title">Žetono registracija</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Pridėti paskyrą</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nŠi klaida yra nekontroliuojama ${app_name}. Telefone nėra Google paskyros. Atidarykite paskyrų tvarkytuvę ir pridėkite Google paskyrą.</string>
+    <string name="encryption_misconfigured">Šifravimas neteisingai sukonfigūruotas</string>
+    <string name="encryption_not_enabled">Šifravimas nėra įjungtas</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Šiame pokalbyje žinutės bus visapusiškai užšifruojamos.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Šiame pokalbyje žinutės yra visapusiškai užšifruotos.</string>
+    <string name="encryption_enabled_tile_description">Šiame kambaryje žinutės yra visapusiškai užšifruotos. Sužinokite daugiau ir patvirtinkite naudotojus jų profilyje.</string>
+    <string name="encryption_enabled">Šifravimas įjungtas</string>
+    <string name="encryption_unknown_algorithm_tile_description">Šiame kambaryje naudojamas šifravimas nepalaikomas</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Jau beveik! Laukiama patvirtinimo…</string>
+    <string name="qr_code_scanned_self_verif_notice">Jau beveik! Ar kitas prietaisas rodo varnelę\?</string>
+    <string name="topic_prefix">"Tema: "</string>
+    <string name="add_a_topic_link_text">Pridėkite temą</string>
+    <string name="send_your_first_msg_to_invite">Siųskite pirmąją žinutę kad pakviestumėte %s į pokalbį</string>
+    <string name="this_is_the_beginning_of_dm">Tai yra jūsų tiesioginių žinučių su %s istorijos pradžia.</string>
+    <string name="this_is_the_beginning_of_room_no_name">Tai šio pokalbio pradžia.</string>
+    <string name="this_is_the_beginning_of_room">Tai yra %s pradžia.</string>
+    <string name="direct_room_created_summary_item_by_you">Jūs prisijungėte.</string>
+    <string name="direct_room_created_summary_item">%s prisijungė.</string>
+    <string name="room_created_summary_item_by_you">Sukūrėte ir sukonfigūravote kambarį.</string>
+    <string name="room_created_summary_item">%s sukūrė ir sukonfigūravo kambarį.</string>
+    <string name="error_failed_to_import_keys">Nepavyko importuoti raktų</string>
+    <string name="qr_code_scanned_verif_waiting">Laukiama %s…</string>
+    <string name="auth_invalid_login_deactivated_account">Ši paskyra buvo deaktyvuota.</string>
+    <string name="room_message_placeholder">Žinutė…</string>
+    <string name="bootstrap_progress_checking_backup">Tikrinamas atsarginės kopijos raktas</string>
+    <string name="recovery_key_empty_error_message">Įveskite atkūrimo raktą</string>
+    <string name="bootstrap_invalid_recovery_key">Tai netinkamas atkūrimo raktas</string>
+    <string name="use_file">Naudoti failą</string>
+    <string name="bootstrap_enter_recovery">Norėdami tęsti, įveskite savo %s</string>
+    <string name="security_prompt_text">Patvirtinkite save ir kitus, kad pokalbiai būtų saugūs</string>
+    <string name="upgrade_security">Galimas šifravimo patobulinimas</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Tikrinamas atsarginės kopijos raktas (%s)</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCM žetonas sėkmingai užregistruotas namų serveryje.</string>
+    <string name="terms_description_for_integration_manager">Naudoti botus, tiltus, valdiklius ir lipdukų paketus</string>
+    <string name="change_identity_server">Keisti tapatybės serverį</string>
+    <string name="settings_discovery_consent_title">Siųsti el. paštus ir telefono numerius</string>
+    <string name="add_identity_server">Konfigūruoti tapatybės serverį</string>
+    <string name="disconnect_identity_server">Atjungti tapatybės serverį</string>
+    <string name="identity_server">Tapatybės serveris</string>
+    <string name="settings_text_message_sent_wrong_code">Patvirtinimo kodas neteisingas.</string>
+    <string name="settings_text_message_sent_hint">Kodas</string>
+    <string name="error_network_timeout">Atrodo, kad serveris neatsako per ilgai, tai gali būti dėl prasto ryšio arba serverio klaidos. Pabandykite dar kartą po kurio laiko.</string>
+    <string name="one_user_read">%s perskaitė</string>
+    <string name="two_users_read">%1$s ir %2$s perskaitė</string>
+    <string name="three_users_read">%1$s, %2$s ir %3$s perskaitė</string>
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s ir %3$d kitas perskaitė</item>
+        <item quantity="few">%1$s, %2$s ir %3$d kiti perskaitė</item>
+        <item quantity="other">%1$s, %2$s ir %3$d kitų perskaitė</item>
+    </plurals>
+    <string name="a11y_jump_to_bottom">Peršokti į apačią</string>
+    <string name="a11y_close_keys_backup_banner">Uždaryti raktų atsarginės kopijos antraštę</string>
+    <string name="a11y_create_room">Sukurti naują kambarį</string>
+    <string name="a11y_create_message">Sukurti naują pokalbį arba kambarį</string>
+    <string name="a11y_create_direct_message">Sukurti naują tiesioginį pokalbį</string>
+    <string name="a11y_create_menu_close">Uždaryti kambario kūrimo meniu…</string>
+    <string name="a11y_create_menu_open">Atidaryti kambario kūrimo meniu</string>
+    <string name="a11y_open_drawer">Atidaryti navigacijos stalčių</string>
+    <string name="send_attachment">Siųsti priedą</string>
+    <plurals name="fallback_users_read">
+        <item quantity="one">%d naudotojas perskaitė</item>
+        <item quantity="few">%d naudotojai perskaitė</item>
+        <item quantity="other">%d naudotojų perskaitė</item>
+    </plurals>
+    <string name="error_file_too_big_simple">Failas yra per didelis, kad jį būtų galima įkelti.</string>
+    <string name="attachment_type_dialog_title">Pridėti paveikslėlį iš</string>
+    <string name="content_reported_as_inappropriate_content">Šis turinys buvo praneštas kaip nepadorus.
+\n
+\nJei nenorite matyti daugiau šio naudotojo turinio, galite jį ignoruoti kad paslėpti jo žinutes.</string>
+    <string name="content_reported_as_inappropriate_title">Pranešta kaip nepadorus turinys</string>
+    <string name="content_reported_as_spam_content">Apie šį turinį buvo pranešta kaip apie šlamštą.
+\n
+\nJei nenorite matyti daugiau šio naudotojo turinio, galite jį ignoruoti kad paslėpti jo žinutes.</string>
+    <string name="content_reported_as_spam_title">Pranešta kaip šlamštas</string>
+    <string name="content_reported_content">Buvo pranešta apie šį turinį.
+\n
+\nJei nenorite matyti daugiau šio naudotojo turinio, galite jį ignoruoti kad paslėpti jo žinutes.</string>
+    <string name="content_reported_title">Turinys praneštas</string>
+    <string name="block_user">IGNORUOTI NAUDOTOJĄ</string>
+    <string name="report_content_custom_submit">PRANEŠTI</string>
+    <string name="report_content_custom_hint">Pranešimo apie šį turinį priežastis</string>
+    <string name="report_content_custom_title">Pranešti apie šį turinį</string>
+    <string name="report_content_custom">Pasirinktinis pranešimas…</string>
+    <string name="report_content_inappropriate">Tai nepadoru</string>
+    <string name="report_content_spam">Tai šlamštas</string>
+    <string name="uploads_files_no_result">Šiame kambaryje nėra failų</string>
+    <string name="uploads_files_subtitle">%1$s %2$s</string>
+    <string name="uploads_files_title">FAILAI</string>
+    <string name="uploads_media_no_result">Šiame kambaryje nėra medijos</string>
+    <string name="uploads_media_title">MEDIJA</string>
+    <string name="attachment_viewer_item_x_of_y">%1$d iš %2$d</string>
+    <string name="error_handling_incoming_share">Nepavyko tvarkyti bendrinimo duomenų</string>
+    <string name="rotate_and_crop_screen_title">Pasukti ir apkarpyti</string>
+    <string name="attachment_type_location">Vietovė</string>
+    <string name="attachment_type_poll">Apklausa</string>
+    <string name="attachment_type_sticker">Lipdukas</string>
+    <string name="attachment_type_gallery">Galerija</string>
+    <string name="attachment_type_camera">Kamera</string>
+    <string name="attachment_type_contact">Kontaktas</string>
+    <string name="attachment_type_file">Failas</string>
+    <string name="reaction_search_type_hint">Įveskite raktažodžius, reakcijos radimui.</string>
+    <string name="spoiler">Spoileris</string>
+    <string name="command_description_spoiler">Siunčia duotą žinutę kaip spoilerį</string>
+    <string name="notice_member_no_changes_by_you">Nepadarėte jokių pakeitimų</string>
+    <string name="notice_member_no_changes">%1$s nepadarė jokių pakeitimų</string>
+    <string name="room_join_rules_invite">%1$s padarė šį kambarį tik pakviestiems.</string>
+    <string name="room_join_rules_public_by_you">Paviešinote kambarį visiems, kurie žino nuorodą.</string>
+    <string name="room_join_rules_public">%1$s paviešino kambarį visiems, kurie žino nuorodą.</string>
+    <string name="help_long_click_on_room_for_more_options">Ilgai spauskite ant kambario, kad pamatytumėte daugiau parinkčių</string>
+    <string name="no_ignored_users">Jūs neignoruojate jokių naudotojų</string>
+    <string name="room_list_quick_actions_low_priority_remove">Pašalinti iš žemo prioriteto</string>
+    <string name="room_list_quick_actions_low_priority_add">Pridėti prie žemo prioriteto</string>
+    <string name="room_list_quick_actions_favorite_remove">Pašalinti iš parankinių</string>
+    <string name="room_list_quick_actions_favorite_add">Pridėti prie parankinių</string>
+    <string name="message_ignore_user">Ignoruoti naudotoją</string>
+    <string name="room_list_quick_actions_notifications_all_noisy">Visos žinutės (triukšmingas)</string>
+    <string name="room_list_quick_actions_notifications_mute">Nutildyti</string>
+    <string name="room_list_quick_actions_notifications_mentions">Tik paminėjimai</string>
+    <string name="room_list_quick_actions_notifications_all">Visos žinutės</string>
+    <string name="room_list_quick_actions_settings">Nustatymai</string>
+    <string name="room_list_quick_actions_room_settings">Kambario nustatymai</string>
+    <string name="room_list_quick_actions_leave">Išeiti iš kambario</string>
+    <string name="direct_room_join_rules_invite_by_you">Padarėte šitai tik pakviestiems.</string>
+    <string name="direct_room_join_rules_invite">%1$s padarė šitai tik pakviestiems.</string>
+    <string name="room_join_rules_invite_by_you">Padarėte šį kambarį tik pakviestiems.</string>
+    <string name="ftue_auth_carousel_workplace_title">Žinučių siuntimas jūsų komandai.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Saugus žinučių siuntimas.</string>
+    <string name="ftue_auth_carousel_control_title">Jūs viską kontroliuojate.</string>
+    <string name="ftue_auth_carousel_secure_title">Turėkite savo pokalbius.</string>
+    <string name="timeline_unread_messages">Neperskaitytos žinutės</string>
+    <string name="ftue_auth_use_case_skip">Dar nesate tikri\? %s</string>
+    <string name="ftue_auth_use_case_option_three">Bendruomenės</string>
+    <string name="ftue_auth_use_case_option_two">Komandos</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Redaguoti</string>
+    <string name="ftue_auth_create_account_sso_section_header">Arba</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Kur laikomi jūsų pokalbiai</string>
+    <string name="ftue_auth_create_account_choose_server_header">Kur bus laikomi jūsų pokalbiai</string>
+    <string name="ftue_auth_create_account_password_entry_footer">Turi būti ne mažiau kaip 8 simboliai</string>
+    <string name="ftue_auth_create_account_username_entry_footer">Kiti gali jus atrasti %s</string>
+    <string name="ftue_auth_create_account_title">Sukurti savo paskyrą</string>
+    <string name="ftue_account_created_subtitle">Jūsų paskyra %s buvo sukurta</string>
+    <string name="ftue_account_created_congratulations_title">Sveikiname!</string>
+    <string name="ftue_account_created_take_me_home">Pasiimkite mane namo</string>
+    <string name="ftue_account_created_personalize">Suasmeninti profilį</string>
+    <string name="ftue_auth_use_case_connect_to_server">Prisijungti prie serverio</string>
+    <string name="ftue_auth_use_case_join_existing_server">Norite prisijungti prie esamo serverio\?</string>
+    <string name="ftue_auth_use_case_skip_partial">Praleisti šį klausimą</string>
+    <string name="ftue_auth_welcome_back_title">Sveiki sugrįžę!</string>
+    <string name="ftue_auth_terms_subtitle">Perskaitykite %s sąlygas ir taisykles</string>
+    <string name="ftue_auth_terms_title">Serverio politikos</string>
+    <string name="ftue_auth_reset_password_breaker_title">Patikrinkite savo el. paštą.</string>
+    <string name="ftue_auth_choose_server_ems_cta">Susisiekite su mumis</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) yra tvirta ir patikima talpinimo paslauga, skirta greitam ir saugiam bendravimui realiuoju laiku. Sužinokite, kaip &lt;a href=\"${ftue_ems_url}\"&gt;element.io/ems&lt;/a&gt;</string>
+    <string name="ftue_auth_choose_server_ems_title">Norite turėti savo serverį\?</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s atsiųs jums patvirtinimo nuorodą</string>
+    <string name="ftue_auth_choose_server_entry_hint">Serverio URL</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">Patvirtinimo kodas</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Koks yra jūsų serverio adresas\?</string>
+    <string name="ftue_auth_choose_server_subtitle">Koks yra jūsų serverio adresas\? Tai tarsi visų jūsų duomenų namai</string>
+    <string name="ftue_auth_choose_server_title">Pasirinkti savo serverį</string>
+    <string name="ftue_auth_phone_entry_title">Telefono numeris</string>
+    <string name="ftue_auth_phone_subtitle">%s turi patvirtinti jūsų paskyrą</string>
+    <string name="ftue_auth_phone_title">Įveskite savo telefono numerį</string>
+    <string name="ftue_auth_email_entry_title">El. paštas</string>
+    <string name="ftue_auth_email_subtitle">%s turi patvirtinti jūsų paskyrą</string>
+    <string name="ftue_auth_email_title">Įveskite savo el. paštą</string>
+    <string name="ftue_auth_new_password_subtitle">Įsitikinkite, kad jis yra 8 ar daugiau simbolių.</string>
+    <string name="ftue_auth_new_password_title">Pasirinkite naują slaptažodį</string>
+    <string name="ftue_auth_new_password_entry_title">Naujas slaptažodis</string>
+    <string name="settings_notifications_targets">Pranešimų tikslai</string>
+    <string name="settings_olm_version">olm versija</string>
+    <string name="settings_integrations_summary">Naudokite integracijų tvarkyklę botams, tiltams, valdikliams ir lipdukų paketams tvarkyti.
+\nIntegracijų valdytojai gauna konfigūracijos duomenis ir gali keisti valdiklius, siųsti kvietimus į kambarius ir nustatyti galios lygius jūsų vardu.</string>
+    <string name="settings_contacts_phonebook_country">Telefonų knygos šalis</string>
+    <string name="settings_contact">Vietiniai kontaktai</string>
+    <string name="settings_pin_missed_notifications">Prisegti kambarius su praleistais pranešimais</string>
+    <string name="settings_home_display">Pradžios ekranas</string>
+    <string name="settings_inline_url_preview_summary">Nuorodų peržiūra pokalbyje, kai jūsų namų serveris palaiko šią funkciją.</string>
+    <string name="settings_inline_url_preview">Įterptinė URL peržiūra</string>
+    <string name="settings_pin_unread_messages">Prisegti kambarius su neperskaitytomis žinutėmis</string>
+    <string name="settings_integrations">Integracijos</string>
+    <string name="settings_cryptography_manage_keys">Kriptografijos raktų valdymas</string>
+    <string name="settings_cryptography">Kriptografija</string>
+    <string name="analytics_opt_in_content">Padėkite mums nustatyti problemas ir tobulinti ${app_name} dalydamiesi anoniminiais naudojimo duomenimis. Kad suprastume, kaip žmonės naudojasi keliais įrenginiais, sugeneruosime atsitiktinį identifikatorių, kuriuo dalijasi jūsų įrenginiai.
+\n
+\nGalite perskaityti visas mūsų sąlygas %s.</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Jei įjungta, kitiems naudotojams visada atrodysite neprisijungę, net jei naudosite programą.</string>
+    <string name="settings_presence_user_always_appears_offline">Neprisijungęs režimas</string>
+    <string name="settings_presence">Esamumas</string>
+    <string name="media_saving_period_forever">Amžinai</string>
+    <string name="media_saving_period_1_month">1 mėnuo</string>
+    <string name="media_saving_period_1_week">1 savaitė</string>
+    <string name="media_saving_period_3_days">3 dienos</string>
+    <string name="settings_play_shutter_sound">Groti užrakto garsą</string>
+    <string name="media_source_choose">Pasirinkti</string>
+    <string name="settings_default_media_source">Numatytasis medijos šaltinis</string>
+    <string name="compression_opt_list_choose">Pasirinkti</string>
+    <string name="settings_default_compression">Numatytasis glaudinimas</string>
+    <string name="settings_media">Medija</string>
+    <string name="settings_select_country">Pasirinkti šalį</string>
+    <string name="settings_discovery_consent_notice_on">Sutikote siųsti el. paštus ir telefono numerius į šį tapatybės serverį, kad būtų galima atrasti kitus naudotojus iš jūsų kontaktų.</string>
+    <string name="identity_server_consent_dialog_title_2">Siųsti el. paštus ir telefono numerius į %s</string>
+    <string name="settings_discovery_consent_action_give_consent">Duoti sutikimą</string>
+    <string name="settings_discovery_consent_action_revoke">Atšaukti mano sutikimą</string>
+    <string name="settings_discovery_consent_notice_off_2">Jūsų kontaktai yra privatūs. Kad galėtume rasti naudotojus iš jūsų kontaktų, mums reikia jūsų leidimo siųsti kontaktinę informaciją į jūsų tapatybės serverį.</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Išsiuntėme jums patvirtinimo el. laišką į %s, pirmiausia patikrinkite savo el. paštą ir spustelėkite patvirtinimo nuorodą</string>
+    <string name="settings_discovery_confirm_mail">Išsiuntėme jums patvirtinimo el. laišką į %s, patikrinkite savo el. paštą ir spustelėkite patvirtinimo nuorodą</string>
+    <string name="settings_discovery_msisdn_title">Atrandami telefono numeriai</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Atsijungimas nuo tapatybės serverio reiškia, kad jūsų negalės rasti kiti naudotojai ir negalėsite pakviesti kitų el. paštu ar telefonu.</string>
+    <string name="settings_discovery_no_msisdn">Pridėjus telefono numerį bus rodomos atradimo parinktys.</string>
+    <string name="settings_discovery_no_mails">Pridėjus el. pašto adresą, bus rodomos atradimo parinktys.</string>
+    <string name="settings_discovery_emails_title">Atrandami el. pašto adresai</string>
+    <string name="settings_discovery_identity_server_info_none">Šiuo metu nenaudojate tapatybės serverio. Norėdami atrasti esamus žinomus kontaktus ir būti jų atrandami, sukonfigūruokite jį žemiau.</string>
+    <string name="settings_discovery_identity_server_info">Šiuo metu naudojate %1$s, esamų kontaktų atradimui, kuriuos pažįstate, ir kad būtumėte jų atrandami.</string>
+    <string name="settings_discovery_no_policy_provided">Tapatybės serveris nepateikė jokios politikos</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_info">Temos yra nebaigtas darbas, kuriame bus naujų, įdomių būsimų funkcijų, pvz., patobulinti pranešimai. Norėtume išgirsti jūsų atsiliepimus!</string>
+    <string name="send_feedback_threads_title">Temų Beta atsiliepimai</string>
+    <string name="settings_emails_and_phone_numbers_summary">Tvarkyti el. paštus ir telefono numerius susietus su jūsų Matrix paskyra</string>
+    <string name="settings_emails_and_phone_numbers_title">El. paštai ir telefono numeriai</string>
+    <string name="settings_unignore_user">Rodyti visas žinutes nuo %s\?</string>
+    <string name="settings_password_updated">Jūsų slaptažodis buvo atnaujintas</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">Slaptažodis nėra tinkamas</string>
+    <string name="settings_fail_to_update_password">Nepavyko atnaujinti slaptažodžio</string>
+    <string name="settings_new_password">Naujas slaptažodis</string>
+    <string name="settings_old_password">Dabartinis slaptažodis</string>
+    <string name="settings_change_password">Keisti slaptažodį</string>
+    <string name="settings_password">Slaptažodis</string>
+    <string name="account_phone_number_already_used_error">Šis telefono numeris jau naudojamas.</string>
+    <string name="account_email_already_used_error">Šis el. pašto adresas jau naudojamas.</string>
+    <string name="account_email_validation_message">Patikrinkite savo el. paštą ir spustelėkite jame esančią nuorodą. Kai tai padarysite, spauskite tęsti.</string>
+    <string name="analytics_opt_in_title">Padėkite tobulinti ${app_name}</string>
+    <string name="settings_opt_in_of_analytics_summary">${app_name} renka anoniminę analizę, kad galėtume tobulinti programą.</string>
+    <string name="settings_select_language">Pasirinkti kalbą</string>
+    <string name="settings_interface_language">Kalba</string>
+    <string name="settings_opt_in_of_analytics">Siųsti analitikos duomenis</string>
+    <string name="settings_analytics">Analitika</string>
+    <string name="settings_discovery_manage">Tvarkyti atradimo nustatymus.</string>
+    <string name="settings_discovery_category">Atradimas</string>
+    <string name="settings_deactivate_my_account">Deaktyvuoti mano paskyrą</string>
+    <string name="reset_secure_backup_warning">Tai pakeis dabartinį raktą arba frazę.</string>
+    <string name="reset_secure_backup_title">Generuoti naują saugumo raktą arba nustatyti naują esamos atsarginės kopijos saugumo frazę.</string>
+    <string name="settings_secure_backup_section_info">Apsisaugokite nuo užšifruotų žinučių ir duomenų praradimo, darydami šifravimo raktų atsargines kopijas serveryje.</string>
+    <string name="settings_secure_backup_enter_to_setup">Nustatyti šiame įrenginyje</string>
+    <string name="settings_secure_backup_reset">Nustatyti saugią atsarginę kopiją iš naujo</string>
+    <string name="settings_secure_backup_setup">Nustatyti saugią atsarginę kopiją</string>
+    <string name="settings_secure_backup_section_title">Saugi atsarginė kopija</string>
+    <string name="settings_show_emoji_keyboard_summary">Pridėti žinutės kompozitoriuje mygtuką jaustukų klaviatūros atidarymui</string>
+    <string name="settings_show_emoji_keyboard">Rodyti jaustukų klaviatūrą</string>
+    <string name="settings_send_message_with_enter_summary">Programinės klaviatūros mygtukas Enter išsiųs žinutę, o ne pridės eilutės pertrauką</string>
+    <string name="settings_send_message_with_enter">Siųsti žinutę su enter</string>
+    <string name="settings_preview_media_before_sending">Medijos peržiūra prieš siunčiant</string>
+    <string name="settings_vibrate_on_mention">Vibruoti paminėjus naudotoją</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Įtraukiami avataro ir rodomojo vardo keitimai.</string>
+    <string name="settings_show_avatar_display_name_changes_messages">Rodyti paskyrų įvykius</string>
+    <string name="settings_show_join_leave_messages_summary">Kvietimai, pašalinimai ir užblokavimai nėra įtakojami.</string>
+    <string name="settings_show_join_leave_messages">Rodyti prisijungimo ir išėjimo įvykius</string>
+    <string name="settings_autoplay_animated_images_summary">Paleisti animuotus paveikslėlius laiko juostoje, kai tik jie tampa matomi</string>
+    <string name="settings_autoplay_animated_images_title">Automatinis animuotų vaizdų paleidimas</string>
+    <string name="settings_chat_effects_description">Naudokite /confetti komandą arba siųskite žinutę, kurioje yra ❄️ arba 🎉</string>
+    <string name="settings_chat_effects_title">Rodyti pokalbio efektus</string>
+    <string name="settings_show_read_receipts_summary">Spustelėkite ant skaitymo kvitų, kad pamatytumėte išsamų sąrašą.</string>
+    <string name="settings_show_read_receipts">Rodyti skaitymo kvitus</string>
+    <string name="settings_12_24_timestamps">Rodyti laiko žymas 12 valandų formatu</string>
+    <string name="settings_contacts_app_permission">Leidimas naudotis kontaktais</string>
+    <string name="settings_always_show_timestamps">Rodyti laiko žymas visoms žinutėms</string>
+    <string name="settings_send_markdown_summary">Prieš siunčiant žinutes, suformatuoti jas naudojant Markdown sintakse. Tai leidžia atlikti išplėstinį formatavimą, pavyzdžiui, naudoti žvaigždutes tekstui kursyvu rodyti.</string>
+    <string name="settings_send_markdown">Markdown formatavimas</string>
+    <string name="settings_user_interface">Naudotojo sąsaja</string>
+    <string name="settings_send_typing_notifs_summary">Leisti kitiems naudotojams žinoti, kad rašote.</string>
+    <string name="disabled_integration_dialog_content">Norėdami tai daryti, Įjunkite \'Leisti integracijas\' nustatymuose.</string>
+    <string name="settings_send_typing_notifs">Siųsti pranešimus apie rašymą</string>
+    <string name="legals_third_party_notices">Trečiųjų šalių bibliotekos</string>
+    <string name="legals_identity_server_title">Jūsų tapatybės serverio politika</string>
+    <string name="legals_home_server_title">Jūsų namų serverio politika</string>
+    <string name="legals_application_title">${app_name} politika</string>
+    <string name="settings_integration_manager">Integracijų tvarkyklė</string>
+    <string name="settings_integration_allow">Leisti integracijas</string>
+    <string name="settings_identity_server">Tapatybės serveris</string>
+    <string name="settings_home_server">Namų serveris</string>
+    <string name="settings_logged_in">Prisijungta kaip</string>
+    <string name="devices_delete_dialog_title">Autentifikacija</string>
+    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+    <string name="devices_details_last_seen_title">Paskutinį kartą matytas</string>
+    <string name="devices_details_device_name">Atnaujinti viešą pavadinimą</string>
+    <string name="devices_details_name_title">Viešas pavadinimas</string>
+    <string name="settings_deactivate_account_section">Deaktyvuoti paskyrą</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="analytics_opt_in_list_item_3">Tai galite bet kada išjungti nustatymuose</string>
+    <string name="analytics_opt_in_list_item_2">Mes &lt;b&gt;nesidalijame&lt;/b&gt; informacija su trečiosiomis šalimis</string>
+    <string name="analytics_opt_in_list_item_1">Mes &lt;b&gt;neįrašome ir neprofiliuojame&lt;/b&gt; jokių paskyros duomenų</string>
+    <string name="analytics_opt_in_content_link">čia</string>
+    <string name="disabled_integration_dialog_title">Integracijos yra išjungtos</string>
+    <string name="legals_no_policy_provided">Šis serveris nepateikia jokios politikos.</string>
+    <string name="notice_call_candidates_by_you">Išsiuntėte duomenis skambučiui nustatyti.</string>
+    <string name="settings_discovery_hide_identity_server_policy_title">Slėpti tapatybės serverio politiką</string>
+    <string name="settings_discovery_show_identity_server_policy_title">Rodyti tapatybės serverio politiką</string>
+    <string name="downloaded_file">Failas %1$s buvo atsiųstas!</string>
+    <string name="send_file_step_compressing_video">Suglaudinamas vaizdo įrašas %d%%</string>
+    <string name="send_file_step_compressing_image">Suglaudinamas paveikslėlis…</string>
+    <string name="send_file_step_sending_file">Siunčiamas failas (%1$s / %2$s)</string>
+    <string name="send_file_step_sending_thumbnail">Siunčiama miniatiūra (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Užšifruojamas failas…</string>
+    <string name="send_file_step_encrypting_thumbnail">Užšifruojama miniatiūra…</string>
+    <string name="room_filtering_footer_title">Nerandate to, ko ieškote\?</string>
+    <string name="send_file_step_idle">Laukiama…</string>
+    <string name="room_filtering_filter_hint">Filtruoti pokalbius…</string>
+    <string name="no_message_edits_found">Redagavimų nerasta</string>
+    <string name="message_edits">Žinutės redagavimai</string>
+    <string name="edited_suffix">(redaguota)</string>
+    <string name="labs_show_unread_notifications_as_tab">Pagrindiniame ekrane pridėti specialų skirtuką neperskaitytiems pranešimams.</string>
+    <string name="labs_swipe_to_reply_in_timeline">Įjungti perbraukimą, kad atsakytumėte laiko juostoje</string>
+    <string name="search_hint_room_name">Ieškoti pavadinimo</string>
+    <string name="user_directory_search_hint_2">Ieškoti pagal vardą, ID arba paštą</string>
+    <string name="room_directory_search_hint">Pavadinimas arba ID (#pavyzdys:matrix.org)</string>
+    <string name="room_filtering_footer_open_room_directory">Peržiūrėti kambarių katalogą</string>
+    <string name="room_filtering_footer_create_new_direct_message">Siųsti naują tiesioginę žinutę</string>
+    <string name="bottom_action_people_x">Tiesioginės žinutės</string>
+    <string name="room_filtering_footer_create_new_room">Sukurti naują kambarį</string>
+    <string name="direct_room_user_list_suggestions_title">Pasiūlymai</string>
+    <string name="direct_room_user_list_known_title">Žinomi naudotojai</string>
+    <string name="creating_direct_room">Kuriamas kambarys…</string>
+    <string name="qr_code">QR kodas</string>
+    <string name="add_by_qr_code">Pridėti pagal QR kodą</string>
+    <string name="terms_description_for_identity_server">Būkite atrandami kitų</string>
+    <string name="terms_of_service">Paslaugų teikimo sąlygos</string>
+    <string name="message_view_edit_history">Peržiūrėti redagavimo istoriją</string>
+    <string name="link_copied_to_clipboard">Nuoroda nukopijuota į iškarpinę</string>
+    <string name="open_discovery_settings">Atidaryti atradimo nustatymus</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Rodyti pilną istoriją užšifruotuose kambariuose</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">Rodyti paslėptus įvykius laiko juostoje</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Iš naujo nustatyti pranešimų metodą</string>
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Registruoti žetoną</string>
+    <string name="preference_system_settings">Sistemos nustatymai</string>
+    <string name="settings_push_gateway_no_pushers">Nėra registruotų tiesioginių pranešimų vartų</string>
+    <string name="settings_push_rules_no_rules">Nėra nustatytų tiesioginų pranešimų taisyklių</string>
+    <string name="settings_push_rules">Tiesioginių pranešimų taisyklės</string>
+    <string name="settings_security_and_privacy">Saugumas &amp; Privatumas</string>
+    <string name="settings_preferences">Nuostatos</string>
+    <string name="settings_general_title">Bendrieji</string>
+    <string name="settings_other_third_party_notices">Kiti trečiųjų šalių pranešimai</string>
+    <string name="settings_sdk_version">Matrix SDK versija</string>
+    <string name="create_room_settings_section">Kambario nustatymai</string>
+    <string name="settings_show_redacted_summary">Rodyti pašalintų žinučių vietoje užrašą</string>
+    <string name="settings_show_redacted">Rodyti pašalintas žinutes</string>
+    <string name="keys_backup_settings_delete_confirm_message">ištrinti iš serverio atsarginę šifravimo raktų kopiją\? Atkūrimo rakto nebegalėsite naudoti užšifruotai žinučių istorijai skaityti.</string>
+    <string name="keys_backup_settings_delete_confirm_title">Ištrinti atsarginę kopiją</string>
+    <string name="keys_backup_settings_checking_backup_state">Tikrinama atsarginės kopijos būsena</string>
+    <string name="keys_backup_settings_deleting_backup">Atsarginė kopija ištrinama…</string>
+    <string name="keys_backup_settings_untrusted_backup">Jei norite naudoti atsarginę raktų kopiją šioje sesijoje, dabar atkurkite naudodami slaptažodį arba atkūrimo raktą.</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Atsarginė kopija turi netinkamą parašą iš nepatvirtintos sesijos %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Atsarginė kopija turi netinkamą parašą iš patvirtintos sesijos %s</string>
+    <string name="settings_labs_native_camera_summary">Įjungti sistemos kamerą, vietoj pritaikytos kameros ekrano.</string>
+    <string name="settings_labs_native_camera">Naudoti vietinę kamerą</string>
+    <string name="encryption_information_verify_device_warning">Patvirtinkite palygindami šiuos duomenis su naudotojo nustatymais kitoje sesijoje:</string>
+    <string name="encryption_settings_manage_message_recovery_summary">Tvarkyti raktų atsarginę kopiją</string>
+    <string name="settings_theme">Tema</string>
+    <string name="room_settings_unset_main_address">Atšaukti nustatymą pagrindiniu adresu</string>
+    <string name="room_settings_set_main_address">Nustatyti kaip pagrindinį adresą</string>
+    <string name="room_settings_labs_warning_message">Tai eksperimentinės funkcijos, kurios gali netikėtai sugesti. Naudokite atsargiai.</string>
+    <string name="room_settings_labs_pref_title">Laboratorijos</string>
+    <string name="room_settings_room_version_title">Kambario versija</string>
+    <string name="room_settings_room_internal_id">Šio kambario vidinis ID</string>
+    <string name="room_settings_category_advanced_title">Išplėstiniai</string>
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d užblokuotas naudotojas</item>
+        <item quantity="few">%d užblokuoti naudotojai</item>
+        <item quantity="other">%d užblokuotų naudotojų</item>
+    </plurals>
+    <string name="room_settings_banned_users_title">Užblokuoti naudotojai</string>
+    <string name="room_settings_room_access_public_description">Bet kas gali rasti kambarį ir prisijungti</string>
+    <string name="room_settings_room_access_public_title">Viešas</string>
+    <string name="room_settings_room_access_private_description">Tik pakviesti žmonės gali rasti ir prisijungti</string>
+    <string name="room_settings_room_access_private_invite_only_title">Privatus (tik su kvietimais)</string>
+    <string name="room_settings_room_access_private_title">Privatus</string>
+    <string name="room_settings_room_access_entry_unknown">Nežinomas prieigos nustatymas (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Bet kas gali pasibelsti į kambarį, o nariai gali priimti arba atmesti</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Tik nariai (nuo jų prisijungimo)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Tik nariai (nuo jų pakvietimo)</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Tik nariai (nuo šios parinkties pasirinkimo momento)</string>
+    <string name="room_settings_read_history_entry_anyone">Bet kas</string>
+    <string name="room_settings_guest_access_title">Leisti svečiams prisijungti</string>
+    <string name="room_settings_room_notifications_notify_me">Pranešti man apie</string>
+    <string name="room_settings_alias_subtitle">Peržiūrėti ir tvarkyti šio kambario adresus bei jo matomumą kambarių kataloge.</string>
+    <string name="room_settings_access_rules_pref_dialog_title">Kas gali prieiti\?</string>
+    <string name="room_settings_room_read_history_dialog_subtitle">Pakeitimai, kas gali skaityti istoriją, bus taikomi tik būsimoms šio kambario žinutėms. Esamos istorijos matomumas išliks nepakitęs.</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Kas gali skaityti istoriją\?</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Kambario istorijos skaitomumas</string>
+    <string name="room_settings_room_notifications_account_settings">Paskyros nustatymai</string>
+    <string name="room_settings_topic">Tema</string>
+    <string name="room_settings_alias_title">Kambario adresai</string>
+    <string name="room_settings_room_access_title">Kambario prieiga</string>
+    <string name="room_settings_room_notifications_manage_notifications">Pranešimus galite tvarkyti %1$s.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Atkreipkite dėmesį, kad pranešimai apie paminėjimus ir raktinius žodžius užšifruotuose kambariuose, nėra prieinami mobiliuosiuose įrenginiuose.</string>
+    <string name="settings_notification_configuration">Pranešimų konfigūracija</string>
+    <string name="settings_security_prevent_screenshots_summary">Įjungus šį nustatymą, prie visų veiksmų pridedamas žymuo FLAG_SECURE. Iš naujo paleiskite programą, kad pakeitimas įsigaliotų.</string>
+    <string name="settings_security_prevent_screenshots_title">Neleisti programos ekrano nuotraukų</string>
+    <string name="auth_biometric_key_invalidated_message">Biometrinis autentifikavimas buvo išjungtas, nes neseniai buvo pridėtas naujas biometrinis autentifikavimo metodas. Jį vėl galite įjungti nustatymuose.</string>
+    <string name="settings_security_pin_code_use_biometrics_error">Nepavyko įjungti biometrinio autentifikavimo.</string>
+    <string name="a11y_open_settings">Atidaryti nustatymus</string>
+    <string name="labs_enable_deferred_dm_summary">Sukurti AŽ tik po pirmos žinutės</string>
+    <string name="labs_enable_deferred_dm_title">Įjungti atidėtas AŽ</string>
+    <string name="labs_enable_new_app_layout_summary">Supaprastintas Element su nebūtinais skirtukais</string>
+    <string name="labs_enable_new_app_layout_title">Įjungti naują išdėstymą</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-lt/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-lt/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-lt/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-lt/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-lv/strings.xml b/library/ui-strings/src/main/res/values-lv/strings.xml
similarity index 99%
rename from vector/src/main/res/values-lv/strings.xml
rename to library/ui-strings/src/main/res/values-lv/strings.xml
index f16e61980e..1787653fae 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/library/ui-strings/src/main/res/values-lv/strings.xml
@@ -152,8 +152,6 @@
     <string name="event_status_sending_message">Sūta ziņu…</string>
     <string name="initial_sync_start_importing_account_data">Sākotnējā sinhronizācija:
 \nImportē konta datus</string>
-    <string name="initial_sync_start_importing_account_groups">Sākotnējā sinhronizācija:
-\nImportē kopienas</string>
     <string name="initial_sync_start_importing_account_left_rooms">Sākotnējā sinhronizācija:
 \nImportē pamestās istabas</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Sākotnējā sinhronizācija:
@@ -279,7 +277,6 @@
     <string name="notification_silent_notifications">Klusi paziņojumi</string>
     <string name="title_activity_bug_report">Kļūdas atskaite</string>
     <string name="loading">Ielādējas…</string>
-    <string name="groups_header">Kopienas</string>
     <string name="start_voice_call_prompt_msg">Tiešām vēlies uzsākt balss zvanu\?</string>
     <string name="start_video_call_prompt_msg">Tiešām vēlies uzsākt video zvanu\?</string>
     <string name="option_take_photo">Uzņemt foto</string>
@@ -290,7 +287,6 @@
     <string name="auth_forgot_password">Aizmirsāt paroli\?</string>
 
     <string name="auth_recaptcha_message">Mājasservers vēlas pārbaudīt, vai neesat robots</string>
-    <string name="auth_reset_password_missing_email">Ir jābūt ievadītai kontam piesaistītajai epasta adresei.</string>
     <string name="auth_reset_password_error_unauthorized">Neizdevās verificēt epasta adresi: pārbaudiet, vai esi noklikšķinājis(usi) uz saiti atsūtītajā epastā</string>
 
     <string name="login_error_invalid_home_server">Ievadi korektu URL adresi</string>
@@ -473,7 +469,7 @@
     <string name="settings_theme">Tēma</string>
     <string name="encryption_information_decryption_error">Atšifrēšanas kļūda</string>
     <string name="encryption_information_device_name">Ierīces nosaukums</string>
-    <string name="encryption_information_device_id">Sesijas ID</string>
+    <string name="device_manager_session_details_session_id">Sesijas ID</string>
     <string name="encryption_information_device_key">Sesijas atslēga</string>
     <string name="encryption_export_e2e_room_keys">Eksportēt istabas šifrēšanas atslēgas</string>
     <string name="encryption_export_room_keys">Eksportēt istabas atslēgas</string>
@@ -699,7 +695,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="fab_menu_create_chat">Tiešās ziņas</string>
     <string name="fab_menu_create_room">Istabas</string>
     <string name="room_preview_no_preview">Šo istabu nevar priekšskatīt</string>
-    <string name="group_all_communities">Visas kopienas</string>
     <string name="event_redacted">Ziņa ir dzēsta</string>
     <string name="reactions">Reaģēšana</string>
     <string name="title_activity_emoji_reaction_picker">Reaģēšana</string>
diff --git a/vector/src/main/res/values-lv/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-lv/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-lv/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-lv/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-mk/strings.xml b/library/ui-strings/src/main/res/values-mk/strings.xml
similarity index 100%
rename from vector/src/main/res/values-mk/strings.xml
rename to library/ui-strings/src/main/res/values-mk/strings.xml
diff --git a/vector/src/main/res/values-ml/strings.xml b/library/ui-strings/src/main/res/values-ml/strings.xml
similarity index 99%
rename from vector/src/main/res/values-ml/strings.xml
rename to library/ui-strings/src/main/res/values-ml/strings.xml
index e7e57d9e21..20bc2d4354 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/library/ui-strings/src/main/res/values-ml/strings.xml
@@ -403,8 +403,6 @@
     <string name="event_status_sending_message">സന്ദേശം അയയ്ക്കുന്നു…</string>
     <string name="initial_sync_start_importing_account_data">പ്രാരംഭ സമന്വയം:
 \nഅക്കൗണ്ട് ഡാറ്റ ഇറക്കുമതി ചെയ്യുന്നു</string>
-    <string name="initial_sync_start_importing_account_groups">പ്രാരംഭ സമന്വയം:
-\nജനസമൂഹങ്ങൾ ഇറക്കുമതി ചെയ്യുന്നു</string>
     <string name="initial_sync_start_importing_account_left_rooms">പ്രാരംഭ സമന്വയം:
 \nഉപേക്ഷിച്ച മുറികൾ ഇറക്കുമതി ചെയ്യുന്നു</string>
     <string name="initial_sync_start_importing_account_invited_rooms">പ്രാരംഭ സമന്വയം:
@@ -474,7 +472,6 @@
     <string name="call_camera_front">മുന്നിലുള്ള</string>
     <string name="call_camera_back">പിന്നിലുള്ള</string>
     <string name="sound_device_headset">ഹെഡ്‌സെറ്റ്</string>
-    <string name="groups_header">കമ്മ്യൂണിറ്റികൾ</string>
     <string name="dialog_title_error">പിശക്</string>
     <string name="action_disconnect">വിച്ഛേദിക്കുക</string>
     <string name="action_revoke">അസാധുവാക്കുക</string>
diff --git a/vector/src/main/res/values-ml/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-ml/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-ml/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-ml/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/library/ui-strings/src/main/res/values-nb-rNO/strings.xml
similarity index 99%
rename from vector/src/main/res/values-nb-rNO/strings.xml
rename to library/ui-strings/src/main/res/values-nb-rNO/strings.xml
index 683961e590..067dbbbc28 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/library/ui-strings/src/main/res/values-nb-rNO/strings.xml
@@ -36,13 +36,12 @@
     <string name="copied_to_clipboard">Kopiert til utklippstavle</string>
     <string name="dialog_title_warning">Advarsel</string>
     <string name="dialog_title_error">Feil</string>
-    <string name="bottom_action_people">Folk</string>
+    <string name="bottom_action_people">Personer</string>
     <string name="bottom_action_rooms">Rom</string>
     <string name="invitations_header">Invitasjoner</string>
     <string name="low_priority_header">Lavprioritet</string>
     <string name="no_result_placeholder">Ingen treff</string>
     <string name="rooms_header">Rom</string>
-    <string name="groups_header">Samfunn</string>
     <string name="send_bug_report">Meld fra om en bug</string>
     <string name="send_bug_report_progress">Fremgang (%s%%)</string>
     <string name="join_room">Bli med i rommet</string>
@@ -66,10 +65,6 @@
     <string name="action_remove">Fjern</string>
     <string name="action_join">Bli med</string>
     <string name="action_reject">Avvis</string>
-
-
-
-
     <string name="room_participants_action_invite">Inviter</string>
     <string name="room_participants_action_ban">Utesteng</string>
     <string name="room_participants_action_unban">Opphev utestengelse</string>
@@ -120,7 +115,7 @@
     <string name="room_settings_banned_users_title">Bannlyste brukere</string>
     <string name="room_settings_category_advanced_title">Avansert</string>
     <string name="settings_theme">Tema</string>
-    <string name="encryption_information_device_id">Økt-ID</string>
+    <string name="device_manager_session_details_session_id">Økt-ID</string>
     <string name="encryption_information_device_key">Øktnøkkel</string>
     <string name="encryption_export_export">Eksporter</string>
     <string name="encryption_import_import">Importer</string>
@@ -266,7 +261,6 @@
     <string name="room_one_user_is_typing">%s skriver …</string>
     <string name="search_hint">Søk</string>
     <string name="search_members_hint">Filtrer rommets medlemmer</string>
-
     <string name="room_settings_all_messages">Alle meldinger</string>
     <string name="settings_olm_version">olm-versjon</string>
     <string name="settings_deactivate_account_section">Deaktiver kontoen</string>
@@ -315,8 +309,6 @@
     <string name="notification_noisy">Bråkete</string>
     <string name="encrypted_message">Kryptert melding</string>
     <string name="rooms">Rom</string>
-
-
     <string name="reason_colon">Årsak: %1$s</string>
     <string name="x_plus">%d+</string>
     <string name="keys_backup_setup">Begynn å bruke Nøkkelsikkerhetskopiering</string>
@@ -380,7 +372,6 @@
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Du kommer til å miste tilgang til dine enkrypterte meldinger med mindre du sikkerhetskopierer nøklene dine før du logger av.</string>
     <string name="view_decrypted_source">Se dekryptert kilde</string>
     <string name="report_content">Rapporter innhold</string>
-
     <string name="action_sign_out_confirmation_simple">Er du sikker på at vil logge ut\?</string>
     <string name="action_voice_call">Telefonsamtale</string>
     <string name="action_video_call">Videosamtale</string>
@@ -394,7 +385,6 @@
     <string name="system_alerts_header">Systemadvarsler</string>
     <string name="direct_chats_header">Samtaler</string>
     <string name="matrix_only_filter">Bare matrix-kontakter</string>
-
     <string name="send_bug_report_include_crash_logs">Send kjæsjlogg</string>
     <string name="send_bug_report_include_screenshot">Send skjermbilde</string>
     <string name="send_bug_report_description">Vennligst forklar feilen. Hva gjorde du\? Hva forventet du at skulle skje\? Hva skjedde i stedet\?</string>
@@ -447,7 +437,6 @@
     <string name="auth_invalid_email">Dette ser ikke ut som en gyldig E-postadresse</string>
     <string name="login_error_ssl_other">SSL-feil.</string>
     <string name="login_error_limit_exceeded">For mange forespørsler har blitt sendt</string>
-
     <string name="room_participants_leave_prompt_title">Forlat rommet</string>
     <string name="room_participants_header_direct_chats">Direktemeldinger</string>
     <string name="room_participants_action_ignore_title">Ignorer bruker</string>
@@ -524,7 +513,6 @@
     <string name="event_redacted">Meldingen ble slettet</string>
     <string name="settings_show_redacted">Vis fjernede meldinger</string>
     <string name="settings_show_redacted_summary">Vis en stattholder for fjernede meldinger</string>
-    <string name="group_all_communities">Alle samfunn</string>
     <string name="settings_sdk_version">Matrix SDK-versjon</string>
     <string name="send_suggestion">Send inn et forslag</string>
     <string name="send_file_step_encrypting_file">Krypterer filen …</string>
@@ -602,14 +590,10 @@
     <string name="no_permissions_to_start_conf_call_in_direct_room">Du har ikke tillatelse til å starte en konferansesamtale</string>
     <string name="action_reset">Tilbakestill</string>
     <string name="auth_accept_policies">Vennligst gjennomgå og godta retningslinjene til denne hjemmeserveren:</string>
-
     <string name="auth_reset_password_error_unauthorized">Klarte ikke verifisere e-postadressen: Pass på at du har klikket på lenken i e-posten</string>
-    <string name="auth_reset_password_missing_email">Du må skrive inn e-postadressen som er knyttet til din konto.</string>
     <string name="auth_recaptcha_message">Denne hjemmetjeneren vil vite om du er en robot</string>
-
     <string name="call_failed_no_connection_description">Klarte ikke å starte en sanntidskopling.
 \nVennligst be hjemmetjeneradministratoren din om å sette opp en TURN server så samtaler blir mer stabile.</string>
-
     <string name="login_error_not_json">Inneholdt ikke gyldig JSON</string>
     <string name="login_error_bad_json">Ugyldig JSON</string>
     <string name="set_a_security_phrase_hint">Sikkerhetsfrase</string>
@@ -705,7 +689,6 @@
     <string name="settings_app_info_link_title">App info</string>
     <string name="settings_phone_number_empty">Ingen telefonnummer er lagt til kontoen din</string>
     <string name="room_settings_add_homescreen_shortcut">Legg til på startskjerm</string>
-
     <string name="ssl_only_accept">Godta bare sertifikatet hvis serveradministratoren har publisert et fingeravtrykk som samsvarer med det over.</string>
     <string name="ssl_expected_existing_expl">Sertifikatet er endret fra en tidligere klarert til en som ikke er klarert. Serveren kan ha fornyet sertifikatet. Kontakt serveradministratoren for forventet fingeravtrykk.</string>
     <string name="ssl_unexpected_existing_expl">Sertifikatet har endret seg fra et som telefonen din klarerte. Dette er veldig uvanlig. Det anbefales at du IKKE godtar dette nye sertifikatet.</string>
@@ -737,19 +720,14 @@
     <string name="room_participants_action_mention">Nevne</string>
     <string name="room_participants_action_cancel_invite">Avbryt invitasjonen</string>
     <string name="room_participants_leave_prompt_msg">Er du sikker på at du vil forlate rommet\?</string>
-
     <string name="room_jump_to_first_unread">Gå til første uleste melding.</string>
     <string name="list_members">Liste medlemmer</string>
     <string name="permissions_denied_add_contact">Tillat tillatelse til å få tilgang til kontaktene dine.</string>
     <string name="permissions_denied_qr_code">For å skanne en QR-kode, må du gi tilgang til kameraet.</string>
-
     <string name="permissions_rationale_msg_camera_and_audio">${app_name} trenger tillatelse for å få tilgang til kameraet og mikrofonen for å utføre videosamtaler.
 \n
 \nTillat tilgang til de neste popup-vinduene for å kunne ringe.</string>
-
     <string name="permissions_rationale_msg_record_audio">${app_name} trenger tillatelse for å få tilgang til mikrofonen din for å utføre lydanrop.</string>
-
-
     <string name="incoming_voice_call">Innkommende taleanrop</string>
     <string name="incoming_video_call">Innkommende videosamtale</string>
     <string name="call_ended">Anrop avsluttet</string>
@@ -773,7 +751,6 @@
     <string name="start_chatting">Begynn å chatte</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nDenne feilen er utenfor kontroll av ${app_name}, og ifølge Google indikerer denne feilen at enheten har for mange apper registrert hos FCM. Feilen oppstår bare i tilfeller der det er ekstremt mange apper, så det bør ikke påvirke gjennomsnittsbrukeren.</string>
-
     <string name="call_error_user_not_responding">Ekstern vert kunne ikke plukke opp.</string>
     <string name="video_call_in_progress">Pågående videosamtale…</string>
     <string name="call_in_progress">Pågående samtale…</string>
@@ -1140,7 +1117,6 @@
     <string name="settings_integrations_summary">Bruk en integrasjonshåndterer til å administrere botter, broer, widgets og klistremerkepakker.
 \nIntegrasjonshåndterere mottar konfigurasjonsdata, og kan endre moduler, sende rominvitasjoner og angi maktnivåer på dine vegne.</string>
     <string name="settings_set_sync_delay">Forsinkelse mellom hver synkronisering</string>
-
     <string name="settings_set_sync_timeout">Tidsavbrudd for synkroniseringsforespørsel</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Du vil ikke bli varslet om innkommende meldinger når appen er i bakgrunnen.</string>
     <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} vil synkroniseres i bakgrunnen med jevne mellomrom på presis tid (konfigurerbar).
@@ -1254,7 +1230,6 @@
     <string name="spaces_no_server_support_description">Ta kontakt med din hjemmetjener -administrator for mer informasjon</string>
     <string name="this_space_has_no_rooms_not_admin">Noen rom kan være skjult fordi de er private, og du trenger en invitasjon.
 \nDu har ikke tillatelse til å legge til rom.</string>
-
     <string name="upgrade_required">Oppgradering kreves</string>
     <string name="upgrade_public_room">Oppgrader offentlig rom</string>
     <string name="upgrade_private_room">Oppgrader privat rom</string>
@@ -1278,4 +1253,4 @@
     <string name="notice_display_name_set">%1$s endret visningsnavnet sitt til %2$s</string>
     <string name="notice_room_ban">%1$s utestengte %2$s</string>
     <string name="notice_room_invite_no_invitee">%ss invitasjon</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-nb-rNO/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-nb-rNO/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-nb-rNO/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-nb-rNO/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-nl/strings.xml b/library/ui-strings/src/main/res/values-nl/strings.xml
similarity index 70%
rename from vector/src/main/res/values-nl/strings.xml
rename to library/ui-strings/src/main/res/values-nl/strings.xml
index a79f5e7aee..5bc5305df4 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/library/ui-strings/src/main/res/values-nl/strings.xml
@@ -2,11 +2,11 @@
 <resources>
     <string name="notice_room_invite_no_invitee">Uitnodiging van %s</string>
     <string name="notice_room_invite">%1$s heeft %2$s uitgenodigd</string>
-    <string name="notice_room_invite_you">%1$s heeft u uitgenodigd</string>
-    <string name="notice_room_join">%1$s neemt nu deel aan het gesprek</string>
-    <string name="notice_room_leave">%1$s heeft het gesprek verlaten</string>
+    <string name="notice_room_invite_you">%1$s heeft je uitgenodigd</string>
+    <string name="notice_room_join">%1$s is deelnemer geworden van de kamer</string>
+    <string name="notice_room_leave">%1$s heeft het de kamer verlaten</string>
     <string name="notice_room_reject">%1$s heeft de uitnodiging geweigerd</string>
-    <string name="notice_room_remove">%1$s heeft %2$s uit het gesprek verwijderd</string>
+    <string name="notice_room_remove">%1$s heeft %2$s verwijderd</string>
     <string name="notice_room_unban">%1$s heeft %2$s ontbannen</string>
     <string name="notice_room_ban">%1$s heeft %2$s verbannen</string>
     <string name="notice_room_withdraw">%1$s heeft de uitnodiging van %2$s ingetrokken</string>
@@ -15,20 +15,20 @@
     <string name="notice_display_name_changed_from">%1$s heeft zijn/haar naam aangepast van %2$s naar %3$s</string>
     <string name="notice_display_name_removed">%1$s heeft zijn/haar naam verwijderd (%2$s)</string>
     <string name="notice_room_topic_changed">%1$s heeft het onderwerp veranderd naar: %2$s</string>
-    <string name="notice_room_name_changed">%1$s heeft de gespreksnaam veranderd naar: %2$s</string>
+    <string name="notice_room_name_changed">%1$s heeft de kamernaam veranderd naar: %2$s</string>
     <string name="notice_placed_video_call">%s heeft een video-oproep gemaakt.</string>
     <string name="notice_placed_voice_call">%s heeft een spraakoproep gemaakt.</string>
     <string name="notice_answered_call">%s heeft de oproep beantwoord.</string>
     <string name="notice_ended_call">%s heeft de oproep beëindigd.</string>
-    <string name="notice_made_future_room_visibility">%1$s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor %2$s</string>
-    <string name="notice_room_visibility_invited">alle deelnemers aan het gesprek, vanaf het punt dat ze zijn uitgenodigd.</string>
-    <string name="notice_room_visibility_joined">alle deelnemers aan het gesprek, vanaf het punt dat ze zijn toegetreden.</string>
-    <string name="notice_room_visibility_shared">alle deelnemers aan het gesprek.</string>
+    <string name="notice_made_future_room_visibility">%1$s heeft de toekomstige kamergeschiedenis zichtbaar gemaakt voor %2$s</string>
+    <string name="notice_room_visibility_invited">alle kamerdeelnemers, vanaf het punt dat ze zijn uitgenodigd.</string>
+    <string name="notice_room_visibility_joined">alle kamerdeelnemers, vanaf het punt dat ze deelnemer zijn geworden.</string>
+    <string name="notice_room_visibility_shared">alle kamerdeelnemers.</string>
     <string name="notice_room_visibility_world_readable">iedereen.</string>
     <string name="notice_avatar_changed_too">(avatar is ook veranderd)</string>
-    <string name="notice_room_name_removed">%1$s heeft de gespreksnaam verwijderd</string>
-    <string name="notice_room_topic_removed">%1$s heeft het gespreksonderwerp verwijderd</string>
-    <string name="notice_room_third_party_invite">%1$s heeft een uitnodiging naar %2$s gestuurd om het gesprek toe te treden</string>
+    <string name="notice_room_name_removed">%1$s heeft de kamernaam verwijderd</string>
+    <string name="notice_room_topic_removed">%1$s heeft het kameronderwerp verwijderd</string>
+    <string name="notice_room_third_party_invite">%1$s heeft een uitnodiging naar %2$s gestuurd om deelnemer te worden van de kamer</string>
     <string name="notice_room_third_party_registered_invite">%1$s heeft de uitnodiging voor %2$s aanvaard</string>
     <string name="notice_crypto_unable_to_decrypt">** Kan niet ontsleutelen: %s **</string>
     <string name="notice_crypto_error_unknown_inbound_session_id">Het apparaat van de afzender heeft geen sleutels voor dit bericht gestuurd.</string>
@@ -36,32 +36,30 @@
     <string name="matrix_error">Matrix-fout</string>
     <string name="medium_email">E-mailadres</string>
     <string name="medium_phone_number">Telefoonnummer</string>
-    <string name="room_displayname_room_invite">Gespreksuitnodiging</string>
+    <string name="room_displayname_room_invite">Kameruitnodiging</string>
     <string name="room_displayname_two_members">%1$s en %2$s</string>
-    <string name="room_displayname_empty_room">Leeg gesprek</string>
+    <string name="room_displayname_empty_room">Lege kamer</string>
     <string name="initial_sync_start_importing_account">Initiële synchronisatie:
 \nAccount wordt geïmporteerd…</string>
     <string name="initial_sync_start_importing_account_crypto">Initiële synchronisatie:
 \nCrypto wordt geïmporteerd</string>
     <string name="initial_sync_start_importing_account_rooms">Initiële synchronisatie:
-\nGesprekken worden geïmporteerd</string>
+\nKamers importeren</string>
     <string name="initial_sync_start_importing_account_joined_rooms">Initiële synchronisatie:
-\nDeelgenomen gesprekken worden geïmporteerd
-\nDit kan enige tijd in beslag nemen</string>
+\nGesprekken worden geladen
+\nAls u aan veel kamers deelneemt kan dit even duren</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Initiële synchronisatie:
-\nUitgenodigde gesprekken worden geïmporteerd</string>
+\nUitgenodigde kamers worden geïmporteerd</string>
     <string name="initial_sync_start_importing_account_left_rooms">Initiële synchronisatie:
-\nVerlaten gesprekken worden geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_groups">Initiële synchronisatie:
-\nGemeenschappen worden geïmporteerd</string>
+\nVerlaten kamers worden geïmporteerd</string>
     <string name="initial_sync_start_importing_account_data">Initiële synchronisatie:
 \nAccountgegevens worden geïmporteerd</string>
-    <string name="notice_room_update">%s heeft dit gesprek geüpgraded.</string>
+    <string name="notice_room_update">%s heeft deze kamer geüpgraded.</string>
     <string name="event_status_sending_message">Bericht wordt verstuurd…</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s heeft de uitnodiging voor %2$s om het gesprek toe te treden ingetrokken</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s heeft de uitnodiging voor %2$s om deelnemer te worden van de kamer ingetrokken</string>
     <string name="notice_room_invite_no_invitee_with_reason">Uitnodiging van %1$s. Reden: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s heeft %2$s uitgenodigd. Reden: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s heeft u uitgenodigd. Reden: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s heeft je uitgenodigd. Reden: %2$s</string>
     <string name="notice_room_join_with_reason">%1$s neemt nu deel. Reden: %2$s</string>
     <string name="notice_room_leave_with_reason">%1$s is weggegaan. Reden: %2$s</string>
     <string name="notice_room_reject_with_reason">%1$s heeft de uitnodiging geweigerd. Reden: %2$s</string>
@@ -71,20 +69,20 @@
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s heeft de uitnodiging voor %2$s aanvaard. Reden: %3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s heeft de uitnodiging van %2$s ingetrokken. Reden: %3$s</string>
     <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s heeft %2$s als gespreksadres toegevoegd.</item>
-        <item quantity="other">%1$s heeft %2$s als gespreksadressen toegevoegd.</item>
+        <item quantity="one">%1$s heeft %2$s als kameradres toegevoegd.</item>
+        <item quantity="other">%1$s heeft %2$s als kameradressen toegevoegd.</item>
     </plurals>
     <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s heeft %2$s als gespreksadres verwijderd.</item>
-        <item quantity="other">%1$s heeft %2$s als gespreksadressen verwijderd.</item>
+        <item quantity="one">%1$s heeft %2$s verwijderd als adres voor deze kamer.</item>
+        <item quantity="other">%1$s heeft %2$s verwijderd als adressen voor deze kamer.</item>
     </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s heeft %2$s als gespreksadres toegevoegd en %3$s verwijderd.</string>
-    <string name="notice_room_canonical_alias_set">%1$s heeft het hoofdadres voor dit gesprek ingesteld op %2$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s heeft het hoofdadres voor dit gesprek verwijderd.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s heeft %2$s toegevoegd en %3$s verwijderd als adres voor deze kamer.</string>
+    <string name="notice_room_canonical_alias_set">%1$s heeft %2$s ingesteld als het hoofdadres voor deze kamer.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s heeft het hoofdadres van deze kamer verwijderd.</string>
     <string name="notice_room_guest_access_can_join">%1$s heeft gasten de toegang tot dit gesprek verleend.</string>
     <string name="notice_room_guest_access_forbidden">%1$s heeft gasten de toegang tot het gesprek verhinderd.</string>
-    <string name="notice_end_to_end_ok">%1$s heeft end-to-end-versleuteling ingeschakeld.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s heeft end-to-end-versleuteling ingeschakeld (onbekend algoritme %2$s).</string>
+    <string name="notice_end_to_end_ok">%1$s heeft eind-tot-eind-versleuteling ingeschakeld.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s heeft eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %2$s).</string>
     <string name="title_activity_settings">Instellingen</string>
     <string name="ok">Oké</string>
     <string name="action_cancel">Annuleren</string>
@@ -125,16 +123,16 @@
     <string name="send_bug_report_include_logs">Logboek versturen</string>
     <string name="send_bug_report_include_crash_logs">Crash-logboek versturen</string>
     <string name="send_bug_report_include_screenshot">Schermafdruk versturen</string>
-    <string name="send_bug_report">Fout melden</string>
-    <string name="send_bug_report_description">Beschrijf de fout. Wat heeft u gedaan\? Wat verwachtte u dat er zou gebeuren\? Wat is er echt gebeurd\?</string>
-    <string name="send_bug_report_placeholder">Beschrijf hier uw probleem</string>
-    <string name="send_bug_report_logs_description">Om het probleem te kunnen onderzoeken worden logboeken van deze cliënt met de foutmelding verstuurd. Deze foutmelding, inclusief de logboeken en schermafdruk, zullen niet openbaar zichtbaar zijn. Indien u liever alleen de bovenstaande tekst verstuurt, haal dan het vinkje weg:</string>
-    <string name="send_bug_report_alert_message">Het ziet er naar uit dat u de telefoon in frustratie schudt. Wilt u een probleem melden\?</string>
+    <string name="send_bug_report">Probleem melden</string>
+    <string name="send_bug_report_description">Beschrijf de fout. Wat heb je gedaan\? Wat verwachtte je dat er zou gebeuren\? Wat is er echt gebeurd\?</string>
+    <string name="send_bug_report_placeholder">Beschrijf hier jouw probleem</string>
+    <string name="send_bug_report_logs_description">Om het probleem te kunnen onderzoeken worden logboeken van deze cliënt met de foutmelding verstuurd. Deze foutmelding, inclusief de logboeken en schermafdruk, zullen niet openbaar zichtbaar zijn. Indien je liever alleen de bovenstaande tekst verstuurt, haal dan het vinkje weg:</string>
+    <string name="send_bug_report_alert_message">Het ziet er naar uit dat je de telefoon in frustratie schudt. Wil je een probleem melden\?</string>
     <string name="send_bug_report_sent">De foutmelding is verzonden</string>
     <string name="send_bug_report_failed">Versturen van foutmelding is mislukt (%s)</string>
     <string name="send_bug_report_progress">Voortgang (%s%%)</string>
-    <string name="send_bug_report_app_crashed">De toepassing is de vorige keer gecrasht. Wilt u dit melden\?</string>
-    <string name="join_room">Gesprek toetreden</string>
+    <string name="send_bug_report_app_crashed">De toepassing is de vorige keer gecrasht. Wil je dit melden\?</string>
+    <string name="join_room">Deelnemen aan kamer</string>
     <string name="username">Inlognaam</string>
     <string name="logout">Afmelden</string>
     <string name="hs_url">Server-URL</string>
@@ -149,9 +147,8 @@
     <string name="auth_invalid_email">Dit is geen geldig e-mailadres</string>
     <string name="auth_email_already_defined">Dit e-mailadres is al in gebruik.</string>
     <string name="auth_forgot_password">Wachtwoord vergeten?</string>
-    <string name="auth_recaptcha_message">Deze server wil graag weten of u geen robot bent</string>
-    <string name="auth_reset_password_missing_email">Het e-mailadres dat aan uw account gekoppeld is moet ingevoerd worden.</string>
-    <string name="auth_reset_password_error_unauthorized">Verifiëren van het e-mailadres is mislukt: zorg dat u op de koppeling in de e-mail hebt geklikt</string>
+    <string name="auth_recaptcha_message">Deze server wil graag weten of je geen robot bent</string>
+    <string name="auth_reset_password_error_unauthorized">Verifiëren van het e-mailadres is mislukt: zorg dat je op de koppeling in de e-mail hebt geklikt</string>
     <string name="login_error_invalid_home_server">Voer een geldige URL in</string>
     <string name="login_error_bad_json">Ongeldige JSON</string>
     <string name="login_error_not_json">Bevatte geen geldige JSON</string>
@@ -167,19 +164,19 @@
     <string name="call_in_progress">Oproep gaande…</string>
     <string name="call_error_user_not_responding">De andere kant heeft niet opgenomen.</string>
     <string name="permissions_rationale_popup_title">Informatie</string>
-    <string name="permissions_rationale_msg_record_audio">${app_name} heeft toegang nodig tot uw microfoon om spraakoproepen te maken.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">${app_name} heeft toegang nodig tot uw camera en microfoon om video-oproepen te maken.
+    <string name="permissions_rationale_msg_record_audio">${app_name} heeft toegang nodig tot je microfoon om spraakoproepen te maken.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">${app_name} heeft toegang nodig tot je camera en microfoon om video-oproepen te maken.
 \n
 \nVerleen toegang op de volgende pop-ups om de oproep te maken.</string>
     <string name="yes">JA</string>
     <string name="no">NEE</string>
     <string name="_continue">Verdergaan</string>
     <string name="action_remove">Verwijderen</string>
-    <string name="action_join">Toetreden</string>
+    <string name="action_join">Deelnemen</string>
     <string name="action_reject">Afwijzen</string>
-    <string name="room_jump_to_first_unread">Ga naar ongelezen</string>
+    <string name="room_jump_to_first_unread">Naar ongelezen springen</string>
     <string name="room_participants_leave_prompt_title">Gesprek verlaten</string>
-    <string name="room_participants_leave_prompt_msg">Weet u zeker dat u het gesprek wilt verlaten\?</string>
+    <string name="room_participants_leave_prompt_msg">Weet je zeker dat je het gesprek wil verlaten\?</string>
     <string name="room_participants_header_direct_chats">TWEEGESPREKKEN</string>
     <string name="room_participants_action_invite">Uitnodigen</string>
     <string name="room_participants_action_ban">Verbannen</string>
@@ -187,22 +184,22 @@
     <string name="room_participants_action_ignore">Alle berichten van deze persoon verbergen</string>
     <string name="room_participants_action_unignore">Alle berichten van deze persoon tonen</string>
     <string name="room_participants_action_mention">Vermelden</string>
-    <string name="room_participants_power_level_prompt">U kunt deze veranderingen niet ongedaan maken aangezien u de persoon tot hetzelfde niveau als uzelf promoveert.
-\nWeet u het zeker\?</string>
+    <string name="room_participants_power_level_prompt">Je kan deze veranderingen niet ongedaan maken aangezien je de persoon tot hetzelfde niveau als jezelf promoveert.
+\nWeet je het zeker\?</string>
     <string name="room_one_user_is_typing">%s is aan het typen…</string>
     <string name="room_two_users_are_typing">%1$s en %2$s zijn aan het typen…</string>
     <string name="room_many_users_are_typing">%1$s, %2$s en anderen zijn aan het typen…</string>
-    <string name="room_do_not_have_permission_to_post">U heeft geen toestemming om dit naar dit gesprek te sturen.</string>
+    <string name="room_do_not_have_permission_to_post">Je hebt geen toestemming om dit naar dit gesprek te sturen.</string>
     <string name="ssl_trust">Vertrouwen</string>
     <string name="ssl_do_not_trust">Niet vertrouwen</string>
     <string name="ssl_logout_account">Afmelden</string>
     <string name="ssl_remain_offline">Negeren</string>
     <string name="ssl_fingerprint_hash">Vingerafdruk (%s):</string>
     <string name="ssl_could_not_verify">Kan de identiteit van de externe server niet verifïeren.</string>
-    <string name="ssl_cert_not_trust">Dit kan betekenen dat iemand uw internetverkeer met slechte bedoelingen probeert te onderscheppen, of dat uw telefoon het certificaat van de server niet vertrouwt.</string>
+    <string name="ssl_cert_not_trust">Dit kan betekenen dat iemand jouw internetverkeer met slechte bedoelingen probeert te onderscheppen, of dat jouw telefoon het certificaat van de server niet vertrouwt.</string>
     <string name="ssl_cert_new_account_expl">Als de serverbeheerder heeft gezegd dat dit normaal is, wees er dan zeker van dat de vingerafdruk hieronder overeenkomt met de door de beheerder verschafte vingerafdruk.</string>
-    <string name="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.</string>
-    <string name="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.</string>
+    <string name="ssl_unexpected_existing_expl">Het certificaat is veranderd van één dat door jouw telefoon werd vertrouwd naar een ander. Dit is HEEL ONGEBRUIKELIJK. Het wordt aangeraden om dit nieuwe certificaat NIET TE AANVAARDEN.</string>
+    <string name="ssl_expected_existing_expl">Het certificaat is veranderd van een vertrouwd naar een onvertrouwd certificaat. De server heeft misschien zijn certificaat vernieuwd. Neem contact op met de serverbeheerder voor de verwachte vingerafdruk.</string>
     <string name="ssl_only_accept">Aanvaard het certificaat alleen als de serverbeheerder een vingerafdruk heeft gepubliceerd die overeenkomt met degene hierboven.</string>
     <string name="search_hint">Zoeken</string>
     <string name="search_members_hint">Gespreksleden filteren</string>
@@ -213,7 +210,7 @@
     <string name="settings_add_phone_number">Telefoonnummer toevoegen</string>
     <string name="settings_app_info_link_summary">Toon informatie over de app in de systeeminstellingen.</string>
     <string name="settings_app_info_link_title">App-informatie</string>
-    <string name="settings_enable_all_notif">Meldingen voor deze account inschakelen</string>
+    <string name="settings_enable_all_notif">Meldingen voor dit account inschakelen</string>
     <string name="settings_enable_this_device">Meldingen voor deze sessie inschakelen</string>
     <string name="settings_messages_in_one_to_one">Berichten in één-op-één-gesprekken</string>
     <string name="settings_messages_in_group_chat">Berichten in groepsgesprekken</string>
@@ -230,7 +227,7 @@
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Privacybeleid</string>
     <string name="settings_clear_cache">Cache wissen</string>
-    <string name="settings_user_settings">Persoonsinstellingen</string>
+    <string name="settings_user_settings">Gebruikersinstellingen</string>
     <string name="settings_notifications">Meldingen</string>
     <string name="settings_ignored_users">Genegeerde personen</string>
     <string name="settings_other">Overige</string>
@@ -252,14 +249,14 @@
     <string name="settings_logged_in">Aangemeld als</string>
     <string name="settings_home_server">Server</string>
     <string name="settings_identity_server">Identiteitsserver</string>
-    <string name="account_email_validation_message">Bekijk uw e-mail en tik op de koppeling erin. Tik zodra dit gedaan is op Verdergaan.</string>
+    <string name="account_email_validation_message">Bekijk je e-mail en tik op de koppeling erin. Tik zodra dit gedaan is op Verdergaan.</string>
     <string name="account_email_already_used_error">Dit e-mailadres is al in gebruik.</string>
     <string name="account_phone_number_already_used_error">Dit telefoonnummer is al in gebruik.</string>
     <string name="settings_change_password">Wachtwoord veranderen</string>
     <string name="settings_old_password">Huidig wachtwoord</string>
     <string name="settings_new_password">Nieuw wachtwoord</string>
     <string name="settings_fail_to_update_password">Bijwerken van wachtwoord is mislukt</string>
-    <string name="settings_password_updated">Uw wachtwoord is gewijzigd</string>
+    <string name="settings_password_updated">Je wachtwoord is gewijzigd</string>
     <string name="settings_unignore_user">Alle berichten van %s tonen\?</string>
     <string name="settings_select_country">Kies een land</string>
     <string name="room_settings_topic">Onderwerp</string>
@@ -268,17 +265,17 @@
     <string name="room_settings_read_history_entry_anyone">Iedereen</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Alleen deelnemers (vanaf het moment dat deze optie wordt geselecteerd)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Alleen deelnemers (vanaf het moment dat ze worden uitgenodigd)</string>
-    <string name="room_settings_read_history_entry_members_only_joined">Alleen deelnemers (vanaf het moment dat ze toetreden)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Alleen deelnemers (vanaf het moment dat ze deelnemer zijn geworden)</string>
     <string name="room_settings_banned_users_title">Verbannen personen</string>
     <string name="room_settings_category_advanced_title">Geavanceerd</string>
     <string name="room_settings_room_internal_id">Interne ID van dit gesprek</string>
     <string name="room_settings_labs_pref_title">Experimenteel</string>
-    <string name="room_settings_labs_warning_message">Dit zijn experimentele functies die zich op onverwachte manieren kunnen gedragen. Wees behoedzaam bij het gebruik van deze functies.</string>
+    <string name="room_settings_labs_warning_message">Dit zijn experimentele functionaliteiten die zich op onverwachte manieren kunnen gedragen. Wees behoedzaam bij het gebruik van deze functies.</string>
     <string name="room_settings_set_main_address">Instellen als hoofdadres</string>
     <string name="room_settings_unset_main_address">Niet instellen als hoofdadres</string>
     <string name="encryption_information_decryption_error">Ontsleutelingsfout</string>
     <string name="encryption_information_device_name">Publieke naam</string>
-    <string name="encryption_information_device_id">Sessie ID</string>
+    <string name="device_manager_session_details_session_id">Sessie-ID</string>
     <string name="encryption_information_device_key">Sessiesleutel</string>
     <string name="encryption_export_e2e_room_keys">E2E-gesprekssleutels exporteren</string>
     <string name="encryption_export_room_keys">Gesprekssleutels exporteren</string>
@@ -295,9 +292,9 @@
     <string name="encryption_information_not_verified">NIET geverifieerd</string>
     <string name="encryption_information_verified">Geverifieerd</string>
     <string name="encryption_information_verify">Verifiëren</string>
-    <string name="encryption_information_verify_device_warning">Om te verifiëren dat deze sessie vertrouwd kan worden, contacteert u de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraagt u hem/haar of de sleutel die hij/zij ziet in zijn/haar persoonsinstellingen van deze sessie overeenkomt met de sleutel hieronder:</string>
-    <string name="encryption_information_verify_device_warning2">Als het overeenkomt, drukt u op de knop ‘Verifiëren’ hieronder. Als het niet overeenkomt, dan onderschept iemand anders deze sessie en zou u het beter blokkeren. In de toekomst zal dit verificatieproces verbeterd worden.</string>
-    <string name="select_room_directory">Kies een gesprekscatalogus</string>
+    <string name="encryption_information_verify_device_warning">Om te verifiëren dat deze sessie vertrouwd kan worden, neem je contact op met de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraag je ze of de sleutel die ze zien in hun persoonsinstellingen van deze sessie overeenkomt met de sleutel hieronder:</string>
+    <string name="encryption_information_verify_device_warning2">Als het overeenkomt, druk je op de knop ‘Verifiëren’ hieronder. Als het niet overeenkomt, dan onderschept iemand anders deze sessie en kan je het beter blokkeren. In de toekomst zal dit verificatieproces verbeterd worden.</string>
+    <string name="select_room_directory">Kamermap kiezen</string>
     <string name="directory_server_placeholder">Servernaam</string>
     <string name="directory_server_all_rooms_on_server">Alle gesprekken op server %s</string>
     <string name="directory_server_native_rooms">Alle lokale gesprekken op %s</string>
@@ -327,17 +324,17 @@
     <string name="notification_listening_for_events">Luisteren naar gebeurtenissen</string>
     <string name="settings_notification_ringtone">Meldingsgeluid</string>
     <string name="settings_12_24_timestamps">Tijdsaanduidingen in 12-uursformaat weergeven</string>
-    <string name="widget_delete_message_confirmation">Weet u zeker dat u deze widget uit dit gesprek wilt verwijderen\?</string>
+    <string name="widget_delete_message_confirmation">Weet je zeker dat je deze widget uit dit gesprek wilt verwijderen\?</string>
     <string name="widget_integration_unable_to_create">Kan widget niet aanmaken.</string>
     <string name="widget_integration_failed_to_send_request">Versturen van verzoek mislukt.</string>
     <string name="widget_integration_positive_power_level">Het machtsniveau moet een positief geheel getal zijn.</string>
-    <string name="widget_integration_must_be_in_room">U zit niet in dit gesprek.</string>
-    <string name="widget_integration_no_permission_in_room">U heeft geen toestemming om dat in dit gesprek te doen.</string>
+    <string name="widget_integration_must_be_in_room">Je zit niet in dit gesprek.</string>
+    <string name="widget_integration_no_permission_in_room">Je hebt geen toestemming om dat in dit gesprek te doen.</string>
     <string name="widget_integration_missing_room_id">room_id ontbreekt in het verzoek.</string>
     <string name="widget_integration_missing_user_id">user_id ontbreekt in het verzoek.</string>
     <string name="widget_integration_room_not_visible">Gesprek %s is niet zichtbaar.</string>
     <string name="room_add_matrix_apps">Matrix-apps toevoegen</string>
-    <string name="notification_noisy_notifications">Geluidsmeldingen</string>
+    <string name="notification_noisy_notifications">Belangrijke meldingen</string>
     <string name="notification_silent_notifications">Stille meldingen</string>
     <string name="title_activity_bug_report">Foutmelding</string>
     <string name="option_take_photo">Foto maken</string>
@@ -347,8 +344,8 @@
     <string name="settings_containing_my_user_name">Berichten die mijn inlognaam bevatten</string>
     <string name="settings_analytics">Statistische gegevens</string>
     <string name="settings_labs_native_camera">Systeemcamera gebruiken</string>
-    <string name="you_added_a_new_device">U heeft een nieuwe sessie ‘%s’ toegevoegd, die versleutelingssleutels aanvraagt.</string>
-    <string name="your_unverified_device_requesting">Uw ongeverifieerde sessie ‘%s’ vraagt versleutelingssleutels aan.</string>
+    <string name="you_added_a_new_device">Je hebt een nieuwe sessie ‘%s’ toegevoegd, die versleutelingssleutels aanvraagt.</string>
+    <string name="your_unverified_device_requesting">Jouw ongeverifieerde sessie ‘%s’ vraagt versleutelingssleutels aan.</string>
     <string name="start_verification">Verificatie starten</string>
     <string name="command_error">Opdrachtfout</string>
     <string name="unrecognized_command">Onbekende opdracht: %s</string>
@@ -356,10 +353,9 @@
     <string name="notification_noisy">Lawaaierig</string>
     <string name="encrypted_message">Versleuteld bericht</string>
     <string name="loading">Laden…</string>
-    <string name="groups_header">Gemeenschappen</string>
     <string name="send_bug_report_rage_shake">Schudden om een probleem te melden</string>
-    <string name="start_voice_call_prompt_msg">Weet u zeker dat u een spraakoproep wilt beginnen\?</string>
-    <string name="start_video_call_prompt_msg">Weet u zeker dat u een video-oproep wilt beginnen\?</string>
+    <string name="start_voice_call_prompt_msg">Weet je zeker dat je een spraakoproep wilt beginnen\?</string>
+    <string name="start_video_call_prompt_msg">Weet je zeker dat je een video-oproep wilt beginnen\?</string>
     <plurals name="membership_changes">
         <item quantity="one">%d verandering in lidmaatschap</item>
         <item quantity="other">%d veranderingen in lidmaatschap</item>
@@ -369,7 +365,7 @@
         <item quantity="one">%d deelnemer</item>
         <item quantity="other">%d deelnemers</item>
     </plurals>
-    <string name="room_participants_ban_prompt_msg">Als een persoon wordt verbannen, wordt deze uit deze kamer verwijderd en wordt er voorkomen dat hij opnieuw lid wordt.</string>
+    <string name="room_participants_ban_prompt_msg">Als een persoon wordt verbannen, wordt deze uit deze kamer verwijderd en wordt er voorkomen dat ze opnieuw lid worden.</string>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d nieuw bericht</item>
         <item quantity="other">%d nieuwe berichten</item>
@@ -391,43 +387,43 @@
     <string name="group_details_home">Thuis</string>
     <string name="rooms">Gesprekken</string>
     <string name="invited">Uitgenodigd</string>
-    <string name="has_been_removed">%2$s heeft u uit %1$s gezet</string>
-    <string name="has_been_banned">%2$s heeft u uit %1$s verbannen</string>
+    <string name="has_been_removed">%2$s heeft je uit %1$s gezet</string>
+    <string name="has_been_banned">%2$s heeft je uit %1$s verbannen</string>
     <string name="reason_colon">Reden: %1$s</string>
     <string name="avatar">Avatar</string>
     <plurals name="notification_unread_notified_messages">
-        <item quantity="one">%d ongelezen bericht waarin u vermeld bent</item>
-        <item quantity="other">%d ongelezen berichten waarin u vermeld bent</item>
+        <item quantity="one">%d ongelezen bericht waarin je vermeld bent</item>
+        <item quantity="other">%d ongelezen berichten waarin je vermeld bent</item>
     </plurals>
     <string name="title_activity_choose_sticker">Verstuur een sticker</string>
     <string name="option_send_sticker">Sticker versturen</string>
-    <string name="no_sticker_application_dialog_content">U heeft momenteel geen stickerpakketten ingeschakeld.
+    <string name="no_sticker_application_dialog_content">Je hebt momenteel geen stickerpakketten ingeschakeld.
 \n
-\nWilt u er nu een paar toevoegen\?</string>
+\nWil je er nu een paar toevoegen\?</string>
     <string name="settings_deactivate_account_section">Account deactiveren</string>
     <string name="settings_deactivate_my_account">Mijn account deactiveren</string>
     <string name="settings_opt_in_of_analytics">Statistische gegevens (analytics) versturen</string>
     <string name="settings_opt_in_of_analytics_summary">${app_name} verzamelt anonieme statistische gegevens (analytics) om het voor ons mogelijk te maken om de app te verbeteren.</string>
     <string name="widget_integration_missing_parameter">Er ontbreekt een vereiste parameter.</string>
-    <string name="dialog_user_consent_content">Om de %1$s-server verder te blijven gebruiken, dient u de voorwaarden te lezen en ermee akkoord te gaan.</string>
+    <string name="dialog_user_consent_content">Om de %1$s-server verder te blijven gebruiken, dien je de voorwaarden te lezen en ermee akkoord te gaan.</string>
     <string name="dialog_user_consent_submit">Nu doorlezen</string>
     <string name="deactivate_account_title">Account deactiveren</string>
-    <string name="deactivate_account_content">Dit zal uw account voorgoed onbruikbaar maken. U zult zich niet meer kunnen aanmelden, en niemand anders zal met dezelfde persoon-ID kunnen registreren. Dit zal er voor zorgen dat uw account alle gesprekken verlaat waar deze momenteel lid van is, en het verwijdert de accountgegevens van de identiteitsserver. <b>Deze actie is onomkeerbaar.</b>
+    <string name="deactivate_account_content">Dit zal je account voorgoed onbruikbaar maken. Je zal je niet meer kunnen aanmelden, en niemand anders zal met dezelfde persoon-ID kunnen registreren. Dit zal er voor zorgen dat jouw account alle gesprekken verlaat waar deze momenteel lid van is, en het verwijdert de accountgegevens van de identiteitsserver. <b>Deze actie is onomkeerbaar.</b>
 \n
-\nHet deactiveren van uw account <b>zal er niet standaard voor zorgen dat de berichten die u hebt verzonden worden vergeten.</b> Indien u wilt dat wij de berichten vergeten, vinkt u het vakje hieronder aan.
+\nHet deactiveren van je account <b>zal er niet standaard voor zorgen dat de berichten die je hebt verzonden worden vergeten.</b> Indien je wil dat wij de berichten vergeten, vink je het vakje hieronder aan.
 \n
-\nDe zichtbaarheid van berichten in Matrix is gelijkaardig aan e-mails. Het vergeten van uw berichten betekent dat berichten die u verstuurd heeft niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.</string>
+\nDe zichtbaarheid van berichten in Matrix is gelijkaardig aan e-mails. Het vergeten van jouw berichten betekent dat berichten die je verstuurd hebt niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.</string>
     <string name="deactivate_account_delete_checkbox">Vergeet alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (<b>Let op:</b> dit zal er voor zorgen dat toekomstige personen een onvolledig beeld krijgen van gesprekken)</string>
     <string name="deactivate_account_submit">Account deactiveren</string>
     <string name="action_download">Downloaden</string>
-    <string name="e2e_re_request_encryption_key">Beveiligingssleutels van uw sessies <u>opnieuw aanvragen</u>.</string>
+    <string name="e2e_re_request_encryption_key">Beveiligingssleutels van je sessies <u>opnieuw aanvragen</u>.</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Start ${app_name} op een ander apparaat dat het bericht kan ontsleutelen, zodat het de sleutels naar deze sessie kan sturen.</string>
     <string name="option_send_voice">Spraakbericht versturen</string>
     <string name="error_no_external_application_found">Sorry, er is geen externe toepassing gevonden om deze actie te voltooien.</string>
-    <string name="error_empty_field_your_password">Voer uw wachtwoord in.</string>
+    <string name="error_empty_field_your_password">Voer je wachtwoord in.</string>
     <string name="send_bug_report_description_in_english">Beschrijf het probleem in het Engels, indien mogelijk.</string>
     <string name="settings_preview_media_before_sending">Media bekijken vóór het versturen</string>
-    <string name="command_description_emote">Toont een actie</string>
+    <string name="command_description_emote">Geeft activiteit weer</string>
     <string name="command_description_ban_user">Verbant persoon met gegeven ID</string>
     <string name="command_description_unban_user">Heft verbanning van persoon met gegeven ID op</string>
     <string name="command_description_op_user">Stel het machtsniveau van een persoon in</string>
@@ -437,7 +433,7 @@
     <string name="command_description_part_room">Gesprek verlaten</string>
     <string name="command_description_topic">Onderwerp van het gesprek instellen</string>
     <string name="command_description_remove_user">Stuurt persoon met gegeven ID eruit</string>
-    <string name="command_description_nick">Wijzigt uw weergavenaam</string>
+    <string name="command_description_nick">Wijzig je weergavenaam</string>
     <string name="command_description_markdown">Markdown aan/uit</string>
     <string name="room_tombstone_versioned_description">Dit gesprek is vervangen en is niet langer actief.</string>
     <string name="room_tombstone_continuation_link">Het gesprek wordt hier voortgezet</string>
@@ -449,7 +445,7 @@
         <item quantity="other">%d geselecteerd</item>
     </plurals>
     <string name="command_description_clear_scalar_token">Om Matrix-appbeheer te herstellen</string>
-    <string name="resource_limit_contact_admin">contact op te nemen met uw dienstbeheerder</string>
+    <string name="resource_limit_contact_admin">contact op te nemen met je dienstbeheerder</string>
     <string name="resource_limit_soft_default">Deze server heeft een van zijn bronlimieten overschreden, dus <b>sommige personen zullen zich niet kunnen aanmelden</b>.</string>
     <string name="resource_limit_hard_default">Deze server heeft een van zijn bronlimieten overschreden.</string>
     <string name="resource_limit_soft_mau"> Deze server heeft zijn limiet voor maandelijks actieve personen overschreden, dus <b>sommige personen zullen zich niet kunnen aanmelden</b>.</string>
@@ -460,15 +456,15 @@
     <string name="action_accept">Aanvaarden</string>
     <string name="auth_accept_policies">Gelieve het beleid van deze server te lezen en aanvaarden:</string>
     <string name="settings_call_category">Oproepen</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Gebruik de standaardbeltoon van ${app_name} voor inkomende oproepen</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Standaardbeltoon van ${app_name} gebruiken voor inkomende oproepen</string>
     <string name="settings_call_ringtone_title">Beltoon voor inkomende oproepen</string>
     <string name="settings_call_ringtone_dialog_title">Selecteer beltoon voor oproepen:</string>
     <string name="room_participants_action_remove">Eruit sturen</string>
-    <string name="settings_inline_url_preview_summary">Voorvertoning van koppelingen in het gesprek tonen (als uw server deze functie ondersteunt).</string>
+    <string name="settings_inline_url_preview_summary">Voorvertoning van koppelingen in het gesprek tonen (als je server deze functionaliteit ondersteunt).</string>
     <string name="settings_send_typing_notifs">Typmeldingen versturen</string>
-    <string name="settings_send_typing_notifs_summary">Laat andere personen weten dat u aan het typen bent.</string>
+    <string name="settings_send_typing_notifs_summary">Laat andere personen weten dat je aan het typen bent.</string>
     <string name="settings_send_markdown">Markdown-opmaak</string>
-    <string name="settings_send_markdown_summary">Maak berichten op met Markdown-syntax voordat ze verstuurd worden. Hiermee kunt u uitgebreide opmaak gebruiken, zoals sterretjes voor schuingedrukte tekst.</string>
+    <string name="settings_send_markdown_summary">Maak berichten op met Markdown-syntax voordat ze verstuurd worden. Hiermee kan je uitgebreide opmaak gebruiken, zoals sterretjes voor schuingedrukte tekst.</string>
     <string name="settings_show_read_receipts">Leesbevestigingen weergeven</string>
     <string name="settings_show_read_receipts_summary">Tik op de leesbevestigingen voor een uitgebreide lijst.</string>
     <string name="settings_show_join_leave_messages">Toetredingen en verlatingen weergeven</string>
@@ -477,18 +473,18 @@
     <string name="settings_show_avatar_display_name_changes_messages_summary">Omvat veranderingen in avatar en weergavenaam.</string>
     <string name="title_activity_keys_backup_setup">Sleutelback-up</string>
     <string name="title_activity_keys_backup_restore">Sleutelback-up gebruiken</string>
-    <string name="sign_out_bottom_sheet_warning_no_backup">Indien u zich nu afmeldt, zult u uw versleutelde berichten verliezen</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">Sleutelback-up is bezig. Indien u zich nu afmeldt, zult u de toegang tot uw versleutelde berichten verliezen.</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">Veilige sleutelback-up dient actief te zijn op al uw sessies om de toegang tot uw versleutelde berichten niet te verliezen.</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Indien je jezelf nu afmeldt, zal je jouw versleutelde berichten verliezen</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Sleutelback-up is bezig. Indien je jezelf nu afmeldt, zal je de toegang tot jouw versleutelde berichten verliezen.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Veilige sleutelback-up dient actief te zijn op al je sessies om de toegang tot je versleutelde berichten niet te verliezen.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Ik wil mijn versleutelde berichten niet</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Sleutels worden geback-upt…</string>
-    <string name="are_you_sure">Weet u het zeker\?</string>
+    <string name="are_you_sure">Weet je het zeker\?</string>
     <string name="backup">Back-up maken</string>
-    <string name="sign_out_bottom_sheet_will_lose_secure_messages">U zult de toegang tot uw versleutelde berichten verliezen, tenzij u eerst een back-up van uw sleutels maakt vooraleer u zich afmeldt.</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Je zal de toegang tot je versleutelde berichten verliezen, tenzij je eerst een back-up van je sleutels maakt voordat je jezelf afmeldt.</string>
     <string name="action_skip">Overslaan</string>
     <string name="done">Klaar</string>
     <string name="action_ignore">Negeren</string>
-    <string name="action_sign_out_confirmation_simple">Weet u zeker dat u zich wilt afmelden\?</string>
+    <string name="action_sign_out_confirmation_simple">Weet je zeker dat je jezelf wilt afmelden\?</string>
     <string name="action_mark_room_read">Markeren als gelezen</string>
     <string name="auth_login_sso">Aanmelden met unieke aanmelding</string>
     <string name="video_call_in_progress">Video-oproep gaande…</string>
@@ -498,7 +494,7 @@
     <string name="settings_troubleshoot_diagnostic">Diagnostische probleemoplossingsinformatie</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Testen uitvoeren</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Bezig met uitvoeren… (%1$d van %2$d)</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnose is oké. Als u nog steeds geen meldingen ontvangt, gelieve dan een bugmelding in te dienen om ons te helpen onderzoeken.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnose is oké. Als je nog steeds geen meldingen ontvangt, gelieve dan een bugmelding in te dienen om ons te helpen onderzoeken.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Er zijn één of meer tests mislukt, probeer de aanbevolen oplossing(en).</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Er zijn één of meer tests mislukt, gelieve een bugmelding in te dienen om ons te helpen onderzoeken.</string>
     <string name="settings_troubleshoot_test_system_settings_title">Systeeminstellingen.</string>
@@ -507,8 +503,8 @@
 \nGelieve deze te controleren.</string>
     <string name="open_settings">Instellingen openen</string>
     <string name="settings_troubleshoot_test_account_settings_title">Accountinstellingen.</string>
-    <string name="settings_troubleshoot_test_account_settings_success">Meldingen zijn ingeschakeld voor uw account.</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">Meldingen zijn uitgeschakeld voor uw account.
+    <string name="settings_troubleshoot_test_account_settings_success">Meldingen zijn ingeschakeld voor jouw account.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Meldingen zijn uitgeschakeld voor jouw account.
 \nGelieve de accountinstellingen te controleren.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Inschakelen</string>
     <string name="settings_troubleshoot_test_device_settings_title">Sessie-instellingen.</string>
@@ -518,7 +514,7 @@
     <string name="settings_troubleshoot_test_device_settings_quickfix">Inschakelen</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Aangepaste instellingen.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Sommige soorten berichten zijn stil (ze geven een geluidsloze melding).</string>
-    <string name="settings_troubleshoot_test_bing_settings_failed">Sommige meldingen zijn uitgeschakeld in uw aangepaste instellingen.</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">Sommige meldingen zijn uitgeschakeld in je aangepaste instellingen.</string>
     <string name="settings_troubleshoot_test_play_services_title">Play-diensten controleren</string>
     <string name="settings_troubleshoot_test_play_services_success">De APK van Google Play Services is beschikbaar en up-to-date.</string>
     <string name="settings_troubleshoot_test_play_services_failed">${app_name} maakt gebruikt van Google Play Services om pushberichten af te leveren, maar dit lijkt niet juist geconfigureerd te zijn:
@@ -532,7 +528,7 @@
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nDeze fout is onafhankelijk van ${app_name}. Volgens Google betekent deze fout dat het apparaat te veel apps heeft geregistreerd met FCM. De fout treedt enkel op ingeval er een enorm aantal apps is, dus zou dit de gemiddelde persoon niet mogen hinderen.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nDeze fout is onafhankelijk van ${app_name}. Ze kan verschillende oorzaken hebben. Misschien werkt het als u het later opnieuw probeert. U kunt ook controleren of het gegevensverbruik van Google Play Services niet wordt beperkt in de systeeminstellingen, of dat de klok van uw apparaat wel juist staat, of dat het misschien aan een aangepaste ROM ligt.</string>
+\nDeze fout is onafhankelijk van ${app_name}. Ze kan verschillende oorzaken hebben. Misschien werkt het als je het later opnieuw probeert. Je kan ook controleren of het gegevensverbruik van Google Play Services niet wordt beperkt in de systeeminstellingen, of dat de klok van je apparaat wel juist staat, of dat het misschien aan een aangepaste ROM ligt.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nDeze fout is onafhankelijk van ${app_name}. Er is geen Google-account verbonden met de telefoon. Open het accountbeheer en voeg er een Google-account toe.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Account toevoegen</string>
@@ -542,20 +538,20 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_service_boot_title">Starten bij opstarten van apparaat</string>
     <string name="settings_troubleshoot_test_service_boot_success">De dienst zal starten wanneer het apparaat wordt herstart.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">De dienst zal niet starten wanneer het apparaat wordt herstart en u zult geen meldingen ontvangen tot u ${app_name} hebt geopend.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">De dienst zal niet starten wanneer het apparaat wordt herstart en je zal geen meldingen ontvangen tot je ${app_name} hebt geopend.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Starten bij opstarten inschakelen</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Achtergrondbeperkingen controleren</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">Achtergrondbeperkingen zijn uitgeschakeld voor ${app_name}. Deze test dient uitgevoerd te worden met een mobiele verbinding (geen wifi).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_failed">Achtergrondbeperkingen zijn ingeschakeld voor ${app_name}.
-\nAl wat de app probeert te doen zal in de achtergrond hevig beperkt worden; dit kan het correct functioneren van meldingen beïnvloeden.
+\nAlles wat de app probeert te doen zal in de achtergrond hevig beperkt worden; dit kan het correct functioneren van meldingen beïnvloeden.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Beperkingen uitschakelen</string>
     <string name="settings_troubleshoot_test_battery_title">Accuoptimalisatie</string>
     <string name="settings_troubleshoot_test_battery_success">${app_name} wordt niet beperkt door accuoptimalisatie.</string>
     <string name="settings_troubleshoot_test_battery_failed">Als een persoon een apparaat los van de oplader een tijd laat stilliggen, met het scherm uitgeschakeld, gaat het apparaat in slaapmodus. Dit verhindert apps de toegang tot het netwerk, en stelt hun taken, synchronisaties en standaardalarmen uit.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Optimalisatie negeren</string>
-    <string name="settings_noisy_notifications_preferences">Lawaaiierige meldingen configureren</string>
+    <string name="settings_noisy_notifications_preferences">Belangrijke meldingen configureren</string>
     <string name="settings_call_notifications_preferences">Oproepmeldingen configureren</string>
     <string name="settings_silent_notifications_preferences">Stille meldingen configureren</string>
     <string name="settings_system_preferences_summary">Bepaal de LED-kleur, vibratie, geluid, …</string>
@@ -570,7 +566,7 @@
     <string name="settings_default_media_source">Standaardmediabron</string>
     <string name="media_source_choose">Kiezen</string>
     <string name="settings_play_shutter_sound">Sluitergeluid afspelen</string>
-    <string name="encryption_export_notice">Maak een wachtwoord aan om de geëxporteerde sleutels mee te versleutelen. U heeft dit wachtwoord nodig om de sleutels te kunnen importeren.</string>
+    <string name="encryption_export_notice">Maak een wachtwoord aan om de geëxporteerde sleutels mee te versleutelen. Je hebt dit wachtwoord nodig om de sleutels te kunnen importeren.</string>
     <string name="encryption_message_recovery">Herstel van versleutelde berichten</string>
     <string name="encryption_settings_manage_message_recovery_summary">Sleutelback-up beheren</string>
     <plurals name="notification_compat_summary_line_for_room">
@@ -603,27 +599,27 @@
     <string name="passphrase_passphrase_does_not_match">Wachtwoorden komen niet overeen</string>
     <string name="passphrase_empty_error_message">Voer een wachtwoord in</string>
     <string name="passphrase_passphrase_too_weak">Wachtwoord is te zwak</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Verwijder het wachtwoord als u wilt dat ${app_name} een herstelsleutel genereert.</string>
-    <string name="keys_backup_setup_step1_title">Verlies nooit uw versleutelde berichten</string>
-    <string name="keys_backup_setup_step1_description">Berichten in versleutelde gesprekken worden beveiligd met end-to-end-versleuteling. Enkel de ontvanger(s) en u hebben de sleutels om deze berichten te lezen.
+    <string name="keys_backup_passphrase_not_empty_error_message">Verwijder het wachtwoord als je wil dat ${app_name} een herstelsleutel genereert.</string>
+    <string name="keys_backup_setup_step1_title">Verlies nooit jouw versleutelde berichten</string>
+    <string name="keys_backup_setup_step1_description">Berichten in versleutelde gesprekken worden beveiligd met eind-to-eind-versleuteling. Enkel de ontvanger(s) en jij hebben de sleutels om deze berichten te lezen.
 \n
-\nMaak een veilige back-up van uw sleutels om ze niet te verliezen.</string>
+\nMaak een veilige back-up van jouw sleutels om ze niet te verliezen.</string>
     <string name="keys_backup_setup">Begin sleutelback-up te gebruiken</string>
     <string name="keys_backup_setup_step1_advanced">(Geavanceerd)</string>
     <string name="keys_backup_setup_step1_manual_export">Sleutels handmatig exporteren</string>
-    <string name="keys_backup_setup_step2_text_title">Beveilig uw back-up met een wachtwoord.</string>
-    <string name="keys_backup_setup_step2_text_description">We bewaren een versleutelde kopie van uw sleutels op onze server. Bescherm uw back-up met een wachtwoord om deze veilig te houden.
+    <string name="keys_backup_setup_step2_text_title">Beveilig je back-up met een wachtwoord.</string>
+    <string name="keys_backup_setup_step2_text_description">We bewaren een versleutelde kopie van jouw sleutels op onze server. Bescherm je back-up met een wachtwoord om deze veilig te houden.
 \n
-\nVoor een maximale beveiliging zou deze sleutel moeten verschillen van uw accountwachtwoord.</string>
+\nVoor een maximale beveiliging zou deze sleutel moeten verschillen van je accountwachtwoord.</string>
     <string name="keys_backup_setup_step2_button_title">Wachtwoord instellen</string>
     <string name="keys_backup_setup_creating_backup">Back-up wordt aangemaakt</string>
-    <string name="keys_backup_setup_step1_recovery_key_alternative">Of beveilig uw back-up met een herstelsleutel, en bewaar deze op een veilige plaats.</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Of beveilig je back-up met een herstelsleutel, en bewaar deze op een veilige plaats.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Geavanceerd) Instellen met herstelsleutel</string>
     <string name="keys_backup_setup_step3_success_title">Klaar!</string>
-    <string name="keys_backup_setup_step3_text_line1">Uw sleutels worden geback-upt.</string>
-    <string name="keys_backup_setup_step3_text_line2">Uw herstelsleutel is een veiligheidsnet - u kunt deze gebruiken om de toegang tot uw versleutelde berichten te herstellen indien u uw wachtwoord vergeet.
-\nBewaar uw herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewaar uw herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)</string>
+    <string name="keys_backup_setup_step3_text_line1">Jouw sleutels worden geback-upt.</string>
+    <string name="keys_backup_setup_step3_text_line2">Jouw herstelsleutel is een veiligheidsnet - je kan deze gebruiken om de toegang tot jouw versleutelde berichten te herstellen indien je jouw wachtwoord vergeet.
+\nBewaar je herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewaar je herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)</string>
     <string name="keys_backup_setup_step3_button_title">Klaar</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">Ik heb een kopie gemaakt</string>
     <string name="keys_backup_setup_step3_copy_button_title">Herstelsleutel opslaan</string>
@@ -634,23 +630,23 @@
     <string name="keys_backup_setup_step3_generating_key_status">Herstelsleutel wordt gegenereerd met wachtwoord, dit proces kan enkele seconden duren.</string>
     <string name="recovery_key">Herstelsleutel</string>
     <string name="unexpected_error">Onverwachte fout</string>
-    <string name="keys_backup_setup_skip_title">Weet u het zeker\?</string>
-    <string name="keys_backup_setup_skip_msg">U kunt de toegang tot uw berichten verliezen indien u zich afmeldt of dit apparaat verliest.</string>
+    <string name="keys_backup_setup_skip_title">Weet je het zeker\?</string>
+    <string name="keys_backup_setup_skip_msg">Je kunt de toegang tot je berichten verliezen indien je jezelf afmeldt of dit apparaat verliest.</string>
     <string name="keys_backup_restore_is_getting_backup_version">Back-upversie wordt opgehaald…</string>
-    <string name="keys_backup_restore_with_passphrase">Gebruik uw herstelwachtwoord om uw versleutelde berichtgeschiedenis te ontgrendelen</string>
-    <string name="keys_backup_restore_use_recovery_key">uw herstelsleutel gebruiken</string>
-    <string name="keys_backup_restore_with_passphrase_helper_with_link">Als u uw herstelwachtwoord niet meer weet, kunt u %s.</string>
-    <string name="keys_backup_restore_with_recovery_key">Gebruik uw herstelsleutel om uw versleutelde berichtgeschiedenis te ontgrendelen</string>
+    <string name="keys_backup_restore_with_passphrase">Gebruik je herstelwachtwoord om jouw versleutelde berichtgeschiedenis te ontgrendelen</string>
+    <string name="keys_backup_restore_use_recovery_key">jouw herstelsleutel gebruiken</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Als je jouw herstelwachtwoord niet meer weet, kan je %s.</string>
+    <string name="keys_backup_restore_with_recovery_key">Gebruik je herstelsleutel om jouw versleutelde berichtgeschiedenis te ontgrendelen</string>
     <string name="keys_backup_restore_key_enter_hint">Voer de herstelsleutel in</string>
-    <string name="keys_backup_restore_with_key_helper">Herstelsleutel verloren\? U kunt er een nieuwe instellen in de instellingen.</string>
-    <string name="keys_backup_passphrase_error_decrypt">De back-up kan met dit wachtwoord niet ontsleuteld worden: controleer of u het juiste herstelwachtwoord heeft ingevoerd.</string>
+    <string name="keys_backup_restore_with_key_helper">Herstelsleutel verloren\? Je kan er een nieuwe instellen in de instellingen.</string>
+    <string name="keys_backup_passphrase_error_decrypt">De back-up kan met dit wachtwoord niet ontsleuteld worden: controleer of je het juiste herstelwachtwoord hebt ingevoerd.</string>
     <string name="keys_backup_restoring_waiting_message">Back-up wordt hersteld:</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Herstelsleutel wordt berekend…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Sleutels worden gedownload…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Sleutels worden geïmporteerd…</string>
     <string name="keys_backup_unlock_button">Geschiedenis ontgrendelen</string>
     <string name="keys_backup_recovery_code_empty_error_message">Voer een herstelsleutel in</string>
-    <string name="keys_backup_recovery_code_error_decrypt">De back-up kan met deze herstelsleutel niet ontsleuteld worden: controleer of u de juiste herstelsleutel heeft ingevoerd.</string>
+    <string name="keys_backup_recovery_code_error_decrypt">De back-up kan met deze herstelsleutel niet ontsleuteld worden: controleer of je de juiste herstelsleutel hebt ingevoerd.</string>
     <string name="keys_backup_restore_success_title">Back-up hersteld %s!</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Back-up met %d sleutel hersteld.</item>
@@ -665,18 +661,18 @@
     <string name="keys_backup_settings_delete_backup_button">Back-up verwijderen</string>
     <string name="keys_backup_settings_status_ok">Sleutelback-up is correct ingesteld voor deze sessie.</string>
     <string name="keys_backup_settings_status_ko">Sleutelback-up is niet actief op deze sessie.</string>
-    <string name="keys_backup_settings_status_not_setup">Uw sleutels worden niet geback-upt vanaf deze sessie.</string>
+    <string name="keys_backup_settings_status_not_setup">Jouw sleutels worden niet geback-upt vanaf deze sessie.</string>
     <string name="keys_backup_settings_signature_from_unknown_device">De back-up heeft een ondertekening van een onbekende sessie met ID %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">De back-up heeft een geldige ondertekening van deze sessie.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">De back-up heeft een geldige ondertekening van de geverifieerde sessie %s.</string>
     <string name="keys_backup_settings_valid_signature_from_unverified_device">De back-up heeft een geldige ondertekening van de ongeverifieerde sessie %s</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">De back-up heeft een ongeldige ondertekening van de geverifieerde sessie %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">De back-up heeft een ongeldige ondertekening van de ongeverifieerde sessie %s</string>
-    <string name="keys_backup_settings_untrusted_backup">Herstel nu met uw wachtwoord of herstelsleutel om sleutelback-up op deze sessie te gebruiken.</string>
+    <string name="keys_backup_settings_untrusted_backup">Herstel nu met je wachtwoord of herstelsleutel om sleutelback-up op deze sessie te gebruiken.</string>
     <string name="keys_backup_settings_deleting_backup">Back-up wordt verwijderd…</string>
     <string name="keys_backup_settings_delete_confirm_title">Back-up verwijderen</string>
-    <string name="keys_backup_settings_delete_confirm_message">Uw geback-upte versleutelingssleutels verwijderen van de server\? U zult uw herstelsleutel niet meer kunnen gebruiken om de versleutelde berichtgeschiedenis te lezen.</string>
-    <string name="keys_backup_banner_recover_line1">Verlies nooit uw versleutelde berichten</string>
+    <string name="keys_backup_settings_delete_confirm_message">Jouw geback-upte versleutelingssleutels verwijderen van de server\? Je zal jouw herstelsleutel niet meer kunnen gebruiken om de versleutelde berichtgeschiedenis te lezen.</string>
+    <string name="keys_backup_banner_recover_line1">Verlies nooit je versleutelde berichten</string>
     <string name="keys_backup_banner_recover_line2">Sleutelback-up gebruiken</string>
     <string name="keys_backup_banner_update_line1">Nieuwe sleutels voor versleutelde berichten</string>
     <string name="keys_backup_banner_update_line2">Beheren in sleutelback-up</string>
@@ -691,21 +687,21 @@
     <string name="keys_backup_info_title_signature">Ondertekening</string>
     <string name="error_jitsi_not_supported_on_old_device">Sorry, vergadergesprekken met Jitsi worden nog niet ondersteund op oudere apparaten (met een Android-versie lager dan 6.0)</string>
     <string name="encryption_information_unknown_ip">onbekend IP-adres</string>
-    <string name="you_added_a_new_device_with_info">Een nieuwe sessie vraagt versleutelingssleutels aan. 
-\nSessienaam: %1$s 
-\nLaatst gezien: %2$s 
-\nAls u zich niet heeft aangemeld op een andere sessie, negeer dan dit verzoek.</string>
-    <string name="your_unverified_device_requesting_with_info">Een ongeverifieerde sessie vraagt versleutelingssleutels aan. 
-\nSessienaam: %1$s 
-\nLaatst gezien: %2$s 
-\nAls u zich niet heeft aangemeld op een andere sessie, negeer dan dit verzoek.</string>
+    <string name="you_added_a_new_device_with_info">Een nieuwe sessie vraagt versleutelingssleutels aan.
+\nSessienaam: %1$s
+\nLaatst gezien: %2$s
+\nAls je jezelf niet hebt aangemeld op een andere sessie, negeer dan dit verzoek.</string>
+    <string name="your_unverified_device_requesting_with_info">Een ongeverifieerde sessie vraagt versleutelingssleutels aan.
+\nSessienaam: %1$s
+\nLaatst gezien: %2$s
+\nAls je jezelf niet hebt aangemeld op een andere sessie, negeer dan dit verzoek.</string>
     <string name="share_without_verifying_short_label">Delen</string>
     <string name="key_share_request">Sleuteldeelverzoek</string>
     <string name="ignore_request_short_label">Negeren</string>
     <string name="sas_verified">Geverifieerd!</string>
     <string name="sas_got_it">Ik snap het</string>
     <string name="sas_incoming_request_notif_title">Verificatieverzoek</string>
-    <string name="sas_incoming_request_notif_content">%s wil uw sessie verifiëren</string>
+    <string name="sas_incoming_request_notif_content">%s wil je sessie verifiëren</string>
     <string name="sas_error_unknown">Onbekende fout</string>
     <string name="none">Geen</string>
     <string name="action_revoke">Intrekken</string>
@@ -716,17 +712,17 @@
     <string name="settings_background_fdroid_sync_mode">Synchroniseren op de achtergrond</string>
     <string name="settings_background_fdroid_sync_mode_battery">Geoptimaliseerd voor batterij</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">${app_name} zal op een batterijzuinige manier synchroniseren op de achtergrond.
-\nAfhankelijk van de staat van uw apparaat kan het besturingssysteem de synchronisatie uitstellen.</string>
+\nAfhankelijk van de staat van je apparaat kan het besturingssysteem de synchronisatie uitstellen.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Geoptimaliseerd voor snelheid</string>
     <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} zal periodiek op de achtergrond synchroniseren (configureerbaar).
-\nDit heeft een negatieve impact op uw batterij- en datagebruik. Er zal een melding getoond worden ter informatie.</string>
+\nDit heeft een negatieve impact op je batterij- en datagebruik. Er zal een melding getoond worden ter informatie.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Geen achtergrondssynchronisatie</string>
-    <string name="settings_background_fdroid_sync_mode_disabled_description">U zal geen melding van berichten ontvangen als de app zich in de achtergrond bevindt.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Je zal geen melding van berichten ontvangen als de app zich in de achtergrond bevindt.</string>
     <string name="settings_integrations">Integraties</string>
     <string name="settings_integrations_summary">Gebruik een integratiebeheerder om bots, bruggen, widgets en stickerpakketten te beheren.
-\nIntegratiebeheerders ontvangen configuratiedata en kunnen widgets aanpassen, gespreksuitnodigingen versturen en bestuursniveaus instellen namens u.</string>
+\nIntegratiebeheerders ontvangen configuratiedata en kunnen widgets aanpassen, gespreksuitnodigingen versturen en bestuursniveaus instellen namens jou.</string>
     <string name="settings_discovery_category">Ontdekken</string>
-    <string name="settings_discovery_manage">Beheer uw ontdekinstellingen.</string>
+    <string name="settings_discovery_manage">Beheer jouw ontdekkingsinstellingen.</string>
     <string name="settings_integration_allow">Integraties toestaan</string>
     <string name="settings_integration_manager">Integratiebeheerder</string>
     <string name="room_widget_activity_title">Widget</string>
@@ -739,10 +735,10 @@
     <string name="room_widget_reload">Widget herladen</string>
     <string name="room_widget_open_in_browser">Openen in browser</string>
     <string name="room_widget_revoke_access">Toegang intrekken voor mij</string>
-    <string name="room_widget_permission_display_name">Uw weergavenaam</string>
-    <string name="room_widget_permission_avatar_url">Uw profielfoto-URL</string>
-    <string name="room_widget_permission_user_id">Uw persoon-ID</string>
-    <string name="room_widget_permission_theme">Uw thema</string>
+    <string name="room_widget_permission_display_name">Jouw weergavenaam</string>
+    <string name="room_widget_permission_avatar_url">Jouw profielfoto-URL</string>
+    <string name="room_widget_permission_user_id">Jouw persoon-ID</string>
+    <string name="room_widget_permission_theme">Jouw thema</string>
     <string name="room_widget_permission_widget_id">Widget-ID</string>
     <string name="room_widget_permission_room_id">Gespreks-ID</string>
     <string name="room_widget_resource_permission_title">Deze widget wil gebruik maken van de volgende bronnen:</string>
@@ -751,25 +747,25 @@
     <string name="room_widget_webview_access_camera">Camera gebruiken</string>
     <string name="room_widget_webview_access_microphone">Microfoon gebruiken</string>
     <string name="room_widget_webview_read_protected_media">DRM-beschermde media lezen</string>
-    <string name="widget_integration_review_terms">Om verder te gaan dient u de dienstvoorwaarden te aanvaarden.</string>
-    <string name="keys_backup_setup_override_backup_prompt_tile">Er bestaat al een back-up op uw server</string>
-    <string name="keys_backup_setup_override_backup_prompt_description">Het lijkt erop dat u al een back-up van uw herstelsleutel heeft uit een andere sessie. Wilt u deze vervangen door degene die u nu aanmaakt\?</string>
+    <string name="widget_integration_review_terms">Om verder te gaan dien je de dienstvoorwaarden te aanvaarden.</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">Er bestaat al een back-up op je server</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Het lijkt erop dat je al een back-up van je herstelsleutel heeft uit een andere sessie. Wilt je deze vervangen door degene die je nu aanmaakt\?</string>
     <string name="keys_backup_setup_override_replace">Vervangen</string>
     <string name="keys_backup_setup_override_stop">Stoppen</string>
     <string name="keys_backup_settings_checking_backup_state">Back-upstatus wordt gecontroleerd</string>
-    <string name="identity_server_not_defined">U gebruikt geen identiteitsserver</string>
-    <string name="error_user_already_logged_in">Het lijkt er op dat u probeert verbinding te maken met een andere server. Wil je uitloggen\?</string>
+    <string name="identity_server_not_defined">Je gebruikt geen identiteitsserver</string>
+    <string name="error_user_already_logged_in">Het lijkt er op dat je probeert verbinding te maken met een andere server. Wil je uitloggen\?</string>
     <string name="edit">Bewerken</string>
     <string name="reply">Beantwoorden</string>
     <string name="global_retry">Opnieuw proberen</string>
-    <string name="send_you_invite">Heeft u een uitnodiging gestuurd</string>
+    <string name="send_you_invite">Heeft je een uitnodiging gestuurd</string>
     <string name="invited_by">Uitgenodigd door %s</string>
-    <string name="room_list_catchup_empty_title">U bent helemaal bij!</string>
-    <string name="room_list_catchup_empty_body">U hebt geen ongelezen berichten meer</string>
+    <string name="room_list_catchup_empty_title">Je bent helemaal bij!</string>
+    <string name="room_list_catchup_empty_body">Je hebt geen ongelezen berichten meer</string>
     <string name="room_list_people_empty_title">Gesprekken</string>
-    <string name="room_list_people_empty_body">Uw directe gesprekken zullen hier worden weergegeven. Gebruik de + knop rechts onder om een gesprek te starten.</string>
+    <string name="room_list_people_empty_body">Jouw directe gesprekken zullen hier worden weergegeven. Gebruik de + knop rechts onder om een gesprek te starten.</string>
     <string name="room_list_rooms_empty_title">Kamers</string>
-    <string name="room_list_rooms_empty_body">Uw kamers zullen hier worden weergegeven. Gebruik de + knop rechtsonder om een bestaande kamer te openen of een nieuwe aan te maken.</string>
+    <string name="room_list_rooms_empty_body">Jouw kamers zullen hier worden weergegeven. Gebruik de + knop rechtsonder om een bestaande kamer te openen of een nieuwe aan te maken.</string>
     <string name="title_activity_emoji_reaction_picker">Reacties</string>
     <string name="action_agree">Bevestigen</string>
     <string name="message_add_reaction">Reactie Toevoegen</string>
@@ -778,22 +774,21 @@
     <string name="event_redacted_by_user_reason">Gebeurtenis verwijderd door persoon</string>
     <string name="event_redacted_by_admin_reason">Gebeurtenis gemodereerd door gesprek beheerder</string>
     <string name="malformed_message">Niet correcte gebeurtenis, kan niet weergeven</string>
-    <string name="create_new_room">Maak een nieuw gesprek aan</string>
-    <string name="error_no_network">Geen netwerk. Controleer uw internet verbinding.</string>
+    <string name="create_new_room">Nieuwe kamer aanmaken</string>
+    <string name="error_no_network">Geen netwerk. Controleer je internet verbinding.</string>
     <string name="action_change">Wijzigen</string>
-    <string name="change_room_directory_network">Wijzig netwerk</string>
+    <string name="change_room_directory_network">Netwerk wijzigen</string>
     <string name="please_wait">Even wachten…</string>
-    <string name="group_all_communities">Alle Gemeenschappen</string>
-    <string name="room_preview_no_preview">Dit gesprek kan niet worden voorvertoond</string>
+    <string name="room_preview_no_preview">Deze kamer kan niet worden voorvertoond</string>
     <string name="fab_menu_create_room">Gesprekken</string>
     <string name="fab_menu_create_chat">Directe Berichten</string>
     <string name="create_room_action_create">AANMAKEN</string>
-    <string name="create_room_name_hint">Gespreksnaam</string>
+    <string name="create_room_name_hint">Naam</string>
     <string name="create_room_public_title">Publiek</string>
-    <string name="create_room_public_description">Iedereen kan deze kamer kunnen toetreden</string>
+    <string name="create_room_public_description">Iedereen kan deelnemer worden van deze kamer</string>
     <string name="action_play">Afspelen</string>
-    <string name="notice_room_canonical_alias_unset_by_you">U heeft het hoofdadres voor dit gesprek verwijderd.</string>
-    <string name="notice_room_invite_with_reason_by_you">U heeft %1$s uitgenodigd. Reden: %2$s</string>
+    <string name="notice_room_canonical_alias_unset_by_you">U heeft het hoofdadres van deze kamer verwijderd.</string>
+    <string name="notice_room_invite_with_reason_by_you">Je hebt %1$s uitgenodigd. Reden: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Jouw uitnodiging. Reden: %1$s</string>
     <string name="event_status_sent_message">Bericht verstuurd</string>
     <string name="initial_sync_start_downloading">Initiële synchronisatie:
@@ -802,36 +797,36 @@
 \nAan het wachten op een antwoord van de server…</string>
     <string name="room_displayname_empty_room_was">Lege kamer (was %s)</string>
     <string name="power_level_moderator">Moderator</string>
-    <string name="notice_direct_room_third_party_invite_by_you">U heeft %1$s uitgenodigd</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Je hebt %1$s uitgenodigd</string>
     <string name="notice_direct_room_third_party_invite">%1$s nodigde %2$s uit</string>
     <string name="notice_room_server_acl_updated_no_change">Geen verandering.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">U heeft toekomstige berichten zichtbaar gemaakt voor %1$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Je hebt toekomstige berichten zichtbaar gemaakt voor %1$s</string>
     <string name="notice_made_future_direct_room_visibility">%1$s heeft toekomstige berichten zichtbaar gemaakt voor %2$s</string>
-    <string name="notice_ended_call_by_you">U hebt de oproep beëindigd.</string>
-    <string name="notice_answered_call_by_you">U hebt de oproep beantwoord.</string>
-    <string name="notice_display_name_changed_from_by_you">U heeft uw schermnaam gewijzigd van %1$s naar %2$s</string>
-    <string name="notice_display_name_set_by_you">U heeft uw schermnaam ingesteld op %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">U heeft uw avatar aangepast</string>
-    <string name="notice_room_reject_by_you">U heeft de uitnodiging geweigerd</string>
-    <string name="notice_direct_room_leave_by_you">U heeft de kamer verlaten</string>
+    <string name="notice_ended_call_by_you">Je hebt de oproep beëindigd.</string>
+    <string name="notice_answered_call_by_you">Je hebt de oproep beantwoord.</string>
+    <string name="notice_display_name_changed_from_by_you">Je hebt je schermnaam gewijzigd van %1$s naar %2$s</string>
+    <string name="notice_display_name_set_by_you">Je hebt je schermnaam ingesteld op %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Je hebt je avatar aangepast</string>
+    <string name="notice_room_reject_by_you">Je hebt de uitnodiging geweigerd</string>
+    <string name="notice_direct_room_leave_by_you">Je hebt de kamer verlaten</string>
     <string name="notice_direct_room_leave">%1$s heeft de kamer verlaten</string>
-    <string name="notice_room_leave_by_you">U heeft de kamer verlaten</string>
-    <string name="notice_room_invite_by_you">U heeft %1$s uitgenodigd</string>
-    <string name="notice_direct_room_created_by_you">U heeft de discussie aangemaakt</string>
+    <string name="notice_room_leave_by_you">Je hebt de kamer verlaten</string>
+    <string name="notice_room_invite_by_you">Je hebt %1$s uitgenodigd</string>
+    <string name="notice_direct_room_created_by_you">Je hebt de discussie aangemaakt</string>
     <string name="notice_direct_room_created">%1$s heeft de discussie aangemaakt</string>
-    <string name="notice_room_created_by_you">U heeft de kamer aangemaakt</string>
+    <string name="notice_room_created_by_you">Je hebt de kamer aangemaakt</string>
     <string name="notice_room_created">%1$s heeft de kamer aangemaakt</string>
-    <string name="notice_room_invite_no_invitee_by_you">Uw uitnodiging</string>
-    <string name="notice_room_ban_with_reason_by_you">U heeft %1$s verbannen. Reden: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">U heeft de verbanning van %1$s opgeheven. Reden: %2$s</string>
-    <string name="notice_room_remove_with_reason_by_you">U heeft %1$s eruit getrapt. Reden: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">U heeft de uitnodiging geweigerd. Reden: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">U bent vertrokken. Reden: %1$s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Je uitnodiging</string>
+    <string name="notice_room_ban_with_reason_by_you">Je hebt %1$s verbannen. Reden: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Je hebt de verbanning van %1$s opgeheven. Reden: %2$s</string>
+    <string name="notice_room_remove_with_reason_by_you">Je hebt %1$s eruit getrapt. Reden: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Je hebt de uitnodiging geweigerd. Reden: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Je bent vertrokken. Reden: %1$s</string>
     <string name="notice_direct_room_leave_with_reason">%1$s is vertrokken. Reden: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">U heeft de kamer verlaten. Reden: %1$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">U heeft zich aangesloten. Reden: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Je hebt de kamer verlaten. Reden: %1$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Je hebt je aangesloten. Reden: %1$s</string>
     <string name="notice_direct_room_join_with_reason">%1$s heeft zich aangesloten. Reden: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">U heeft zich aangesloten bij de kamer. Reden: %1$s</string>
+    <string name="notice_room_join_with_reason_by_you">Je hebt je aangesloten bij de kamer. Reden: %1$s</string>
     <plurals name="room_displayname_four_and_more_members">
         <item quantity="one">%1$s, %2$s, %3$s en %4$d andere</item>
         <item quantity="other">%1$s, %2$s, %3$s en %4$d anderen</item>
@@ -840,75 +835,75 @@
     <string name="room_displayname_3_members">%1$s, %2$s en %3$s</string>
     <string name="notice_power_level_diff">%1$s van %2$s naar %3$s</string>
     <string name="notice_power_level_changed">%1$s heeft het machtigingsniveau van %2$s aangepast.</string>
-    <string name="notice_power_level_changed_by_you">U heeft het machtigingsniveau van %1$s aangepast.</string>
+    <string name="notice_power_level_changed_by_you">Je hebt het machtigingsniveau van %1$s aangepast.</string>
     <string name="power_level_custom_no_value">Speciaal</string>
     <string name="power_level_custom">Speciaal (%1$d)</string>
     <string name="power_level_default">Standaardlid</string>
     <string name="power_level_admin">Beheerder</string>
-    <string name="notice_widget_modified_by_you">U heeft de widget %1$s aangepast</string>
+    <string name="notice_widget_modified_by_you">Je hebt de widget %1$s aangepast</string>
     <string name="notice_widget_modified">%1$s heeft de widget %2$s aangepast</string>
-    <string name="notice_widget_removed_by_you">U heeft de widget %1$s verwijderd</string>
+    <string name="notice_widget_removed_by_you">Je hebt de widget %1$s verwijderd</string>
     <string name="notice_widget_removed">%1$s heeft de widget %2$s verwijderd</string>
-    <string name="notice_widget_added_by_you">U heeft de widget %1$s toegevoegd</string>
+    <string name="notice_widget_added_by_you">Je hebt de widget %1$s toegevoegd</string>
     <string name="notice_widget_added">%1$s heeft de widget %2$s toegevoegd</string>
-    <string name="notice_room_third_party_registered_invite_by_you">U heeft de uitnodiging voor %1$s geaccepteerd</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">U heeft de uitnodiging voor %1$s ingetrokken</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Je hebt de uitnodiging voor %1$s geaccepteerd</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Je hebt de uitnodiging voor %1$s ingetrokken</string>
     <string name="notice_direct_room_third_party_revoked_invite">%1$s heeft de uitnodiging voor %2$s ingetrokken</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">U heeft de uitnodiging voor %1$s ingetrokken om zich bij de kamer aan te sluiten</string>
-    <string name="notice_room_third_party_invite_by_you">U heeft een uitnodiging gestuurd naar %1$s om zich bij de kamer aan te sluiten</string>
-    <string name="notice_room_avatar_removed_by_you">U heeft de kameravatar verwijderd</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Je hebt de uitnodiging voor %1$s ingetrokken om zich bij de kamer aan te sluiten</string>
+    <string name="notice_room_third_party_invite_by_you">Je hebt een uitnodiging gestuurd naar %1$s om zich bij de kamer aan te sluiten</string>
+    <string name="notice_room_avatar_removed_by_you">Je hebt de kameravatar verwijderd</string>
     <string name="notice_room_avatar_removed">%1$s heeft de kameravatar verwijderd</string>
-    <string name="notice_room_topic_removed_by_you">U heeft het kameronderwerp verwijderd</string>
-    <string name="notice_room_name_removed_by_you">U heeft de kamernaam verwijderd</string>
-    <string name="notice_room_update_by_you">U heeft de kamer geüpgraded.</string>
-    <string name="notice_call_candidates_by_you">U verstuurde data om het gesprek op te zetten.</string>
+    <string name="notice_room_topic_removed_by_you">Je hebt het kameronderwerp verwijderd</string>
+    <string name="notice_room_name_removed_by_you">Je hebt de kamernaam verwijderd</string>
+    <string name="notice_room_update_by_you">Je hebt de kamer geüpgraded.</string>
+    <string name="notice_call_candidates_by_you">Je verstuurde data om het gesprek op te zetten.</string>
     <string name="notice_call_candidates">%s verstuurde data om het gesprek op te zetten.</string>
-    <string name="notice_placed_voice_call_by_you">U heeft een audiogesprek geopend.</string>
-    <string name="notice_placed_video_call_by_you">U heeft een videogesprek geopend.</string>
-    <string name="notice_room_name_changed_by_you">U heeft de kamernaam veranderd naar: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">U heeft de kamer afbeelding aangepast</string>
-    <string name="notice_room_avatar_changed">%1$s heeft de kamer afbeelding aangepast</string>
-    <string name="notice_room_topic_changed_by_you">U heeft het onderwerp gewijzigd naar: %1$s</string>
-    <string name="notice_display_name_removed_by_you">U heeft uw weergavenaam verwijderd (voorheen %1$s)</string>
-    <string name="notice_room_withdraw_by_you">U heeft de uitnodiging van %1$s ingetrokken</string>
-    <string name="notice_room_ban_by_you">U heeft %1$s verbannen</string>
-    <string name="notice_room_unban_by_you">U heeft de verbanning van %1$s opgeheven</string>
-    <string name="notice_room_remove_by_you">U heeft %1$s eruit getrapt</string>
-    <string name="notice_direct_room_join_by_you">U sloot zich aan</string>
+    <string name="notice_placed_voice_call_by_you">Je hebt een audiogesprek geopend.</string>
+    <string name="notice_placed_video_call_by_you">Je hebt een videogesprek geopend.</string>
+    <string name="notice_room_name_changed_by_you">Je hebt de kamernaam veranderd naar: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Je hebt de kamerafbeelding aangepast</string>
+    <string name="notice_room_avatar_changed">%1$s heeft de kamerafbeelding aangepast</string>
+    <string name="notice_room_topic_changed_by_you">Je hebt het onderwerp gewijzigd naar: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Je hebt je weergavenaam verwijderd (voorheen %1$s)</string>
+    <string name="notice_room_withdraw_by_you">Je hebt de uitnodiging van %1$s ingetrokken</string>
+    <string name="notice_room_ban_by_you">Je hebt %1$s verbannen</string>
+    <string name="notice_room_unban_by_you">Je hebt de verbanning van %1$s opgeheven</string>
+    <string name="notice_room_remove_by_you">Je hebt %1$s verwijderd</string>
+    <string name="notice_direct_room_join_by_you">Je sloot je aan</string>
     <string name="notice_direct_room_join">%1$s sluit aan</string>
-    <string name="notice_room_join_by_you">U heeft de kamer betreden</string>
-    <string name="voice_message_tap_to_stop_toast">Druk op uw opname om te stoppen of om te luisteren</string>
+    <string name="notice_room_join_by_you">Je hebt de kamer betreden</string>
+    <string name="voice_message_tap_to_stop_toast">Druk op je opname om te stoppen of om te luisteren</string>
     <string name="voice_message_release_to_send_toast">Houd ingedrukt om op te nemen, laat los om te versturen</string>
     <string name="a11y_delete_recorded_voice_message">Verwijder opname</string>
     <string name="a11y_recording_voice_message">Stembericht aan het opnemen</string>
     <string name="a11y_pause_voice_message">Pauzeer stembericht</string>
     <string name="a11y_play_voice_message">Speel stembericht af</string>
-    <string name="upgrade_room_for_restricted">Iedereen in %s kan de ruimte vinden en betreden - het is niet nodig om iedereen handmatig uit te nodigen. U kunt dit op elk moment aanpassen in de kamer instellingen.</string>
+    <string name="upgrade_room_for_restricted">Iedereen in %s kan de ruimte vinden en betreden - het is niet nodig om iedereen handmatig uit te nodigen. Je kan dit op elk moment aanpassen in de kamer instellingen.</string>
     <string name="voice_message_reply_content">Stembericht (%1$s)</string>
     <string name="error_voice_message_cannot_reply_or_edit">Kan niet antwoorden of aanpassen als stembericht actief is</string>
     <string name="error_voice_message_unable_to_record">Kan stembericht niet opnemen</string>
     <string name="error_voice_message_unable_to_play">Kan stembericht niet afspelen</string>
-    <string name="notice_room_guest_access_can_join_by_you">U heeft gasten de toegang tot dit gesprek verleend.</string>
-    <string name="notice_room_canonical_alias_set_by_you">U heeft het hoofdadres voor dit gesprek ingesteld op %1$s.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">U heeft %1$s als gespreksadres toegevoegd en %2$s verwijderd.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Je hebt gasten de toegang tot dit gesprek verleend.</string>
+    <string name="notice_room_canonical_alias_set_by_you">U heeft %1$s ingesteld als hoofdadres van deze kamer.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">U heeft %1$s toegevoegd en %2$s verwijderd als adressen voor deze kamer.</string>
     <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">U heeft %1$s als gespreksadres verwijderd.</item>
-        <item quantity="other">U heeft %1$s als gespreksadressen verwijderd.</item>
+        <item quantity="one">U heeft %1$s verwijderd als adres voor deze kamer.</item>
+        <item quantity="other">U heeft %1$s verwijderd als adressen voor deze kamer.</item>
     </plurals>
     <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">U heeft %1$s als gespreksadres toegevoegd.</item>
-        <item quantity="other">U heeft %1$s als gespreksadressen toegevoegd.</item>
+        <item quantity="one">Je hebt %1$s als kameradres toegevoegd.</item>
+        <item quantity="other">Je hebt %1$s als kameradressen toegevoegd.</item>
     </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">U heeft de uitnodiging van %1$s ingetrokken. Reden: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">U heeft de uitnodiging voor %1$s aanvaard. Reden: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Je hebt de uitnodiging van %1$s ingetrokken. Reden: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Je hebt de uitnodiging voor %1$s aanvaard. Reden: %2$s</string>
     <string name="notice_room_server_acl_allow_is_empty">🎉 Alle servers zijn uitgesloten van deelname! Deze kamer kan niet meer gebruikt worden.</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servers die overeenkomen met IP-tekens zijn nu verbannen.</string>
     <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servers die overeenkomen met IP-tekens zijn nu toegestaan.</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servers die overeenkomen met IP-letters zijn verbannen.</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">• Servers die overeenkomen met IP-tekens zijn toegestaan.</string>
     <string name="notice_room_server_acl_set_title">%s heeft de server ACL\'s voor deze kamer ingesteld.</string>
-    <string name="notice_room_server_acl_set_title_by_you">U heeft de server ACL\'s voor deze kamer ingesteld.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">U heeft de server ACL\'s voor deze kamer aangepast.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Je hebt de server ACL\'s voor deze kamer ingesteld.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Je hebt de server ACL\'s voor deze kamer aangepast.</string>
     <string name="notice_room_server_acl_updated_title">%s heeft de server ACL\'s voor deze kamer aangepast.</string>
     <string name="notice_room_server_acl_updated_was_allowed">• Servers die overeenkomen met %s zijn verwijderd uit de toegestane lijst.</string>
     <string name="notice_room_server_acl_updated_allowed">• Servers die overeenkomen met %s zijn nu toegestaan.</string>
@@ -916,14 +911,14 @@
     <string name="notice_room_server_acl_updated_banned">• Servers die overeenkomen met %s zijn nu verbannen.</string>
     <string name="notice_room_server_acl_set_allowed">• Servers die overeenkomen met %s zijn toegestaan.</string>
     <string name="notice_room_server_acl_set_banned">• Servers die overeenkomen met %s zijn verbannen.</string>
-    <string name="notice_direct_room_update_by_you">U heeft hier geüpgraded.</string>
+    <string name="notice_direct_room_update_by_you">Je hebt hier geüpgraded.</string>
     <string name="notice_direct_room_update">%s heeft hier geüpgraded.</string>
-    <string name="notice_made_future_room_visibility_by_you">U heeft toekomstige gespreksgeschiedenis zichtbaar gemaakt voor %1$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Je hebt toekomstige kamergeschiedenis zichtbaar gemaakt voor %1$s</string>
     <string name="voice_message_n_seconds_warning_toast">%1$ds over</string>
     <string name="direct_room_created_summary_item">%s is toegetreden.</string>
     <string name="sent_verification_conclusion">Conclusie Bevestiging</string>
     <string name="create_room_settings_section">Kamerinstellingen</string>
-    <string name="create_room_name_section">Gespreksnaam</string>
+    <string name="create_room_name_section">Kamernaam</string>
     <string name="room_manage_integrations">Integraties Beheren</string>
     <plurals name="notification_invitations">
         <item quantity="one">%d uitnodiging</item>
@@ -945,7 +940,7 @@
     <string name="create_pin_confirm_title">PIN Bevestigen</string>
     <string name="three_pid_revoke_invite_dialog_title">Uitnodiging intrekken</string>
     <string name="contacts_book_title">Contactpersonen</string>
-    <string name="room_settings_name_hint">Gespreksnaam</string>
+    <string name="room_settings_name_hint">Kamernaam</string>
     <string name="set_a_security_phrase_hint">Beveiligingszin</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Instellen</string>
     <string name="bottom_sheet_setup_secure_backup_title">Beveiligde backup</string>
@@ -963,11 +958,11 @@
     <string name="bootstrap_finish_title">Klaar!</string>
     <string name="message_key">Berichtsleutel</string>
     <string name="recovery_passphrase">Herstelwachtwoordzin</string>
-    <string name="verification_cancelled">Bevestiging Geannuleerd</string>
+    <string name="verification_cancelled">Verificatie geannuleerd</string>
     <string name="settings_key_requests">Sleutelverzoeken</string>
     <string name="delete_event_dialog_title">Verwijderen Bevestigen</string>
     <string name="settings_account_data">Accountgegevens</string>
-    <string name="settings_dev_tools">Ontwikkel Gereedschap</string>
+    <string name="settings_dev_tools">Ontwikkelaarsgereedschap</string>
     <string name="a11y_qr_code_for_verification">QR-code</string>
     <string name="reset_cross_signing">Sleutels herstellen</string>
     <string name="initialize_cross_signing">Gekruist Ondertekenen Initialiseren</string>
@@ -976,7 +971,7 @@
     <string name="settings_active_sessions_list">Actieve Sessies</string>
     <string name="room_settings_enable_encryption_dialog_submit">Versleuteling inschakelen</string>
     <string name="room_settings_enable_encryption_dialog_title">Versleuteling inschakelen\?</string>
-    <string name="settings_category_composer">Berichtverwerker</string>
+    <string name="settings_category_composer">Berichtbewerker</string>
     <string name="room_profile_section_more_leave">Gesprek Verlaten</string>
     <plurals name="room_profile_section_more_member_list">
         <item quantity="one">Eén persoon</item>
@@ -993,7 +988,7 @@
     <string name="verification_request_other_cancelled">%s heeft geannuleerd</string>
     <string name="verification_request_you_accepted">Jij hebt geaccepteerd</string>
     <string name="verification_request_other_accepted">%s heeft geaccepteerd</string>
-    <string name="verification_request_you_cancelled">U heeft geannuleerd</string>
+    <string name="verification_request_you_cancelled">Je hebt geannuleerd</string>
     <string name="verification_conclusion_not_secure">Niet beveiligd</string>
     <string name="verification_sas_match">Ze komen overeen</string>
     <string name="create_room_encryption_title">Versleuteling inschakelen</string>
@@ -1048,7 +1043,7 @@
     <string name="bottom_action_people_x">Directe Berichten</string>
     <string name="feedback">Feedback</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Token registreren</string>
-    <string name="settings_push_rules">Pushregels</string>
+    <string name="settings_push_rules">Push-regels</string>
     <string name="event_redacted">Bericht verwijderd</string>
     <string name="secure_backup_banner_setup_line1">Beveiligde Backup</string>
     <string name="active_widgets_title">Actieve widgets</string>
@@ -1060,7 +1055,7 @@
     <string name="settings_notification_other">Overige</string>
     <string name="room_settings_none">Geen</string>
     <string name="room_participants_action_ignore_title">Persoon negeren</string>
-    <string name="room_participants_power_level_demote_warning_title">Uzelf degraderen\?</string>
+    <string name="room_participants_power_level_demote_warning_title">Jezelf degraderen\?</string>
     <string name="room_participants_action_cancel_invite">Uitnodiging annuleren</string>
     <string name="call_hold_action">In de wacht zetten</string>
     <string name="login_error_ssl_other">SSL-fout.</string>
@@ -1174,10 +1169,10 @@
     <string name="send_file_step_idle">Wachten…</string>
     <string name="push_gateway_item_format">Formaat:</string>
     <string name="push_gateway_item_url">Url:</string>
-    <string name="push_gateway_item_device_name">sessie_naam:</string>
-    <string name="push_gateway_item_app_display_name">app_weergave_naam:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_device_name">Sessie weergavenaam:</string>
+    <string name="push_gateway_item_app_display_name">App weergavenaam:</string>
+    <string name="push_gateway_item_push_key">Push key:</string>
+    <string name="push_gateway_item_app_id">App ID:</string>
     <string name="settings_preferences">Voorkeuren</string>
     <string name="settings_general_title">Algemeen</string>
     <string name="active_widget_view_action">BEKIJKEN</string>
@@ -1191,36 +1186,36 @@
     <string name="dialog_title_success">Succes</string>
     <string name="action_copy">Kopiëren</string>
     <string name="denied_permission_camera">Geef toestemming om de camera te gebruiken via de systeeminstellingen om deze actie uit te voeren.</string>
-    <string name="denied_permission_generic">Sommige rechten ontbreken om deze actie uit te voeren, geeft a.u.b. toestemming via de systeeminstellingen.</string>
-    <string name="spaces">Spaces</string>
+    <string name="denied_permission_generic">Sommige rechten ontbreken om deze actie uit te voeren, geeft toestemming via de systeeminstellingen.</string>
+    <string name="spaces">Ruimten</string>
     <string name="start_chatting">Begin met chatten</string>
     <string name="action_reset">Herstellen</string>
     <string name="action_dismiss">Afwijzen</string>
     <string name="system_theme">Systeemstandaard</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">U heeft end-to-end-versleuteling ingeschakeld (onbekend algoritme %1$s).</string>
-    <string name="notice_end_to_end_ok_by_you">U heeft end-to-end-versleuteling ingeschakeld.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">U heeft gasten de toegang tot het gesprek verhinderd.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Je hebt eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %1$s).</string>
+    <string name="notice_end_to_end_ok_by_you">Je hebt eind-tot-eind-versleuteling ingeschakeld.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Je hebt gasten de toegang tot het gesprek verhinderd.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s heeft gasten de toegang tot het gesprek verhinderd.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">U heeft gasten de toegang tot het gesprek verhinderd.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">U heeft hier gasten toegelaten.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Je hebt gasten de toegang tot het gesprek verhinderd.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Je hebt hier gasten toegelaten.</string>
     <string name="notice_direct_room_guest_access_can_join">%1$s heeft hier gasten toegelaten.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">U heeft het gespreksadres gewijzigd.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Je hebt het gespreksadres gewijzigd.</string>
     <string name="notice_room_canonical_alias_no_change">%1$s heeft het gespreksadres gewijzigd.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">U heeft het hoofdadres en alternatieve gespreksadres gewijzigd.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Je hebt het hoofdadres en alternatieve gespreksadres gewijzigd.</string>
     <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s heeft het hoofdadres en alternatieve gespreksadres gewijzigd.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">U heeft het alternatieve gespreksadres gewijzigd.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Je hebt het alternatieve gespreksadres gewijzigd.</string>
     <string name="notice_room_canonical_alias_alternative_changed">%1$s heeft het alternatieve gespreksadres gewijzigd.</string>
     <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">U heeft alternatief gespreksadres %1$s verwijderd.</item>
-        <item quantity="other">U heeft alternatieve gespreksadressen %1$s verwijderd.</item>
+        <item quantity="one">Je hebt alternatief gespreksadres %1$s verwijderd.</item>
+        <item quantity="other">Je hebt alternatieve gespreksadressen %1$s verwijderd.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_removed">
         <item quantity="one">%1$s heeft %2$s als alternatief gespreksadres verwijderd.</item>
         <item quantity="other">%1$s heeft %2$s als alternatieve gespreksadressen verwijderd.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">U heeft %1$s als alternatief gespreksadres toegevoegd.</item>
-        <item quantity="other">U heeft %1$s als alternatieve gespreksadressen toegevoegd.</item>
+        <item quantity="one">Je hebt %1$s als alternatief gespreksadres toegevoegd.</item>
+        <item quantity="other">Je hebt %1$s als alternatieve gespreksadressen toegevoegd.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added">
         <item quantity="one">%1$s heeft %2$s als alternatief gespreksadres toegevoegd.</item>
@@ -1229,31 +1224,31 @@
     <string name="login_splash_submit">Aan de slag</string>
     <string name="space_settings_permissions_title">Spacerechten</string>
     <string name="room_settings_permissions_title">Gespreksrechten</string>
-    <string name="space_participants_unban_prompt_msg">Door deze persoon niet meer de verbannen kan hij/zij opnieuw toetreden tot de space.</string>
-    <string name="room_participants_unban_prompt_msg">Door deze persoon niet meer de verbannen kan hij/zij opnieuw toetreden tot het gesprek.</string>
-    <string name="space_participants_ban_prompt_msg">Door deze persoon te verbannen zal hij/zij verwijderd worden uit deze space en voorkomen dat hij/zij opnieuw toetreedt.</string>
+    <string name="space_participants_unban_prompt_msg">Door de verbanning op te heffen kan deze persoon opnieuw deelnemer worden van de space.</string>
+    <string name="room_participants_unban_prompt_msg">Door de verbanning op te heffen kan deze persoon opnieuw deelnemer worden van de kamer.</string>
+    <string name="space_participants_ban_prompt_msg">Door deze persoon te verbannen zullen ze verwijderd worden uit deze space en voorkomen dat ze opnieuw toetreden.</string>
     <string name="room_participants_ban_reason">Reden voor verbanning</string>
-    <string name="space_participants_remove_prompt_msg">Door deze persoon de verwijderen zal hij/zij niet meer in deze space zitten.
+    <string name="space_participants_remove_prompt_msg">De persoon zal worden verwijderd uit deze space.
 \n
-\nOm te voorkomen dat hij/zij opnieuw toetreedt, kunt u hem/haar ook verbannen.</string>
-    <string name="room_participants_remove_prompt_msg">Door deze persoon te verwijderen zal hij/zij niet meer in dit gesprek zitten.
+\nOm te voorkomen dat ze opnieuw toetreden, kan je ze verbannen.</string>
+    <string name="room_participants_remove_prompt_msg">De persoon zal worden verwijderd van deze kamer.
 \n
-\nOm te voorkomen dat hij/zij opnieuw toetreedt, kun je hem/haar ook verbannen.</string>
+\nOm te voorkomen dat ze opnieuw toetreden, kan je ze verbannen.</string>
     <string name="room_participants_remove_reason">Reden voor verwijdering</string>
-    <string name="room_participants_action_cancel_invite_prompt_msg">Weet u zeker dat u uitnodiging voor deze persoon wilt annuleren\?</string>
-    <string name="room_participants_action_unignore_prompt_msg">Als u deze persoon niet negeert, worden alle berichten van deze persoon opnieuw weergegeven.</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Weet je zeker dat je de uitnodiging voor deze persoon wilt annuleren\?</string>
+    <string name="room_participants_action_unignore_prompt_msg">Als je deze persoon niet negeert, worden alle berichten van deze persoon opnieuw weergegeven.</string>
     <string name="room_participants_action_ignore_prompt_msg">Door deze persoon te negeren worden zijn/haar berichten verwijderd uit gesprekken die jullie delen.
 \n
-\nU kunt deze actie op elk moment ongedaan maken in de algemene instellingen.</string>
-    <string name="room_participants_power_level_demote_warning_prompt">U kunt deze wijziging niet ongedaan maken omdat uzelf degradeert, als u de laatste persoon met rechten bent in het gesprek zal het onmogelijk zijn om opnieuw rechten te krijgen.</string>
-    <string name="room_participants_leave_private_warning">Dit gesprek is niet publiek. U kunt niet opnieuw toetreden zonder uitnodiging.</string>
-    <string name="permissions_denied_add_contact">Toegang verlenen tot uw contactpersonen.</string>
-    <string name="permissions_denied_qr_code">Om de QR-code te scannen moet u toegang verlenen tot de camera.</string>
+\nJe kan deze actie op elk moment ongedaan maken in de algemene instellingen.</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Je kan deze wijziging niet ongedaan maken omdat je jezelf degradeert, als je de laatste persoon met rechten bent in het gesprek zal het onmogelijk zijn om opnieuw rechten te krijgen.</string>
+    <string name="room_participants_leave_private_warning">Deze kamer is niet publiek. Je kan niet opnieuw deelnemer worden zonder uitnodiging.</string>
+    <string name="permissions_denied_add_contact">Toegang verlenen tot je contactpersonen.</string>
+    <string name="permissions_denied_qr_code">Om de QR-code te scannen moet je toegang verlenen tot de camera.</string>
     <string name="call_remove_jitsi_widget_progress">Oproep beëindigen…</string>
     <string name="call_ended_invite_timeout_title">Geen antwoord</string>
-    <string name="call_ended_user_busy_description">De persoon die u heeft gebeld is bezet.</string>
+    <string name="call_ended_user_busy_description">De persoon die je hebt gebeld is bezet.</string>
     <string name="call_ended_user_busy_title">Persoon bezet</string>
-    <string name="call_held_by_you">U heeft de oproep in de wacht gezet</string>
+    <string name="call_held_by_you">Je hebt de oproep in de wacht gezet</string>
     <string name="call_held_by_user">%s heeft de oproep in de wacht gezet</string>
     <string name="audio_call_with_participant">Bellen met %s</string>
     <string name="video_call_with_participant">Videobellen met %s</string>
@@ -1277,7 +1272,7 @@
     <string name="call_format_turn_hd_off">HD uitschakelen</string>
     <string name="call_select_sound_device">Geluidsapparaat Selecteren</string>
     <string name="call_failed_no_connection_description">Kan geen realtime verbinding tot stand brengen.
-\nVraag de beheerder van uw server om een TURN-server te configureren om gesprekken betrouwbaar te laten werken.</string>
+\nVraag de beheerder van jouw server om een TURN-server te configureren om gesprekken betrouwbaar te laten werken.</string>
     <string name="call_failed_no_connection">${app_name} Oproep Mislukt</string>
     <string name="hs_client_url">Server API URL</string>
     <string name="send_bug_report_include_key_share_history">Sleutel deelverzoekgeschiedenis versturen</string>
@@ -1289,36 +1284,36 @@
     <string name="dialog_edit_hint">Nieuwe waarde</string>
     <string name="failed_to_remove_widget">Widget verwijderen mislukt</string>
     <string name="failed_to_add_widget">Widget toevoegen mislukt</string>
-    <string name="cannot_call_yourself_with_invite">U kunt uzelf niet bellen, wacht totdat deelnemers de uitnodiging accepteren</string>
-    <string name="cannot_call_yourself">U kunt niet met uzelf bellen</string>
-    <string name="audio_video_meeting_description">Vergaderingen gebruiken beveiligings- en toestemmingsbeleid van Jitsi. Alle huidige personen in het gesprek zullen een uitnodiging zien terwijl uw vergadering bezig is.</string>
+    <string name="cannot_call_yourself_with_invite">Je kunt jezelf niet bellen, wacht totdat deelnemers de uitnodiging accepteren</string>
+    <string name="cannot_call_yourself">Je kunt niet met jezelf bellen</string>
+    <string name="audio_video_meeting_description">Vergaderingen gebruiken beveiligings- en toestemmingsbeleid van Jitsi. Alle huidige personen in het gesprek zullen een uitnodiging zien terwijl je vergadering bezig is.</string>
     <string name="audio_meeting">Geluidsvergadering starten</string>
     <string name="video_meeting">Videoconferentie starten</string>
-    <string name="no_permissions_to_start_webrtc_call_in_direct_room">U mist de rechten om een oproep te starten</string>
-    <string name="no_permissions_to_start_webrtc_call">U mist de rechten om een oproep in dit gesprek te starten</string>
-    <string name="no_permissions_to_start_conf_call_in_direct_room">U mist de rechten om een vergadering te starten</string>
-    <string name="no_permissions_to_start_conf_call">U mist de rechten om een vergadering in dit gesprek te starten</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Je mist de rechten om een oproep te starten</string>
+    <string name="no_permissions_to_start_webrtc_call">Je mist de rechten om een oproep in dit gesprek te starten</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Je mist de rechten om een vergadering te starten</string>
+    <string name="no_permissions_to_start_conf_call">Je mist de rechten om een vergadering in dit gesprek te starten</string>
     <string name="missing_permissions_title">Ontbrekende rechten</string>
     <string name="denied_permission_voice_message">Geef toestemming om de microfoon te gebruiken om stemberichten te versturen.</string>
     <string name="secure_backup_reset_all">Alles herstellen</string>
-    <string name="direct_room_created_summary_item_by_you">U bent toegetreden.</string>
+    <string name="direct_room_created_summary_item_by_you">Je bent toegetreden.</string>
     <string name="login_reset_password_mail_confirmation_notice">Er is een verificatie e-mail verzonden naar %1$s.</string>
     <string name="login_reset_password_mail_confirmation_title">Controleer je inbox</string>
     <string name="login_reset_password_error_not_found">Dit e-mailadres is niet aan een account gekoppeld</string>
-    <string name="login_reset_password_warning_content">Als u uw wachtwoord wijzigt, worden alle end-to-end-versleutelingssleutels voor al uw sessies opnieuw ingesteld, waardoor de gecodeerde chatgeschiedenis onleesbaar wordt. Stel een back-up sleutel in of exporteer uw kamersleutels uit een andere sessie voordat u uw wachtwoord opnieuw instelt.</string>
-    <string name="login_reset_password_notice">Er wordt een verificatie-e-mail naar uw inbox gestuurd om het instellen van uw nieuwe wachtwoord te bevestigen.</string>
+    <string name="login_reset_password_warning_content">Als je jouw wachtwoord wijzigt, worden alle eind-tot-eind-versleutelingssleutels voor al je sessies opnieuw ingesteld, waardoor de gecodeerde chatgeschiedenis onleesbaar wordt. Stel een back-up sleutel in of exporteer je kamersleutels uit een andere sessie voordat je jouw wachtwoord opnieuw instelt.</string>
+    <string name="login_reset_password_notice">Er wordt een verificatie-e-mail naar jouw inbox gestuurd om het instellen van je nieuwe wachtwoord te bevestigen.</string>
     <string name="login_reset_password_on">Wachtwoord opnieuw instellen op %1$s</string>
     <string name="login_login_with_email_error">Dit e-mailadres is niet gekoppeld aan een account.</string>
     <string name="login_registration_not_supported">De applicatie kan geen account aanmaken op deze server.
 \n
-\nWilt u zich aanmelden met een webclient\?</string>
+\nWil je jezelf aanmelden met een webclient\?</string>
     <string name="login_registration_disabled">Sorry, deze server accepteert geen nieuwe accounts.</string>
     <string name="login_mode_not_supported">De applicatie kan niet inloggen op deze server. De thuisserver ondersteunt de volgende aanmeldingstype(s): %1$s.
 \n
 \nWil je inloggen met een webclient\?</string>
     <string name="login_sso_error_message">Er is een fout opgetreden bij het laden van de pagina: %1$s (%2$d)</string>
-    <string name="login_server_url_form_common_notice">Voer het adres in van de server die u wilt gebruiken</string>
-    <string name="login_server_url_form_modular_notice">Voer het adres in van de Modular Element of de server die u wilt gebruiken</string>
+    <string name="login_server_url_form_common_notice">Voer het adres in van de server die je wil gebruiken</string>
+    <string name="login_server_url_form_modular_notice">Voer het adres in van de Modular Element of de server die je wil gebruiken</string>
     <string name="login_server_url_form_modular_text">Premium hosting voor organisaties</string>
     <string name="login_server_url_form_modular_hint">Element Matrix Services-adres</string>
     <string name="login_clear_homeserver_history">Geschiedenis wissen</string>
@@ -1336,21 +1331,21 @@
     <string name="login_server_matrix_org_text">Word gratis lid met miljoenen anderen op de grootste openbare server</string>
     <string name="login_server_text">Net als e-mail hebben accounts één thuis, hoewel je met iedereen kunt praten</string>
     <string name="login_server_title">Selecteer een server</string>
-    <string name="login_splash_text3">Breid en pas uw ervaring aan</string>
+    <string name="login_splash_text3">Breid uit en personaliseer je ervaring</string>
     <string name="login_splash_text2">Houd gesprekken privé met versleuteling</string>
     <string name="login_splash_text1">Chat direct met mensen of in groepen</string>
-    <string name="login_splash_title">Het is jouw gesprek. Bezet het.</string>
-    <string name="direct_room_join_rules_invite_by_you">U heeft deze op enkel uitnodiging gemaakt.</string>
+    <string name="login_splash_title">Het is jouw gesprek. Bezit het.</string>
+    <string name="direct_room_join_rules_invite_by_you">Je hebt deze op enkel uitnodiging gemaakt.</string>
     <string name="direct_room_join_rules_invite">%1$s heeft dit alleen op uitnodiging gemaakt.</string>
     <string name="room_join_rules_invite_by_you">Je hebt de kamer alleen op uitnodiging gemaakt.</string>
     <string name="room_join_rules_invite">%1$s heeft de kamer alleen voor uitnodigingen ingesteld.</string>
-    <string name="room_join_rules_public_by_you">U heeft de kamer openbaar gemaakt voor iedereen die de link kent.</string>
-    <string name="no_ignored_users">U negeert geen enkele persoon</string>
+    <string name="room_join_rules_public_by_you">Je heb de kamer openbaar gemaakt voor iedereen die de link kent.</string>
+    <string name="no_ignored_users">Je negeert geen enkele persoon</string>
     <string name="room_join_rules_public">%1$s heeft de kamer openbaar gemaakt voor iedereen die de link kent.</string>
     <string name="help_long_click_on_room_for_more_options">Klik lang op een kamer om meer opties te zien</string>
     <string name="reaction_search_type_hint">Schrijf trefwoorden om een reactie te vinden.</string>
     <string name="command_description_spoiler">Stuurt het gegeven bericht als een spoiler</string>
-    <string name="notice_member_no_changes_by_you">U heeft geen wijzigingen aangebracht</string>
+    <string name="notice_member_no_changes_by_you">Je hebt geen wijzigingen aangebracht</string>
     <string name="notice_member_no_changes">%1$s heeft geen wijzigingen aangebracht</string>
     <string name="room_list_quick_actions_room_settings">Kamer instellingen</string>
     <string name="room_list_quick_actions_leave">Verlaat de kamer</string>
@@ -1358,18 +1353,18 @@
     <string name="room_list_quick_actions_low_priority_add">Toevoegen aan lage prioriteit</string>
     <string name="room_list_quick_actions_favorite_remove">Verwijder van favorieten</string>
     <string name="room_list_quick_actions_favorite_add">Toevoegen aan favorieten</string>
-    <string name="room_list_quick_actions_notifications_all_noisy">Alle berichten (luidruchtig)</string>
+    <string name="room_list_quick_actions_notifications_all_noisy">Alle belangrijke berichten</string>
     <string name="content_reported_as_inappropriate_content">Deze inhoud is als ongepast gerapporteerd.
 \n
-\nAls u geen inhoud van deze persoon meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
+\nAls je geen inhoud van deze persoon meer wilt zien, kan je deze negeren om hun berichten te verbergen.</string>
     <string name="content_reported_as_inappropriate_title">Gemeld als ongepast</string>
     <string name="content_reported_as_spam_content">Deze inhoud is gerapporteerd als spam.
 \n
-\nAls u geen inhoud van deze persoon meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
+\nAls je geen inhoud van deze persoon meer wilt zien, kan je deze negeren om hun berichten te verbergen.</string>
     <string name="content_reported_as_spam_title">Gerapporteerd als spam</string>
     <string name="content_reported_content">Deze inhoud is gemeld.
 \n
-\nAls u geen inhoud van deze persoon meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
+\nAls je geen inhoud van deze persoon meer wilt zien, kan je deze negeren om hun berichten te verbergen.</string>
     <string name="report_content_custom_hint">Reden voor het rapporteren van deze inhoud</string>
     <string name="report_content_custom_title">Deze inhoud rapporteren</string>
     <string name="uploads_files_no_result">Er zijn geen bestanden in deze kamer</string>
@@ -1399,49 +1394,49 @@
     <string name="a11y_create_menu_open">Open het menu kamer maken</string>
     <string name="a11y_open_drawer">Open de navigatielade</string>
     <string name="error_network_timeout">Het lijkt erop dat de server er te lang over doet om te reageren. Dit kan worden veroorzaakt door een slechte verbinding of een fout met de server. Probeer het over een tijdje opnieuw.</string>
-    <string name="error_terms_not_accepted">Probeer het opnieuw zodra u de algemene voorwaarden van uw homeserver hebt geaccepteerd.</string>
-    <string name="labs_allow_extended_logging_summary">Uitgebreide logboeken helpen ontwikkelaars door meer logboeken te verstrekken wanneer u een RageShake verzendt. Zelfs wanneer ingeschakeld, registreert de toepassing geen berichtinhoud of andere privégegevens.</string>
-    <string name="labs_allow_extended_logging">Uitgebreide logboeken inschakelen.</string>
-    <string name="settings_agree_to_terms">Ga akkoord met de servicevoorwaarden van de identiteitsserver (%s), zodat u vindbaar bent op e-mailadres of telefoonnummer.</string>
-    <string name="settings_discovery_disconnect_with_bound_pid">U deelt momenteel e-mailadressen of telefoonnummers op de identiteitsserver %1$s. U moet opnieuw verbinding maken met %2$s om ze niet meer te delen.</string>
+    <string name="error_terms_not_accepted">Probeer het opnieuw zodra je de algemene voorwaarden van je homeserver hebt geaccepteerd.</string>
+    <string name="labs_allow_extended_logging_summary">Uitgebreide logboeken helpen ontwikkelaars door meer logboeken te verstrekken wanneer je een RageShake verzendt. Zelfs wanneer ingeschakeld, registreert de toepassing geen berichtinhoud of andere privégegevens.</string>
+    <string name="labs_allow_extended_logging">Uitgebreide logboeken inschakelen</string>
+    <string name="settings_agree_to_terms">Ga akkoord met de servicevoorwaarden van de identiteitsserver (%s), zodat je vindbaar bent op e-mailadres of telefoonnummer.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Je deelt momenteel e-mailadressen of telefoonnummers op de identiteitsserver %1$s. Je moet opnieuw verbinding maken met %2$s om ze niet meer te delen.</string>
     <string name="settings_text_message_sent_wrong_code">De verificatiecode is niet correct.</string>
     <string name="settings_text_message_sent">Er is een sms-bericht verzonden naar %s. Voer de verificatiecode in die deze bevat.</string>
-    <string name="settings_discovery_no_terms">De door u gekozen identiteitsserver heeft geen servicevoorwaarden. Ga alleen verder als je de eigenaar van de service vertrouwt</string>
+    <string name="settings_discovery_no_terms">De door jouw gekozen identiteitsserver heeft geen servicevoorwaarden. Ga alleen verder als je de eigenaar van de service vertrouwt</string>
     <string name="settings_discovery_no_terms_title">Identiteitsserver heeft geen servicevoorwaarden</string>
     <string name="settings_discovery_please_enter_server">Voer de URL van de identiteitsserver in</string>
     <string name="settings_discovery_bad_identity_server">Kan geen verbinding maken met identiteitsserver</string>
     <string name="settings_discovery_enter_identity_server">Voer een identiteitsserver URL in</string>
-    <string name="identity_server_consent_dialog_content_question">Gaat u akkoord met het versturen van deze informatie\?</string>
-    <string name="identity_server_consent_dialog_content_3">Om bestaande contacten te ontdekken, moet u contactgegevens (e-mailadressen en telefoonnummers) naar uw identiteitsserver sturen. We hashen uw gegevens voordat ze worden verzonden vanwege privacy.</string>
+    <string name="identity_server_consent_dialog_content_question">Ga je akkoord met het versturen van deze informatie\?</string>
+    <string name="identity_server_consent_dialog_content_3">Om bestaande contacten te ontdekken, moet je contactgegevens (e-mailadressen en telefoonnummers) naar je identiteitsserver sturen. We hashen je gegevens voordat ze worden verzonden vanwege privacy.</string>
     <string name="identity_server_consent_dialog_title_2">Stuur e-mailadressen en telefoonnummers naar %s</string>
     <string name="settings_discovery_consent_action_give_consent">Toestemming geven</string>
     <string name="settings_discovery_consent_action_revoke">Mijn toestemming intrekken</string>
-    <string name="legals_home_server_title">Uw server-beleid</string>
-    <string name="login_error_homeserver_from_url_not_found">Kan geen server bereiken op de URL %s. Controleer uw link of kies handmatig een server.</string>
-    <string name="settings_discovery_consent_notice_off_2">Uw contacten zijn privé. Om personen van uw contacten te ontdekken, hebben we uw toestemming nodig om contactgegevens naar uw identiteitsserver te sturen.</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">We hebben u een bevestigingsmail gestuurd naar %s, controleer eerst uw e-mail en klik op de bevestigingslink</string>
-    <string name="settings_discovery_confirm_mail">We hebben u een bevestigingsmail gestuurd naar %s, controleer uw e-mail en klik op de bevestigingslink</string>
-    <string name="settings_discovery_no_mails">Ontdekkingsopties verschijnen zodra u een e-mail heeft toegevoegd.</string>
-    <string name="settings_discovery_identity_server_info">U gebruikt momenteel %1$s om te ontdekken en vindbaar te zijn voor bestaande contacten die u kent.</string>
-    <string name="navigate_to_room_when_already_in_the_room">U bekijkt deze kamer al!</string>
-    <string name="room_preview_no_preview_join">Er kan geen voorbeeld van deze kamer worden bekeken. Wilt u deelnemen\?</string>
+    <string name="legals_home_server_title">Jouw thuisserverbeleid</string>
+    <string name="login_error_homeserver_from_url_not_found">Kan geen server bereiken op de URL %s. Controleer je link of kies handmatig een server.</string>
+    <string name="settings_discovery_consent_notice_off_2">Jouw contacten zijn privé. Om personen van je contacten te ontdekken, hebben we jouw toestemming nodig om contactgegevens naar je identiteitsserver te sturen.</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">We hebben een e-mail gestuurd naar %s, controleer eerst je e-mail en klik op de bevestigingslink</string>
+    <string name="settings_discovery_confirm_mail">We hebben een e-mail gestuurd naar %s, controleer je e-mail en klik op de bevestigingslink</string>
+    <string name="settings_discovery_no_mails">Ontdekkingsopties verschijnen zodra je een e-mailadres hebt toegevoegd.</string>
+    <string name="settings_discovery_identity_server_info">Je gebruikt momenteel %1$s om te ontdekken en vindbaar te zijn voor bestaande contacten die je kent.</string>
+    <string name="navigate_to_room_when_already_in_the_room">Je bekijkt deze kamer al!</string>
+    <string name="room_preview_no_preview_join">Er kan geen voorbeeld van deze kamer worden bekeken. Wil je toetreden\?</string>
     <string name="room_preview_not_found">Deze kamer is op dit moment niet toegankelijk.
-\nProbeer het later opnieuw of vraag een kamerbeheerder om te controleren of u toegang heeft.</string>
-    <string name="command_description_avatar_for_room">Verander uw avatar alleen in deze huidige kamer</string>
-    <string name="command_description_nick_for_room">Verander uw schermnaam alleen in de huidige kamer</string>
-    <string name="other_spaces_or_rooms_you_might_not_know">Andere spaces of kamers die u misschien niet kent</string>
-    <string name="space_you_know_that_contains_this_room">Space die u kent die deze kamer bevat</string>
-    <string name="room_alias_local_address_subtitle">Stel adressen in voor deze kamer zodat personen deze kamer kunnen vinden via uw server (%1$s)</string>
-    <string name="analytics_opt_in_list_item_3">U kunt dit op elk moment uitschakelen in de instellingen</string>
-    <string name="settings_mentions_and_keywords_encryption_notice">U krijgt geen meldingen voor vermeldingen en trefwoorden in versleutelde kamers op uw mobiel.</string>
-    <string name="error_threepid_auth_failed">Zorg ervoor dat u op de link heeft geklikt in de e-mail die we u hebben gestuurd.</string>
-    <string name="settings_discovery_consent_notice_on">U hebt uw toestemming gegeven om e-mails en telefoonnummers naar deze identiteitsserver te sturen om andere personen van uw contacten te ontdekken.</string>
+\nProbeer het later opnieuw of vraag een kamerbeheerder om te controleren of je toegang hebt.</string>
+    <string name="command_description_avatar_for_room">Verander je afbeelding alleen in deze kamer</string>
+    <string name="command_description_nick_for_room">Verander je weergavenaam alleen in de huidige kamer</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Andere spaces of kamers die je misschien niet kent</string>
+    <string name="space_you_know_that_contains_this_room">Space die je kent die deze kamer bevat</string>
+    <string name="room_alias_local_address_subtitle">Stel adressen in voor deze kamer zodat personen deze kamer kunnen vinden via jouw server (%1$s)</string>
+    <string name="analytics_opt_in_list_item_3">Je kan dit op elk moment uitschakelen in de instellingen</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Je krijgt geen meldingen voor vermeldingen en trefwoorden in versleutelde kamers op je mobiel.</string>
+    <string name="error_threepid_auth_failed">Zorg ervoor dat je op de link hebt geklikt in de e-mail die we je hebben gestuurd.</string>
+    <string name="settings_discovery_consent_notice_on">Je hebt toestemming gegeven om e-mails en telefoonnummers naar deze identiteitsserver te sturen om andere personen van je contacten te ontdekken.</string>
     <string name="settings_discovery_consent_title">E-mailadressen en telefoonnummers versturen</string>
     <string name="settings_discovery_msisdn_title">Vindbare telefoonnummers</string>
-    <string name="settings_discovery_disconnect_identity_server_info">Als u de verbinding met uw identiteitsserver verbreekt, betekent dit dat u niet door andere personen kan worden gevonden en dat u anderen niet per e-mail of telefoon kunt uitnodigen.</string>
-    <string name="settings_discovery_no_msisdn">Ontdekkingsopties verschijnen zodra u een telefoonnummer heeft toegevoegd.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Als je de verbinding met je identiteitsserver verbreekt, betekent dit dat je niet door andere personen kan worden gevonden en dat je anderen niet per e-mail of telefoon kan uitnodigen.</string>
+    <string name="settings_discovery_no_msisdn">Ontdekkingsopties verschijnen zodra je een telefoonnummer hebt toegevoegd.</string>
     <string name="settings_discovery_emails_title">Vindbare e-mailadressen</string>
-    <string name="settings_discovery_identity_server_info_none">U gebruikt momenteel geen identiteitsserver. Om te ontdekken en vindbaar te zijn door bestaande contacten die u kent, configureert u er een hieronder.</string>
+    <string name="settings_discovery_identity_server_info_none">Je gebruikt momenteel geen identiteitsserver. Om te ontdekken en vindbaar te zijn door bestaande contacten die Je kent, configureer je er een hieronder.</string>
     <string name="settings_discovery_no_policy_provided">Geen beleid geleverd door de identiteitsserver</string>
     <string name="settings_discovery_hide_identity_server_policy_title">Identiteitsserverbeleid verbergen</string>
     <string name="settings_discovery_show_identity_server_policy_title">Identiteitsserverbeleid weergeven</string>
@@ -1465,27 +1460,27 @@
     <string name="room_filtering_footer_open_room_directory">Bekijk de kamer directory</string>
     <string name="room_filtering_footer_create_new_direct_message">Een nieuw privébericht versturen</string>
     <string name="room_filtering_footer_create_new_room">Nieuwe kamer aanmaken</string>
-    <string name="room_filtering_footer_title">Kunt u niet vinden wat u zoekt\?</string>
+    <string name="room_filtering_footer_title">Kan je niet vinden wat je zoekt\?</string>
     <string name="no_message_edits_found">Geen bewerkingen gevonden</string>
     <string name="downloaded_file">Bestand %1$s is gedownload!</string>
     <string name="send_file_step_compressing_video">Video comprimeren %d%%</string>
     <string name="send_file_step_compressing_image">Afbeelding comprimeren…</string>
     <string name="send_file_step_sending_file">Bestand versturen (%1$s / %2$s)</string>
     <string name="send_file_step_sending_thumbnail">Miniatuur versturen (%1$s / %2$s)</string>
-    <string name="settings_labs_show_complete_history_in_encrypted_room">Toon volledige geschiedenis in versleutelde kamers</string>
-    <string name="settings_labs_show_hidden_events_in_timeline">Toon verborgen gebeurtenissen op de tijdlijn</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Volledige geschiedenis in versleutelde kamers weergeven</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">Verborgen gebeurtenissen op de tijdlijn weergeven</string>
     <string name="give_feedback">Geef feedback</string>
     <string name="feedback_failed">De feedback kan niet worden verzonden (%s)</string>
-    <string name="feedback_sent">Bedankt, uw feedback is succesvol verzonden</string>
-    <string name="you_may_contact_me">U kunt contact met mij opnemen als u vervolgvragen heeft</string>
-    <string name="send_feedback_space_info">U gebruikt een bètaversie van spaces. Uw feedback zal helpen bij het informeren van de volgende versies. Uw platform en inlognaam worden genoteerd om ons te helpen uw feedback zoveel mogelijk te gebruiken.</string>
+    <string name="feedback_sent">Bedankt, je feedback is succesvol verzonden</string>
+    <string name="you_may_contact_me">Je kan contact met mij opnemen als je vervolgvragen hebt</string>
+    <string name="send_feedback_space_info">Je gebruikt een bètaversie van spaces. Jouw feedback zal helpen bij het informeren van de volgende versies. Jouw platform en inlognaam worden genoteerd om ons te helpen jouw feedback zoveel mogelijk te gebruiken.</string>
     <string name="send_feedback_space_title">Spaces feedback</string>
     <string name="send_suggestion_failed">De suggestie kan niet worden verzonden (%s)</string>
     <string name="send_suggestion_sent">Bedankt, de suggestie is succesvol verzonden</string>
-    <string name="send_suggestion_report_placeholder">Beschrijf hier uw suggestie</string>
-    <string name="send_suggestion_content">Schrijf hieronder uw suggestie.</string>
-    <string name="send_suggestion">Doe een suggestie</string>
-    <string name="preference_system_settings">Systeem instellingen</string>
+    <string name="send_suggestion_report_placeholder">Beschrijf hier jouw suggestie</string>
+    <string name="send_suggestion_content">Schrijf hieronder jouw suggestie.</string>
+    <string name="send_suggestion">Een voorstel doen</string>
+    <string name="preference_system_settings">Systeeminstellingen</string>
     <string name="preference_versions">Versies</string>
     <string name="preference_help_summary">Hulp bij het gebruik van ${app_name}</string>
     <string name="preference_help_title">Hulp en ondersteuning</string>
@@ -1505,9 +1500,9 @@
 \n
 \n%s</string>
     <string name="create_room_topic_section">Kameronderwerp (optioneel)</string>
-    <string name="create_new_space">Aanmaken nieuwe Space</string>
-    <string name="settings_show_redacted_summary">Toon een aanduiding voor verwijderde berichten</string>
-    <string name="settings_show_redacted">Toon verwijderde berichten</string>
+    <string name="create_new_space">Nieuwe space aanmaken</string>
+    <string name="settings_show_redacted_summary">Geeft een plaatsvervangende melding weer voor verwijderde berichten.</string>
+    <string name="settings_show_redacted">Verwijderde berichten weergeven</string>
     <string name="secure_backup_setup">Beveiligde back-up instellen</string>
     <string name="secure_backup_banner_setup_line2">Beveiliging tegen verlies van toegang tot versleutelde berichten en gegevens</string>
     <string name="recovery_key_export_saved">De herstelsleutel is opgeslagen.</string>
@@ -1524,9 +1519,9 @@
     <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s in %2$s en %3$s</string>
     <string name="directory_add_a_new_server_error_already_added">Deze server is al aanwezig in de lijst</string>
     <string name="directory_add_a_new_server_error">Kan deze server of de kamerlijst niet vinden</string>
-    <string name="directory_add_a_new_server_prompt">Voer de naam in van een nieuwe server die u wilt verkennen.</string>
+    <string name="directory_add_a_new_server_prompt">Voer de naam in van een nieuwe server die je wil verkennen.</string>
     <string name="directory_add_a_new_server">Een nieuwe server toevoegen</string>
-    <string name="directory_your_server">Uw server</string>
+    <string name="directory_your_server">Jouw server</string>
     <plurals name="encryption_import_room_keys_success">
         <item quantity="one">Sleutel %1$d/%2$d geïmporteerd met succes.</item>
         <item quantity="other">%1$d/%2$d sleutels met succes geïmporteerd.</item>
@@ -1567,10 +1562,10 @@
     <string name="room_alias_published_alias_add_manually">Een nieuw adres handmatig publiceren</string>
     <string name="room_alias_published_other">Andere gepubliceerde adressen:</string>
     <string name="room_alias_published_alias_main">Dit is het hoofdadres</string>
-    <string name="room_alias_published_alias_subtitle">Gepubliceerde adressen kunnen door iedereen op elke server worden gebruikt om lid te worden van uw kamer. Om een adres te publiceren, moet het eerst als lokaal adres worden ingesteld.</string>
+    <string name="room_alias_published_alias_subtitle">Gepubliceerde adressen kunnen door iedereen op elke server worden gebruikt om lid te worden van jouw kamer. Om een adres te publiceren, moet het eerst als lokaal adres worden ingesteld.</string>
     <string name="room_alias_published_alias_title">Gepubliceerde adressen</string>
     <string name="space_settings_alias_subtitle">Adressen van deze kamer bekijken en beheren.</string>
-    <string name="space_settings_alias_title">Spaceadressen</string>
+    <string name="space_settings_alias_title">Ruimte-adressen</string>
     <string name="room_settings_alias_subtitle">Bekijk en beheer de adressen van deze kamer en de zichtbaarheid ervan in de kamerdirectory.</string>
     <string name="room_settings_alias_title">Kameradressen</string>
     <string name="room_settings_guest_access_title">Sta toe om gasten te laten deelnemen</string>
@@ -1579,34 +1574,34 @@
     <string name="room_settings_access_rules_pref_dialog_title">Wie heeft toegang\?</string>
     <string name="room_settings_room_read_history_dialog_subtitle">Wijzigingen in wie geschiedenis kan lezen, zijn alleen van toepassing op toekomstige berichten in deze kamer. De zichtbaarheid van de bestaande historie blijft ongewijzigd.</string>
     <string name="room_settings_room_notifications_account_settings">Account instellingen</string>
-    <string name="room_settings_room_notifications_manage_notifications">U kunt meldingen beheren in %1$s.</string>
+    <string name="room_settings_room_notifications_manage_notifications">Je kan meldingen beheren in %1$s.</string>
     <string name="room_settings_room_notifications_encryption_notice">Houd er rekening mee dat vermeldingen en trefwoordmeldingen niet beschikbaar zijn in versleutelde kamers op mobiel.</string>
     <string name="room_settings_room_notifications_notify_me">Informeer mij voor</string>
-    <string name="settings_emails_and_phone_numbers_summary">Beheer e-mailadressen en telefoonnummers die aan uw Matrix-account zijn gekoppeld</string>
+    <string name="settings_emails_and_phone_numbers_summary">Beheer e-mailadressen en telefoonnummers die aan je Matrix-account zijn gekoppeld</string>
     <string name="settings_emails_and_phone_numbers_title">E-mailadressen en telefoonnummers</string>
     <string name="disabled_integration_dialog_content">Schakel hiervoor \'Integraties toestaan\' in bij Instellingen.</string>
     <string name="disabled_integration_dialog_title">Integraties zijn uitgeschakeld</string>
     <string name="legals_no_policy_provided">Deze server biedt geen beleid.</string>
     <string name="legals_third_party_notices">Bibliotheken van derden</string>
-    <string name="legals_identity_server_title">Uw identiteitsserverbeleid</string>
-    <string name="legals_application_title">${app_name} beleid</string>
+    <string name="legals_identity_server_title">Jouw identiteitsserverbeleid</string>
+    <string name="legals_application_title">${app_name}-beleid</string>
     <string name="analytics_opt_in_list_item_2">We delen <b>geen</b> informatie met derden</string>
     <string name="analytics_opt_in_list_item_1">We registreren of profileren <b>geen</b> accountgegevens</string>
     <string name="analytics_opt_in_content_link">hier</string>
-    <string name="analytics_opt_in_content">Help ons problemen te identificeren en ${app_name} te verbeteren door anonieme gebruiksgegevens te delen. Om inzicht te krijgen in hoe mensen meerdere apparaten gebruiken, genereren we een willekeurige identificatie die door uw apparaten wordt gedeeld.
+    <string name="analytics_opt_in_content">Help ons problemen te identificeren en ${app_name} te verbeteren door anonieme gebruiksgegevens te delen. Om inzicht te krijgen in hoe mensen meerdere apparaten gebruiken, genereren we een willekeurige identificatie die door jouw apparaten wordt gedeeld.
 \n
-\nU kunt al onze voorwaarden %s lezen.</string>
+\nJe kan al onze voorwaarden %s lezen.</string>
     <string name="analytics_opt_in_title">Help ${app_name} verbeteren</string>
-    <string name="reset_secure_backup_warning">Dit zal uw huidige sleutel of zin vervangen.</string>
-    <string name="reset_secure_backup_title">Genereer een nieuwe beveiligingssleutel of stel een nieuwe beveiligingszin in voor uw bestaande back-up.</string>
-    <string name="settings_secure_backup_section_info">Bescherm uzelf tegen verlies van toegang tot versleutelde berichten en gegevens door een back-up te maken van versleutelingssleutels op uw server.</string>
+    <string name="reset_secure_backup_warning">Dit zal jouw huidige sleutel of zin vervangen.</string>
+    <string name="reset_secure_backup_title">Genereer een nieuwe beveiligingssleutel of stel een nieuwe beveiligingszin in voor je bestaande back-up.</string>
+    <string name="settings_secure_backup_section_info">Bescherm jezelf tegen verlies van toegang tot versleutelde berichten en gegevens door een back-up te maken van versleutelingssleutels op je server.</string>
     <string name="settings_secure_backup_enter_to_setup">Instellen op dit apparaat</string>
     <string name="settings_secure_backup_reset">Beveiligde back-up resetten</string>
     <string name="settings_secure_backup_setup">Beveiligde back-up instellen</string>
     <string name="settings_show_emoji_keyboard_summary">Voeg een knop toe aan de invoerveld om het emoji-toetsenbord te openen</string>
     <string name="settings_show_emoji_keyboard">Emoji-toetsenbord weergeven</string>
     <string name="settings_chat_effects_description">Gebruik /confetti commando of stuur een bericht met ❄️ of 🎉</string>
-    <string name="settings_chat_effects_title">Toon chateffecten</string>
+    <string name="settings_chat_effects_title">Chateffecten weergeven</string>
     <string name="settings_room_upgrades">Kamer upgrades</string>
     <string name="settings_messages_by_bot">Berichten door bot</string>
     <string name="settings_room_invitations">Kameruitnodigingen</string>
@@ -1621,23 +1616,23 @@
     <string name="settings_messages_in_e2e_group_chat">Versleutelde berichten in groepsgesprekken</string>
     <string name="settings_messages_in_e2e_one_to_one">Versleutelde berichten in één-op-één gesprekken</string>
     <string name="settings_troubleshoot_test_notification_notification_clicked">Er is op de melding geklikt!</string>
-    <string name="settings_troubleshoot_test_notification_notice">Klik op de melding. Als u de melding niet ziet, controleer dan de systeeminstellingen.</string>
-    <string name="settings_troubleshoot_test_push_notification_content">U bekijkt de melding! Klik hier!</string>
+    <string name="settings_troubleshoot_test_notification_notice">Klik op de melding. Als je de melding niet ziet, controleer dan de systeeminstellingen.</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Je bekijkt de melding! Klik hier!</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Kan push niet ontvangen. Oplossing zou kunnen zijn om de applicatie opnieuw te installeren.</string>
     <string name="settings_troubleshoot_test_push_loop_success">De applicatie ontvangt PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">De applicatie wacht op de PUSH</string>
     <string name="settings_notification_keyword_contains_invalid_character">Trefwoorden mogen \'%s\' niet bevatten</string>
     <string name="settings_notification_keyword_contains_dot">Trefwoorden mogen niet beginnen met \'.\'</string>
     <string name="settings_notification_new_keyword">Nieuw trefwoord toevoegen</string>
-    <string name="settings_notification_your_keywords">Uw trefwoorden</string>
+    <string name="settings_notification_your_keywords">Jouw trefwoorden</string>
     <string name="settings_notification_notify_me_for">Breng me op de hoogte voor</string>
     <string name="settings_notification_mentions_and_keywords">Vermeldingen en trefwoorden</string>
     <string name="settings_notification_default">Standaardmeldingen</string>
     <string name="settings_notification_emails_enable_for_email">E-mailmeldingen inschakelen voor %s</string>
-    <string name="settings_notification_emails_no_emails">Om e-mail met melding te ontvangen, koppelt u een e-mail aan uw Matrix-account</string>
+    <string name="settings_notification_emails_no_emails">Om e-mail met melding te ontvangen, koppel je een e-mailadres aan je Matrix-account</string>
     <string name="settings_notification_emails_category">E-mail notificatie</string>
-    <string name="settings_emails_empty">Er is geen e-mailadres toegevoegd aan uw account</string>
-    <string name="settings_phone_number_empty">Er is geen telefoonnummer toegevoegd aan uw account</string>
+    <string name="settings_emails_empty">Er is geen e-mailadres toegevoegd aan je account</string>
+    <string name="settings_phone_number_empty">Er is geen telefoonnummer toegevoegd aan je account</string>
     <string name="shortcut_disabled_reason_sign_out">De sessie is afgemeld!</string>
     <string name="shortcut_disabled_reason_room_left">De kamer is verlaten!</string>
     <string name="room_settings_mention_and_keyword_only">Alleen vermeldingen en trefwoorden</string>
@@ -1665,8 +1660,8 @@
     <string name="room_permissions_invite_users">Personen uitnodigen</string>
     <string name="room_permissions_send_messages">Berichten sturen</string>
     <string name="room_permissions_default_role">Standaardrol</string>
-    <string name="space_permissions_notice_read_only">U bent niet gemachtigd om de rollen bij te werken die nodig zijn om verschillende delen van deze space te wijzigen</string>
-    <string name="room_permissions_notice_read_only">U bent niet gemachtigd om de rollen bij te werken die nodig zijn om verschillende delen van de kamer te wijzigen</string>
+    <string name="space_permissions_notice_read_only">Je bent niet gemachtigd om de rollen bij te werken die nodig zijn om verschillende delen van deze space te wijzigen</string>
+    <string name="room_permissions_notice_read_only">Je bent niet gemachtigd om de rollen bij te werken die nodig zijn om verschillende delen van de kamer te wijzigen</string>
     <string name="space_permissions_notice">Selecteer de rollen die nodig zijn om verschillende delen van deze space te wijzigen</string>
     <string name="room_permissions_notice">Selecteer de rollen die nodig zijn om verschillende delen van de kamer te veranderen</string>
     <string name="space_settings_permissions_subtitle">Bekijk en update de rollen die nodig zijn om verschillende delen van de kamer te veranderen.</string>
@@ -1674,8 +1669,8 @@
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Kies server</string>
     <string name="action_not_now">Niet nu</string>
     <string name="action_enable">Inschakelen</string>
-    <string name="notification_listening_for_notifications">Luisteren naar notificaties</string>
-    <string name="room_error_access_unauthorized">U mag niet deelnemen aan deze kamer</string>
+    <string name="notification_listening_for_notifications">Luisteren naar meldingen</string>
+    <string name="room_error_access_unauthorized">Je mag niet toetreden tot deze kamer</string>
     <string name="dev_tools_success_state_event">Gebeurtenis status verzonden!</string>
     <string name="dev_tools_success_event">Gebeurtenis verzonden!</string>
     <string name="dev_tools_error_malformed_event">Misvormde gebeurtenis</string>
@@ -1711,7 +1706,7 @@
     <string name="a11y_import_key_from_file">Sleutel importeren uit bestand</string>
     <string name="a11y_open_widget">Widgets openen</string>
     <string name="authentication_error">Authenticatie mislukt</string>
-    <string name="re_authentication_default_confirm_text">${app_name} vereist dat u uw inloggegevens invoert om deze actie uit te voeren.</string>
+    <string name="re_authentication_default_confirm_text">${app_name} vereist dat je jouw inloggegevens invoert om deze actie uit te voeren.</string>
     <string name="re_authentication_activity_title">Opnieuw authenticatie nodig</string>
     <string name="call_slide_to_end_conference">Schuif om het gesprek te beëindigen</string>
     <string name="call_transfer_unknown_person">Onbekend persoon</string>
@@ -1742,38 +1737,38 @@
     <string name="call_tile_call_back">Terugbellen</string>
     <string name="call_tile_ended">Dit gesprek is beëindigd</string>
     <string name="call_tile_other_declined">%1$s heeft dit gesprek geweigerd</string>
-    <string name="call_tile_you_declined_this_call">U heeft deze oproep geweigerd</string>
+    <string name="call_tile_you_declined_this_call">Je hebt deze oproep geweigerd</string>
     <string name="warning_unsaved_change_discard">Veranderingen ongedaan maken</string>
     <string name="warning_unsaved_change">Er zijn niet opgeslagen wijzigingen. De wijzigingen negeren\?</string>
     <string name="warning_room_not_created_yet">De kamer is nog niet aangemaakt. Het aanmaken van een kamer annuleren\?</string>
     <string name="universal_link_malformed">De link was verkeerd ingedeeld</string>
     <string name="qr_code_not_scanned">QR-code niet gescand!</string>
     <string name="invalid_qr_code_uri">Ongeldige QR-code (ongeldige URI)!</string>
-    <string name="cannot_dm_self">U kunt uzelf niet DM\'en!</string>
+    <string name="cannot_dm_self">Je kan jezelf niet DM\'en!</string>
     <string name="share_by_text">Deel via tekst</string>
     <string name="room_error_not_found">Kan deze kamer niet vinden. Zorg ervoor dat het bestaat.</string>
-    <string name="error_opening_banned_room">U kunt geen kamer openen waar u uit bent verbannen.</string>
-    <string name="settings_security_pin_code_change_pin_summary">Wijzig uw huidige pincode</string>
+    <string name="error_opening_banned_room">Je kan geen kamer openen waar je uit bent verbannen.</string>
+    <string name="settings_security_pin_code_change_pin_summary">Wijzig je huidige pincode</string>
     <string name="settings_security_pin_code_change_pin_title">Verander pincode</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Elke keer dat u ${app_name} opent, is een pincode vereist.</string>
+    <string name="settings_security_pin_code_grace_period_summary_off">Elke keer dat je ${app_name} opent, is een pincode vereist.</string>
     <string name="settings_security_pin_code_grace_period_summary_on">Pincode is vereist na 2 minuten ${app_name} niet te hebben gebruikt.</string>
     <string name="settings_security_pin_code_grace_period_title">Pincode vereist na 2 minuten</string>
     <string name="settings_security_pin_code_notifications_summary_off">Geef alleen het aantal ongelezen berichten weer in een eenvoudige melding.</string>
-    <string name="settings_security_pin_code_notifications_summary_on">Toon details zoals kamernamen en berichtinhoud.</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Geeft details weer zoals kamernamen en berichtinhoud.</string>
     <string name="settings_security_pin_code_notifications_title">Inhoud in meldingen weergeven</string>
     <string name="settings_security_pin_code_use_biometrics_summary_off">Pincode is de enige manier om ${app_name} te ontgrendelen.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Schakel apparaatspecifieke biometrische gegevens in, zoals vingerafdrukken en gezichtsherkenning.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Biometrische gegevens inschakelen</string>
-    <string name="settings_security_pin_code_summary">Als u uw pincode opnieuw wilt instellen, tikt u op Pincode vergeten om uit te loggen en opnieuw in te stellen.</string>
+    <string name="settings_security_pin_code_summary">Als je jouw pincode opnieuw wilt instellen, tik je op Pincode vergeten om uit te loggen en opnieuw in te stellen.</string>
     <string name="settings_security_pin_code_title">Pincode inschakelen</string>
     <string name="settings_security_application_protection_screen_title">Beveiliging configureren</string>
     <string name="settings_security_application_protection_summary">Beveilig de toegang met pincode en biometrie.</string>
     <string name="settings_security_application_protection_title">Toegang beveiligen</string>
-    <string name="auth_pin_reset_content">Om uw pincode opnieuw in te stellen, moet u opnieuw inloggen en een nieuwe maken.</string>
-    <string name="auth_pin_title">Voer uw pincode in</string>
+    <string name="auth_pin_reset_content">Om je pincode opnieuw in te stellen, moet je opnieuw inloggen en een nieuwe maken.</string>
+    <string name="auth_pin_title">Voer je pincode in</string>
     <string name="create_pin_confirm_failure">Kan pincode niet valideren. Tik voor een nieuwe.</string>
     <string name="create_pin_title">Kies een pincode voor beveiliging</string>
-    <string name="too_many_pin_failures">Te veel fouten, u bent uitgelogd</string>
+    <string name="too_many_pin_failures">Te veel fouten, je bent uitgelogd</string>
     <string name="wrong_pin_message_last_remaining_attempt">Waarschuwing! Laatste resterende poging voor uitloggen!</string>
     <plurals name="entries">
         <item quantity="one">%d invoer</item>
@@ -1783,49 +1778,49 @@
         <item quantity="one">Verkeerde code, %d resterende poging</item>
         <item quantity="other">Verkeerde code, %d resterende pogingen</item>
     </plurals>
-    <string name="alert_push_are_disabled_description">Controleer uw instellingen om pushmeldingen in te schakelen</string>
+    <string name="alert_push_are_disabled_description">Controleer je instellingen om pushmeldingen in te schakelen</string>
     <string name="alert_push_are_disabled_title">Pushmeldingen zijn uitgeschakeld</string>
     <string name="failed_to_unban">Kan persoon verbanning niet opheffen</string>
     <string name="member_banned_by">Verbannen door %1$s</string>
     <string name="three_pid_revoke_invite_dialog_content">Uitnodiging voor %1$s intrekken\?</string>
     <string name="phone_book_perform_lookup">Zoeken naar contacten op Matrix</string>
-    <string name="empty_contact_book">Uw contactenboek is leeg</string>
-    <string name="loading_contact_book">Uw contacten ophalen…</string>
+    <string name="empty_contact_book">Jouw contactenboek is leeg</string>
+    <string name="loading_contact_book">Jouw contacten ophalen…</string>
     <string name="save_recovery_key_chooser_hint">Herstelsleutel opslaan in</string>
     <string name="disclaimer_positive_button">LEER MEER</string>
     <string name="disclaimer_negative_button">BEGREPEN</string>
-    <string name="disclaimer_content">We zijn verheugd om aan te kondigen dat we van naam zijn veranderd! Uw app is up-to-date en u bent ingelogd op uw account.</string>
+    <string name="disclaimer_content">We zijn verheugd om aan te kondigen dat we van naam zijn veranderd! Jouw app is up-to-date en je bent ingelogd op jouw account.</string>
     <string name="disclaimer_title">Riot is nu Element!</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Wachten op versleutelingsgeschiedenis</string>
-    <string name="crypto_error_withheld_generic">U heeft geen toegang tot dit bericht omdat de afzender de sleutels met opzet niet heeft verzonden</string>
-    <string name="crypto_error_withheld_blacklisted">U heeft geen toegang tot dit bericht omdat u bent geblokkeerd door de afzender</string>
-    <string name="crypto_error_withheld_unverified">U heeft geen toegang tot dit bericht omdat uw sessie niet wordt vertrouwd door de afzender</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Vanwege end-to-end-versleuteling moet u mogelijk wachten op het bericht van iemand omdat de versleutelingssleutels niet correct naar u zijn verzonden.</string>
+    <string name="crypto_error_withheld_generic">Je hebt geen toegang tot dit bericht omdat de afzender de sleutels met opzet niet heeft verzonden</string>
+    <string name="crypto_error_withheld_blacklisted">Je hebt geen toegang tot dit bericht omdat je bent geblokkeerd door de afzender</string>
+    <string name="crypto_error_withheld_unverified">Je hebt geen toegang tot dit bericht omdat jouw sessie niet wordt vertrouwd door de afzender</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Vanwege eind-tot-eind-versleuteling moet je mogelijk wachten op het bericht van iemand omdat de versleutelingssleutels niet correct naar jou zijn verzonden.</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Wachten op dit bericht, dit kan even duren</string>
-    <string name="notice_crypto_unable_to_decrypt_final">U heeft geen toegang tot dit bericht</string>
+    <string name="notice_crypto_unable_to_decrypt_final">Je hebt geen toegang tot dit bericht</string>
     <string name="room_settings_set_avatar">Avatar instellen</string>
     <string name="room_settings_save_success">Je hebt de kamerinstellingen met succes gewijzigd</string>
-    <string name="set_a_security_phrase_again_notice">Voer uw beveiligingszin nogmaals in om deze te bevestigen.</string>
-    <string name="set_a_security_phrase_notice">Voer een beveiligingszin in die alleen u kent en die wordt gebruikt om geheimen op uw server te beveiligen.</string>
+    <string name="set_a_security_phrase_again_notice">Voer jouw beveiligingszin nogmaals in om deze te bevestigen.</string>
+    <string name="set_a_security_phrase_notice">Voer een beveiligingszin in die alleen jij kent en die wordt gebruikt om geheimen op jouw server te beveiligen.</string>
     <string name="set_a_security_phrase_title">Stel een beveiligingszin in</string>
-    <string name="bottom_sheet_save_your_recovery_key_content">Bewaar uw beveiligingssleutel ergens veilig, zoals een wachtwoordbeheerder of een kluis.</string>
-    <string name="bottom_sheet_save_your_recovery_key_title">Bewaar uw beveiligingssleutel</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Voer een geheime zin in die alleen u kent en genereer een sleutel voor back-up.</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Bewaar jouw beveiligingssleutel ergens veilig, zoals een wachtwoordbeheerder of een kluis.</string>
+    <string name="bottom_sheet_save_your_recovery_key_title">Bewaar jouw beveiligingssleutel</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Voer een geheime zin in die alleen jij kent en genereer een sleutel voor back-up.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Gebruik een beveiligingszin</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Genereer een beveiligingssleutel om ergens veilig op te slaan, zoals een wachtwoordbeheerder of een kluis.</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Een beveiligingssleutel gebruiken</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">Bescherm uzelf tegen verlies van toegang tot versleutelde berichten en gegevens door een back-up te maken van versleutelingssleutels op uw server.</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Bescherm jezelf tegen verlies van toegang tot versleutelde berichten en gegevens door een back-up te maken van versleutelingssleutels op je server.</string>
     <string name="a11y_start_camera">Start de camera</string>
     <string name="a11y_stop_camera">Stop de camera</string>
     <string name="a11y_unmute_microphone">Dempen van de microfoon opheffen</string>
     <string name="a11y_mute_microphone">De microfoon dempen</string>
     <string name="identity_server_set_alternative_notice_no_default">Voer de URL van een identiteitsserver in</string>
-    <string name="identity_server_set_alternative_notice">U kunt ook een andere identiteitsserver URL invoeren</string>
-    <string name="identity_server_set_default_notice">Uw server (%1$s) stelt voor om %2$s te gebruiken voor uw identiteitsserver</string>
+    <string name="identity_server_set_alternative_notice">Je kan ook een andere identiteitsserver URL invoeren</string>
+    <string name="identity_server_set_default_notice">Je server (%1$s) stelt voor om %2$s te gebruiken voor jouw identiteitsserver</string>
     <string name="identity_server_user_consent_not_provided">De toestemming van de persoon is niet gegeven.</string>
     <string name="identity_server_error_no_current_binding_error">Er is geen huidige associatie met dit id.</string>
     <string name="identity_server_error_binding_error">De associatie heeft gefaald.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Voor uw privacy ondersteunt ${app_name} alleen het versturen van gehashte e-mailadressen en telefoonnummers van personen.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Voor je privacy ondersteunt ${app_name} alleen het versturen van gehashte e-mailadressen en telefoonnummers van personen.</string>
     <string name="identity_server_error_terms_not_signed">Accepteer eerst de voorwaarden van de identiteitsserver in de instellingen.</string>
     <string name="identity_server_error_no_identity_server_configured">Configureer eerst een identiteitsserver.</string>
     <string name="identity_server_error_outdated_home_server">Deze operatie is niet mogelijk. De server is verouderd.</string>
@@ -1834,11 +1829,11 @@
     <string name="open_terms_of">Open voorwaarden van %s</string>
     <string name="choose_locale_loading_locales">Beschikbare talen laden…</string>
     <string name="choose_locale_other_locales_title">Andere beschikbare talen</string>
-    <string name="user_code_info_text">Deel deze code met mensen zodat ze deze kunnen scannen om u toe te voegen en te beginnen met chatten.</string>
+    <string name="user_code_info_text">Deel deze code met mensen zodat ze deze kunnen scannen om je toe te voegen en te beginnen met chatten.</string>
     <string name="user_code_my_code">Mijn code</string>
-    <string name="user_code_share">Deel mijn code</string>
-    <string name="user_code_scan">Scan een QR-code</string>
-    <string name="invite_users_to_room_failure">We kunnen geen personen uitnodigen. Controleer de personen die u wilt uitnodigen en probeer het opnieuw.</string>
+    <string name="user_code_share">Mijn code delen</string>
+    <string name="user_code_scan">Een QR-code scannen</string>
+    <string name="invite_users_to_room_failure">We kunnen geen personen uitnodigen. Controleer de personen die je wil uitnodigen en probeer het opnieuw.</string>
     <plurals name="invitations_sent_to_one_and_more_users">
         <item quantity="one">Uitnodigingen verzonden naar %1$s en nog één</item>
         <item quantity="other">Uitnodigingen verzonden naar %1$s en %2$d meer</item>
@@ -1848,21 +1843,21 @@
     <string name="invitation_sent_to_one_user">Uitnodiging verzonden naar %1$s</string>
     <string name="invite_friends_rich_title">🔐️ Doe mee met ${app_name}</string>
     <string name="invite_friends_text">Hé, praat met me op ${app_name}: %s</string>
-    <string name="invite_friends">Nodig vrienden uit</string>
+    <string name="invite_friends">Vrienden uitnodigen</string>
     <string name="add_people">Mensen toevoegen</string>
-    <string name="create_room_dm_failure">We kunnen je DM niet maken. Controleer de personen die u wilt uitnodigen en probeer het opnieuw.</string>
-    <string name="external_link_confirmation_message">De link %1$s brengt u naar een andere site: %2$s.
+    <string name="create_room_dm_failure">We kunnen je DM niet maken. Controleer de personen die je wilt uitnodigen en probeer het opnieuw.</string>
+    <string name="external_link_confirmation_message">De link %1$s brengt je naar een andere site: %2$s.
 \n
-\nWeet u zeker dat u door wilt gaan\?</string>
+\nWeet je zeker dat je door wilt gaan\?</string>
     <string name="external_link_confirmation_title">Dubbelcheck deze link</string>
     <string name="error_empty_field_choose_password">Kies een wachtwoord.</string>
     <string name="error_empty_field_choose_user_name">Kies een inlognaam.</string>
     <string name="failed_to_initialize_cross_signing">Kan kruislingsondertekenen niet instellen</string>
-    <string name="confirm_your_identity_quad_s">Bevestig uw identiteit door deze login te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
-    <string name="confirm_your_identity">Bevestig uw identiteit door deze login van een van uw andere sessies te verifiëren en toegang te verlenen tot versleutelde berichten.</string>
+    <string name="confirm_your_identity_quad_s">Bevestig je identiteit door deze login te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
+    <string name="confirm_your_identity">Bevestig je identiteit door deze login van een van uw andere sessies te verifiëren en toegang te verlenen tot versleutelde berichten.</string>
     <string name="cross_signing_verify_by_emoji">Interactief verifiëren door Emoji</string>
     <string name="cross_signing_verify_by_text">Handmatig verifiëren via tekst</string>
-    <string name="verify_this_session">Verifieer de nieuwe login voor toegang tot uw account: %1$s</string>
+    <string name="verify_this_session">Verifieer de nieuwe login voor toegang tot je account: %1$s</string>
     <string name="verify_other_sessions">Verifieer al je sessies om ervoor te zorgen dat je account en berichten veilig zijn</string>
     <string name="review_logins">Bekijk waar je bent ingelogd</string>
     <string name="encrypted_unverified">Versleuteld door een niet-geverifieerd apparaat</string>
@@ -1871,34 +1866,34 @@
     <string name="command_snow">Stuurt het gegeven bericht met sneeuwval</string>
     <string name="command_confetti">Stuurt het gegeven bericht met confetti</string>
     <plurals name="secure_backup_reset_devices_you_can_verify">
-        <item quantity="one">Laat het apparaat zien waarmee u nu kunt verifiëren</item>
-        <item quantity="other">%d apparaten weergeven waarmee u nu kunt verifiëren</item>
+        <item quantity="one">Laat het apparaat zien waarmee je nu kan verifiëren</item>
+        <item quantity="other">%d apparaten weergeven waarmee je nu kan verifiëren</item>
     </plurals>
-    <string name="secure_backup_reset_no_history">U start opnieuw op zonder geschiedenis, geen berichten, vertrouwde apparaten of vertrouwde personen</string>
+    <string name="secure_backup_reset_no_history">Je start opnieuw op zonder geschiedenis, geen berichten, vertrouwde apparaten of vertrouwde personen</string>
     <string name="secure_backup_reset_if_you_reset_all">Als je alles reset</string>
-    <string name="secure_backup_reset_all_no_other_devices">Doe dit alleen als u geen ander apparaat heeft waarmee u dit apparaat kunt verifiëren.</string>
+    <string name="secure_backup_reset_all_no_other_devices">Doe dit alleen als je geen ander apparaat hebt waarmee je dit apparaat kunt verifiëren.</string>
     <string name="bad_passphrase_key_reset_all_action">Alle herstelopties vergeten of verloren\? Alles resetten</string>
     <string name="failed_to_access_secure_storage">Kan geen toegang krijgen tot beveiligde opslag</string>
-    <string name="enter_secret_storage_input_key">Selecteer uw herstelsleutel of voer deze handmatig in door deze te typen of te plakken vanaf uw klembord</string>
+    <string name="enter_secret_storage_input_key">Selecteer je herstelsleutel of voer deze handmatig in door deze te typen of te plakken vanaf je klembord</string>
     <string name="use_recovery_key">Herstelsleutel gebruiken</string>
-    <string name="enter_secret_storage_passphrase_or_key">Gebruik uw %1$s of gebruik uw %2$s om door te gaan.</string>
+    <string name="enter_secret_storage_passphrase_or_key">Gebruik je %1$s of gebruik je %2$s om door te gaan.</string>
     <string name="command_description_discard_session_not_handled">Alleen ondersteund in versleutelde kamers</string>
     <string name="command_description_discard_session">Dwingt dat de huidige uitgaande groepssessie in een versleutelde kamer wordt weggegooid</string>
-    <string name="use_latest_app">Gebruik de nieuwste ${app_name} op uw andere apparaten:</string>
+    <string name="use_latest_app">Gebruik de nieuwste ${app_name} op je andere apparaten:</string>
     <string name="or_other_mx_capable_client">of een andere Matrix client die kruislingsondetekenen ondersteunt</string>
     <string name="app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
     <string name="app_desktop_web">${app_name} Web
 \n${app_name} Desktop</string>
-    <string name="use_other_session_content_description">Gebruik de nieuwste ${app_name} op uw andere apparaten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} voor Android of een andere Matrix-client die geschikt is voor kruislingsondertekenen</string>
+    <string name="use_other_session_content_description">Gebruik de nieuwste ${app_name} op je andere apparaten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} voor Android of een andere Matrix-client die geschikt is voor kruislings ondertekenen</string>
     <string name="change_password_summary">Stel een nieuw accountwachtwoord in…</string>
     <string name="error_saving_media_file">Kan mediabestand niet opslaan</string>
-    <string name="settings_security_prevent_screenshots_summary">Als u deze instelling inschakelt, wordt de FLAG_SECURE aan alle activiteiten toegevoegd. Start de toepassing opnieuw om de wijziging door te voeren.</string>
+    <string name="settings_security_prevent_screenshots_summary">Als je deze instelling inschakelt, wordt de FLAG_SECURE aan alle activiteiten toegevoegd. Start de applicatie opnieuw om de wijziging door te voeren.</string>
     <string name="settings_security_prevent_screenshots_title">Voorkom screenshots van de applicatie</string>
     <string name="bootstrap_migration_backup_recovery_key">Sleutel Back-up herstelsleutel</string>
-    <string name="bootstrap_migration_with_passphrase_helper_with_link">Weet u uw Key Back-up wachtwoordzin niet, u kunt %s.</string>
-    <string name="bootstrap_migration_use_recovery_key">gebruik uw Backup-herstelsleutel</string>
-    <string name="bootstrap_migration_enter_backup_password">Voer uw Sleutel Back-up wachtwoordzin in om door te gaan.</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Weet je jouw Key Back-up wachtwoordzin niet, je kan %s.</string>
+    <string name="bootstrap_migration_use_recovery_key">gebruik je Backup-herstelsleutel</string>
+    <string name="bootstrap_migration_enter_backup_password">Voer je Sleutel Back-up wachtwoordzin in om door te gaan.</string>
     <string name="bootstrap_progress_storing_in_sss">Sleutelback-up geheim opslaan in SSSS</string>
     <string name="bootstrap_progress_generating_ssss_recovery">SSSS sleutel genereren uit herstelsleutel</string>
     <string name="bootstrap_progress_generating_ssss_with_info">SSSS sleutel genereren op basis van wachtwoordzin (%s)</string>
@@ -1908,8 +1903,8 @@
     <string name="bootstrap_progress_checking_backup">Back-upsleutel controleren</string>
     <string name="recovery_key_empty_error_message">Voer een herstelsleutel in</string>
     <string name="bootstrap_invalid_recovery_key">Het is geen geldige herstelsleutel</string>
-    <string name="bootstrap_enter_recovery">Voer uw %s in om door te gaan</string>
-    <string name="security_prompt_text">Verifieer uzelf en anderen om uw chats veilig te houden</string>
+    <string name="bootstrap_enter_recovery">Voer je %s in om door te gaan</string>
+    <string name="security_prompt_text">Verifieer jezelf en anderen om jouw chats veilig te houden</string>
     <string name="upgrade_security">Encryptie upgrade beschikbaar</string>
     <string name="auth_invalid_login_deactivated_account">Dit account is gedeactiveerd.</string>
     <string name="auth_invalid_login_param_space_in_password">Onjuiste inlognaam en/of wachtwoord. Het ingevoerde wachtwoord begint of eindigt met spaties, controleer dit alstublieft.</string>
@@ -1917,27 +1912,27 @@
     <string name="error_failed_to_import_keys">Kan sleutels niet importeren</string>
     <string name="qr_code_scanned_verif_waiting">Wachten op %s…</string>
     <string name="qr_code_scanned_verif_waiting_notice">Bijna daar! Op bevestiging wachten…</string>
-    <string name="qr_code_scanned_self_verif_notice">Bijna daar! Toont het andere apparaat een vinkje\?</string>
+    <string name="qr_code_scanned_self_verif_notice">Bijna klaar! Toont het andere apparaat een vinkje\?</string>
     <string name="add_a_topic_link_text">Een onderwerp toevoegen</string>
     <string name="room_created_summary_no_topic_creation_text">%s om mensen te laten weten waar deze kamer over gaat.</string>
-    <string name="this_is_the_beginning_of_dm">Dit is het begin van uw privéberichtgeschiedenis met %s.</string>
+    <string name="this_is_the_beginning_of_dm">Dit is het begin van jouw privéberichtgeschiedenis met %s.</string>
     <string name="this_is_the_beginning_of_room_no_name">Dit is het begin van dit gesprek.</string>
     <string name="this_is_the_beginning_of_room">Dit is het begin van %s.</string>
-    <string name="room_created_summary_item_by_you">U hebt de kamer gemaakt en geconfigureerd.</string>
+    <string name="room_created_summary_item_by_you">Je hebt de kamer gemaakt en geconfigureerd.</string>
     <string name="room_created_summary_item">%s heeft de kamer gemaakt en geconfigureerd.</string>
     <string name="encryption_unknown_algorithm_tile_description">De versleuteling die door deze kamer wordt gebruikt, wordt niet ondersteund</string>
     <string name="encryption_not_enabled">Versleuteling niet ingeschakeld</string>
-    <string name="direct_room_encryption_enabled_tile_description">Berichten in deze chat zijn end-to-end-versleuteld.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Berichten in deze chat zijn eind-tot-eind-versleuteld.</string>
     <string name="encryption_enabled_tile_description">Berichten in deze kamer zijn eind-tot-eind-versleuteld. Lees meer en verifieer persoon in hun profiel.</string>
-    <string name="bootstrap_cancel_text">Als u nu annuleert, kunt u versleutelde berichten en gegevens kwijtraken als u de toegang tot uw aanmeldingen verliest.
+    <string name="bootstrap_cancel_text">Als je nu annuleert, kan je versleutelde berichten en gegevens kwijtraken als je de toegang tot uw aanmeldingen verliest.
 \n
-\nU kunt ook Veilige back-up instellen en uw sleutels beheren in Instellingen.</string>
-    <string name="bootstrap_crosssigning_save_cloud">Kopieer het naar uw persoonlijke cloudopslag</string>
+\nJe kan ook Veilige back-up instellen en uw sleutels beheren in Instellingen.</string>
+    <string name="bootstrap_crosssigning_save_cloud">Kopieer het naar je persoonlijke cloudopslag</string>
     <string name="bootstrap_crosssigning_save_usb">Bewaar het op een USB-stick of back-upstation</string>
     <string name="bootstrap_crosssigning_print_it">Print het uit en bewaar het ergens veilig</string>
-    <string name="bootstrap_cross_signing_success">Uw %2$s en %1$s zijn nu ingesteld.
+    <string name="bootstrap_cross_signing_success">Jouw %2$s en %1$s zijn nu ingesteld.
 \n
-\nHoud ze veilig! U heeft ze nodig om versleutelde berichten te ontgrendelen en informatie te beveiligen als u al uw actieve sessies verliest.</string>
+\nHoud ze veilig! Je hebt ze nodig om versleutelde berichten te ontgrendelen en informatie te beveiligen als je al jouw actieve sessies verliest.</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Sleutelback-up instellen</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Zelfondertekenende sleutel synchroniseren</string>
     <string name="bootstrap_crosssigning_progress_save_usk">Persoonssleutel synchroniseren</string>
@@ -1948,25 +1943,25 @@
     <string name="keep_it_safe">Hou het veilig</string>
     <string name="bootstrap_loading_title">Herstel instellen.</string>
     <string name="bootstrap_loading_text">Dit kan enkele seconden duren, even geduld a.u.b.</string>
-    <string name="bootstrap_info_text_2">Voer een beveiligingszin in die alleen u kent en die wordt gebruikt om geheimen op uw server te beveiligen.</string>
-    <string name="bootstrap_dont_reuse_pwd">Gebruik niet uw accountwachtwoord.</string>
-    <string name="enter_account_password">Voer uw %s in om door te gaan.</string>
-    <string name="verify_cancelled_notice">Verificatie is geannuleerd. U kunt de verificatie opnieuw starten.</string>
+    <string name="bootstrap_info_text_2">Voer een beveiligingszin in die alleen jij kent en die wordt gebruikt om geheimen op jouw server te beveiligen.</string>
+    <string name="bootstrap_dont_reuse_pwd">Gebruik niet je accountwachtwoord.</string>
+    <string name="enter_account_password">Voer je %s in om door te gaan.</string>
+    <string name="verify_cancelled_notice">Verificatie is geannuleerd. Je kan de verificatie opnieuw starten.</string>
     <string name="verify_not_me_self_verification">Een van de volgende zaken kan worden aangetast:
 \n
-\n- Uw wachtwoord
-\n- Uw server
+\n- Jouw wachtwoord
+\n- Jouw server
 \n- Dit apparaat, of het andere apparaat
 \n- De internetverbinding die elk apparaat gebruikt
 \n
-\nWe raden u aan uw wachtwoord en herstelsleutel onmiddellijk in Instellingen te wijzigen.</string>
-    <string name="verify_cancel_other">U verifieert %1$s (%2$s) niet als u nu annuleert. Begin opnieuw in hun profiel.</string>
-    <string name="verify_cancel_self_verification_from_untrusted">Als u annuleert, kunt u geen versleutelde berichten op dit apparaat lezen en zullen andere personen het niet vertrouwen</string>
-    <string name="verify_cancel_self_verification_from_trusted">Als u annuleert, kunt u geen versleutelde berichten lezen op je nieuwe apparaat en zullen andere personen het niet vertrouwen</string>
-    <string name="verify_new_session_compromized">Uw account is mogelijk gecompromitteerd</string>
+\nWe raden je aan jouw wachtwoord en herstelsleutel onmiddellijk in Instellingen te wijzigen.</string>
+    <string name="verify_cancel_other">Je verifieert %1$s (%2$s) niet als je nu annuleert. Begin opnieuw in hun profiel.</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Als je annuleert, kan je geen versleutelde berichten op dit apparaat lezen en zullen andere personen het niet vertrouwen</string>
+    <string name="verify_cancel_self_verification_from_trusted">Als je annuleert, kan je geen versleutelde berichten lezen op je nieuwe apparaat en zullen andere personen het niet vertrouwen</string>
+    <string name="verify_new_session_compromized">Jouw account is mogelijk gecompromitteerd</string>
     <string name="verify_new_session_was_not_me">Dit was ik niet</string>
-    <string name="verify_new_session_notice">Gebruik deze sessie om uw nieuwe te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
-    <string name="new_session">Nieuwe login. Was u dit\?</string>
+    <string name="verify_new_session_notice">Gebruik deze sessie om je nieuwe te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
+    <string name="new_session">Nieuwe login. Was jij dit\?</string>
     <string name="e2e_use_keybackup">Ontgrendel de geschiedenis van versleutelde berichten</string>
     <string name="settings_export_trail">Exportcontrole</string>
     <string name="login_default_session_public_name">${app_name} Android</string>
@@ -1975,7 +1970,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Gebeurtenis verwijderd door persoon, reden: %1$s</string>
     <string name="delete_event_dialog_reason_hint">Reden voor redigeren</string>
     <string name="delete_event_dialog_reason_checkbox">Geef een reden op</string>
-    <string name="delete_event_dialog_content">Weet u zeker dat u deze gebeurtenis wilt verwijderen (wissen)\? Houd er rekening mee dat als u een kamer naam of onderwerpwijziging verwijdert, de wijziging ongedaan kan worden gemaakt.</string>
+    <string name="delete_event_dialog_content">Weet je zeker dat je deze gebeurtenis wil verwijderen (wissen)\? Houd er rekening mee dat als je een kamer naam of onderwerpwijziging verwijdert, de wijziging ongedaan kan worden gemaakt.</string>
     <string name="send_images_and_video_with_original_size">Media versturen in het originele formaat</string>
     <plurals name="send_videos_with_original_size">
         <item quantity="one">Stuur video in het originele formaat</item>
@@ -1985,7 +1980,7 @@
         <item quantity="one">Stuur afbeelding in het originele formaat</item>
         <item quantity="other">Stuur afbeeldingen in het originele formaat</item>
     </plurals>
-    <string name="share_confirm_room">Wilt u deze bijlage naar %1$s sturen\?</string>
+    <string name="share_confirm_room">Wil je deze bijlage naar %1$s sturen\?</string>
     <string name="enter_secret_storage_invalid">Kan geen geheimen vinden in opslag</string>
     <string name="verification_use_passphrase">Als je geen toegang hebt tot een bestaande sessie</string>
     <string name="verification_cannot_access_other_session">Een herstelwachtwoordzin of -sleutel gebruiken</string>
@@ -1994,9 +1989,9 @@
 \nWees voorzichtig, het kan leiden tot onverwacht gedrag.</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Vliegtuigmodus is ingeschakeld</string>
     <string name="no_connectivity_to_the_server_indicator">Verbinding met de server is verbroken</string>
-    <string name="qr_code_scanned_by_other_notice">Bijna daar! Toont %s een vinkje\?</string>
-    <string name="verification_profile_device_untrust_info">Totdat deze persoon deze sessie vertrouwt, worden berichten die van en naar de sessie worden verzonden, gelabeld met waarschuwingen. U kunt het ook handmatig verifiëren.</string>
-    <string name="verification_profile_device_new_signing">%1$s (%2$s) aangemeld met een nieuwe sessie:</string>
+    <string name="qr_code_scanned_by_other_notice">Bijna klaar! Toont %s een vinkje\?</string>
+    <string name="verification_profile_device_untrust_info">Totdat deze persoon deze sessie vertrouwt, worden berichten die van en naar deze sessie worden verzonden, gelabeld met waarschuwingen. Je kan het ook handmatig verifiëren.</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) is aangemeld met een nieuwe sessie:</string>
     <string name="verification_profile_device_verified_because">Deze sessie wordt vertrouwd voor veilig berichtenverkeer omdat %1$s (%2$s) deze heeft geverifieerd:</string>
     <string name="room_member_profile_failed_to_get_devices">Kan geen sessies ophalen</string>
     <string name="verification_open_other_to_verify">Gebruik een bestaande sessie om deze te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
@@ -2005,39 +2000,39 @@
         <item quantity="one">%d actieve sessie</item>
         <item quantity="other">%d actieve sessies</item>
     </plurals>
-    <string name="settings_active_sessions_unverified_device_desc">Verifieer deze sessie om hem als vertrouwd te markeren en verleen hem toegang tot versleutelde berichten. Als u zich niet bij deze sessie hebt aangemeld, is uw account mogelijk gehackt:</string>
-    <string name="settings_active_sessions_verified_device_desc">Deze sessie wordt vertrouwd voor veilige berichten omdat u deze heeft geverifieerd:</string>
+    <string name="settings_active_sessions_unverified_device_desc">Verifieer deze sessie om als vertrouwd te markeren en toegang te verlenen tot versleutelde berichten. Als jij je niet bij deze sessie hebt aangemeld, is jouw account mogelijk gehackt:</string>
+    <string name="settings_active_sessions_verified_device_desc">Deze sessie wordt vertrouwd voor veilige berichten omdat je deze hebt geverifieerd:</string>
     <string name="settings_failed_to_get_crypto_device_info">Geen cryptografische informatie beschikbaar</string>
     <string name="settings_server_default_room_version">Standaardversie</string>
     <string name="settings_server_room_versions">Kamerversies 👓</string>
     <string name="settings_server_upload_size_unknown">De limiet is onbekend.</string>
-    <string name="settings_server_upload_size_content">Uw server accepteert bijlagen (bestanden, media, enz.) met een grootte tot %s.</string>
+    <string name="settings_server_upload_size_content">Jouw server accepteert bijlagen (bestanden, media, enz.) met een grootte tot %s.</string>
     <string name="settings_server_upload_size_title">Server limiet voor het uploaden van bestanden</string>
     <string name="settings_server_version">Serverversie</string>
     <string name="settings_server_name">Server naam</string>
     <string name="settings_active_sessions_signout_device">Afmelden voor deze sessie</string>
-    <string name="settings_active_sessions_show_all">Toon alle sessies</string>
-    <string name="settings_hs_admin_e2e_disabled">Uw serverbeheerder heeft standaard end-to-end versleuteling uitgeschakeld in privékamers en privéberichten.</string>
+    <string name="settings_active_sessions_show_all">Alle sessies tonen</string>
+    <string name="settings_hs_admin_e2e_disabled">Jouw serverbeheerder heeft standaard eind-tot-eind versleuteling uitgeschakeld in privékamers en privéberichten.</string>
     <string name="encryption_information_dg_xsigning_disabled">Kruisondertekenen is niet ingeschakeld</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">Kruisondertekenen is ingeschakeld.
+    <string name="encryption_information_dg_xsigning_not_trusted">Kruislings ondertekenen is ingeschakeld.
 \nSleutels worden niet vertrouwd</string>
-    <string name="encryption_information_dg_xsigning_trusted">Kruisondertekenen is ingeschakeld
+    <string name="encryption_information_dg_xsigning_trusted">Kruislings ondertekenen is ingeschakeld
 \nSleutels zijn vertrouwd.
 \nPrivésleutels zijn niet bekend</string>
     <string name="encryption_information_dg_xsigning_complete">Kruisondertekening is ingeschakeld
 \nPrivésleutels op het apparaat.</string>
-    <string name="verification_conclusion_ok_self_notice">Uw nieuwe sessie is nu geverifieerd. Het heeft toegang tot uw gecodeerde berichten en andere personen zullen het als vertrouwd zien.</string>
-    <string name="verification_conclusion_ok_notice">Berichten met deze persoon zijn end-to-end-versleuteld en kunnen niet door derden worden gelezen.</string>
+    <string name="verification_conclusion_ok_self_notice">Jouw nieuwe sessie is nu geverifieerd. Het heeft toegang tot jouw gecodeerde berichten en andere personen zullen het als vertrouwd zien.</string>
+    <string name="verification_conclusion_ok_notice">Berichten met deze persoon zijn eind-tot-eind-versleuteld en kunnen niet door derden worden gelezen.</string>
     <string name="verification_code_notice">Vergelijk de code met die op het scherm van de andere persoon.</string>
     <string name="verification_emoji_notice">Vergelijk de unieke emoji en zorg ervoor dat ze in dezelfde volgorde verschijnen.</string>
     <string name="verification_request_start_notice">Doe dit voor de zekerheid persoonlijk of gebruik een andere manier om te communiceren.</string>
-    <string name="verification_request_notice">Om veilig te zijn, verifieert u %s door een eenmalige code te controleren.</string>
+    <string name="verification_request_notice">Om veilig te zijn, verifieer je %s door een eenmalige code te controleren.</string>
     <string name="room_settings_enable_encryption_dialog_content">Eenmaal ingeschakeld, kan versleuteling voor een kamer niet worden uitgeschakeld. Berichten die in een versleutelde kamer worden verzonden, kunnen niet door de server worden gezien, alleen door de deelnemers van de kamer. Het inschakelen van versleuteling kan voorkomen dat veel bots en koppelingen correct werken.</string>
-    <string name="room_settings_enable_encryption_no_permission">U bent niet gemachtigd om versleuteling in deze kamer in te schakelen.</string>
-    <string name="room_settings_enable_encryption">End-to-end-versleuteling inschakelen…</string>
+    <string name="room_settings_enable_encryption_no_permission">Je bent niet gemachtigd om versleuteling in deze kamer in te schakelen.</string>
+    <string name="room_settings_enable_encryption">Eind-tot-eind-versleuteling inschakelen…</string>
     <string name="command_description_rainbow_emote">Verzendt de gegeven emote gekleurd als een regenboog</string>
     <string name="command_description_rainbow">Stuurt het gegeven bericht gekleurd als een regenboog</string>
-    <string name="verify_cannot_cross_sign">Deze sessie kan deze verificatie niet delen met uw andere sessies.
+    <string name="verify_cannot_cross_sign">Deze sessie kan deze verificatie niet delen met jouw andere sessies.
 \nDe verificatie wordt lokaal opgeslagen en gedeeld in een toekomstige versie van de app.</string>
     <string name="rendering_event_error_exception">${app_name} heeft een probleem ondervonden bij het weergeven van de inhoud van het gebeurtenis met id \'%1$s\'</string>
     <string name="rendering_event_error_type_of_event_not_handled">${app_name} verwerkt geen gebeurtenissen van het type \'%1$s\'</string>
@@ -2048,134 +2043,134 @@
     <string name="room_member_power_level_moderator_in">Moderator in %1$s</string>
     <string name="room_member_power_level_admin_in">Beheerder in %1$s</string>
     <string name="room_profile_leaving_room">De kamer verlaten…</string>
-    <string name="direct_room_profile_encrypted_subtitle">Berichten hier zijn end-to-end-versleuteld.
+    <string name="direct_room_profile_encrypted_subtitle">Berichten hier zijn eind-tot-eind-versleuteld.
 \n
-\nUw berichten zijn beveiligd met sloten en alleen u en de ontvanger hebben de unieke sleutels om ze te ontgrendelen.</string>
-    <string name="room_profile_encrypted_subtitle">Berichten in deze kamer zijn end-to-end-versleuteld.
+\nJouw berichten zijn beveiligd met sloten en alleen jij en de ontvanger hebben de unieke sleutels om ze te ontgrendelen.</string>
+    <string name="room_profile_encrypted_subtitle">Berichten in deze kamer zijn eind-tot-eind-versleuteld.
 \n
-\nUw berichten zijn beveiligd met sloten en alleen u en de ontvanger hebben de unieke sleutels om ze te ontgrendelen.</string>
-    <string name="direct_room_profile_not_encrypted_subtitle">Berichten hier zijn niet end-to-end-versleuteld.</string>
-    <string name="room_profile_not_encrypted_subtitle">Berichten in deze kamer zijn niet end-to-end-versleuteld.</string>
+\nJouw berichten zijn beveiligd met sloten en alleen jij en de ontvanger hebben de unieke sleutels om ze te ontgrendelen.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Berichten hier zijn niet eind-tot-eind-versleuteld.</string>
+    <string name="room_profile_not_encrypted_subtitle">Berichten in deze kamer zijn niet eind-tot-eind-versleuteld.</string>
     <string name="verification_request_waiting_for">Wachten op %s…</string>
     <string name="verification_no_scan_emoji_title">Verifieer door emoji\'s te vergelijken</string>
     <string name="verification_scan_self_emoji_subtitle">Verifieer door emoji te vergelijken</string>
-    <string name="verification_scan_emoji_subtitle">Als u niet persoonlijk aanwezig bent, vergelijk dan emoji\'s</string>
+    <string name="verification_scan_emoji_subtitle">Als je niet persoonlijk aanwezig bent, vergelijk dan emoji\'s</string>
     <string name="verification_scan_with_this_device">Scannen met dit apparaat</string>
     <string name="verification_scan_their_code">Scan hun code</string>
-    <string name="verification_scan_self_notice">Scan de code met uw ander apparaat of wissel en scan met dit apparaat</string>
+    <string name="verification_scan_self_notice">Scan de code met je andere apparaat of wissel en scan met dit apparaat</string>
     <string name="verification_scan_notice">Scan de code met het apparaat van de andere persoon om elkaar veilig te verifiëren</string>
     <string name="verification_verify_device">Deze sessie verifiëren</string>
     <string name="sent_a_reaction">Gereageerd met: %s</string>
-    <string name="verification_conclusion_compromised">"Een van de volgende zaken kan worden aangetast:
+    <string name="verification_conclusion_compromised">Een van de volgende zaken kan worden aangetast:
 \n
-\n  - Uw server
-\n  - De server waarmee de gebruiker die u verifieert is verbonden
-\n  - De internetverbinding van u of de andere personen
-\n  - Het apparaat van u of van andere personen"</string>
+\n - Jouw server
+\n - De server waarmee de gebruiker die je verifieert is verbonden
+\n - De internetverbinding van jou of de andere personen
+\n - Het apparaat van jou of van andere personen</string>
     <string name="verification_sas_do_not_match">Ze komen niet overeen</string>
     <string name="verification_conclusion_warning">Niet-vertrouwd inloggen</string>
-    <string name="login_error_threepid_denied">Uw e-maildomein is niet geautoriseerd om op deze server te registreren</string>
-    <string name="create_space_in_progress">Space aanmaken…</string>
+    <string name="login_error_threepid_denied">Jouw e-maildomein is niet geautoriseerd om op deze server te registreren</string>
+    <string name="create_space_in_progress">Ruimte aanmaken…</string>
     <string name="create_room_in_progress">Kamer aanmaken…</string>
     <string name="create_room_alias_invalid">Sommige tekens zijn niet toegestaan</string>
     <string name="create_room_alias_empty">Geef een kameradres op</string>
     <string name="create_room_alias_already_in_use">Dit adres is al in gebruik</string>
-    <string name="create_space_alias_hint">Space adres</string>
-    <string name="create_room_disable_federation_description">U kunt dit inschakelen als de kamer alleen wordt gebruikt voor samenwerking met interne teams op uw server. Dit kan later niet meer worden gewijzigd.</string>
+    <string name="create_space_alias_hint">Ruimte-adres</string>
+    <string name="create_room_disable_federation_description">Je kan dit inschakelen als de kamer alleen wordt gebruikt voor samenwerking met interne teams op jouw server. Dit kan later niet meer worden gewijzigd.</string>
     <string name="create_room_disable_federation_title">Blokkeer iedereen die geen deel uitmaakt van %s om ooit deel te nemen aan deze kamer</string>
     <string name="hide_advanced">Verberg geavanceerd</string>
-    <string name="show_advanced">Toon geavanceerd</string>
+    <string name="show_advanced">Geavanceerd weergeven</string>
     <string name="create_room_encryption_description">Eenmaal ingeschakeld, kan versleuteling niet worden uitgeschakeld.</string>
     <string name="command_description_lenny">Voegt ( ͡° ͜ʖ ͡°) toe aan een bericht in platte tekst</string>
     <string name="command_description_shrug">Voegt ¯\\_(ツ)_/¯ toe aan een bericht in platte tekst</string>
-    <string name="settings_developer_mode_show_info_on_screen_summary">Toon wat nuttige informatie om te helpen bij het debuggen van de applicatie</string>
-    <string name="settings_developer_mode_show_info_on_screen_title">Toon debug-informatie op het scherm</string>
+    <string name="settings_developer_mode_show_info_on_screen_summary">Geeft wat nuttige informatie weer om te helpen bij foutopsporing van de app.</string>
+    <string name="settings_developer_mode_show_info_on_screen_title">Foutopsporingsinformatie op het scherm weergeven</string>
     <string name="settings_developer_mode_fail_fast_summary">${app_name} kan vaker crashen als er een onverwachte fout optreedt</string>
     <string name="autocomplete_limited_results">Laat alleen de eerste resultaten zien, typ meer letters…</string>
     <string name="settings_rageshake_detection_threshold_summary">Schud je telefoon om de detectiedrempel te testen</string>
     <string name="settings_developer_mode_summary">De ontwikkelaarsmodus activeert verborgen functies en kan de applicatie ook minder stabiel maken. Alleen voor ontwikkelaars!</string>
     <string name="bug_report_error_too_short">De beschrijving is te kort</string>
-    <string name="permalink_malformed">Uw matrix.to link is onjuist opgemaakt</string>
-    <string name="soft_logout_sso_not_same_user_error">De huidige sessie is voor gebruiker %1$s en u geeft inloggegevens op voor persoon %2$s. Dit wordt niet ondersteund door ${app_name}.
-\nWis eerst de gegevens en meld u vervolgens opnieuw aan met een ander account.</string>
-    <string name="soft_logout_clear_data_dialog_e2e_warning_content">U raakt de toegang tot beveiligde berichten kwijt, tenzij u zich aanmeldt om uw versleutelingssleutels te herstellen.</string>
+    <string name="permalink_malformed">Jouw matrix.to link is onjuist opgemaakt</string>
+    <string name="soft_logout_sso_not_same_user_error">De huidige sessie is voor gebruiker %1$s en je geeft inloggegevens op voor persoon %2$s. Dit wordt niet ondersteund door ${app_name}.
+\nWis eerst de gegevens en meld je vervolgens opnieuw aan met een ander account.</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Je raakt de toegang tot beveiligde berichten kwijt, tenzij je jezelf aanmeldt om jouw versleutelingssleutels te herstellen.</string>
     <string name="soft_logout_clear_data_dialog_content">Alle gegevens wissen die momenteel op dit apparaat zijn opgeslagen\?
-\nMeld u opnieuw aan om toegang te krijgen tot uw accountgegevens en berichten.</string>
+\nMeld je opnieuw aan om toegang te krijgen tot je accountgegevens en berichten.</string>
     <string name="soft_logout_clear_data_submit">Alle gegevens wissen</string>
-    <string name="soft_logout_clear_data_notice">Waarschuwing: uw persoonlijke gegevens (inclusief versleutelingssleutels) zijn nog steeds opgeslagen op dit apparaat.
+    <string name="soft_logout_clear_data_notice">Waarschuwing: jouw persoonlijke gegevens (inclusief versleutelingssleutels) zijn nog steeds opgeslagen op dit apparaat.
 \n
-\nWis het als u klaar bent met het gebruik van dit apparaat of als u zich wilt aanmelden bij een ander account.</string>
+\nWis het als je klaar bent met het gebruik van dit apparaat of als je jezelf wilt aanmelden bij een ander account.</string>
     <string name="soft_logout_clear_data_title">Persoonlijke gegevens wissen</string>
     <string name="soft_logout_signin_e2e_warning_notice">Log in om versleutelingssleutels te herstellen die exclusief op dit apparaat zijn opgeslagen. Je hebt ze nodig om al uw beveiligde berichten op elk apparaat te lezen.</string>
-    <string name="soft_logout_signin_notice">Uw server (%1$s) beheerder heeft u uitgelogd van uw account %2$s (%3$s).</string>
+    <string name="soft_logout_signin_notice">Je server (%1$s) beheerder heeft je uitgelogd van jouw account %2$s (%3$s).</string>
     <string name="soft_logout_title">Je bent uitgelogd</string>
     <string name="signed_out_submit">Opnieuw inloggen</string>
     <string name="signed_out_notice">Het kan verschillende redenen hebben:
 \n
-\n• U heeft uw wachtwoord bij een andere sessie gewijzigd.
+\n• Je hebt je wachtwoord bij een andere sessie gewijzigd.
 \n
-\n• U heeft deze sessie verwijderd uit een andere sessie.
+\n• Je hebt deze sessie verwijderd uit een andere sessie.
 \n
-\n• De beheerder van uw server heeft uw toegang om veiligheidsredenen ongeldig gemaakt.</string>
+\n• De beheerder van je server heeft jouw toegang om veiligheidsredenen ongeldig gemaakt.</string>
     <string name="signed_out_title">Je bent uitgelogd</string>
-    <string name="autodiscover_well_known_error">Kan geen geldige server vinden. Controleer uw ID a.u.b.</string>
+    <string name="autodiscover_well_known_error">Kan geen geldige server vinden. Controleer je ID</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Dit is geen geldige persoon-ID. Verwacht formaat: \'@persoon:server.org\'</string>
-    <string name="login_signin_matrix_id_password_notice">Als u uw wachtwoord niet weet, gaat u terug om het opnieuw in te stellen.</string>
+    <string name="login_signin_matrix_id_password_notice">Als je jouw wachtwoord niet weet, ga je terug om het opnieuw in te stellen.</string>
     <string name="login_signin_matrix_id_notice">Als je een account aanmaakt op een server, gebruik dan je Matrix ID (bijv. @persoon:domein.nl) en wachtwoord hieronder.</string>
     <string name="login_signin_matrix_id_title">Aanmelden met Matrix ID</string>
     <string name="login_connect_using_matrix_id_submit">Aanmelden met Matrix ID</string>
     <plurals name="login_error_limit_exceeded_retry_after">
-        <item quantity="one">Er zijn te veel verzoeken verzonden. Je kunt het over %1$d seconde opnieuw proberen…</item>
-        <item quantity="other">Er zijn te veel verzoeken verzonden. Je kunt het over %1$d seconden opnieuw proberen…</item>
+        <item quantity="one">Er zijn te veel verzoeken verzonden. Je kan het over %1$d seconde opnieuw proberen…</item>
+        <item quantity="other">Er zijn te veel verzoeken verzonden. Je kan het over %1$d seconden opnieuw proberen…</item>
     </plurals>
-    <string name="login_error_outdated_homeserver_warning_content">Deze server draait op een oude versie. Vraag uw server beheerder om te upgraden. U kunt doorgaan, maar sommige functies werken mogelijk niet correct.</string>
+    <string name="login_error_outdated_homeserver_warning_content">Deze server draait op een oude versie. Vraag je server beheerder om te upgraden. Je kan doorgaan, maar sommige functionaliteiten werken mogelijk niet correct.</string>
     <string name="login_validation_code_is_not_correct">De ingevoerde code is niet correct. Gelieve dit te controleren.</string>
     <string name="login_wait_for_email_notice">We hebben zojuist een e-mail gestuurd naar %1$s.
 \nKlik op de link die deze bevat om door te gaan met het aanmaken van een account.</string>
-    <string name="login_wait_for_email_title">Controleer uw e-mail</string>
+    <string name="login_wait_for_email_title">Controleer je e-mail</string>
     <string name="login_terms_title">Accepteer de voorwaarden om door te gaan</string>
     <string name="login_a11y_captcha_container">Voer de captcha uitdaging uit</string>
     <string name="login_a11y_choose_other">Selecteer een aangepaste server</string>
     <string name="login_a11y_choose_modular">Selecteer Element Matrix Services</string>
-    <string name="login_signup_cancel_confirmation_content">Uw account is nog niet aangemaakt. Het registratieproces stoppen\?</string>
+    <string name="login_signup_cancel_confirmation_content">Jouw account is nog niet aangemaakt. Het registratieproces stoppen\?</string>
     <string name="login_signup_error_user_in_use">Deze inlognaam is in gebruik</string>
     <string name="login_signin_username_hint">Inlognaam of e-mailadres</string>
-    <string name="login_signup_to">Meld u aan bij %1$s</string>
+    <string name="login_signup_to">Meld je aan bij %1$s</string>
     <string name="login_msisdn_error_other">Telefoonnummer lijkt ongeldig. Controleer het alstublieft</string>
     <string name="login_msisdn_error_not_international">Internationale telefoonnummers moeten beginnen met \'+\'</string>
     <string name="login_msisdn_notice">Gebruik het internationale formaat (telefoonnummer moet beginnen met \'+\')</string>
-    <string name="login_msisdn_confirm_notice">We hebben zojuist een code naar %1$s gestuurd. Voer het hieronder in om te verifiëren dat u het bent.</string>
+    <string name="login_msisdn_confirm_notice">We hebben zojuist een code naar %1$s gestuurd. Voer het hieronder in om te verifiëren dat jij het bent.</string>
     <string name="login_msisdn_confirm_title">Telefoonnummer bevestigen</string>
     <string name="login_set_msisdn_optional_hint">Telefoon nummer (optioneel)</string>
     <string name="login_set_msisdn_notice2">Gebruik het internationale formaat.</string>
-    <string name="login_set_msisdn_notice">Stel een telefoonnummer in om optioneel toe te staan dat mensen die u kent u kunnen ontdekken.</string>
+    <string name="login_set_msisdn_notice">Stel een telefoonnummer in om optioneel toe te staan dat mensen die je kent jou kunnen ontdekken.</string>
     <string name="login_set_msisdn_title">Telefoonnummer instellen</string>
     <string name="does_not_look_like_valid_email">Lijkt niet op een geldig e-mailadres</string>
-    <string name="login_set_email_notice">Stel een e-mail in om uw account te herstellen. Later kunt u optioneel toelaten dat mensen die u kent u via uw e-mail ontdekken.</string>
+    <string name="login_set_email_notice">Stel een e-mail in om je account te herstellen. Later kan je optioneel toestaan dat mensen die je kent jou via je e-mail ontdekken.</string>
     <string name="login_set_email_title">E-mailadres instellen</string>
-    <string name="login_reset_password_cancel_confirmation_content">Uw wachtwoord is nog niet gewijzigd.
+    <string name="login_reset_password_cancel_confirmation_content">Jouw wachtwoord is nog niet gewijzigd.
 \n
 \nHet proces voor het wijzigen van het wachtwoord stoppen\?</string>
     <string name="login_reset_password_success_submit">Terug naar Inloggen</string>
-    <string name="login_reset_password_success_notice_2">U bent bij alle sessies uitgelogd en ontvangt geen pushmeldingen meer. Log opnieuw in op elk apparaat om meldingen weer in te schakelen.</string>
+    <string name="login_reset_password_success_notice_2">Je bent bij alle sessies uitgelogd en ontvangt geen pushmeldingen meer. Log opnieuw in op elk apparaat om meldingen weer in te schakelen.</string>
     <string name="login_reset_password_success_notice">Je wachtwoord is gereset.</string>
     <string name="login_reset_password_mail_confirmation_submit">Ik heb mijn e-mailadres geverifieerd</string>
-    <string name="login_reset_password_mail_confirmation_notice_2">Tik op de link om uw nieuwe wachtwoord te bevestigen. Klik hieronder als u de link hebt gevolgd die erin staat.</string>
-    <string name="ftue_auth_carousel_secure_title">Word eigenaar van uw gesprekken.</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Tik op de link om je nieuwe wachtwoord te bevestigen. Klik hieronder als je de link hebt gevolgd die erin staat.</string>
+    <string name="ftue_auth_carousel_secure_title">Word eigenaar van jouw gesprekken.</string>
     <string name="create_space">Space aanmaken</string>
     <string name="create_spaces_loading_message">Space aanmaken…</string>
-    <string name="activity_create_space_title">Aanmaken een space</string>
+    <string name="activity_create_space_title">Een ruimte aanmaken</string>
     <string name="dev_tools_event_content_hint">Gebeurtenis inhoud</string>
     <string name="upgrade_room_for_restricted_note">Houd er rekening mee dat bij het upgraden een nieuwe versie van de kamer wordt gemaakt. Alle huidige berichten blijven in deze gearchiveerde kamer.</string>
-    <string name="upgrade_room_for_restricted_no_param">Iedereen in een ouderkamer kan deze kamer vinden en er lid van worden. Het is niet nodig om iedereen handmatig uit te nodigen. U kunt dit op elk moment wijzigen in de kamer instellingen.</string>
+    <string name="upgrade_room_for_restricted_no_param">Iedereen in een ouderspace kan deze kamer vinden en er lid van worden. Het is niet nodig om iedereen handmatig uit te nodigen. Je kan dit op elk moment wijzigen in de kamer instellingen.</string>
     <string name="upgrade_room_warning">Het upgraden van een kamer is een geavanceerde actie en wordt meestal aanbevolen wanneer een kamer onstabiel is vanwege bugs, ontbrekende functies of beveiligingsproblemen.
 \nDit heeft meestal alleen invloed op hoe de kamer op de server wordt verwerkt.</string>
     <string name="space_settings_manage_rooms">Beheer kamers</string>
-    <string name="space_leave_prompt_msg_as_admin">U bent de enige beheerder van deze kamer. Als u het verlaat, betekent dit dat niemand er controle over heeft.</string>
+    <string name="space_leave_prompt_msg_as_admin">Je bent de enige beheerder van deze kamer. Als je het verlaat, betekent dit dat niemand er controle over heeft.</string>
     <string name="room_alias_preview_not_found">Deze alias is momenteel niet toegankelijk.
-\nProbeer het later opnieuw of vraag een kamerbeheerder om te controleren of u toegang heeft.</string>
+\nProbeer het later opnieuw of vraag een kamerbeheerder om te controleren of je toegang hebt.</string>
     <string name="share_space_link_message">Word lid van mijn kamer %1$s %2$s</string>
-    <string name="create_spaces_join_info_help">Als u lid wilt worden van een bestaande kamer, heeft u een uitnodiging nodig.</string>
+    <string name="create_spaces_join_info_help">Als je lid wil worden van een bestaande kamer, heb je een uitnodiging nodig.</string>
     <string name="event_status_delete_all_failed_dialog_message">Weet je zeker dat je alle niet verzonden berichten in deze kamer wilt verwijderen\?</string>
     <string name="labs_auto_report_uisi">Automatisch rapport versleutelingsfouten.</string>
     <string name="tooltip_attachment_poll">Poll maken</string>
@@ -2184,7 +2179,7 @@
     <string name="tooltip_attachment_file">Upload bestand</string>
     <string name="tooltip_attachment_gallery">Afbeeldingen en video\'s versturen</string>
     <string name="tooltip_attachment_photo">Open camera</string>
-    <string name="delete_poll_dialog_content">Weet u zeker dat u deze poll wilt verwijderen\? U kunt het niet meer herstellen nadat het is verwijderd.</string>
+    <string name="delete_poll_dialog_content">Weet je zeker dat je deze poll wilt verwijderen\? Je kan het niet meer herstellen nadat het is verwijderd.</string>
     <string name="delete_poll_dialog_title">Poll verwijderen</string>
     <string name="poll_end_room_list_preview">Poll beëindigd</string>
     <string name="poll_response_room_list_preview">Stem uitgebracht</string>
@@ -2221,65 +2216,65 @@
     <string name="create_poll_question_hint">Vraag of onderwerp</string>
     <string name="create_poll_question_title">Poll vraag of onderwerp</string>
     <string name="create_poll_title">Poll maken</string>
-    <string name="restart_the_application_to_apply_changes">Start de toepassing opnieuw om de wijziging door te voeren.</string>
+    <string name="restart_the_application_to_apply_changes">Start de applicatie opnieuw om de wijziging door te voeren.</string>
     <string name="labs_enable_latex_maths">LaTeX wiskunde inschakelen</string>
     <string name="link_this_email_with_your_account">%s in Instellingen om uitnodigingen rechtstreeks in ${app_name} te ontvangen.</string>
-    <string name="link_this_email_settings_link">Koppel deze e-mail aan uw account</string>
-    <string name="this_invite_to_this_space_was_sent">Deze uitnodiging voor deze space is verzonden naar %s die niet is gekoppeld aan uw account</string>
-    <string name="this_invite_to_this_room_was_sent">Deze uitnodiging voor deze kamer is verzonden naar %s die niet is gekoppeld aan uw account</string>
+    <string name="link_this_email_settings_link">Koppel deze e-mail aan je account</string>
+    <string name="this_invite_to_this_space_was_sent">Deze uitnodiging voor deze space is verzonden naar %s die niet is gekoppeld aan jouw account</string>
+    <string name="this_invite_to_this_room_was_sent">Deze uitnodiging voor deze kamer is verzonden naar %s die niet is gekoppeld aan jouw account</string>
     <string name="a11y_stop_voice_message">Stop met opnemen</string>
     <string name="voice_message_slide_to_cancel">Schuif om te annuleren</string>
     <string name="a11y_start_voice_message">Spraakbericht opnemen</string>
     <string name="error_failed_to_join_room">Sorry, er is een fout opgetreden bij het proberen deel te nemen aan: %s</string>
     <string name="room_upgrade_to_recommended_version">Upgrade naar de aanbevolen kamerversie</string>
     <string name="room_using_unstable_room_version">In deze kamer wordt versie %s gebruikt, die door deze server als onstabiel is gemarkeerd.</string>
-    <string name="upgrade_room_no_power_to_manage">U heeft toestemming nodig om een kamer te upgraden</string>
+    <string name="upgrade_room_no_power_to_manage">Je hebt toestemming nodig om een kamer te upgraden</string>
     <string name="upgrade_room_update_parent_space">Bovenliggende space automatisch bijwerken</string>
     <string name="upgrade_room_auto_invite">Personen automatisch uitnodigen</string>
-    <string name="upgrade_public_room_from_to">U update de kamer van %1$s naar %2$s.</string>
+    <string name="upgrade_public_room_from_to">Je update de kamer van %1$s naar %2$s.</string>
     <string name="upgrade_private_room">Upgrade privékamer</string>
     <string name="upgrade_public_room">Upgrade openbare kamer</string>
     <string name="upgrade_required">Upgrade vereist</string>
     <string name="it_may_take_some_time">Even geduld, het kan even duren.</string>
     <string name="joining_replacement_room">Deelnemen aan vervangende kamer</string>
     <string name="unnamed_room">Naamloze kamer</string>
-    <string name="this_space_has_no_rooms_admin">Sommige kamers zijn mogelijk verborgen omdat ze privé zijn en u een uitnodiging nodig heeft.</string>
-    <string name="this_space_has_no_rooms_not_admin">Sommige kamers zijn mogelijk verborgen omdat ze privé zijn en u een uitnodiging nodig heeft.
-\nU heeft geen rechten om kamers toe te voegen.</string>
+    <string name="this_space_has_no_rooms_admin">Sommige kamers zijn mogelijk verborgen omdat ze privé zijn en je een uitnodiging nodig hebt.</string>
+    <string name="this_space_has_no_rooms_not_admin">Sommige kamers zijn mogelijk verborgen omdat ze privé zijn en je een uitnodiging nodig hebt.
+\nJe hebt geen rechten om kamers toe te voegen.</string>
     <string name="this_space_has_no_rooms">Deze space heeft geen kamers</string>
-    <string name="spaces_no_server_support_description">Neem contact op met uw server beheerder voor meer informatie</string>
+    <string name="spaces_no_server_support_description">Neem contact op met jouw serverbeheerder voor meer informatie</string>
     <string name="spaces_no_server_support_title">Het lijkt erop dat je server nog geen Spaces ondersteunt</string>
     <string name="spaces_feeling_experimental_subspace">Experimenteel voelen\?
-\nU kunt bestaande spaces aan een space toevoegen.</string>
-    <string name="all_rooms_youre_in_will_be_shown_in_home">Alle kamers waarin u deelneemt, worden weergegeven in Home.</string>
-    <string name="preference_show_all_rooms_in_home">Toon alle kamers in Home</string>
+\nJe kan bestaande spaces aan een space toevoegen.</string>
+    <string name="all_rooms_youre_in_will_be_shown_in_home">Alle kamers waarin je deelneemt, worden weergegeven in Home.</string>
+    <string name="preference_show_all_rooms_in_home">Alle kamers op startscherm weergeven</string>
     <string name="space_manage_rooms_and_spaces">Kamers en spaces beheren</string>
     <string name="space_mark_as_suggested">Markeren als aanbevolen</string>
     <string name="space_mark_as_not_suggested">Markeren als niet aanbevolen</string>
     <string name="looking_for_someone_not_in_space">Op zoek naar iemand die niet in %s zit\?</string>
-    <string name="user_invites_you">%s nodigt u uit</string>
-    <string name="labs_auto_report_uisi_desc">Uw systeem verzendt automatisch logboeken wanneer er een fout optreedt die niet kan worden ontsleuteld</string>
-    <string name="you_are_invited">U bent uitgenodigd</string>
+    <string name="user_invites_you">%s nodigt je uit</string>
+    <string name="labs_auto_report_uisi_desc">Jouw systeem verzendt automatisch logboeken wanneer er een fout optreedt die niet kan worden ontsleuteld</string>
+    <string name="you_are_invited">Je bent uitgenodigd</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Spaces zijn een nieuwe manier om kamers en mensen te groeperen.</string>
-    <string name="space_add_space_to_any_space_you_manage">Voeg een space toe aan elke space die u beheert.</string>
+    <string name="space_add_space_to_any_space_you_manage">Voeg een space toe aan elke space die jij beheert.</string>
     <string name="space_add_existing_spaces">Bestaande spaces toevoegen</string>
     <string name="space_add_existing_rooms_only">Bestaande kamers toevoegen</string>
     <string name="space_add_existing_rooms">Bestaande kamers en space toevoegen</string>
-    <string name="space_leave_prompt_msg_private">U kunt pas weer deelnemen als u opnieuw wordt uitgenodigd.</string>
-    <string name="space_leave_prompt_msg_only_you">U bent de enige persoon hier. Als u weggaat, kan niemand meer meedoen, ook u niet.</string>
-    <string name="space_leave_prompt_msg_with_name">Weet u zeker dat u %s wilt verlaten\?</string>
+    <string name="space_leave_prompt_msg_private">Je kan pas weer deelnemen als je opnieuw wordt uitgenodigd.</string>
+    <string name="space_leave_prompt_msg_only_you">Je bent de enige persoon hier. Als je weggaat, kan niemand meer meedoen, ook jij niet.</string>
+    <string name="space_leave_prompt_msg_with_name">Weet je zeker dat je %s wil verlaten\?</string>
     <string name="leave_space">Verlaat</string>
     <string name="space_add_child_title">Kamers toevoegen</string>
     <string name="space_explore_activity_title">Kamers ontdekken</string>
     <plurals name="space_people_you_know">
-        <item quantity="one">%d persoon die u kent is al lid geworden</item>
-        <item quantity="other">%d mensen die u kent zijn al lid geworden</item>
+        <item quantity="one">%d persoon die je kent is al lid geworden</item>
+        <item quantity="other">%d mensen die je kent zijn al lid geworden</item>
     </plurals>
     <string name="discovery_section">Ontdek (%s)</string>
     <string name="finish_setup">Installatie voltooien</string>
     <string name="discovery_invite">Nodig uit via e-mail, vind contacten en meer…</string>
     <string name="finish_setting_up_discovery">Voltooi het instellen van detectie.</string>
-    <string name="create_space_identity_server_info_none">U gebruikt momenteel geen identiteitsserver. Om teamgenoten uit te nodigen en door hen vindbaar te zijn, configureert u er hieronder een.</string>
+    <string name="create_space_identity_server_info_none">Je gebruikt momenteel geen identiteitsserver. Om teamgenoten uit te nodigen en door hen vindbaar te zijn, configureet je er hieronder een.</string>
     <string name="join_anyway">Doe toch mee</string>
     <string name="join_space">Space deelnemen</string>
     <string name="skip_for_now">Voor nu overslaan</string>
@@ -2290,37 +2285,37 @@
     <string name="invite_by_link">Deel link</string>
     <string name="invite_by_username_or_mail">Uitnodigen via inlognaam of e-mailadres</string>
     <string name="invite_by_email">uitnodiging via e-mail</string>
-    <string name="invite_people_to_your_space_desc">Het is alleen u op dit moment. %s zal nog beter zijn met anderen.</string>
+    <string name="invite_people_to_your_space_desc">Het is alleen jij op dit moment. %s zal nog beter zijn met anderen.</string>
     <string name="invite_to_space">Uitnodigen voor %s</string>
     <string name="invite_people_menu">Mensen uitnodigen</string>
-    <string name="invite_people_to_your_space">Nodig mensen uit voor uw space</string>
-    <string name="create_spaces_room_private_header_desc">Laten we voor elk van hen een kamer maken. U kunt later ook meer toevoegen, inclusief reeds bestaande.</string>
-    <string name="create_spaces_room_private_header">Aan welke dingen werkt u\?</string>
-    <string name="create_spaces_invite_public_header_desc">Zorg ervoor dat de juiste mensen toegang hebben tot %s bedrijf. U kunt later meer uitnodigen.</string>
-    <string name="create_spaces_invite_public_header">Wie zijn uw teamgenoten\?</string>
-    <string name="create_spaces_room_public_header_desc">We zullen kamers voor hen maken. U kunt later ook meer toevoegen.</string>
-    <string name="create_spaces_room_public_header">Wat zijn enkele discussies die u wilt voeren in %s\?</string>
+    <string name="invite_people_to_your_space">Nodig mensen uit voor jouw space</string>
+    <string name="create_spaces_room_private_header_desc">Laten we voor elk van hen een kamer maken. Je kan er later ook meer toevoegen, inclusief reeds bestaande.</string>
+    <string name="create_spaces_room_private_header">Aan welke dingen werk jij\?</string>
+    <string name="create_spaces_invite_public_header_desc">Zorg ervoor dat de juiste mensen toegang hebben tot %s bedrijf. Je kan er later meer uitnodigen.</string>
+    <string name="create_spaces_invite_public_header">Wie zijn jouw teamgenoten\?</string>
+    <string name="create_spaces_room_public_header_desc">We zullen kamers voor hen maken. Je kan later ook meer toevoegen.</string>
+    <string name="create_spaces_room_public_header">Wat zijn enkele discussies die je wil voeren in %s\?</string>
     <string name="create_space_error_empty_field_space_name">Geef het een naam om door te gaan.</string>
-    <string name="create_spaces_details_private_header">Voeg wat details toe om mensen te helpen het te identificeren. U kunt deze op elk moment wijzigen.</string>
-    <string name="create_spaces_details_public_header">Voeg wat details toe om het te laten opvallen. U kunt deze op elk moment wijzigen.</string>
-    <string name="space_type_private_desc">Alleen op uitnodiging, het beste voor uzelf of teams</string>
+    <string name="create_spaces_details_private_header">Voeg wat details toe om mensen te helpen het te identificeren. Je kan deze op elk moment wijzigen.</string>
+    <string name="create_spaces_details_public_header">Voeg wat details toe om het te laten opvallen. Je kan deze op elk moment wijzigen.</string>
+    <string name="space_type_private_desc">Alleen op uitnodiging, het beste voor jezelf of teams</string>
     <string name="space_type_public_desc">Open voor iedereen, het beste voor gemeenschappen</string>
-    <string name="create_spaces_private_teammates">Een privé space voor u en uw teamgenoten</string>
+    <string name="create_spaces_private_teammates">Een privé-ruimte voor jou en jouw teamgenoten</string>
     <string name="create_spaces_me_and_teammates">Ik en teamgenoten</string>
     <string name="create_spaces_organise_rooms">Een privé space om je kamers te organiseren</string>
     <string name="create_spaces_just_me">Alleen ik</string>
     <string name="create_spaces_make_sure_access">Zorg ervoor dat de juiste mensen toegang hebben tot %s.</string>
-    <string name="create_spaces_who_are_you_working_with">Met wie werkt u samen\?</string>
-    <string name="create_spaces_you_can_change_later">U kunt dit later wijzigen</string>
-    <string name="create_spaces_choose_type_label">Wat voor soort space wilt u aanmaken\?</string>
-    <string name="your_private_space">Uw privé space</string>
-    <string name="your_public_space">Uw openbare space</string>
+    <string name="create_spaces_who_are_you_working_with">Met wie werk je samen\?</string>
+    <string name="create_spaces_you_can_change_later">Je kan dit later wijzigen</string>
+    <string name="create_spaces_choose_type_label">Wat voor soort ruimte wil je aanmaken\?</string>
+    <string name="your_private_space">Jouw privé-ruimte</string>
+    <string name="your_public_space">Jouw openbare ruimte</string>
     <string name="add_space">Space toevoegen</string>
     <string name="private_space">Privé space</string>
     <string name="public_space">Openbare space</string>
     <string name="event_status_delete_all_failed_dialog_title">Niet verzonden berichten verwijderen</string>
     <string name="event_status_failed_messages_warning">Berichten kunnen niet worden verzonden</string>
-    <string name="event_status_cancel_sending_dialog_message">Wilt u het versturen van een bericht annuleren\?</string>
+    <string name="event_status_cancel_sending_dialog_message">Wil je het versturen van een bericht annuleren\?</string>
     <string name="event_status_a11y_delete_all">Alle mislukte berichten verwijderen</string>
     <string name="command_description_upgrade_room">Upgrade een kamer naar een nieuwe versie</string>
     <string name="command_description_leave_room">Verlaat kamer met gegeven id (of huidige kamer indien leeg)</string>
@@ -2330,11 +2325,11 @@
     <string name="room_member_override_nick_color">Kleur weergavenaam overschrijven</string>
     <string name="login_splash_already_have_account">Ik heb al een account</string>
     <string name="ftue_auth_carousel_encrypted_title">Veilig berichtenverkeer.</string>
-    <string name="ftue_auth_carousel_control_title">U heeft de controle.</string>
+    <string name="ftue_auth_carousel_control_title">Jij hebt de controle.</string>
     <string name="tooltip_attachment_location">Deel locatie</string>
     <string name="location_share_external">Open met</string>
-    <string name="location_not_available_dialog_content">${app_name} kan geen toegang krijgen tot uw locatie. Probeer het later opnieuw.</string>
-    <string name="location_not_available_dialog_title">${app_name} heeft geen toegang tot uw locatie</string>
+    <string name="location_not_available_dialog_content">${app_name} kan geen toegang krijgen tot jouw locatie. Probeer het later opnieuw.</string>
+    <string name="location_not_available_dialog_title">${app_name} heeft geen toegang tot jouw locatie</string>
     <string name="location_activity_title_preview">Locatie</string>
     <string name="location_activity_title_static_sharing">Deel locatie</string>
     <string name="closed_poll_option_description">Resultaten worden pas onthuld als je de poll beëindigt</string>
@@ -2350,36 +2345,36 @@
     <string name="encryption_has_been_misconfigured">Versleuteling is verkeerd geconfigureerd.</string>
     <string name="sent_location">Hun locatie gedeeld</string>
     <string name="login_splash_create_account">Account aanmaken</string>
-    <string name="ftue_auth_carousel_workplace_title">Berichten voor uw team.</string>
-    <string name="ftue_auth_carousel_encrypted_body">End-to-end versleuteld en geen telefoonnummer vereist. Geen advertenties of dataverzameling.</string>
-    <string name="ftue_auth_carousel_control_body">Kies waar je gesprekken worden bewaard, zodat u controle en onafhankelijkheid heeft. Verbonden via Matrix.</string>
-    <string name="ftue_auth_carousel_secure_body">Veilige en onafhankelijke communicatie die u dezelfde mate van privacy geeft als een persoonlijk gesprek in uw eigen huis.</string>
+    <string name="ftue_auth_carousel_workplace_title">Berichten voor jouw team.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Eind-tot-eind versleuteld en geen telefoonnummer vereist. Geen advertenties of dataverzameling.</string>
+    <string name="ftue_auth_carousel_control_body">Kies waar je gesprekken worden bewaard, zodat je controle en onafhankelijkheid hebt. Verbonden via Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Veilige en onafhankelijke communicatie die je dezelfde mate van privacy geeft als een persoonlijk gesprek in je eigen huis.</string>
     <string name="attachment_type_location">Locatie</string>
-    <string name="room_unsupported_e2e_algorithm_as_admin">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt versturen. Klik om instellingen te openen.</string>
-    <string name="room_unsupported_e2e_algorithm">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt versturen. Neem contact op met een beheerder om de versleuteling in een geldige staat te herstellen.</string>
-    <string name="message_bubbles">Toon bericht bubbels</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">De versleuteling is verkeerd geconfigureerd, zodat je geen berichten kunt versturen. Klik om instellingen te openen.</string>
+    <string name="room_unsupported_e2e_algorithm">De versleuteling is verkeerd geconfigureerd, zodat je geen berichten kunt versturen. Neem contact op met een beheerder om de versleuteling in een geldige staat te herstellen.</string>
+    <string name="message_bubbles">Berichtbubbels weergeven</string>
     <string name="location_timeline_failed_to_load_map">Kan kaart niet laden</string>
     <string name="a11y_static_map_image">Kaart</string>
     <string name="labs_enable_thread_messages_desc">Let op: app wordt opnieuw gestart</string>
     <string name="labs_enable_thread_messages">Discussieberichten inschakelen</string>
     <string name="ftue_auth_use_case_connect_to_server">Verbinding maken met server</string>
-    <string name="ftue_auth_use_case_join_existing_server">Wilt u lid worden van een bestaande server\?</string>
+    <string name="ftue_auth_use_case_join_existing_server">Wil je lid worden van een bestaande server\?</string>
     <string name="ftue_auth_use_case_skip_partial">Sla deze vraag over</string>
     <string name="ftue_auth_use_case_skip">Nog niet zeker\? %s</string>
     <string name="ftue_auth_use_case_option_three">Gemeenschappen</string>
     <string name="ftue_auth_use_case_option_two">Teams</string>
     <string name="ftue_auth_use_case_option_one">Vrienden en familie</string>
-    <string name="ftue_auth_use_case_subtitle">We helpen u om verbinding te maken</string>
-    <string name="ftue_auth_use_case_title">Met wie gaat u het meest chatten\?</string>
-    <string name="navigate_to_thread_when_already_in_the_thread">U bekijkt deze discussie al!</string>
+    <string name="ftue_auth_use_case_subtitle">We helpen je om verbinding te maken</string>
+    <string name="ftue_auth_use_case_title">Met wie ga je het meest chatten\?</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Je bekijkt deze thread al!</string>
     <string name="view_in_room">Bekijk in kamer</string>
-    <string name="reply_in_thread">Reageren in discussie</string>
+    <string name="reply_in_thread">Reageren in thread</string>
     <string name="command_not_supported_in_threads">Het commando \"%s\" wordt herkend maar niet ondersteund in discussies.</string>
-    <string name="search_thread_from_a_thread">Van een discussie</string>
+    <string name="search_thread_from_a_thread">Van een thread</string>
     <string name="thread_list_empty_notice">Tip: Tik lang op een bericht en gebruik \"%s\".</string>
     <string name="thread_list_empty_subtitle">Discussies helpen je gesprekken on-topic te houden en gemakkelijk bij te houden.</string>
-    <string name="thread_list_empty_title">Houd discussies georganiseerd met discussielijnen</string>
-    <string name="thread_list_modal_my_threads_subtitle">Toont alle discussies waaraan u heeft deelgenomen</string>
+    <string name="thread_list_empty_title">Houd discussies georganiseerd met threads</string>
+    <string name="thread_list_modal_my_threads_subtitle">Toont alle discussies waaraan je hebt deelgenomen</string>
     <string name="thread_list_modal_my_threads_title">Mijn discussies</string>
     <string name="thread_list_modal_all_threads_subtitle">Toont alle discussies van de huidige kamer</string>
     <string name="thread_list_modal_all_threads_title">Alle discussies</string>
@@ -2389,7 +2384,7 @@
     <string name="room_threads_filter">Discussies in de kamer filteren</string>
     <string name="action_thread_copy_link_to_thread">Kopieer link naar discussie</string>
     <string name="action_thread_view_in_room">Bekijk in kamer</string>
-    <string name="action_view_threads">Discussies bekijken</string>
+    <string name="action_view_threads">Thead bekijken</string>
     <string name="room_message_autocomplete_users">Personen</string>
     <string name="error_forbidden_digits_only_username">De server accepteert geen inlognaam met alleen cijfers.</string>
     <string name="room_message_autocomplete_notification">Kamer notificatie</string>
@@ -2398,7 +2393,7 @@
         <item quantity="one">%1$d meer</item>
         <item quantity="other">%1$d meer</item>
     </plurals>
-    <string name="message_reaction_show_less">Toon minder</string>
+    <string name="message_reaction_show_less">Minder weergeven</string>
     <string name="live_location_sharing_notification_description">Locatie delen is bezig</string>
     <string name="live_location_sharing_notification_title">${app_name} Live locatie</string>
     <string name="location_share_live_stop">Stop</string>
@@ -2413,25 +2408,24 @@
     <string name="a11y_location_share_pin_on_map">Pin van geselecteerde locatie op kaart</string>
     <string name="ftue_personalize_skip_this_step">Sla deze stap over</string>
     <string name="ftue_personalize_submit">Opslaan en doorgaan</string>
-    <string name="ftue_personalize_complete_subtitle">U kunt op elk moment bij de instellingen uw profiel bijwerken</string>
+    <string name="ftue_personalize_complete_subtitle">Je kan op elk moment bij de instellingen jouw profiel bijwerken</string>
     <string name="ftue_personalize_complete_title">Ziet er goed uit!</string>
     <string name="ftue_personalize_lets_go">Laten we beginnen</string>
-    <string name="ftue_profile_picture_subtitle">Tijd om een gezicht bij uw naam te voegen</string>
+    <string name="ftue_profile_picture_subtitle">Tijd om een gezicht bij je naam te voegen</string>
     <string name="ftue_profile_picture_title">Voeg een profielfoto toe</string>
-    <string name="ftue_display_name_entry_footer">U kunt dit later wijzigen</string>
+    <string name="ftue_display_name_entry_footer">Je kunt dit later wijzigen</string>
     <string name="ftue_display_name_entry_title">Weergavenaam</string>
-    <string name="ftue_display_name_subtitle">Dit wordt weergegeven wanneer u berichten verzendt.</string>
     <string name="ftue_display_name_title">Kies een weergavenaam</string>
-    <string name="ftue_account_created_subtitle">Uw account %s is aangemaakt</string>
+    <string name="ftue_account_created_subtitle">Jouw account %s is aangemaakt</string>
     <string name="ftue_account_created_congratulations_title">Gefeliciteerd!</string>
     <string name="ftue_account_created_take_me_home">Breng me naar het begin</string>
     <string name="ftue_account_created_personalize">Personaliseer profiel</string>
-    <string name="threads_notice_migration_message">We komen dichter bij het uitbrengen van een openbare bèta voor Discussies.
+    <string name="threads_notice_migration_message">We komen dichter bij het uitbrengen van een openbare bèta voor Threads.
 \n
 \nTerwijl we ons erop voorbereiden, moeten we enkele wijzigingen aanbrengen: discussies die vóór dit punt zijn gemaakt, worden weergegeven als gewone antwoorden.
 \n
-\nDit zal een eenmalige overgang zijn, aangezien Discussies nu deel uitmaken van de Matrix-specificatie.</string>
-    <string name="threads_notice_migration_title">Discussies die bèta naderen 🎉</string>
+\nDit zal een eenmalige overgang zijn, aangezien Threads nu deel uitmaken van de Matrix-specificatie.</string>
+    <string name="threads_notice_migration_title">Threads benaderen bèta 🎉</string>
     <string name="room_notification_more_than_two_users_are_typing">%1$s, %2$s en anderen</string>
     <string name="room_notification_two_users_are_typing">%1$s en %2$s</string>
     <string name="action_disable">Uitzetten</string>
@@ -2443,7 +2437,7 @@
     <string name="location_share_live_select_duration_option_3">8 uur</string>
     <string name="location_share_live_select_duration_option_2">1 uur</string>
     <string name="location_share_live_select_duration_option_1">15 minuten</string>
-    <string name="location_share_live_select_duration_title">Deel uw live locatie voor</string>
+    <string name="location_share_live_select_duration_title">Deel jouw live locatie voor</string>
     <string name="audio_message_file_size">(%1$s)</string>
     <string name="audio_message_reply_content">%1$s (%2$s)</string>
     <string name="error_audio_message_unable_to_play">%1$s kan niet worden afgeluisterd</string>
@@ -2454,17 +2448,17 @@
     <string name="sent_live_location">Hun live locatie gedeeld</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name} is ook geweldig voor op de werkplek. Het wordt vertrouwd door \'s werelds veiligste organisaties.</string>
     <string name="beta">BÈTA</string>
-    <string name="send_feedback_threads_info">Discussies zijn werk in uitvoering met nieuwe, opwindende aankomende functies, zoals verbeterde meldingen. We horen graag uw feedback!</string>
+    <string name="send_feedback_threads_info">Threads zijn werk in uitvoering met nieuwe, opwindende aankomende functies, zoals verbeterde meldingen. We horen graag jouw feedback!</string>
     <string name="send_feedback_threads_title">Discussies Beta-feedback</string>
     <string name="give_feedback_threads">Geef feedback</string>
     <string name="beta_title_bottom_sheet_action">BÈTA</string>
-    <string name="settings_presence_user_always_appears_offline_summary">Indien ingeschakeld, verschijnt u altijd offline voor andere personen, zelfs wanneer u de applicatie gebruikt.</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Indien ingeschakeld, verschijn je altijd offline voor andere personen, zelfs wanneer je de applicatie gebruikt.</string>
     <string name="settings_presence_user_always_appears_offline">Offline modus</string>
     <string name="settings_presence">Aanwezigheid</string>
-    <string name="threads_labs_enable_notice_message">Uw server ondersteunt momenteel geen discussies, dus deze functie kan onbetrouwbaar zijn. Sommige berichten in een discussie zijn mogelijk niet betrouwbaar beschikbaar. %sWilt u toch discussies inschakelen\?</string>
-    <string name="threads_labs_enable_notice_title">Discussies bèta</string>
-    <string name="threads_beta_enable_notice_message">Discussies helpen uw gesprekken on-topic te houden en gemakkelijk bij te houden. %s Als u discussies inschakelt, wordt de app vernieuwd. Bij sommige accounts kan dit langer duren.</string>
-    <string name="threads_beta_enable_notice_title">Discussies bèta</string>
+    <string name="threads_labs_enable_notice_message">Jouw server ondersteunt momenteel geen threads, dus deze functionaliteit kan onbetrouwbaar zijn. Sommige berichten in een thread zijn mogelijk niet betrouwbaar beschikbaar. %sWil je threads toch inschakelen\?</string>
+    <string name="threads_labs_enable_notice_title">Threads bèta</string>
+    <string name="threads_beta_enable_notice_message">Threads helpen je gesprekken on-topic te houden en gemakkelijk bij te houden. %s Als je threads inschakelt, wordt de app vernieuwd. Bij sommige accounts kan dit langer duren.</string>
+    <string name="threads_beta_enable_notice_title">Threads bèta</string>
     <string name="action_learn_more">Leer meer</string>
     <string name="action_try_it_out">Probeer het uit</string>
     <string name="screen_sharing_notification_description">Scherm delen is bezig</string>
@@ -2477,19 +2471,18 @@
 \n
 \nHoud er rekening mee dat deze actie de app opnieuw zal starten en dat dit enige tijd kan duren.</string>
     <string name="initial_sync_request_title">Initieel synchronisatieverzoek</string>
-    <string name="settings_show_latest_profile_description">Toon de laatste profielinformatie (avatar en weergavenaam) voor alle berichten.</string>
-    <string name="settings_show_latest_profile">Toon laatste persoonsinformatie</string>
+    <string name="settings_show_latest_profile_description">Geeft de meest recente gebruikersinfo (avatar en weergavenaam) weer voor alle berichten.</string>
+    <string name="settings_show_latest_profile">Meest recente gebruikersinfo weergeven</string>
     <string name="a11y_presence_busy">Bezet</string>
     <string name="keys_backup_settings_signature_from_this_user">Back-up heeft een geldige handtekening van deze persoon.</string>
     <string name="live_location_bottom_sheet_last_updated_at">%1$s geleden bijgewerkt</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Stop met delen</string>
     <string name="labs_enable_live_location_summary">Tijdelijke implementatie: locaties blijven bestaan in kamergeschiedenis</string>
     <string name="labs_enable_live_location">Live locatie delen inschakelen</string>
     <string name="location_share_live_remaining_time">%1$s te gaan</string>
     <string name="location_share_live_until">Live tot %1$s</string>
     <string name="location_share_live_view">Bekijk live locatie</string>
     <string name="location_share_live_ended">Live locatie beëindigd</string>
-    <string name="space_explore_filter_no_result_description">Sommige resultaten zijn mogelijk verborgen omdat ze privé zijn en u hiervoor een uitnodiging nodig heeft.</string>
+    <string name="space_explore_filter_no_result_description">Sommige resultaten zijn mogelijk verborgen omdat ze privé zijn en je hiervoor een uitnodiging nodig hebt.</string>
     <string name="space_explore_filter_no_result_title">Geen resultaten gevonden</string>
     <string name="space_leave_radio_button_none">Verlaat geen</string>
     <string name="space_leave_radio_button_all">Verlaat alles</string>
@@ -2500,7 +2493,7 @@
     <string name="time_unit_minute_short">min</string>
     <string name="time_unit_hour_short">u</string>
     <string name="live_location_labs_promotion_switch_title">Locatie delen inschakelen</string>
-    <string name="live_location_labs_promotion_description">Let op: dit is een labfunctie met een tijdelijke implementatie. Dit betekent dat u uw locatiegeschiedenis niet kunt verwijderen en dat geavanceerde gebruikers uw locatiegeschiedenis kunnen zien, zelfs nadat u stopt met het delen van uw live locatie met deze ruimte.</string>
+    <string name="live_location_labs_promotion_description">Let op: dit is een labfunctie met een tijdelijke implementatie. Dit betekent dat je jouw locatiegeschiedenis niet kunt verwijderen en dat geavanceerde gebruikers jouw locatiegeschiedenis kunnen zien, zelfs nadat je stopt met het delen van je live locatie met deze ruimte.</string>
     <string name="live_location_labs_promotion_title">Live locatie delen</string>
     <string name="settings_troubleshoot_test_current_gateway">Huidige gateway: %s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">Gateway</string>
@@ -2519,9 +2512,9 @@
     <string name="settings_notification_method">Meldingsmethode</string>
     <string name="unifiedpush_distributor_background_sync">Achtergrondsynchronisatie</string>
     <string name="unifiedpush_distributor_fcm_fallback">Google Services</string>
-    <string name="unifiedpush_getdistributors_dialog_title">Kies hoe u meldingen wilt ontvangen</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Kies hoe je meldingen wil ontvangen</string>
     <string name="settings_security_pin_code_use_biometrics_error">Kan biometrische authenticatie niet inschakelen.</string>
-    <string name="auth_biometric_key_invalidated_message">Biometrische authenticatie is uitgeschakeld omdat er onlangs een nieuwe biometrische authenticatiemethode is toegevoegd. U kunt het weer inschakelen in Instellingen.</string>
+    <string name="auth_biometric_key_invalidated_message">Biometrische authenticatie is uitgeschakeld omdat er onlangs een nieuwe biometrische authenticatiemethode is toegevoegd. Je kan het weer inschakelen in Instellingen.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Meldingsmethode resetten</string>
     <string name="push_gateway_item_profile_tag">Profieltag:</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">Kan eindpunt token niet registreren op server:
@@ -2532,7 +2525,7 @@
     <string name="poll_undisclosed_not_ended">Resultaten zijn zichtbaar wanneer de poll is afgelopen</string>
     <string name="labs_enable_msc3061_share_history_desc">Bij het uitnodigen in een versleutelde ruimte die geschiedenis deelt, is de versleutelde geschiedenis zichtbaar.</string>
     <string name="labs_enable_msc3061_share_history">MSC3061: Kamersleutels delen voor eerdere berichten</string>
-    <string name="send_your_first_msg_to_invite">Stuur uw eerste bericht om %s uit te nodigen om te chatten</string>
+    <string name="send_your_first_msg_to_invite">Stuur je eerste bericht om %s uit te nodigen om te chatten</string>
     <string name="direct_room_encryption_enabled_tile_description_future">Berichten in deze chat worden eind-tot-eind versleuteld.</string>
     <string name="create_room_action_go">Ga</string>
     <plurals name="room_removed_messages">
@@ -2540,49 +2533,49 @@
         <item quantity="other">%d berichten verwijderd</item>
     </plurals>
     <string name="live_location_share_location_item_share">Deel locatie</string>
-    <string name="live_location_not_enough_permission_dialog_description">U moet de juiste rechten hebben om de live locatie in deze kamer te delen.</string>
-    <string name="live_location_not_enough_permission_dialog_title">U heeft geen toestemming om de live locatie te delen</string>
+    <string name="live_location_not_enough_permission_dialog_description">Je moet de juiste rechten hebben om de live locatie in deze kamer te delen.</string>
+    <string name="live_location_not_enough_permission_dialog_title">Je hebt geen toestemming om de live locatie te delen</string>
     <string name="permalink_unsupported_groups">Kan deze link niet openen: communities zijn vervangen door spaces</string>
     <string name="ftue_auth_login_username_entry">Gebruikersnaam / E-mailadres / Telefoonnummer</string>
-    <string name="ftue_auth_captcha_title">Bent u een mens\?</string>
+    <string name="ftue_auth_captcha_title">Ben je een mens\?</string>
     <string name="ftue_auth_password_reset_email_confirmation_subtitle">Volg de instructies die naar %s zijn verstuurd</string>
     <string name="ftue_auth_password_reset_confirmation">Wachtwoord reset</string>
     <string name="ftue_auth_forgot_password">Wachtwoord vergeten</string>
-    <string name="ftue_auth_email_resend_email">Email opnieuw verzenden</string>
+    <string name="ftue_auth_email_resend_email">E-mail opnieuw verzenden</string>
     <string name="ftue_auth_email_verification_footer">Geen e-mail ontvangen\?</string>
     <string name="ftue_auth_email_verification_subtitle">Volg de instructies die naar %s zijn gestuurd</string>
-    <string name="ftue_auth_email_verification_title">Verifieer uw e-mailadres</string>
+    <string name="ftue_auth_email_verification_title">Verifieer je e-mailadres</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Code nogmaals versturen</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Er is een code verzonden naar %s</string>
-    <string name="ftue_auth_phone_confirmation_title">Bevestig uw telefoonnummer</string>
+    <string name="ftue_auth_phone_confirmation_title">Bevestig je telefoonnummer</string>
     <string name="ftue_auth_sign_out_all_devices">Alle apparaten uitloggen</string>
     <string name="ftue_auth_reset_password">Reset wachtwoord</string>
     <string name="ftue_auth_new_password_subtitle">Zorg ervoor dat het 8 tekens of meer zijn.</string>
     <string name="ftue_auth_new_password_title">Kies een nieuw wachtwoord</string>
     <string name="ftue_auth_new_password_entry_title">Nieuw wachtwoord</string>
-    <string name="ftue_auth_reset_password_breaker_title">Controleer uw e-mail.</string>
-    <string name="ftue_auth_reset_password_email_subtitle">%s stuurt u een verificatielink</string>
+    <string name="ftue_auth_reset_password_breaker_title">Controleer je e-mail.</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s stuurt je een verificatielink</string>
     <string name="ftue_auth_phone_confirmation_entry_title">Bevestigingscode</string>
     <string name="ftue_auth_phone_entry_title">Telefoonnummer</string>
-    <string name="ftue_auth_phone_subtitle">%s moet uw account verifiëren</string>
-    <string name="ftue_auth_phone_title">Vul uw telefoonnummer in</string>
+    <string name="ftue_auth_phone_subtitle">%s moet je account verifiëren</string>
+    <string name="ftue_auth_phone_title">Vul je telefoonnummer in</string>
     <string name="ftue_auth_email_entry_title">E-mail</string>
-    <string name="ftue_auth_email_subtitle">%s moet uw account verifiëren</string>
-    <string name="ftue_auth_email_title">Vul uw e-mailadres in</string>
+    <string name="ftue_auth_email_subtitle">%s moet jouw account verifiëren</string>
+    <string name="ftue_auth_email_title">Vul jouw e-mailadres in</string>
     <string name="ftue_auth_terms_subtitle">Lees de voorwaarden en het beleid van %s door</string>
-    <string name="ftue_auth_terms_title">Serverbeleid</string>
+    <string name="ftue_auth_terms_title">Serverbeleiden</string>
     <string name="ftue_auth_choose_server_ems_cta">Neem contact op</string>
     <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) is een robuuste en betrouwbare hostingservice voor snelle, veilige en realtime communicatie. Ontdek hoe op <a href="${ftue_ems_url}">element.io/ems</a></string>
-    <string name="ftue_auth_choose_server_ems_title">Wilt u uw eigen server hosten\?</string>
+    <string name="ftue_auth_choose_server_ems_title">Wil je jouw eigen server hosten\?</string>
     <string name="ftue_auth_choose_server_entry_hint">Server URL</string>
-    <string name="ftue_auth_choose_server_subtitle">Wat is het adres van uw server\? Dit is als uw huis voor al uw data</string>
-    <string name="ftue_auth_choose_server_title">Selecteer uw server</string>
+    <string name="ftue_auth_choose_server_subtitle">Wat is het adres van jouw server\? Dit is als een huis voor al jouw data</string>
+    <string name="ftue_auth_choose_server_title">Selecteer je server</string>
     <string name="ftue_auth_welcome_back_title">Welkom terug!</string>
     <string name="ftue_auth_create_account_edit_server_selection">Bewerk</string>
     <string name="ftue_auth_create_account_sso_section_header">Of</string>
-    <string name="ftue_auth_create_account_choose_server_header">Waar uw gesprekken zijn opgeslagen</string>
+    <string name="ftue_auth_create_account_choose_server_header">Waar jouw gesprekken worden opgeslagen</string>
     <string name="ftue_auth_create_account_password_entry_footer">Moet 8 tekens of meer zijn</string>
-    <string name="ftue_auth_create_account_username_entry_footer">Anderen kunnen u ontdekken %s</string>
+    <string name="ftue_auth_create_account_username_entry_footer">Anderen kunnen je ontdekken %s</string>
     <string name="ftue_auth_create_account_title">Maak een account aan</string>
     <string name="font_size_use_system">Systeemstandaard gebruiken</string>
     <string name="font_size_section_manually">Handmatig kiezen</string>
@@ -2592,15 +2585,261 @@
     <string name="labs_enable_element_call_permission_shortcuts">Snelkoppelingen voor Element Oproep machtigingen inschakelen</string>
     <string name="live_location_description">Live locatie</string>
     <string name="verify_invalid_qr_notice">Deze QR-code lijkt misvormd. Probeer te verifiëren met een andere methode.</string>
-    <string name="crosssigning_cannot_verify_this_session_desc">U hebt geen toegang tot de gecodeerde berichtgeschiedenis. Reset uw Veilige Berichten Back-up en verificatiesleutels om opnieuw te beginnen.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Je hebt geen toegang tot de gecodeerde berichtgeschiedenis. Reset je Veilige Berichten Back-up en verificatiesleutels om opnieuw te beginnen.</string>
     <string name="crosssigning_cannot_verify_this_session">Kan dit apparaat niet verifiëren</string>
-    <string name="ftue_auth_choose_server_sign_in_subtitle">Wat is het adres van uw server\?</string>
-    <string name="ftue_auth_sign_in_choose_server_header">Waar uw conversaties leven</string>
-    <string name="updating_your_data">Uw gegevens bijwerken…</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Wat is het adres van jouw server\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Waar jouw gesprekken zijn opgeslagen</string>
+    <string name="updating_your_data">Jouw gegevens bijwerken…</string>
     <plurals name="search_space_multiple_parents">
         <item quantity="one">%1$s en %2$d andere</item>
         <item quantity="other">%1$s en %2$d andere</item>
     </plurals>
     <string name="search_space_two_parents">%1$s en %2$s</string>
     <string name="auth_reset_password_error_unverified">E-mailadres niet geverifieerd, controleer je inbox</string>
+    <string name="location_share_loading_map_error">Kan kaart niet laden
+\nDeze server is mogelijk niet geconfigureerd om kaarten weer te geven.</string>
+    <string name="a11y_open_settings">Open instellingen</string>
+    <string name="device_manager_sessions_other_description">Voor de beste beveiliging verifieer je jouw sessies en meld je jezelf af bij elke sessie die je niet meer herkent of gebruikt.</string>
+    <string name="device_manager_sessions_other_title">Andere sessies</string>
+    <string name="settings_sessions_list">Sessies</string>
+    <string name="a11y_open_spaces">Lijst met publieke spaces</string>
+    <string name="a11y_create_message">Nieuw gesprek of nieuwe kamer aanmaken</string>
+    <string name="room_list_filter_people">Personen</string>
+    <string name="room_list_filter_favourites">Favorieten</string>
+    <string name="room_list_filter_unreads">Ongelezen</string>
+    <string name="room_list_filter_all">Alles</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Activiteit</string>
+    <string name="home_layout_preferences_sort_by">Sorteer op</string>
+    <string name="home_layout_preferences_recents">Recente tonen</string>
+    <string name="home_layout_preferences_filters">Filters weergeven</string>
+    <string name="home_layout_preferences">Lay-outvoorkeuren</string>
+    <string name="explore_rooms">Ontdek kamers</string>
+    <string name="create_room">Kamer creëren</string>
+    <string name="start_chat">Gesprek starten</string>
+    <string name="all_chats">Alle gesprekken</string>
+    <string name="onboarding_new_app_layout_feedback_message">Je kan feedback geven via het menu rechtsboven.</string>
+    <string name="onboarding_new_app_layout_spaces_message">Krijg sneller en gemakkelijker toegang tot jouw spaces (rechtsonder).</string>
+    <string name="onboarding_new_app_layout_welcome_message">Om ${app_name} te versimpelen zijn tabbladen nu optioneel. Je kan ze beheren in het menu rechtsboven.</string>
+    <string name="home_empty_no_unreads_message">Hier zullen jouw ongelezen berichten verschijnen wanneer je deze hebt.</string>
+    <string name="home_empty_no_rooms_message">De allesomvattende beveiligde chat-app voor teams, vrienden en organisaties. Maak een gesprek aan of word deelnemer van een bestaande kamer om te beginnen.</string>
+    <string name="home_empty_space_no_rooms_message">Spaces zijn een nieuwe manier om kamers en personen te groeperen. Voeg een bestaande kamer toe, of maak een nieuwe aan via de knop rechtsonder.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Overweeg uit te loggen van oude sessies (%1$d of meer dagen) welke je niet meer gebruikt.</item>
+        <item quantity="other">Overweeg uit te loggen van oude sessies (%1$d of meer dagen) welke je niet meer gebruikt.</item>
+    </plurals>
+    <string name="device_manager_unverified_sessions_description">Verifieer of log uit van ongeverifieerde sessies.</string>
+    <string name="device_manager_header_section_security_recommendations_description">Verbeter je accountbeveiliging door deze aanbevelingen te volgen.</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Al %1$d+ dag inactief (%2$s)</item>
+        <item quantity="other">Al %1$d+ dagen inactief (%2$s)</item>
+    </plurals>
+    <string name="device_manager_header_section_security_recommendations_title">Beveiligingsaanbevelingen</string>
+    <string name="device_manager_unverified_sessions_title">Niet-geverifieerde sessies</string>
+    <string name="device_manager_inactive_sessions_title">Inactieve sessies</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nziet er vrij leeg uit.</string>
+    <string name="home_empty_no_rooms_title">Welkom bij ${app_name},
+\n%s.</string>
+    <string name="home_empty_no_unreads_title">Niets te melden.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Welkom bij een nieuw uiterlijk!</string>
+    <string name="onboarding_new_app_layout_spaces_title">Toegang tot ruimten</string>
+    <string name="onboarding_new_app_layout_feedback_title">Feedback geven</string>
+    <string name="onboarding_new_app_layout_button_try">Uitproberen</string>
+    <string name="device_manager_other_sessions_description_unverified">Niet-geverifieerd · Laatste activiteit %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Geverifieerd · Laatste activiteit %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Alle bekijken (%1$d)</string>
+    <string name="device_manager_view_details">Details bekijken</string>
+    <string name="device_manager_verify_session">Sessie verifiëren</string>
+    <string name="timeline_error_room_not_found">Sorry, deze kamer kon niet worden gevonden.
+\nProbeer het later opnieuw. %s</string>
+    <string name="invites_empty_message">Dit is waar jouw nieuwe verzoeken en uitnodigingen zullen verschijnen.</string>
+    <string name="space_list_empty_message">Spaces zijn een nieuwe manier om kamers en personen te groeperen. Maak een space aan om te beginnen.</string>
+    <string name="device_manager_verification_status_unverified">Ongeverifieerde sessie</string>
+    <string name="device_manager_verification_status_verified">Geverifieerde sessie</string>
+    <string name="a11y_device_manager_device_type_unknown">Onbekend apparaattype</string>
+    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobiel</string>
+    <string name="invites_empty_title">Niets nieuws.</string>
+    <string name="invites_title">Uitnodigingen</string>
+    <string name="space_list_empty_title">Nog geen spaces.</string>
+    <string name="a11y_collapse_space_children">%s subitems inklappen</string>
+    <string name="a11y_expand_space_children">%s subitems uitvouwen</string>
+    <string name="change_space">Space veranderen</string>
+    <string name="command_description_table_flip">Voeg (╯°□°）╯︵ ┻━┻ toe voor elk platte tekst bericht</string>
+    <string name="attachment_type_voice_broadcast">Spraakuitzending</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} heeft toestemming nodig om notificaties te laten zien.
+\nGeef alsjeblieft toestemming.</string>
+    <string name="labs_enable_rich_text_editor_summary">Probeer de rich-text-editor (platte tekst-modus binnenkort beschikbaar)</string>
+    <string name="labs_enable_rich_text_editor_title">Rich-text-editor inschakelen</string>
+    <string name="labs_enable_deferred_dm_title">Uitgestelde privéberichten inschakelen</string>
+    <string name="labs_enable_new_app_layout_summary">Een vereenvoudigde Element met optionele tabs</string>
+    <string name="labs_enable_new_app_layout_title">Nieuwe layout inschakelen</string>
+    <string name="qr_code_login_confirm_security_code">Bevestigen</string>
+    <string name="qr_code_login_try_again">Opnieuw proberen</string>
+    <string name="qr_code_login_signing_in">Je wordt ingelogd</string>
+    <string name="qr_code_login_connecting_to_device">Verbinden met apparaat</string>
+    <string name="qr_code_login_scan_qr_code_button">Scan QR-code</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Inloggen op een mobiel apparaat\?</string>
+    <string name="qr_code_login_show_qr_code_button">Toon QR-code op dit apparaat</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Begin op het inlogscherm</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Begin op het inlogscherm</string>
+    <string name="qr_code_login_new_device_instruction_2">Ga naar Instellingen -&gt; Veiligheid &amp; privacy</string>
+    <string name="qr_code_login_new_device_instruction_1">Open de app op je andere apparaat</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Het inloggen is afgebroken op het andere apparaat.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Die QR-code is ongeldig.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Het andere apparaat moet ingelogd zijn.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Het andere apparaat is al ingelogd.</string>
+    <string name="qr_code_login_header_failed_other_description">De aanvraag is mislukt.</string>
+    <string name="qr_code_login_header_failed_denied_description">De aanvraag is op het andere apparaat geweigerd.</string>
+    <string name="qr_code_login_header_failed_timeout_description">De verbinding kon niet in de benodigde tijd tot stand worden gebracht.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Verbinden met dit apparaat wordt niet ondersteund.</string>
+    <string name="qr_code_login_header_failed_title">Verbinding mislukt</string>
+    <string name="qr_code_login_header_connected_title">Beveiligde verbinding tot stand gebracht</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scan de onderstaande QR-code met je uitgelogde apparaat.</string>
+    <string name="qr_code_login_header_show_qr_code_title">Inloggen met QR-code</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Gebruik de camera op dit apparaat om de op het andere apparaat getoonde QR-code te scannen:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Scan QR-code</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Geverifieerde sessies</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Niet-geverifieerde sessies</string>
+    <string name="device_manager_learn_more_sessions_inactive">Inactieve sessies zijn sessies die je al een tijd niet gebruikt hebt, maar deze blijven encryptiesleutels ontvangen.
+\n
+\nVerwijder inactieve sessies om de veiligheid en prestaties te verbeteren. Het helpt je ook met het herkennen van mogelijk verdachte nieuwe sessies.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Inactieve sessies</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Je kan dit apparaat gebruiken om in te loggen op een ander apparaat met een QR-code. Er zijn twee manier om dit te doen:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Log in met QR-code</string>
+    <string name="device_manager_session_rename_warning">Wees bewust dat sessienamen ook zichtbaar zijn voor personen met wie je communiceert.</string>
+    <string name="device_manager_session_rename_edit_hint">Sessienaam</string>
+    <string name="device_manager_session_details_device_ip_address">IP-adres</string>
+    <string name="device_manager_session_details_device_operating_system">Besturingssysteem</string>
+    <string name="device_manager_session_details_application_version">Versie</string>
+    <string name="device_manager_session_details_application_name">Naam</string>
+    <string name="device_manager_session_details_application">Applicatie</string>
+    <string name="device_manager_session_details_session_name">Sessienaam</string>
+    <string name="device_manager_push_notifications_description">Ontvang pushnotificaties op deze sessie.</string>
+    <string name="device_manager_push_notifications_title">Pushnotificaties</string>
+    <string name="device_manager_session_details_title">Sessiedetails</string>
+    <string name="device_manager_session_overview_signout">Uitloggen voor deze sessie</string>
+    <string name="device_manager_other_sessions_clear_filter">Filter wissen</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Geen inactieve sessies gevonden.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Geen niet-geverifieerde sessies gevonden.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Geen geverifieerde sessies gevonden.</string>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inactief</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Niet geverifieerd</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Geverifieerd</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">%1$d dag of langer inactief</item>
+        <item quantity="other">%1$d dagen of langer inactief</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inactief</string>
+    <string name="device_manager_filter_option_unverified_description">Niet klaar voor veilige communicatie</string>
+    <string name="device_manager_filter_option_unverified">Niet geverifieerd</string>
+    <string name="device_manager_filter_option_verified_description">Klaar voor veilige communicatie</string>
+    <string name="device_manager_filter_option_verified">Geverifieerd</string>
+    <string name="device_manager_filter_option_all_sessions">Alle sessies</string>
+    <string name="device_manager_device_title">Apparaat</string>
+    <string name="device_manager_session_title">Sessie</string>
+    <string name="device_manager_current_session_title">Huidige Sessie</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Niet geverifeerd · Jouw huidige sessie</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifieer je huidige sessie voor verbeterde veilige communicatie.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Deze sessie is klaar voor veilige communicatie.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Je huidige sessie is klaar voor veilige communicatie.</string>
+    <string name="device_manager_verification_status_unknown">Onbekende verificatiestatus</string>
+    <string name="a11y_voice_broadcast_buffering">Bufferen</string>
+    <string name="voice_broadcast_live">Live</string>
+    <string name="key_authenticity_not_guaranteed">De authenticiteit van dit versleutelde bericht kan niet worden gegarandeerd op dit apparaat.</string>
+    <string name="settings_security_incognito_keyboard_title">Incognito toetsenbord</string>
+    <string name="login_scan_qr_code">Scan QR-code</string>
+    <string name="push_gateway_item_enabled">Ingeschakeld:</string>
+    <string name="push_gateway_item_device_id">Sessie ID:</string>
+    <string name="error_check_network">Er is iets fout gegaan. Controleer je netwerkverbinding en probeer het opnieuw.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Er zijn niet-geverifieerde apparaten in deze kamer. Deze zullen niet in staat zijn de door jouw verzonden berichten te ontsleutelen.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Stuur nooit versleutelde berichten naar niet-geverifieerde sessie in deze kamer.</string>
+    <string name="grant_permission">Toestemming geven</string>
+    <string name="permissions_rationale_msg_notification">${app_name} heeft toestemming nodig om notificaties te laten zien. Notificaties kunnen je berichten, uitnodigen, etc. tonen. 
+\n
+\nGeeft toestemming bij de volgende pop-ups om notificaties te kunnen zien.</string>
+    <string name="action_got_it">Begrepen</string>
+    <string name="rich_text_editor_format_underline">Onderstreep formaat toepassen</string>
+    <string name="rich_text_editor_format_strikethrough">Doorhaal formaat toepassen</string>
+    <string name="rich_text_editor_format_italic">Cursief formaat toepassen</string>
+    <string name="rich_text_editor_format_bold">Vet formaat toepassen</string>
+    <string name="qr_code_login_confirm_security_code_description">Zorg ervoor dat je de herkomst van deze code kent. Door apparaten te koppelen, geef je iemand volledige toegang tot jouw account.</string>
+    <string name="qr_code_login_status_no_match">Geen match\?</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Selecteer \'QR-code scannen\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Selecteer \'Aanmelden met QR-code\'</string>
+    <string name="qr_code_login_new_device_instruction_3">Selecteer \'Toon QR-code\'</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">De server ondersteunt geen inloggen met QR-code.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Er is een beveiligingsprobleem opgetreden bij het instellen van beveiligde berichtenuitwisseling. Een van de volgende zaken kan in geschonden zijn: je server; je internetverbinding(en); je apparaat(en);</string>
+    <string name="qr_code_login_header_connected_description">Controleer je aangemelde apparaat, de onderstaande code zou moeten worden weergegeven. Bevestig dat de onderstaande code overeenkomt met dat apparaat:</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Gebruik je aangemelde apparaat om de onderstaande QR-code te scannen:</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="labs_enable_voice_broadcast_summary">In staat zijn om spraakuitzendingen op te nemen en te verzenden in de tijdlijn van de kamer.</string>
+    <string name="labs_enable_voice_broadcast_title">Spraakuitzending inschakelen</string>
+    <string name="labs_enable_client_info_recording_summary">Noteer de naam, versie en url van de applicatie om sessies gemakkelijker te herkennen in sessiebeheer.</string>
+    <string name="labs_enable_client_info_recording_title">Opname van applicatie informatie inschakelen</string>
+    <string name="labs_enable_session_manager_summary">Meer zichtbaarheid en controle over al je sessies.</string>
+    <string name="labs_enable_session_manager_title">Nieuwe sessiemanager inschakelen</string>
+    <string name="device_manager_learn_more_session_rename">Andere gebruikers in privéchats en chatruimten waaraan jij deelneemt, kunnen een volledige lijst van je sessies bekijken.
+\n
+\nDit geeft ze het vertrouwen dat ze echt met jou praten, maar het betekent ook dat ze de sessienaam kunnen zien die je hier invoert.</string>
+    <string name="device_manager_learn_more_session_rename_title">Sessies hernoemen</string>
+    <string name="device_manager_learn_more_sessions_verified">Geverifieerde sessies zijn ingelogd met jouw inloggegevens en vervolgens geverifieerd, hetzij met je veilige wachtwoordzin of door kruisverificatie.
+\n
+\nDit betekent dat ze coderingssleutels bevatten voor je eerdere berichten en bevestigen aan andere gebruikers waarmee je communiceert dat deze sessies echt van jou zijn.</string>
+    <string name="device_manager_learn_more_sessions_unverified">Niet-geverifieerde sessies zijn sessies die zijn aangemeld met jouw inloggegevens, maar niet zijn geverifieerd.
+\n
+\nJe moet er vooral zeker van zijn dat je deze sessies herkent, omdat ze een ongeoorloofd gebruik van je account kunnen vertegenwoordigen.</string>
+    <string name="device_manager_session_rename_description">Met aangepaste sessienamen kan je jouw apparaten gemakkelijker herkennen.</string>
+    <string name="device_manager_session_rename">Sessie hernoemen</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_session_last_activity">Laatste activiteit</string>
+    <string name="device_manager_session_details_description">Informatie over toepassing, apparaat en activiteit.</string>
+    <string name="device_manager_other_sessions_select">Sessies selecteren</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Overweeg om je af te melden bij oude sessies (%1$d dag of meer) die je niet meer gebruikt.</item>
+        <item quantity="other">Overweeg om je af te melden bij oude sessies (%1$d dagen of meer) die je niet meer gebruikt.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifieer je sessies voor verbeterde beveiligde berichtenuitwisseling of meld je af bij sessies die je niet meer herkent of gebruikt.</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Voor de beste beveiliging log je uit bij elke sessie die je niet meer herkent of gebruikt.</string>
+    <string name="a11y_device_manager_filter">Filter</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filter</string>
+    <string name="device_manager_session_last_activity">Laatste activiteit %1$s</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifieer je huidige sessie om de verificatiestatus van deze sessie weer te geven.</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verifieer of meld je af bij deze sessie voor de beste beveiliging en betrouwbaarheid.</string>
+    <string name="attachment_type_selector_contact">Contact</string>
+    <string name="attachment_type_selector_camera">Camera</string>
+    <string name="attachment_type_selector_location">Locatie</string>
+    <string name="attachment_type_selector_poll">Peilingen</string>
+    <string name="attachment_type_selector_voice_broadcast">Spraakuitzending</string>
+    <string name="attachment_type_selector_file">Bijlagen</string>
+    <string name="attachment_type_selector_sticker">Stikkers</string>
+    <string name="attachment_type_selector_gallery">Fotobibliotheek</string>
+    <string name="tooltip_attachment_voice_broadcast">Een spraakuitzending starten</string>
+    <string name="a11y_pause_voice_broadcast">Spraakuitzending pauzeren</string>
+    <string name="a11y_play_voice_broadcast">Spraakuitzending afspelen of hervatten</string>
+    <string name="a11y_stop_voice_broadcast_record">Opname van spraakuitzending stoppen</string>
+    <string name="a11y_pause_voice_broadcast_record">Opname van spraakuitzending pauzeren</string>
+    <string name="a11y_resume_voice_broadcast_record">Opname van spraakuitzending hervatten</string>
+    <string name="settings_security_incognito_keyboard_summary">Verzoek dat het toetsenbord geen gepersonaliseerde gegevens, zoals typgeschiedenis en woordenboek, bijwerkt op basis van wat je in gesprekken hebt getypt. Opgelet dat sommige toetsenborden deze instelling mogelijk niet respecteren.</string>
+    <string name="command_description_devtools">Open het scherm met ontwikkelaarstools</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Je hebt de codering voor geverifieerde sessies enkel voor alle kamers ingeschakeld in Beveiligingsinstellingen.</string>
+    <string name="labs_enable_deferred_dm_summary">Maak directe chat alleen aan bij een bericht</string>
+    <string name="action_deselect_all">Deselecteer alles</string>
+    <string name="action_select_all">Selecteer alles</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d geselecteerd</item>
+        <item quantity="other">%1$d geselecteerd</item>
+    </plurals>
+    <string name="settings_nightly_build">Nightly-versie</string>
+    <string name="quoting">Quoten</string>
+    <string name="replying_to">Reageren op %s</string>
+    <string name="editing">Bewerking</string>
+    <string name="settings_enable_direct_share_summary">Recente gesprekken in het deelmenu van het systeem tonen</string>
+    <string name="settings_enable_direct_share_title">Direct delen inschakelen</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-nl/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-nl/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-nl/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-nl/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-nn/strings.xml b/library/ui-strings/src/main/res/values-nn/strings.xml
similarity index 99%
rename from vector/src/main/res/values-nn/strings.xml
rename to library/ui-strings/src/main/res/values-nn/strings.xml
index c7d96037e2..45c8679736 100644
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/library/ui-strings/src/main/res/values-nn/strings.xml
@@ -90,8 +90,6 @@
     <string name="matrix_only_filter">Berre Matrix-kontaktar</string>
     <string name="no_result_placeholder">Ingen treff</string>
     <string name="rooms_header">Rom</string>
-
-    <string name="groups_header">Fellesskap</string>
     <string name="send_bug_report_include_logs">Send loggar</string>
     <string name="send_bug_report_include_crash_logs">Send krasjrapportar</string>
     <string name="send_bug_report_include_screenshot">Send skjermbilde</string>
@@ -131,7 +129,6 @@
     <string name="auth_forgot_password">Gløymt passord\?</string>
 
     <string name="auth_recaptcha_message">Heimtenaren ynskjer å stadfeste at du ikkje er ein robot</string>
-    <string name="auth_reset_password_missing_email">Du må skriva inn e-postadressa som er knytt til brukaren din.</string>
     <string name="auth_reset_password_error_unauthorized">Fekk ikkje til å stadfesta e-postadressa: sjå til at du klikka på lenken i e-posten</string>
     <string name="login_error_invalid_home_server">Skriv inn ein gyldig URL</string>
     <string name="login_error_bad_json">Feilformatert JSON</string>
@@ -313,7 +310,7 @@
     <string name="settings_theme">Preg</string>
     <string name="encryption_information_decryption_error">Noko gjekk gale med dekrypteringa</string>
     <string name="encryption_information_device_name">Offentleg namn</string>
-    <string name="encryption_information_device_id">Økt-ID</string>
+    <string name="device_manager_session_details_session_id">Økt-ID</string>
     <string name="encryption_information_device_key">Sesjonsnøkkel</string>
     <string name="encryption_export_e2e_room_keys">Eksporter E2E-romnøkklar</string>
     <string name="encryption_export_room_keys">Eksporter romnøkklar</string>
diff --git a/vector/src/main/res/values-nn/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-nn/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-nn/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-nn/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-pa/strings.xml b/library/ui-strings/src/main/res/values-pa/strings.xml
similarity index 100%
rename from vector/src/main/res/values-pa/strings.xml
rename to library/ui-strings/src/main/res/values-pa/strings.xml
diff --git a/vector/src/main/res/values-pa/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-pa/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-pa/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-pa/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-pl/strings.xml b/library/ui-strings/src/main/res/values-pl/strings.xml
similarity index 94%
rename from vector/src/main/res/values-pl/strings.xml
rename to library/ui-strings/src/main/res/values-pl/strings.xml
index 71669740db..4b26562b06 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/library/ui-strings/src/main/res/values-pl/strings.xml
@@ -39,7 +39,7 @@
     <string name="notice_room_third_party_invite">%1$s wysłał(a) zaproszenie do %2$s aby dołączył(a) do tego pokoju</string>
     <string name="notice_room_third_party_registered_invite">%1$s zaakceptował(a) zaproszenie dla %2$s</string>
     <string name="notice_crypto_error_unknown_inbound_session_id">Urządzenie nadawcy nie wysłało nam kluczy do tej wiadomości.</string>
-    <string name="notice_room_update">%s zakutalizował(a) ten pokój.</string>
+    <string name="notice_room_update">%s zaktualizował(a) ten pokój.</string>
     <string name="initial_sync_start_importing_account">Wstępna synchronizacja:
 \nImportowanie konta…</string>
     <string name="initial_sync_start_importing_account_crypto">Wstępna synchronizacja:
@@ -53,8 +53,6 @@
 \nImportowanie zaproszonych pokojów</string>
     <string name="initial_sync_start_importing_account_left_rooms">Wstępna synchronizacja:
 \nImportowanie opuszczonych pokojów</string>
-    <string name="initial_sync_start_importing_account_groups">Wstępna synchronizacja:
-\nImportowanie grup</string>
     <string name="initial_sync_start_importing_account_data">Wstępna synchronizacja:
 \nImportowanie danych Konta</string>
     <string name="event_status_sending_message">Wysyłanie wiadomości…</string>
@@ -123,7 +121,6 @@
     <string name="auth_email_already_defined">Ten adres e-mail został już użyty.</string>
     <string name="auth_forgot_password">Zapomniałeś(-aś) hasła?</string>
     <string name="auth_recaptcha_message">Serwer domowy prosi o potwierdzenie, że nie jesteś robotem</string>
-    <string name="auth_reset_password_missing_email">Musi zostać wprowadzony e-mail powiązany z kontem.</string>
     <string name="auth_reset_password_error_unauthorized">Nie udało się zweryfikować adresu e-mail: upewnij się, że kliknąłeś w odnośnik z wiadomości</string>
     <string name="login_error_invalid_home_server">Proszę wprowadzić prawidłowy adres URL</string>
     <string name="login_error_not_json">Nie zawiera prawidłowego JSON</string>
@@ -148,7 +145,7 @@
     <string name="room_jump_to_first_unread">Przejdź do pierwszej nieprzeczytanej wiadomości</string>
     <string name="room_participants_leave_prompt_title">Opuść pokój</string>
     <string name="room_participants_leave_prompt_msg">Czy na pewno chcesz opuścić pokój?</string>
-    <string name="room_participants_header_direct_chats">WIADOMOŚCI BEZPOŚREDNIE</string>
+    <string name="room_participants_header_direct_chats">Wiadomości bezpośrednie</string>
     <string name="room_participants_action_invite">Zaproś</string>
     <string name="room_participants_action_ban">Blokuj</string>
     <string name="room_participants_action_unban">Odbanuj</string>
@@ -234,7 +231,7 @@
     <string name="room_settings_set_main_address">Ustaw jako główny adres</string>
     <string name="settings_theme">Motyw</string>
     <string name="encryption_information_device_name">Nazwa publiczna</string>
-    <string name="encryption_information_device_id">ID sesji</string>
+    <string name="device_manager_session_details_session_id">ID sesji</string>
     <string name="encryption_export_export">Eksportuj</string>
     <string name="passphrase_enter_passphrase">Wprowadź hasło</string>
     <string name="passphrase_confirm_passphrase">Potwierdź hasło</string>
@@ -268,7 +265,6 @@
     <string name="notification_silent_notifications">Ciche powiadomienia</string>
     <string name="title_activity_bug_report">Zgłoś błąd</string>
     <string name="loading">Wczytywanie…</string>
-    <string name="groups_header">Społeczności</string>
     <string name="send_bug_report_rage_shake">Potrząśnij wściekle, aby zgłosić błąd</string>
     <string name="start_voice_call_prompt_msg">Czy jesteś pewien, że chcesz rozpocząć rozmowę głosową?</string>
     <string name="start_video_call_prompt_msg">Czy jesteś pewien, że chcesz rozpocząć wideorozmowę?</string>
@@ -349,7 +345,7 @@
     <string name="encryption_import_room_keys_summary">Importuj klucze z lokalnego pliku</string>
     <string name="encryption_import_import">Importuj</string>
     <string name="encryption_never_send_to_unverified_devices_title">Szyfruj wiadomości tylko do zaufanych sesji</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych sesji w tym pokoju z tej sesji.</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Nigdy nie wysyłaj szyfrowanych wiadomości do sesji (np urządzeń innych użytkowników) które nie zostały zweryfikowane.</string>
     <string name="encryption_information_verify_device_warning">Aby sprawdzić czy ta sesja jest zaufana, skontaktuj się z jej właścicielem używając innych form (np. osobiście lub telefonicznie) i zapytaj czy klucz, który widzą w ustawieniach użytkownika dla tego urządzenia pasuje do klucza poniżej:</string>
     <string name="encryption_information_verify_device_warning2">Jeśli klucz pasuje, potwierdź to przyciskiem poniżej. Jeśli nie, to ktoś inny najprawdopodobniej przejmuje lub podszywa się pod tą sesję i powinieneś dodać tę sesję do czarnej listy. W przyszłości proces weryfikacji będzie bardziej skomplikowany.</string>
     <string name="title_activity_choose_sticker">Wyślij naklejkę</string>
@@ -552,8 +548,7 @@
     <string name="room_list_rooms_empty_title">Pokoje</string>
     <string name="message_add_reaction">Dodaj reakcję</string>
     <string name="create_new_room">Utwórz nowy pokój</string>
-    <string name="group_all_communities">Wszystkie społeczności</string>
-    <string name="fab_menu_create_chat">Wiadomości Bezpośrednie</string>
+    <string name="fab_menu_create_chat">Wiadomości bezpośrednie</string>
     <string name="create_room_action_create">STWÓRZ</string>
     <string name="create_room_name_hint">Nazwa</string>
     <string name="create_room_public_title">Publiczny</string>
@@ -627,7 +622,7 @@
     <string name="error_no_network">Brak sieci. Sprawdź swoje połączenie z Internetem.</string>
     <string name="please_wait">Proszę czekać…</string>
     <string name="room_preview_no_preview">Tego pokoju nie można podejrzeć</string>
-    <string name="settings_security_and_privacy">Bezpieczeństwo i Prywatność</string>
+    <string name="settings_security_and_privacy">Bezpieczeństwo i prywatność</string>
     <string name="settings_push_rules_no_rules">Brak reguł push</string>
     <string name="send_file_step_idle">Oczekiwanie…</string>
     <string name="send_file_step_sending_thumbnail">Wysyłanie miniatury (%1$s / %2$s)</string>
@@ -659,7 +654,7 @@
     <string name="keys_backup_setup_step3_please_make_copy">Proszę wykonać kopię</string>
     <string name="settings_preferences">Preferencje</string>
     <string name="preference_voice_and_video">Głos i wideo</string>
-    <string name="bottom_action_people_x">Wiadomości Bezpośrednie</string>
+    <string name="bottom_action_people_x">Wiadomości bezpośrednie</string>
     <string name="room_filtering_filter_hint">Filtruj rozmowy…</string>
     <string name="room_filtering_footer_create_new_direct_message">Wyślij nową wiadomość bezpośrednią</string>
     <string name="settings_sdk_version">Wersja Matrix SDK</string>
@@ -737,10 +732,10 @@
     <string name="settings_send_message_with_enter">Wysyłaj wiadomości za pomocą klawisza enter</string>
     <string name="settings_send_message_with_enter_summary">Przycisk enter na klawiaturze programowej wyśle wiadomość zamiast wprowadzania łamanania linii</string>
     <string name="settings_discovery_category">Ustawienia wyszukiwania</string>
-    <string name="settings_discovery_manage">Ustal jak inni mogą odnaleść twoje konto.</string>
+    <string name="settings_discovery_manage">Ustal jak inni mogą odnaleźć twoje konto.</string>
     <string name="settings_media">Media</string>
     <string name="settings_default_media_source">Domyślne źródło mediów</string>
-    <string name="encryption_message_recovery">Odzyskiwanie zaszyforwanych wiadomości</string>
+    <string name="encryption_message_recovery">Odzyskiwanie zaszyfrowanych wiadomości</string>
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s: %2$d wiadomość</item>
         <item quantity="few">%1$s: %2$d wiadomości</item>
@@ -839,14 +834,14 @@
     <string name="import_e2e_keys_from_file">Importowanie kluczy E2E z pliku \"%1$s\".</string>
     <string name="settings_other_third_party_notices">Informacje o stronach trzecich</string>
     <string name="navigate_to_room_when_already_in_the_room">Już wyświetlasz ten pokój!</string>
-    <string name="push_gateway_item_app_id">id_aplikacji:</string>
-    <string name="push_gateway_item_push_key">klucz_push:</string>
+    <string name="push_gateway_item_app_id">App ID:</string>
+    <string name="push_gateway_item_push_key">Push Key:</string>
     <string name="push_gateway_item_app_display_name">wyświetlana_nazwa_aplikacji:</string>
     <string name="push_gateway_item_device_name">nazwa_sesji:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Zarejestruj token</string>
-    <string name="send_suggestion_sent">Dziękujemy, sugestia została szczęśliwie wysłana</string>
+    <string name="send_suggestion_sent">Dziękujemy, sugestia została pomyślnie wysłana</string>
     <string name="send_suggestion_failed">Wysłanie sugestii nie powiodło się (%s)</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Wyświetl ukryte wydarzenia na linii czasowej</string>
     <string name="edited_suffix">(edytowano)</string>
@@ -1063,12 +1058,12 @@
     <string name="verification_request_you_accepted">Zaakceptowałeś(-łaś)</string>
     <string name="verification_sent">Żądanie weryfikacji wysłane</string>
     <string name="verification_request">Żądanie weryfikacji</string>
-    <string name="verification_verify_device">Zweryfikuj tą sesję</string>
+    <string name="verification_verify_device">Zweryfikuj tę sesję</string>
     <string name="verification_scan_notice">Zeskanuj kod z urządzenia innego użytkownika aby bezpiecznie zweryfikować siebie nawzajem</string>
     <string name="verification_scan_their_code">Zeskanuj ich kod</string>
     <string name="verification_scan_emoji_title">Nie można zeskanować</string>
     <string name="verification_scan_emoji_subtitle">Jeżeli nie jesteś z tą osobą, zamiast tego porównaj emoji</string>
-    <string name="verification_no_scan_emoji_title">Zweryfikuj porównując emoji</string>
+    <string name="verification_no_scan_emoji_title">Zweryfikuj porównując emotikony</string>
     <string name="verification_verify_user">Zweryfikuj %s</string>
     <string name="verification_verified_user">Zweryfikowano %s</string>
     <string name="verification_request_waiting_for">Oczekiwanie na %s…</string>
@@ -1104,7 +1099,7 @@
     <string name="room_settings_enable_encryption_dialog_title">Aktywować szyfrowanie\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Raz włączone szyfrowanie w pokoju nie może zostać wyłączone. Wiadomości wysłane w zaszyfrowanym pokoju nie są widziane przez serwer, a jedynie przez uczestników w pokoju. Aktywowanie szyfrowania może uniemożliwić wielu botom i mostkom prawidłowe działanie.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Aktywuj szyfrowanie</string>
-    <string name="verification_request_notice">Aby być bezpiecznym, zweryfikuj %s poprzez sprawdzenie jednorazowego kodu.</string>
+    <string name="verification_request_notice">Aby zachować bezpieczeństwo, zweryfikuj %s poprzez sprawdzenie jednorazowego kodu.</string>
     <string name="verification_request_start_notice">Aby być bezpiecznym, zrób to osobiście lub użyj innej metody komunikacji.</string>
     <string name="verification_emoji_notice">Porównaj unikalny ciąg emoji, upewniając się, że pojawiają się w identycznym porządku.</string>
     <string name="verification_code_notice">Porównaj kod wyświetlany na ekranie innego użytkownika.</string>
@@ -1125,7 +1120,7 @@
     <string name="settings_active_sessions_signout_device">Wyloguj z tej sesji</string>
     <string name="settings_failed_to_get_crypto_device_info">Brak dostępnej informacji o kryptografii</string>
     <string name="settings_active_sessions_verified_device_desc">Ta sesja jest zaufana dla bezpiecznej wymiany wiadomości, ponieważ ją zweryfikowałeś(-łaś):</string>
-    <string name="settings_active_sessions_unverified_device_desc">Zweryfikuj tą sesję aby oznaczyć ją jako zaufaną i przyznać jej dostęp do zaszyfrowanych wiadomości. Jeżeli nie logowałeś(-łaś) się do tej sesji, twoje konto mogło zostać naruszone:</string>
+    <string name="settings_active_sessions_unverified_device_desc">Zweryfikuj tę sesję aby oznaczyć ją jako zaufaną i przyznać jej dostęp do zaszyfrowanych wiadomości. Jeżeli nie logowałeś(-łaś) się do tej sesji, twoje konto mogło zostać zaatakowane:</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d aktywna sesja</item>
         <item quantity="few">%d aktywne sesje</item>
@@ -1335,12 +1330,12 @@
     <string name="recovery_passphrase">Hasło odzyskiwania</string>
     <string name="verification_cancelled">Weryfikacja anulowana</string>
     <string name="verify_cancelled_notice">Weryfikacja anulowana. Możesz rozpocząć jej proces ponownie.</string>
-    <string name="verify_not_me_self_verification">Jedno z poniższych mogło zostać skompromitowane:
+    <string name="verify_not_me_self_verification">Jedno z poniższych może być zagrożone:
 \n
-\n-Twoje hasło
-\n-Twój serwer domowy
-\n-To urządzenie albo inne urządzenie
-\n-Połączenie internetowe używane przez urządzenie
+\n- Twoje hasło
+\n- Twój serwer domowy
+\n- To lub drugie urządzenie
+\n- Połączenie internetowe używane przez dowolne z urządzeń
 \n
 \nZalecamy natychmiastową zmianę Twojego hasła oraz klucza odzyskiwania w Ustawieniach.</string>
     <string name="verify_cancel_self_verification_from_trusted">Jeżeli anulujesz, nie będziesz w stanie czytać zaszyfrowanych wiadomości na nowym urządzeniu, a inni użytkownicy nie będą mu ufali</string>
@@ -1375,7 +1370,7 @@
     <string name="settings_hs_admin_e2e_disabled">Twój administrator serwera zablokował domyślne szyfrowanie punkt-punkt (e2e) w pokojach prywatnych w Wiadomościach Bezpośrednich.</string>
     <string name="room_settings_enable_encryption_no_permission">Nie masz uprawnień żeby uaktywnić szyfrowanie w tym pokoju.</string>
     <string name="room_member_open_or_create_dm">Wiadomość bezpośrednia</string>
-    <string name="room_member_power_level_default_in">Domyślnie w %1$s</string>
+    <string name="room_member_power_level_default_in">Zwykły w %1$s</string>
     <string name="direct_room_profile_section_more_leave">Opuść</string>
     <string name="direct_room_profile_section_more_settings">Ustawienia</string>
     <string name="room_profile_section_admin">Operacje administratora</string>
@@ -1393,7 +1388,7 @@
     <string name="create_room_disable_federation_title">Zablokuj wszystkich nie będących członkami %s przed dołączeniem do tego pokoju</string>
     <string name="hide_advanced">Ukryj zaawansowane</string>
     <string name="show_advanced">Pokaż zaawansowane</string>
-    <string name="autodiscover_well_known_error">Nie można znaleźć właściwego serwera domowego. Zweryfikuj swój identyfikator</string>
+    <string name="autodiscover_well_known_error">Nie można znaleźć właściwego serwera domowego. Sprawdź swój identyfikator</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">To nie jest prawidłowy identyfikator użytkownika. Oczekiwany format: \"@user:homeserver.org\"</string>
     <string name="login_signin_matrix_id_password_notice">Jeżeli nie pamiętasz hasła, cofnij się aby je zresetować.</string>
     <string name="login_signin_matrix_id_hint">Matrix ID</string>
@@ -1497,7 +1492,7 @@
     <string name="disabled_integration_dialog_content">Włącz \"Zezwalaj na integracje\" w Ustawieniach żeby to zrobić.</string>
     <string name="disabled_integration_dialog_title">Integracje są zablokowane</string>
     <string name="reset_secure_backup_warning">To zastąpi obecny Klucz bądź Hasło.</string>
-    <string name="reset_secure_backup_title">Wygeneruj nowy Klucz Bezpieczeństwa albo Hasło dla istniejącej kopii zapasowej.</string>
+    <string name="reset_secure_backup_title">Wygeneruj nowy klucz bezpieczeństwa albo hasło dla istniejącej kopii zapasowej.</string>
     <string name="settings_secure_backup_section_info">Zabezpiecza przeciwko utracie dostępu do zaszyfrowanych wiadomości oraz danych poprzez zapisanie zaszyfrowanych kluczy na Twoim serwerze.</string>
     <string name="settings_troubleshoot_test_notification_notification_clicked">Powiadomienie zostało kliknięte!</string>
     <string name="settings_troubleshoot_test_notification_notice">Proszę kliknąć na powiadomieniu, Jeżeli nie widzisz powiadomienia, sprawdź ustawienia systemowe.</string>
@@ -1654,7 +1649,7 @@
     <string name="user_code_my_code">Mój kod</string>
     <string name="user_code_share">Udostępnij mój kod</string>
     <string name="user_code_scan">Zeskanuj kod QR</string>
-    <string name="invite_users_to_room_failure">Nie możemy zaprosić użytkowników. Zweryfikuj osoby, które chcesz zaprosić i spróbuj ponownie.</string>
+    <string name="invite_users_to_room_failure">Nie udało się zaprosić użytkowników. Sprawdź osoby, które chcesz zaprosić i spróbuj ponownie.</string>
     <plurals name="invitations_sent_to_one_and_more_users">
         <item quantity="one">Zaproszenia wysłane do %1$s i jeszcze jednej osoby</item>
         <item quantity="few">Zaproszenia wysłane do %1$s i %2$d innych osób</item>
@@ -1990,7 +1985,7 @@
     <string name="invite_by_link">Udostępnij link</string>
     <string name="invite_by_username_or_mail">Zaproś przez nazwę użytkownika lub email</string>
     <string name="invite_by_email">Zaproś przez email</string>
-    <string name="invite_people_to_your_space_desc">Aktualnie jesteś tylko Ty. %s będzie jeszcze lepsza kiedy dołączą inni.</string>
+    <string name="invite_people_to_your_space_desc">Aktualnie jesteś tu tylko ty. %s będzie jeszcze lepszą przestrzenią, gdy dołączą do niej inni.</string>
     <string name="invite_to_space">Zaproś do %s</string>
     <string name="invite_people_menu">Zaproś osoby</string>
     <string name="invite_people_to_your_space">Zaproś osoby do Twojej przestrzeni</string>
@@ -2132,7 +2127,7 @@
     <string name="settings_server_upload_size_title">Limit wielkości pliku na serwerze</string>
     <string name="settings_server_version">Wersja serwera</string>
     <string name="settings_server_name">Nazwa serwera</string>
-    <string name="verification_scan_self_emoji_subtitle">Zweryfikuj zgodność wyświetlonych emotikon</string>
+    <string name="verification_scan_self_emoji_subtitle">Zamiast tego, zweryfikuj porównując emotikony</string>
     <string name="verification_scan_with_this_device">Zeskanuj za pomocą tego urządzenia</string>
     <string name="verification_scan_self_notice">Zeskanuj kod Twoim drugim urządzeniem lub przełącz się i zeskanuj za pomocą tego urządzenia</string>
     <string name="sent_a_voice_message">Głos</string>
@@ -2316,8 +2311,8 @@
     </plurals>
     <string name="room_member_override_nick_color">Zastąp kolor wyświetlanej nazwy</string>
     <string name="login_splash_already_have_account">Posiadam już konto</string>
-    <string name="ftue_auth_carousel_encrypted_title">Połącz się z każdym.</string>
-    <string name="ftue_auth_carousel_control_title">Ty jesteś w kontroli.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Bezpieczna komunikacja.</string>
+    <string name="ftue_auth_carousel_control_title">Masz wszystko pod kontrolą.</string>
     <string name="ftue_auth_carousel_secure_title">Przejmij swoje konwersacje.</string>
     <string name="identity_server_consent_dialog_content_3">By odkryć istniejące kontakty, musisz najpierw przesłać swoje dane kontaktowe (adresy e-mail i numer telefonu) do serwera tożsamości. Przed wysłaniem Twoje dane zostaną zaszyfrowane w celu zachowania prywatności.</string>
     <string name="preference_help_summary">Uzyskaj pomoc w korzystaniu z ${app_name}</string>
@@ -2385,7 +2380,6 @@
     <string name="ftue_display_name_entry_footer">Możesz zmienić ją później</string>
     <string name="room_message_autocomplete_notification">Powiadomienie pokoju</string>
     <string name="ftue_display_name_entry_title">Wyświetlana nazwa</string>
-    <string name="ftue_display_name_subtitle">Będzie ona widoczna podczas wysyłania wiadomości.</string>
     <string name="ftue_display_name_title">Wybierz wyświetlaną nazwę</string>
     <string name="ftue_account_created_subtitle">Twoje konto %s zostało utworzone</string>
     <string name="ftue_account_created_congratulations_title">Gratulacje!</string>
@@ -2398,13 +2392,13 @@
     <string name="ftue_auth_use_case_option_three">Społeczności</string>
     <string name="ftue_auth_use_case_option_two">Zespoły</string>
     <string name="ftue_auth_use_case_option_one">Przyjaciele i rodzina</string>
-    <string name="ftue_auth_use_case_subtitle">Pomożemy Ci się połączyć</string>
+    <string name="ftue_auth_use_case_subtitle">Pomożemy Ci nawiązać kontakt</string>
     <string name="ftue_auth_use_case_title">Z kim będziesz najczęściej rozmawiać\?</string>
-    <string name="ftue_auth_carousel_encrypted_body">Szyfrowane od-końca-do-końca i nie wymaga numeru telefonu. Brak reklam i dataminingu.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Szyfrowane od-końca-do-końca, bez konieczności podawania numeru telefonu. Zero reklam i dataminingu.</string>
     <string name="ftue_auth_carousel_control_body">Wybierz, gdzie prowadzone są Twoje rozmowy, dając Ci kontrolę i niezależność. Połączenie przez sieć Matrix.</string>
     <string name="ftue_auth_carousel_secure_body">Bezpieczna i niezależna komunikacja, która zapewnia ten sam poziom prywatności, co rozmowa twarzą w twarz we własnym domu.</string>
-    <string name="ftue_auth_carousel_workplace_title">Wiadomości dla Twojego zespołu.</string>
-    <string name="attachment_type_location">Położenie</string>
+    <string name="ftue_auth_carousel_workplace_title">Komunikacja dla Twojego zespołu.</string>
+    <string name="attachment_type_location">Lokalizacja</string>
     <string name="preference_root_legals">Zagadnienia prawne</string>
     <string name="navigate_to_thread_when_already_in_the_thread">Już przeglądasz ten wątek!</string>
     <string name="view_in_room">Wyświetl w pokoju</string>
@@ -2527,7 +2521,7 @@
     <string name="upgrade_room_for_restricted_no_param">Każdy w przestrzeni nadrzędnej będzie mógł znaleźć ten pokój i dołączyć do niego — nie ma potrzeby ręcznego zapraszania wszystkich. W każdej chwili możesz to zmienić w ustawieniach pokoju.</string>
     <string name="upgrade_room_update_parent_space">Automatycznie aktualizuj nadrzędną przestrzeń</string>
     <string name="labs_auto_report_uisi_desc">Twój system automatycznie wyśle dzienniki, gdy wystąpi błąd niemożności odszyfrowania</string>
-    <string name="labs_auto_report_uisi">Błędy automatycznego deszyfrowania raportów.</string>
+    <string name="labs_auto_report_uisi">Automatycznie zgłaszaj błędy deszyfrowania.</string>
     <string name="command_description_leave_room">Opuść pokój o podanym identyfikatorze (lub aktualny pokój, jeśli null)</string>
     <string name="sent_location">Udostępnili swoją lokalizację</string>
     <string name="room_message_notify_everyone">Powiadom cały pokój</string>
@@ -2577,7 +2571,6 @@
     <string name="live_location_bottom_sheet_last_updated_at">Zaktualizowano %1$s temu</string>
     <string name="location_share_live_remaining_time">%1$s pozostało</string>
     <string name="location_share_live_until">Na żywo do %1$s</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Przestań udostępniać</string>
     <string name="labs_enable_live_location_summary">Tymczasowa implementacja: lokalizacje pozostaną w historii pokoju</string>
     <string name="labs_enable_live_location">Włącz udostępnianie lokalizacji na żywo</string>
     <string name="location_share_live_view">Pokaż lokalizację na żywo</string>
@@ -2693,4 +2686,116 @@
     </plurals>
     <string name="search_space_two_parents">%1$s i %2$s</string>
     <string name="auth_reset_password_error_unverified">Email nie został zweryfikowany, sprawdź swoją skrzynkę</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_failed">Nie udało się zarejestrować tokena punktu końcowego na serwerze domowym:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_current_gateway">Bieżąca brama: %s</string>
+    <string name="settings_troubleshoot_test_current_gateway_title">Wejście</string>
+    <string name="settings_troubleshoot_test_current_endpoint_failed">Nie można znaleźć punktu końcowego.</string>
+    <string name="settings_troubleshoot_test_current_endpoint_success">Bieżący punkt końcowy: %s</string>
+    <string name="settings_troubleshoot_test_current_endpoint_title">Punkt końcowy</string>
+    <string name="location_share_loading_map_error">Nie można wczytać mapy.
+\nTen serwer macierzysty może nie być skonfigurowany do wyświetlania map.</string>
+    <string name="a11y_open_settings">Otwórz ustawienia</string>
+    <string name="device_manager_sessions_other_description">Aby zapewnić najlepsze bezpieczeństwo, zweryfikuj swoje sesje i wyloguj się z każdej sesji, której już nie rozpoznajesz lub której już nie używasz.</string>
+    <string name="device_manager_sessions_other_title">Inne sesje</string>
+    <string name="settings_sessions_list">Sesje</string>
+    <string name="a11y_open_spaces">Lista otwartych przestrzeni</string>
+    <string name="a11y_create_message">Utwórz nową rozmowę lub pokój</string>
+    <string name="room_list_filter_people">Ludzie</string>
+    <string name="room_list_filter_favourites">Ulubione</string>
+    <string name="room_list_filter_unreads">Nieprzeczytane</string>
+    <string name="room_list_filter_all">Wszystkie</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_success">Punkt końcowy został pomyślnie zarejestrowany na serwerze domowym.</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_title">Rejestracja punktu końcowego</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Aktywności</string>
+    <string name="home_layout_preferences_sort_by">Sortuj według</string>
+    <string name="home_layout_preferences_recents">Wyświetl ostatnie</string>
+    <string name="home_layout_preferences_filters">Wyświetl filtry</string>
+    <string name="home_layout_preferences">Preferencje interfejsu</string>
+    <string name="explore_rooms">Przeglądaj pokoje</string>
+    <string name="create_room">Utwórz pokój</string>
+    <string name="start_chat">Rozpocznij czat</string>
+    <string name="all_chats">Wszystkie rozmowy</string>
+    <string name="device_manager_other_sessions_description_unverified">Nie zweryfikowano · Ostatnia aktywność %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Zweryfikowano · Ostatnia aktywność %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Pokaż wszystkie (%1$d)</string>
+    <string name="device_manager_view_details">Pokaż szczegóły</string>
+    <string name="device_manager_verify_session">Zweryfikuj sesję</string>
+    <string name="device_manager_verification_status_unverified">Niezweryfikowana sesja</string>
+    <string name="device_manager_verification_status_verified">Zweryfikowana sesja</string>
+    <string name="a11y_device_manager_device_type_unknown">Nieznany typ urządzenia</string>
+    <string name="a11y_device_manager_device_type_desktop">Komputer</string>
+    <string name="a11y_device_manager_device_type_web">Przeglądarka</string>
+    <string name="a11y_device_manager_device_type_mobile">Urządzenie przenośne</string>
+    <string name="timeline_error_room_not_found">Niestety, ten pokój nie został znaleziony.
+\nSpróbuj ponownie później.%s</string>
+    <string name="invites_title">Zaproszenia</string>
+    <string name="home_empty_no_unreads_message">Tutaj pojawią się rozmowy które nie zostały jeszcze odczytane.</string>
+    <string name="home_empty_no_unreads_title">Brak nowych wiadomości.</string>
+    <string name="change_space">Zmień przestrzeń</string>
+    <string name="labs_enable_deferred_dm_summary">Stwórz prywatny chat dopiero po wysłaniu pierwszej wiadomości</string>
+    <string name="labs_enable_deferred_dm_title">Włącz odroczone prywatne chaty</string>
+    <string name="labs_enable_new_app_layout_summary">Odświeżony wygląd Element z opcjonalnymi kartami</string>
+    <string name="labs_enable_new_app_layout_title">Włącz nowy układ</string>
+    <string name="home_empty_space_no_rooms_message">Przestrzenie to nowa metoda na grupowanie razem wielu pokoi i osób. Dodaj tu już istniejący pokój lub stwórz nowy używając przycisku w prawym-dolnym rogu.</string>
+    <string name="space_list_empty_message">Jest to nowa metoda na grupowanie razem wielu pokoi i osób.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nwygląda nieco pusto.</string>
+    <string name="space_list_empty_title">Brak przestrzeni.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ W tym pokoju znajdują się użytkownicy ze niezweryfikowanymi urządzeniami, nie będą one mogły odszyfrować wiadomości które wysyłasz.</string>
+    <string name="grant_permission">Udziel Uprawnień</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} potrzebuje uprawnień aby wyświetlać powiadomienia.
+\nProszę udziel uprawnień.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} potrzebuje uprawnień by wyświetlić powiadomienia. Będą one pokazywać twoje wiadomości, zaproszenia, itd.
+\n
+\nProszę zezwól na dostęp na następnym pop-upie aby móc zobaczyć powiadomienia.</string>
+    <string name="invites_empty_message">Tutaj będą twoje nowe zaproszenia.</string>
+    <string name="invites_empty_title">Brak zaproszeń.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych sesji w tym pokoju.</string>
+    <string name="device_manager_session_overview_signout">Wyloguj się z tej sesji</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Wyloguj się z %1$d sesji</item>
+        <item quantity="few">Wyloguj się z %1$d sesji</item>
+        <item quantity="many"/>
+        <item quantity="other"/>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Wyloguj się</string>
+    <string name="device_manager_other_sessions_select">Wybierz sesje</string>
+    <string name="device_manager_other_sessions_show_ip_address">Pokaż adres IP</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Niezweryfikowane sesje</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Brak niezweryfikowanych sesji.</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Zweryfikuj swoje sesje dla zwiększenia bezpieczeństwa wiadomości lub wyloguj się z tych których nie rozpoznajesz lub już nie używasz.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Niezweryfikowane</string>
+    <string name="device_manager_unverified_sessions_description">Zweryfikuj te sesje lub wyloguj się z nich.</string>
+    <string name="device_manager_unverified_sessions_title">Niezweryfikowane sesje</string>
+    <string name="device_manager_header_section_security_recommendations_description">Popraw swoje bezpieczeństwo stosując te zalecenia.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Zalecenia bezpieczenstwa</string>
+    <string name="settings_enable_direct_share_summary">Pokaż ostatnie rozmowy w systemowym menu udostępniania</string>
+    <string name="settings_enable_direct_share_title">Bezpośrednie udostępnianie</string>
+    <string name="labs_enable_voice_broadcast_summary">Bądź w stanie nagrywać i wysyłać transmisje głosowe na osi czasu pokoju.</string>
+    <string name="labs_enable_voice_broadcast_title">Włącz transmicje głosowe</string>
+    <string name="labs_enable_client_info_recording_summary">Zachowuj nazwę aplikacji, wersję oraz jej url aby łatwiej rozpoznawać je w menedzerze sesji.</string>
+    <string name="labs_enable_client_info_recording_title">Włącz rejestrowanie informacji o kliencie</string>
+    <string name="labs_enable_session_manager_summary">Miej lepszą kontrolę nad zalogowanymi sesjami.</string>
+    <string name="labs_enable_session_manager_title">Włącz nowy manager sesji</string>
+    <string name="labs_enable_rich_text_editor_summary">Wypróbuj zaawansowany edytor tekstu (tryb zwykłego tekstu dostępny wkrótce)</string>
+    <string name="labs_enable_rich_text_editor_title">Włącz zaawansowany edytor tekstu</string>
+    <string name="attachment_type_selector_text_formatting">Formatowanie tekstu</string>
+    <string name="attachment_type_selector_poll">Ankiety</string>
+    <string name="attachment_type_voice_broadcast">Transmisja Głosowa</string>
+    <string name="attachment_type_selector_file">Załączniki</string>
+    <string name="attachment_type_selector_sticker">Naklejki</string>
+    <string name="attachment_type_selector_gallery">Galeria</string>
+    <string name="error_check_network" tools:ignore="UnusedResources">Coś poszło nie tak. Sprawdź swoje połączenie i spróbuj ponownie.</string>
+    <string name="quoting">Cytowanie</string>
+    <string name="replying_to">Odpowiadanie %s</string>
+    <string name="editing">Edytowanie</string>
+    <string name="command_description_devtools">Otwórz ekran narzędzi programisty</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Włączyłeś ograniczenie szyfrowania tylko dla zweryfikowanych sesji dla wszystkich pokojów w ustawieniach bezpieczeństwa.</string>
+    <string name="action_deselect_all">Odznacz wszystko</string>
+    <string name="action_select_all">Zaznacz wszystko</string>
+    <string name="action_got_it">Rozumiem</string>
+    <string name="a11y_collapse_space_children">Zwiń %s pokojów</string>
+    <string name="a11y_expand_space_children">Rozwiń %s pokojów</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-pl/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-pl/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-pl/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-pl/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
similarity index 87%
rename from vector/src/main/res/values-pt-rBR/strings.xml
rename to library/ui-strings/src/main/res/values-pt-rBR/strings.xml
index 8e4e1942da..bc617c62f0 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="notice_room_invite_no_invitee">convite de %s</string>
+    <string name="notice_room_invite_no_invitee">Convite de %s</string>
     <string name="notice_room_invite">%1$s convidou %2$s</string>
     <string name="notice_room_invite_you">%1$s convidou você</string>
-    <string name="notice_room_join">%1$s juntou-se à sala</string>
+    <string name="notice_room_join">%1$s entrou na sala</string>
     <string name="notice_room_leave">%1$s saiu da sala</string>
     <string name="notice_room_reject">%1$s rejeitou o convite</string>
     <string name="notice_room_remove">%1$s removeu %2$s</string>
@@ -43,7 +43,7 @@
     <string name="notice_room_created">%1$s criou a sala</string>
     <string name="notice_room_created_by_you">Você criou a sala</string>
     <string name="notice_room_invite_by_you">Você convidou %1$s</string>
-    <string name="notice_room_join_by_you">Você juntou-se à sala</string>
+    <string name="notice_room_join_by_you">Você entrou na sala</string>
     <string name="notice_room_leave_by_you">Você saiu da sala</string>
     <string name="notice_room_reject_by_you">Você rejeitou o convite</string>
     <string name="notice_room_remove_by_you">Você removeu %1$s</string>
@@ -89,33 +89,31 @@
     <string name="notice_power_level_changed_by_you">Você mudou o nível de poder de %1$s.</string>
     <string name="notice_power_level_changed">%1$s mudou o nível de poder de %2$s.</string>
     <string name="notice_power_level_diff">%1$s de %2$s para %3$s</string>
-    <string name="initial_sync_start_importing_account">Sinc inicial:
+    <string name="initial_sync_start_importing_account">Sincronização inicial:
 \nImportando conta…</string>
-    <string name="initial_sync_start_importing_account_crypto">Sinc inicial:
-\nImportando crypto</string>
-    <string name="initial_sync_start_importing_account_rooms">Sinc inicial:
+    <string name="initial_sync_start_importing_account_crypto">Sincronização inicial:
+\nImportando criptografia</string>
+    <string name="initial_sync_start_importing_account_rooms">Sincronização inicial:
 \nImportando salas</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Sinc inicial:
+    <string name="initial_sync_start_importing_account_joined_rooms">Sincronização inicial:
 \nCarregando suas conversas
-\nSe você tem se juntado a muitas salas, isto podia levar um tempo</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Sinc inicial:
-\nImportando salas convidadas</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Sinc inicial:
-\nImportando salas saídas</string>
-    <string name="initial_sync_start_importing_account_groups">Sinc inicial:
-\nImportando comunidades</string>
-    <string name="initial_sync_start_importing_account_data">Sinc inicial:
+\nSe você entrou em muitas salas, isso pode demorar</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Sincronização inicial:
+\nImportando salas para as quais foi convidado</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Sincronização inicial:
+\nImportando salas das quais saiu</string>
+    <string name="initial_sync_start_importing_account_data">Sincronização inicial:
 \nImportando dados de conta</string>
     <string name="event_status_sending_message">Enviando mensagem…</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Convite de %1$s. Razão: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Seu convite. Razão: %1$s</string>
-    <string name="notice_room_invite_with_reason">%1$s convidou %2$s. Razão: %3$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Você convidou %1$s. Razão: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s convidou você. Razão: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s juntou-se à sala. Razão: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Você juntou-se à sala. Razão: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s saiu da sala. Razão: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Você saiu da sala. Razão: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Convite de %1$s. Motivo: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Seu convite. Motivo: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s convidou %2$s. Motivo: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Você convidou %1$s. Motivo: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s convidou você. Motivo: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s entrou na sala. Motivo: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Você entrou na sala. Motivo: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s saiu da sala. Motivo: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Você saiu da sala. Motivo: %1$s</string>
     <string name="notice_room_reject_with_reason">%1$s rejeitou o convite. Razão: %2$s</string>
     <string name="notice_room_reject_with_reason_by_you">Você rejeitou o convite. Razão: %1$s</string>
     <string name="notice_room_remove_with_reason">%1$s expulsou %2$s. Razão: %3$s</string>
@@ -162,10 +160,10 @@
     <string name="notice_direct_room_guest_access_forbidden">%1$s tem prevenido visitantes de se juntarem à sala.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">Você tem permitido visitantes se juntarem aqui.</string>
     <string name="notice_direct_room_guest_access_can_join">%1$s tem permitido visitantes se juntarem aqui.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Você saiu. Razão: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s saiu. Razão: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Você juntou-se. Razão: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s juntou-se. Razão: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Você saiu. Motivo: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s saiu. Motivo: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Você entrou. Motivo: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s entrou. Motivo: %2$s</string>
     <string name="notice_direct_room_third_party_revoked_invite_by_you">Você revogou o convite para %1$s</string>
     <string name="notice_direct_room_third_party_revoked_invite">%1$s revogou o convite para %2$s</string>
     <string name="notice_direct_room_third_party_invite_by_you">Você convidou %1$s</string>
@@ -176,8 +174,8 @@
     <string name="notice_made_future_direct_room_visibility">%1$s fez mensagens futuras visíveis para %2$s</string>
     <string name="notice_direct_room_leave_by_you">Você saiu da sala</string>
     <string name="notice_direct_room_leave">%1$s saiu da sala</string>
-    <string name="notice_direct_room_join_by_you">Você juntou-se</string>
-    <string name="notice_direct_room_join">%1$s juntou-se</string>
+    <string name="notice_direct_room_join_by_you">Você entrou</string>
+    <string name="notice_direct_room_join">%1$s entrou</string>
     <string name="notice_direct_room_created_by_you">Você criou a discussão</string>
     <string name="notice_direct_room_created">%1$s criou a discussão</string>
     <string name="room_displayname_empty_room_was">Sala vazia (era %s)</string>
@@ -293,7 +291,6 @@
     <string name="auth_email_already_defined">Este endereço de email já está definido.</string>
     <string name="auth_forgot_password">Esqueceu senha\?</string>
     <string name="auth_recaptcha_message">Este servidorcasa gostaria de assegurar que você não é um robô</string>
-    <string name="auth_reset_password_missing_email">O endereço de email linkado a sua conta deve ser entrado.</string>
     <string name="auth_reset_password_error_unauthorized">Falha para verificar endereço de email: assegure-se que clicou no link no email</string>
     <string name="login_error_invalid_home_server">Por favor entre um URL válido</string>
     <string name="login_error_bad_json">JSON malformado</string>
@@ -421,7 +418,7 @@
     <string name="room_settings_unset_main_address">Des-definir como endereço principal</string>
     <string name="encryption_information_decryption_error">Erro de decriptação</string>
     <string name="encryption_information_device_name">Nome público</string>
-    <string name="encryption_information_device_id">ID de sessão</string>
+    <string name="device_manager_session_details_session_id">ID de sessão</string>
     <string name="encryption_information_device_key">Chave de sessão</string>
     <string name="encryption_export_e2e_room_keys">Exportar chaves de sala E2E</string>
     <string name="encryption_export_room_keys">Exportar chaves de sala</string>
@@ -472,19 +469,18 @@
     <string name="notification_silent_notifications">Notificações silenciosas</string>
     <string name="title_activity_bug_report">Reporte de bug</string>
     <string name="loading">Carregando…</string>
-    <string name="groups_header">Comunidades</string>
     <string name="start_voice_call_prompt_msg">Você tem certeza que você quer começar uma chamada de voz\?</string>
     <string name="start_video_call_prompt_msg">Você tem certeza que você quer começar uma chamada de vídeo\?</string>
     <string name="option_take_photo">Tirar foto</string>
     <string name="option_take_video">Tirar vídeo</string>
-    <string name="call">Chamar</string>
+    <string name="call">Chamada</string>
     <string name="room_participants_ban_prompt_msg">Banir usuária(o) vai removê-la(o) desta sala e preveni-la(o) de se juntar de novo.</string>
     <string name="room_settings_all_messages">Todas as mensagens</string>
     <string name="room_settings_add_homescreen_shortcut">Adicionar a tela de Início</string>
     <string name="settings_notification_ringtone">Som de notificação</string>
     <string name="settings_containing_my_display_name">Mnsgns contendo meu nome de exibição</string>
     <string name="settings_containing_my_user_name">Mnsgns contendo meu nome de usuária(o)</string>
-    <string name="settings_inline_url_preview">Previsualização de URL emlinha</string>
+    <string name="settings_inline_url_preview">Previsualização de URL inline</string>
     <string name="settings_12_24_timestamps">Mostrar timestamps em formato de 12 horas</string>
     <string name="settings_vibrate_on_mention">Vibrar ao mencionar um/uma usuário(a)</string>
     <string name="settings_analytics">Analítica</string>
@@ -992,7 +988,6 @@
     <string name="action_change">Mudar</string>
     <string name="change_room_directory_network">Mudar rede</string>
     <string name="please_wait">Por favor espere…</string>
-    <string name="group_all_communities">Todas as Comunidades</string>
     <string name="room_preview_no_preview">Esta sala não pode ser previsualizada</string>
     <string name="fab_menu_create_room">Salas</string>
     <string name="fab_menu_create_chat">Mensagens Diretas</string>
@@ -1012,10 +1007,10 @@
     <string name="settings_push_rules">Regras de Push</string>
     <string name="settings_push_rules_no_rules">Nenhuma regra de push definida</string>
     <string name="settings_push_gateway_no_pushers">Nenhum gateway de push registrado</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_id">ID do App:</string>
+    <string name="push_gateway_item_push_key">Chave Push:</string>
+    <string name="push_gateway_item_app_display_name">Nome de Exibição do App:</string>
+    <string name="push_gateway_item_device_name">Nome de Exibição da Sessão:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formato:</string>
     <string name="preference_voice_and_video">Voz &amp; Vídeo</string>
@@ -1058,12 +1053,12 @@
     <string name="settings_discovery_identity_server_info">Você está atualmente usando %1$s para descobrir e ser descobertável por contatos existentes que você conhece.</string>
     <string name="settings_discovery_identity_server_info_none">Você não está atualmente usando um servidor de identidade. Para descobrir e ser descobertável por contatos existentes que você conhece, configure um abaixo.</string>
     <string name="settings_discovery_emails_title">Endereços de email descobertáveis</string>
-    <string name="settings_discovery_no_mails">Opções de descoberta vão aparecer uma vez que você tenha adicionado um email.</string>
+    <string name="settings_discovery_no_mails">Opções de descoberta vão aparecer uma vez que você tenha adicionado um endereço de email.</string>
     <string name="settings_discovery_no_msisdn">Opções de descoberta vão aparecer uma vez que você tenha adicionado um número de telefone.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Desconectar-se de seu servidor de identidade vai significar que você não vai ser descobertável por outras(os) usuárias(os) e você não vai ser capaz de convidar outras(os) por email ou telefone.</string>
     <string name="settings_discovery_msisdn_title">Números de telefone descobertáveis</string>
-    <string name="settings_discovery_confirm_mail">Nós enviamos a você um email de confirmar para %s, cheque seu email e clique no link de confirmação</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Nós enviamos a você um email de confirmar para %s, por favor primeiro cheque seu email e clique no link de confirmação</string>
+    <string name="settings_discovery_confirm_mail">Nós enviamos um email para %s, cheque seu email e clique no link de confirmação</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Nós enviamos um email para %s, por favor primeiro cheque seu email e clique no link de confirmação</string>
     <string name="settings_discovery_enter_identity_server">Entre um URL de servidor de identidade</string>
     <string name="settings_discovery_bad_identity_server">Não foi possível conectar-se a servidor de identidade</string>
     <string name="settings_discovery_please_enter_server">Por favor entre o url de servidor de identidade</string>
@@ -1176,7 +1171,7 @@
     <string name="login_registration_not_supported">O aplicativo não é capaz de criar uma conta neste servidorcasa.
 \n
 \nVocê quer fazer signup usando um cliente web\?</string>
-    <string name="login_login_with_email_error">Este email não está associado com nenhuma conta.</string>
+    <string name="login_login_with_email_error">Este endereço de email não está associado a nenhuma conta.</string>
     <string name="login_reset_password_on">Resettar senha em %1$s</string>
     <string name="login_reset_password_notice">Um email de verificação vai ser enviado para sua inbox para confirmar definição de sua nova senha.</string>
     <string name="login_reset_password_submit">Próximo</string>
@@ -1185,7 +1180,7 @@
     <string name="login_reset_password_warning_title">Aviso!</string>
     <string name="login_reset_password_warning_content">Mudar sua senha vai resettar quaisquer chaves de encriptação ponta-a-ponta em todas as suas sessões, fazendo histórico de chat encriptado ilegível. Configure Backup de Chave ou exporte suas chaves de sala de uma outra sessão antes de resettar sua senha.</string>
     <string name="login_reset_password_warning_submit">Continuar</string>
-    <string name="login_reset_password_error_not_found">Este email não está linkado a nenhuma conta</string>
+    <string name="login_reset_password_error_not_found">Este endereço de email não está linkado a nenhuma conta</string>
     <string name="login_reset_password_mail_confirmation_title">Cheque sua inbox</string>
     <string name="login_reset_password_mail_confirmation_notice">Um email de verificação foi enviado para %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Toque no link para confirmar sua nova senha. Uma vez que você tenha seguido o link que ele contém, clique abaixo.</string>
@@ -1199,7 +1194,7 @@
 \n
 \nPara o processo de mudança de senha\?</string>
     <string name="login_set_email_title">Definir endereço de email</string>
-    <string name="login_set_email_notice">Defina um email para recuperar sua conta. Mais tarde, você pode opcionalmente permitir pessoas que você conhece descobrirem você por seu email.</string>
+    <string name="login_set_email_notice">Defina um endereço de email para recuperar sua conta. Mais tarde, você pode opcionalmente permitir pessoas que você conhece descobrirem você por este endereço.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (opcional)</string>
     <string name="login_set_email_submit">Próximo</string>
@@ -1565,7 +1560,7 @@
     <string name="identity_server_error_outdated_home_server">Esta operação não é possível. O servidorcasa está desatualizado.</string>
     <string name="identity_server_error_no_identity_server_configured">Por favor primeiro configure um servidor de identidade.</string>
     <string name="identity_server_error_terms_not_signed">Por favor primeiro aceite os termos do servidor de identidade nas configurações.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Para sua privacidade, ${app_name} somente suporta enviar emails e números de telefone de usuária(o) hashados.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Para sua privacidade, ${app_name} somente suporta enviar endereços de email e números de telefone de usuária(o) hashados.</string>
     <string name="identity_server_error_binding_error">A associação tem falhado.</string>
     <string name="identity_server_error_no_current_binding_error">Não há nenhuma associação atual com este identificador.</string>
     <string name="identity_server_set_default_notice">Seu servidorcasa (%1$s) propõe usar %2$s para seu servidor de identidade</string>
@@ -1659,7 +1654,7 @@
     <string name="no_permissions_to_start_webrtc_call">Você não tem permissão para começar uma chamada nesta sala</string>
     <string name="settings_phone_number_empty">Nenhum número de telefone tem sido adicionado a sua conta</string>
     <string name="settings_emails">Endereços de email</string>
-    <string name="settings_emails_empty">Nenhum email tem sido adicionado a sua conta</string>
+    <string name="settings_emails_empty">Nenhum endereço de email tem sido adicionado a sua conta</string>
     <string name="settings_phone_numbers">Números de telefone</string>
     <string name="settings_remove_three_pid_confirmation_content">Remover %s\?</string>
     <string name="error_threepid_auth_failed">Assegure-se que você tem clicado no link no email que enviamos para você.</string>
@@ -1668,7 +1663,7 @@
         <item quantity="other">%d segundos</item>
     </plurals>
     <string name="settings_emails_and_phone_numbers_title">Emails e números de telefone</string>
-    <string name="settings_emails_and_phone_numbers_summary">Gerenciar emails e números de telefone linkados a sua conta Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Gerenciar endereços de email e números de telefone linkados a sua conta Matrix</string>
     <string name="settings_text_message_sent_hint">Código</string>
     <string name="login_msisdn_notice">Por favor use o formato internacional (número de telefone deve começar com \'+\')</string>
     <string name="confirm_your_identity_quad_s">Confirme sua identidade ao verificar este login, concedendo-lhe acesso a mensagens encriptadas.</string>
@@ -1703,7 +1698,7 @@
     <string name="secure_backup_reset_all_no_other_devices">Somente faça isto se você não tem nenhum outro dispositivo com o qual você pode verificar este dispositivo.</string>
     <string name="secure_backup_reset_all">Resettar tudo</string>
     <string name="bad_passphrase_key_reset_all_action">Esqueceu ou perdeu todas as opções de recuperação\? Resette tudo</string>
-    <string name="direct_room_created_summary_item_by_you">Você juntou-se.</string>
+    <string name="direct_room_created_summary_item_by_you">Você entrou.</string>
     <string name="direct_room_encryption_enabled_tile_description">Mensagens neste chat são encriptadas ponta-a-ponta.</string>
     <string name="direct_room_profile_section_more_leave">Sair</string>
     <string name="direct_room_profile_section_more_settings">Configurações</string>
@@ -1727,7 +1722,7 @@
     <string name="action_reset">Resettar</string>
     <string name="direct_room_join_rules_invite">%1$s fez isto somente convite.</string>
     <string name="direct_room_join_rules_invite_by_you">Você fez isto somente convite.</string>
-    <string name="direct_room_created_summary_item">%s juntou-se.</string>
+    <string name="direct_room_created_summary_item">%s entrou.</string>
     <string name="search_banned_user_hint">Filtrar usuárias(os) banidas(os)</string>
     <string name="settings_troubleshoot_test_push_loop_title">Testar Push</string>
     <plurals name="notification_invitations">
@@ -1783,7 +1778,7 @@
     <string name="attachment_viewer_item_x_of_y">%1$d de %2$d</string>
     <string name="settings_discovery_consent_action_give_consent">Dar consentimento</string>
     <string name="settings_discovery_consent_action_revoke">Revogar meu consentimento</string>
-    <string name="settings_discovery_consent_notice_on">Você tem dado seu consentimento para enviar emails e números de telefone para este servidor de identidade para descobrir outras(os) usuárias(os) de seus contatos.</string>
+    <string name="settings_discovery_consent_notice_on">Você tem dado seu consentimento para enviar endereços de email e números de telefone para este servidor de identidade para descobrir outras(os) usuárias(os) de seus contatos.</string>
     <string name="settings_discovery_consent_title">Enviar emails e números de telefone</string>
     <string name="direct_room_user_list_suggestions_title">Sugestões</string>
     <string name="direct_room_user_list_known_title">Usuárias(os) Conhecidas(os)</string>
@@ -1903,10 +1898,10 @@
     <string name="settings_category_room_directory">Diretório de salas</string>
     <string name="dialog_edit_hint">Novo valor</string>
     <string name="action_switch">Alterar</string>
-    <string name="initial_sync_start_downloading">Sinc inicial:
+    <string name="initial_sync_start_downloading">Sincronização inicial:
 \nFazendo download de dados…</string>
-    <string name="initial_sync_start_server_computing">Sinc inicial:
-\nEsperando por resposta de servidor…</string>
+    <string name="initial_sync_start_server_computing">Sincronização inicial:
+\nEsperando pela resposta do servidor…</string>
     <string name="a11y_trust_level_trusted">Nível de confiança confiado</string>
     <string name="a11y_trust_level_warning">Nível de confiança alerta</string>
     <string name="event_status_delete_all_failed_dialog_message">Você tem certeza que você quer deletar todas as mensagens não-enviadas nesta sala\?</string>
@@ -2147,7 +2142,7 @@
     <string name="settings_notification_mentions_and_keywords">Menções e Palavrachaves</string>
     <string name="settings_notification_default">Notificações Default</string>
     <string name="link_this_email_with_your_account">%s em Configurações para receber convites diretamente em ${app_name}.</string>
-    <string name="link_this_email_settings_link">Linkar este email com sua conta</string>
+    <string name="link_this_email_settings_link">Linkar este endereço de email com sua conta</string>
     <string name="this_invite_to_this_space_was_sent">Este convite para este espaço foi enviado para %s que não está associado com sua conta</string>
     <string name="this_invite_to_this_room_was_sent">Este convite para esta sala foi enviado para %s que não está associado com sua conta</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Todas as salas em que você está vão ser mostradas em Home.</string>
@@ -2216,7 +2211,7 @@
     <string name="room_settings_space_access_title">Acesso a espaço</string>
     <string name="room_settings_access_rules_pref_dialog_title">Quem pode acessar\?</string>
     <string name="settings_notification_emails_enable_for_email">Habilitar notificações de email para %s</string>
-    <string name="settings_notification_emails_no_emails">Para receber email com notificação, por favor associe um email a sua conta Matrix</string>
+    <string name="settings_notification_emails_no_emails">Para receber email com notificação, por favor associe um endereço de email a sua conta Matrix</string>
     <string name="settings_notification_emails_category">Notificação de email</string>
     <string name="room_permissions_upgrade_the_space">Fazer upgrade do espaço</string>
     <string name="room_permissions_change_space_name">Mudar nome de espaço</string>
@@ -2263,12 +2258,12 @@
     <string name="create_poll_question_title">Sondar pergunta ou tópico</string>
     <string name="create_poll_title">Criar Sondagem</string>
     <string name="attachment_type_poll">Sondagem</string>
-    <string name="identity_server_consent_dialog_title_2">Enviar emails e números de telefone para %s</string>
+    <string name="identity_server_consent_dialog_title_2">Enviar endereços de email e números de telefone para %s</string>
     <string name="settings_discovery_consent_notice_off_2">Seus contatos são privados. Para descobrir usuárias(os) de seus contatos, você precisa de permissão para enviar info de contato a seu servidor de identidade.</string>
     <string name="shortcut_disabled_reason_sign_out">O signout desta sessão tem sido feito!</string>
     <string name="shortcut_disabled_reason_room_left">Esta sala tem sido saída!</string>
     <string name="identity_server_consent_dialog_content_question">Você concorda em enviar esta info\?</string>
-    <string name="identity_server_consent_dialog_content_3">Para descobrir contatos existentes, você precisa enviar info de contato (emails e números de telefone) para seu servidor de identidade. Nós hashamos seus dados antes de enviar por privacidade.</string>
+    <string name="identity_server_consent_dialog_content_3">Para descobrir contatos existentes, você precisa enviar info de contato (endereços de email e números de telefone) para seu servidor de identidade. Nós hashamos seus dados antes de enviar por privacidade.</string>
     <string name="action_not_now">Não agora</string>
     <string name="delete_poll_dialog_content">Você tem certeza que você quer remover esta sondagem\? Você não vai ser capaz de recuperá-la uma vez removida.</string>
     <string name="delete_poll_dialog_title">Remover sondagem</string>
@@ -2325,7 +2320,7 @@
     <string name="tooltip_attachment_gallery">Enviar imagens e vídeos</string>
     <string name="tooltip_attachment_photo">Abrir câmera</string>
     <string name="labs_auto_report_uisi_desc">Seu sistema vai automaticamente enviar logs quando um erro incapaz de decriptar ocorre</string>
-    <string name="labs_auto_report_uisi">Auro Reportar Erros de Decriptação.</string>
+    <string name="labs_auto_report_uisi">Auto Reportar Erros de Decriptação.</string>
     <string name="room_member_override_nick_color">Sobrepor cor de nome de exibição</string>
     <string name="login_splash_already_have_account">Eu já tenho uma conta</string>
     <string name="ftue_auth_carousel_encrypted_title">Mensageria segura.</string>
@@ -2361,7 +2356,7 @@
     <string name="location_timeline_failed_to_load_map">Falha para carregar mapa</string>
     <string name="a11y_static_map_image">Mapa</string>
     <string name="labs_enable_thread_messages_desc">Nota: app vai ser recomeçado</string>
-    <string name="labs_enable_thread_messages">Habilitar Mensagens de Thread</string>
+    <string name="labs_enable_thread_messages">Habilitar mensagens com threads</string>
     <string name="ftue_auth_use_case_connect_to_server">Conectar a servidor</string>
     <string name="ftue_auth_use_case_join_existing_server">Procurando se juntar a um servidor existente\?</string>
     <string name="ftue_auth_use_case_skip_partial">Pular esta pergunta</string>
@@ -2432,7 +2427,6 @@
     <string name="ftue_profile_picture_title">Adicione uma imagem de perfil</string>
     <string name="ftue_display_name_entry_footer">Você pode mudar isto mais tarde</string>
     <string name="ftue_display_name_entry_title">Nome de Exibição</string>
-    <string name="ftue_display_name_subtitle">Isto vai ser mostrado quando você enviar mensagens.</string>
     <string name="ftue_display_name_title">Escolha um nome de exibição</string>
     <string name="ftue_account_created_subtitle">Sua conta %s tem sido criada</string>
     <string name="ftue_account_created_congratulations_title">Parabéns!</string>
@@ -2466,7 +2460,7 @@
     <string name="threads_beta_enable_notice_message">Threads ajudam manThreads ajudam manter suas conversas em-tópico e fáceis de rastrear. %sHabilitar threads vai refrescar o app. Isto pode tomar mais tempo para algumas contas.</string>
     <string name="threads_beta_enable_notice_title">Threads Beta</string>
     <string name="action_learn_more">Saber mais</string>
-    <string name="action_try_it_out">Teste aí</string>
+    <string name="action_try_it_out">Experimentar</string>
     <string name="screen_sharing_notification_description">Compartilhamento de tela está em progresso</string>
     <string name="screen_sharing_notification_title">${app_name} Compartilhamento de Tela</string>
     <string name="call_stop_screen_sharing">Parar compartilhamento de tela</string>
@@ -2476,15 +2470,14 @@
 \n%s
 \n
 \nNote que esta ação vai recomeçar o app e pode levar algum tempo.</string>
-    <string name="initial_sync_request_title">Requisição de sinc inicial</string>
+    <string name="initial_sync_request_title">Requisição de sincronização inicial</string>
     <string name="settings_show_latest_profile_description">Mostrar a info de perfil mais recente (avatar e nome de exibição) para todas as mensagens.</string>
     <string name="settings_show_latest_profile">Mostrar info de usuária(o) mais recente</string>
     <string name="a11y_presence_busy">Ocupada(o)</string>
     <string name="keys_backup_settings_signature_from_this_user">Backup tem uma assinatura válida desta(e) usuária(o).</string>
     <string name="live_location_bottom_sheet_last_updated_at">Atualizada %1$s atrás</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Parar de compartilhar</string>
     <string name="labs_enable_live_location_summary">Implementação tempoária: locais persistem em histórico de sala</string>
-    <string name="labs_enable_live_location">Habilitar Compartilhament de Localização Ao Vivo</string>
+    <string name="labs_enable_live_location">Habilitar Compartilhamento de Localização Ao Vivo</string>
     <string name="location_share_live_remaining_time">%1$s restando</string>
     <string name="location_share_live_until">Ao vivo até %1$s</string>
     <string name="location_share_live_view">Ver localização ao vivo</string>
@@ -2506,7 +2499,7 @@
     <string name="settings_troubleshoot_test_current_endpoint_title">Endpoint</string>
     <string name="settings_troubleshoot_test_current_gateway_title">Gateway</string>
     <string name="live_location_labs_promotion_switch_title">Ativar compartilhamento de localização</string>
-    <string name="live_location_labs_promotion_title">Compartilhamento de localização em tempo real</string>
+    <string name="live_location_labs_promotion_title">Compartilhamento de localização ao vivo</string>
     <string name="settings_troubleshoot_test_current_gateway">Gateway atual: %s</string>
     <string name="settings_troubleshoot_test_current_endpoint_failed">Não foi possível encontrar o endpoint.</string>
     <string name="settings_troubleshoot_test_current_endpoint_success">Endpoint atual: %s</string>
@@ -2545,7 +2538,7 @@
     <string name="ftue_auth_login_username_entry">Nome de Usuária(o) / Email / Telefone</string>
     <string name="ftue_auth_captcha_title">Você é um/uma humano(a)\?</string>
     <string name="ftue_auth_password_reset_email_confirmation_subtitle">Siga as instruções enviadas para %s</string>
-    <string name="ftue_auth_password_reset_confirmation">Reset de senha</string>
+    <string name="ftue_auth_password_reset_confirmation">Senha resettada</string>
     <string name="ftue_auth_forgot_password">Esqueceu senha</string>
     <string name="ftue_auth_email_resend_email">Reenviar email</string>
     <string name="ftue_auth_email_verification_footer">Não recebeu um email\?</string>
@@ -2603,4 +2596,298 @@
     </plurals>
     <string name="search_space_two_parents">%1$s e %2$s</string>
     <string name="auth_reset_password_error_unverified">Email não verificado, cheque sua inbox</string>
+    <string name="location_share_loading_map_error">Incapaz de carregar mapa
+\nEste servidor casa pode não estar configurado para exibir mapas.</string>
+    <string name="a11y_open_settings">Abrir configurações</string>
+    <string name="all_chats">Todos os Chats</string>
+    <string name="device_manager_sessions_other_description">Para a melhor segurança, verifique suas sessões e faça signout de qualquer sessão que você não reconhece ou usa mais.</string>
+    <string name="device_manager_sessions_other_title">Outras sessões</string>
+    <string name="settings_sessions_list">Sessões</string>
+    <string name="a11y_open_spaces">Abrir lista de espaços</string>
+    <string name="a11y_create_message">Criar uma nova conversa ou sala</string>
+    <string name="room_list_filter_all">Todas</string>
+    <string name="room_list_filter_people">Pessoas</string>
+    <string name="room_list_filter_favourites">Favoritas</string>
+    <string name="room_list_filter_unreads">Não-lidas</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Atividade</string>
+    <string name="home_layout_preferences_sort_by">Ordenar por</string>
+    <string name="home_layout_preferences_recents">Mostrar recentes</string>
+    <string name="home_layout_preferences_filters">Mostrar filtros</string>
+    <string name="home_layout_preferences">Preferências de layout</string>
+    <string name="explore_rooms">Explorar Salas</string>
+    <string name="create_room">Criar Sala</string>
+    <string name="start_chat">Começar Chat</string>
+    <string name="device_manager_other_sessions_description_unverified">Não-verificada · Última atividade %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Verificada · Última atividade %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Ver Todas (%1$d)</string>
+    <string name="device_manager_view_details">Visualizar Detalhes</string>
+    <string name="device_manager_verify_session">Verificar Sessão</string>
+    <string name="device_manager_verification_status_unverified">Sessão não-verificada</string>
+    <string name="device_manager_verification_status_verified">Sessão verificada</string>
+    <string name="a11y_device_manager_device_type_unknown">Tipo de dispositivo desconhecido</string>
+    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobile</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="timeline_error_room_not_found">Desculpe, esta sala não tem sido encontrada.
+\nPor favor retente mais tarde.%s</string>
+    <string name="invites_title">Convites</string>
+    <string name="onboarding_new_app_layout_button_try">Experimentar</string>
+    <string name="onboarding_new_app_layout_feedback_message">Toque na direita topo para ver a opção para feedback.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Dê Feedback</string>
+    <string name="onboarding_new_app_layout_spaces_message">Acesse seus Espaços (direita fundo) mais rápido e fácil que jamais antes.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Acesse Espaços</string>
+    <string name="onboarding_new_app_layout_welcome_message">Para simplificar seu ${app_name}, abas são agora opcionais. Gerencie-as usando o menu direito topo.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Boas-vindas a uma nova visão!</string>
+    <string name="home_empty_no_unreads_message">Isto é onde suas mensagens não-lidas vão aparecer, quando você tiver algumas.</string>
+    <string name="home_empty_no_unreads_title">Nada para reportar.</string>
+    <string name="home_empty_no_rooms_message">O app de chat seguro tudo-em-um para equipes, amigas(os) e organizações. Crie um chat, ou junte-se a uma sala existe, para começar.</string>
+    <string name="home_empty_no_rooms_title">Boas-vindas a ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Espaços são uma nova maneira de agrupar salas e pessoas. Adicione uma sala existente, ou crie uma nova, usando o botão direito fundo.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nestá parecendo um pouco vazio.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Considere fazer signout de sessões antigas (%1$d dia ou mais) que você não usa mais.</item>
+        <item quantity="other">Considere fazer signout de sessões antigas (%1$d dias ou mais) que você não usa mais.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Sessões inativas</string>
+    <string name="device_manager_unverified_sessions_description">Verificar ou fazer signout de sessões não-verificadas.</string>
+    <string name="device_manager_unverified_sessions_title">Sessões não-verificadas</string>
+    <string name="device_manager_header_section_security_recommendations_description">Melhore a segurança de sua conta ao seguir estas recomendações.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Recomendações de segurança</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inativa por %1$d+ dia (%2$s)</item>
+        <item quantity="other">Inativa por %1$d+ dias (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Isto é onde suas novas requisições e convites vão estar.</string>
+    <string name="invites_empty_title">Nada novo.</string>
+    <string name="space_list_empty_message">Espaços são uma nova maneira de agrupar salas e pessoas. Crie um espaço para começar.</string>
+    <string name="space_list_empty_title">Nenhum espaço ainda.</string>
+    <string name="a11y_collapse_space_children">Colapsar filhos de %s</string>
+    <string name="a11y_expand_space_children">Expandir filhos de %s</string>
+    <string name="change_space">Mudar Espaço</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Não-verificadas</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Verificadas</string>
+    <string name="device_manager_filter_option_unverified">Não-verificadas</string>
+    <string name="device_manager_filter_option_verified">Verificadas</string>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inativas</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Inativas por %1$d dia ou mais longo</item>
+        <item quantity="other">Inativas por %1$d dias ou mais longo</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inativas</string>
+    <string name="device_manager_session_details_device_ip_address">Endereço de IP</string>
+    <string name="device_manager_session_details_session_last_activity">Última atividade</string>
+    <string name="device_manager_session_details_session_name">Nome de sessão</string>
+    <string name="device_manager_session_details_description">Informação de aplicativo, dispositivo, e atividade.</string>
+    <string name="device_manager_session_details_title">Detalhes de sessão</string>
+    <string name="device_manager_other_sessions_clear_filter">Limpar Filtro</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Nenhuma sessão inativa encontrada.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Nenhuma sessão não-verificada encontrada.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Nenhuma sessão verificada encontrada.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Considere fazer signout de sessões antigas (%1$d dia ou mais) que você não usa mais.</item>
+        <item quantity="other">Considere fazer signout de sessões antigas (%1$d dias ou mais) que você não usa mais.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifique suas sessões para mensageria segura melhorada ou faça signout daquelas que você não reconhece ou usa mais.</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Para melhor segurança, faça signout de qualquer sessão que você não reconhece ou usa mais.</string>
+    <string name="a11y_device_manager_filter">Filtrar</string>
+    <string name="device_manager_filter_option_verified_description">Pronta para mensageria segura</string>
+    <string name="device_manager_filter_option_unverified_description">Não pronta para mensageria segura</string>
+    <string name="device_manager_filter_option_all_sessions">Todas as sessões</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filtrar</string>
+    <string name="device_manager_session_last_activity">Última atividade %1$s</string>
+    <string name="device_manager_device_title">Dispositivo</string>
+    <string name="device_manager_session_title">Sessão</string>
+    <string name="device_manager_current_session_title">Sessão atual</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verifique ou faça signout desta sessão para melhor segurança e fiabilidade.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifique sua sessão atual para mensageria segura melhorada.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Esta sessão está pronta para mensageria segura.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Sua sessão atual está pronta para mensageria segura.</string>
+    <string name="labs_enable_deferred_dm_summary">Criar DM somente em primeira mensagem</string>
+    <string name="labs_enable_deferred_dm_title">Habilitar DMs diferidas</string>
+    <string name="labs_enable_new_app_layout_summary">Um Element simplificado com abas opcionais</string>
+    <string name="labs_enable_new_app_layout_title">Habilitar novo layout</string>
+    <string name="device_manager_learn_more_session_rename">Outras(os) usuárias(os) em mensagens diretas e salas a que você se junta são capazes de visualizar uma lista completa de suas sessões.
+\n
+\nIsto as/os provê com confiança que elas(es) são estão realmente falando com você, mas também significa que elas(es) veem o nome da sessão que você entrar aqui.</string>
+    <string name="device_manager_learn_more_session_rename_title">Renomeando sessões</string>
+    <string name="device_manager_learn_more_sessions_verified">Sessões verificadas têm feito login com suas credenciais e então têm sido verificadas, ou usando sua frasepasse segura ou por verificação cruzada.
+\n
+\nIsto significa que elas mantêm chaves de encriptação para suas mensagens anteriores, e confirmam a outras(os) usuárias(os) com quem você está comunicando que estas sessões são realmente você.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sessões verificadas</string>
+    <string name="device_manager_learn_more_sessions_unverified">Sessões não-verificadas são sessões que você tem feito login com suas credenciais mas não têm sido verificadas cruzado.
+\n
+\nVocê devia especialmente se certificar que você reconhece estas sessões já que elas podiam representar um uso não-autorizado de sua conta.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sessões não-verificadas</string>
+    <string name="device_manager_learn_more_sessions_inactive">Sessões inativas são sessões que você não tem usado em algum tempo, mas elas continuam a receber chaves de encriptação.
+\n
+\nRemover sessões inativas melhora segurança e performance, e torna mais fácil para você identificar se uma nova sessão é suspeita.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sessões inativas</string>
+    <string name="device_manager_session_rename_warning">Por favor esteja ciente que nomes de sessões também são visíveis a pessoas com quem você se comunica.</string>
+    <string name="device_manager_session_rename_description">Nomes de sessões personalizadas podem ajudar você a reconhecer seus dispositivos mais facilmente.</string>
+    <string name="device_manager_session_rename_edit_hint">Nome da sessão</string>
+    <string name="device_manager_session_rename">Renomear sessão</string>
+    <string name="device_manager_session_overview_signout">Fazer signout desta sessão</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Não-verificada · Sua sessão atual</string>
+    <string name="tooltip_attachment_voice_broadcast">Começar um broadcast de voz</string>
+    <string name="key_authenticity_not_guaranteed">A autenticidade desta mensagem encriptada não pode ser garantida neste dispositivo.</string>
+    <string name="settings_security_incognito_keyboard_summary">Requisitar que o teclado não devia atualizar quaisquer dados personalizados tais como histórico de digitação e dicionário baseado no que você tem digitado em conversas. Note que alguns teclados podem não respeitar esta configuração.</string>
+    <string name="settings_security_incognito_keyboard_title">Teclado incognito</string>
+    <string name="command_description_table_flip">Prepende (╯°□°）╯︵ ┻━┻ a uma mensagem de texto puro</string>
+    <string name="attachment_type_voice_broadcast">Broadcast de Voz</string>
+    <string name="command_description_devtools">Abrir tela de ferramentas de desenvolvedor(a)</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Você tem habilitado encriptar para sessões verificadas somente para todas as salas em Configurações de Segurança.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Existem dispositivos não-verificados nesta sala, eles não vão ser capazes de decriptar mensagens que você enviar.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Nunca enviar mensagens encriptadas a sessões não-verificadas nesta sala.</string>
+    <string name="action_got_it">Entendido</string>
+    <string name="rich_text_editor_format_strikethrough">Aplicar formato tachar</string>
+    <string name="rich_text_editor_format_underline">Aplicar formato sublinhar</string>
+    <string name="rich_text_editor_format_italic">Aplicar formato itálico</string>
+    <string name="rich_text_editor_format_bold">Aplicar formato negrito</string>
+    <string name="labs_enable_client_info_recording_summary">Gravar o nome de cliente, versão, e url para reconhecer sessões mais facilmente em gerenciador de sessão.</string>
+    <string name="labs_enable_client_info_recording_title">Habilitar gravação de info de cliente</string>
+    <string name="labs_enable_session_manager_summary">Tenha visibilidade e controle maiores sobre todas suas sessões.</string>
+    <string name="labs_enable_session_manager_title">Habilitar novo gerenciador de sessão</string>
+    <string name="device_manager_session_details_device_operating_system">Sistema operativo</string>
+    <string name="device_manager_session_details_device_model">Modelo</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versão</string>
+    <string name="device_manager_session_details_application_name">Nome</string>
+    <string name="device_manager_session_details_application">Aplicativo</string>
+    <string name="device_manager_push_notifications_description">Receber notificações push nesta sessão.</string>
+    <string name="device_manager_push_notifications_title">Notificações push</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifique sua sessão atual para revelar o status de verificação desta sessão.</string>
+    <string name="device_manager_verification_status_unknown">Status de verificação desconhecido</string>
+    <string name="push_gateway_item_enabled">Habilitado:</string>
+    <string name="push_gateway_item_device_id">ID da Sessão:</string>
+    <string name="error_check_network">Algo deu errado. Por favor cheque sua conexão de rede e tente de novo.</string>
+    <string name="grant_permission">Conceder Permissão</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} precisa de permissão para mostrar notificações.
+\nPor favor conceda a permissão.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} precisa de permissão para exibir notificações. Notificações podem exibir suas mensagens, seus convites, etc.
+\n
+\nPor favor permita acesso nos próximos pop-ups para ser capaz de visualizar notificação.</string>
+    <string name="labs_enable_rich_text_editor_summary">Experimente o editor de texto rico (modo de texto puro vindo em breve)</string>
+    <string name="labs_enable_rich_text_editor_title">Habilitar editor de texto rico</string>
+    <string name="qr_code_login_confirm_security_code_description">Por favor assegure que você sabe a origem deste código. Ao linkar dispositivos, você vai prover alguém com acesso completo a sua conta.</string>
+    <string name="qr_code_login_confirm_security_code">Confirmar</string>
+    <string name="qr_code_login_try_again">Tentar de novo</string>
+    <string name="qr_code_login_status_no_match">Nenhuma correspondência\?</string>
+    <string name="qr_code_login_signing_in">Fazendo-lhe signin</string>
+    <string name="qr_code_login_connecting_to_device">Conectando a dispositivo</string>
+    <string name="qr_code_login_scan_qr_code_button">Scannar QR code</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Fazendo signin com um dispositivo móvel\?</string>
+    <string name="qr_code_login_show_qr_code_button">Mostrar QR code neste dispositivo</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Selecione \'Scannar QR code\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Comece na tela de signin</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Selecione \'Fazer signin com QR code\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Comece na tela de signin</string>
+    <string name="qr_code_login_new_device_instruction_3">Selecione \'Mostrar QR code\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Vá para Configurações -&gt; Segurança &amp; Privacidade</string>
+    <string name="qr_code_login_new_device_instruction_1">Abra o app em seu outro dispositivo</string>
+    <string name="qr_code_login_header_failed_denied_description">A requisição foi negada no outro dispositivo.</string>
+    <string name="qr_code_login_header_failed_timeout_description">A linkagem não foi completada no tempo requerido.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Linkagem com este dispositivo não é suportado.</string>
+    <string name="qr_code_login_header_failed_title">Conexão malsucedida</string>
+    <string name="qr_code_login_header_connected_description">Cheque seu dispositivo feito signin, o código abaixo deveria ser exibido. Confirme que o código abaixo corresponde com esse dispositivo:</string>
+    <string name="qr_code_login_header_connected_title">Conexão segura estabelecida</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scanne o QR code abaixo com seu dispositivo que está feito signout.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Use seu dispositivo feito signin para scannar o QR code abaixo:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Fazer signin com QR code</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Use a câmera neste dispositivo para scannar o QR code mostrado em seu outro dispositivo:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Scannar QR code</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Você pode usar este dispositivo para fazer signin com um dispositivo móvel ou web com um QR code. Existem duas maneiras de fazer isto:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Fazer signin com QR Code</string>
+    <string name="login_scan_qr_code">Scannar QR code</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">O servidorcasa não suporta sign in com QR code.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">O sign in foi cancelado no outro dispositivo.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">O QR code é inválido.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">O outro dispositivo deve estar feito signin.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">O outro dispositivo já está feito signin.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Um problema de segurança foi encontrado ao configurar mensageria segura. Um dos seguintes pode ter sido comprometido: Seu servidorcasa; Sua(s) conexão(ões) de internet; Seu(s) dispositivo(s);</string>
+    <string name="qr_code_login_header_failed_other_description">A requisição falhou.</string>
+    <string name="labs_enable_voice_broadcast_summary">Seja capaz de gravar e enviar broadcast de voz em timeline de sala.</string>
+    <string name="labs_enable_voice_broadcast_title">Broadcast de voz</string>
+    <string name="a11y_voice_broadcast_buffering">Buffering…</string>
+    <string name="a11y_pause_voice_broadcast">Pausar broadcast de voz</string>
+    <string name="a11y_play_voice_broadcast">Tocar ou retomar broadcast de voz</string>
+    <string name="a11y_stop_voice_broadcast_record">Parar gravação de broadcast de voz</string>
+    <string name="a11y_pause_voice_broadcast_record">Pausar gravação de broadcast de voz</string>
+    <string name="a11y_resume_voice_broadcast_record">Retomar gravação de broadcast de voz</string>
+    <string name="voice_broadcast_live">Ao vivo</string>
+    <string name="device_manager_other_sessions_select">Selecionar sessões</string>
+    <string name="attachment_type_selector_contact">Contato</string>
+    <string name="attachment_type_selector_camera">Câmera</string>
+    <string name="attachment_type_selector_location">Localização</string>
+    <string name="attachment_type_selector_poll">Sondagens</string>
+    <string name="attachment_type_selector_voice_broadcast">Broadcast de voz</string>
+    <string name="attachment_type_selector_file">Anexos</string>
+    <string name="attachment_type_selector_sticker">Stickers</string>
+    <string name="attachment_type_selector_gallery">Biblioteca de fotos</string>
+    <string name="action_deselect_all">Desselecionar todas(os)</string>
+    <string name="action_select_all">Selecionar todas(os)</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d selecionada(o)</item>
+        <item quantity="other">%1$d selecionadas(os)</item>
+    </plurals>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Alguma outra pessoa já está gravando um broadcast de voz. Espere que o broadcast de voz dela termine para começar um novo.</string>
+    <string name="rich_text_editor_full_screen_toggle">Alternar modo de tela cheia</string>
+    <string name="attachment_type_selector_text_formatting">Formatação de texto</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Você já está gravando um broadcast de voz. Por favor termine seu broadcast de voz atual para começar um novo.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Você não tem as permissões requeridas para começar um broadcast de voz nesta sala. Contacte um/uma administrador(a) para fazer upgrade de suas permissões.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Não dá pra começar um novo broadcast de voz</string>
+    <string name="a11y_voice_broadcast_fast_forward">Avançar rápido 30 segundos</string>
+    <string name="a11y_voice_broadcast_fast_backward">Retroceder 30 segundos</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Sessões verificadas são onde quer que você esteja usando esta conta depois de entrar sua frasepasse ou confirmar sua identidade com uma outra sessão verificada.
+\n
+\nIsto significa que você tem todas as chaves necessárias para destrancar suas mensagens encriptadas e confirmar a outras(os) usuárias(os) que você confia nesta sessão.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Fazer signout de %1$d sessão</item>
+        <item quantity="other">Fazer signout de %1$d sessões</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Fazer signout</string>
+    <string name="voice_broadcast_recording_time_left">%1$s restando</string>
+    <string name="message_reply_to_sender_created_poll">criou uma sondagem.</string>
+    <string name="message_reply_to_sender_sent_sticker">enviou um sticker.</string>
+    <string name="message_reply_to_sender_sent_video">enviou um vídeo.</string>
+    <string name="message_reply_to_sender_sent_image">enviou uma imagem.</string>
+    <string name="message_reply_to_sender_sent_voice_message">enviou uma mensagem de voz.</string>
+    <string name="message_reply_to_sender_sent_audio_file">enviou um arquivo de áudio.</string>
+    <string name="message_reply_to_sender_sent_file">enviou um arquivo.</string>
+    <string name="message_reply_to_prefix">Em resposta a</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Esconder endereço de IP</string>
+    <string name="device_manager_other_sessions_show_ip_address">Mostrar endereço de IP</string>
+    <string name="quoting">Citando</string>
+    <string name="replying_to">Respondendo a %s</string>
+    <string name="editing">Editando</string>
+    <string name="settings_enable_direct_share_summary">Mostrar chats recentes no menu de compartilhar do sistema</string>
+    <string name="settings_enable_direct_share_title">Habilitar compartilhar direto</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Esta sessão não suporta encriptação, então ela não pode ser verificada.
+\n
+\nVocê não vai ser capaz de participar em salas onde encriptação está habilitada quando usando esta sessão.
+\n
+\nPara a melhor segurança e privacidade, é recomendado usar cliente Matrix que suportam encriptação.</string>
+    <string name="device_manager_signout_all_other_sessions">Fazer signout de todas as outras sessões</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Esta sessão não suporta encriptação e assim não pode ser verificada.</string>
+    <string name="review_unverified_sessions_description">Revise para assegurar que sua conta está segura</string>
+    <string name="review_unverified_sessions_title">Você tem sessões não-verificadas</string>
+    <string name="settings_nightly_build_update">Obtenha a build mais recente (note: você pode ter problema para fazer signin)</string>
+    <string name="settings_nightly_build">Build nightly</string>
+    <string name="voice_broadcast_live_broadcast">Broadcast ao vivo</string>
+    <string name="notice_voice_broadcast_ended_by_you">Você terminou um broadcast de voz.</string>
+    <string name="notice_voice_broadcast_ended">%1$s terminou um broadcast de voz.</string>
+    <string name="set_link_edit">Editar link</string>
+    <string name="set_link_create">Criar um link</string>
+    <string name="set_link_link">Link</string>
+    <string name="set_link_text">Texto</string>
+    <string name="rich_text_editor_link">Definir link</string>
+    <string name="stop_voice_broadcast_content">Tem certeza que você quer parar seu broadcast ao vivo\? Isto vai terminar o broadcast e a gravação completa vai estar disponível na sala.</string>
+    <string name="stop_voice_broadcast_dialog_title">Parar de fazer broadcasting ao vivo\?</string>
+    <string name="action_stop">Sim, Parar</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-pt-rBR/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-pt-rBR/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-pt-rBR/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-pt-rBR/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-pt/strings.xml b/library/ui-strings/src/main/res/values-pt/strings.xml
similarity index 99%
rename from vector/src/main/res/values-pt/strings.xml
rename to library/ui-strings/src/main/res/values-pt/strings.xml
index c5f6329f3d..87b6297b2b 100644
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/library/ui-strings/src/main/res/values-pt/strings.xml
@@ -107,7 +107,6 @@
     <string name="auth_forgot_password">Esqueceu-se da palavra-passe?</string>
 
     <string name="auth_recaptcha_message">Este servidor quer ter a certeza de que você não é um robô</string>
-    <string name="auth_reset_password_missing_email">O endereço de e-mail associado à sua conta tem que ser introduzido.</string>
     <string name="auth_reset_password_error_unauthorized">Falha ao verificar o endereço de e-mail: verifique se clicou no link no e-mail</string>
 
     <string name="login_error_invalid_home_server">Introduza um URL válido</string>
@@ -247,7 +246,7 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
 
     <string name="encryption_information_decryption_error">Erro de decifragem</string>
     <string name="encryption_information_device_name">Nome do dispositivo</string>
-    <string name="encryption_information_device_id">ID do dispositivo</string>
+    <string name="device_manager_session_details_session_id">ID do dispositivo</string>
     <string name="encryption_information_device_key">Chave do dispositivo</string>
     <string name="encryption_export_e2e_room_keys">Exportar chaves E2E da sala</string>
     <string name="encryption_export_room_keys">Exportar chaves de sala</string>
@@ -316,7 +315,6 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
     <string name="action_download">Descarregar</string>
     <string name="dialog_title_error">Erro</string>
     <string name="system_alerts_header">Alertas de Sistema</string>
-    <string name="groups_header">Comunidades</string>
     <string name="send_bug_report_description_in_english">Se possível, escrever a descrição em inglês.</string>
     <string name="send_bug_report_rage_shake">Agitar furiosamente para relatar um erro</string>
     <string name="option_send_voice">Enviar voz</string>
diff --git a/vector/src/main/res/values-pt/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-pt/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-pt/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-pt/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-ro/strings.xml b/library/ui-strings/src/main/res/values-ro/strings.xml
similarity index 99%
rename from vector/src/main/res/values-ro/strings.xml
rename to library/ui-strings/src/main/res/values-ro/strings.xml
index 09a5863b77..01e4761983 100644
--- a/vector/src/main/res/values-ro/strings.xml
+++ b/library/ui-strings/src/main/res/values-ro/strings.xml
@@ -267,8 +267,6 @@
     <string name="event_status_sent_message">Mesaj trimis</string>
     <string name="initial_sync_start_importing_account_data">Sincronizare inițială:
 \nSe importă datele contului</string>
-    <string name="initial_sync_start_importing_account_groups">Sincronizare inițială:
-\nSe importă comunitățile</string>
     <string name="initial_sync_start_importing_account_left_rooms">Sincronizare inițială:
 \nSe importă camerele pe care le-ați părăsit</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Sincronizare inițială:
@@ -403,4 +401,4 @@
     <string name="notice_room_join_with_reason">%1$s s-a alăturat camerei. Motivul: %2$s</string>
     <string name="notice_room_invite_you_with_reason">%1$s te-a invitat. Motivul: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s la invitat pe %2$s. Motivul este: %3$s</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-ro/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-ro/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-ro/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-ro/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-ru/strings.xml b/library/ui-strings/src/main/res/values-ru/strings.xml
similarity index 83%
rename from vector/src/main/res/values-ru/strings.xml
rename to library/ui-strings/src/main/res/values-ru/strings.xml
index 1fd522c7d5..0d8f1103fe 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -3,7 +3,7 @@
     <string name="notice_room_invite_no_invitee">приглашение %s</string>
     <string name="notice_room_invite">%1$s пригласил(а) %2$s</string>
     <string name="notice_room_invite_you">%1$s пригласил(а) вас</string>
-    <string name="notice_room_join">%1$s вошёл(ла) в комнату</string>
+    <string name="notice_room_join">%1$s вошёл(шла) в комнату</string>
     <string name="notice_room_leave">%1$s покинул(а) комнату</string>
     <string name="notice_room_reject">%1$s отклонил(а) приглашение</string>
     <string name="notice_room_remove">%1$s выгнан %2$s</string>
@@ -52,17 +52,15 @@
 \nИмпорт приглашенных комнат</string>
     <string name="initial_sync_start_importing_account_left_rooms">Начальная синхронизация:
 \nИмпорт покинутых комнат</string>
-    <string name="initial_sync_start_importing_account_groups">Начальная синхронизация:
-\nИмпорт сообществ</string>
     <string name="initial_sync_start_importing_account_data">Начальная синхронизация:
-\nИмпорт данных учетной записи</string>
+\nИмпорт данных учётной записи</string>
     <string name="notice_room_update">%s обновил эту комнату.</string>
     <string name="event_status_sending_message">Отправка сообщения…</string>
     <string name="notice_room_third_party_revoked_invite">%1$s отозвал приглашение %2$s присоединиться к комнате</string>
     <string name="notice_room_invite_no_invitee_with_reason">Приглашение %1$s. Причина: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s приглашен %2$s. Причина: %3$s</string>
     <string name="notice_room_invite_you_with_reason">%1$s пригласил вас. Причина: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s вошёл(ла) в комнату. Причина: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s присоединился(лась) к комнате. Причина: %2$s</string>
     <string name="notice_room_leave_with_reason">%1$s покинул(а) комнату. Причина: %2$s</string>
     <string name="notice_room_reject_with_reason">%1$s отклонил приглашение. Причина: %2$s</string>
     <string name="notice_room_remove_with_reason">%1$s выгнали %2$s. Причина: %3$s</string>
@@ -194,7 +192,7 @@
     <string name="room_displayname_3_members">%1$s, %2$s и %3$s</string>
     <string name="notice_room_server_acl_allow_is_empty">🎉 Всем серверам запрещено участвовать! Эта комната больше не может быть использована.</string>
     <string name="notice_room_server_acl_updated_no_change">Без изменений.</string>
-    <string name="room_displayname_empty_room_was">Пустая комната (был(а) %s)</string>
+    <string name="room_displayname_empty_room_was">Пустая комната (без %s)</string>
     <string name="notice_room_server_acl_set_banned">• Соответствующие серверы %s заблокированы.</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Серверы, соответствующие буквальным IP-адресам, теперь запрещены.</string>
     <string name="notice_room_server_acl_updated_ip_literals_allowed">• Серверы, соответствующие буквальным IP-адресам, теперь разрешены.</string>
@@ -258,7 +256,7 @@
     <string name="action_rename">Переименовать</string>
     <string name="report_content">Пожаловаться на содержимое</string>
     <string name="or">или</string>
-    <string name="action_invite">Приглашение</string>
+    <string name="action_invite">Пригласить</string>
     <string name="action_sign_out">Выйти из учётной записи</string>
     <string name="action_voice_call">Голосовой вызов</string>
     <string name="action_video_call">Видео вызов</string>
@@ -275,7 +273,7 @@
     <string name="home_filter_placeholder_home">Фильтр названий комнат</string>
     <string name="invitations_header">Приглашения</string>
     <string name="low_priority_header">Маловажные</string>
-    <string name="direct_chats_header">Беседы</string>
+    <string name="direct_chats_header">Личные сообщения</string>
     <string name="matrix_only_filter">Только Matrix контакты</string>
     <string name="no_result_placeholder">Нет результатов</string>
     <string name="rooms_header">Комнаты</string>
@@ -290,7 +288,7 @@
     <string name="send_bug_report_sent">Отчет об ошибке успешно отправлен</string>
     <string name="send_bug_report_failed">Сбой отправки отчета об ошибке (%s)</string>
     <string name="send_bug_report_progress">Прогресс (%s%%)</string>
-    <string name="send_bug_report_app_crashed">В прошлый раз приложение некорректно завершило работу. Хотите отправить отчет о сбое?</string>
+    <string name="send_bug_report_app_crashed">В прошлый раз приложение некорректно завершило работу. Хотите отправить отчёт о сбое\?</string>
     <string name="join_room">Войти в Комнату</string>
     <string name="username">Имя пользователя</string>
     <string name="logout">Выйти</string>
@@ -307,7 +305,6 @@
     <string name="auth_email_already_defined">Этот адрес электронной почты уже используется.</string>
     <string name="auth_forgot_password">Забыли пароль?</string>
     <string name="auth_recaptcha_message">Этот домашний сервер хочет убедиться, что вы не робот</string>
-    <string name="auth_reset_password_missing_email">Должен быть введен адрес электронной почты привязанный к учетной записи.</string>
     <string name="auth_reset_password_error_unauthorized">Не удалось проверить адрес электронной почты: убедитесь, что вы перешли по ссылке из сообщения</string>
     <string name="login_error_invalid_home_server">Пожалуйста, введите корректный URL</string>
     <string name="login_error_bad_json">Неверный формат JSON</string>
@@ -370,8 +367,8 @@
     <string name="settings_add_phone_number">Добавить телефон</string>
     <string name="settings_app_info_link_summary">Системные настройки приложения.</string>
     <string name="settings_app_info_link_title">Сведения о приложении</string>
-    <string name="settings_enable_all_notif">Включить уведомления для этой учетной записи</string>
-    <string name="settings_enable_this_device">Включить уведомления для этой сессии</string>
+    <string name="settings_enable_all_notif">Уведомления для этой учётной записи</string>
+    <string name="settings_enable_this_device">Уведомления для этого сеанса</string>
     <string name="settings_messages_in_one_to_one">В персональных чатах</string>
     <string name="settings_messages_in_group_chat">В групповых чатах</string>
     <string name="settings_invited_to_room">Когда меня приглашают в комнату</string>
@@ -401,8 +398,8 @@
     <string name="settings_pin_missed_notifications">Прикрепить комнаты с отключенными уведомлениями</string>
     <string name="settings_pin_unread_messages">Прикрепить комнаты с непрочитанными сообщениями</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Публичное имя</string>
-    <string name="devices_details_device_name">Обновить публичное имя</string>
+    <string name="devices_details_name_title">Публичное название</string>
+    <string name="devices_details_device_name">Обновить публичное название</string>
     <string name="devices_details_last_seen_title">Недавно</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_title">Аутентификация</string>
@@ -434,28 +431,28 @@
     <string name="room_settings_set_main_address">Установить как основной адрес</string>
     <string name="room_settings_unset_main_address">Сбросить основной адрес</string>
     <string name="encryption_information_decryption_error">Ошибка дешифровки</string>
-    <string name="encryption_information_device_name">Публичное имя</string>
-    <string name="encryption_information_device_id">ID сессии</string>
-    <string name="encryption_information_device_key">Ключ сессии</string>
-    <string name="encryption_export_e2e_room_keys">Экспорт E2E ключей комнаты</string>
-    <string name="encryption_export_room_keys">Экспорт ключей комнаты</string>
+    <string name="encryption_information_device_name">Публичное название</string>
+    <string name="device_manager_session_details_session_id">ID сеанса</string>
+    <string name="encryption_information_device_key">Ключ сеанса</string>
+    <string name="encryption_export_e2e_room_keys">Экспорт E2E ключей</string>
+    <string name="encryption_export_room_keys">Экспорт ключей</string>
     <string name="encryption_export_room_keys_summary">Экспорт ключей в локальный файл</string>
     <string name="encryption_export_export">Экспорт</string>
-    <string name="passphrase_enter_passphrase">Введите парольную фразу</string>
-    <string name="passphrase_confirm_passphrase">Подтвердите парольную фразу</string>
-    <string name="encryption_import_e2e_room_keys">Импорт E2E ключей комнаты</string>
-    <string name="encryption_import_room_keys">Импорт ключей комнаты</string>
+    <string name="passphrase_enter_passphrase">Введите мнемоническую фразу</string>
+    <string name="passphrase_confirm_passphrase">Подтвердите мнемоническую фразу</string>
+    <string name="encryption_import_e2e_room_keys">Импорт E2E ключей</string>
+    <string name="encryption_import_room_keys">Импорт ключей</string>
     <string name="encryption_import_room_keys_summary">Импортировать ключи из локального файла</string>
     <string name="encryption_import_import">Импорт</string>
-    <string name="encryption_never_send_to_unverified_devices_title">Шифровать только для проверенных сессий</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Не отправлять зашифрованные сообщения непроверенным сессиям с этой сессии.</string>
-    <string name="encryption_information_not_verified">Не проверено</string>
-    <string name="encryption_information_verified">Проверено</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Шифровать только для заверенных сеансов</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Не отправлять зашифрованные сообщения незаверенным сеансам из этого сеанса.</string>
+    <string name="encryption_information_not_verified">Не заверено</string>
+    <string name="encryption_information_verified">Заверено</string>
     <string name="encryption_information_verify">Подтвердить</string>
     <string name="encryption_information_verify_device_warning">Чтобы убедиться, что этой сессии можно доверять, обратитесь к ее владельцу, используя другие способы (например, лично или по телефону), и спросите, соответствует ли ключ, который он видит в настройках для этой сессии:</string>
     <string name="encryption_information_verify_device_warning2">Если они не совпадают, безопасность вашего общения может быть поставлена под угрозу.</string>
     <string name="select_room_directory">Выбор каталога комнат</string>
-    <string name="directory_server_placeholder">Имя сервера</string>
+    <string name="directory_server_placeholder">Название сервера</string>
     <string name="directory_server_all_rooms_on_server">Все комнаты на сервере %s</string>
     <string name="directory_server_native_rooms">Все местные комнаты %s</string>
     <string name="settings_user_interface">Пользовательский интерфейс</string>
@@ -497,7 +494,7 @@
     <string name="call">Вызов</string>
     <string name="settings_containing_my_user_name">Сообщения, содержащие мое имя пользователя</string>
     <string name="you_added_a_new_device">Вы добавили новою сессию \'%s\', запрашивающую ключи шифрования.</string>
-    <string name="your_unverified_device_requesting">Ваше непроверенная сессия \'%s\' запрашивает ключи шифрования.</string>
+    <string name="your_unverified_device_requesting">Ваш незаверенный сеанс \'%s\' запрашивает ключи шифрования.</string>
     <string name="settings_containing_my_display_name">Сообщения, содержащие моё отображаемое имя</string>
     <string name="start_verification">Начать проверку</string>
     <string name="notification_noisy_notifications">Звуковые уведомления</string>
@@ -513,7 +510,6 @@
     <string name="notification_noisy">Громко</string>
     <string name="encrypted_message">Зашифрованное сообщение</string>
     <string name="loading">Загрузка…</string>
-    <string name="groups_header">Сообщества</string>
     <string name="start_voice_call_prompt_msg">Вы уверены, что хотите начать голосовой вызов?</string>
     <string name="start_video_call_prompt_msg">Вы уверены, что хотите начать видеовызов?</string>
     <string name="room_participants_ban_prompt_msg">Блокировка пользователя удалит его из этой комнаты и не позволит ему присоединиться вновь.</string>
@@ -621,8 +617,8 @@
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
     <string name="dialog_title_error">Ошибка</string>
-    <string name="passphrase_create_passphrase">Создать парольную фразу</string>
-    <string name="passphrase_passphrase_does_not_match">Парольные фразы не совпадают</string>
+    <string name="passphrase_create_passphrase">Создать мнемоническую фразу</string>
+    <string name="passphrase_passphrase_does_not_match">Мнемонические фразы не совпадают</string>
     <string name="resource_limit_contact_admin">свяжитесь с вашим администратором</string>
     <string name="resource_limit_soft_default">Превышен один из ресурсных лимитов сервера, по этому <b>некоторые пользователи не смогут авторизоваться</b>.</string>
     <string name="resource_limit_hard_default">Превышен один из ресурсных лимитов сервера.</string>
@@ -641,7 +637,7 @@
     <string name="settings_call_ringtone_title">Мелодия входящего вызова</string>
     <string name="settings_call_ringtone_dialog_title">Выберите мелодию звонка:</string>
     <string name="video_call_in_progress">Идёт видеозвонок …</string>
-    <string name="room_participants_action_remove">Удалить из чата</string>
+    <string name="room_participants_action_remove">Удалить из комнаты</string>
     <string name="settings_notification_troubleshoot">Поиск проблем с уведомлениями</string>
     <string name="settings_send_typing_notifs">Оправлять уведомления о наборе текста</string>
     <string name="settings_send_markdown">Markdown форматирование</string>
@@ -665,9 +661,9 @@
     <string name="settings_troubleshoot_test_account_settings_failed">Уведомления отключены для вашей учетной записи. 
 \nПожалуйста, проверьте настройки аккаунта.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Включить</string>
-    <string name="settings_troubleshoot_test_device_settings_title">Настройки сессии.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">Настройки сеанса.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Уведомления включены для этой сессии.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Уведомления не включено для этой сессии.
+    <string name="settings_troubleshoot_test_device_settings_failed">Уведомления не включены для этого сеанса.
 \nПожалуйста, проверьте настройки ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Включить</string>
     <string name="settings_troubleshoot_test_play_services_title">Проверка сервисов Play</string>
@@ -729,47 +725,47 @@
     <string name="settings_cryptography_manage_keys">Управление криптографическими ключами</string>
     <string name="encryption_settings_manage_message_recovery_summary">Управление резервным копированием ключей</string>
     <string name="notification_silent">Беззвучный</string>
-    <string name="passphrase_empty_error_message">Пожалуйста, введите парольную фразу</string>
-    <string name="passphrase_passphrase_too_weak">Парольная фраза слишком простая</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите парольную фразу, если хотите, чтобы ${app_name} сгенерировал ключ восстановления.</string>
+    <string name="passphrase_empty_error_message">Введите мнемоническую фразу</string>
+    <string name="passphrase_passphrase_too_weak">Мнемоническая фраза слишком проста</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите мнемоническую фразу, если хотите, чтобы ${app_name} сгенерировал бумажный ключ.</string>
     <string name="keys_backup_setup_step1_title">Никогда не теряйте зашифрованных сообщений</string>
     <string name="keys_backup_setup_step1_description">Сообщения в зашифрованных комнатах защищены сквозным шифрованием. Ключи для прочтения этих сообщений есть только у вас и получателя(ей).
 \n
 \nНадёжно сохраните резервную копию ключей, чтобы не потерять их.</string>
-    <string name="keys_backup_setup_step2_button_title">Установите парольную фразу</string>
-    <string name="keys_backup_setup_step3_copy_button_title">Сохраните ключ восстановления</string>
+    <string name="keys_backup_setup_step2_button_title">Задайте мнемоническую фразу</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Сохранить бумажный ключ</string>
     <string name="keys_backup_setup_step3_button_title">Готово</string>
     <string name="keys_backup_setup_step3_save_button_title">Сохранить как файл</string>
     <string name="keys_backup_setup_step3_please_make_copy">Пожалуйста, сделайте копию</string>
-    <string name="keys_backup_setup_step3_share_intent_chooser_title">Поделиться ключом восстановления с…</string>
-    <string name="recovery_key">Ключ для восстановления</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Поделиться бумажным ключом с…</string>
+    <string name="recovery_key">Бумажный ключ</string>
     <string name="unexpected_error">Непредвиденная ошибка</string>
     <string name="keys_backup_setup_skip_title">Уверены?</string>
-    <string name="keys_backup_settings_delete_confirm_message">Удалить резервную копию ключей шифрования с сервера? Вы больше не сможете использовать ключ восстановления для чтения истории зашифрованных сообщений.</string>
+    <string name="keys_backup_settings_delete_confirm_message">Удалить резервную копию ключей шифрования с сервера\? Вы больше не сможете использовать бумажный ключ для чтения истории зашифрованных сообщений.</string>
     <string name="keys_backup_settings_delete_confirm_title">Удалить резервную копию</string>
     <string name="keys_backup_settings_deleting_backup">Удаление резервной копии…</string>
-    <string name="keys_backup_settings_untrusted_backup">Чтобы использовать резервную копию ключа в этой сессии, восстановите его с помощью своей парольной фразы или ключа восстановления.</string>
+    <string name="keys_backup_settings_untrusted_backup">Чтобы использовать резервное копирование ключей в этом сеансе, восстановите их с помощью мнемонической фразы или бумажного ключа.</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Резервная копия имеет недействительную подпись из подтвержденной сессии %s</string>
     <string name="keys_backup_settings_valid_signature_from_unverified_device">Резервная копия имеет действительную подпись из неподтвержденной сессии %s</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">Резервная копия имеет действительную подпись из подтверждённой сессии %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">Резервная копия имеет действительную подпись с этой сессии.</string>
     <string name="keys_backup_settings_signature_from_unknown_device">Резервная копия подписана сессией с идентификатором %s.</string>
     <string name="keys_backup_settings_status_not_setup">Резервные копии ключей этой сессии не сохраняются.</string>
-    <string name="keys_backup_settings_status_ko">Резервное копирование ключей не активировано в этой сессии.</string>
-    <string name="keys_backup_settings_status_ok">Резервное копирование ключей успешно настроено для этой сессии.</string>
+    <string name="keys_backup_settings_status_ko">Резервное копирование ключей не активировано в этом сеансе.</string>
+    <string name="keys_backup_settings_status_ok">Резервное копирование ключей успешно настроено для этого сеанса.</string>
     <string name="keys_backup_settings_delete_backup_button">Удалить резервную копию</string>
     <string name="keys_backup_settings_restore_backup_button">Восстановить из резервной копии</string>
-    <string name="keys_backup_recovery_code_empty_error_message">Пожалуйста, введите ключ восстановления</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Пожалуйста, введите бумажный ключ</string>
     <string name="keys_backup_unlock_button">Разблокировать историю</string>
     <string name="keys_backup_restoring_waiting_message">Восстановление резервной копии:</string>
-    <string name="keys_backup_restore_key_enter_hint">Введите ключ восстановления</string>
-    <string name="keys_backup_restore_with_recovery_key">Используйте ключ восстановления для разблокировки истории зашифрованных сообщений</string>
-    <string name="keys_backup_restore_with_passphrase_helper_with_link">Если вы не знаете вашу парольную фразу для восстановления, вы можете %s.</string>
-    <string name="keys_backup_restore_use_recovery_key">используйте ключ восстановления</string>
+    <string name="keys_backup_restore_key_enter_hint">Введите бумажный ключ</string>
+    <string name="keys_backup_restore_with_recovery_key">Используйте бумажный ключ для разблокировки зашифрованных сообщений</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Если забыли свою мнемоническую фразу, вы можете %s.</string>
+    <string name="keys_backup_restore_use_recovery_key">используйте бумажный ключ</string>
     <string name="keys_backup_setup_skip_msg">Вы можете потерять доступ к сообщениям, если выйдете из системы или потеряете это устройство.</string>
     <string name="keys_backup_restore_is_getting_backup_version">Получение версии резервной копии…</string>
-    <string name="keys_backup_restore_with_passphrase">Используйте парольную фразу для разблокировки истории зашифрованных сообщений</string>
-    <string name="keys_backup_restore_with_key_helper">Потеряли ключ восстановления? В настройках вы можете создать новый.</string>
+    <string name="keys_backup_restore_with_passphrase">Используйте мнемоническую фразу для разблокировки зашифрованных сообщений</string>
+    <string name="keys_backup_restore_with_key_helper">Потеряли бумажный ключ\? В настройках вы можете создать новый.</string>
     <string name="keys_backup_restore_success_title">Резервная копия восстановлена %s !</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Резервная копия имеет недействительную подпись из неподтвержденной сессии %s</string>
     <string name="keys_backup_get_version_error">Не удалось получить последнюю версию ключей восстановления (%s).</string>
@@ -784,9 +780,9 @@
         <item quantity="few">Восстановлены резервные копии с %d ключами.</item>
         <item quantity="many">Восстановлены резервные копии с %d ключами.</item>
     </plurals>
-    <string name="keys_backup_recovery_code_error_decrypt">Невозможно расшифровать резервную копию с помощью этого ключа восстановления: убедитесь, что вы ввели правильный ключ.</string>
-    <string name="keys_backup_passphrase_error_decrypt">Невозможно расшифровать резервную копию с помощью этого пароля: убедитесь, что вы ввели правильный пароль.</string>
-    <string name="keys_backup_setup_step3_generating_key_status">Генерация ключей восстановления с использованием парольной фразы может занять несколько секунд.</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Невозможно расшифровать резервную копию с помощью этого бумажного ключа: пожалуйста, убедитесь, что вы ввели правильный бумажный ключ.</string>
+    <string name="keys_backup_passphrase_error_decrypt">Невозможно расшифровать резервную копию с помощью этой мнемонической фразы: пожалуйста, убедитесь, что вы ввели правильную мнемоническую фразу.</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Создание бумажного ключа с использованием мнемонической фразы может занять несколько секунд.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nЭта ошибка вне контроля ${app_name}. На телефоне нет учетной записи Google. Пожалуйста, добавьте аккаунт Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
@@ -819,9 +815,9 @@
     <string name="keys_backup_banner_in_progress">Резервное копирование ключей…</string>
     <string name="keys_backup_banner_recover_line1">Никогда не теряйте зашифрованные сообщения</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Поделиться</string>
-    <string name="keys_backup_setup_step3_button_title_no_passphrase">Я сделал копию</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Храните ключ восстановления в надежном месте, например, в диспетчере паролей (или в сейфе)</string>
-    <string name="keys_backup_setup_step2_text_title">Защитите резервную копию парольной фразой.</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Я сделал(а) копию</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Храните бумажный ключ в очень надёжном месте, например, в менеджере паролей (или в сейфе)</string>
+    <string name="keys_backup_setup_step2_text_title">Защитите резервную копию мнемонической фразой.</string>
     <string name="encryption_message_recovery">Восстановление зашифрованных сообщений</string>
     <string name="keys_backup_setup">Начать использовать резервное копирование ключей</string>
     <string name="keys_backup_banner_recover_line2">Использовать резервное копирование ключей</string>
@@ -829,16 +825,16 @@
     <string name="keys_backup_banner_update_line1">Новые ключи зашифрованных сообщений</string>
     <string name="keys_backup_setup_step3_text_line1">Ваши ключи копируются.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Дополнительно) Настройка с ключом восстановления</string>
-    <string name="keys_backup_setup_step1_recovery_key_alternative">Или защитите резервную копию с помощью ключа восстановления, сохранив его в безопасном месте.</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Или защитите резервную копию бумажным ключом, сохранив его в надёжном месте.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Безопасная резервная копия ключей должна быть активирована на всех ваших сессиях, чтобы не потерять доступ к зашифрованным сообщениям.</string>
-    <string name="keys_backup_setup_step2_text_description">Зашифрованная копия ключей будет храниться на вашем сервере. Для безопасности защитите её парольной фразой.
+    <string name="keys_backup_setup_step2_text_description">Зашифрованная копия ключей будет храниться на вашем сервере. Для безопасности защитите её мнемонической фразой.
 \n
-\nДля максимальной безопасности парольная фраза должна отличаться от пароля вашей учётной записи.</string>
-    <string name="keys_backup_setup_step3_text_line2">Ключ восстановления — это страховка, вы можете использовать его для восстановления доступа к вашим зашифрованным сообщениям, если забудете вашу парольную фразу. 
-\nХраните ключ восстановления в надёжном месте, например, в диспетчере паролей (или в сейфе)</string>
+\nДля максимальной безопасности мнемоническая фраза должна отличаться от пароля вашей учётной записи.</string>
+    <string name="keys_backup_setup_step3_text_line2">Бумажный ключ — это подстраховка: вы можете использовать его для восстановления доступа к своим зашифрованным сообщениям, если забудете свою мнемоническую фразу.
+\nХраните свой бумажный ключ в очень надёжном месте, например, в менеджере паролей (или в сейфе)</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Импортирование ключей…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Скачивание ключей…</string>
-    <string name="keys_backup_restoring_computing_key_waiting_message">Вычисление ключа восстановления…</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Вычисление бумажного ключа…</string>
     <string name="action_ignore">Игнорировать</string>
     <string name="action_mark_room_read">Отметить как прочитанное</string>
     <string name="auth_login_sso">Войти с помощью единого входа</string>
@@ -870,14 +866,14 @@
     <string name="encryption_information_unknown_ip">неизвестный IP</string>
     <string name="notification_inline_reply_failed">** Отправить не удалось — пожалуйста, откройте комнату</string>
     <string name="error_jitsi_not_supported_on_old_device">К сожалению, конференц-звонки с Jitsi не поддерживаются на старых устройствах (ниже Android OS - 6.0)</string>
-    <string name="you_added_a_new_device_with_info">Новая сессия запрашивает ключи шифрования. 
-\nИмя сессии: %1$s 
-\nПоследний раз в сети: %2$s 
-\nЕсли вы не вошли с другой сессии, проигнорируйте этот запрос.</string>
-    <string name="your_unverified_device_requesting_with_info">Непроверенная сессия запрашивает ключи шифрования. 
-\nИмя сессии: %1$s 
-\nПоследний раз в сети: %2$s 
-\nЕсли вы не открывали новую сессию - проигнорируйте этот запрос.</string>
+    <string name="you_added_a_new_device_with_info">Новый сеанс запрашивает ключи шифрования.
+\nНазвание сеанса: %1$s
+\nПоследний раз в сети: %2$s
+\nЕсли вы не входили в другой сеанс, проигнорируйте этот запрос.</string>
+    <string name="your_unverified_device_requesting_with_info">Незаверенный сеанс запрашивает ключи шифрования.
+\nНазвание сеанса: %1$s
+\nПоследний раз в сети: %2$s
+\nЕсли вы не входили в другой сеанс, проигнорируйте этот запрос.</string>
     <string name="share_without_verifying_short_label">Поделиться</string>
     <string name="key_share_request">Запрос поделится ключом</string>
     <string name="ignore_request_short_label">Игнорировать</string>
@@ -911,17 +907,16 @@
     <string name="event_redacted_by_user_reason">Событие удалено пользователем</string>
     <string name="event_redacted_by_admin_reason">Событие модерируется администратором комнаты</string>
     <string name="malformed_message">Некорректное событие, не могу отобразить</string>
-    <string name="create_new_room">Создать новую комнату</string>
+    <string name="create_new_room">Создать комнату</string>
     <string name="error_no_network">Нет сети. Пожалуйста, проверьте подключение к Интернету.</string>
     <string name="action_change">Изменить</string>
-    <string name="change_room_directory_network">Изменить сеть</string>
+    <string name="change_room_directory_network">Изменить сервер</string>
     <string name="please_wait">Пожалуйста, подождите…</string>
-    <string name="group_all_communities">Все сообщества</string>
     <string name="room_preview_no_preview">Эту комнату нельзя предварительно просмотреть</string>
     <string name="fab_menu_create_room">Комнаты</string>
     <string name="fab_menu_create_chat">Личные сообщения</string>
     <string name="create_room_action_create">СОЗДАТЬ</string>
-    <string name="create_room_name_hint">Имя</string>
+    <string name="create_room_name_hint">Название</string>
     <string name="create_room_public_title">Публичная</string>
     <string name="create_room_public_description">Каждый сможет присоединиться к этой комнате</string>
     <string name="keys_backup_unable_to_get_trust_info">Произошла ошибка при получении информации о доверии</string>
@@ -932,12 +927,12 @@
     <string name="navigate_to_room_when_already_in_the_room">Вы уже просмотрели эту комнату!</string>
     <string name="settings_general_title">Общее</string>
     <string name="settings_preferences">Предпочтения</string>
-    <string name="settings_security_and_privacy">Безопасность и конфиденциальность</string>
+    <string name="settings_security_and_privacy">Безопасность</string>
     <string name="settings_push_rules">Правила push-уведомлений</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_id">ID приложения:</string>
+    <string name="push_gateway_item_push_key">Ключ Push:</string>
+    <string name="push_gateway_item_app_display_name">Отображаемое название приложения:</string>
+    <string name="push_gateway_item_device_name">Отображаемое название сеанса:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Формат:</string>
     <string name="preference_voice_and_video">Голос и видео</string>
@@ -960,12 +955,12 @@
     <string name="message_edits">Изменение сообщения</string>
     <string name="no_message_edits_found">Изменения не найдены</string>
     <string name="room_filtering_filter_hint">Отфильтровать беседы…</string>
-    <string name="room_filtering_footer_title">Не можете найти то, что ищете\?</string>
-    <string name="room_filtering_footer_create_new_room">Создать новую комнату</string>
-    <string name="room_filtering_footer_create_new_direct_message">Отправить новое личное сообщение</string>
-    <string name="room_filtering_footer_open_room_directory">Просмотр каталога комнат</string>
-    <string name="room_directory_search_hint">Имя или ID (#example:matrix.org)</string>
-    <string name="labs_swipe_to_reply_in_timeline">Включить жест смахивания для ответа в ленте сообщений</string>
+    <string name="room_filtering_footer_title">Не можете найти нужное\?</string>
+    <string name="room_filtering_footer_create_new_room">Создать комнату</string>
+    <string name="room_filtering_footer_create_new_direct_message">Отправить личное сообщение</string>
+    <string name="room_filtering_footer_open_room_directory">Каталог комнат</string>
+    <string name="room_directory_search_hint">Название или ID (#example:matrix.org)</string>
+    <string name="labs_swipe_to_reply_in_timeline">Жест смахивания для ответа в ленте сообщений</string>
     <string name="link_copied_to_clipboard">Ссылка скопирована в буфер обмена</string>
     <string name="creating_direct_room">Создаем комнату…</string>
     <string name="message_view_edit_history">История изменений</string>
@@ -1005,10 +1000,10 @@
     <string name="settings_discovery_bad_identity_server">Не удалось подключиться к серверу обнаружения</string>
     <string name="settings_discovery_please_enter_server">Пожалуйста, введите URL сервера обнаружения</string>
     <string name="settings_discovery_no_terms_title">Сервер обнаружения не имеет условий использования</string>
-    <string name="settings_discovery_no_mails">Параметры обнаружения появятся после добавления электронной почты.</string>
+    <string name="settings_discovery_no_mails">Параметры обнаружения появятся после добавления адреса электронной почты.</string>
     <string name="settings_discovery_no_msisdn">Параметры поиска появятся после добавления номера телефона.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Отключение от сервера обнаружения будет означать, что другие пользователи не смогут обнаружить вас, и вы не сможете приглашать других по электронной почте или по телефону.</string>
-    <string name="settings_discovery_confirm_mail">Мы отправили вам электронное письмо с подтверждением на %s, проверьте вашу электронную почту и нажмите на ссылку для подтверждения</string>
+    <string name="settings_discovery_confirm_mail">Мы отправили вам электронное письмо на %s, проверьте вашу электронную почту и нажмите на ссылку для подтверждения</string>
     <string name="settings_discovery_no_terms">Выбранный сервер обнаружения не имеет условий использования. Продолжайте, только если вы доверяете его владельцу</string>
     <string name="settings_text_message_sent">Текстовое сообщение отправлено %s. Введите код проверки, который он содержит.</string>
     <string name="settings_discovery_disconnect_with_bound_pid">В настоящее время вы делитесь адресами электронной почты или телефонными номерами на сервере обнаружения %1$s. Вам нужно повторно подключиться к %2$s, чтобы прекратить делиться ими.</string>
@@ -1044,7 +1039,7 @@
     <string name="room_widget_webview_access_camera">Использовать камеру</string>
     <string name="room_widget_webview_access_microphone">Использовать микрофон</string>
     <string name="room_widget_webview_read_protected_media">Получать доступ к медиа, защищённым DRM</string>
-    <string name="a11y_create_room">Создать новую комнату</string>
+    <string name="a11y_create_room">Создать комнату</string>
     <string name="attachment_type_file">Файл</string>
     <string name="attachment_type_camera">Камера</string>
     <string name="attachment_type_gallery">Галерея</string>
@@ -1107,7 +1102,7 @@
     <string name="login_reset_password_warning_title">Предупреждение!</string>
     <string name="login_reset_password_warning_content">Смена пароля приведёт к сбросу всех сквозных ключей шифрования во всех ваших сессиях, что сделает зашифрованную историю разговоров нечитаемой. Настройте резервное копирование ключей или экспортируйте ключи от комнаты из другой сессии, прежде чем сбрасывать пароль.</string>
     <string name="login_reset_password_warning_submit">Продолжить</string>
-    <string name="login_reset_password_error_not_found">Данный электронный ящик не связан ни с одним аккаунтом</string>
+    <string name="login_reset_password_error_not_found">Данный адрес электронной почты не связан ни с одним аккаунтом</string>
     <string name="login_reset_password_mail_confirmation_title">Проверьте свою почту</string>
     <string name="login_reset_password_mail_confirmation_notice">Письмо с подтверждением было отправлено на %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Нажмите на ссылку, чтобы подтвердить свой новый пароль. Как только вы перейдете по ссылке нажмите ниже.</string>
@@ -1190,8 +1185,8 @@
     <string name="settings_developer_mode">Режим разработчика</string>
     <string name="settings_developer_mode_summary">Режим разработчика активирует скрытые функции, а также может сделать приложение менее стабильным. Только для разработчиков!</string>
     <string name="settings">Настройки</string>
-    <string name="devices_current_device">Текущая сессия</string>
-    <string name="devices_other_devices">Другие сессии</string>
+    <string name="devices_current_device">Текущий сеанс</string>
+    <string name="devices_other_devices">Другие сеансы</string>
     <string name="create_room_encryption_title">Включить шифрование</string>
     <string name="verification_conclusion_warning">Недоверенный вход</string>
     <string name="room_profile_section_more_uploads">Вложения</string>
@@ -1224,10 +1219,10 @@
     <string name="room_profile_section_more">Ещё</string>
     <string name="a11y_qr_code_for_verification">QR-код</string>
     <string name="no_connectivity_to_the_server_indicator">Соединение с сервером потеряно</string>
-    <string name="verification_cannot_access_other_session">Используйте пароль восстановления или ключ</string>
+    <string name="verification_cannot_access_other_session">Используйте мнемоническую фразу или бумажный ключ</string>
     <string name="e2e_use_keybackup">Разблокировать историю зашифрованных сообщений</string>
     <string name="verify_cancelled_notice">Проверка была отменена. Вы можете начать проверку снова.</string>
-    <string name="recovery_passphrase">Парольная фраза для восстановления</string>
+    <string name="recovery_passphrase">Мнемоническая фраза</string>
     <string name="enter_account_password">Введите %s, чтобы продолжить.</string>
     <string name="bootstrap_dont_reuse_pwd">Не переиспользуйте пароль учётной записи.</string>
     <string name="bootstrap_loading_text">Это может занять несколько секунд, пожалуйста, наберитесь терпения.</string>
@@ -1235,8 +1230,8 @@
     <string name="room_message_placeholder">Сообщение…</string>
     <string name="upgrade_security">Доступно обновление шифрования</string>
     <string name="security_prompt_text">Проверьте себя и других для защиты ваших бесед</string>
-    <string name="crosssigning_verify_session">Подтвердите вход</string>
-    <string name="confirm_your_identity">Подтвердите свою личность и получите доступ к зашифрованным сообщениям, подтвердив этот вход в другой сессии.</string>
+    <string name="crosssigning_verify_session">Заверьте сеанс</string>
+    <string name="confirm_your_identity">Подтвердите свою личность и получите доступ к зашифрованным сообщениям, сверив этот сеанс с другим вашим сеансом.</string>
     <string name="settings_category_timeline">Лента сообщений</string>
     <string name="message_key">Ключ сообщения</string>
     <string name="bootstrap_crosssigning_print_it">Распечатайте его и храните в безопасном месте</string>
@@ -1246,7 +1241,7 @@
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
     <string name="settings_show_redacted">Удалённые сообщения</string>
     <string name="settings_show_redacted_summary">Показывать заглушку на месте удалённых сообщений</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Мы отправили письмо для подтверждения на %s, проверьте почту и нажмите на ссылку для подтверждения</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Мы отправили письмо на %s, пожалуйста проверьте почту и нажмите на ссылку для подтверждения</string>
     <string name="settings_text_message_sent_wrong_code">Код подтверждения неверный.</string>
     <string name="error_terms_not_accepted">Попробуйте снова после принятия условий обслуживания на вашем домашнем сервере.</string>
     <string name="error_network_timeout">Похоже, сервер долгое время не отвечает, что может быть вызвано плохим соединением или ошибкой на сервере. Попробуйте снова через некоторое время.</string>
@@ -1319,7 +1314,7 @@
     <string name="settings_secure_backup_reset">Сброс безопасного резервного копирования</string>
     <string name="settings_secure_backup_enter_to_setup">Настроить на этом устройстве</string>
     <string name="settings_secure_backup_section_info">Защитите себя от потери доступа к зашифрованным сообщениям и данным, создав резервные копии ключей шифрования на вашем сервере.</string>
-    <string name="reset_secure_backup_title">Создайте новый ключ безопасности или задайте новую секретную фразу для существующей резервной копии.</string>
+    <string name="reset_secure_backup_title">Создайте новый бумажный ключ или задайте новую мнемоническую фразу для существующей резервной копии.</string>
     <string name="reset_secure_backup_warning">Это заменит ваш текущий ключ или фразу.</string>
     <string name="disabled_integration_dialog_title">Интеграции отключены</string>
     <string name="disabled_integration_dialog_content">Включите «Управление интеграциями» в настройках, чтобы сделать это.</string>
@@ -1331,7 +1326,7 @@
     <string name="encryption_exported_successfully">Ключи успешно экспортированы</string>
     <string name="active_widget_view_action">ОБЗОР</string>
     <string name="active_widgets_title">Активные виджеты</string>
-    <string name="recovery_key_export_saved">Ключ восстановления был сохранён.</string>
+    <string name="recovery_key_export_saved">Бумажный ключ сохранён.</string>
     <string name="secure_backup_banner_setup_line1">Безопасное резервное копирование</string>
     <string name="secure_backup_banner_setup_line2">Защита от потери доступа к зашифрованным сообщениям и данным</string>
     <string name="secure_backup_setup">Настроить безопасное резервное копирование</string>
@@ -1356,7 +1351,7 @@
     <string name="login_server_url_form_common_notice">Введите адрес сервера, который вы хотите использовать</string>
     <string name="login_reset_password_notice">На ваш почтовый ящик будет отправлено письмо для подтверждения установки нового пароля.</string>
     <string name="login_reset_password_mail_confirmation_submit">Я подтвердил свою электронную почту</string>
-    <string name="login_set_email_notice">Установите адрес электронной почты для восстановления вашей учетной записи. Позже вы можете дополнительно разрешить людям, которых вы знаете, обнаружить вас по электронной почте.</string>
+    <string name="login_set_email_notice">Укажите адрес электронной почты для восстановления вашей учетной записи. Потом вы сможете, при желании, разрешить людям, которых вы знаете, обнаружить вас по адресу электронной почты.</string>
     <string name="login_validation_code_is_not_correct">Введенный код неверен. Пожалуйста, проверьте.</string>
     <string name="login_connect_using_matrix_id_submit">Войти с Matrix ID</string>
     <string name="login_signin_matrix_id_title">Войти с Matrix ID</string>
@@ -1373,7 +1368,7 @@
     <string name="autocomplete_limited_results">Показываем только первые результаты, наберите больше букв…</string>
     <string name="settings_developer_mode_fail_fast_title">Раннее падение</string>
     <string name="settings_developer_mode_fail_fast_summary">${app_name} может падать чаще, когда происходит непредвиденная ошибка</string>
-    <string name="command_description_shrug">Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения</string>
+    <string name="command_description_shrug">Добавляет ¯\\_(ツ)_/¯ в начало сообщения</string>
     <string name="create_room_encryption_description">После включения шифрования его нельзя отключить.</string>
     <string name="login_error_threepid_denied">Ваш почтовый домен не имеет права регистрироваться на этом сервере</string>
     <string name="verification_conclusion_not_secure">Не безопасно</string>
@@ -1395,7 +1390,7 @@
     <string name="verification_request_you_accepted">Вы приняли</string>
     <string name="verification_sent">Подтверждение отправлено</string>
     <string name="verification_request">Запрос на подтверждение</string>
-    <string name="verification_verify_device">Подтвердите эту сессию</string>
+    <string name="verification_verify_device">Заверьте этот сеанс</string>
     <string name="verification_scan_notice">Сканируйте код с помощью устройства другого пользователя, чтобы безопасно проверить друг друга</string>
     <string name="verification_scan_their_code">Сканировать их код</string>
     <string name="verification_scan_emoji_title">Невозможно сканировать</string>
@@ -1434,9 +1429,9 @@
     <string name="verification_emoji_notice">Сравните уникальные эмодзи, убедившись, что они появились в том же порядке.</string>
     <string name="verification_code_notice">Сравните код с тем, который отображается на экране другого пользователя.</string>
     <string name="verification_conclusion_ok_notice">Сообщения от этого пользователя зашифрованы сквозным шифрованием и не смогут быть прочитаны третьими лицами.</string>
-    <string name="verification_conclusion_ok_self_notice">Ваша новая сессия подтверждена. У нее есть доступ к вашим зашифрованным сообщениям, а другие пользователи увидят его как доверенное.</string>
-    <string name="encryption_information_cross_signing_state">Перекрестная подпись</string>
-    <string name="encryption_information_dg_xsigning_complete">Перекрестная подпись включена
+    <string name="verification_conclusion_ok_self_notice">Ваш новый сеанс заверен. Он имеет доступ к вашим зашифрованным сообщениям, и другие пользователи будут воспринимать его как заверенный.</string>
+    <string name="encryption_information_cross_signing_state">Перекрёстная подпись</string>
+    <string name="encryption_information_dg_xsigning_complete">Перекрёстная подпись включена
 \nЛичные ключи хранятся на устройстве.</string>
     <string name="encryption_information_dg_xsigning_trusted">Перекрестная подпись включена
 \nКлючи являются доверенными.
@@ -1445,17 +1440,17 @@
 \nКлючи не являются доверенными</string>
     <string name="encryption_information_dg_xsigning_disabled">Перекрестная подпись выключена</string>
     <string name="settings_hs_admin_e2e_disabled">Администратор вашего сервера отключил сквозное шифрование по умолчанию в приватных комнатах и личных сообщениях.</string>
-    <string name="settings_active_sessions_list">Активные сессии</string>
-    <string name="settings_active_sessions_show_all">Показать все сессии</string>
-    <string name="settings_active_sessions_manage">Управление сессиями</string>
-    <string name="settings_active_sessions_signout_device">Выйти из этой сессии</string>
+    <string name="settings_active_sessions_list">Активные сеансы</string>
+    <string name="settings_active_sessions_show_all">Показать все сеансы</string>
+    <string name="settings_active_sessions_manage">Управление сеансами</string>
+    <string name="settings_active_sessions_signout_device">Выйти из этого сеанса</string>
     <string name="settings_failed_to_get_crypto_device_info">Нет доступной криптографической информации</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d сессия активна</item>
         <item quantity="few">%d сессии активны</item>
         <item quantity="many">%d сессий активно</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Подтвердите это устройство</string>
+    <string name="crosssigning_verify_this_session">Заверьте этот сеанс</string>
     <string name="verification_open_other_to_verify">Используйте существующую сессию для подтверждения этой, предоставив ей доступ к зашифрованным сообщениям.</string>
     <string name="settings_dev_tools">Инструменты для разработчиков</string>
     <string name="settings_account_data">Данные учётной записи</string>
@@ -1478,16 +1473,16 @@
     <string name="bottom_sheet_setup_secure_backup_title">Безопасное резервное копирование</string>
     <string name="settings_active_sessions_verified_device_desc">Эта сессия является надежной для безопасного обмена сообщениями, поскольку вы подтвердили ее:</string>
     <string name="settings_active_sessions_unverified_device_desc">Подтвердите эту сессию, чтобы пометить её доверенной и предоставить ей доступ к зашифрованным сообщениям. Если вы не входили в эту сессию, ваша учетная запись может быть скомпрометирована:</string>
-    <string name="verification_profile_verify">Проверить</string>
-    <string name="verification_profile_verified">Проверено</string>
+    <string name="verification_profile_verify">Заверить</string>
+    <string name="verification_profile_verified">Заверено</string>
     <string name="verification_profile_warning">Предупреждение</string>
     <string name="room_member_profile_failed_to_get_devices">Не удалось получить список сессий</string>
-    <string name="room_member_profile_sessions_section_title">Сессии</string>
-    <string name="trusted">Доверенные</string>
-    <string name="not_trusted">Недоверенные</string>
+    <string name="room_member_profile_sessions_section_title">Сеансы</string>
+    <string name="trusted">Заверенная</string>
+    <string name="not_trusted">Незаверенная</string>
     <string name="verification_profile_device_verified_because">Эта сессия является доверенной для безопасного обмена сообщениями, так как %1$s (%2$s) проверил(а) его:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) вошел(ла), используя новую сессию:</string>
-    <string name="verification_profile_device_untrust_info">Пока этот пользователь не доверяет этой сессии, сообщения, отправленные в обе стороны, помечаются предупреждениями. Кроме того, вы можете подтвердить сессию вручную.</string>
+    <string name="verification_profile_device_untrust_info">Пока этот пользователь не доверяет этой сессии, сообщения, отправленные в обе стороны, помечаются предупреждениями. Вы также можете подтвердить эту сессию вручную.</string>
     <string name="initialize_cross_signing">Начать перекрестную подпись</string>
     <string name="reset_cross_signing">Сбросить ключи</string>
     <string name="qr_code_scanned_by_other_notice">Почти готово! Показывает ли %s галочку\?</string>
@@ -1525,16 +1520,16 @@
 \n
 \nМы рекомендуем вам немедленно изменить свой пароль и ключ восстановления в настройках.</string>
     <string name="verification_cancelled">Подтверждение отменено</string>
-    <string name="bootstrap_crosssigning_progress_pbkdf2">Генерация ключа безопасности из парольной фразы</string>
-    <string name="bootstrap_progress_generating_ssss">Генерация ключа SSSS из парольной фразы</string>
-    <string name="bootstrap_progress_generating_ssss_with_info">Генерация ключа SSSS из парольной фразы (%s)</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Создание бумажного ключа из мнемонической фразы</string>
+    <string name="bootstrap_progress_generating_ssss">Создание ключа SSSS из мнемонической фразы</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Создание ключа SSSS из мнемонической фразы (%s)</string>
     <string name="bootstrap_migration_enter_backup_password">Чтобы продолжить работу, введите парольную фразу для резервного копирования ключа.</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Если вы не знаете вашу парольную фразу для резервного копирования ключей, вы можете %s.</string>
     <string name="power_level_edit_title">Задать роль</string>
-    <string name="bootstrap_info_text_2">Введите секретную фразу, известную только вам, для защиты данных на вашем сервере.</string>
+    <string name="bootstrap_info_text_2">Введите мнемоническую фразу, известную только вам, которая используется для защиты данных на вашем сервере.</string>
     <string name="bootstrap_loading_title">Настройка восстановления.</string>
     <string name="bootstrap_finish_title">Готово!</string>
-    <string name="keep_it_safe">Храните его в безопасности</string>
+    <string name="keep_it_safe">Храните его в надёжном месте</string>
     <string name="finish">Завершить</string>
     <string name="bootstrap_crosssigning_progress_initializing">Публикация созданных ключей идентификации</string>
     <string name="bootstrap_crosssigning_progress_default_key">Определение ключа SSSS по умолчанию</string>
@@ -1558,12 +1553,12 @@
     <string name="auth_invalid_login_deactivated_account">Эта учётная запись была деактивирована.</string>
     <string name="bootstrap_enter_recovery">Введите %s, чтобы продолжить</string>
     <string name="use_file">Использовать файл</string>
-    <string name="bootstrap_invalid_recovery_key">Это недействительный ключ восстановления</string>
-    <string name="recovery_key_empty_error_message">Пожалуйста, введите ключ восстановления</string>
+    <string name="bootstrap_invalid_recovery_key">Этот бумажный ключ недействителен</string>
+    <string name="recovery_key_empty_error_message">Пожалуйста, введите бумажный ключ</string>
     <string name="bootstrap_progress_checking_backup">Проверка ключа резервного копирования</string>
     <string name="bootstrap_progress_checking_backup_with_info">Проверка ключа резервного копирования (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">Получение кривой ключа</string>
-    <string name="bootstrap_progress_generating_ssss_recovery">Генерация ключа SSSS из ключа восстановления</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Генерация ключа SSSS из бумажного ключа</string>
     <string name="bootstrap_progress_storing_in_sss">Сохранение резервной копии ключа в SSSS</string>
     <string name="bootstrap_migration_use_recovery_key">используйте ваш ключ восстановления ключа резервной копии</string>
     <string name="bootstrap_migration_backup_recovery_key">Ключ восстановления ключа резервной копии</string>
@@ -1576,9 +1571,9 @@
 \n${app_name} для Android</string>
     <string name="or_other_mx_capable_client">или другой клиент Matrix поддерживающий перекрестную подпись</string>
     <string name="command_description_discard_session">Принудительно отбрасывает текущую групповую сессию для отправки сообщений в зашифрованную комнату</string>
-    <string name="enter_secret_storage_passphrase_or_key">Чтобы продолжить, используйте ваш %1$s или используйте ваш %2$s.</string>
-    <string name="use_recovery_key">Используйте ключ восстановления</string>
-    <string name="enter_secret_storage_input_key">Выберите ключ восстановления или введите его вручную, введя или вставив из буфера обмена</string>
+    <string name="enter_secret_storage_passphrase_or_key">Чтобы продолжить, используйте %1$s или %2$s.</string>
+    <string name="use_recovery_key">Используйте бумажный ключ</string>
+    <string name="enter_secret_storage_input_key">Выберите бумажный ключ или введите его вручную, введя или вставив из буфера обмена</string>
     <string name="failed_to_access_secure_storage">Не удалось получить доступ к защищенному хранилищу данных</string>
     <string name="unencrypted">Не зашифровано</string>
     <string name="encrypted_unverified">Зашифровано неподтверждённой сессией</string>
@@ -1611,7 +1606,7 @@
     <string name="identity_server_error_outdated_home_server">Эта операция невозможна. Домашний сервер устарел.</string>
     <string name="identity_server_error_no_identity_server_configured">Пожалуйста, настройте сначала сервер идентификации.</string>
     <string name="identity_server_error_terms_not_signed">Пожалуйста, примите сначала условия сервера идентификации в настройках.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Для вашей приватности, ${app_name} поддерживает отправку адреса электронной почты и номера телефона только в хэшированном виде.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Для вашей приватности, ${app_name} поддерживает отправку адреса электронной почты и номеров телефонов только в хэшированном виде.</string>
     <string name="identity_server_error_binding_error">Привязка не удалась.</string>
     <string name="identity_server_error_no_current_binding_error">Текущая взаимосвязь с этим идентификатором отсутствует.</string>
     <string name="identity_server_set_default_notice">Ваш домашний сервер (%1$s) предлагает использовать %2$s для вашего сервера обнаружения</string>
@@ -1629,14 +1624,14 @@
     <string name="bottom_sheet_setup_secure_backup_submit">Настроить</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Используйте ключ безопасности</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Создайте ключ безопасности для хранения в надежном месте, например в менеджере паролей или сейфе.</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Использовать секретную фразу</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Введите секретную фразу, известную только вам, и создайте ключ для резервного копирования.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Использовать мнемоническую фразу</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Введите мнемоническую фразу, известную только вам, и создайте ключ для резервного копирования.</string>
     <string name="bottom_sheet_save_your_recovery_key_title">Сохраните свой ключ безопасности</string>
-    <string name="bottom_sheet_save_your_recovery_key_content">Храните ключ безопасности в надежном месте, например в менеджере паролей или сейфе.</string>
-    <string name="set_a_security_phrase_title">Задайте секретную фразу</string>
-    <string name="set_a_security_phrase_notice">Введите секретную фразу, известную только вам, для защиты данных на вашем сервере.</string>
-    <string name="set_a_security_phrase_hint">Секретная фраза</string>
-    <string name="set_a_security_phrase_again_notice">Для подтверждения введите вашу секретную фразу ещё раз.</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Храните бумажный ключ в надёжном месте, например, в менеджере паролей или в сейфе.</string>
+    <string name="set_a_security_phrase_title">Задайте мнемоническую фразу</string>
+    <string name="set_a_security_phrase_notice">Введите мнемоническую фразу, известную только вам, которая используется для защиты данных на вашем сервере.</string>
+    <string name="set_a_security_phrase_hint">Мнемоническая фраза</string>
+    <string name="set_a_security_phrase_again_notice">Введите мнемоническую фразу ещё раз, чтобы подтвердить её.</string>
     <string name="room_settings_name_hint">Название комнаты</string>
     <string name="room_settings_topic_hint">Тема</string>
     <string name="room_settings_save_success">Вы успешно изменили настройки комнаты</string>
@@ -1651,7 +1646,7 @@
     <string name="disclaimer_content">Мы рады сообщить, что сменили имя! Ваше приложение обновлено, и вы вошли в свою учетную запись.</string>
     <string name="disclaimer_negative_button">ПОНЯТНО</string>
     <string name="disclaimer_positive_button">УЗНАТЬ БОЛЬШЕ</string>
-    <string name="save_recovery_key_chooser_hint">Сохранить ключ восстановления в</string>
+    <string name="save_recovery_key_chooser_hint">Сохранить бумажный ключ в</string>
     <string name="loading_contact_book">Получаем ваши контакты…</string>
     <string name="empty_contact_book">Ваша контактная книга пуста</string>
     <string name="contacts_book_title">Книга контактов</string>
@@ -1684,7 +1679,8 @@
     <plurals name="encryption_import_room_keys_success">
         <item quantity="one">%1$d/%2$d ключ успешно импортирован.</item>
         <item quantity="few">%1$d/%2$d ключа успешно импортированы.</item>
-        <item quantity="many">%1$d/%2$d ключей успешно импортировано.</item>
+        <item quantity="many">%1$d/%2$d ключей успешно импортированы.</item>
+        <item quantity="other">%1$d/%2$d ключей успешно импортированы.</item>
     </plurals>
     <string name="room_manage_integrations">Управление интеграциями</string>
     <string name="room_no_active_widgets">Нет активных виджетов</string>
@@ -1706,12 +1702,12 @@
     <string name="auth_msisdn_already_defined">Этот номер телефона уже используется.</string>
     <string name="settings_phone_number_empty">В ваш аккаунт не добавлен номер телефона</string>
     <string name="settings_emails">Адрес электронной почты</string>
-    <string name="settings_emails_empty">В ваш аккаунт не добавлен адрес электронной почты</string>
+    <string name="settings_emails_empty">В вашу учётную запись не добавлен адрес электронной почты</string>
     <string name="settings_phone_numbers">Телефонные номера</string>
     <string name="settings_remove_three_pid_confirmation_content">Удалить %s\?</string>
     <string name="error_threepid_auth_failed">Убедитесь, что вы перешли по ссылке в электронном письме, которое мы вам отправили.</string>
     <string name="settings_emails_and_phone_numbers_title">Электронная почта и номера телефонов</string>
-    <string name="settings_emails_and_phone_numbers_summary">Управляйте электронной почтой и номерами телефонов, привязанными к вашей учетной записи Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Управляйте адресами электронной почты и номерами телефонов, привязанными к вашей учётной записи Matrix</string>
     <string name="settings_text_message_sent_hint">Код</string>
     <string name="login_msisdn_notice">Используйте международный формат (номер телефона должен начинаться с \'+\')</string>
     <string name="confirm_your_identity_quad_s">Подтвердите свою личность, проверив этот логин, предоставив ему доступ к зашифрованным сообщениям.</string>
@@ -1743,12 +1739,12 @@
     <string name="settings_security_application_protection_summary">Защитите доступ с помощью PIN-кода и биометрии.</string>
     <string name="settings_security_application_protection_title">Защита доступа</string>
     <string name="secure_backup_reset_no_history">Вы перезапустите приложение без истории, сообщений, доверенных устройств или доверенных пользователей</string>
-    <string name="secure_backup_reset_if_you_reset_all">Если сбросить все</string>
+    <string name="secure_backup_reset_if_you_reset_all">Если сбросить всё</string>
     <string name="secure_backup_reset_all_no_other_devices">Делайте это только в том случае, если у вас нет другого устройства, с которого вы можете проверить это устройство.</string>
-    <string name="secure_backup_reset_all">Сбросить все</string>
-    <string name="bad_passphrase_key_reset_all_action">Забыли или потеряли все варианты восстановления\? Сбросить все</string>
+    <string name="secure_backup_reset_all">Сбросить всё</string>
+    <string name="bad_passphrase_key_reset_all_action">Забыли или потеряли все варианты восстановления\? Сбросить всё</string>
     <string name="direct_room_created_summary_item_by_you">Вы вошли.</string>
-    <string name="direct_room_created_summary_item">%s вошёл(ла).</string>
+    <string name="direct_room_created_summary_item">%s вошёл(шла).</string>
     <string name="direct_room_encryption_enabled_tile_description">Сообщения в этой переписке защищены сквозным шифрованием.</string>
     <string name="direct_room_profile_section_more_leave">Покинуть</string>
     <string name="direct_room_profile_section_more_settings">Настройки</string>
@@ -1797,7 +1793,7 @@
     <string name="attachment_type_dialog_title">Добавить изображение из</string>
     <string name="create_room_topic_hint">Тема</string>
     <string name="create_room_name_section">Название комнаты</string>
-    <string name="settings_discovery_consent_notice_on">Вы дали свое согласие на отправку электронных писем и телефонных номеров на этот сервер обнаружения для обнаружения других пользователей из ваших контактов.</string>
+    <string name="settings_discovery_consent_notice_on">Вы дали свое согласие на отправку адресов электронных почт и телефонных номеров на этот сервер идентификации для обнаружения других пользователей из ваших контактов.</string>
     <string name="add_by_qr_code">Добавить по QR-коду</string>
     <string name="permissions_denied_add_contact">Разрешить доступ к вашим контактам.</string>
     <string name="permissions_denied_qr_code">Чтобы отсканировать QR-код, вам нужно разрешить доступ к камере.</string>
@@ -2042,7 +2038,7 @@
     <string name="space_leave_prompt_msg_only_you">Вы здесь единственный человек. Если вы уйдёте, никто не сможет присоединиться в будущем, включая вас.</string>
     <string name="leave_space">Покинуть</string>
     <string name="space_add_child_title">Добавить комнаты</string>
-    <string name="space_explore_activity_title">Исследуйте комнаты</string>
+    <string name="space_explore_activity_title">Обзор комнат</string>
     <plurals name="space_people_you_know">
         <item quantity="one">%d человек, которого вы знаете, уже присоединился</item>
         <item quantity="few">%d людей, которых вы знаете, уже присоединились</item>
@@ -2121,7 +2117,7 @@
     <string name="verification_scan_self_notice">Сканируйте код с помощью другого устройства или переключитесь и сканируйте с помощью этого устройства</string>
     <string name="create_space_alias_hint">Адрес пространства</string>
     <string name="error_file_too_big_simple">Файл слишком большой для загрузки.</string>
-    <string name="search_hint_room_name">Поиск по имени</string>
+    <string name="search_hint_room_name">Поиск по названию</string>
     <string name="send_file_step_compressing_video">Сжатие видео %d%%</string>
     <string name="send_file_step_compressing_image">Сжатие изображения…</string>
     <string name="give_feedback">Оставить отзыв</string>
@@ -2235,7 +2231,7 @@
     <string name="call_tile_video_incoming">Входящий видеовызов</string>
     <string name="call_tile_voice_incoming">Входящий голосовой вызов</string>
     <string name="call_tile_you_declined_this_call">Вы отклонили этот вызов</string>
-    <string name="room_settings_room_notifications_account_settings">Настройки учетной записи</string>
+    <string name="room_settings_room_notifications_account_settings">Настройки учётной записи</string>
     <string name="room_settings_room_notifications_manage_notifications">Вы можете управлять уведомлениями в %1$s.</string>
     <string name="room_settings_room_notifications_encryption_notice">Обратите внимание, что уведомления об упоминаниях и ключевых словах недоступны в зашифрованных комнатах на мобильных устройствах.</string>
     <string name="room_settings_room_notifications_notify_me">Уведомлять меня о</string>
@@ -2280,7 +2276,7 @@
     <string name="room_settings_space_access_title">Доступ к пространству</string>
     <string name="room_settings_access_rules_pref_dialog_title">Кто имеет к этому доступ\?</string>
     <string name="settings_notification_emails_enable_for_email">Включить уведомления по электронной почте для %s</string>
-    <string name="settings_notification_emails_no_emails">Чтобы получать уведомления по электронной почте, пожалуйста, привяжите электронную почту к вашей учетной записи Matrix</string>
+    <string name="settings_notification_emails_no_emails">Чтобы получать уведомления по электронной почте, пожалуйста, привяжите адрес электронной почты к своей учётной записи Matrix</string>
     <string name="settings_notification_emails_category">Уведомление по эл. почте</string>
     <string name="room_permissions_upgrade_the_space">Обновить пространство</string>
     <string name="room_permissions_change_space_name">Изменить название пространства</string>
@@ -2379,11 +2375,11 @@
     <string name="attachment_type_poll">Опрос</string>
     <string name="create_poll_title">Создать опрос</string>
     <string name="restart_the_application_to_apply_changes">Перезапустите приложение, чтобы изменения вступили в силу.</string>
-    <string name="labs_enable_latex_maths">Включить математику LaTeX</string>
+    <string name="labs_enable_latex_maths">Математика LaTeX</string>
     <string name="labs_auto_report_uisi_desc">Ваша система будет автоматически отправлять журналы при возникновении ошибки невозможности расшифровки</string>
     <string name="labs_auto_report_uisi">Автоматически сообщать об ошибках расшифровки.</string>
     <string name="encryption_misconfigured">Шифрование неправильно настроено</string>
-    <string name="room_member_override_nick_color">Изменить цвет отображаемого имени</string>
+    <string name="room_member_override_nick_color">Изменить цвет имени</string>
     <string name="room_profile_section_restore_security">Восстановить шифрование</string>
     <string name="contact_admin_to_restore_encryption">Обратитесь к администратору, чтобы восстановить шифрование до рабочего состояния.</string>
     <string name="encryption_has_been_misconfigured">Шифрование настроено неправильно.</string>
@@ -2400,7 +2396,7 @@
     <string name="attachment_type_location">Местоположение</string>
     <string name="identity_server_consent_dialog_content_question">Вы согласны отправить эту информацию\?</string>
     <string name="identity_server_consent_dialog_content_3">Чтобы обнаружить существующие контакты, необходимо отправить контактную информацию (электронную почту и номера телефонов) на сервер обнаружения. Мы хешируем ваши данные перед отправкой для обеспечения конфиденциальности.</string>
-    <string name="identity_server_consent_dialog_title_2">Отправить электронные адреса и номера телефонов %s</string>
+    <string name="identity_server_consent_dialog_title_2">Отправить адреса электронных почт и номера телефонов %s</string>
     <string name="settings_discovery_consent_notice_off_2">Ваши контакты приватны. Чтобы обнаружить пользователей из ваших контактов, нам необходимо ваше разрешение на отправку контактной информации на ваш сервер обнаружения.</string>
     <string name="preference_system_settings">Системные настройки</string>
     <string name="preference_versions">Версии</string>
@@ -2421,7 +2417,7 @@
 \n
 \nВы можете ознакомиться со всеми нашими условиями %s.</string>
     <string name="analytics_opt_in_title">Помогите улучшить ${app_name}</string>
-    <string name="shortcut_disabled_reason_sign_out">Сессия завершена!</string>
+    <string name="shortcut_disabled_reason_sign_out">Сеанс завершён!</string>
     <string name="shortcut_disabled_reason_room_left">Комната покинута!</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">Шифрование неправильно настроено, поэтому вы не можете отправлять сообщения. Нажмите, чтобы открыть настройки.</string>
     <string name="room_unsupported_e2e_algorithm">Шифрование настроено неправильно, поэтому вы не можете отправлять сообщения. Пожалуйста, обратитесь к администратору, чтобы восстановить работу шифрования.</string>
@@ -2440,7 +2436,7 @@
     <string name="location_timeline_failed_to_load_map">Не удалось загрузить карту</string>
     <string name="a11y_static_map_image">Карта</string>
     <string name="labs_enable_thread_messages_desc">Примечание: приложение будет перезапущено</string>
-    <string name="labs_enable_thread_messages">Включить обсуждения сообщений</string>
+    <string name="labs_enable_thread_messages">Обсуждения сообщений</string>
     <string name="ftue_auth_use_case_connect_to_server">Подключиться к серверу</string>
     <string name="ftue_auth_use_case_join_existing_server">Хотите присоединиться к существующему серверу\?</string>
     <string name="ftue_auth_use_case_skip_partial">Пропустить вопрос</string>
@@ -2449,7 +2445,7 @@
     <string name="ftue_auth_use_case_option_two">Команды</string>
     <string name="ftue_auth_use_case_option_one">Друзья и семья</string>
     <string name="ftue_auth_use_case_subtitle">Мы поможем вам подключиться</string>
-    <string name="ftue_auth_use_case_title">С кем вы будете общаться больше всего\?</string>
+    <string name="ftue_auth_use_case_title">С кем вы будете общаться чаще всего\?</string>
     <string name="navigate_to_thread_when_already_in_the_thread">Вы уже просматриваете это обсуждение!</string>
     <string name="view_in_room">Просмотр в Комнате</string>
     <string name="reply_in_thread">Обсудить</string>
@@ -2487,7 +2483,6 @@
     <string name="ftue_profile_picture_title">Добавить аватар</string>
     <string name="ftue_display_name_entry_footer">Вы сможете изменить это позже</string>
     <string name="ftue_display_name_entry_title">Отображаемое имя</string>
-    <string name="ftue_display_name_subtitle">Показывается, когда вы отправляете сообщения.</string>
     <string name="ftue_display_name_title">Выберите отображаемое имя</string>
     <string name="ftue_account_created_subtitle">Ваша учётная запись %s создана</string>
     <string name="ftue_account_created_congratulations_title">Поздравляем!</string>
@@ -2513,8 +2508,7 @@
     <string name="live_location_sharing_notification_description">Идёт отправка местоположения</string>
     <string name="location_share_live_remaining_time">Осталось %1$s</string>
     <string name="live_location_bottom_sheet_last_updated_at">Обновлено %1$s назад</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Остановить трансляцию</string>
-    <string name="labs_enable_live_location">Включить функцию \"Поделиться трансляцией местоположения\"</string>
+    <string name="labs_enable_live_location">Функция \"Поделиться трансляцией местоположения\"</string>
     <string name="live_location_sharing_notification_title">${app_name} Трансляция местоположения</string>
     <string name="location_share_live_until">Транслировать до %1$s</string>
     <string name="location_share_live_ended">Трансляция завершена</string>
@@ -2640,7 +2634,7 @@
     <string name="ftue_auth_sign_in_choose_server_header">Где хранятся ваши переписки</string>
     <string name="ftue_auth_create_account_choose_server_header">Где будут храниться ваши переписки</string>
     <string name="ftue_auth_create_account_password_entry_footer">Должно быть 8 или более символов</string>
-    <string name="crosssigning_cannot_verify_this_session">Не удалось подтвердить это устройство</string>
+    <string name="crosssigning_cannot_verify_this_session">Не удалось заверить этот сеанс</string>
     <string name="permalink_unsupported_groups">Невозможно открыть эту ссылку: сообщества были заменены пространствами</string>
     <string name="ftue_auth_login_username_entry">Имя пользователя / Почта / Телефон</string>
     <string name="ftue_auth_password_reset_email_confirmation_subtitle">Следуйте инструкциям, отправленным на %s</string>
@@ -2661,6 +2655,325 @@
     <string name="ftue_auth_choose_server_entry_hint">URL-адрес сервера</string>
     <string name="ftue_auth_welcome_back_title">С возвращением!</string>
     <string name="ftue_auth_create_account_sso_section_header">Или</string>
-    <string name="ftue_auth_create_account_title">Создать учётную запись</string>
+    <string name="ftue_auth_create_account_title">Создайте учётную запись</string>
     <string name="search_space_two_parents">%1$s и %2$s</string>
+    <string name="a11y_open_settings">Открыть настройки</string>
+    <string name="location_share_loading_map_error">Не удалось загрузить карту
+\nВозможно, этот домашний сервер не настроен для отображения карт.</string>
+    <string name="all_chats">Все беседы</string>
+    <string name="device_manager_sessions_other_description">Для лучшей защиты заверьте свои сеансы и выйдите из тех, которые более не признаёте или не используете.</string>
+    <string name="device_manager_sessions_other_title">Другие сеансы</string>
+    <string name="settings_sessions_list">Сеансы</string>
+    <string name="a11y_create_message">Создать беседу или комнату</string>
+    <string name="room_list_filter_people">ЛС</string>
+    <string name="home_layout_preferences">Настройки вида</string>
+    <string name="home_layout_preferences_filters">Фильтры</string>
+    <string name="home_layout_preferences_recents">Недавние</string>
+    <string name="room_list_filter_favourites">Избранные</string>
+    <string name="room_list_filter_unreads">Непрочитанные</string>
+    <string name="room_list_filter_all">Все</string>
+    <string name="home_layout_preferences_sort_name">А - Я</string>
+    <string name="home_layout_preferences_sort_activity">Активности</string>
+    <string name="home_layout_preferences_sort_by">Сортировать по</string>
+    <string name="explore_rooms">Обзор комнат</string>
+    <string name="start_chat">Отправить ЛС</string>
+    <string name="create_room">Создать комнату</string>
+    <string name="device_manager_other_sessions_view_all">Посмотреть все (%1$d)</string>
+    <string name="device_manager_header_section_security_recommendations_description">Повысьте безопасность учётной записи, следуя этим рекомендациям.</string>
+    <string name="device_manager_other_sessions_description_verified">Заверенный · Последняя активность %1$s</string>
+    <string name="device_manager_verification_status_unverified">Незаверенный сеанс</string>
+    <string name="device_manager_verification_status_verified">Заверенный сеанс</string>
+    <string name="a11y_device_manager_device_type_unknown">Неизвестный тип устройства</string>
+    <string name="a11y_device_manager_device_type_desktop">Компьютер</string>
+    <string name="a11y_device_manager_device_type_mobile">Мобильный</string>
+    <string name="device_manager_other_sessions_description_unverified">Незаверенный · Последняя активность %1$s</string>
+    <string name="device_manager_header_section_security_recommendations_title">Рекомендации по безопасности</string>
+    <string name="device_manager_unverified_sessions_title">Незаверенные сеансы</string>
+    <string name="device_manager_inactive_sessions_title">Неактивные сеансы</string>
+    <string name="home_empty_no_rooms_title">Добро пожаловать в ${app_name},
+\n%s.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Оставить отзыв</string>
+    <string name="device_manager_session_details_session_name">Название сеанса</string>
+    <string name="device_manager_filter_option_inactive">Неактивные</string>
+    <string name="device_manager_session_details_device_ip_address">IP-адрес</string>
+    <string name="device_manager_session_details_session_last_activity">Последняя активность</string>
+    <string name="device_manager_session_details_title">Сведения о сеансе</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Для лучшей безопасности выйдите из всех сеансов, которые более не признаёте или не используете.</string>
+    <string name="device_manager_filter_option_verified">Заверенные</string>
+    <string name="device_manager_filter_option_all_sessions">Все сеансы</string>
+    <string name="device_manager_session_last_activity">Последняя активность %1$s</string>
+    <string name="device_manager_device_title">Устройство</string>
+    <string name="device_manager_session_title">Сеанс</string>
+    <string name="device_manager_current_session_title">Текущий сеанс</string>
+    <string name="device_manager_verify_session">Заверить сеанс</string>
+    <string name="device_manager_view_details">Подробности</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Этот сеанс готов к защищенной переписке.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Текущий сеанс готов к защищенной переписке.</string>
+    <string name="a11y_device_manager_device_type_web">Веб-браузер</string>
+    <string name="space_list_empty_message">Пространства — это новый способ организации комнат и людей. Создайте пространство, чтобы начать.</string>
+    <string name="labs_enable_new_app_layout_title">Новый вид</string>
+    <string name="home_empty_no_unreads_title">Нечего отображать.</string>
+    <string name="home_empty_no_unreads_message">Здесь будут отображаться непрочитанные сообщения, когда таковые будут.</string>
+    <string name="font_size_use_system">Как в системе</string>
+    <string name="change_space">Смена пространства</string>
+    <string name="labs_enable_new_app_layout_summary">Упрощённый Element с дополнительными вкладками</string>
+    <string name="onboarding_new_app_layout_welcome_title">Добро пожаловать в новый вид!</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nвыглядит слегка пустовато.</string>
+    <string name="onboarding_new_app_layout_button_try">Попробовать</string>
+    <string name="device_manager_session_details_description">Информация о приложении, устройстве и активности.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Заверьте текущий сеанс для усиления защиты переписки.</string>
+    <string name="space_list_empty_title">Пока нет пространств.</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Заверьте свои сеансы для усиления защиты переписки или выйдите из тех, которые более не признаёте или не используете.</string>
+    <string name="device_manager_unverified_sessions_description">Заверьте или выйдите из незаверенных сеансов.</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Заверьте или выйдите из этого сеанса для лучшей безопасности и надёжности.</string>
+    <string name="invites_empty_title">Ничего нового.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Заверенных сеансов не обнаружено.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Незаверенных сеансов не обнаружено.</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Неактивных сеансов не обнаружено.</string>
+    <string name="device_manager_other_sessions_clear_filter">Очистить фильтр</string>
+    <string name="device_manager_filter_option_unverified_description">Не готовы к защищенной переписке</string>
+    <string name="device_manager_filter_option_verified_description">Готовы к защищенной переписке</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Неактивны %1$d день или дольше</item>
+        <item quantity="few">Неактивны %1$d дня или дольше</item>
+        <item quantity="many">Неактивны %1$d дней или дольше</item>
+        <item quantity="other">Неактивны %1$d дней или дольше</item>
+    </plurals>
+    <string name="device_manager_filter_option_unverified">Незаверенные</string>
+    <string name="device_manager_filter_bottom_sheet_title">Фильтр</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Незаверенный · Текущий сеанс</string>
+    <string name="device_manager_session_rename">Переименовать сеанс</string>
+    <string name="device_manager_session_rename_edit_hint">Название сеанса</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Заверенные</string>
+    <string name="device_manager_session_overview_signout">Выйти из этого сеанса</string>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Неактивные</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Незаверенные</string>
+    <string name="device_manager_session_rename_warning">Пожалуйста, имейте в виду, что названия сеансов также видны людям, с которыми вы общаетесь.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Заверенные сеансы</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Незаверенные сеансы</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Неактивные сеансы</string>
+    <string name="command_description_table_flip">Добавляет (╯°□°）╯︵ ┻━┻ в начало сообщения</string>
+    <string name="settings_security_incognito_keyboard_title">Приватная клавиатура</string>
+    <string name="settings_security_incognito_keyboard_summary">Запрещает клавиатуре обновлять персональные данные, такие как история набора текста и словарь, на основе того, что вы набрали при общении. Обратите внимание, что некоторые клавиатуры могут не соблюдать эту настройку.</string>
+    <string name="action_got_it">Понятно</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 В настройках безопасности вы включили шифрование только для заверенных сессий во всех комнатах.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Не отправлять зашифрованные сообщения незаверенным сеансам в этой комнате.</string>
+    <string name="device_manager_learn_more_sessions_inactive">Неактивные сеансы — это сеансы, которыми вы не пользовались определённое время, но они продолжают получать ключи шифрования.
+\n
+\nУдаление неактивных сеансов повышает безопасность и производительность, а также облегчает выявление подозрительных новых сеансов.</string>
+    <string name="device_manager_learn_more_session_rename_title">Переименование сеансов</string>
+    <string name="device_manager_learn_more_session_rename">Другие пользователи в личных сообщениях и комнатах, к которым вы присоединились, могут просматривать весь перечень ваших сеансов.
+\n
+\nЭто даёт им уверенность в том, что они действительно общаются с вами, но это также означает, что они могут видеть название сеанса, которое вы ввели здесь.</string>
+    <string name="labs_enable_rich_text_editor_title">Наглядный текстовый редактор</string>
+    <string name="push_gateway_item_device_id">ID сеанса:</string>
+    <string name="device_manager_push_notifications_title">Уведомления</string>
+    <string name="device_manager_push_notifications_description">Получать push-уведомления в этой сессии.</string>
+    <string name="device_manager_session_details_application_url">URL-адрес</string>
+    <string name="device_manager_session_details_application">Приложение</string>
+    <string name="device_manager_session_details_application_name">Название</string>
+    <string name="device_manager_session_details_application_version">Версия</string>
+    <string name="device_manager_session_details_device_browser">Веб-браузер</string>
+    <string name="device_manager_session_details_device_model">Модель</string>
+    <string name="device_manager_session_details_device_operating_system">Операционная система</string>
+    <string name="labs_enable_session_manager_title">Новый менеджер сеансов</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Рассмотрите возможность выхода из старых сеансов (%1$d день или дольше), которые вы более не используете.</item>
+        <item quantity="few">Рассмотрите возможность выхода из старых сеансов (%1$d дня или дольше), которые вы более не используете.</item>
+        <item quantity="many">Рассмотрите возможность выхода из старых сеансов (%1$d дней или дольше), которые вы более не используете.</item>
+        <item quantity="other">Рассмотрите возможность выхода из старых сеансов (%1$d дней или дольше), которые вы более не используете.</item>
+    </plurals>
+    <string name="poll_undisclosed_not_ended">Результаты будут видны после завершения опроса</string>
+    <string name="onboarding_new_app_layout_spaces_message">Доступ к пространствам (внизу справа) быстрее и проще, чем когда-либо прежде.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Доступ к пространствам</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Рассмотрите возможность выхода из старых сеансов (%1$d день или дольше), которые вы более не используете.</item>
+        <item quantity="few">Рассмотрите возможность выхода из старых сеансов (%1$d дня или дольше), которые вы более не используете.</item>
+        <item quantity="many">Рассмотрите возможность выхода из старых сеансов (%1$d дней или дольше), которые вы более не используете.</item>
+        <item quantity="other">Рассмотрите возможность выхода из старых сеансов (%1$d дней или дольше), которые вы более не используете.</item>
+    </plurals>
+    <string name="attachment_type_voice_broadcast">Голосовая трансляция</string>
+    <string name="labs_enable_voice_broadcast_title">Голосовые трансляции</string>
+    <string name="labs_enable_client_info_recording_summary">Записывает название клиента, версию и URL-адрес для более лёгкого распознавания сеансов в менеджере сеансов.</string>
+    <string name="labs_enable_client_info_recording_title">Записывать информацию о клиенте</string>
+    <string name="attachment_type_selector_gallery">Галерея</string>
+    <string name="attachment_type_selector_sticker">Наклейки</string>
+    <string name="attachment_type_selector_file">Вложения</string>
+    <string name="attachment_type_selector_voice_broadcast">Голосовая трансляция</string>
+    <string name="attachment_type_selector_poll">Опрос</string>
+    <string name="attachment_type_selector_location">Местоположение</string>
+    <string name="attachment_type_selector_camera">Камера</string>
+    <string name="attachment_type_selector_contact">Контакт</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} нуждается в разрешении для отображения оповещений.
+\nПожалуйста, дайте разрешение.</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s и %2$d другой</item>
+        <item quantity="few">%1$s и %2$d другие</item>
+        <item quantity="many">%1$s и %2$d других</item>
+        <item quantity="other">%1$s и %2$d других</item>
+    </plurals>
+    <string name="permissions_rationale_msg_notification">${app_name} нуждается в резрешении для отображения оповещений. Оповещения могут показывать ваши сообщения, приглашения и тому подобное.
+\n
+\nПожалуйста разрешите доступ при следующем всплывающем сообщении, чтобы иметь возможность видеть оповещения.</string>
+    <string name="invites_empty_message">Здесь будут появляться новые запросы и приглашения.</string>
+    <string name="invites_title">Приглашения</string>
+    <string name="labs_enable_rich_text_editor_summary">Попробуйте расширенный текстовый редактор (режим набора обычного текста скоро появится)</string>
+    <string name="labs_enable_deferred_dm_summary">Создавать личные сообщения только при отправке первого сообщения</string>
+    <string name="labs_enable_deferred_dm_title">Включить отложенные личные сообщения</string>
+    <string name="action_deselect_all">Отменить выбор всего</string>
+    <string name="action_select_all">Выбрать всё</string>
+    <string name="a11y_collapse_space_children">Свернуть дочерние элементы %s</string>
+    <string name="a11y_expand_space_children">Развернуть дочерние элементы %s</string>
+    <plurals name="x_selected">
+        <item quantity="one">Выбрано %1$d</item>
+        <item quantity="few">Выбрано %1$d</item>
+        <item quantity="many">Выбрано %1$d</item>
+        <item quantity="other">Выбрано %1$d</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">Войти в полноэкранный режим</string>
+    <string name="rich_text_editor_format_underline">Применить форматирование подчёркиванием</string>
+    <string name="rich_text_editor_format_strikethrough">Применить форматирование перечёркиванием</string>
+    <string name="rich_text_editor_format_italic">Применить форматирование курсивом</string>
+    <string name="rich_text_editor_format_bold">Применить форматирование жирным</string>
+    <string name="qr_code_login_confirm_security_code_description">Пожалуйста удостоверьтесь в том, что вы знаете откуда этот код. При соединении устройств, вы даёте кому-то полный доступ к вашей учётной записи.</string>
+    <string name="qr_code_login_confirm_security_code">Подтвердить</string>
+    <string name="qr_code_login_try_again">Попробовать снова</string>
+    <string name="qr_code_login_status_no_match">Не сходится\?</string>
+    <string name="qr_code_login_signing_in">Вход</string>
+    <string name="qr_code_login_connecting_to_device">Соединение с устройством</string>
+    <string name="qr_code_login_scan_qr_code_button">Сканировать QR-код</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Входите с мобильного устройства\?</string>
+    <string name="qr_code_login_show_qr_code_button">Показать QR-код на этом устройстве</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Выберите «Сканировать QR-код»</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Начните с экрана входа</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Выберите «Войти по QR-коду»</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Начните с экрана входа</string>
+    <string name="qr_code_login_new_device_instruction_3">Выберите «Показать QR-код»</string>
+    <string name="qr_code_login_new_device_instruction_2">Зайдите в Настройки -&gt; Безопасность и Приватность</string>
+    <string name="qr_code_login_new_device_instruction_1">Откройте приложение с другого устройства</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Домашний сервер не поддерживает вход по QR-коду.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Вход был отменён с другого устройства.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Этот QR-код не работает.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Другое устройство должно войти в учётную запись.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Другое устройство уже выполнило вход.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Во время установки безопасной переписки возникла проблема с безопасностью. Одно из следующего является скомпроментированным: Ваш домашний сервер; Ваше интернет-соединение; Ваше устройство;</string>
+    <string name="qr_code_login_header_failed_other_description">Запрос не выполнен.</string>
+    <string name="qr_code_login_header_failed_denied_description">Запрос был отклонён на другом устройстве.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Соединение не было выполнено за нужное время.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Соединение с этим устройством не поддерживается.</string>
+    <string name="qr_code_login_header_failed_title">Неудачное соединение</string>
+    <string name="qr_code_login_header_connected_description">Проверьте устройство, с которого вы вошли в учётную запись. На его экране должен появиться код снизу. Подтвердите, что код снизу такой же, как и на том устройстве:</string>
+    <string name="qr_code_login_header_connected_title">Безопасное соединение установлено</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Сканируйте QR-код снизу при помощи устройства, с которого вы вышли с учётной записи.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Используйте устройство, с которого вы вошли в учётную запись, чтобы сканировать QR-код снизу:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Войти по QR-коду</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Используйте камеру на этом устройстве, чтобы сканировать QR-код, отображённый на вашем другом устройстве:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Сканировать QR-код</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="onboarding_new_app_layout_feedback_message">Нажмите слева сверху, чтобы увидеть опцию отзыва.</string>
+    <string name="onboarding_new_app_layout_welcome_message">Чтобы упростить ${app_name}, вкладки теперь опциональные. Управляйте ими при помощи меню справа сверху.</string>
+    <string name="home_empty_no_rooms_message">Универсальное безопасное приложение для переписок с командами, друзьями и организациями. Создайте переписку или присоеденитесь к уже существующей, чтобы начать.</string>
+    <string name="home_empty_space_no_rooms_message">Пространства — новый способ групировать комнаты и людей. Добавьте существующую комнату или создайте новую, используя кнопку слева снизу.</string>
+    <string name="labs_enable_voice_broadcast_summary">Возможность записывать и отправлять голосовые трансляции в ленту комнаты.</string>
+    <string name="labs_enable_session_manager_summary">Получите лучший надзор и контроль над всеми вашими сессиями.</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Заверенные сеансы есть везде, где вы используете эту учётную запись после ввода своей мнемонической фразы или подтверждения своей личности с помощью другого заверенного сеанса.
+\n
+\nЭто означает, что у вас есть все ключи, необходимые для разблокировки ваших зашифрованных сообщений и подтверждения другим пользователям, что вы доверяете этому сеансу.</string>
+    <string name="device_manager_learn_more_sessions_verified" tools:ignore="UnusedResources">Заверенные сеансы — сеансы, которые вошли в систему с вашими учётными данными, а затем были заверены либо мнемонической фразой (бумажным ключом), либо путём перекрёстной сверки.
+\n
+\nЭто означает, что они хранят ключи шифрования от ваших предыдущих сообщений и подтверждают другим пользователям, с которыми вы общаетесь, что эти сеансы — действительно ваши.</string>
+    <string name="device_manager_learn_more_sessions_unverified">Незаверенные сеансы — это сеансы, которые вошли в систему с вашими учётными данными, но не были перекрёстно заверены.
+\n
+\nВы должны быть особенно уверены, что признаёте эти сеансы, поскольку они могут представлять собой несанкционированное использование вашей учётной записи.</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Вы можете использовать это устройство для входа с телефона или веб-устройства при помощи QR-кода. Для этого есть два способа:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Войти по QR-коду</string>
+    <string name="device_manager_session_rename_description">Собственные названия сессий помогут вам легче распознать свои девайсы.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Выйти из %1$d сеанса</item>
+        <item quantity="few">Выйти из %1$d сеансов</item>
+        <item quantity="many">Выйти из %1$d сеансов</item>
+        <item quantity="other">Выйти из %1$d сеансов</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Выйти</string>
+    <string name="device_manager_other_sessions_select">Выбрать сеансы</string>
+    <string name="a11y_device_manager_filter">Фильтр</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Неактивен %1$d+ день (%2$s)</item>
+        <item quantity="few">Неактивен %1$d+ дней (%2$s)</item>
+        <item quantity="many">Неактивен %1$d+ дня (%2$s)</item>
+        <item quantity="other">Неактивен %1$d+ дня (%2$s)</item>
+    </plurals>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Подтвердите текущую сессию, чтобы посмотреть её состояние подтверждения.</string>
+    <string name="device_manager_verification_status_unknown">Неизвестное состояние проверки</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Автоматически принимать виджеты Element Call и давать доступ к микрофону/камере</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Включить ярлыки разрешений Element Call</string>
+    <string name="attachment_type_selector_text_formatting">Форматирование текста</string>
+    <string name="tooltip_attachment_voice_broadcast">Начать новую голосовую трансляцию</string>
+    <string name="live_location_not_enough_permission_dialog_description">Вам необходимо иметь нужные разрешения, чтобы делиться местоположением в реальном времени в этой комнате.</string>
+    <string name="live_location_not_enough_permission_dialog_title">У вас нет разрешения делиться местоположением в реальном времени</string>
+    <string name="labs_enable_msc3061_share_history_desc">При приглашении кого-то в зашифрованную комнату, которая делится историей, зашифрованная история будет видимой.</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Вы уже записываете голосовую трансляцию. Пожалуйста закончите текущую голосовую трансляцию, чтобы начать новую.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Кто-то другой уже записывает голосовую трансляцию. Подождите пока их голосовая трансляция закончится, чтобы начать новую.</string>
+    <string name="error_voice_broadcast_permission_denied_message">У вас нет необходимых разрешений для начала голосовой трансляции в этой комнате. Свяжитесь с администратором комнаты, чтобы получить разрешения.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Не получилось начать новую голосовую трансляцию</string>
+    <string name="a11y_voice_broadcast_fast_forward">Перемотать вперёд на 30 секунд</string>
+    <string name="a11y_voice_broadcast_fast_backward">Перемотать назад на 30 секунд</string>
+    <string name="a11y_voice_broadcast_buffering">Буферизация…</string>
+    <string name="a11y_pause_voice_broadcast">Приостановить голосовую трансляцию</string>
+    <string name="a11y_play_voice_broadcast">Проиграть или продолжить голосовую трансляцию</string>
+    <string name="a11y_stop_voice_broadcast_record">Остановить запись голосовой трансляции</string>
+    <string name="a11y_pause_voice_broadcast_record">Приостановить запись голосовой трансляции</string>
+    <string name="a11y_resume_voice_broadcast_record">Продолжить запись голосовой трансляции</string>
+    <string name="voice_broadcast_live">Прямая трансляция</string>
+    <string name="key_authenticity_not_guaranteed">Подлинность этого зашифрованного сообщения не может быть гарантирована на этом устройстве.</string>
+    <string name="login_scan_qr_code">Сканировать QR-код</string>
+    <string name="send_your_first_msg_to_invite">Отправьте ваше первое сообщение, чтобы пригласить %s в переписку</string>
+    <string name="verify_invalid_qr_notice">Этот QR-код выглядит неправильно. Пожалуйста, попробуйте подтвердить другим способом.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Вы не сможете получить доступ к истории зашифрованных сообщений. Сбросьте вашу защищённую резевную копию и ключи подтверждения, чтобы начать заново.</string>
+    <string name="ftue_auth_password_reset_confirmation">Сброс пароля</string>
+    <string name="ftue_auth_new_password_title">Выберите новый пароль</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s пришлёт вам ссылку для подтверждения</string>
+    <string name="ftue_auth_phone_subtitle">%s нуждается в подтверждении вашей учётной записи</string>
+    <string name="ftue_auth_email_subtitle">%s нуждается в подтверждении вашей учётной записи</string>
+    <string name="ftue_auth_choose_server_ems_cta">Связаться</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) — надёжная хостинговая служба для быстрой и безопасной связи в режиме реального времени. Узнайте больше на &lt;a href=\"${ftue_ems_url}\"&gt;element.io/ems&lt;/a&gt;</string>
+    <string name="a11y_open_spaces">Открыть список пространств</string>
+    <string name="push_gateway_item_enabled">Включено:</string>
+    <string name="error_check_network" tools:ignore="UnusedResources">Что-то пошло не так. Пожалуйста, проверьте соединение и попробуйте ещё раз.</string>
+    <string name="command_description_devtools">Открыть экран инструментов для разработчика</string>
+    <string name="timeline_error_room_not_found">Простите, эта комната не была найдена.
+\nПожалуйста, попробуйте снова позже.%s</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ В этой комнате есть неподтверждённые устройства, они не смогут расшифровывать сообщения, отправленные вами.</string>
+    <string name="grant_permission">Дать разрешение</string>
+    <string name="ftue_auth_create_account_username_entry_footer">Другие пользователи могут найти вас по %s</string>
+    <string name="voice_broadcast_recording_time_left">Осталось %1$s</string>
+    <string name="message_reply_to_sender_created_poll">создал опрос.</string>
+    <string name="message_reply_to_sender_sent_sticker">отправил наклейку.</string>
+    <string name="message_reply_to_sender_sent_video">отправил видео.</string>
+    <string name="message_reply_to_sender_sent_image">отправил изображение.</string>
+    <string name="message_reply_to_sender_sent_voice_message">отправил голосовое сообщение.</string>
+    <string name="message_reply_to_sender_sent_audio_file">отправил аудиофайл.</string>
+    <string name="message_reply_to_sender_sent_file">отправил файл.</string>
+    <string name="message_reply_to_prefix">В ответ на</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Скрыть IP-адрес</string>
+    <string name="device_manager_other_sessions_show_ip_address">Показать IP-адрес</string>
+    <string name="quoting">Цитируя</string>
+    <string name="replying_to">В ответ на %s</string>
+    <string name="editing">Редактирование</string>
+    <string name="settings_enable_direct_share_summary">Показывать последние беседы в системном меню распостранения</string>
+    <string name="settings_enable_direct_share_title">Включить прямое распостранение</string>
+    <string name="device_manager_signout_all_other_sessions">Выйти из всех других сеансов</string>
+    <string name="review_unverified_sessions_title">У вас есть незаверенные сеансы</string>
+    <string name="settings_nightly_build">Ночная сборка</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Этот сеанс не поддерживает шифрование, поэтому его невозможно заверить.
+\n
+\nПри использовании этого сеанса вы не сможете участвовать в комнатах, где включено шифрование.
+\n
+\nДля лучшей защиты и приватности рекомендуется использовать клиенты Matrix, поддерживающие шифрование.</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Этот сеанс не поддерживает шифрование и поэтому не может быть заверен.</string>
+    <string name="notice_voice_broadcast_ended">%1$s завершил(а) голосовую трансляцию.</string>
+    <string name="notice_voice_broadcast_ended_by_you">Вы завершили голосовую трансляцию.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ru/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-ru/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-ru/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-ru/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-rue/strings.xml b/library/ui-strings/src/main/res/values-rue/strings.xml
similarity index 100%
rename from vector/src/main/res/values-rue/strings.xml
rename to library/ui-strings/src/main/res/values-rue/strings.xml
diff --git a/vector/src/main/res/values-si/strings.xml b/library/ui-strings/src/main/res/values-si/strings.xml
similarity index 100%
rename from vector/src/main/res/values-si/strings.xml
rename to library/ui-strings/src/main/res/values-si/strings.xml
diff --git a/vector/src/main/res/values-si/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-si/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-si/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-si/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-sk/strings.xml b/library/ui-strings/src/main/res/values-sk/strings.xml
similarity index 88%
rename from vector/src/main/res/values-sk/strings.xml
rename to library/ui-strings/src/main/res/values-sk/strings.xml
index cac6187d8a..d46b4e8898 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/library/ui-strings/src/main/res/values-sk/strings.xml
@@ -53,8 +53,6 @@
 \nImport pozvaných miestností</string>
     <string name="initial_sync_start_importing_account_left_rooms">Úvodná synchronizácia:
 \nPrebieha import opustených miestností</string>
-    <string name="initial_sync_start_importing_account_groups">Úvodná synchronizácia:
-\nPrebieha import komunít</string>
     <string name="initial_sync_start_importing_account_data">Úvodná synchronizácia:
 \nPrebieha import údajov účtu</string>
     <string name="event_status_sending_message">Odosielanie správy…</string>
@@ -246,7 +244,6 @@
     <string name="auth_email_already_defined">Táto emailová adresa sa už používa.</string>
     <string name="auth_forgot_password">Zabudli ste heslo?</string>
     <string name="auth_recaptcha_message">Tento domovský server by sa rád uistil, že nieste robot</string>
-    <string name="auth_reset_password_missing_email">Musíte zadať emailovú adresu prepojenú s vašim účtom.</string>
     <string name="auth_reset_password_error_unauthorized">Nepodarilo sa overiť emailovú adresu: Uistite sa, že ste správne klikli na odkaz v emailovej správe</string>
     <string name="login_error_invalid_home_server">Zadajte platnú adresu URL</string>
     <string name="login_error_bad_json">Chybné údaje vo formáte JSON</string>
@@ -391,7 +388,7 @@
     <string name="settings_theme">Vzhľad</string>
     <string name="encryption_information_decryption_error">Chyba dešifrovania</string>
     <string name="encryption_information_device_name">Verejné meno</string>
-    <string name="encryption_information_device_id">ID relácie</string>
+    <string name="device_manager_session_details_session_id">ID relácie</string>
     <string name="encryption_information_device_key">Kľúč relácie</string>
     <string name="encryption_export_e2e_room_keys">Exportovať šifrovacie kľúče miestnosti</string>
     <string name="encryption_export_room_keys">Exportovať kľúče miestnosti</string>
@@ -448,7 +445,6 @@
     <string name="notification_noisy">Hlasné</string>
     <string name="encrypted_message">Šifrovaná správa</string>
     <string name="loading">Načítavanie…</string>
-    <string name="groups_header">Komunity</string>
     <string name="start_voice_call_prompt_msg">Ste si istý, že chcete začať hlasový hovor?</string>
     <string name="start_video_call_prompt_msg">Ste si istí, že chcete začať video hovor?</string>
     <string name="room_participants_ban_prompt_msg">Zakázanie používateľa ho odstráni z tejto miestnosti a zabráni mu v ďalšom vstupe.</string>
@@ -972,7 +968,6 @@
     <string name="action_change">Zmeniť</string>
     <string name="change_room_directory_network">Zmeniť sieť</string>
     <string name="please_wait">Prosím čakajte…</string>
-    <string name="group_all_communities">Všetky komunity</string>
     <string name="room_preview_no_preview">Nie je možné zobraziť náhľad tejto miestnosti</string>
     <string name="fab_menu_create_room">Miestnosti</string>
     <string name="fab_menu_create_chat">Priame konverzácie</string>
@@ -1045,8 +1040,8 @@
     <string name="settings_discovery_no_msisdn">Možnosti objavovania sa zobrazia, až keď pridáte telefónne číslo.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Odpojením sa od servera totožností znemožníte ostatným, aby vás našli a tiež nebudete môcť kontakty pozývať zadaním emailovej adresy alebo telefónneho čísla.</string>
     <string name="settings_discovery_msisdn_title">Telefónne čísla, podľa ktorých je vás možné nájsť</string>
-    <string name="settings_discovery_confirm_mail">Odoslali sme vám potvrdzujúci e-mail na adresu %s, skontrolujte svoj e-mail a kliknite na potvrdzujúci odkaz</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Odoslali sme vám potvrdzujúci e-mail na adresu %s, najskôr si prosím skontrolujte svoj e-mail a kliknite na potvrdzujúci odkaz</string>
+    <string name="settings_discovery_confirm_mail">Odoslali sme vám e-mail na adresu %s, skontrolujte svoj e-mail a kliknite na potvrdzujúci odkaz</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Odoslali sme vám e-mail na adresu %s, najskôr si prosím skontrolujte svoj e-mail a kliknite na potvrdzujúci odkaz</string>
     <string name="settings_discovery_enter_identity_server">Zadajte URL adresu servera totožností</string>
     <string name="settings_discovery_bad_identity_server">Nie je možné sa pripojiť k serveru totožností</string>
     <string name="settings_discovery_please_enter_server">Prosím, zadajte URL adresu servera totožností</string>
@@ -1705,7 +1700,7 @@
     <string name="login_set_msisdn_notice2">Prosím, použite medzinárodný formát.</string>
     <string name="login_set_msisdn_notice">Nastavte si telefónne číslo, aby ste voliteľne umožnili ľuďom, ktorých poznáte, aby vás objavili.</string>
     <string name="does_not_look_like_valid_email">Toto nevyzerá ako platná e-mailová adresa</string>
-    <string name="login_set_email_notice">Nastavte si e-mail na obnovenie konta. Neskôr môžete voliteľne povoliť známym, aby vás objavili podľa vášho e-mailu.</string>
+    <string name="login_set_email_notice">Nastavte si e-mail na obnovenie konta. Neskôr môžete voliteľne povoliť svojim známym, aby vás objavili podľa tohto e-mailu.</string>
     <string name="login_set_email_title">Nastaviť e-mailovú adresu</string>
     <string name="login_reset_password_success_submit">Späť na prihlásenie</string>
     <string name="login_reset_password_success_notice">Vaše heslo bolo obnovené.</string>
@@ -1851,7 +1846,7 @@
     <string name="settings_notification_keyword_contains_dot">Kľúčové slová nemôžu začínať na \".\"</string>
     <string name="settings_notification_new_keyword">Pridať nové kľúčové slovo</string>
     <string name="settings_notification_emails_enable_for_email">Povoliť e-mailové oznámenia pre %s</string>
-    <string name="settings_notification_emails_no_emails">Ak chcete dostávať e-mail s upozornením, priraďte e-mail k svojmu kontu Matrix</string>
+    <string name="settings_notification_emails_no_emails">Ak chcete dostávať e-mail s upozornením, priraďte e-mail k svojmu Matrix účtu</string>
     <string name="settings_notification_emails_category">E-mailové oznámenie</string>
     <string name="room_settings_room_notifications_notify_me">Upozorniť ma na</string>
     <string name="settings_notification_notify_me_for">Upozorniť ma na</string>
@@ -1861,10 +1856,10 @@
     <string name="room_settings_mention_and_keyword_only">Iba zmienky a kľúčové slová</string>
     <string name="login_msisdn_error_not_international">Medzinárodné telefónne čísla musia začínať znakom \"+\"</string>
     <string name="identity_server_consent_dialog_content_3">Ak chcete zistiť existujúce kontakty, potrebujete odoslať kontaktné informácie (e-maily a telefónne čísla) na server totožností. Pred odoslaním vaše údaje zahašujeme kvôli ochrane osobných údajov.</string>
-    <string name="identity_server_consent_dialog_title_2">Odoslať e-maily a telefónne čísla na %s</string>
+    <string name="identity_server_consent_dialog_title_2">Odoslať emailové adresy a telefónne čísla na %s</string>
     <string name="settings_discovery_consent_notice_on">Dali ste súhlas na odosielanie e-mailov a telefónnych čísel na tento server totožností na objavenie ďalších používateľov z vašich kontaktov.</string>
     <string name="settings_discovery_consent_title">Odoslať e-maily a telefónne čísla</string>
-    <string name="settings_emails_and_phone_numbers_summary">Spravovať e-maily a telefónne čísla prepojené s vaším účtom Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Spravujte e-maily a telefónne čísla prepojené s vaším účtom Matrix</string>
     <string name="settings_emails_and_phone_numbers_title">Emaily a telefónne čísla</string>
     <string name="change_password_summary">Nastaviť nové heslo k účtu…</string>
     <string name="bootstrap_dont_reuse_pwd">Nepoužívajte heslo k svojmu účtu.</string>
@@ -2480,7 +2475,6 @@
     <string name="ftue_profile_picture_title">Pridať profilový obrázok</string>
     <string name="ftue_display_name_entry_footer">Neskôr to môžete zmeniť</string>
     <string name="ftue_display_name_entry_title">Zobrazované meno</string>
-    <string name="ftue_display_name_subtitle">Toto sa zobrazí pri odosielaní správ.</string>
     <string name="ftue_display_name_title">Vyberte si zobrazované meno</string>
     <string name="ftue_account_created_congratulations_title">Gratulujeme!</string>
     <string name="ftue_account_created_take_me_home">Zober ma domov</string>
@@ -2529,7 +2523,6 @@
     <string name="a11y_presence_busy">Obsadený/zaneprázdnený</string>
     <string name="keys_backup_settings_signature_from_this_user">Zálohovanie má platný podpis od tohto používateľa.</string>
     <string name="live_location_bottom_sheet_last_updated_at">Aktualizované pred %1$s</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Zastaviť zdieľanie</string>
     <string name="labs_enable_live_location_summary">Dočasná implementácia: polohy pretrvávajú v histórii miestnosti</string>
     <string name="labs_enable_live_location">Povoliť zdieľanie polohy v reálnom čase</string>
     <string name="location_share_live_remaining_time">ostáva %1$s</string>
@@ -2653,4 +2646,304 @@
     </plurals>
     <string name="search_space_two_parents">%1$s a %2$s</string>
     <string name="auth_reset_password_error_unverified">E-mail nie je overený, skontrolujte si schránku</string>
+    <string name="location_share_loading_map_error">Nie je možné načítať mapu
+\nTento domovský server nemusí byť nakonfigurovaný na zobrazovanie máp.</string>
+    <string name="a11y_open_settings">Otvoriť nastavenia</string>
+    <string name="all_chats">Všetky konverzácie</string>
+    <string name="device_manager_sessions_other_description">V záujme čo najlepšieho zabezpečenia, overte svoje relácie a odhláste sa z každej relácie, ktorú už nepoznáte alebo nepoužívate.</string>
+    <string name="device_manager_sessions_other_title">Iné relácie</string>
+    <string name="settings_sessions_list">Relácie</string>
+    <string name="a11y_open_spaces">Zoznam priestorov</string>
+    <string name="a11y_create_message">Vytvoriť novú konverzáciu alebo miestnosť</string>
+    <string name="room_list_filter_people">Ľudia</string>
+    <string name="room_list_filter_favourites">Obľúbené</string>
+    <string name="room_list_filter_unreads">Neprečítané</string>
+    <string name="room_list_filter_all">Všetky</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Aktivity</string>
+    <string name="home_layout_preferences_sort_by">Zoradiť podľa</string>
+    <string name="home_layout_preferences_recents">Zobraziť posledné</string>
+    <string name="home_layout_preferences_filters">Zobraziť filtre</string>
+    <string name="home_layout_preferences">Predvoľby rozmiestnenia</string>
+    <string name="explore_rooms">Preskúmať miestnosti</string>
+    <string name="create_room">Vytvoriť miestnosť</string>
+    <string name="start_chat">Začať konverzáciu</string>
+    <string name="device_manager_other_sessions_description_unverified">Neoverené - Posledná aktivita %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Overené - Posledná aktivita %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Zobraziť všetky (%1$d)</string>
+    <string name="device_manager_view_details">Zobraziť podrobnosti</string>
+    <string name="device_manager_verify_session">Overiť reláciu</string>
+    <string name="device_manager_verification_status_unverified">Neoverená relácia</string>
+    <string name="device_manager_verification_status_verified">Overená relácia</string>
+    <string name="a11y_device_manager_device_type_unknown">Neznámy typ zariadenia</string>
+    <string name="a11y_device_manager_device_type_desktop">Stolný počítač</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobil</string>
+    <string name="timeline_error_room_not_found">Je nám ľúto, táto miestnosť nebola nájdená.
+\nProsím, skúste to neskôr.%s</string>
+    <string name="invites_title">Pozvánky</string>
+    <string name="onboarding_new_app_layout_button_try">Vyskúšajte si to</string>
+    <string name="onboarding_new_app_layout_feedback_message">Ťuknutím na položku vpravo hore zobrazíte možnosť spätnej väzby.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Poskytnite spätnú väzbu</string>
+    <string name="onboarding_new_app_layout_spaces_message">Získajte prístup k svojim priestorom (vľavo dole) rýchlejšie a jednoduchšie ako kedykoľvek predtým.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Prístup k priestorom</string>
+    <string name="onboarding_new_app_layout_welcome_message">Pre zjednodušenie vašej aplikácie ${app_name}, sú teraz karty voliteľné. Spravujte ich pomocou ponuky vpravo hore.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Vitajte v novom zobrazení!</string>
+    <string name="home_empty_no_unreads_message">Tu sa zobrazia neprečítané správy, ak nejaké máte.</string>
+    <string name="home_empty_no_unreads_title">Nič, o čom by bolo potrebné podať správu.</string>
+    <string name="home_empty_no_rooms_message">Kompletná zabezpečená aplikácia na komunikáciu pre tímy, priateľov a organizácie. Začnite konverzáciu alebo sa pridajte k existujúcej miestnosti.</string>
+    <string name="home_empty_no_rooms_title">Vitajte v aplikácii ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Priestory sú novým spôsobom zoskupovania miestností a ľudí. Pomocou tlačidla vpravo dole môžete pridať existujúcu miestnosť alebo vytvoriť novú.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nvyzerá trochu prázdne.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Zvážte odhlásenie zo starých relácií (%1$d deň alebo viac), ktoré už nepoužívate.</item>
+        <item quantity="few">Zvážte odhlásenie zo starých relácií (%1$d dni alebo viac), ktoré už nepoužívate.</item>
+        <item quantity="other">Zvážte odhlásenie zo starých relácií (%1$d dní alebo viac), ktoré už nepoužívate.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Neaktívne relácie</string>
+    <string name="device_manager_unverified_sessions_description">Overte alebo sa odhláste z neoverených relácií.</string>
+    <string name="device_manager_unverified_sessions_title">Neoverené relácie</string>
+    <string name="device_manager_header_section_security_recommendations_description">Zlepšite zabezpečenie svojho účtu dodržiavaním týchto odporúčaní.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Bezpečnostné odporúčania</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Neaktívny už %1$d+ deň (%2$s)</item>
+        <item quantity="few">Neaktívny už %1$d+ dni (%2$s)</item>
+        <item quantity="other">Neaktívny už %1$d+ dní (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Tu sa budú nachádzať vaše nové žiadosti a pozvánky.</string>
+    <string name="invites_empty_title">Nič nové.</string>
+    <string name="space_list_empty_message">Priestory sú novým spôsobom zoskupovania miestností a ľudí. Vytvorte si priestor a začnite.</string>
+    <string name="space_list_empty_title">Zatiaľ žiadne priestory.</string>
+    <string name="a11y_collapse_space_children">Zbaliť %s podpriestory</string>
+    <string name="a11y_expand_space_children">Rozbaliť %s podpriestory</string>
+    <string name="change_space">Zmeniť priestor</string>
+    <string name="device_manager_session_details_device_ip_address">IP adresa</string>
+    <string name="device_manager_session_details_session_last_activity">Posledná aktivita</string>
+    <string name="device_manager_session_details_session_name">Názov relácie</string>
+    <string name="device_manager_session_details_description">Informácie o aplikácii, zariadení a činnosti.</string>
+    <string name="device_manager_session_details_title">Podrobnosti o relácii</string>
+    <string name="device_manager_other_sessions_clear_filter">Zrušiť filter</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Nenašli sa žiadne neaktívne relácie.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Nenašli sa žiadne neoverené relácie.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Nenašli sa žiadne overené relácie.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Zvážte odhlásenie zo starých relácií (%1$d deň alebo viac), ktoré už nepoužívate.</item>
+        <item quantity="few">Zvážte odhlásenie zo starých relácií (%1$d dni alebo viac), ktoré už nepoužívate.</item>
+        <item quantity="other">Zvážte odhlásenie zo starých relácií (%1$d dní alebo viac), ktoré už nepoužívate.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Neaktívne</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Overte si relácie pre vylepšené bezpečné zasielanie správ alebo sa odhláste z tých, ktoré už nepoznáte alebo nepoužívate.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Neoverené</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">V záujme čo najlepšieho zabezpečenia sa odhláste z každej relácie, ktorú už nepoznáte alebo nepoužívate.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Overené</string>
+    <string name="a11y_device_manager_filter">Filter</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Neaktívny už %1$d deň alebo dlhšie</item>
+        <item quantity="few">Neaktívny už %1$d dni alebo dlhšie</item>
+        <item quantity="other">Neaktívny už %1$d dní alebo dlhšie</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Neaktívne</string>
+    <string name="device_manager_filter_option_unverified_description">Nie je pripravené na bezpečné zasielanie správ</string>
+    <string name="device_manager_filter_option_unverified">Neoverené</string>
+    <string name="device_manager_filter_option_verified_description">Pripravené na bezpečné zasielanie správ</string>
+    <string name="device_manager_filter_option_verified">Overené</string>
+    <string name="device_manager_filter_option_all_sessions">Všetky relácie</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filter</string>
+    <string name="device_manager_session_last_activity">Posledná aktivita %1$s</string>
+    <string name="device_manager_device_title">Zariadenie</string>
+    <string name="device_manager_session_title">Relácia</string>
+    <string name="device_manager_current_session_title">Aktuálna relácia</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">V záujme čo najvyššej bezpečnosti a spoľahlivosti túto reláciu overte alebo sa z nej odhláste.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Overte svoju aktuálnu reláciu pre vylepšené bezpečné zasielanie správ.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Táto relácia je pripravená na bezpečné zasielanie správ.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Vaša aktuálna relácia je pripravená na bezpečné zasielanie správ.</string>
+    <string name="labs_enable_deferred_dm_summary">Vytvoriť priamu správu len pri prvej správe</string>
+    <string name="labs_enable_deferred_dm_title">Povoliť odložené priame správy</string>
+    <string name="labs_enable_new_app_layout_summary">Zjednodušený Element s voliteľnými kartami</string>
+    <string name="labs_enable_new_app_layout_title">Zapnúť nové usporiadanie</string>
+    <string name="device_manager_learn_more_session_rename">Ostatní používatelia v priamych správach a miestnostiach, do ktorých sa pripojíte, si môžu pozrieť úplný zoznam vašich relácií.
+\n
+\nTo im poskytuje istotu, že sa komunikujú naozaj s vami, ale zároveň to znamená, že vidia názov relácie, ktorý sem zadáte.</string>
+    <string name="device_manager_learn_more_session_rename_title">Premenovanie relácií</string>
+    <string name="device_manager_learn_more_sessions_verified">Overené relácie, do ktorých ste sa prihlásili pomocou svojich prihlasovacích údajov a ktoré boli následne overené buď pomocou vašej bezpečnostnej prístupovej frázy, alebo krížovým overením.
+\n
+\nTo znamená, že majú šifrovacie kľúče pre vaše predchádzajúce správy a potvrdzujú ostatným používateľom, s ktorými komunikujete, že tieto relácie ste skutočne vy.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Overené relácie</string>
+    <string name="device_manager_learn_more_sessions_unverified">Neoverené relácie sú relácie, do ktorých ste sa prihlásili pomocou svojich prístupových údajov, ale ktoré neboli krížovo overené.
+\n
+\nMali by ste si byť obzvlášť istí, že tieto relácie poznáte, pretože by mohli predstavovať neoprávnené použitie vášho konta.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Neoverené relácie</string>
+    <string name="device_manager_learn_more_sessions_inactive">Neaktívne relácie sú relácie, ktoré ste určitý čas nepoužívali, ale naďalej dostávajú šifrovacie kľúče.
+\n
+\nOdstránenie neaktívnych relácií zvyšuje bezpečnosť a výkon a uľahčuje identifikáciu podozrivých nových relácií.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Neaktívne relácie</string>
+    <string name="device_manager_session_rename_warning">Uvedomte si, že názvy relácií sú viditeľné aj pre ľudí, s ktorými komunikujete.</string>
+    <string name="device_manager_session_rename_description">Vlastné názvy relácií vám pomôžu ľahšie rozpoznať vaše zariadenia.</string>
+    <string name="device_manager_session_rename_edit_hint">Názov relácie</string>
+    <string name="device_manager_session_rename">Premenovať reláciu</string>
+    <string name="device_manager_session_overview_signout">Odhlásiť sa z tejto relácie</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Neoverená - Vaša aktuálna relácia</string>
+    <string name="tooltip_attachment_voice_broadcast">Spustiť hlasové vysielanie</string>
+    <string name="key_authenticity_not_guaranteed">Vierohodnosť tejto zašifrovanej správy nie je možné zaručiť na tomto zariadení.</string>
+    <string name="settings_security_incognito_keyboard_summary">Požiadajte, aby klávesnica neaktualizovala žiadne personalizované údaje, napríklad históriu písania a slovník, na základe toho, čo ste napísali v konverzáciách. Upozorňujeme, že niektoré klávesnice nemusia toto nastavenie rešpektovať.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognito klávesnica</string>
+    <string name="command_description_table_flip">Pridá znaky (╯°□°）╯︵ ┻━┻ pred správy vo formáte obyčajného textu</string>
+    <string name="attachment_type_voice_broadcast">Hlasové vysielanie</string>
+    <string name="command_description_devtools">Otvoriť obrazovku vývojárskych nástrojov</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 V Nastaveniach zabezpečenia ste povolili šifrovanie len pre overené relácie pre všetky miestnosti.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ V tejto miestnosti sa nachádzajú neoverené zariadenia, ktoré nebudú schopné dešifrovať odoslané správy.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Nikdy neposielať šifrované správy do neoverených relácií v tejto miestnosti.</string>
+    <string name="action_got_it">Rozumiem</string>
+    <string name="rich_text_editor_format_underline">Použiť formát podčiarknutia</string>
+    <string name="rich_text_editor_format_strikethrough">Použiť formát prečiarknutia</string>
+    <string name="rich_text_editor_format_italic">Použiť formát kurzívou</string>
+    <string name="rich_text_editor_format_bold">Použiť tučný formát</string>
+    <string name="labs_enable_client_info_recording_summary">Zaznamenať názov klienta, verziu a url, aby bolo možné ľahšie rozpoznať relácie v správcovi relácií.</string>
+    <string name="labs_enable_client_info_recording_title">Povoliť zaznamenanie informácií o klientovi</string>
+    <string name="labs_enable_session_manager_summary">Majte lepší prehľad a kontrolu nad všetkými reláciami.</string>
+    <string name="labs_enable_session_manager_title">Použiť nového správcu relácií</string>
+    <string name="device_manager_session_details_device_operating_system">Operačný systém</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Prehliadač</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Verzia</string>
+    <string name="device_manager_session_details_application_name">Názov</string>
+    <string name="device_manager_session_details_application">Aplikácia</string>
+    <string name="device_manager_push_notifications_description">Prijímať push oznámenia v tejto relácii.</string>
+    <string name="device_manager_push_notifications_title">Push oznámenia</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Overením aktuálnej relácie zistíte stav overenia tejto relácie.</string>
+    <string name="device_manager_verification_status_unknown">Neznámy stav overenia</string>
+    <string name="push_gateway_item_enabled">Zapnuté:</string>
+    <string name="push_gateway_item_device_id">ID relácie:</string>
+    <string name="error_check_network">Niečo sa pokazilo. Skontrolujte, prosím, svoje sieťové pripojenie a skúste to znova.</string>
+    <string name="grant_permission">Udeliť oprávnenie</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} potrebuje povolenie na zobrazovanie oznámení.
+\nProsím, udeľte toto povolenie.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} potrebuje povolenie na zobrazovanie oznámení. Oznámenia môžu zobrazovať vaše správy, pozvánky atď.
+\n
+\nPovoľte prístup na ďalších vyskakovacích oknách, aby ste mohli zobrazovať oznámenia.</string>
+    <string name="labs_enable_rich_text_editor_summary">Vyskúšajte rozšírený textový editor (čistý textový režim sa objaví čoskoro)</string>
+    <string name="labs_enable_rich_text_editor_title">Povoliť rozšírený textový editor</string>
+    <string name="qr_code_login_confirm_security_code_description">Uistite sa prosím, že poznáte pôvod tohto kódu. Prepojením zariadení poskytnete niekomu plný prístup k svojmu účtu.</string>
+    <string name="qr_code_login_confirm_security_code">Potvrdiť</string>
+    <string name="qr_code_login_try_again">Skúste to znova</string>
+    <string name="qr_code_login_status_no_match">Nezhoduje sa\?</string>
+    <string name="qr_code_login_signing_in">Prebieha prihlasovanie</string>
+    <string name="qr_code_login_connecting_to_device">Pripájanie k zariadeniu</string>
+    <string name="qr_code_login_scan_qr_code_button">Skenovať QR kód</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Prihlasovanie do mobilného zariadenia\?</string>
+    <string name="qr_code_login_show_qr_code_button">Zobraziť QR kód na tomto zariadení</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Vyberte možnosť \"Skenovať QR kód\"</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Začnite na prihlasovacej obrazovke</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Vyberte možnosť \"Prihlásiť sa pomocou QR kódu\"</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Začnite na prihlasovacej obrazovke</string>
+    <string name="qr_code_login_new_device_instruction_3">Vyberte možnosť \"Zobraziť QR kód\"</string>
+    <string name="qr_code_login_new_device_instruction_2">Prejdite do Nastavenia -&gt; Zabezpečenie a súkromie</string>
+    <string name="qr_code_login_new_device_instruction_1">Otvorte aplikáciu na vašom druhom zariadení</string>
+    <string name="qr_code_login_header_failed_denied_description">Žiadosť bola na druhom zariadení zamietnutá.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Prepojenie nebolo dokončené v požadovanom čase.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Prepojenie s týmto zariadením nie je podporované.</string>
+    <string name="qr_code_login_header_failed_title">Neúspešné pripojenie</string>
+    <string name="qr_code_login_header_connected_description">Skontrolujte svoje prihlásené zariadenie, mal by sa zobraziť nasledujúci kód. Skontrolujte, či sa nižšie uvedený kód zhoduje s daným zariadením:</string>
+    <string name="qr_code_login_header_connected_title">Zabezpečené pripojenie bolo vytvorené</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Naskenujte nižšie uvedený QR kód pomocou zariadenia, ktoré je odhlásené.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Pomocou prihláseného zariadenia naskenujte nižšie uvedený QR kód:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Prihlásiť sa pomocou QR kódu</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Pomocou fotoaparátu na tomto zariadení naskenujte QR kód zobrazený na vašom druhom zariadení:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Skenovať QR kód</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Pomocou tohto zariadenia sa môžete prihlásiť do mobilného alebo webového zariadenia pomocou QR kódu. Môžete to urobiť dvoma spôsobmi:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Prihlásiť sa pomocou QR kódu</string>
+    <string name="login_scan_qr_code">Skenovať QR kód</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Domovský server nepodporuje prihlásenie pomocou QR kódu.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Prihlasovanie bolo zrušené na druhom zariadení.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">QR kód nie je platný.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Druhé zariadenie musí byť prihlásené.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Druhé zariadenie je už prihlásené.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Pri nastavovaní zabezpečeného zasielania správ sa vyskytol bezpečnostný problém. Jedna z nasledujúcich možností môže byť kompromitovaná: Váš domovský server; Vaše internetové pripojenie (pripojenia); Vaše zariadenie (zariadenia);</string>
+    <string name="qr_code_login_header_failed_other_description">Žiadosť zlyhala.</string>
+    <string name="labs_enable_voice_broadcast_summary">Možnosť nahrávania a odosielania hlasového vysielania v časovej osi miestnosti.</string>
+    <string name="labs_enable_voice_broadcast_title">Zapnúť hlasové vysielanie</string>
+    <string name="a11y_voice_broadcast_buffering">Načítavanie do vyrovnávacej pamäte…</string>
+    <string name="a11y_pause_voice_broadcast">Pozastaviť hlasové vysielanie</string>
+    <string name="a11y_play_voice_broadcast">Prehrať alebo pokračovať v nahrávaní hlasového vysielania</string>
+    <string name="a11y_stop_voice_broadcast_record">Zastaviť nahrávanie hlasového vysielania</string>
+    <string name="a11y_pause_voice_broadcast_record">Pozastaviť nahrávanie hlasového vysielania</string>
+    <string name="a11y_resume_voice_broadcast_record">Pokračovať v nahrávaní hlasového vysielania</string>
+    <string name="voice_broadcast_live">Naživo</string>
+    <string name="device_manager_other_sessions_select">Vyberte relácie</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Poloha</string>
+    <string name="attachment_type_selector_poll">Ankety</string>
+    <string name="attachment_type_selector_voice_broadcast">Hlasové vysielanie</string>
+    <string name="attachment_type_selector_file">Prílohy</string>
+    <string name="attachment_type_selector_sticker">Nálepky</string>
+    <string name="attachment_type_selector_gallery">Knižnica fotografií</string>
+    <string name="action_deselect_all">Zrušiť výber všetkých</string>
+    <string name="action_select_all">Vybrať všetko</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d vybraté</item>
+        <item quantity="few">%1$d vybraté</item>
+        <item quantity="other">%1$d vybraných</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">Prepnutie režimu na celú obrazovku</string>
+    <string name="attachment_type_selector_text_formatting">Formátovanie textu</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Už nahrávate hlasové vysielanie. Ukončite aktuálne hlasové vysielanie a spustite nové.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Niekto iný už nahráva hlasové vysielanie. Počkajte, kým sa skončí jeho hlasové vysielanie, a potom spustite nové.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Nemáte požadované oprávnenia na spustenie hlasového vysielania v tejto miestnosti. Obráťte sa na správcu miestnosti, aby vám rozšíril oprávnenia.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Nie je možné spustiť nové hlasové vysielanie</string>
+    <string name="a11y_voice_broadcast_fast_backward">Rýchle posunutie dozadu o 30 sekúnd</string>
+    <string name="a11y_voice_broadcast_fast_forward">Rýchle posunutie dopredu o 30 sekúnd</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Overené relácie sú všade tam, kde používate toto konto po zadaní svojho prístupového hesla alebo po potvrdení svojej totožnosti inou overenou reláciou.
+\n
+\nTo znamená, že máte všetky kľúče potrebné na odomknutie zašifrovaných správ a potvrdenie pre ostatných používateľov, že tejto relácii dôverujete.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Odhlásiť sa z %1$d relácie</item>
+        <item quantity="few">Odhlásiť sa z %1$d relácií</item>
+        <item quantity="other">Odhlásiť sa z %1$d relácií</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Odhlásiť sa</string>
+    <string name="voice_broadcast_recording_time_left">Ostáva %1$s</string>
+    <string name="quoting">Cituje</string>
+    <string name="message_reply_to_sender_created_poll">vytvoril/a anketu.</string>
+    <string name="message_reply_to_sender_sent_sticker">poslal/a nálepku.</string>
+    <string name="message_reply_to_sender_sent_video">poslal/a video.</string>
+    <string name="message_reply_to_sender_sent_image">poslal/a obrázok.</string>
+    <string name="message_reply_to_sender_sent_voice_message">poslal/a zvukovú správu.</string>
+    <string name="message_reply_to_sender_sent_audio_file">poslal/a zvukový súbor.</string>
+    <string name="message_reply_to_sender_sent_file">poslal súbor.</string>
+    <string name="message_reply_to_prefix">V odpovedi na</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Skryť IP adresu</string>
+    <string name="device_manager_other_sessions_show_ip_address">Zobraziť IP adresu</string>
+    <string name="replying_to">Odpoveď na %s</string>
+    <string name="editing">Úprava</string>
+    <string name="settings_enable_direct_share_summary">Zobraziť posledné konverzácie v systémovej ponuke zdieľania</string>
+    <string name="settings_enable_direct_share_title">Povoliť priame zdieľanie</string>
+    <string name="review_unverified_sessions_description">Skontrolujte, či je vaše konto bezpečné</string>
+    <string name="review_unverified_sessions_title">Máte neoverené relácie</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Táto relácia nepodporuje šifrovanie, takže ju nemožno overiť.
+\n
+\nPri používaní tejto relácie sa nebudete môcť zúčastňovať konverzácií v miestnostiach, kde je zapnuté šifrovanie.
+\n
+\nNa dosiahnutie čo najlepšieho zabezpečenia a súkromia sa odporúča používať Matrix klientov, ktoré podporujú šifrovanie.</string>
+    <string name="device_manager_signout_all_other_sessions">Odhlásiť zo všetkých ostatných relácií</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Táto relácia nepodporuje šifrovanie, a preto ju nemožno overiť.</string>
+    <string name="settings_nightly_build_update">Získajte najnovšiu zostavu (poznámka: môžete mať problémy s prihlásením)</string>
+    <string name="settings_nightly_build">Nočná zostava</string>
+    <string name="voice_broadcast_live_broadcast">Živé vysielanie</string>
+    <string name="notice_voice_broadcast_ended_by_you">Ukončili ste hlasové vysielanie.</string>
+    <string name="notice_voice_broadcast_ended">%1$s ukončil/a hlasové vysielanie.</string>
+    <string name="stop_voice_broadcast_content">Určite chcete zastaviť vysielanie naživo\? Tým sa vysielanie ukončí a v miestnosti bude k dispozícii celý záznam.</string>
+    <string name="stop_voice_broadcast_dialog_title">Zastaviť vysielanie naživo\?</string>
+    <string name="action_stop">Áno, zastaviť</string>
+    <string name="set_link_edit">Upraviť odkaz</string>
+    <string name="set_link_create">Vytvoriť odkaz</string>
+    <string name="set_link_link">Odkaz</string>
+    <string name="set_link_text">Text</string>
+    <string name="rich_text_editor_link">Nastaviť odkaz</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sk/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-sk/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-sk/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-sk/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-sl/strings.xml b/library/ui-strings/src/main/res/values-sl/strings.xml
similarity index 100%
rename from vector/src/main/res/values-sl/strings.xml
rename to library/ui-strings/src/main/res/values-sl/strings.xml
diff --git a/vector/src/main/res/values-sl/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-sl/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-sl/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-sl/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-sq/strings.xml b/library/ui-strings/src/main/res/values-sq/strings.xml
similarity index 83%
rename from vector/src/main/res/values-sq/strings.xml
rename to library/ui-strings/src/main/res/values-sq/strings.xml
index 80b6b27793..3b233c087c 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/library/ui-strings/src/main/res/values-sq/strings.xml
@@ -53,8 +53,6 @@
 \nPo importohen dhoma me ftesë</string>
     <string name="initial_sync_start_importing_account_left_rooms">Njëkohësimi fillestar:
 \nPo importohen dhoma të braktisura</string>
-    <string name="initial_sync_start_importing_account_groups">Njëkohësimi fillestar:
-\nPo importohen bashkësi</string>
     <string name="initial_sync_start_importing_account_data">Njëkohësimi fillestar:
 \nPo importohet të dhëna llogarie</string>
     <string name="event_status_sending_message">Po dërgohet mesazh…</string>
@@ -266,7 +264,6 @@
     <string name="matrix_only_filter">Vetëm kontakte të Matrix-it</string>
     <string name="no_result_placeholder">S’ka përfundime</string>
     <string name="rooms_header">Dhoma</string>
-    <string name="groups_header">Bashkësi</string>
     <string name="send_bug_report_include_logs">Dërgo regjistra</string>
     <string name="send_bug_report_include_crash_logs">Dërgoni regjistrime vithisjesh</string>
     <string name="send_bug_report_include_screenshot">Dërgo foto ekrani</string>
@@ -293,7 +290,6 @@
     <string name="auth_email_already_defined">Kjo adresë email është e përkufizuar tashmë.</string>
     <string name="auth_forgot_password">Harruat fjalëkalimin?</string>
     <string name="auth_recaptcha_message">Ky shërbyes Home do të donte të sigurohej se s’jeni robot</string>
-    <string name="auth_reset_password_missing_email">Duhet dhënë adresa email e lidhur me llogarinë tuaj.</string>
     <string name="login_error_invalid_home_server">Ju lutemi, jepni një URL të vlefshme</string>
     <string name="login_error_bad_json">JSON e keqformuar</string>
     <string name="login_error_not_json">S’përmbante JSON të vlefshëm</string>
@@ -435,7 +431,7 @@
     <string name="settings_theme">Temë</string>
     <string name="encryption_information_decryption_error">Gabim shfshehtëzimi</string>
     <string name="encryption_information_device_name">Emër publik</string>
-    <string name="encryption_information_device_id">ID Sesioni</string>
+    <string name="device_manager_session_details_session_id">ID Sesioni</string>
     <string name="encryption_information_device_key">Kyç sesioni</string>
     <string name="encryption_export_e2e_room_keys">Eksporto kyçe dhome E2E</string>
     <string name="encryption_export_room_keys">Eksporto kyçe dhome</string>
@@ -605,9 +601,7 @@
     <string name="settings_send_markdown_summary">Formatojini mesazhet duke përdorur sintaksën Markdown përpara se të dërgohen. Kjo lejon formatim të thelluar, f.v., përdorimi i yllthit për ta shfaqur tekstin me të pjerrëta.</string>
     <string name="settings_show_join_leave_messages_summary">Nuk prek ftesat, heqjet dhe dëbimet.</string>
     <string name="settings_opt_in_of_analytics_summary">${app_name}-i grumbullon të dhëna analitike anonime që të na lejojë ta përmirësojmë aplikacionin.</string>
-    <string name="settings_unignore_user">Të shfaqen krejt mesazhet prej %s\?
-\n
-\nKini parasysh që ky veprim do të sjellë rinisjen e aplikacionit dhe mund të hajë ca kohë.</string>
+    <string name="settings_unignore_user">Të shfaqen krejt mesazhet prej %s\?</string>
     <string name="settings_labs_native_camera_summary">Nis kamerën e sistemit, në vend se skenën e kamerës vetjake.</string>
     <string name="command_description_emote">Shfaq veprimin</string>
     <string name="command_description_markdown">On/Off sintakse Markdown</string>
@@ -871,7 +865,6 @@
     <string name="action_change">Ndryshoje</string>
     <string name="change_room_directory_network">Ndryshoni rrjetin</string>
     <string name="please_wait">Ju lutemi, pritni…</string>
-    <string name="group_all_communities">Krejt Bashkësitë</string>
     <string name="room_preview_no_preview">Kjo dhomë s’mund të parashihet</string>
     <string name="fab_menu_create_room">Dhoma</string>
     <string name="fab_menu_create_chat">Mesazhe të Drejtpërdrejtë</string>
@@ -902,10 +895,10 @@
     <string name="send_suggestion_failed">S’u arrit të dërgohej sugjerimi (%s)</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Shfaq te rrjedha kohore akte të fshehura</string>
     <string name="settings_integration_manager">Përgjegjës integrimesh</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">emër_sesioni:</string>
+    <string name="push_gateway_item_app_id">ID Aplikacioni:</string>
+    <string name="push_gateway_item_push_key"/>
+    <string name="push_gateway_item_app_display_name">Emër Aplikacioni Në Ekran:</string>
+    <string name="push_gateway_item_device_name">Emër Sesioni Në Ekran:</string>
     <string name="bottom_action_people_x">Mesazhe të Drejtpërdrejtë</string>
     <string name="send_file_step_idle">Po pritet…</string>
     <string name="send_file_step_encrypting_thumbnail">Po fshehtëzohet miniatura…</string>
@@ -954,11 +947,11 @@
     <string name="settings_discovery_identity_server_info">Po përdorni %1$s për të zbuluar dhe për të qenë i zbulueshëm nga kontakte ekzistues që njihni.</string>
     <string name="settings_discovery_identity_server_info_none">S’po përdorni ndonjë shërbyes identitetesh. Që të zbuloni dhe të jini i zbulueshëm nga kontakte ekzistuese që njihni, formësoni një të tillë më poshtë.</string>
     <string name="settings_discovery_emails_title">Adresa email të zbulueshme</string>
-    <string name="settings_discovery_no_mails">Mundësitë rreth zbulimesh do të shfaqen sapo të keni shtuar një email.</string>
+    <string name="settings_discovery_no_mails">Mundësitë e zbulimit do të shfaqen sapo të keni shtuar një adresë email.</string>
     <string name="settings_discovery_no_msisdn">Mundësi zbulimesh do të shfaqen sapo të keni shtuar një numër telefoni.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Shkëputja prej shërbyesit tuaj të identiteteve do të thotë se s’do të jeni i zbulueshëm prej përdoruesish të tjerë dhe s’do të jeni në gjendje të ftoni të tjerë me email ose telefon.</string>
     <string name="settings_discovery_msisdn_title">Numra telefoni të zbulueshëm</string>
-    <string name="settings_discovery_confirm_mail">Ju dërguam një email ripohimi te %s, hapeni dhe klikoni mbi lidhjen e ripohimit</string>
+    <string name="settings_discovery_confirm_mail">Ju dërguam një email te %s, hapeni dhe klikoni mbi lidhjen e ripohimit</string>
     <string name="settings_discovery_enter_identity_server">Jepni një URL shërbyesi identitetesh</string>
     <string name="settings_discovery_bad_identity_server">S’u lidh dot te shërbyes identitetesh</string>
     <string name="settings_discovery_please_enter_server">Ju lutemi, jepni URL-në e shërbyesit të identiteteve</string>
@@ -1085,7 +1078,7 @@
     <string name="login_registration_not_supported">Aplikacioni s’është në gjendje të krijojë llogari në këtë shërbyes Home.
 \n
 \nDoni të regjistroheni duke përdorur një klient web\?</string>
-    <string name="login_login_with_email_error">Ky emai s’është përshoqëruar me ndonjë llogari.</string>
+    <string name="login_login_with_email_error">Kjo adresë email s’është e përshoqëruar me ndonjë llogari.</string>
     <string name="login_reset_password_on">Ricaktoni fjalëkalimin në %1$s</string>
     <string name="login_reset_password_notice">Te mesazhet tuaj do të dërgohet një email verifikimi, për të ripohuar caktimin e fjalëkalimit tuaj të ri.</string>
     <string name="login_reset_password_submit">Pasuesi</string>
@@ -1094,7 +1087,7 @@
     <string name="login_reset_password_warning_title">Kujdes!</string>
     <string name="login_reset_password_warning_content">Ndryshimi i fjalëkalimit tuaj do të sjellë zerim të çfarëdo kyçesh fshehtëzimi skaj-më-skaj në krejt sesionet tuaj, duke e bërë të palexueshëm historikun e bisedave të fshehtëzuara. Ujdisni një Kopjeruajtje Kyçesh ose eksportoni kyçet e dhomës tuaj prej një tjetër sesioni, përpara se të ricaktoni fjalëkalimin tuaj.</string>
     <string name="login_reset_password_warning_submit">Vazhdo</string>
-    <string name="login_reset_password_error_not_found">Ky email s’është i lidhur me ndonjë llogari</string>
+    <string name="login_reset_password_error_not_found">Kjo adresë email s’është e lidhur me ndonjë llogari</string>
     <string name="login_reset_password_mail_confirmation_title">Kontrolloni te mesazhet tuaj të marrë</string>
     <string name="login_reset_password_mail_confirmation_notice">Një email verifikimi u dërgua te %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Prekni mbi lidhjen që të ripohohet fjalëkalimi juaj i ri. Pasi të keni ndjekur lidhjen që përmban, klikoni më poshtë.</string>
@@ -1108,7 +1101,7 @@
 \n
 \nTë ndalet procesi i ndryshimit të fjalëkalimit\?</string>
     <string name="login_set_email_title">Caktoni adresë email</string>
-    <string name="login_set_email_notice">Caktoni një email për rimarrje të llogarisë tuaj. Më vonë, mundeni të lejoni persona që njihni t’ju zbulojnë përmes email-it tuaj.</string>
+    <string name="login_set_email_notice">Caktoni një adresë email për rimarrje të llogarisë tuaj. Më vonë, mundeni të lejoni persona që njihni t’ju zbulojnë përmes kësaj adrese.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (në daçi)</string>
     <string name="login_set_email_submit">Pasuesi</string>
@@ -1450,7 +1443,7 @@
     <string name="event_redacted">Mesazhi u fshi</string>
     <string name="settings_show_redacted">Shfaq mesazhe të hequr</string>
     <string name="settings_show_redacted_summary">Shfaq një vendmbajtëse për mesazhe të hequr</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Ju dërguam një email ripohimi te %s, ju lutemi, së pari, shihni email-in tuaj dhe klikoni mbi lidhjen e ripohimit</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Ju dërguam një email te %s, ju lutemi, së pari, shihni email-in tuaj dhe klikoni mbi lidhjen e ripohimit</string>
     <string name="settings_text_message_sent_wrong_code">Kodi i verifikimit s’është i saktë.</string>
     <string name="uploads_media_title">MEDIA</string>
     <string name="uploads_media_no_result">S’ka media në këtë dhomë</string>
@@ -1523,9 +1516,7 @@
 \n
 \nKëtë veprim mund ta zhbëni në çfarëdo kohe, te rregullimet e përgjithshme.</string>
     <string name="room_participants_action_unignore_title">Hiqe shpërfilljen e përdoruesit</string>
-    <string name="room_participants_action_unignore_prompt_msg">Heqja e shpërfilljes së këtij përdoruesi do të shfaqë sërish krejt mesazhet prej tij.
-\n
-\nKini parasysh se ky veprim do të sjellë rinisjen e aplikacionit dhe do të hajë ca kohë.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Heqja e shpërfilljes së këtij përdoruesi do të shfaqë sërish krejt mesazhet prej tij.</string>
     <string name="room_participants_action_cancel_invite_title">Anuloje ftesën</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Jeni i sigurt se doni të anulohet ftesa për këtë përdorues\?</string>
     <string name="room_participants_remove_title">Përzëre përdoruesin</string>
@@ -1539,7 +1530,7 @@
     <string name="room_participants_unban_prompt_msg">Heqja e dëbimit përdoruesit do t’i lejojë të marrë pjesë sërish në dhomë.</string>
     <string name="settings_phone_number_empty">Te llogaria juaj s’është shtuar ndonjë numër telefoni</string>
     <string name="settings_emails">Adresa email</string>
-    <string name="settings_emails_empty">Te llogaria juaj s’është shtuar ndonjë email</string>
+    <string name="settings_emails_empty">Te llogaria juaj s’është shtuar ndonjë adresë email</string>
     <string name="settings_phone_numbers">Numra telefoni</string>
     <string name="settings_remove_three_pid_confirmation_content">Të hiqet %s\?</string>
     <string name="error_threepid_auth_failed">Sigurohuni që keni klikuar te lidhja në email-in që ju kemi dërguar.</string>
@@ -1557,7 +1548,7 @@
     <string name="disabled_integration_dialog_title">Integrimet janë të çaktivizuara</string>
     <string name="disabled_integration_dialog_content">Që të bëhet kjo, aktivizoni “Lejo integrime”, te Rregullimet.</string>
     <string name="settings_emails_and_phone_numbers_title">Email-e dhe numra telefonash</string>
-    <string name="settings_emails_and_phone_numbers_summary">Administroni email-e dhe numra telefonash të lidhur me llogarinë tuaj Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Administroni adresa email dhe numra telefonash të lidhur me llogarinë tuaj Matrix</string>
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">%d përdorues i dëbuar</item>
         <item quantity="other">%d përdorues të dëbuar</item>
@@ -1610,7 +1601,7 @@
     <string name="auth_invalid_login_deactivated_account">Kjo llogari është çaktivizuar.</string>
     <string name="error_saving_media_file">S’u ruajt dot kartelë media</string>
     <string name="confirm_your_identity_quad_s">Ripohoni identitetin tuaj duke verifikuar këto kredenciale hyrjeje, duke i akorduar hyrje te mesazhe të fshehtëzuar.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Për privatësinë tuaj, ${app_name}-i mbulon vetëm dërgim email-esh dhe numrash telefoni përdoruesi të koduar.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Për privatësinë tuaj, ${app_name}-i mbulon vetëm dërgim adresash email dhe numrash telefoni përdoruesi të koduar.</string>
     <string name="power_level_edit_title">Caktoni rol</string>
     <string name="power_level_title">Rol</string>
     <string name="a11y_open_chat">Hapni fjalosje</string>
@@ -1774,7 +1765,7 @@
     <string name="attachment_viewer_item_x_of_y">%1$d nga %2$d</string>
     <string name="settings_discovery_consent_action_give_consent">Jepe pranimin</string>
     <string name="settings_discovery_consent_action_revoke">Shfuqizoje pranimin tim</string>
-    <string name="settings_discovery_consent_notice_on">Keni dhënë pranimin tuaj për të dërguar email-e dhe numra telefonash te ky shërbyes identitetesh që të zbulojë përdorues të tjerë prej kontakteve tuaj.</string>
+    <string name="settings_discovery_consent_notice_on">Keni dhënë pranimin tuaj për të dërguar adresa email-e dhe numra telefonash te ky shërbyes identitetesh që të zbulojë përdorues të tjerë prej kontakteve tuaj.</string>
     <string name="settings_discovery_consent_title">Dërgo email-e dhe numra telefonash</string>
     <string name="direct_room_user_list_suggestions_title">Sugjerime</string>
     <string name="direct_room_user_list_known_title">Përdorues të Ditur</string>
@@ -2140,7 +2131,7 @@
     <string name="settings_notification_mentions_and_keywords">Përmendje dhe Fjalëkyçe</string>
     <string name="settings_notification_default">Njoftime Parazgjedhje</string>
     <string name="link_this_email_with_your_account">%s te Rregullimet, që të merrni ftesa drejt e në ${app_name}.</string>
-    <string name="link_this_email_settings_link">Lidheni këtë email me llogarinë tuaj</string>
+    <string name="link_this_email_settings_link">Lidheni këtë adresë email me llogarinë tuaj</string>
     <string name="this_invite_to_this_space_was_sent">Kjo ftesë për te kjo hapësirë u dërgua te %s që s’është i përshoqëruar me llogarinë tuaj</string>
     <string name="this_invite_to_this_room_was_sent">Kjo ftesë për te kjo dhomë qe dërguar për %s që s’është i përshoqëruar me llogarinë tuaj</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Krejt dhomat ku gjendeni do të shfaqen te Home.</string>
@@ -2208,7 +2199,7 @@
     <string name="room_settings_space_access_title">Hyrje në hapësirë</string>
     <string name="room_settings_access_rules_pref_dialog_title">Kush mund të hyjë\?</string>
     <string name="settings_notification_emails_enable_for_email">Aktivizo njoftime me email për %s</string>
-    <string name="settings_notification_emails_no_emails">Që të merrni email me njoftim, ju lutemi, përshoqërojini llogarisë tuaj Matrix një email</string>
+    <string name="settings_notification_emails_no_emails">Që të merrni email me njoftim, ju lutemi, përshoqërojini llogarisë tuaj Matrix një adresë email</string>
     <string name="settings_notification_emails_category">Njoftim me email</string>
     <string name="room_permissions_upgrade_the_space">Të përmirësojë hapësirën</string>
     <string name="room_permissions_change_space_name">Të ndryshojë emrin e hapësirës</string>
@@ -2254,8 +2245,8 @@
     <string name="create_poll_question_title">Pyetje ose temë pyetësori</string>
     <string name="create_poll_title">Krijoni Pyetësor</string>
     <string name="identity_server_consent_dialog_content_question">A pranoni të dërgohen këto hollësi\?</string>
-    <string name="identity_server_consent_dialog_content_3">Për të zbuluar kontakte ekzistuese, duhet të dërgoni hollësi kontakti (email-e dhe numra telefonash) te shërbyesi juaj i identiteteve. Para dërgimit, i fshehtëzojmë të dhënat tuaja, për privatësi.</string>
-    <string name="identity_server_consent_dialog_title_2">Dërgo email-e dhe numra telefonash te %s</string>
+    <string name="identity_server_consent_dialog_content_3">Për të zbuluar kontakte ekzistuese, duhet të dërgoni hollësi kontakti (adresa email dhe numra telefonash) te shërbyesi juaj i identiteteve. Para dërgimit, i fshehtëzojmë të dhënat tuaja, për privatësi.</string>
+    <string name="identity_server_consent_dialog_title_2">Dërgo adresa email dhe numra telefonash te %s</string>
     <string name="settings_discovery_consent_notice_off_2">Kontaktet tuaja janë private. Për të zbuluar përdorues prej kontakteve tuaja, na duhet leja juaj për të dërguar hollësi kontakti te shërbyesi juaj i identiteteve.</string>
     <string name="shortcut_disabled_reason_sign_out">Është bërë dalja nga sesioni!</string>
     <string name="shortcut_disabled_reason_room_left">U dol nga dhoma!</string>
@@ -2352,7 +2343,7 @@
     <string name="location_timeline_failed_to_load_map">S’u arrit të ngarkohej hartë</string>
     <string name="a11y_static_map_image">Hartë</string>
     <string name="labs_enable_thread_messages_desc">Shënim: aplikacioni do të riniset</string>
-    <string name="labs_enable_thread_messages">Aktivizoni Rrjedha Mesazhesh</string>
+    <string name="labs_enable_thread_messages">Aktivizoni rrjedha mesazhesh</string>
     <string name="ftue_auth_use_case_connect_to_server">Lidhu te shërbyesi</string>
     <string name="ftue_auth_use_case_join_existing_server">Po shihni për të marrë pjesë në një shërbyes ekzistues\?</string>
     <string name="ftue_auth_use_case_skip_partial">anashkalojeni këtë pyetje</string>
@@ -2360,7 +2351,7 @@
     <string name="ftue_auth_use_case_option_three">Bashkësi</string>
     <string name="ftue_auth_use_case_option_two">Ekipe</string>
     <string name="ftue_auth_use_case_option_one">Shokë dhe familje</string>
-    <string name="ftue_auth_use_case_subtitle">Do t’ju ndihmojmë të lidheni.</string>
+    <string name="ftue_auth_use_case_subtitle">Do t’ju ndihmojmë të lidheni</string>
     <string name="ftue_auth_use_case_title">Me kë do të bisedoni më shumë\?</string>
     <string name="navigate_to_thread_when_already_in_the_thread">Po e shihni tashmë këtë rrjedhë!</string>
     <string name="view_in_room">Shiheni në Dhomë</string>
@@ -2416,16 +2407,15 @@
     <string name="error_forbidden_digits_only_username">Shërbyesi Home s’pranon emër përdorues vetëm me shifra.</string>
     <string name="ftue_personalize_skip_this_step">Anashkalojeni këtë hap</string>
     <string name="ftue_personalize_submit">Ruajeni dhe vazhdoni</string>
-    <string name="ftue_personalize_complete_subtitle">Parapëlqimet tuaja u ruajtën.</string>
+    <string name="ftue_personalize_complete_subtitle">Kaloni te rregullimet, kur të doni, që të përditësoni profilin tuaj</string>
     <string name="ftue_personalize_complete_title">Kaq qe!</string>
     <string name="ftue_personalize_lets_go">Shkojmë</string>
-    <string name="ftue_profile_picture_subtitle">Këtë mund ta ndryshoni kurdo.</string>
+    <string name="ftue_profile_picture_subtitle">Erdh koha t’i jepet surrat emrit</string>
     <string name="ftue_profile_picture_title">Shtoni një foto profili</string>
     <string name="ftue_display_name_entry_footer">Këtë mund ta ndryshoni më vonë</string>
     <string name="ftue_display_name_entry_title">Emër Në Ekran</string>
-    <string name="ftue_display_name_subtitle">Kjo do të shfaqet kur dërgoni mesazhe.</string>
     <string name="ftue_display_name_title">Zgjidhni një emër për në ekran</string>
-    <string name="ftue_account_created_subtitle">Llogaria juaj %s u krijua.</string>
+    <string name="ftue_account_created_subtitle">Llogaria juaj %s u krijua</string>
     <string name="ftue_account_created_congratulations_title">Përgëzime!</string>
     <string name="ftue_account_created_take_me_home">Shpjemëni në shtëpi</string>
     <string name="ftue_account_created_personalize">Personalizoni profil</string>
@@ -2456,4 +2446,432 @@
     <string name="settings_presence">Prani</string>
     <string name="action_learn_more">Mësoni më tepër</string>
     <string name="action_try_it_out">Provojeni</string>
-</resources>
+    <string name="labs_enable_element_call_permission_shortcuts">Aktivizo shkurtore lejesh për Thirrje Element</string>
+    <string name="settings_troubleshoot_test_distributors_fdroid">S’u gjet metodë tjetër veç njëkohësimit në prapaskenë.</string>
+    <string name="initial_sync_request_content">${app_name}-it i duhet një fshehtinë e pastër, për të qenë i përditësuar, për arsyen vijuese:
+\n%s
+\n
+\nKini parasysh se ky veprim do të sjellë rinisjen e aplikacionit dhe mund të dojë ca kohë.</string>
+    <string name="labs_enable_client_info_recording_summary">Regjistro emrin, versionin dhe URL-në e klientit, për të dalluar më kollaj sesionet te përgjegjës sesionesh.</string>
+    <string name="device_manager_session_last_activity">Veprimtaria e fundit më %1$s</string>
+    <string name="rich_text_editor_format_underline">Apliko format me të nënvizuara</string>
+    <string name="rich_text_editor_format_strikethrough">Apliko format me të hequravije</string>
+    <string name="rich_text_editor_format_italic">Apliko format me të pjerrta</string>
+    <string name="rich_text_editor_format_bold">Apliko format me të trasha</string>
+    <string name="qr_code_login_confirm_security_code_description">Ju lutemi, sigurohuni se e dini origjinën e këtij kodi. Duke lidhur pajisje, do t’i jepni dikujt hyrje të plotë në llogarinë tuaj.</string>
+    <string name="qr_code_login_confirm_security_code">Ripohojeni</string>
+    <string name="qr_code_login_try_again">Riprovoni</string>
+    <string name="qr_code_login_status_no_match">Pa përputhje\?</string>
+    <string name="qr_code_login_signing_in">Po bëhet hyrja juaj</string>
+    <string name="qr_code_login_connecting_to_device">Po lidhet me pajisjen</string>
+    <string name="qr_code_login_scan_qr_code_button">Skanoni kodin QR</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Po bëhet hyrja te një pajisje celulare\?</string>
+    <string name="qr_code_login_show_qr_code_button">Shfaq kod QR te kjo pajisje</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Përzgjidhni “Skanoni kod QR”</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Filloja në skenën e hyrjes</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Përzgjidhni “Hyni me kod QR”</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Filloja në skenën e hyrjes</string>
+    <string name="qr_code_login_new_device_instruction_3">Përzgjidhni “Shfaq kod QR”</string>
+    <string name="qr_code_login_new_device_instruction_2">Kaloni te Rregullime -&gt; Siguri &amp; Privatësi</string>
+    <string name="qr_code_login_new_device_instruction_1">Hapeni aplikacionin në pajisjen tuaj tjetër</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Hyrja u anulua në pajisjen tuaj tjetër.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Ai kod QR është i pavlefshëm.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Duhet bërë hyrja te pajisja tjetër.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Nga pajisja tjetër është bërë tashmë hyrja.</string>
+    <string name="qr_code_login_header_failed_other_description">Kërkesa dështoi.</string>
+    <string name="qr_code_login_header_failed_denied_description">Kërkesa u hodh poshtë në pajisjen tjetër.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Lidhja me këtë pajisje nuk mbulohet.</string>
+    <string name="qr_code_login_header_failed_title">Lidhje e pasuksesshme</string>
+    <string name="qr_code_login_header_connected_title">U vendos lidhje e siguruar</string>
+    <string name="qr_code_login_header_show_qr_code_title">Hyni me kod QR</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Skanoni kodin QR</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="onboarding_new_app_layout_button_try">Provojeni</string>
+    <string name="onboarding_new_app_layout_feedback_message">Prekeni djathtas në krye që të shihni mundësinë për dhënie përshtypjesh.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Jepni Përshtypje</string>
+    <string name="onboarding_new_app_layout_spaces_message">Hyni në Hapësirat tuaja (poshtë djathtas) më shpejt dhe më kollaj se kurrë më parë.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Hyni Në Hapësira</string>
+    <string name="onboarding_new_app_layout_welcome_message">Që të thjeshtohet ${app_name} juaj, skedat tanimë janë opsionale. Administrojini duke përdorur menunë djathtas në krye.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Mirë se vini te një pamje e re!</string>
+    <string name="home_empty_no_unreads_message">Ky është vendi ku do të shfaqen mesazhet tuaj të palexuar, kur të ketë të tillë.</string>
+    <string name="home_empty_no_unreads_title">S’ka gjë për ta raportuar.</string>
+    <string name="home_empty_no_rooms_message">Aplikacioni “all-in-one” i fjalosjeve të siguruara, për ekipe, shokë dhe ente. Që t’ia filloni, krijoni një fjalosje, ose hyni në një dhomë ekzistuese.</string>
+    <string name="home_empty_no_rooms_title">Mirë se vini te ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Hapësirat janë një mënyrë e re për të grupuar dhoma dhe persona. Shtoni një dhomë ekzistuese, ose krijoni një të re, duke përdorur butonin poshtë djathtas.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nduket paksa si i zbrazët.</string>
+    <string name="labs_enable_voice_broadcast_summary">Jini në gjendje të incizoni dhe dërgoni transmetim zanor në rrjedhën kohore të dhomës.</string>
+    <string name="labs_enable_voice_broadcast_title">Aktivizoni transmetim zanor</string>
+    <string name="labs_enable_client_info_recording_title">Aktivizo regjistrim hollësish klienti</string>
+    <string name="labs_enable_session_manager_summary">Shihini më qartë dhe kontrolloni më mirë krejt sesionet tuaj.</string>
+    <string name="labs_enable_session_manager_title">Aktivizo përgjegjës të ri sesionesh</string>
+    <string name="device_manager_learn_more_session_rename">Përdorues të tjerë në mesazhe të drejtpërdrejtë dhe dhoma ku hyni janë në gjendje të shohin një listë të plotë të sesioneve tuaj.
+\n
+\nKjo u jep atyre besim se po flasin vërtet me ju, por do të thotë gjithashtu që mund shohin emrin e sesionit që jepni këtu.</string>
+    <string name="device_manager_learn_more_session_rename_title">Riemërtim sesionesh</string>
+    <string name="device_manager_learn_more_sessions_verified">Sesionet e verifikuar përfaqësojnë sesione ku është bërë hyrja dhe janë verifikuar, ose duke përdorur togfjalëshin tuaj të sigurt, ose me verifikim.
+\n
+\nKjo do të thotë se zotërojnë kyçe fshehtëzimi për mesazhe tuajt të mëparshëm dhe u ripohojnë përdoruesve të tjerë, me të cilët po komunikoni, se këto sesione ju takojnë juve.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sesione të verifikuar</string>
+    <string name="device_manager_learn_more_sessions_unverified">Sesionet e paverifikuar janë sesione në të cilët është bërë hyrja me kredencialet tuaja, por pa u bërë verifikim.
+\n
+\nDuhet të jeni posaçërisht të qartë se i njihni këto sesione, ngaqë mund të përbëjnë përdorim të paautorizuar të llogarisë tuaj.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sesione të paverifikuar</string>
+    <string name="device_manager_learn_more_sessions_inactive">Sesioni joaktive janë sesione që keni ca kohë që s’i përdorni, por që vazhdojnë të marrin kyçe fshehtëzimi.
+\n
+\nHeqja e sesioneve joaktive përmirëson sigurinë dhe punimin dhe e bën më të lehtë për ju të pikasni nëse një sesion i ri është i dyshimtë.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sesione joaktive</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Mund të përdorni këtë pajisje për të bërë hyrjen në një pajisje celulare apo web me një kod QR. Për ta bërë këtë ka dy mënyra:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Hyni me Kod QR</string>
+    <string name="device_manager_session_rename_warning">Ju lutemi, kini parasysh se emrat e sesioneve janë të dukshëm edhe për personat me të cilët komunikoni.</string>
+    <string name="device_manager_session_rename_description">Emra vetjakë sesionesh mund t’ju ndihmojnë të njihni më kollaj pajisjet tuaja.</string>
+    <string name="device_manager_session_rename_edit_hint">Emër sesioni</string>
+    <string name="device_manager_session_rename">Riemërtoni sesionin</string>
+    <string name="device_manager_session_details_device_ip_address">Adresë IP</string>
+    <string name="device_manager_session_details_device_operating_system">Sistem operativ</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Shfletues</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Version</string>
+    <string name="device_manager_session_details_application_name">Ëmër</string>
+    <string name="device_manager_session_details_application">Aplikacion</string>
+    <string name="device_manager_session_details_session_last_activity">Veprimtaria e fundit</string>
+    <string name="device_manager_session_details_session_name">Emër sesioni</string>
+    <string name="device_manager_push_notifications_description">Merrni njoftime push për këtë sesion.</string>
+    <string name="device_manager_push_notifications_title">Njoftime Push</string>
+    <string name="device_manager_session_details_description">Hollësi aplikacioni, pajisjeje dhe veprimtarie.</string>
+    <string name="device_manager_session_details_title">Hollësi sesioni</string>
+    <string name="device_manager_session_overview_signout">Dilni nga ky sesion</string>
+    <string name="device_manager_other_sessions_select">Përzgjidhni sesione</string>
+    <string name="device_manager_other_sessions_clear_filter">Spastroje Filtrin</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">S’u gjetën sesione joaktive.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">S’u gjetën seanca të paverifikuara.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">S’u gjetën sesione të verifikuara.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Shihni mundësinë e daljes nga sesione të vjetër (%1$d ditë ose më tepër) të cilët s’i përdorni më.</item>
+        <item quantity="other">Shihni mundësinë e daljes nga sesione të vjetër (%1$d ditë ose më tepër) të cilët s’i përdorni më.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Joaktive</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifikoni sesionet tuaj, për shkëmbim më të sigurt mesazhesh, ose dilni prej atyre që nuk i njihni, apo përdorni më.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Të paverifikuar</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Për sigurinë më të mirë, dilni nga çfarëdo sesioni që nuk e njihni apo përdorni më.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Të verifikuar</string>
+    <string name="a11y_device_manager_filter">Filtroji</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Joaktiv për %1$d ditë, ose më gjatë</item>
+        <item quantity="other">Joaktiv për %1$d ditë, ose më gjatë</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Jo aktiv</string>
+    <string name="device_manager_filter_option_unverified_description">Jo gati për shkëmbim të sigurt mesazhesh</string>
+    <string name="device_manager_filter_option_unverified">E paverifikuar</string>
+    <string name="device_manager_filter_option_verified_description">Gati për shkëmbim të sigurt mesazhesh</string>
+    <string name="device_manager_filter_option_verified">E verifikuar</string>
+    <string name="device_manager_filter_option_all_sessions">Krejt sesionet</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filtroji</string>
+    <string name="device_manager_device_title">Pajisje</string>
+    <string name="device_manager_session_title">Sesion</string>
+    <string name="device_manager_current_session_title">Sesioni i tanishëm</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Shihni mundësinë e daljes nga sesione të vjetër (%1$d ditë ose më tepër) të cilët s’i përdorni më.</item>
+        <item quantity="other">Shihni mundësinë e daljes nga sesione të vjetër (%1$d ditë ose më tepër) të cilët s’i përdorni më.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Sesione joaktive</string>
+    <string name="device_manager_unverified_sessions_description">Verifikojini, ose dilni nga sesione të paverifikuar.</string>
+    <string name="device_manager_unverified_sessions_title">Sesione të paverifikuar</string>
+    <string name="device_manager_header_section_security_recommendations_description">Përmirësoni sigurinë e llogarisë tuaj duke ndjekur këto rekomandime.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Rekomandime sigurie</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Joaktiv për %1$d+ ditë (%2$s)</item>
+        <item quantity="other">Joaktiv për %1$d+ ditë (%2$s)</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_unverified_current_session">I paverifikuar · Sesioni juaj i tanishëm</string>
+    <string name="device_manager_other_sessions_description_unverified">I paverifikuar · Veprimtari së fundi më %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">I verifikuar · Veprimtaria e fundit më %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Shihni Krejt (%1$d)</string>
+    <string name="device_manager_view_details">Shihni Hollësitë</string>
+    <string name="device_manager_verify_session">Verifiko Sesion</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifikoni sesionin tuaj të tanishëm, që të shfaqni gjendjen e verifikimit të këtij sesioni.</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Për sigurinë dhe besueshmërinë më të mirë, verifikojeni, ose dilni nga ky sesion.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifikoni sesionin tuaj të tanishëm, për shkëmbim më të sigurt të mesazheve.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Ky sesion është gati për shkëmbim të sigurt mesazhesh.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Sesioni juaj i tanishëm është gati për shkëmbim të sigurt mesazhesh.</string>
+    <string name="device_manager_verification_status_unknown">Gjendje e panjohur verifikimi</string>
+    <string name="device_manager_verification_status_unverified">Sesion i paverifikuar</string>
+    <string name="device_manager_verification_status_verified">Sesion i verifikuar</string>
+    <string name="a11y_device_manager_device_type_unknown">Lloj i panjohur pajisjeje</string>
+    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_mobile">Celular</string>
+    <string name="device_manager_sessions_other_description">Për sigurinë më të mirë, verifikoni sesionet tuaja dhe dilni nga çfarëdo sesioni që s’e njihni, ose s’e përdorni më.</string>
+    <string name="device_manager_sessions_other_title">Sesione të tjera</string>
+    <plurals name="room_removed_messages">
+        <item quantity="one">U hoq %d mesazh</item>
+        <item quantity="other">U hoqë %d mesazhe</item>
+    </plurals>
+    <string name="live_location_labs_promotion_switch_title">Aktivizoni tregim vendndodhjeje</string>
+    <string name="live_location_labs_promotion_description">Ju lutemi, kini parasysh: kjo është një veçori në zhvillim, që përdor një sendërtim të përkohshëm. Kjo do të thotë se s’do të jeni në gjendje të fshini historikun e vendndodhjeve tuaja dhe përdoruesit e përparuar do të jenë në gjendje të shohin historikun e vendndodhjeve tuaja, edhe pasi të keni ndalur dhënien “live” për këtë dhomë të vendndodhjes tuaj.</string>
+    <string name="live_location_labs_promotion_title">Tregim “live” vendndodhjeje</string>
+    <string name="settings_troubleshoot_test_current_gateway">Kanal i tanishëm: %s</string>
+    <string name="settings_troubleshoot_test_current_gateway_title">Kanal</string>
+    <string name="settings_troubleshoot_test_current_endpoint_failed">S’gjendet pikëmbarimi.</string>
+    <string name="settings_troubleshoot_test_current_endpoint_success">Pikëmbarim i tanishëm: %s</string>
+    <string name="settings_troubleshoot_test_current_endpoint_title">Pikëmbarim</string>
+    <string name="settings_troubleshoot_test_current_distributor">Hëpërhë po përdoret %s.</string>
+    <string name="settings_troubleshoot_test_current_distributor_title">Metodë</string>
+    <plurals name="settings_troubleshoot_test_distributors_many">
+        <item quantity="one">U gjet %d metodë.</item>
+        <item quantity="other">U gjetën %d metoda.</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_distributors_gplay">S’u gjet metodë tjetër veç Google Play Service.</string>
+    <string name="settings_troubleshoot_test_distributors_title">Metoda të gatshme</string>
+    <string name="settings_notification_method">Metodë njoftimi</string>
+    <string name="unifiedpush_distributor_background_sync">Njëkohësim në prapaskenë</string>
+    <string name="unifiedpush_distributor_fcm_fallback">Shërbime Google</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Zgjidhni si të merren njoftime</string>
+    <string name="screen_sharing_notification_description">Tregimi i ekranit është në punë e sipër</string>
+    <string name="screen_sharing_notification_title">Tregim Ekrani ${app_name}</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Kamerë</string>
+    <string name="attachment_type_selector_location">Vendndodhje</string>
+    <string name="attachment_type_selector_poll">Pyetësorë</string>
+    <string name="attachment_type_selector_voice_broadcast">Transmetim zanor</string>
+    <string name="attachment_type_selector_file">Bashkëngjitje</string>
+    <string name="attachment_type_selector_sticker">Ngjitës</string>
+    <string name="attachment_type_selector_gallery">Fototekë</string>
+    <string name="tooltip_attachment_voice_broadcast">Nisni një transmetim zanor</string>
+    <string name="live_location_description">Vendndodhje drejtpërsëdrejti</string>
+    <string name="live_location_share_location_item_share">Jepe vendndodhjen</string>
+    <string name="live_location_not_enough_permission_dialog_description">Që të mund të ndani drejtpërsëdrejti vendndodhje me të tjerë në këtë dhomë, lypset të keni lejet e duhura.</string>
+    <string name="live_location_not_enough_permission_dialog_title">S’keni leje të tregoni vendndodhje drejtpërsëdrejti</string>
+    <string name="live_location_bottom_sheet_last_updated_at">Përditësuar %1$s më parë</string>
+    <string name="labs_enable_live_location_summary">Sendërtim i përkohshëm: vendndodhjet mbeten në historikun e dhomës</string>
+    <string name="labs_enable_live_location">Aktivizo Tregim Vendndodhjeje “Live”</string>
+    <string name="live_location_sharing_notification_title">Vendndodhje Drejtpërsëdrejti ${app_name}</string>
+    <string name="location_share_live_remaining_time">Edhe %1$s</string>
+    <string name="location_share_live_until">“Live” deri më %1$s</string>
+    <string name="location_share_live_view">Shihni vendndodhje “live”</string>
+    <string name="location_share_live_ended">Tregimi “live” i vendndodhjes përfundoi</string>
+    <string name="location_share_live_started">Po ngarkohet vendndodhje “live”…</string>
+    <string name="location_share_loading_map_error">S’arrihet të ngarkohet hartë
+\nKy shërbyes Home mund të mos jetë formësuar të shfaqë harta.</string>
+    <string name="poll_undisclosed_not_ended">Përfundimet do të jenë të dukshme pasi të ketë përfunduar pyetësori</string>
+    <string name="labs_enable_msc3061_share_history_desc">Kur bëhet ftesë në një dhomë të fshehtëzuar që ka historik ndarjesh me të tjerët, historiku i fshehtëzuar do të jetë i dukshëm.</string>
+    <string name="a11y_voice_broadcast_buffering"/>
+    <string name="a11y_pause_voice_broadcast">Ndal transmetim zanor</string>
+    <string name="a11y_play_voice_broadcast">Luani ose vazhdoni luajtje transmetimi zanor</string>
+    <string name="a11y_stop_voice_broadcast_record">Ndal incizim transmetimi zanor</string>
+    <string name="a11y_pause_voice_broadcast_record">Ndal incizim transmetimi zanor</string>
+    <string name="a11y_resume_voice_broadcast_record">Vazhdo incizim transmetimi zanor</string>
+    <string name="voice_broadcast_live">Drejtpërdrejt</string>
+    <string name="settings_show_latest_profile">Shfaq hollësitë më të reja të përdoruesit</string>
+    <string name="space_explore_filter_no_result_description">Disa përfundime mund të jenë të fshehura, ngaqë janë private dhe ju duhet një ftesë për to.</string>
+    <string name="space_explore_filter_no_result_title">S’u gjetën përfundime</string>
+    <string name="space_leave_radio_button_none">Mos braktis ndonjë</string>
+    <string name="space_leave_radio_button_all">Braktisi krejt</string>
+    <string name="space_leave_radio_buttons_title">Gjëra në këtë hapësirë</string>
+    <string name="a11y_presence_busy">I zënë</string>
+    <string name="a11y_open_settings">Hap rregullimet</string>
+    <string name="settings_security_pin_code_use_biometrics_error">S’u aktivizua dot mirëfilltësim biometrik.</string>
+    <string name="auth_biometric_key_invalidated_message">Mirëfilltësimi biometrik qe çaktivizuar ngaqë tani së fundi është shtuar një metodë e re mirëfilltësimi biometrik. Mund ta riaktivizoni që nga Rregullimet.</string>
+    <string name="key_authenticity_not_guaranteed">S’mund të garantohet mirëfilltësia e këtij mesazhi të fshehtëzuar në këtë pajisje.</string>
+    <string name="settings_security_incognito_keyboard_title">Tastierë inkonjito</string>
+    <string name="send_your_first_msg_to_invite">Dërgoni mesazhin tuaj të parë për të ftuar në fjalosje %s</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Mesazhet në këtë fjalosje do të jenë të fshehtëzuar skaj-më-skaj.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">S’do të jeni në gjendje të shihni historikun e mesazheve të fshehtëzuara. Që t’ia rifilloni nga e para, ricaktoni kyçet tuaja për Kopjeruajtje të Sigurt Mesazhesh dhe kyçe verifikimi.</string>
+    <string name="crosssigning_cannot_verify_this_session">S’arrihet të verifikohet kjo pajisje</string>
+    <string name="settings_sessions_list">Sesione</string>
+    <string name="sent_live_location">Tregoi vendndodhjen e vet drejtpërsëdrejti</string>
+    <string name="command_description_table_flip">E paraprin një mesazh tekst i thjeshtë me (╯°□°）╯︵ ┻━┻</string>
+    <string name="permalink_unsupported_groups">S’hapet dot kjo lidhje: bashkësitë janë zëvendësuar nga hapësirat</string>
+    <string name="login_scan_qr_code">Skanoni kodin QR</string>
+    <string name="ftue_auth_login_username_entry">Emër përdoruesi / Email / Telefon</string>
+    <string name="ftue_auth_captcha_title">Jeni qenie njerëzore\?</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Ndiqni udhëzimet e dërguara te %s</string>
+    <string name="ftue_auth_password_reset_confirmation">Ricaktim fjalëkalimi</string>
+    <string name="ftue_auth_forgot_password">Harrova fjalëkalimin</string>
+    <string name="ftue_auth_email_resend_email">Ridërgo email</string>
+    <string name="ftue_auth_email_verification_footer">S’morët email\?</string>
+    <string name="ftue_auth_email_verification_subtitle">Ndiqni udhëzimet e dërguara te %s</string>
+    <string name="ftue_auth_email_verification_title">Verifikoni email-in tuaj</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">Ridërgomëni kodin</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">Te %s u dërgua një kod</string>
+    <string name="ftue_auth_phone_confirmation_title">Ripohoni numrin e telefonit tuaj</string>
+    <string name="ftue_auth_sign_out_all_devices">Dil nga krejt pajisjet</string>
+    <string name="ftue_auth_reset_password">Ricaktoni fjalëkalimin</string>
+    <string name="ftue_auth_new_password_subtitle">Sigurohuni të jetë 8 ose më shumë shenja.</string>
+    <string name="ftue_auth_new_password_title">Zgjidhni një fjalëkalim të ri</string>
+    <string name="ftue_auth_new_password_entry_title">Fjalëkalim i Ri</string>
+    <string name="ftue_auth_reset_password_breaker_title">Kontrolloni email-in tuaj.</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s do t’ju dërgojë një lidhje verifikimi</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">Kod ripohimi</string>
+    <string name="ftue_auth_phone_entry_title">Numër Telefoni</string>
+    <string name="ftue_auth_phone_subtitle">%s lyp verifikimin e llogarisë tuaj</string>
+    <string name="ftue_auth_phone_title">Jepni numrin e telefonit tuaj</string>
+    <string name="ftue_auth_email_entry_title">Email</string>
+    <string name="ftue_auth_email_subtitle">%s lyp verifikimin e llogarisë tuaj</string>
+    <string name="ftue_auth_email_title">Jepni email-in tuaj</string>
+    <string name="ftue_auth_terms_subtitle">Ju lutemi, lexoni kushte dhe rregulla të %s</string>
+    <string name="ftue_auth_terms_title">Rregulla shërbyesi</string>
+    <string name="ftue_auth_choose_server_ems_cta">Lidhuni</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) është një shërbim strehimi i fuqishëm dhe i besueshëm, për komunikim të shpejtë, të sigurt dhe të atypëratyshëm. Shihni më tepër se si, te<a href="${ftue_ems_url}">element.io/ems</a></string>
+    <string name="ftue_auth_choose_server_ems_title">Doni të strehoni shërbyesin tuaj\?</string>
+    <string name="ftue_auth_choose_server_entry_hint">URL Shërbyesi</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Cila është adresa e shërbyesit tuaj\?</string>
+    <string name="ftue_auth_choose_server_subtitle">Cila është adresa e shërbyesit tuaj\? Kjo është si një shtëpi për krejt të dhënat tuaja</string>
+    <string name="ftue_auth_choose_server_title">Përzgjidhni shërbyesin tuaj</string>
+    <string name="ftue_auth_welcome_back_title">Mirë se u kthyet!</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Përpunojeni</string>
+    <string name="ftue_auth_create_account_sso_section_header">Ose</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Ku gjenden bisedat tuaja</string>
+    <string name="ftue_auth_create_account_choose_server_header">Ku do të gjenden bisedat tuaja</string>
+    <string name="ftue_auth_create_account_password_entry_footer">Duhet të jetë 8 ose më shumë shenja</string>
+    <string name="ftue_auth_create_account_username_entry_footer">Të tjerët mund t’ju zbulojnë %s</string>
+    <string name="ftue_auth_create_account_title">Krijoni llogarinë tuaj</string>
+    <string name="attachment_type_voice_broadcast">Transmetim Zanor</string>
+    <string name="a11y_open_spaces">Hap listë hapësirash</string>
+    <string name="a11y_create_message">Krijoni një bisedë ose dhomë të re</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Ricaktoni metodë njoftimesh</string>
+    <string name="push_gateway_item_enabled">Të aktivizuara:</string>
+    <string name="push_gateway_item_profile_tag">Etiketë profili:</string>
+    <string name="push_gateway_item_device_id">ID sesioni:</string>
+    <string name="create_room_action_go">Jepi</string>
+    <string name="updating_your_data">Po përditësohen të dhënat tuaja…</string>
+    <string name="error_check_network">Diç shkoi ters. Ju lutemi, kontrolloni lidhjen tuaj në rrjet dhe riprovoni.</string>
+    <string name="room_list_filter_people">Persona</string>
+    <string name="room_list_filter_favourites">Të parapëlqyera</string>
+    <string name="room_list_filter_unreads">Të palexuara</string>
+    <string name="room_list_filter_all">Krejt</string>
+    <string name="keys_backup_settings_signature_from_this_user">Kopjeruajtja ka një nënshkrim të vlefshëm prej këtij përdoruesi.</string>
+    <string name="command_description_devtools">Hap skenën e mjeteve të zhvilluesit</string>
+    <string name="timeline_error_room_not_found">Na ndjeni, kjo dhomë s’u gjet.
+\nJu lutemi, riprovoni më vonë.%s</string>
+    <string name="font_size_use_system">Përdor parazgjedhje sistemi</string>
+    <string name="font_size_section_manually">Zgjidheni dorazi</string>
+    <string name="font_size_section_auto">Caktoje vetvetiu</string>
+    <string name="font_size_title">Zgjidhni madhësi shkronjash</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Në këtë dhomë ka pajisje të paverifikuara, ato s’do të jenë në gjendje të shfshehtëzojnë mesazhet që dërgoni.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Mos dërgo kurrë prej këtij sesioni mesazhe të fshehtëzuar te sesione të paverifikuar në këtë dhomë.</string>
+    <string name="settings_autoplay_animated_images_title">Figurat e animuara vetëluaji</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_failed">S’u arrit të regjistrohej token pikëmbarimi te shërbyesi Home:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_success">Pikëmbarim i regjistruar me sukses te shërbyesi Home.</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_title">Regjistrim Pikëmbarimi</string>
+    <string name="grant_permission">Akordojini Leje</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} lyp lejen për shfaqje njoftimesh.
+\nJu lutemi, akordoni lejen.</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s dhe %2$d tjetër</item>
+        <item quantity="other">%1$s dhe %2$d të tjerë</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s dhe %2$s</string>
+    <string name="permissions_rationale_msg_notification">${app_name} lyp leje të shfaqë njoftime. Njoftimet mund të shfaqin mesazhet tuaja, ftesa tuajat, etj.
+\n
+\nJu lutemi, lejoni përdorimin e tyre te flluska pasuese, që të jeni në gjendje të shihni njoftime.</string>
+    <string name="auth_reset_password_error_unverified">Email jo i verifikuar, kontrolloni te Të marrët tuaj</string>
+    <string name="call_stop_screen_sharing">Reshtni tregimin e ekranit tuaj</string>
+    <string name="call_start_screen_sharing">Tregojuani ekranin të tjerëve</string>
+    <string name="invites_empty_message">Ky është vendi ku do të gjenden kërkesat dhe ftesat tuaja të reja.</string>
+    <string name="invites_empty_title">S’ka gjë të re.</string>
+    <string name="invites_title">Ftesa</string>
+    <string name="space_list_empty_message">Hapësirat janë një mënyrë e re për të grupuar dhoma dhe njerëz. Që t’ia filloni, krijoni një hapësirë.</string>
+    <string name="space_list_empty_title">Ende pa hapësira.</string>
+    <string name="labs_enable_rich_text_editor_summary">Provoni përpunuesin e teksteve të pasur (për tekst të thjeshtë vjen së shpejti)</string>
+    <string name="labs_enable_rich_text_editor_title">Aktivizo përpunues teksti të pasur</string>
+    <string name="labs_enable_deferred_dm_summary">Krijo MD vetëm për mesazhin e parë</string>
+    <string name="labs_enable_new_app_layout_summary">Një Element i thjeshtuar, me skeda opsionale</string>
+    <string name="labs_enable_new_app_layout_title">Aktivizo skemë të re</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_activity">Veprimtari</string>
+    <string name="home_layout_preferences_sort_by">Renditi sipas</string>
+    <string name="home_layout_preferences_recents">Shfaq të freskëta</string>
+    <string name="home_layout_preferences_filters">Shfaq filtra</string>
+    <string name="home_layout_preferences">Parapëlqime skeme grafike</string>
+    <string name="action_deselect_all">Shpërzgjidhi krejt</string>
+    <string name="action_select_all">Përzgjidhi krejt</string>
+    <string name="action_got_it">E mora</string>
+    <string name="action_next">Më pas</string>
+    <string name="action_reset">Rifillo</string>
+    <string name="time_unit_second_short">sek</string>
+    <string name="time_unit_minute_short">min</string>
+    <string name="time_unit_hour_short">h</string>
+    <string name="initial_sync_request_reason_unignored_users">- Për disa përdorues u hoq shpërfillja</string>
+    <string name="initial_sync_request_title">Kërkesë njëkohësimi fillestar</string>
+    <string name="explore_rooms">Eksploroni Dhoma</string>
+    <string name="change_space">Ndërroni Hapësire</string>
+    <string name="create_room">Krijo Dhomë</string>
+    <string name="start_chat">Filloni Fjalosje</string>
+    <string name="all_chats">Krejt Fjalosjet</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d i përzgjedhura</item>
+        <item quantity="other">%1$d të përzgjedhura</item>
+    </plurals>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Shërbyesi Home nuk mbulon hyrje me kod QR.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">U has një problem sigurie, kur ujdisej shkëmbim i siguruar mesazhesh. Mund të jetë komprometuar një nga sa vijon: shërbyesi juaj Home; lidhja(et) tuaja internet; pajisja(et) tuaja;</string>
+    <string name="qr_code_login_header_failed_timeout_description">Lidhja s’u plotësua në kohën e duhur.</string>
+    <string name="qr_code_login_header_connected_description">Kontrolloni pajisjen ku jeni i futur, duhet të shfaqet kodi më poshtë. Sigurohuni se kodi më poshtë përputhet me atë pajisje:</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Skanoni kodin QR më poshtë me pajisjen tuaj prej nga është dalë nga llogaria.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Përdorni pajisjen tuaj ku jeni brenda llogarisë që të skanoni kodin QR më poshtë:</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Përdorni kamerën në këtë pajisje që të skanoni kodin QR të shfaqur në pajisjen tuaj tjetër:</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Mirato vetvetiu widget-e Thirrjesh Element Call dhe akordo përdorim kamere / mikfrofoni</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Po jepen kyçe dhome për mesazhe të dikurshëm</string>
+    <string name="settings_show_latest_profile_description">Shfaq hollësitë më të reja të profileve (avatar dhe emër në ekran) për krejt mesazhet.</string>
+    <string name="settings_security_incognito_keyboard_summary">Kërko doemos që tastiera të mos përditësojë ndonjë të dhënë të personalizuar, bie fjala, historik shtypjeje në të dhe fjalor bazuar në ç’keni shtypur në biseda. Kini parasysh se disa tastiera mund të mos e respektojnë këtë rregullim.</string>
+    <string name="verify_invalid_qr_notice">Ky kod QR duket i formuar keq. Ju lutemi, provoni ta verifikoni me tjetër metodë.</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Keni aktivizuar fshehtëzim për sesionie të verifikuar vetëm për krejt dhomat, që nga Rregullime Sigurie.</string>
+    <string name="settings_autoplay_animated_images_summary">Luaj figura të animuara te rrjedha kohora sapo zënë të duken</string>
+    <string name="message_reply_to_sender_created_poll">krijoi një pyetësor.</string>
+    <string name="message_reply_to_sender_sent_sticker">dërgoi një ngjitës.</string>
+    <string name="message_reply_to_sender_sent_video">dërgoi një video.</string>
+    <string name="message_reply_to_sender_sent_image">dërgoi një figurë.</string>
+    <string name="message_reply_to_sender_sent_voice_message">dërgoi një mesazh zanor.</string>
+    <string name="message_reply_to_sender_sent_audio_file">dërgoi një kartelë audio.</string>
+    <string name="message_reply_to_sender_sent_file">dërgoi një kartelë.</string>
+    <string name="message_reply_to_prefix">Në përgjigje të</string>
+    <string name="rich_text_editor_full_screen_toggle">Hyni/Dilni nga mënyra “Sa krejt ekrani”</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Sesionet e verifikuar janë kudo ku përdorni këtë llogari pas dhënies së frazëkalimit tuaj, apo ripohimit të identitetit tuaj me një sesion tjetër të verifikuar.
+\n
+\nKjo do të thotë se keni krejt kyçet e nevojshëm për të shkyçur mesazhet tuaj të fshehtëzuar dhe për të ripohuar se e besoni këtë sesion.</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Fshihe adresën IP</string>
+    <string name="device_manager_other_sessions_show_ip_address">Shfaq adresë IP</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Dilni nga %1$d sesion</item>
+        <item quantity="other">Dilni nga %1$d sesione</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Dilni</string>
+    <string name="attachment_type_selector_text_formatting">Formatim teksti</string>
+    <string name="voice_broadcast_recording_time_left">Edhe %1$s</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Jeni duke incizuar tashmë një transmetim zanor. Ju lutemi, që të nisni një të ri, përfundoni transmetimin tuaj aktual zanor.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Dikush tjetër është tashmë duke incizuar një transmetim zanor. Prisni që të përfundojë transmetimi zanor i tij, pa të filloni një të ri.</string>
+    <string name="error_voice_broadcast_permission_denied_message">S’keni lejet e domosdoshme për të nisur një transmetim zanor në këtë dhomë. Lidhuni me një përgjegjës dhome që të përmirësojë lejet tuaja.</string>
+    <string name="error_voice_broadcast_unauthorized_title">S’mund të niset një transmetim i ri zanor</string>
+    <string name="a11y_voice_broadcast_fast_forward">Shtyrje përpara 30 sekonda</string>
+    <string name="a11y_voice_broadcast_fast_backward">Kthim prapa 30 sekonda</string>
+    <string name="replying_to">Si përgjigje për %s</string>
+    <string name="labs_enable_deferred_dm_title">Aktivizo MD të lënë për më vonë</string>
+    <string name="a11y_collapse_space_children">Tkurr pjella të %s</string>
+    <string name="a11y_expand_space_children">Zgjero pjella të %s</string>
+    <string name="review_unverified_sessions_description">Shqyrtojini, për të garantuar se llogaria juaj është e parrezik</string>
+    <string name="review_unverified_sessions_title">Keni sesione të paverifikuar</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Ky sesion nuk mbulon fshehtëzim, ndaj s’mund të verifikohet.
+\n
+\nS’do të jeni në gjendje të merrni pjesë në dhoma ku është i aktivizuar fshehtëzimi, kur përdorni këtë sesion.
+\n
+\nPër sigurinë dhe privatësinë më të mirë, rekomandohet të përdorni klientë Matrix që mbulojnë fshehtëzimin.</string>
+    <string name="device_manager_signout_all_other_sessions">Dilni nga krejt sesionet e tjerë</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Ky sesion nuk mbulon fshehtëzim dhe ndaj s’mund të verifikohet.</string>
+    <string name="voice_broadcast_live_broadcast">Transmetim i drejtpërdrejtë</string>
+    <string name="settings_nightly_build_update">Merrni montimin më të ri (shënim: mund të keni probleme të bëni hyrjen)</string>
+    <string name="settings_nightly_build">Montim i përnatshëm</string>
+    <string name="notice_voice_broadcast_ended_by_you">Përfunduat një transmetim zanor.</string>
+    <string name="notice_voice_broadcast_ended">%1$s përfundoi një transmetim zanor.</string>
+    <string name="stop_voice_broadcast_content">Jeni i sigurt se doni të ndalet transmetimi juaj i drejtpërdrejtë\? Kjo do të përfundojë transmetimin dhe regjistrimi i plotë do të jetë i passhëm te dhoma.</string>
+    <string name="stop_voice_broadcast_dialog_title">Të ndalet transmetimi i drejtpërdrejtë\?</string>
+    <string name="action_stop">Po, Ndale</string>
+    <string name="set_link_edit">Përpunoni lidhje</string>
+    <string name="set_link_create">Krijoni një lidhje</string>
+    <string name="set_link_link">Lidhje</string>
+    <string name="set_link_text">Tekst</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sq/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-sq/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-sq/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-sq/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-sr/strings.xml b/library/ui-strings/src/main/res/values-sr/strings.xml
similarity index 99%
rename from vector/src/main/res/values-sr/strings.xml
rename to library/ui-strings/src/main/res/values-sr/strings.xml
index 69265899af..fcaf45aaa3 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/library/ui-strings/src/main/res/values-sr/strings.xml
@@ -128,8 +128,6 @@
     <string name="notice_room_invite_no_invitee_with_reason">%1$s - позивница. Разлог: %2$s</string>
     <string name="initial_sync_start_importing_account_data">Почетна синхронизација:
 \nувозим податке о налогу</string>
-    <string name="initial_sync_start_importing_account_groups">Почетна синхронизација:
-\nувозим заједнице</string>
     <string name="initial_sync_start_importing_account_left_rooms">Почетна синхронизација:
 \nувозим напуштене собе</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Почетна синхронизација:
@@ -326,8 +324,6 @@
     <string name="send_bug_report_include_screenshot">Шаљи снимак екрана</string>
     <string name="send_bug_report_include_crash_logs">Слање записника грешке</string>
     <string name="send_bug_report_include_logs">Слање записника</string>
-    <string name="groups_header">Заједнице</string>
-
     <string name="no_more_results">Нема више резултата</string>
     <string name="system_alerts_header">Системска упозорења</string>
     <string name="bottom_action_notification">Обавештења</string>
@@ -386,7 +382,6 @@
     <string name="send_bug_report_include_key_share_history">Укључите историју размене кључева</string>
     <string name="audio_video_meeting_description">Састанци користе Jitsi безбедносне и допунске политике. Сви људи тренутно у соби видеће позив да се придруже састанку.</string>
     <string name="auth_reset_password_error_unauthorized">Није успело верификовати имејл адресу: обавезно кликните на линк из примљеног имејла</string>
-    <string name="auth_reset_password_missing_email">Мора се унети имејл адреса коришћена са вашим налогом.</string>
     <string name="auth_recaptcha_message">Овај кућни сервер жели да се увери да нисте робот</string>
     <string name="auth_forgot_password">Заборавили сте лозинку\?</string>
     <string name="auth_msisdn_already_defined">Овај број телефона је већ коришћен.</string>
@@ -505,4 +500,4 @@
 
 
     <string name="permissions_rationale_popup_title">Информација</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-sr/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-sr/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-sr/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-sr/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-sv/strings.xml b/library/ui-strings/src/main/res/values-sv/strings.xml
similarity index 88%
rename from vector/src/main/res/values-sv/strings.xml
rename to library/ui-strings/src/main/res/values-sv/strings.xml
index f797974e87..373165802a 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/library/ui-strings/src/main/res/values-sv/strings.xml
@@ -102,8 +102,6 @@
 \nImporterar inbjudna rum</string>
     <string name="initial_sync_start_importing_account_left_rooms">Inledande synk:
 \nImporterar lämnade rum</string>
-    <string name="initial_sync_start_importing_account_groups">Inledande synk:
-\nImporterar gemenskaper</string>
     <string name="initial_sync_start_importing_account_data">Inledande synk:
 \nImporterar kontodata</string>
     <string name="event_status_sending_message">Skickar meddelande…</string>
@@ -294,7 +292,6 @@
     <string name="matrix_only_filter">Bara Matrix-kontakter</string>
     <string name="no_result_placeholder">Inga resultat</string>
     <string name="rooms_header">Rum</string>
-    <string name="groups_header">Gemenskaper</string>
     <string name="send_bug_report_include_logs">Skicka loggar</string>
     <string name="send_bug_report_include_crash_logs">Skicka kraschloggar</string>
     <string name="send_bug_report_include_screenshot">Skicka skärmdump</string>
@@ -336,7 +333,6 @@
     <string name="auth_email_already_defined">Den här e-postadressen är redan definierad.</string>
     <string name="auth_forgot_password">Glömt lösenordet\?</string>
     <string name="auth_recaptcha_message">Denna hemserver skulle vilja verifiera att du inte är en robot</string>
-    <string name="auth_reset_password_missing_email">Du måste skriva in e-postadressen länkad till ditt konto.</string>
     <string name="auth_reset_password_error_unauthorized">Misslyckades att verifiera e-postadressen: se till att du klickade på länken i e-brevet</string>
     <string name="auth_accept_policies">Vänligen granska och acceptera villkoren för denna hemserver:</string>
     <string name="login_error_invalid_home_server">Vänligen skriv in en giltig URL</string>
@@ -454,7 +450,6 @@
 \nLagra din återställningsnyckel på något säkert ställe, t.ex. en lösenordshanterare (eller ett kassaskåp)</string>
     <string name="keys_backup_setup_step3_text_line2_no_passphrase">Lagra din återställningsnyckel på något säkert ställe, t.ex. en lösenordshanterare (eller ett kassaskåp)</string>
     <string name="change_room_directory_network">Byt nätverk</string>
-    <string name="group_all_communities">Alla gemenskaper</string>
     <string name="settings_general_title">Allmänt</string>
     <string name="settings_preferences">Alternativ</string>
     <string name="room_directory_search_hint">Namn eller ID (#example:matrix.org)</string>
@@ -575,8 +570,8 @@
     <string name="settings_discovery_no_msisdn">Upptäckbarhetsalternativ kommer att synas när du har lagt till ett telefonnummer.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Om du kopplar bort från din identitetsserver så kommer du inte att vara upptäckbar av andra användare och du kommer inte kunna bjuda in folk med hjälp av deras e-postadresser eller telefonnummer.</string>
     <string name="settings_discovery_msisdn_title">Upptäckbara telefonnummer</string>
-    <string name="settings_discovery_confirm_mail">Vi skickade ett bekräftelse-e-brev till %s, kolla din e-post och klicka på bekräftelselänken</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Vi skickade ett bekräftelse-e-brev till %s, vänligen kolla din e-post och klicka på bekräftelselänken</string>
+    <string name="settings_discovery_confirm_mail">Vi skickade ett e-brev till %s, kolla din e-post och klicka på bekräftelselänken</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Vi skickade ett e-brev till %s, vänligen kolla din e-post och klicka på bekräftelselänken</string>
     <string name="settings_discovery_enter_identity_server">Skriv in en identitetsserver-URL</string>
     <string name="settings_discovery_bad_identity_server">Kunde inte ansluta till identitetsserver</string>
     <string name="settings_discovery_please_enter_server">Vänligen ange en identitetsserver-URL</string>
@@ -620,7 +615,7 @@
     <string name="login_reset_password_mail_confirmation_submit">Jag har verifierat min e-postadress</string>
     <string name="login_reset_password_success_notice_2">Du har blivit utloggad ur alla sessioner och kommer inte längre motta pushnotiser. För att återaktivera pushnotiser, logga in igen på varje enhet.</string>
     <string name="login_set_email_title">Sätt e-postadress</string>
-    <string name="login_set_email_notice">Sätt en e-postadress för att kunna återförva ditt konto. Senare kan du valfritt låta personer du känner upptäcka dig med din e-postadress.</string>
+    <string name="login_set_email_notice">Sätt en e-postadress för att kunna återförvärva ditt konto. Senare kan du valfritt låta personer du känner upptäcka dig med den här e-postadressen.</string>
     <string name="login_set_email_mandatory_hint">E-post</string>
     <string name="login_set_email_optional_hint">E-post (valfritt)</string>
     <string name="login_set_msisdn_notice">Sätt ett telefonnummer som valfritt kan användas för att vara upptäckbar av folk som känner dig.</string>
@@ -923,7 +918,7 @@
     <string name="settings_secure_backup_enter_to_setup">Sätt upp på den här enheten</string>
     <string name="reset_secure_backup_title">Generera en ny säkerhetskopia eller sätt en ny lösenfras för din existerande säkerhetskopia.</string>
     <string name="room_settings_labs_warning_message">Detta är experimentella funktioner som kan gå sönder på oväntade sätt. Använd varsamt.</string>
-    <string name="encryption_information_device_id">Sessions-ID</string>
+    <string name="device_manager_session_details_session_id">Sessions-ID</string>
     <string name="encryption_information_device_key">Sessionsnyckel</string>
     <string name="encryption_export_e2e_room_keys">Exportera krypteringsnycklar</string>
     <string name="encryption_export_room_keys">Exportera rumsnycklar</string>
@@ -1317,10 +1312,10 @@
     <string name="keys_backup_unable_to_get_keys_backup_data">Ett fel inträffade vid hämtning av nyckelsäkerhetskopia</string>
     <string name="navigate_to_room_when_already_in_the_room">Du tittar redan på det här rummet!</string>
     <string name="settings_push_gateway_no_pushers">Inga registrerade pushgateways</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_id">App-ID:</string>
+    <string name="push_gateway_item_push_key">Pushnyckel:</string>
+    <string name="push_gateway_item_app_display_name">Appens visningsnamn:</string>
+    <string name="push_gateway_item_device_name">Sessionens visningsnamn:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Registrera token</string>
@@ -2432,7 +2427,6 @@
     <string name="ftue_profile_picture_title">Lägg till en profilbild</string>
     <string name="ftue_display_name_entry_footer">Du kan ändra detta senare</string>
     <string name="ftue_display_name_entry_title">Visningsnamn</string>
-    <string name="ftue_display_name_subtitle">Det här kommer att visas när du skickar meddelanden.</string>
     <string name="ftue_display_name_title">Välj ett visningsnamn</string>
     <string name="ftue_account_created_subtitle">Ditt konto %s har skapats</string>
     <string name="ftue_account_created_congratulations_title">Grattis!</string>
@@ -2482,7 +2476,6 @@
     <string name="a11y_presence_busy">Upptagen</string>
     <string name="keys_backup_settings_signature_from_this_user">Säkerhetskopian har en giltig signatur från den här användaren.</string>
     <string name="live_location_bottom_sheet_last_updated_at">Uppdaterades för %1$s sen</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Sluta dela</string>
     <string name="labs_enable_live_location_summary">Temporär implementation: platser ligger kvar i rumshistoriken</string>
     <string name="labs_enable_live_location">Aktivera platsdelning i realtid</string>
     <string name="location_share_live_remaining_time">%1$s kvar</string>
@@ -2551,7 +2544,7 @@
     <string name="ftue_auth_email_resend_email">Skicka e-brev igen</string>
     <string name="ftue_auth_email_verification_footer">Fick du inget e-brev\?</string>
     <string name="ftue_auth_email_verification_subtitle">För att bekräfta din e-post, tryck på knappen i e-brevet vi just skickade till %s</string>
-    <string name="ftue_auth_email_verification_title">Kolla din e-post för att verifiera.</string>
+    <string name="ftue_auth_email_verification_title">Verifiera din e-post</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Skicka kod igen</string>
     <string name="ftue_auth_phone_confirmation_subtitle">En kod skickades till %s</string>
     <string name="ftue_auth_phone_confirmation_title">Bekräfta ditt telefonnummer</string>
@@ -2588,4 +2581,305 @@
     <string name="font_size_section_manually">Välj manuellt</string>
     <string name="font_size_section_auto">Ställ in automatiskt</string>
     <string name="font_size_title">Välj teckenstorlek</string>
+    <string name="command_description_devtools">Öppna utvecklingsverktygsskärmen</string>
+    <string name="timeline_error_room_not_found">Tyvärr hittades inte det här rummet.
+\nVänligen pröva igen senare.%s</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Du har aktiverat kryptering endast till verifierade sessioner för alla rum i säkerhetsinställningarna.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Det finns overifierade enheter i det här rummet, de kommer inte kunna avkryptera meddelanden du skickar.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Skicka aldrig krypterade meddelanden till overifierade sessioner i det här rummet.</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s och %2$d till</item>
+        <item quantity="other">%1$s och %2$d till</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s och %2$s</string>
+    <string name="auth_reset_password_error_unverified">E-post inte verifierad, kolla din inkorg</string>
+    <string name="invites_empty_message">Det här är var dina nya förfrågningar och inbjudningar kommer att vara.</string>
+    <string name="invites_empty_title">Inget nytt.</string>
+    <string name="invites_title">Inbjudningar</string>
+    <string name="space_list_empty_message">Utrymmen är ett nytt sätt att gruppera rum och personer. Skapa ett utrymme för att komma igång.</string>
+    <string name="space_list_empty_title">Inga utrymmen än.</string>
+    <string name="labs_enable_deferred_dm_summary">Skapa DM först när du skickar första meddelandet</string>
+    <string name="labs_enable_deferred_dm_title">Aktivera avvaktade DM:er</string>
+    <string name="labs_enable_new_app_layout_summary">En förenklad Element med valfria flikar</string>
+    <string name="labs_enable_new_app_layout_title">Aktivera ny layout</string>
+    <string name="home_layout_preferences_sort_name">A - Ö</string>
+    <string name="home_layout_preferences_sort_activity">Aktivitet</string>
+    <string name="home_layout_preferences_sort_by">Sortera efter</string>
+    <string name="home_layout_preferences_recents">Visa nyliga</string>
+    <string name="home_layout_preferences_filters">Visa filter</string>
+    <string name="home_layout_preferences">Gränssnittsinställningar</string>
+    <string name="action_got_it">Förstått</string>
+    <string name="a11y_collapse_space_children">Kollapsa underutrymmen för %s</string>
+    <string name="a11y_expand_space_children">Expandera underutrymmen för %s</string>
+    <string name="explore_rooms">Utforska rum</string>
+    <string name="change_space">Byt utrymme</string>
+    <string name="create_room">Skapa rum</string>
+    <string name="start_chat">Starta chatt</string>
+    <string name="all_chats">Alla chattar</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Den här sessionen är redo för säkra meddelanden.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Din nuvarande session är redo för säkra meddelanden.</string>
+    <string name="device_manager_verification_status_unverified">Overifierad session</string>
+    <string name="device_manager_verification_status_verified">Verifierad session</string>
+    <string name="a11y_device_manager_device_type_unknown">Okänd enhetstyp</string>
+    <string name="a11y_device_manager_device_type_desktop">Skrivbord</string>
+    <string name="a11y_device_manager_device_type_web">Webb</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobil</string>
+    <string name="device_manager_sessions_other_description">För bäst säkerhet, verifiera dina sessioner och logga ut från alla sessioner du inte känner igen eller använder längre.</string>
+    <string name="device_manager_sessions_other_title">Andra sessioner</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Godkänn automatiskt Element Call-widgets och ge kamera-/mikrofonåtkomst</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Aktivera Element Call-behörighetsgenvägar</string>
+    <string name="tooltip_attachment_voice_broadcast">Starta en röstsändning</string>
+    <string name="live_location_description">Realtidsplats</string>
+    <string name="location_share_loading_map_error">Kunde inte ladda kartan.
+\nDen här hemservern kanske inte är konfigurerad för at visa kartor.</string>
+    <string name="a11y_open_settings">Öppna inställningar</string>
+    <string name="key_authenticity_not_guaranteed">Autenticiteten för det krypterade meddelanden kan inte garanteras på den här enheten.</string>
+    <string name="settings_security_incognito_keyboard_summary">Begär att tangentbordet inte ska uppdatera någon personanpassad data som skrivhistorik och ordlista baserat på vad du har skrivit i konversationer. Observera att vissa tangentbord inte respekterar den här inställningen.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognitotangentbord</string>
+    <string name="verify_invalid_qr_notice">Det här QR-koden ser ogiltig ut. Vänligen pröva igen för att verifiera med en annan metod.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Du kommer inte komma åt krypterad meddelandehistorik. Återställ din säkra meddelandesäkerhetskopia och verifieringsnycklar för att börja om.</string>
+    <string name="crosssigning_cannot_verify_this_session">Kunde inte verifiera den här enheten</string>
+    <string name="settings_sessions_list">Sessioner</string>
+    <string name="command_description_table_flip">Lägger till (╯°□°）╯︵ ┻━┻ till början av ett textmeddelande</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Vad är din servers adress\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Där dina konversationer bor</string>
+    <string name="attachment_type_voice_broadcast">Röstsändning</string>
+    <string name="a11y_open_spaces">Öppna utrymmeslista</string>
+    <string name="a11y_create_message">Skapa den ny konversation eller ett nytt rum</string>
+    <string name="updating_your_data">Uppdaterar din data…</string>
+    <string name="room_list_filter_people">Personer</string>
+    <string name="room_list_filter_favourites">Favoriter</string>
+    <string name="room_list_filter_unreads">Olästa</string>
+    <string name="room_list_filter_all">Alla</string>
+    <string name="device_manager_push_notifications_title">Pushnotiser</string>
+    <string name="device_manager_session_details_description">Applikations-, enhets- och aktivitetsinformation.</string>
+    <string name="device_manager_session_details_title">Sessionsdetaljer</string>
+    <string name="device_manager_session_overview_signout">Logga ut ur den här sessionen</string>
+    <string name="device_manager_other_sessions_clear_filter">Rensa filter</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Inga inaktiva sessioner hittade.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Inga overifierade sessioner hittade.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Inga verifierade sessioner hittade.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Överväg att logga ut ur gamla sessioner (%1$d dag eller längre) du inte använder längre.</item>
+        <item quantity="other">Överväg att logga ut ur gamla sessioner (%1$d dagar eller längre) du inte använder längre.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inaktiv</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifiera dina sessioner för förbättrad säker meddelandehantering eller logga ut ur de du inte känner igen eller använder längre.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Overifierad</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">För bäst säkerhet, logga ut från sessioner du inte känner igen eller använder längre.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Verifierad</string>
+    <string name="a11y_device_manager_filter">Filter</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Överväg att logga ut ur gamla sessioner (%1$d dag eller längre) som du inte använder längre.</item>
+        <item quantity="other">Överväg att logga ut ur gamla sessioner (%1$d dagar eller längre) som du inte använder längre.</item>
+    </plurals>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Inaktiv %1$d dag eller längre</item>
+        <item quantity="other">Inaktiv %1$d dagar eller längre</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inaktiv</string>
+    <string name="device_manager_filter_option_unverified_description">Inte redo för säkra meddelanden</string>
+    <string name="device_manager_filter_option_unverified">Overifierad</string>
+    <string name="device_manager_filter_option_verified_description">Redo för säkra meddelanden</string>
+    <string name="device_manager_filter_option_verified">Verifierade</string>
+    <string name="device_manager_filter_option_all_sessions">Alla sessioner</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filter</string>
+    <string name="device_manager_session_last_activity">Senast aktiv %1$s</string>
+    <string name="device_manager_device_title">Enhet</string>
+    <string name="device_manager_session_title">Session</string>
+    <string name="device_manager_current_session_title">Nuvarande session</string>
+    <string name="device_manager_inactive_sessions_title">Inaktiva sessioner</string>
+    <string name="device_manager_unverified_sessions_description">Verifiera eller logga ut ur overifierade sessioner.</string>
+    <string name="device_manager_unverified_sessions_title">Overifierade sessioner</string>
+    <string name="device_manager_header_section_security_recommendations_description">Förbättra din kontosäkerhet genom att följa dessa rekommendationer.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Säkerhetsrekommendationer</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inaktiv %1$d+ dag (%2$s)</item>
+        <item quantity="other">Inaktiv %1$d+ dagar (%2$s)</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Overifierad · Din nuvarande session</string>
+    <string name="device_manager_other_sessions_description_unverified">Overifierad · Senast aktiv %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Verifierad · Senast aktiv %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Visa alla (%1$d)</string>
+    <string name="device_manager_view_details">Visa detaljer</string>
+    <string name="device_manager_verify_session">Verifiera session</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifiera din nuvarande session för att visa den här sessionens verifieringsstatus.</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verifiera eller logga ut från den här sessionen för bäst säkerhet och pålitlighet.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifiera din nuvarande session för förbättrad säker meddelandehantering.</string>
+    <string name="device_manager_verification_status_unknown">Okänd verifieringsstatus</string>
+    <string name="push_gateway_item_enabled">Aktiverad:</string>
+    <string name="push_gateway_item_device_id">Sessions-ID:</string>
+    <string name="error_check_network">Nåt gick fel. Kolla din nätverksanslutning och pröva igen.</string>
+    <string name="grant_permission">Ge åtkomst</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} behöver behörighet att visa aviseringar.
+\nVänligen ge åtkomst.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} behöver behörighet att visa aviseringar. Aviseringar kan visa dina meddelanden, dina inbjudningar, o.s.v.
+\n
+\nVänligen ge åtkomst på nästa pop-uper för att kunna se aviseringar.</string>
+    <string name="labs_enable_rich_text_editor_title">Aktivera rik-text-redigerare</string>
+    <string name="labs_enable_rich_text_editor_summary">Testa den nya rik-text-redigeraren</string>
+    <string name="onboarding_new_app_layout_welcome_title">Välkommen till en ny vy!</string>
+    <string name="home_empty_no_unreads_message">Det här är vart dina olästa meddelanden hamnar, när du har några.</string>
+    <string name="home_empty_no_unreads_title">Inget att rapportera.</string>
+    <string name="home_empty_no_rooms_message">Den säkra allt-i-ett-chattappen för teams, vänner och organisationer. Skapa en chatt eller gå med i ett existerande rum för att komma igång.</string>
+    <string name="home_empty_no_rooms_title">Välkommen till ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Utrymmen är ett nytt sätt att gruppera rum och personer. Lägg till ett existerande rum, eller skapa ett nytt, med knappen nere till höger.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nser lite tom ut.</string>
+    <string name="labs_enable_voice_broadcast_summary">Möjliggör att spela in och skicka röstsändning i rummets tidslinje.</string>
+    <string name="labs_enable_voice_broadcast_title">Aktivera röstsändning</string>
+    <string name="labs_enable_client_info_recording_summary">Spara klientnamnet, versionen, och URL:en för att enklare känna igen sessioner i sessionehanteraren.</string>
+    <string name="labs_enable_client_info_recording_title">Aktivera klientinforapportering</string>
+    <string name="labs_enable_session_manager_summary">Ha bättre insyn i och kontroll över alla dina sessioner.</string>
+    <string name="labs_enable_session_manager_title">Aktivera den nya sessionshanteraren</string>
+    <string name="device_manager_learn_more_session_rename">Andra användare i direktmeddelanden och rum du går med in kan se en full lista över dina sessioner.
+\n
+\nDet försäkrar dem om att de verkligen pratar med dig, men det betyder också att de kan se sessionsnamnet du anger här.</string>
+    <string name="device_manager_learn_more_session_rename_title">Döper om sessioner</string>
+    <string name="device_manager_learn_more_sessions_verified">Verifierade sessioner har loggat in med dina uppgifter och har sedan verifierats, antingen med din säkra lösenfras eller genom att kors-verifiera.
+\n
+\nDet betyder att det har krypteringsnycklar för dina tidigare meddelanden, bekräftar för andra användare du kommunicerar med att dessa sessioner verkligen är du.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Verifierade sessioner</string>
+    <string name="device_manager_learn_more_sessions_unverified">Overifierade sessioner är sessioner som har loggat in med dina uppgifter men som inte har kors-verifierats.
+\n
+\nDu bör speciellt försäkra dig om att du känner igen dessa sessioner eftersom att de kan utgöra otillåten användning av ditt konto.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Overifierade sessioner</string>
+    <string name="device_manager_learn_more_sessions_inactive">Inaktiva sessioner är sessioner du inte har använt på länge, men de tar fortfarande emot krypteringsnycklar.
+\n
+\nBorttagning av inaktiva sessioner förbättrar säkerhet och prestanda, och gör det lättare för dig att se om en ny session ser misstänkt ut.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Inaktiva sessioner</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Du kan använda den här enheten för att logga in på en mobil- eller webbenhet med en QR-kod. Det finns två sätt att göra detta:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Logga in med QR-kod</string>
+    <string name="device_manager_session_rename_warning">Observera att sessionsnamnen också kan ses av folk du kommunicerar med.</string>
+    <string name="device_manager_session_rename_description">Anpassade namn kan hjälpa dig att känna igen dina enheter lättare.</string>
+    <string name="device_manager_session_rename_edit_hint">Sessionsnamn</string>
+    <string name="device_manager_session_rename">Döp om session</string>
+    <string name="device_manager_session_details_device_ip_address">IP-adress</string>
+    <string name="device_manager_session_details_device_operating_system">Operativsystem</string>
+    <string name="device_manager_session_details_device_model">Modell</string>
+    <string name="device_manager_session_details_device_browser">Webbläsare</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Version</string>
+    <string name="device_manager_session_details_application_name">Namn</string>
+    <string name="device_manager_session_details_application">Applikation</string>
+    <string name="device_manager_session_details_session_last_activity">Senaste aktiviteten</string>
+    <string name="device_manager_session_details_session_name">Sessionsnamn</string>
+    <string name="device_manager_push_notifications_description">Ta emot pushnotiser i den här sessionen.</string>
+    <string name="login_scan_qr_code">Skanna QR-kod</string>
+    <string name="rich_text_editor_format_underline">Använd understrykning</string>
+    <string name="rich_text_editor_format_strikethrough">Använd överstrykning</string>
+    <string name="rich_text_editor_format_italic">Använd kursiv stil</string>
+    <string name="rich_text_editor_format_bold">Använd fetstil</string>
+    <string name="qr_code_login_confirm_security_code_description">Se till att du känner till ursprunget till denna kod. Genom att länka enheter ger du någon full åtkomst till ditt konto.</string>
+    <string name="qr_code_login_confirm_security_code">Bekräfta</string>
+    <string name="qr_code_login_try_again">Pröva igen</string>
+    <string name="qr_code_login_status_no_match">Ingen match\?</string>
+    <string name="qr_code_login_signing_in">Loggar in dig</string>
+    <string name="qr_code_login_connecting_to_device">Ansluter till enhet</string>
+    <string name="qr_code_login_scan_qr_code_button">Skanna QR-kod</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Loggar du in en mobil\?</string>
+    <string name="qr_code_login_show_qr_code_button">Visa QR-kod på den här enheten</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Välj \'Skanna QR-kod\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Börja på inloggningsskärmen</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Välj \'Logga in med QR-kod\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Börja på inloggningsskärmen</string>
+    <string name="qr_code_login_new_device_instruction_3">Välj \'Visa QR-kod\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Gå till Inställningar -&gt; Säkerhet och sekretess</string>
+    <string name="qr_code_login_new_device_instruction_1">Öppna appen på din andra enhet</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Hemservern stöder inte inloggning med QR-kod.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Inloggningen avbröts på den andra enheten.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Den QR-koden är ogiltig.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Den andra enheten måste vara inloggad.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Den andra enheten är redan inloggad.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Ett säkerhetsproblem påträffades vid konfigurering av säker meddelandehantering. En av följande kan vara äventyrad: Din hemserver; Din internetuppkoppling Din enhet;</string>
+    <string name="qr_code_login_header_failed_other_description">Begäran misslyckades.</string>
+    <string name="qr_code_login_header_failed_denied_description">Begäran nekades på den andra enheten.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Länkningen slutfördes inte inom den krävda tiden.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Länkning med den här enheten stöds inte.</string>
+    <string name="qr_code_login_header_failed_title">Misslyckad anslutning</string>
+    <string name="qr_code_login_header_connected_description">Kolla din inloggade enhet, koden nedan borde visas. Bekräfta att koden nedan matchar den enheten:</string>
+    <string name="qr_code_login_header_connected_title">Säker anslutning etablerad</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Skanna QR-koden nedan med din utloggade enhet.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Använd din inloggade enhet för att skanna QR-koden nedan:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Logga in med QR-kod</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Använd den här enhetens kamera för att skanna QR-koden på din andra enhet:</string>
+    <string name="a11y_voice_broadcast_buffering">Buffrar…</string>
+    <string name="a11y_pause_voice_broadcast">Pausa röstsändning</string>
+    <string name="a11y_play_voice_broadcast">Spela eller återuppta röstsändning</string>
+    <string name="a11y_stop_voice_broadcast_record">Avsluta inspelning av röstsändning</string>
+    <string name="a11y_pause_voice_broadcast_record">Pausa inspelning av röstsändning</string>
+    <string name="a11y_resume_voice_broadcast_record">Återuppta inspelning av röstsändning</string>
+    <string name="voice_broadcast_live">Live</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Skanna QR-kod</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="onboarding_new_app_layout_button_try">Pröva</string>
+    <string name="onboarding_new_app_layout_feedback_message">Tryck uppe till höger för att se alternativet att ge återkoppling.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Ge återkoppling</string>
+    <string name="onboarding_new_app_layout_spaces_message">Kom åt dina utrymmen (nere till höger) snabbare och enklare än någonsin förut.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Kom åt utrymmen</string>
+    <string name="onboarding_new_app_layout_welcome_message">För att förenkla din ${app_name} så är flikar nu valfria. Hantera dem i menyn uppe till höger.</string>
+    <string name="device_manager_other_sessions_select">Välj sessioner</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Plats</string>
+    <string name="attachment_type_selector_poll">Omröstningar</string>
+    <string name="attachment_type_selector_voice_broadcast">Röstsändning</string>
+    <string name="attachment_type_selector_file">Bilagor</string>
+    <string name="attachment_type_selector_sticker">Dekaler</string>
+    <string name="attachment_type_selector_gallery">Fotobibliotek</string>
+    <string name="action_deselect_all">Avmarkera alla</string>
+    <string name="action_select_all">Välj alla</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d vald</item>
+        <item quantity="other">%1$d valda</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">Växla fullskärmsläge</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Verifierade sessioner är alla ställen där du använder det här kontot efter att ha angett din lösenfras eller bekräftat din identitet med en annan verifierad session.
+\n
+\nDetta betyder att du har alla nycklar som krävs för att låsa upp dina krypterade meddelanden att bekräfta för andra användare att du litar på den här sessionen.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Logga ut ur %1$d session</item>
+        <item quantity="other">Logga ut ur %1$d sessioner</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Logga ut</string>
+    <string name="attachment_type_selector_text_formatting">Textformatering</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Du spelar redan in en röstsändning. Avsluta din nuvarande röstsändning för att starta en ny.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Någon annan spelar redan in en röstsändning. Vänta på att deras röstsändning avslutas för att starta en ny.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Du är inte behörig att starta en ny röstsändning i det här rummet. Kontakta en rumsadministratör för att uppgradera dina behörigheter.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Kan inte starta en ny röstsändning</string>
+    <string name="a11y_voice_broadcast_fast_forward">Spola framåt 30 sekunder</string>
+    <string name="a11y_voice_broadcast_fast_backward">Spola tillbaka 30 sekunder</string>
+    <string name="message_reply_to_sender_created_poll">skickade en omröstning.</string>
+    <string name="message_reply_to_sender_sent_sticker">skickade en dekal.</string>
+    <string name="message_reply_to_sender_sent_video">skickade en video.</string>
+    <string name="message_reply_to_sender_sent_image">skickade en bild.</string>
+    <string name="message_reply_to_sender_sent_voice_message">skickade ett röstmeddelande.</string>
+    <string name="message_reply_to_sender_sent_audio_file">skickade en ljudfil.</string>
+    <string name="message_reply_to_sender_sent_file">skickade en fil.</string>
+    <string name="message_reply_to_prefix">Svar på</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Dölj IP-adress</string>
+    <string name="device_manager_other_sessions_show_ip_address">Visa IP-adress</string>
+    <string name="voice_broadcast_recording_time_left">%1$s kvar</string>
+    <string name="quoting">Citerar</string>
+    <string name="replying_to">Besvarar %s</string>
+    <string name="editing">Redigerar</string>
+    <string name="review_unverified_sessions_description">Granska för att försäkra att ditt konto är säkert</string>
+    <string name="review_unverified_sessions_title">Du har overifierade sessioner</string>
+    <string name="settings_enable_direct_share_summary">Visa nyliga chattar i systemets delningsmeny</string>
+    <string name="settings_enable_direct_share_title">Aktivera direktdelning</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Den här sessioner stöder inte kryptering, så den kan inte verifieras.
+\n
+\nDu kommer inte kunna delta i rum där kryptering är aktiverat när du använder den här sessionen.
+\n
+\nFör bäst säkerhet och sekretess så rekommenderas det att använda Matrix-klienter som stöder kryptering.</string>
+    <string name="device_manager_signout_all_other_sessions">Logga ut alla andra sessioner</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Den här sessioner stöder inte kryptering och kan därför inte verifieras.</string>
+    <string name="settings_nightly_build_update">Hämta det senaste bygget (obs: du kan ha problem med att logga in)</string>
+    <string name="settings_nightly_build">Nightly-bygge</string>
+    <string name="voice_broadcast_live_broadcast">Direktsändning</string>
+    <string name="notice_voice_broadcast_ended_by_you">Du avslutade en röstsändning.</string>
+    <string name="notice_voice_broadcast_ended">%1$s avslutade en röstsändning.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sv/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-sv/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-sv/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-sv/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-szl/strings.xml b/library/ui-strings/src/main/res/values-szl/strings.xml
similarity index 100%
rename from vector/src/main/res/values-szl/strings.xml
rename to library/ui-strings/src/main/res/values-szl/strings.xml
diff --git a/vector/src/main/res/values-szl/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-szl/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-szl/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-szl/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-ta/strings.xml b/library/ui-strings/src/main/res/values-ta/strings.xml
similarity index 100%
rename from vector/src/main/res/values-ta/strings.xml
rename to library/ui-strings/src/main/res/values-ta/strings.xml
diff --git a/vector/src/main/res/values-te/strings.xml b/library/ui-strings/src/main/res/values-te/strings.xml
similarity index 98%
rename from vector/src/main/res/values-te/strings.xml
rename to library/ui-strings/src/main/res/values-te/strings.xml
index b53d568b2b..0154d54c2e 100644
--- a/vector/src/main/res/values-te/strings.xml
+++ b/library/ui-strings/src/main/res/values-te/strings.xml
@@ -125,7 +125,6 @@
     <string name="auth_invalid_email">ఇది చెల్లుబాటు అయ్యే ఇమెయిల్ చిరునామా లాగా లేదు</string>
     <string name="auth_email_already_defined">ఈ ఇమెయిల్ చిరునామా ఇప్పటికే నిర్వచించబడింది.</string>
     <string name="auth_recaptcha_message">ఈ హోమ్ సర్వర్ మీరు రోబోట్ కాదని నిర్ధారించుకోవాలనుకుంటుంది</string>
-    <string name="auth_reset_password_missing_email">మీ ఖాతాకు లంకె చేయబడిన ఇమెయిల్ చిరునామా తప్పక ఇవ్వాలి.</string>
     <string name="auth_reset_password_error_unauthorized">ఇమెయిల్ చిరునామాను ధృవీకరించడంలో విఫలమైంది: మీరు ఇమెయిల్ లో లంకెను క్లిక్ చేసారా లేదా అని నిర్ధారించుకోండి</string>
     <string name="login_error_invalid_home_server">చెల్లుబాటు అయ్యే URL ను ఇవ్వండి</string>
     <string name="login_error_bad_json">తప్పు JSON</string>
@@ -261,7 +260,7 @@
     <string name="room_settings_set_main_address">ప్రధాన చిరునామాగా సెట్ చేయండి</string>
 
     <string name="encryption_information_device_name">పరికరం పేరు</string>
-    <string name="encryption_information_device_id">పరికరం ID</string>
+    <string name="device_manager_session_details_session_id">పరికరం ID</string>
     <string name="encryption_information_device_key">పరికరం కీ</string>
 
     <string name="encryption_export_e2e_room_keys">E2E గది కీలను ఎగుమతి చేయండి</string>
diff --git a/vector/src/main/res/values-te/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-te/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-te/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-te/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-th/strings.xml b/library/ui-strings/src/main/res/values-th/strings.xml
similarity index 99%
rename from vector/src/main/res/values-th/strings.xml
rename to library/ui-strings/src/main/res/values-th/strings.xml
index b1e69355b1..d189471cea 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/library/ui-strings/src/main/res/values-th/strings.xml
@@ -27,8 +27,6 @@
     <string name="invitations_header">คำเชิญ</string>
     <string name="system_alerts_header">การแจ้งเตือนจากระบบ</string>
     <string name="no_result_placeholder">ไม่มีผลลัพธ์</string>
-
-    <string name="groups_header">ชุมชน</string>
     <string name="send_bug_report_description_in_english">ถ้าเป็นไปได้ โปรดเขียนคำอธิบายเป็นภาษาอังกฤษ</string>
     <string name="send_bug_report_placeholder">อธิบายปัญหาของคุณที่นี่</string>
     <string name="join_room">เข้าร่วมห้อง</string>
@@ -190,4 +188,4 @@
     <string name="dialog_edit_hint">ค่าใหม่</string>
     <string name="action_switch">สลับ</string>
     <string name="settings_category_room_directory">ไดเรกทอรีห้อง</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-th/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-th/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-th/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-th/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-tlh/strings.xml b/library/ui-strings/src/main/res/values-tlh/strings.xml
similarity index 98%
rename from vector/src/main/res/values-tlh/strings.xml
rename to library/ui-strings/src/main/res/values-tlh/strings.xml
index 793c4c32e7..9e9f7ed4e8 100644
--- a/vector/src/main/res/values-tlh/strings.xml
+++ b/library/ui-strings/src/main/res/values-tlh/strings.xml
@@ -52,10 +52,6 @@
     <string name="no_result_placeholder">gher\'ID tu\'lu\'be\'</string>
 
     <string name="rooms_header">pa\'mey</string>
-
-
-    <string name="groups_header">tuqmey</string>
-
     <string name="send_bug_report_include_logs">QonoS ngeH</string>
     <string name="send_bug_report_include_crash_logs">vonlu\' QonoS ngeH</string>
     <string name="send_bug_report_include_screenshot">jIH mIllogh ngeH</string>
diff --git a/vector/src/main/res/values-tlh/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-tlh/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-tlh/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-tlh/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-tr/strings.xml b/library/ui-strings/src/main/res/values-tr/strings.xml
similarity index 99%
rename from vector/src/main/res/values-tr/strings.xml
rename to library/ui-strings/src/main/res/values-tr/strings.xml
index b3c2895b9a..1f0e5be153 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/library/ui-strings/src/main/res/values-tr/strings.xml
@@ -26,7 +26,6 @@
     <string name="action_delete">Sil</string>
     <string name="action_rename">Yeniden Adlandır</string>
     <string name="report_content">Rapor İçeriği</string>
-
     <string name="or">veya</string>
     <string name="action_invite">Davet et</string>
     <string name="action_sign_out">Oturumu kapat</string>
@@ -49,8 +48,6 @@
     <string name="matrix_only_filter">Sadece Matrix kullanıcıları</string>
     <string name="no_result_placeholder">Sonuç bulunamadı</string>
     <string name="rooms_header">Odalar</string>
-
-    <string name="groups_header">Topluluk</string>
     <string name="send_bug_report_include_logs">Sistem günlüğünü (log) gönder</string>
     <string name="send_bug_report_include_crash_logs">Çökme günlüğünü (crash log) gönder</string>
     <string name="send_bug_report_include_screenshot">Ekran görüntüsünü gönder</string>
@@ -106,7 +103,6 @@
     <string name="keys_backup_banner_update_line1">Yeni şifreli mesaj anahtarları</string>
     <string name="keys_backup_banner_update_line2">Anahtar Yedekleme\'yi Yönet</string>
     <string name="keys_backup_banner_recover_line1">Şifrelenmiş mesajları asla kaybetmeyin</string>
-
     <string name="keys_backup_settings_deleting_backup">Yedek siliniyor…</string>
     <string name="keys_backup_settings_delete_confirm_title">Yedeği Sil</string>
     <string name="keys_backup_settings_delete_confirm_message">Yedeklenmiş şifreleme anahtarlarınız sunucudan silinsin mi? Bundan sonra şifrelenmiş mesaj geçmişini okumak için kurtarma anahtarınızı kullanamayacaksınız.</string>
@@ -117,11 +113,8 @@
     <string name="auth_invalid_email">Bu, geçerli bir e-posta adresi gibi gözükmüyor</string>
     <string name="auth_email_already_defined">Bu e-posta adresi zaten tanımlanmış.</string>
     <string name="auth_forgot_password">Şifreni mi unuttun\?</string>
-
     <string name="auth_recaptcha_message">Bu ana sunucu bir robot olmadığından emin olmak istiyor</string>
-    <string name="auth_reset_password_missing_email">Hesaba bağlı e-posta adresi mutlaka girilmeli.</string>
     <string name="auth_reset_password_error_unauthorized">E-posta doğrulaması başarısız: e-postanızdaki bağlantıya tıkladığınızdan emin olun</string>
-
     <string name="auth_accept_policies">Lütfen ana sunucunun ilkelerini gözden geçirin ve kabul edin:</string>
     <string name="login_error_invalid_home_server">Lütfen geçerli bir URL girin</string>
     <string name="login_error_bad_json">Hatalı JSON</string>
@@ -150,14 +143,10 @@
     <string name="video_call_in_progress">Görüntülü Çağrıda…</string>
     <string name="call_error_user_not_responding">Uzak sunucu alınamadı.</string>
     <string name="permissions_rationale_popup_title">Bilgilendirme</string>
-
-
     <string name="permissions_rationale_msg_record_audio">${app_name}\'in sesli arama yapması için mikrofonunuza erişmeye ihtiyacı var.</string>
-
     <string name="permissions_rationale_msg_camera_and_audio">${app_name}\'in görüntülü arama yapması için kameranıza ve mikrofonunuza erişmeye ihtiyacı var.
 \n
 \nLütfen çıkacak ekranda kamera ve mikrofon erişimine izin verin.</string>
-
     <string name="yes">EVET</string>
     <string name="no">HAYIR</string>
     <string name="_continue">Devam et</string>
@@ -165,16 +154,10 @@
     <string name="action_join">Katıl</string>
     <string name="action_reject">Reddet</string>
     <string name="list_members">Üyeleri Listele</string>
-
-
     <plurals name="room_title_members">
         <item quantity="one">%d üye</item>
         <item quantity="other">%d adet üye</item>
     </plurals>
-
-
-
-
     <string name="room_participants_leave_prompt_title">Odadan ayrıl</string>
     <string name="room_participants_leave_prompt_msg">Odadan ayrılmak istediğine emin misin\?</string>
     <string name="room_participants_header_direct_chats">DİREKT SOHBETLER</string>
@@ -211,12 +194,9 @@
         <item quantity="one">%d adet seçili</item>
         <item quantity="other">%d adet seçili</item>
     </plurals>
-
     <string name="search_hint">Bul</string>
     <string name="search_members_hint">Oda üyelerini filtrele</string>
     <string name="search_no_results">Sonuç bulunamadı</string>
-
-
     <string name="room_settings_all_messages">Tüm mesajlar</string>
     <string name="room_settings_add_homescreen_shortcut">Ana ekrana ekle</string>
     <string name="settings_profile_picture">Profil Resmi</string>
@@ -347,7 +327,6 @@
     <string name="settings_preview_media_before_sending">Medyayı göndermeden önce önizleme göster</string>
     <string name="settings_deactivate_account_section">Hesabı devre dışı bırak</string>
     <string name="settings_deactivate_my_account">Hesabımı devre dışı bırak</string>
-
     <string name="settings_analytics">Analitik</string>
     <string name="settings_opt_in_of_analytics">Analitik verilerini gönder</string>
     <string name="settings_opt_in_of_analytics_summary">${app_name} uygulamayı geliştirmemiz için anonim analitik veriler toplar.</string>
@@ -356,7 +335,6 @@
     <string name="devices_details_device_name">Görünür Adı Güncelle</string>
     <string name="devices_details_last_seen_title">Son görülme</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
-
     <string name="devices_delete_dialog_title">Yetkilendirme</string>
     <string name="settings_logged_in">Olarak giriş yaptın</string>
     <string name="settings_home_server">Ana Sunucu</string>
@@ -395,18 +373,16 @@
     <string name="room_settings_labs_warning_message">Bu deneysel özellikler beklenmeyen şekilde hata verebilir. Dikkatli kullanın.</string>
     <string name="room_settings_set_main_address">Ana adres olarak ayarla</string>
     <string name="room_settings_unset_main_address">Ana adres olarak ayarlanmadı</string>
-
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Çözme hatası</string>
     <string name="encryption_information_device_name">Görünür Ad</string>
-    <string name="encryption_information_device_id">Oturum kimliği</string>
+    <string name="device_manager_session_details_session_id">Oturum kimliği</string>
     <string name="encryption_information_device_key">Oturum anahtarı</string>
     <string name="encryption_export_e2e_room_keys">E2E Oda anahtarlarını dışa aktar</string>
     <string name="encryption_export_room_keys">Oda anahtarlarını dışa aktar</string>
     <string name="encryption_export_room_keys_summary">Anahtarları yerel dosyaya aktar</string>
     <string name="encryption_export_export">Dışa aktar</string>
     <string name="encryption_export_notice">Lütfen dışa aktarılmış anahtarları şifrelemek için parola oluşturun. Tekrar içe aktarmak için aynı parolayı girmeniz gerekli.</string>
-
     <string name="encryption_message_recovery">Şifrelenmiş Mesajları Kurtarma</string>
     <string name="encryption_settings_manage_message_recovery_summary">Anahtar yedeklemesini yönet</string>
     <string name="encryption_import_e2e_room_keys">E2E oda anahtarlarını içe aktar</string>
@@ -420,7 +396,6 @@
     <string name="encryption_information_verify">Doğrula</string>
     <string name="encryption_information_verify_device_warning">Bu oturumun güvenilir olduğunu doğrulamak için, lütfen sahibi ile iletişime geçin (örn. yüz yüze ya da telefonla arama) ve onlara Kullanıcı Ayarları altında hangi anahtarın aşağıdaki anahtar ile uyuştuğunu sorun:</string>
     <string name="encryption_information_verify_device_warning2">Eğer uyuşursa aşağıdaki doğrulama tuşuna basın. Eğer uyuşmaz ise biri bu oturum engelliyor demektir bu durumda sen o kişi karalisteye eklemelisin. Gelecekte doğrulama işlemi daha gelişmiş olacak.</string>
-
     <string name="select_room_directory">Bir oda dizini seç</string>
     <string name="directory_server_placeholder">Ana sunucu URL</string>
     <string name="directory_server_all_rooms_on_server">%s sunucusundaki tüm odalar</string>
@@ -429,7 +404,6 @@
         <item quantity="one">%d okunmamış bildirim mesajı</item>
         <item quantity="other">%d okunmamış bildirim mesajları</item>
     </plurals>
-
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d oda</item>
         <item quantity="other">%d odalar</item>
@@ -489,8 +463,6 @@
     <string name="group_details_home">Anasayfa</string>
     <string name="rooms">Odalar</string>
     <string name="invited">Davet edildi</string>
-
-
     <string name="has_been_removed">%1$s dan/den %2$s tarafından atıldın</string>
     <string name="has_been_banned">%1$s dan/den %2$s tarafından engellendin</string>
     <string name="reason_colon">Nedeni: %1$s</string>
@@ -556,7 +528,6 @@
     <string name="keys_backup_setup_step3_copy_button_title">Kurtarma Anahtarını Kaydet</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Paylaş</string>
     <string name="keys_backup_setup_step3_save_button_title">Dosya olarak farklı kaydet</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">Lütfen bir kopya oluşturun</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Kurtarma anahtarını bununla paylaş…</string>
     <string name="keys_backup_setup_step3_generating_key_status">Parola kullanılarak Kurtarma anahtarı oluşturuluyor bu işlem birkaç saniye sürecek.</string>
@@ -616,14 +587,12 @@
     <string name="auth_login_sso">Tek oturum açma ile giriş yap</string>
     <string name="settings_send_message_with_enter">Enter ile mesaj gönder</string>
     <string name="settings_send_message_with_enter_summary">Klavyedeki Enter tuşuna bastığında alt satıra geçmek yerine mesajı gönder</string>
-
     <string name="settings_background_fdroid_sync_mode_battery_description">${app_name}, cihazın sınırlı kaynaklarını (pil) koruyacak şekilde arka planda senkronize olur.
 \nCihazınızın kaynak durumuna bağlı olarak, senkronizasyon işletim sistemi tarafından ertelenebilir.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Gerçek zamanlı için optimize</string>
     <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} periyodik olarak belirli bir zamanda (ayarlanabilir) arka planda senkronize olur.
 \nBu pil ve radyo kullanımını etkileyecek ve ${app_name}\'in olayları dinlediğini belirten kalıcı bir bildirim gösterecektir.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Arka plan senkronizasyonu yok</string>
-
     <string name="settings_integrations">Entegrasyonlar</string>
     <string name="settings_integrations_summary">Botları, köprüleri, widget\'ları ve çıkartma paketlerini yönetmek için bir entegrasyon yöneticisi kullanın.
 \n Entegrasyon yöneticileri, yapılandırma verilerini alır ve widget\'ları değiştirebilir, oda davetleri gönderebilir ve sizin adınıza güç seviyeleri ayarlayabilir.</string>
@@ -693,11 +662,8 @@
     <string name="keys_backup_setup_override_replace">Değiştir</string>
     <string name="keys_backup_setup_override_stop">Dur</string>
     <string name="keys_backup_settings_checking_backup_state">Yedek durumu kontrol ediliyor</string>
-
     <string name="sas_verified">Doğrulandı!</string>
     <string name="sas_got_it">Anlaşıldı</string>
-
-
     <string name="sas_incoming_request_notif_title">Doğrulama Talebi</string>
     <string name="sas_incoming_request_notif_content">%s oturumunu doğrulamak istiyor</string>
     <string name="sas_error_unknown">Bilinmeyen Hata</string>
@@ -727,7 +693,6 @@
     <string name="action_change">Değiştir</string>
     <string name="change_room_directory_network">Ağı değiştir</string>
     <string name="please_wait">Lütfen bekleyin…</string>
-    <string name="group_all_communities">Tüm Topluluklar</string>
     <string name="room_preview_no_preview">Bu oda ön izlenemez</string>
     <string name="fab_menu_create_room">Odalar</string>
     <string name="fab_menu_create_chat">Doğrudan Mesajlar</string>
@@ -1055,7 +1020,6 @@
     <string name="send_attachment">Ek gönder</string>
     <string name="settings_text_message_sent_wrong_code">Onay kodu doğru değil.</string>
     <string name="settings_text_message_sent_hint">Kod</string>
-
     <string name="settings_discovery_disconnect_identity_server_info">Kimlik sunucunuzdan ayrılmanız, diğer kullanıcılar tarafından keşfedilemeyeceğiniz ve başkalarını e-posta ya da telefonla davet edemeyeceğiniz anlamına gelir.</string>
     <string name="settings_discovery_identity_server_info_none">Henüz bir kimlik sunucusu kullanmıyorsunuz. Tanıdığınız mevcut kişileri bulmak ve bu kişiler tarafından görünür olmak için aşağıdakilerden birini yapılandırın.</string>
     <string name="change_identity_server">Kimlik sunucusunu değiştir</string>
@@ -1394,8 +1358,6 @@
     <string name="event_status_sent_message">Mesajı gönderildi</string>
     <string name="initial_sync_start_importing_account_data">İlk senkronizasyon:
 \nHesap verilerini içe aktarma</string>
-    <string name="initial_sync_start_importing_account_groups">İlk senkronizasyon:
-\nToplulukları içe aktarma</string>
     <string name="initial_sync_start_importing_account_left_rooms">İlk senkronizasyon:
 \nSol odalar içe aktarılıyor</string>
     <string name="initial_sync_start_importing_account_invited_rooms">İlk senkronizasyon:
@@ -1414,7 +1376,6 @@
     <string name="initial_sync_start_server_computing">İlk senkronizasyon:
 \nSunucu yanıtı bekleniyor…</string>
     <string name="room_displayname_empty_room_was">Boş oda (%s idi)</string>
-
     <plurals name="room_displayname_four_and_more_members">
         <item quantity="one">%1$s, %2$s, %3$s ve %4$d diğer</item>
         <item quantity="other">%1$s, %2$s, %3$s ve %4$d kişi daha</item>
@@ -1640,7 +1601,6 @@
     <string name="spoiler">Spoiler</string>
     <string name="command_description_spoiler">Verilen mesajı spoiler olarak gönderir</string>
     <string name="room_list_quick_actions_notifications_all_noisy">Tüm mesajlar (gürültülü)</string>
-
     <string name="content_reported_content">Bu içerik rapor edildi.
 \n
 \n Bu kullanıcıdan daha fazla içerik görmek istemiyorsanız, mesajlarını gizlemek için onları yok sayabilirsiniz.</string>
@@ -1673,7 +1633,6 @@
     <string name="settings_discovery_please_enter_server">Lütfen kimlik sunucusu url\'sini girin</string>
     <string name="identity_server_consent_dialog_content_question">Bu bilgiyi göndermeyi kabul ediyor musunuz\?</string>
     <string name="identity_server_consent_dialog_content_3">Mevcut kişileri keşfetmek için, iletişim bilgilerini (e-postalar ve telefon numaraları) kimlik sunucunuza göndermeniz gerekir. Gizlilik için göndermeden önce verilerinizi hash ederiz.</string>
-
     <string name="identity_server_consent_dialog_title_2">%s\'e e-posta ve telefon numarası gönder</string>
     <string name="settings_discovery_consent_notice_off_2">Kişileriniz özeldir. Kişilerinizden kullanıcıları keşfetmek için, kimlik sunucunuza iletişim bilgilerini göndermek için izninize ihtiyacımız var.</string>
     <string name="settings_discovery_confirm_mail_not_clicked">Size %s adresine bir onay e-postası gönderdik, lütfen önce e-postanızı kontrol edin ve onay bağlantısını tıklayın</string>
@@ -1746,7 +1705,6 @@
 \nMesajlarınız şifrelerle korunur ve yalnızca siz ve alıcı, mesajların kilidini açmak için benzersiz anahtarlara sahip olursunuz.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Buradaki mesajlar uçtan uca şifrelenmez.</string>
     <string name="room_profile_not_encrypted_subtitle">Bu odadaki mesajlar uçtan uca şifrelenmez.</string>
-
     <string name="verification_request_waiting_for">%s bekleniyor…</string>
     <string name="verification_verified_user">%s doğrulandı</string>
     <string name="verification_verify_user">%s\'yi doğrula</string>
@@ -1774,4 +1732,6 @@
     <string name="action_thread_copy_link_to_thread">Konu bağlantısını kopyala</string>
     <string name="action_thread_view_in_room">Odada görüntüle</string>
     <string name="action_view_threads">Konuları Görüntüle</string>
+    <string name="initial_sync_request_title">Başlangıç eşitleme isteği</string>
+    <string name="all_chats">Tüm Sohbetler</string>
 </resources>
diff --git a/vector/src/main/res/values-tr/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-tr/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-tr/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-tr/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-tzm/strings.xml b/library/ui-strings/src/main/res/values-tzm/strings.xml
similarity index 100%
rename from vector/src/main/res/values-tzm/strings.xml
rename to library/ui-strings/src/main/res/values-tzm/strings.xml
diff --git a/vector/src/main/res/values-tzm/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-tzm/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-tzm/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-tzm/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-uk/strings.xml b/library/ui-strings/src/main/res/values-uk/strings.xml
similarity index 87%
rename from vector/src/main/res/values-uk/strings.xml
rename to library/ui-strings/src/main/res/values-uk/strings.xml
index 8300199e8a..ebe2dcaf4d 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/library/ui-strings/src/main/res/values-uk/strings.xml
@@ -111,8 +111,6 @@
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваше запрошення. Причина: %1$s</string>
     <string name="notice_room_invite_no_invitee_with_reason">Запрошення від %1$s. Причина: %2$s</string>
     <string name="event_status_sending_message">Надсилання повідомлень…</string>
-    <string name="initial_sync_start_importing_account_groups">Початкова синхронізація:
-\nІмпортування спільнот</string>
     <string name="initial_sync_start_importing_account_left_rooms">Початкова синхронізація:
 \nІмпортування кімнат, які ви залишили</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Початкова синхронізація:
@@ -213,7 +211,6 @@
     <string name="auth_email_already_defined">Ця email адреса вже використовується.</string>
     <string name="auth_forgot_password">Забули пароль?</string>
     <string name="auth_recaptcha_message">Цей домашній сервер хоче переконатися, що ви не робот</string>
-    <string name="auth_reset_password_missing_email">Необхідно ввести е-пошту прив\'язану до вашого облікового запису.</string>
     <string name="auth_reset_password_error_unauthorized">Не вдалося перевірити email: переконайтеся, що ви перейшли за посиланням у листі</string>
     <string name="login_error_invalid_home_server">Введіть дійсний URL</string>
     <string name="login_error_bad_json">Викривлений JSON</string>
@@ -357,7 +354,7 @@
     <string name="room_settings_unset_main_address">Зробити не основною адресою</string>
     <string name="encryption_information_decryption_error">Помилка розшифрування</string>
     <string name="encryption_information_device_name">Загальнодоступна назва</string>
-    <string name="encryption_information_device_id">ID сеансу</string>
+    <string name="device_manager_session_details_session_id">ID сеансу</string>
     <string name="encryption_information_device_key">Ключ сеансу</string>
     <string name="encryption_export_e2e_room_keys">Експортувати E2E ключі кімнати</string>
     <string name="encryption_export_room_keys">Експортувати ключі кімнати</string>
@@ -414,7 +411,6 @@
     <string name="command_error">Помилка виконання команди</string>
     <string name="unrecognized_command">Команду %s не розпізнано</string>
     <string name="loading">Завантаження…</string>
-    <string name="groups_header">Спільноти</string>
     <string name="send_bug_report_rage_shake">Струснути пристрій, щоб повідомити про ваду</string>
     <string name="start_voice_call_prompt_msg">Ви впевнені, що бажаєте розпочати голосовий виклик\?</string>
     <string name="start_video_call_prompt_msg">Ви впевнені, що бажаєте розпочати відео виклик\?</string>
@@ -665,7 +661,6 @@
     <string name="invite_friends_rich_title">🔐️ Приєднуйтесь до мене в ${app_name}</string>
     <string name="invite_friends_text">Привіт! Спілкуймося в ${app_name}: %s</string>
     <string name="invite_friends">Запросити друзів</string>
-    <string name="group_all_communities">Всі спільноти</string>
     <string name="settings_show_redacted_summary">Показувати заглушку на місці видалених повідомлень</string>
     <string name="settings_general_title">Загальні</string>
     <string name="send_suggestion_failed">Не вдалось надіслати пропозицію (%s)</string>
@@ -680,8 +675,8 @@
     <string name="uploads_files_no_result">У цій кімнаті немає файлів</string>
     <string name="uploads_files_subtitle">%1$s о %2$s</string>
     <string name="settings_phone_number_empty">Жодного номера телефону не додано до вашого облікового запису</string>
-    <string name="settings_emails_empty">У ваш обліковий запис не додано жодної електронної адреси</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Для вашої приватності ${app_name} підтримує лише надсилання хешованих електронних адрес користувачів та номера телефону.</string>
+    <string name="settings_emails_empty">У ваш обліковий запис не додано жодної адреси електронної адреси</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Для вашої приватності ${app_name} підтримує лише надсилання хешованих електронних адрес користувачів та номерів телефону.</string>
     <string name="settings_discovery_consent_notice_on">Ви погодилися надіслати електронні адреси та телефонні номери на цей сервер ідентифікації для виявлення інших користувачів із ваших контактів.</string>
     <string name="settings_discovery_consent_title">Надіслати електронні адреси та номери телефонів</string>
     <string name="settings_emails_and_phone_numbers_summary">Керування електронними адресами та номерами телефонів, пов’язаними з вашим обліковим записом Matrix</string>
@@ -823,7 +818,7 @@
     <string name="room_widget_permission_avatar_url">URL-адреса аватара</string>
     <string name="room_widget_permission_display_name">Ваше показуване ім\'я</string>
     <string name="room_widget_revoke_access">Скасувати доступ для мене</string>
-    <string name="room_widget_open_in_browser">Відкрити в переглядачі</string>
+    <string name="room_widget_open_in_browser">Відкрити у браузері</string>
     <string name="room_widget_reload">Перезавантажити віджет</string>
     <string name="room_widget_failed_to_load">Не вдалося завантажити віджет.
 \n%s</string>
@@ -1201,7 +1196,7 @@
     <string name="use_file">Використати файл</string>
     <string name="verification_cannot_access_other_session">Скористатись парольною фразою відновлення або ключем</string>
     <string name="keys_backup_restore_with_passphrase">Скористатись відновлювальними парольною фразою або ключем</string>
-    <string name="use_other_session_content_description">Використовуйте найостаннішій ${app_name} на ваших інших пристроях, ${app_name} Web, ${app_name} для комп\'ютерів, ${app_name} iOS, ${app_name} для Android, або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
+    <string name="use_other_session_content_description">Використовуйте найостаннішій ${app_name} на ваших інших пристроях, ${app_name} браузері, ${app_name} комп\'ютерах, ${app_name} iOS, ${app_name} Android, або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
     <string name="use_latest_app">Використовуйте найостаннішій ${app_name} на ваших інших пристроях:</string>
     <string name="verification_use_passphrase">Якщо ви не можете доступитись до чинного сеансу</string>
     <string name="verification_open_other_to_verify">Використайте чинний сеанс, щоб звірити цей сеанс, таким чином надавши йому доступ до зашифрованих повідомлень.</string>
@@ -1745,10 +1740,10 @@
     <string name="feedback">Відгук</string>
     <string name="push_gateway_item_format">Формат:</string>
     <string name="push_gateway_item_url">Url:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_device_name">Показувана назва сеансу:</string>
+    <string name="push_gateway_item_app_display_name">Показувана назва застосунку:</string>
+    <string name="push_gateway_item_push_key">Ключ Push:</string>
+    <string name="push_gateway_item_app_id">ID застосунку:</string>
     <string name="settings_sdk_version">Версія Matrix SDK</string>
     <string name="create_room_federation_error">Кімнату створено, але деякі запрошення не надіслано з такої причини:
 \n
@@ -1819,8 +1814,8 @@
     <string name="error_network_timeout">Схоже, що відповідь сервера надто тривала, це може бути спричинено або поганим з’єднанням, або помилкою сервера. Повторіть спробу через деякий час.</string>
     <string name="error_terms_not_accepted">Повторіть спробу, коли погодитесь з умовами свого домашнього сервера.</string>
     <string name="settings_text_message_sent">Текстове повідомлення надіслано на %s. Введіть код підтвердження, який воно містить.</string>
-    <string name="settings_discovery_confirm_mail">Ми надіслали вам електронний лист для підтвердження на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Ми надіслали вам електронний лист для підтвердження на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
+    <string name="settings_discovery_confirm_mail">Ми надіслали вам електронний лист на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Ми надіслали вам електронний лист на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
     <string name="sent_a_poll">Опитування</string>
     <string name="sent_a_file">Файл</string>
     <string name="sent_a_voice_message">Голосове</string>
@@ -1882,7 +1877,7 @@
     <string name="login_signup_submit">Далі</string>
     <string name="login_reset_password_submit">Далі</string>
     <string name="login_reset_password_on">Скинути пароль на %1$s</string>
-    <string name="login_login_with_email_error">Ця е-пошта не пов\'язана з жодним обліковим записом.</string>
+    <string name="login_login_with_email_error">Ця адреса е-пошти не пов\'язана з жодним обліковим записом.</string>
     <string name="login_registration_disabled">Перепрошуємо, сервер не приймає нових облікових записів.</string>
     <string name="login_sso_error_message">Сталася помилка під час завантаження сторінки: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">Введіть адресу сервера, який ви хочете використовувати</string>
@@ -1900,7 +1895,7 @@
     <string name="login_connect_to_modular">Під\'єднатися до Element Matrix Services</string>
     <string name="login_connect_to">Під\'єднатися до %1$s</string>
     <string name="login_reset_password_mail_confirmation_title">Перевірти вхідні</string>
-    <string name="login_reset_password_error_not_found">Ця е-пошта не пов\'язана з жодним обліковим записом</string>
+    <string name="login_reset_password_error_not_found">Ця адреса е-пошти не пов\'язана з жодним обліковим записом</string>
     <string name="login_reset_password_warning_submit">Продовжити</string>
     <string name="login_continue">Продовжити</string>
     <string name="login_social_sso">єдиний вхід</string>
@@ -1953,7 +1948,7 @@
     <string name="finish_setting_up_discovery">Завершити налаштування виявності.</string>
     <string name="settings_discovery_msisdn_title">Виявні номери телефону</string>
     <string name="settings_discovery_no_msisdn">Опції виявності з\'являться після додавання номера телефону.</string>
-    <string name="settings_discovery_no_mails">Опції виявності з\'являться після додавання е-пошти.</string>
+    <string name="settings_discovery_no_mails">Опції виявності з\'являться після додавання адреси е-пошти.</string>
     <string name="open_discovery_settings">Відкрити налаштування виявності</string>
     <string name="user_directory_search_hint_2">Пошук за іменем, ID або е-поштою</string>
     <string name="create_new_space">Створити новий простір</string>
@@ -1961,7 +1956,7 @@
     <string name="room_settings_space_access_title">Доступ до простору</string>
     <string name="room_settings_access_rules_pref_dialog_title">Хто може мати доступ\?</string>
     <string name="settings_notification_emails_enable_for_email">Увімкнути сповіщення е-поштою для %s</string>
-    <string name="settings_notification_emails_no_emails">Щоб отримувати сповіщення е-поштою, пов’яжіть її зі своїм обліковим записом Matrix</string>
+    <string name="settings_notification_emails_no_emails">Щоб отримувати сповіщення е-поштою, пов’яжіть її адресу зі своїм обліковим записом Matrix</string>
     <string name="settings_notification_emails_category">Сповіщення е-поштою</string>
     <string name="room_permissions_upgrade_the_space">Оновити простір</string>
     <string name="room_permissions_change_space_name">Змінити назву простору</string>
@@ -2026,7 +2021,7 @@
     <string name="failed_to_access_secure_storage">Не вдалося отримати доступ до безпечного сховища</string>
     <string name="app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="app_desktop_web">${app_name} для переглядача
+    <string name="app_desktop_web">${app_name} для браузера
 \n${app_name} для ПК</string>
     <string name="error_saving_media_file">Не вдалося зберегти медіафайл</string>
     <string name="bootstrap_invalid_recovery_key">Це не дійсний ключ відновлення</string>
@@ -2202,7 +2197,7 @@
     <string name="create_spaces_room_private_header">Над чим ви працюєте\?</string>
     <string name="create_spaces_invite_public_header">Хто учасники вашої команди\?</string>
     <string name="create_space_error_empty_field_space_name">Назвіть його, щоб продовжити.</string>
-    <string name="create_spaces_organise_rooms">Приватний простір для організації ваших кімнат</string>
+    <string name="create_spaces_organise_rooms">Приватний простір для впорядкування ваших кімнат</string>
     <string name="room_error_not_found">Не вдалося знайти таку кімнату. Переконайтеся, що вона існує.</string>
     <string name="settings_security_pin_code_notifications_title">Показувати вміст у сповіщеннях</string>
     <plurals name="wrong_pin_message_remaining_attempts">
@@ -2238,7 +2233,7 @@
         <item quantity="many">Надіслано забагато запитів. Спробуйте знову за %1$d секунд…</item>
         <item quantity="other">Надіслано забагато запитів. Спробуйте знову за %1$d секунд…</item>
     </plurals>
-    <string name="login_set_email_notice">Вкажіть е-пошту для відновлення облікового запису. Згодом ви зможете дозволити знайомим знаходити вас за е-поштою.</string>
+    <string name="login_set_email_notice">Вкажіть адресу е-пошти для відновлення облікового запису. Згодом ви зможете дозволити знайомим знаходити вас за цією адресою.</string>
     <string name="login_reset_password_success_notice_2">Ви вийшли з усіх сеансів і більше не отримуватимете сповіщень. Щоб отримувати сповіщення знову, ввійдіть на кожному пристрої заново.</string>
     <string name="login_reset_password_warning_content">Зміна пароля скине всі ключі наскрізного шифрування всіх ваших сеансів, унеможливлюючи читання історії шифрованих чатів. Налаштуйте резервне копіювання ключів чи експортуйте ключі кімнат з іншого сеансу, перш ніж скинути пароль.</string>
     <string name="login_registration_not_supported">Застосунку не вдалося створити обліковий запис на цьому домашньому сервері.
@@ -2247,7 +2242,7 @@
     <string name="login_mode_not_supported">Застосунку не вдається зайти до вашого домашнього сервера. Домашній сервер підтримує такі типи входу: %1$s.
 \n
 \nБажаєте зайти через вебклієнт\?</string>
-    <string name="identity_server_consent_dialog_content_3">Щоб знайти наявні контакти, надішліть дані контактів (е-пошти й номери телефонів) серверу ідентифікації. Ми хешуємо ваші дані перед надсиланням для приватності.</string>
+    <string name="identity_server_consent_dialog_content_3">Щоб знайти наявні контакти, надішліть дані контактів (адреси е-пошти й номери телефонів) серверу ідентифікації. Ми хешуємо ваші дані перед надсиланням для приватності.</string>
     <string name="settings_discovery_consent_notice_off_2">Ваші контакти приватні. Щоб дізнаватись про користувачів, відповідних вашим контактам, дозвольте нам надсилати дані ваших контактів серверу ідентифікації.</string>
     <string name="identity_server_consent_dialog_title_2">Надіслати електронні адреси та номери телефонів %s</string>
     <string name="shortcut_disabled_reason_sign_out">Сеанс завершено!</string>
@@ -2293,15 +2288,15 @@
     <string name="this_invite_to_this_space_was_sent">Це запрошення до простору надіслане %s, не пов\'язаній із вашим обліковим записом</string>
     <string name="this_invite_to_this_room_was_sent">Це запрошення до кімнати надіслане %s, не пов\'язаній із вашим обліковим записом</string>
     <string name="upgrade_room_for_restricted_note">Зауважте, що поліпшення створить нову версію кімнати. Всі наявні повідомлення залишаться в цій архівованій кімнаті.</string>
-    <string name="upgrade_room_for_restricted_no_param">Будь-хто в батьківському просторі зможемо знайти кімнату й долучитись — нема потреба вручну запрошувати всіх. Можна змінити це в налаштуваннях кімнати будь-коли.</string>
-    <string name="upgrade_room_for_restricted">Будь-хто в %s зможе знайти кімнату й долучитись — нема потреби вручну запрошувати всіх. Можна змінити це в налаштуваннях кімнати будь-коли.</string>
+    <string name="upgrade_room_for_restricted_no_param">Будь-хто в батьківському просторі зможе знайти кімнату й приєднатись — непотрібно вручну запрошувати всіх. Це можна змінити в налаштуваннях кімнати будь-коли.</string>
+    <string name="upgrade_room_for_restricted">Будь-хто в %s зможе знайти кімнату й приєднатись — непотрібно вручну запрошувати всіх. Це можна змінити в налаштуваннях кімнати будь-коли.</string>
     <string name="error_voice_message_cannot_reply_or_edit">Не вдалося відповісти чи редагувати, бо голосове повідомлення активне</string>
     <string name="room_using_unstable_room_version">Кімната — версії %s, яку домашній сервер позначив нестабільною.</string>
     <string name="upgrade_room_warning">Поліпшення кімнати — серйозна операція. Її зазвичай радять, коли кімната нестабільна через вади, брак функціоналу чи вразливості безпеки.
 \nЗазвичай це впливає лише на деталі опрацювання кімнати сервером.</string>
     <string name="this_space_has_no_rooms_admin">Деяких кімнат може бути не видно, бо вони закриті й потребують запрошення.</string>
-    <string name="this_space_has_no_rooms_not_admin">Деяких кімнат може бути не видно, бо вони закриті й потребують запрошення.
-\nУ вас нема дозволу додавати кімнати.</string>
+    <string name="this_space_has_no_rooms_not_admin">Деякі кімнати можуть бути приховані, оскільки вони приватні й потребують запрошення.
+\nУ вас немає дозволу додавати кімнати.</string>
     <string name="space_leave_prompt_msg_as_admin">Ви єдиний адміністратор цього простору. Якщо вийдете, він залишиться без керівництва.</string>
     <string name="space_leave_prompt_msg_private">Ви не зможете приєднатись, поки вас не запросять знову.</string>
     <string name="space_leave_prompt_msg_only_you">Ви єдина особа тут. Якщо ви вийдете, більше ніхто не зможе приєднатись, навіть ви ж.</string>
@@ -2345,7 +2340,7 @@
 \nВвімкнути захищене резервне копіювання й керувати своїми ключами можна в налаштуваннях.</string>
     <string name="verify_cancel_other">Скасування залишить %1$s (%2$s) без звірки. У їхньому користувацькому профілі можна почати заново.</string>
     <string name="verify_new_session_notice">Звірте цим сеансом свій новий. Це надасть йому доступ до зашифрованих повідомлень.</string>
-    <string name="verification_profile_device_untrust_info">Надіслані цьому сеансу й цим сеансом повідомлення позначатимуться застереженнями, поки цей користувач йому не довірить. Або ви можете власноруч звірити сеанс.</string>
+    <string name="verification_profile_device_untrust_info">Поки цей користувач не довіряє цьому сеансу, повідомлення, що надсилаються до нього і від нього, позначаються попередженнями. Крім того, ви можете звірити його вручну.</string>
     <string name="room_settings_enable_encryption_dialog_content">Якщо ви увімкнете шифрування для кімнати, його неможливо буде вимкнути. Надіслані у зашифровану кімнату повідомлення будуть прочитними тільки для учасників кімнати, натомість для сервера вони будуть непрочитними. Увімкнення шифрування може унеможливити роботу ботів та мостів.</string>
     <string name="verify_cannot_cross_sign">Не вдалося поширити звірку цього сеансу з вашими іншими.
 \nЗвірка збережеться локально, її поширить майбутня версія застосунку.</string>
@@ -2526,7 +2521,6 @@
     <string name="ftue_profile_picture_title">Додати зображення профілю</string>
     <string name="ftue_display_name_entry_footer">Ви можете змінити його пізніше</string>
     <string name="ftue_display_name_entry_title">Показуване ім\'я</string>
-    <string name="ftue_display_name_subtitle">Його буде показано у надісланих повідомленнях.</string>
     <string name="ftue_display_name_title">Виберіть показуване ім\'я</string>
     <string name="ftue_account_created_subtitle">Ваш обліковий запис %s створений</string>
     <string name="ftue_account_created_congratulations_title">Вітаємо!</string>
@@ -2576,7 +2570,6 @@
     <string name="a11y_presence_busy">Зайнятий</string>
     <string name="keys_backup_settings_signature_from_this_user">Резервна копія має дійсний підпис від цього користувача.</string>
     <string name="live_location_bottom_sheet_last_updated_at">Оновлено %1$s тому</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Припинити поширення</string>
     <string name="labs_enable_live_location_summary">Тимчасова реалізація: місця зберігаються в історії кімнат</string>
     <string name="labs_enable_live_location">Увімкнути поширення місцеперебування наживо</string>
     <string name="location_share_live_remaining_time">Залишилося %1$s</string>
@@ -2703,4 +2696,310 @@
     </plurals>
     <string name="search_space_two_parents">%1$s і %2$s</string>
     <string name="auth_reset_password_error_unverified">Електронна пошта не підтверджена, перевірте свою поштову скриньку</string>
+    <string name="location_share_loading_map_error">Неможливо завантажити карту
+\nМожливо, цей домашній сервер не налаштовано для показу карт.</string>
+    <string name="a11y_open_settings">Відкрити налаштування</string>
+    <string name="all_chats">Усі бесіди</string>
+    <string name="device_manager_sessions_other_description">Звірте свої сеанси та вийдіть з усіх сеансів, які ви більше не розпізнаєте або не використовуєте для кращої безпеки.</string>
+    <string name="device_manager_sessions_other_title">Інші сеанси</string>
+    <string name="settings_sessions_list">Сеанси</string>
+    <string name="a11y_open_spaces">Відкрити список кімнат</string>
+    <string name="a11y_create_message">Створити нову розмову або кімнату</string>
+    <string name="room_list_filter_people">Люди</string>
+    <string name="room_list_filter_favourites">Обрані</string>
+    <string name="room_list_filter_unreads">Непрочитані</string>
+    <string name="room_list_filter_all">Усі</string>
+    <string name="home_layout_preferences_sort_name">А - Я</string>
+    <string name="home_layout_preferences_sort_activity">Діяльністю</string>
+    <string name="home_layout_preferences_sort_by">Упорядкувати за</string>
+    <string name="home_layout_preferences_recents">Показувати останні</string>
+    <string name="home_layout_preferences_filters">Показати фільтри</string>
+    <string name="home_layout_preferences">Налаштування макета</string>
+    <string name="explore_rooms">Знайти кімнати</string>
+    <string name="create_room">Створити кімнату</string>
+    <string name="start_chat">Розпочати бесіду</string>
+    <string name="device_manager_other_sessions_description_unverified">Не звірений · Остання активність %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Звірений · Остання активність %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Переглянути всі (%1$d)</string>
+    <string name="device_manager_view_details">Переглянути подробиці</string>
+    <string name="device_manager_verify_session">Звірити сеанс</string>
+    <string name="device_manager_verification_status_unverified">Не звірений сеанс</string>
+    <string name="device_manager_verification_status_verified">Звірений сеанс</string>
+    <string name="a11y_device_manager_device_type_unknown">Невідомий тип пристрою</string>
+    <string name="a11y_device_manager_device_type_desktop">Комп\'ютер</string>
+    <string name="a11y_device_manager_device_type_web">Браузер</string>
+    <string name="a11y_device_manager_device_type_mobile">Мобільний</string>
+    <string name="timeline_error_room_not_found">Перепрошуємо, цю кімнату не знайдено.
+\nСпробуйте пізніше.%s</string>
+    <string name="invites_title">Запрошення</string>
+    <string name="onboarding_new_app_layout_button_try">Спробувати</string>
+    <string name="onboarding_new_app_layout_feedback_message">Клацніть праворуч вгорі, щоб побачити опцію відгуку.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Надіслати відгук</string>
+    <string name="onboarding_new_app_layout_spaces_message">Отримуйте доступ до своїх просторів (унизу праворуч) швидше та легше, ніж раніше.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Доступ до просторів</string>
+    <string name="onboarding_new_app_layout_welcome_message">Щоб спростити ваш ${app_name}, вкладки тепер необов’язкові. Керуйте ними у верхньому правому меню.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Вітаємо в новому вигляді!</string>
+    <string name="home_empty_no_unreads_message">Тут з\'являтимуться ваші непрочитані повідомлення, якщо вони є.</string>
+    <string name="home_empty_no_unreads_title">Немає про що звітувати.</string>
+    <string name="home_empty_no_rooms_message">Універсальний безпечний застосунок для спілкування з командами, друзями й організаціями. Створіть бесіду або приєднайтеся до наявної кімнати, щоб розпочати.</string>
+    <string name="home_empty_no_rooms_title">Вітаємо в ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Простори – це новий спосіб групувати кімнати та людей. Додайте наявну кімнату або створіть нову, використовуючи кнопку внизу праворуч.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nмає дещо порожній вигляд.</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Зважте потребу вийти зі старих сеансів (%1$d день або більше), який ви більше не використовуєте.</item>
+        <item quantity="few">Зважте потребу вийти зі старих сеансів (%1$d дні або більше), які ви більше не використовуєте.</item>
+        <item quantity="many">Зважте потребу вийти зі старих сеансів (%1$d днів або більше), які ви більше не використовуєте.</item>
+        <item quantity="other">Зважте потребу вийти зі старих сеансів (%1$d днів або більше), які ви більше не використовуєте.</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">Неактивні сеанси</string>
+    <string name="device_manager_unverified_sessions_description">Звірити або вийти з не звірених сеансів.</string>
+    <string name="device_manager_unverified_sessions_title">Не звірені сеанси</string>
+    <string name="device_manager_header_section_security_recommendations_description">Удоскональте безпеку свого облікового запису, дотримуючись цих порад.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Поради щодо безпеки</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Без активності %1$d+ день (%2$s)</item>
+        <item quantity="few">Без активності %1$d+ дні (%2$s)</item>
+        <item quantity="many">Без активності %1$d+ днів (%2$s)</item>
+        <item quantity="other">Без активності %1$d+ днів (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">Тут з\'являтимуться нові запити та запрошення.</string>
+    <string name="invites_empty_title">Нічого нового.</string>
+    <string name="space_list_empty_message">Простори – це новий спосіб групувати кімнати та людей. Створіть простір, щоб розпочати.</string>
+    <string name="space_list_empty_title">Ще немає просторів.</string>
+    <string name="a11y_collapse_space_children">Згорнути дочірні елементи %s</string>
+    <string name="a11y_expand_space_children">Розгорнути дочірні елементи %s</string>
+    <string name="change_space">Змінити простір</string>
+    <string name="device_manager_session_details_device_ip_address">IP-адреса</string>
+    <string name="device_manager_session_details_session_last_activity">Остання активність</string>
+    <string name="device_manager_session_details_session_name">Назва сеансу</string>
+    <string name="device_manager_session_details_description">Відомості про застосунок, пристрій та діяльність.</string>
+    <string name="device_manager_session_details_title">Подробиці сеансу</string>
+    <string name="device_manager_other_sessions_clear_filter">Очистити фільтр</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Неактивних сеансів не знайдено.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Не знайдено не звірених сеансів.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Знайдені не звірені сеанси.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Подумайте про те, щоб вийти зі старих сеансів (%1$d день або довше), якими ви більше не користуєтесь.</item>
+        <item quantity="few">Подумайте про те, щоб вийти зі старих сеансів (%1$d дні або довше), якими ви більше не користуєтесь.</item>
+        <item quantity="many">Подумайте про те, щоб вийти зі старих сеансів (%1$d днів або довше), якими ви більше не користуєтесь.</item>
+        <item quantity="other">Подумайте про те, щоб вийти зі старих сеансів (%1$d днів або довше), якими ви більше не користуєтесь.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Неактивний</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Звірте свої сеанси для посилення безпеки обміну повідомленнями або вийдіть з тих, які ви більше не впізнаєте або не використовуєте.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Не звірений</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Для кращої безпеки виходьте з будь-якого сеансу, який ви більше не впізнаєте або не використовуєте.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Звірений</string>
+    <string name="a11y_device_manager_filter">Фільтрувати</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Неактивний %1$d день або довше</item>
+        <item quantity="few">Неактивний %1$d дні або довше</item>
+        <item quantity="many">Неактивний %1$d днів або довше</item>
+        <item quantity="other">Неактивний %1$d днів або довше</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Неактивний</string>
+    <string name="device_manager_filter_option_unverified_description">Не готовий до безпечного обміну повідомленнями</string>
+    <string name="device_manager_filter_option_unverified">Не звірений</string>
+    <string name="device_manager_filter_option_verified">Звірений</string>
+    <string name="device_manager_filter_option_verified_description">Готовий до безпечного обміну повідомленнями</string>
+    <string name="device_manager_filter_option_all_sessions">Усі сеанси</string>
+    <string name="device_manager_filter_bottom_sheet_title">Фільтрувати</string>
+    <string name="device_manager_session_last_activity">Остання активність %1$s</string>
+    <string name="device_manager_device_title">Пристрій</string>
+    <string name="device_manager_session_title">Сеанс</string>
+    <string name="device_manager_current_session_title">Поточний сеанс</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Звірте або вийдіть з цього сеансу для кращої безпеки та надійності.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Звірте свій поточний сеанс для посилення безпеки обміну повідомленнями.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Цей сеанс готовий до безпечного обміну повідомленнями.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Ваш поточний сеанс готовий до безпечного обміну повідомленнями.</string>
+    <string name="labs_enable_deferred_dm_summary">Створюйте приватні повідомлення лише за надсилання першого повідомлення</string>
+    <string name="labs_enable_deferred_dm_title">Увімкнути відкладені приватні повідомлення</string>
+    <string name="labs_enable_new_app_layout_summary">Спрощений Element з опціональними вкладками</string>
+    <string name="labs_enable_new_app_layout_title">Увімкнути новий вигляд</string>
+    <string name="device_manager_learn_more_session_rename">Інші користувачі в особистих повідомленнях і кімнатах, до яких ви приєдналися, можуть переглядати повний список ваших сеансів.
+\n
+\nЦе дає їм впевненість у тому, що вони дійсно розмовляють з вами, а також означає, що вони можуть бачити назву сеансу, яку ви ввели тут.</string>
+    <string name="device_manager_learn_more_session_rename_title">Перейменування сеансів</string>
+    <string name="device_manager_learn_more_sessions_verified">Звірені сеанси — ті, до яких ви ввійшли за допомогою своїх облікових даних, а потім пройшли перевірку, використовуючи вашу захищену парольну фразу або шляхом перехресної перевірки.
+\n
+\nЦе означає, що вони мають ключі шифрування для ваших попередніх повідомлень і підтверджують іншим користувачам, з якими ви спілкуєтеся, що ці сеанси — це дійсно ви.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Звірені сеанси</string>
+    <string name="device_manager_learn_more_sessions_unverified">Не звірені сеанси — це сеанси, до яких ви ввійшли в за допомогою своїх облікових даних, але не пройшли перехресну перевірку.
+\n
+\nВи повинні бути особливо впевнені, що розпізнаєте ці сеанси, оскільки вони можуть означати несанкціоноване використання вашого облікового запису.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Не звірені сеанси</string>
+    <string name="device_manager_learn_more_sessions_inactive">Неактивні сеанси — це сеанси, які ви не використовували протягом певного часу, але вони продовжують отримувати ключі шифрування.
+\n
+\nВилучення неактивних сеансів поліпшує безпеку і швидкодію, а також полегшує визначення підозрілих нових сеансів.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Неактивні сеанси</string>
+    <string name="device_manager_session_rename_warning">Зауважте, що назви сеансів також видно людям, з якими ви спілкуєтесь.</string>
+    <string name="device_manager_session_rename_description">Власні назви сеансів допоможуть вам легше розпізнавати ваші пристрої.</string>
+    <string name="device_manager_session_rename_edit_hint">Назва сеансу</string>
+    <string name="device_manager_session_rename">Перейменувати сеанс</string>
+    <string name="device_manager_session_overview_signout">Вийти з цього сеансу</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Не звірений - Ваш поточний сеанс</string>
+    <string name="tooltip_attachment_voice_broadcast">Розпочати голосову трансляцію</string>
+    <string name="key_authenticity_not_guaranteed">Справжність цього зашифрованого повідомлення не може бути гарантована на цьому пристрої.</string>
+    <string name="settings_security_incognito_keyboard_summary">Заборонити клавіатурі оновлювати будь-які персоналізовані дані, як-от історію набору тексту та словник, на основі того, що ви набрали в розмовах. Зверніть увагу, що деякі клавіатури можуть не дотримуватися цього налаштування.</string>
+    <string name="settings_security_incognito_keyboard_title">Клавіатура інкогніто</string>
+    <string name="command_description_table_flip">Надсилає (╯°□°）╯︵ ┻━┻ на початку текстового повідомлення</string>
+    <string name="attachment_type_voice_broadcast">Голосові трансляції</string>
+    <string name="command_description_devtools">Відкрийте інструменти розробника</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Ви увімкнули шифрування лише для перевірених сеансів для всіх кімнат у налаштуваннях безпеки.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ У цій кімнаті є неперевірені пристрої, вони не зможуть розшифрувати повідомлення, які ви надсилаєте.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Ніколи не надсилати зашифровані повідомлення на неперевірені сеанси в цій кімнаті.</string>
+    <string name="action_got_it">Зрозуміло</string>
+    <string name="rich_text_editor_format_underline">Застосувати форматування підкресленим</string>
+    <string name="rich_text_editor_format_strikethrough">Застосувати форматування перекресленим</string>
+    <string name="rich_text_editor_format_italic">Застосувати форматування курсивом</string>
+    <string name="rich_text_editor_format_bold">Застосувати форматування жирним</string>
+    <string name="labs_enable_client_info_recording_summary">Записуйте назву клієнта, версію та URL-адресу, щоб легше розпізнавати сеанси в менеджері сеансів.</string>
+    <string name="labs_enable_client_info_recording_title">Увімкнути запис відомостей про клієнт</string>
+    <string name="labs_enable_session_manager_summary">Отримайте кращу видимість і контроль над усіма вашими сеансами.</string>
+    <string name="labs_enable_session_manager_title">Увімкнути новий менеджер сеансів</string>
+    <string name="device_manager_session_details_device_operating_system">Операційна система</string>
+    <string name="device_manager_session_details_device_model">Модель</string>
+    <string name="device_manager_session_details_device_browser">Браузер</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Версія</string>
+    <string name="device_manager_session_details_application_name">Назва</string>
+    <string name="device_manager_session_details_application">Застосунок</string>
+    <string name="device_manager_push_notifications_description">Отримувати push-сповіщення про цей сеанс.</string>
+    <string name="device_manager_push_notifications_title">Push-сповіщення</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Звірте свій поточний сеанс, щоб побачити стан перевірки цього сеансу.</string>
+    <string name="device_manager_verification_status_unknown">Невідомий стан перевірки</string>
+    <string name="push_gateway_item_enabled">Увімкнено:</string>
+    <string name="push_gateway_item_device_id">ID сеансу:</string>
+    <string name="error_check_network">Щось пішло не так. Будь ласка, перевірте мережеве з\'єднання та спробуйте ще раз.</string>
+    <string name="grant_permission">Надати дозвіл</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} потребує дозволу на показ сповіщень.
+\nНадайте дозвіл.</string>
+    <string name="permissions_rationale_msg_notification">Для показу сповіщень ${app_name} потрібен дозвіл. Сповіщення можуть показувати ваші повідомлення, запрошення тощо.
+\n
+\nДозвольте доступ до наступних спливних вікон, щоб мати змогу переглядати сповіщення.</string>
+    <string name="labs_enable_rich_text_editor_summary">Спробуйте розширений текстовий редактор (незабаром з\'явиться режим звичайного тексту)</string>
+    <string name="labs_enable_rich_text_editor_title">Увімкнути розширений текстовий редактор</string>
+    <string name="qr_code_login_confirm_security_code_description">Переконайтеся, що ви знаєте походження цього коду. Пов\'язавши пристрої, ви надасте будь-кому повний доступ до свого облікового запису.</string>
+    <string name="qr_code_login_confirm_security_code">Підтвердити</string>
+    <string name="qr_code_login_try_again">Повторити спробу</string>
+    <string name="qr_code_login_status_no_match">Не збігається\?</string>
+    <string name="qr_code_login_signing_in">Вхід</string>
+    <string name="qr_code_login_connecting_to_device">Під\'єднання до пристрою</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Входите на мобільному пристрої\?</string>
+    <string name="qr_code_login_show_qr_code_button">Показати QR-код на цьому пристрої</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Виберіть «Сканувати QR-код»</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Виберіть «Увійти за допомогою QR-коду»</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Почніть з екрана входу</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Почніть з екрана входу</string>
+    <string name="qr_code_login_new_device_instruction_3">Виберіть «Показати QR-код»</string>
+    <string name="qr_code_login_new_device_instruction_2">Перейдіть до Налаштування -&gt; Безпека й приватність</string>
+    <string name="qr_code_login_new_device_instruction_1">Відкрийте застосунок на іншому своєму пристрої</string>
+    <string name="qr_code_login_header_failed_denied_description">Запит на іншому пристрої було відхилено.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Пов\'язування не було завершено у встановлені терміни.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Пов\'язування з цим пристроєм не підтримується.</string>
+    <string name="qr_code_login_header_failed_title">Невдале з\'єднання</string>
+    <string name="qr_code_login_header_connected_description">Перевірте свій пристрій, на якому ви ввійшли. На екрані повинен з\'явитися код, наведений нижче. Переконайтеся, що наведений код збігається з кодом на вашому пристрої:</string>
+    <string name="qr_code_login_header_connected_title">Безпечне з\'єднання встановлено</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Зіскануйте QR-код нижче своїм пристроєм, з якого ви вийшли.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Скануйте QR-код нижче за допомогою свого пристрою для входу:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Увійти за допомогою QR-коду</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Використовуйте камеру цього пристрою, щоб зісканувати QR-код, показаний на іншому пристрої:</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">За допомогою цього пристрою ви можете ввійти на мобільному або вебпристрої за допомогою QR-коду. Зробити це можна двома способами:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Увійти за допомогою QR-коду</string>
+    <string name="qr_code_login_scan_qr_code_button">Сканувати QR-код</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Сканувати QR-код</string>
+    <string name="login_scan_qr_code">Сканувати QR-код</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Домашній сервер не підтримує вхід за допомогою QR-коду.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Вхід на іншому пристрої було скасовано.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Цей QR-код недійсний.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Повинен бути виконаний вхід з іншого пристрою.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Вхід з іншого пристрою вже виконано.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Під час налаштування захищеного обміну повідомленнями виникла проблема з безпекою. Можливо, порушено одне з таких налаштувань: Ваш домашній сервер; Ваше інтернет-з\'єднання; Ваш пристрій;</string>
+    <string name="qr_code_login_header_failed_other_description">Запит не виконаний.</string>
+    <string name="labs_enable_voice_broadcast_summary">Можливість записувати та надсилати голосові трансляції до стрічки кімнати.</string>
+    <string name="labs_enable_voice_broadcast_title">Увімкнути голосові трансляції</string>
+    <string name="a11y_voice_broadcast_buffering">Буферизація…</string>
+    <string name="a11y_pause_voice_broadcast">Призупинити голосову трансляцію</string>
+    <string name="a11y_play_voice_broadcast">Відтворити або поновити відтворення голосової трансляції</string>
+    <string name="a11y_stop_voice_broadcast_record">Припинити запис голосової трансляції</string>
+    <string name="a11y_pause_voice_broadcast_record">Призупинити запис голосової трансляції</string>
+    <string name="a11y_resume_voice_broadcast_record">Відновити запис голосової трансляції</string>
+    <string name="voice_broadcast_live">Наживо</string>
+    <string name="device_manager_other_sessions_select">Вибрати сеанси</string>
+    <string name="attachment_type_selector_contact">Контакт</string>
+    <string name="attachment_type_selector_camera">Камера</string>
+    <string name="attachment_type_selector_location">Місце перебування</string>
+    <string name="attachment_type_selector_poll">Опитування</string>
+    <string name="attachment_type_selector_voice_broadcast">Голосові трансляції</string>
+    <string name="attachment_type_selector_file">Вкладення</string>
+    <string name="attachment_type_selector_sticker">Наліпки</string>
+    <string name="attachment_type_selector_gallery">Фотобібліотека</string>
+    <string name="action_deselect_all">Скасувати вибір усіх</string>
+    <plurals name="x_selected">
+        <item quantity="one">Вибрано %1$d</item>
+        <item quantity="few">Вибрано %1$d</item>
+        <item quantity="many">Вибрано %1$d</item>
+        <item quantity="other">Вибрано %1$d</item>
+    </plurals>
+    <string name="action_select_all">Вибрати все</string>
+    <string name="rich_text_editor_full_screen_toggle">Перемкнути повноекранний режим</string>
+    <string name="attachment_type_selector_text_formatting">Форматування тексту</string>
+    <string name="error_voice_broadcast_already_in_progress_message">Ви вже записуєте голосову трансляцію. Завершіть поточну трансляцію, щоб розпочати нову.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Хтось інший вже записує голосову трансляцію. Зачекайте, поки вона завершиться, щоб розпочати нову.</string>
+    <string name="error_voice_broadcast_permission_denied_message">Ви не маєте необхідних дозволів для початку голосової трансляції в цю кімнату. Зверніться до адміністратора кімнати, щоб оновити ваші дозволи.</string>
+    <string name="error_voice_broadcast_unauthorized_title">Не вдалося розпочати нову голосову трансляцію</string>
+    <string name="a11y_voice_broadcast_fast_forward">Перемотати вперед на 30 секунд</string>
+    <string name="a11y_voice_broadcast_fast_backward">Перемотати назад на 30 секунд</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Звірені сеанси — це будь-який пристрій, на якому ви використовуєте цей обліковий запис після введення парольної фрази або підтвердження вашої особи за допомогою іншого звіреного сеансу.
+\n
+\nЦе означає, що ви маєте всі ключі, необхідні для розблокування ваших зашифрованих повідомлень і підтвердження іншим користувачам, що ви довіряєте цьому сеансу.</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Вийти з %1$d сеансу</item>
+        <item quantity="few">Вийти з %1$d сеансів</item>
+        <item quantity="many">Вийти з %1$d сеансів</item>
+        <item quantity="other">Вийти з %1$d сеансів</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">Вийти</string>
+    <string name="voice_broadcast_recording_time_left">Залишилося %1$s</string>
+    <string name="message_reply_to_sender_sent_audio_file">надсилає аудіофайл.</string>
+    <string name="message_reply_to_sender_sent_file">надсилає файл.</string>
+    <string name="message_reply_to_prefix">У відповідь на</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Сховати IP-адресу</string>
+    <string name="message_reply_to_sender_created_poll">створює опитування.</string>
+    <string name="message_reply_to_sender_sent_sticker">надсилає наліпку.</string>
+    <string name="message_reply_to_sender_sent_video">надсилає відео.</string>
+    <string name="message_reply_to_sender_sent_image">надсилає зображення.</string>
+    <string name="message_reply_to_sender_sent_voice_message">надсилає голосове повідомлення.</string>
+    <string name="device_manager_other_sessions_show_ip_address">Показати IP-адресу</string>
+    <string name="quoting">Цитуючи</string>
+    <string name="replying_to">У відповідь %s</string>
+    <string name="editing">Редагування</string>
+    <string name="settings_enable_direct_share_summary">Показувати останні бесіди в системному меню загального доступу</string>
+    <string name="settings_enable_direct_share_title">Увімкнути пряме поширення</string>
+    <string name="review_unverified_sessions_description">Перегляньте їх, щоб переконатися, що ваш обліковий запис у безпеці</string>
+    <string name="review_unverified_sessions_title">У вас є незвірені сеанси</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">Цей сеанс не підтримує шифрування, тому його неможливо звірити.
+\n
+\nПід час користування цим сеансом ви не зможете брати участь у кімнатах, в яких увімкнено шифрування.
+\n
+\nДля кращої безпеки й приватності радимо використовувати клієнти Matrix, які підтримують шифрування.</string>
+    <string name="device_manager_signout_all_other_sessions">Вийти з усіх інших сеансів</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">Цей сеанс не підтримує шифрування і тому не може бути звірений.</string>
+    <string name="settings_nightly_build_update">Отримати найновішу збірку (примітка: у вас можуть виникнути проблеми з входом в систему)</string>
+    <string name="settings_nightly_build">Збірка Nightly</string>
+    <string name="voice_broadcast_live_broadcast">Трансляція наживо</string>
+    <string name="notice_voice_broadcast_ended_by_you">Ви завершили голосову трансляцію.</string>
+    <string name="notice_voice_broadcast_ended">%1$s завершує голосову трансляцію.</string>
+    <string name="stop_voice_broadcast_content">Ви впевнені, що хочете припинити голосову трансляцію\? На цьому трансляція завершиться, і повний запис буде доступний у кімнаті.</string>
+    <string name="stop_voice_broadcast_dialog_title">Припинити голосову трансляцію\?</string>
+    <string name="action_stop">Так, припинити</string>
+    <string name="set_link_edit">Змінити посилання</string>
+    <string name="set_link_create">Створити посилання</string>
+    <string name="set_link_link">Посилання</string>
+    <string name="set_link_text">Текст</string>
+    <string name="rich_text_editor_link">Налаштувати посилання</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-uk/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-uk/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-uk/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-uk/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-ur/strings.xml b/library/ui-strings/src/main/res/values-ur/strings.xml
similarity index 100%
rename from vector/src/main/res/values-ur/strings.xml
rename to library/ui-strings/src/main/res/values-ur/strings.xml
diff --git a/vector/src/main/res/values-uz/strings.xml b/library/ui-strings/src/main/res/values-uz/strings.xml
similarity index 100%
rename from vector/src/main/res/values-uz/strings.xml
rename to library/ui-strings/src/main/res/values-uz/strings.xml
diff --git a/vector/src/main/res/values-uz/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-uz/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-uz/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-uz/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-vi/strings.xml b/library/ui-strings/src/main/res/values-vi/strings.xml
similarity index 99%
rename from vector/src/main/res/values-vi/strings.xml
rename to library/ui-strings/src/main/res/values-vi/strings.xml
index 61b8728ca0..c6dc97f782 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/library/ui-strings/src/main/res/values-vi/strings.xml
@@ -8,7 +8,6 @@
     <string name="send_bug_report">Báo lỗi</string>
     <string name="send_bug_report_include_screenshot">Gửi ảnh chụp màn hình</string>
     <string name="send_bug_report_include_key_share_history">Gửi lịch sử yêu cầu chia sẻ khóa</string>
-    <string name="groups_header">Cộng đồng</string>
     <string name="rooms_header">Phòng</string>
     <string name="no_more_results">Không còn kết quả nào nữa</string>
     <string name="action_ignore">Bỏ qua</string>
@@ -328,7 +327,6 @@
     <string name="notice_crypto_unable_to_decrypt_friendly">Đang đợi tin nhắn này, việc này có thể mất một lúc</string>
     <string name="notice_room_leave_with_reason_by_you">Bạn đã rời phòng. Lý do: %1$s</string>
     <string name="notice_room_leave_with_reason">%1$s đã rời phòng. Lý do: %2$s</string>
-    <string name="auth_reset_password_missing_email">Địa chỉ email được liên kết đến tài khoản của bạn phải được nhập.</string>
     <string name="auth_recaptcha_message">Máy chủ nhà này muốn chắc chắn bạn không phải rô bốt</string>
     <string name="auth_msisdn_already_defined">Số điện thoại này đã được định nghĩa rồi.</string>
     <string name="auth_email_already_defined">Địa chỉ email này đã được định nghĩa rồi.</string>
@@ -491,8 +489,6 @@
     <string name="event_status_sent_message">Đã gửi tin nhắn</string>
     <string name="initial_sync_start_importing_account_data">Đồng bộ ban đầu:
 \nĐang nhập dữ liệu tài khoản</string>
-    <string name="initial_sync_start_importing_account_groups">Đồng bộ ban đầu:
-\nĐang nhập các Community</string>
     <string name="initial_sync_start_importing_account_left_rooms">Đồng bộ ban đầu:
 \nĐang nhập các phòng đã rời khỏi</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Đồng bộ ban đầu:
@@ -598,7 +594,7 @@
     <string name="deactivate_account_title">Hủy tài khoản</string>
     <string name="dialog_user_consent_submit">Xem lại ngay</string>
     <string name="encryption_information_device_key">Chìa khóa phiên</string>
-    <string name="encryption_information_device_id">Mã phiên</string>
+    <string name="device_manager_session_details_session_id">Mã phiên</string>
     <string name="encryption_information_device_name">Tên công khai</string>
     <string name="encryption_information_decryption_error">Lỗi giải mã</string>
     <string name="room_settings_labs_warning_message">Những chức năng này mang tính thí nghiệm có thể còn nhiều lỗi. Lưu ý khi dùng.</string>
@@ -1846,7 +1842,6 @@
     <string name="room_preview_not_found">Căn phòng này không thể truy cập vào thời điểm này.
 \nHãy thử lại sau, hoặc yêu cầu quản trị viên phòng kiểm tra xem bạn có quyền truy cập hay không.</string>
     <string name="room_preview_no_preview">Phòng này không thể được xem trước</string>
-    <string name="group_all_communities">Tất cả Community</string>
     <string name="please_wait">Vui lòng chờ…</string>
     <string name="change_room_directory_network">Thay đổi mạng</string>
     <string name="action_change">Thay đổi</string>
@@ -2277,4 +2272,4 @@
     <string name="unifiedpush_getdistributors_dialog_title">Chọn cách nhận thông báo</string>
     <string name="settings_notification_method">Phương thức thông báo</string>
     <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Đặt lại phương thức thông báo</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-vi/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-vi/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-vi/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-vi/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-vls/strings.xml b/library/ui-strings/src/main/res/values-vls/strings.xml
similarity index 98%
rename from vector/src/main/res/values-vls/strings.xml
rename to library/ui-strings/src/main/res/values-vls/strings.xml
index 02902711f6..f84da57ccf 100644
--- a/vector/src/main/res/values-vls/strings.xml
+++ b/library/ui-strings/src/main/res/values-vls/strings.xml
@@ -66,8 +66,6 @@
 \nUutgenodigde gesprekkn wordn geïmporteerd</string>
     <string name="initial_sync_start_importing_account_left_rooms">Initiële synchronisoasje:
 \nVerloatn gesprekkn wordn geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_groups">Initiële synchronisoasje:
-\nGemeenschappn wordn geïmporteerd</string>
     <string name="initial_sync_start_importing_account_data">Initiële synchronisoasje:
 \nAccountgegeevns wordn geïmporteerd</string>
 
diff --git a/vector/src/main/res/values-vls/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-vls/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-vls/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-vls/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
similarity index 78%
rename from vector/src/main/res/values-zh-rCN/strings.xml
rename to library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index 0549bd84a9..9f975e61e4 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -11,10 +11,10 @@
     <string name="notice_room_ban">%1$s 封禁了 %2$s</string>
     <string name="notice_avatar_url_changed">%1$s 更换了他们的头像</string>
     <string name="notice_display_name_set">%1$s 将他们的显示名称设置为 %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s 把他们的显示名称从 %2$s 改为 %3$s</string>
-    <string name="notice_display_name_removed">%1$s 移除了他们的显示名称 (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s 把主题改为： %2$s</string>
-    <string name="notice_room_name_changed">%1$s 把房间名称改为： %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s 将其显示名称从 %2$s 更改为 %3$s</string>
+    <string name="notice_display_name_removed">%1$s 移除了他们的显示名称（%2$s）</string>
+    <string name="notice_room_topic_changed">%1$s 将话题更改为：%2$s</string>
+    <string name="notice_room_name_changed">%1$s 将房间名称更改为：%2$s</string>
     <string name="notice_placed_video_call">%s 发起了一次视频通话。</string>
     <string name="notice_placed_voice_call">%s 发起了一次语音通话。</string>
     <string name="notice_answered_call">%s 已接听通话。</string>
@@ -25,12 +25,12 @@
     <string name="notice_room_visibility_world_readable">任何人。</string>
     <string name="notice_avatar_changed_too">（头像也被更改）</string>
     <string name="notice_room_name_removed">%1$s 移除了房间名称</string>
-    <string name="notice_room_topic_removed">%1$s 移除了房间主题</string>
+    <string name="notice_room_topic_removed">%1$s 移除了房间话题</string>
     <string name="notice_crypto_unable_to_decrypt">** 无法解密：%s **</string>
     <string name="notice_crypto_error_unknown_inbound_session_id">发送者的设备没有向我们发送此消息的密钥。</string>
     <string name="unable_to_send_message">无法发送消息</string>
     <string name="matrix_error">Matrix 错误</string>
-    <string name="medium_email">电子邮箱地址</string>
+    <string name="medium_email">电子邮件地址</string>
     <string name="medium_phone_number">手机号码</string>
     <string name="notice_room_withdraw">%1$s 撤回了对 %2$s 的邀请</string>
     <string name="notice_made_future_room_visibility">%1$s 让未来的房间历史记录对 %2$s 可见</string>
@@ -52,12 +52,10 @@
 \n正在导入已邀请的房间</string>
     <string name="initial_sync_start_importing_account_left_rooms">初始化同步：
 \n正在导入已离开的房间</string>
-    <string name="initial_sync_start_importing_account_groups">初始化同步：
-\n正在导入社区</string>
     <string name="initial_sync_start_importing_account_data">初始化同步：
 \n正在导入账户数据</string>
     <string name="notice_room_update">%s 升级了此房间。</string>
-    <string name="event_status_sending_message">正在发送消息…</string>
+    <string name="event_status_sending_message">正在发送消息……</string>
     <string name="notice_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 加入房间的邀请</string>
     <string name="notice_room_invite_no_invitee_with_reason">%1$s 的邀请。理由：%2$s</string>
     <string name="notice_room_invite_with_reason">%1$s 邀请了 %2$s。理由：%3$s</string>
@@ -65,7 +63,7 @@
     <string name="notice_room_join_with_reason">%1$s 加入了房间。理由：%2$s</string>
     <string name="notice_room_leave_with_reason">%1$s 离开了房间。理由：%2$s</string>
     <string name="notice_room_reject_with_reason">%1$s 已拒绝邀请。理由：%2$s</string>
-    <string name="notice_room_remove_with_reason">%1$s 踢走了 %2$s。理由：%3$s</string>
+    <string name="notice_room_remove_with_reason">%1$s移除了%2$s。理由：%3$s</string>
     <string name="notice_room_unban_with_reason">%1$s 解封了 %2$s。理由：%3$s</string>
     <string name="notice_room_ban_with_reason">%1$s 封禁了 %2$s。理由：%3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s 接受 %2$s 的邀請。理由：%3$s</string>
@@ -81,62 +79,62 @@
     <string name="notice_room_canonical_alias_unset">%1$s 为此房间移除了主要地址。</string>
     <string name="notice_room_guest_access_can_join">%1$s 已允许访客加入房间。</string>
     <string name="notice_room_guest_access_forbidden">%1$s 已禁止访客加入房间。</string>
-    <string name="notice_end_to_end_ok">%1$s 已开启端对端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s 已开启端对端加密（无法识别的演算法 %2$s）。</string>
-    <string name="notice_room_created">%1$s 创建了这个房间</string>
+    <string name="notice_end_to_end_ok">%1$s 已开启端到端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s 已开启端到端加密（无法识别的算法 %2$s）。</string>
+    <string name="notice_room_created">%1$s 创建了房间</string>
     <string name="notice_room_invite_no_invitee_by_you">你的邀请</string>
-    <string name="notice_room_created_by_you">你创建了这个房间</string>
+    <string name="notice_room_created_by_you">你创建了房间</string>
     <string name="notice_room_invite_by_you">你邀请了 %1$s</string>
     <string name="notice_room_join_by_you">你加入了房间</string>
     <string name="notice_room_leave_by_you">你离开了房间</string>
     <string name="notice_room_reject_by_you">你拒绝了邀请</string>
-    <string name="notice_room_remove_by_you">你踢了 %1$s</string>
+    <string name="notice_room_remove_by_you">你移除了 %1$s</string>
     <string name="notice_room_unban_by_you">你解封了 %1$s</string>
     <string name="notice_room_ban_by_you">你封禁了 %1$s</string>
     <string name="notice_room_withdraw_by_you">你撤回了对 %1$s 的邀请</string>
     <string name="notice_avatar_url_changed_by_you">你更换了你的头像</string>
     <string name="notice_display_name_set_by_you">你将你的显示名称设置为 %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">你将你的显示名称从 %1$s 改为 %2$s</string>
-    <string name="notice_display_name_removed_by_you">你移除了你的显示名称 (%1$s)</string>
-    <string name="notice_room_topic_changed_by_you">你把主题改为：%1$s</string>
+    <string name="notice_display_name_changed_from_by_you">你将显示名称从 %1$s 更改为 %2$s</string>
+    <string name="notice_display_name_removed_by_you">你移除了你的显示名称（%1$s）</string>
+    <string name="notice_room_topic_changed_by_you">你将话题更改为：%1$s</string>
     <string name="notice_room_avatar_changed">%1$s 更改了房间头像</string>
     <string name="notice_room_avatar_changed_by_you">你更改了房间头像</string>
-    <string name="notice_room_name_changed_by_you">你把房间名称改为：%1$s</string>
+    <string name="notice_room_name_changed_by_you">你将房间名称更改为：%1$s</string>
     <string name="notice_placed_video_call_by_you">你发起了一次视频通话。</string>
     <string name="notice_placed_voice_call_by_you">你发起了一次语音通话。</string>
     <string name="notice_call_candidates">%s 发送了数据以建立通话。</string>
     <string name="notice_call_candidates_by_you">你发送了数据以建立通话。</string>
-    <string name="notice_answered_call_by_you">你接听了通话。</string>
-    <string name="notice_ended_call_by_you">你结束了通话。</string>
-    <string name="notice_made_future_room_visibility_by_you">你已让未来的房间历史对%1$s可见</string>
+    <string name="notice_answered_call_by_you">你已接听通话。</string>
+    <string name="notice_ended_call_by_you">你已结束通话。</string>
+    <string name="notice_made_future_room_visibility_by_you">你已让未来的房间历史对 %1$s 可见</string>
     <string name="notice_room_update_by_you">你升级了此房间。</string>
     <string name="notice_room_name_removed_by_you">你移除了房间名称</string>
-    <string name="notice_room_topic_removed_by_you">你移除了房间主题</string>
+    <string name="notice_room_topic_removed_by_you">你移除了房间话题</string>
     <string name="notice_room_avatar_removed">%1$s 移除了房间头像</string>
     <string name="notice_room_avatar_removed_by_you">你移除了房间头像</string>
     <string name="notice_room_third_party_invite_by_you">你向 %1$s 发送了加入房间的邀请</string>
     <string name="notice_room_third_party_revoked_invite_by_you">你已撤回了对 %1$s 加入房间的邀请</string>
     <string name="notice_room_third_party_registered_invite_by_you">你接受了 %1$s 的邀请</string>
-    <string name="notice_widget_added">%1$s 添加了 %2$s 挂件</string>
-    <string name="notice_widget_added_by_you">你添加了 %1$s 挂件</string>
-    <string name="notice_widget_removed">%1$s 移除了 %2$s 挂件</string>
-    <string name="notice_widget_removed_by_you">你移除了 %1$s 挂件</string>
-    <string name="notice_widget_modified">%1$s 修改了 %2$s 挂件</string>
-    <string name="notice_widget_modified_by_you">你修改了 %1$s 挂件</string>
+    <string name="notice_widget_added">%1$s 添加了 %2$s 小部件</string>
+    <string name="notice_widget_added_by_you">你添加了 %1$s 小部件</string>
+    <string name="notice_widget_removed">%1$s 移除了 %2$s 小部件</string>
+    <string name="notice_widget_removed_by_you">你移除了 %1$s 小部件</string>
+    <string name="notice_widget_modified">%1$s 修改了 %2$s 小部件</string>
+    <string name="notice_widget_modified_by_you">你修改了 %1$s 小部件</string>
     <string name="power_level_admin">管理员</string>
     <string name="power_level_moderator">协管员</string>
     <string name="power_level_default">默认</string>
     <string name="power_level_custom">自定义（%1$d）</string>
     <string name="power_level_custom_no_value">自定义</string>
-    <string name="notice_power_level_changed_by_you">你更改了%1$s的权力级别。</string>
-    <string name="notice_power_level_changed">%1$s更改了%2$s的权力级别。</string>
+    <string name="notice_power_level_changed_by_you">你更改了 %1$s 的权限等级。</string>
+    <string name="notice_power_level_changed">%1$s 更改了 %2$s 的权限等级。</string>
     <string name="notice_power_level_diff">%1$s 从 %2$s 到 %3$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">你的邀请。理由：%1$s</string>
     <string name="notice_room_invite_with_reason_by_you">你邀请了 %1$s。理由：%2$s</string>
     <string name="notice_room_join_with_reason_by_you">你加入了房间。理由：%1$s</string>
     <string name="notice_room_leave_with_reason_by_you">你离开了房间。理由：%1$s</string>
     <string name="notice_room_reject_with_reason_by_you">你拒绝了邀请。理由：%1$s</string>
-    <string name="notice_room_remove_with_reason_by_you">你踢走了 %1$s。理由：%2$s</string>
+    <string name="notice_room_remove_with_reason_by_you">你移除了%1$s。理由：%2$s</string>
     <string name="notice_room_unban_with_reason_by_you">你解封了 %1$s。理由：%2$s</string>
     <string name="notice_room_ban_with_reason_by_you">你封禁了 %1$s。理由：%2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">你接受了 %1$s 的邀请。理由：%2$s</string>
@@ -152,8 +150,8 @@
     <string name="notice_room_canonical_alias_unset_by_you">你移除了此房间的主要地址。</string>
     <string name="notice_room_guest_access_can_join_by_you">你已允许访客加入房间。</string>
     <string name="notice_room_guest_access_forbidden_by_you">你已禁止访客加入房间。</string>
-    <string name="notice_end_to_end_ok_by_you">你已开启端对端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">你已开启端对端加密（无法识别的算法 %1$s）。</string>
+    <string name="notice_end_to_end_ok_by_you">你已开启端到端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">你已开启端到端加密（无法识别的算法 %1$s）。</string>
     <string name="notice_direct_room_leave_with_reason_by_you">你已离开。理由：%1$s</string>
     <string name="notice_direct_room_leave_with_reason">%1$s 已离开。理由：%2$s</string>
     <string name="notice_direct_room_join_with_reason_by_you">你已加入。理由：%1$s</string>
@@ -172,15 +170,15 @@
     <string name="notice_direct_room_join">%1$s 已加入</string>
     <string name="notice_direct_room_created_by_you">你创建了讨论</string>
     <string name="notice_direct_room_created">%1$s 创建了讨论</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">你已阻止客人加入房间。</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s已阻止客人加入房间。</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">你已允许客人加入这里。</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s 已允许客人加入这里。</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">你已阻止访客加入房间。</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s 已阻止访客加入房间。</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">你已允许访客加入这里。</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s 已允许访客加入这里。</string>
     <string name="call_notification_answer">接受</string>
     <string name="call_notification_reject">拒绝</string>
     <string name="call_notification_hangup">挂断</string>
     <string name="action_quote">引用</string>
-    <string name="action_share">分享</string>
+    <string name="action_share">共享</string>
     <string name="action_voice_call">语音通话</string>
     <string name="action_video_call">视频通话</string>
     <string name="action_mark_all_as_read">全部标记为已读</string>
@@ -216,10 +214,9 @@
     <string name="auth_login">登录</string>
     <string name="auth_submit">提交</string>
     <string name="auth_invalid_login_param">错误的用户名和/或密码</string>
-    <string name="auth_invalid_email">此电子邮箱地址似乎无效</string>
-    <string name="auth_email_already_defined">此电子邮箱地址已被使用。</string>
+    <string name="auth_invalid_email">此电子邮件地址似乎无效</string>
+    <string name="auth_email_already_defined">此电子邮件地址已被使用。</string>
     <string name="auth_forgot_password">忘记密码？</string>
-    <string name="auth_reset_password_missing_email">必须输入与你账户关联的电子邮箱地址。</string>
     <string name="login_error_invalid_home_server">请输入有效的 URL</string>
     <string name="login_error_not_json">没有包含有效的 JSON</string>
     <string name="login_error_limit_exceeded">发送了过多的请求</string>
@@ -231,7 +228,7 @@
     <string name="search_hint">搜索</string>
     <string name="search_members_hint">过滤房间成员</string>
     <string name="search_no_results">没有结果</string>
-    <string name="settings_add_email_address">添加电子邮箱地址</string>
+    <string name="settings_add_email_address">添加电子邮件地址</string>
     <string name="settings_add_phone_number">添加手机号码</string>
     <string name="settings_version">版本</string>
     <string name="settings_olm_version">olm 版本</string>
@@ -245,7 +242,7 @@
     <string name="settings_password_updated">你的密码已更新</string>
     <string name="encryption_information_decryption_error">解密错误</string>
     <string name="encryption_information_device_name">公开名称</string>
-    <string name="encryption_information_device_id">会话 ID</string>
+    <string name="device_manager_session_details_session_id">会话 ID</string>
     <string name="encryption_information_device_key">会话密钥</string>
     <string name="encryption_import_import">导入</string>
     <string name="encryption_information_verified">已验证</string>
@@ -260,7 +257,7 @@
     <string name="start_video_call">开始视频通话</string>
     <string name="option_take_photo_video">拍摄照片或视频</string>
     <string name="auth_recaptcha_message">此主服务器想确认你不是机器人</string>
-    <string name="auth_reset_password_error_unauthorized">电子邮箱地址验证失败：请确保你已点击邮件中的链接</string>
+    <string name="auth_reset_password_error_unauthorized">电子邮件地址验证失败：请确保你已点击邮件中的链接</string>
     <string name="compression_opt_list_original">原始</string>
     <string name="call_connecting">通话正在连接……</string>
     <string name="permissions_rationale_msg_record_audio">${app_name} 需要权限以访问你的麦克风来进行语音通话。</string>
@@ -301,7 +298,7 @@
     <string name="settings_old_password">当前密码</string>
     <string name="settings_unignore_user">显示所有来自 %s 的消息？</string>
     <string name="settings_select_country">选择国家</string>
-    <string name="room_settings_topic">主题</string>
+    <string name="room_settings_topic">话题</string>
     <string name="room_settings_room_read_history_rules_pref_title">房间历史可见性</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">谁可以阅读历史消息？</string>
     <string name="room_settings_read_history_entry_anyone">任何人</string>
@@ -312,13 +309,13 @@
     <string name="room_settings_category_advanced_title">高级</string>
     <string name="room_settings_room_internal_id">此房间的内部 ID</string>
     <string name="room_settings_labs_warning_message">这些是实验性功能，可能会出现不可预料的错误。请谨慎使用。</string>
-    <string name="encryption_export_e2e_room_keys">导出端对端房间密钥</string>
+    <string name="encryption_export_e2e_room_keys">导出端到端房间密钥</string>
     <string name="encryption_export_room_keys">导出房间密钥</string>
     <string name="encryption_export_room_keys_summary">导出密钥到本地文件</string>
     <string name="encryption_export_export">导出</string>
-    <string name="passphrase_enter_passphrase">输入密语</string>
-    <string name="passphrase_confirm_passphrase">确认密语</string>
-    <string name="encryption_import_e2e_room_keys">导入端对端房间密钥</string>
+    <string name="passphrase_enter_passphrase">输入口令词组</string>
+    <string name="passphrase_confirm_passphrase">确认口令词组</string>
+    <string name="encryption_import_e2e_room_keys">导入端到端房间密钥</string>
     <string name="encryption_import_room_keys">导入房间密钥</string>
     <string name="encryption_import_room_keys_summary">从本地文件导入密钥</string>
     <string name="encryption_never_send_to_unverified_devices_title">仅向已验证的会话发送加密消息</string>
@@ -343,7 +340,7 @@
 \n
 \n请在接下来的弹出窗口中授权允许访问，以便进行通话。</string>
     <string name="action_remove">移除</string>
-    <string name="room_participants_power_level_prompt">你将不能撤销这个修改，因为你正在让这个用户和你拥有相同的权力级别。
+    <string name="room_participants_power_level_prompt">你将无法撤消此更改，因为你正在将用户提升为与你相同的权限级别。
 \n你确定吗？</string>
     <string name="ssl_cert_not_trust">这可能意味着有人正在恶意劫持你的流量，或者你的手机不信任远程服务器提供的数字证书。</string>
     <string name="ssl_cert_new_account_expl">如果服务器管理员说这是预期的情况，请确保下面的指纹与管理员提供的指纹相匹配。</string>
@@ -351,11 +348,11 @@
     <string name="settings_app_info_link_summary">显示系统设置中的应用程序信息。</string>
     <string name="settings_call_invitations">通话请求</string>
     <string name="settings_app_term_conditions">使用条款</string>
-    <string name="settings_other">其他</string>
+    <string name="settings_other">其它</string>
     <string name="settings_notifications_targets">通知目标</string>
     <string name="settings_logged_in">登录为</string>
-    <string name="account_email_validation_message">请检查你的电子邮箱并点击里面包含的链接。完成时请点击继续。</string>
-    <string name="account_email_already_used_error">此电子邮箱地址已被使用。</string>
+    <string name="account_email_validation_message">请检查你的电子邮件并点击里面包含的链接。完成时请点击继续。</string>
+    <string name="account_email_already_used_error">此电子邮件地址已被使用。</string>
     <string name="account_phone_number_already_used_error">此手机号码已被使用。</string>
     <string name="room_settings_set_main_address">设置为主要地址</string>
     <string name="room_settings_unset_main_address">取消设置为主要地址</string>
@@ -419,11 +416,11 @@
     <string name="dark_theme">深色主题</string>
     <string name="black_theme">黑色主题</string>
     <string name="settings_notification_ringtone">通知声音</string>
-    <string name="settings_12_24_timestamps">使用12小时制显示时间戳</string>
-    <string name="widget_delete_message_confirmation">确定要从此房间删除此挂件吗？</string>
-    <string name="widget_integration_unable_to_create">无法创建挂件。</string>
+    <string name="settings_12_24_timestamps">使用 12 小时制显示时间戳</string>
+    <string name="widget_delete_message_confirmation">确定要从此房间中删除小部件吗？</string>
+    <string name="widget_integration_unable_to_create">无法创建小部件。</string>
     <string name="widget_integration_failed_to_send_request">发送请求失败。</string>
-    <string name="widget_integration_positive_power_level">权力级别必须是正整数。</string>
+    <string name="widget_integration_positive_power_level">权限等级必须是正整数。</string>
     <string name="widget_integration_must_be_in_room">你不在这个房间。</string>
     <string name="widget_integration_no_permission_in_room">你没权限在当前房间执行此操作。</string>
     <string name="widget_integration_missing_room_id">请求中缺失 room_id。</string>
@@ -437,7 +434,7 @@
     <string name="you_added_a_new_device">你添加了一个新会话“%s”，它正在请求加密密钥。</string>
     <string name="your_unverified_device_requesting">你的未验证会话“%s”正在请求加密密钥。</string>
     <string name="start_verification">开始验证</string>
-    <string name="title_activity_bug_report">bug报告</string>
+    <string name="title_activity_bug_report">错误报告</string>
     <string name="option_take_photo">拍摄照片</string>
     <string name="option_take_video">拍摄视频</string>
     <string name="settings_labs_native_camera">使用原生相机</string>
@@ -447,7 +444,7 @@
     <string name="encrypted_message">已加密消息</string>
     <string name="notification_noisy_notifications">响铃通知</string>
     <string name="notification_silent_notifications">静默通知</string>
-    <string name="settings_analytics">数据收集</string>
+    <string name="settings_analytics">数据分析</string>
     <string name="notification_noisy">响铃</string>
     <string name="loading">正在加载……</string>
     <string name="start_voice_call_prompt_msg">你确定要发起语音通话吗？</string>
@@ -455,19 +452,18 @@
     <string name="room_participants_ban_prompt_msg">封禁用户会把他们移出此房间并阻止他们再次加入。</string>
     <string name="room_settings_all_messages">全部消息</string>
     <string name="room_settings_add_homescreen_shortcut">添加到主屏幕</string>
-    <string name="settings_inline_url_preview">启用链接预览</string>
+    <string name="settings_inline_url_preview">内联网址预览</string>
     <string name="settings_vibrate_on_mention">提及用户时震动</string>
     <string name="create">创建</string>
     <plurals name="room_new_messages_notification">
         <item quantity="other">%d 条新消息</item>
     </plurals>
-    <string name="groups_header">社群</string>
     <string name="send_bug_report_rage_shake">摇一摇快捷反馈问题</string>
     <plurals name="membership_changes">
         <item quantity="other">%d个成员状态变动</item>
     </plurals>
     <plurals name="room_title_members">
-        <item quantity="other">%d个成员</item>
+        <item quantity="other">%d 个成员</item>
     </plurals>
     <plurals name="notification_unread_notified_messages">
         <item quantity="other">%d条未读的已通知消息</item>
@@ -477,7 +473,7 @@
         <item quantity="other">%d 个房间</item>
     </plurals>
     <plurals name="active_widgets">
-        <item quantity="other">%d个启用的挂件</item>
+        <item quantity="other">%d 个活动的小部件</item>
     </plurals>
     <string name="group_details_home">主页</string>
     <string name="rooms">房间</string>
@@ -489,8 +485,8 @@
     <string name="notification_unread_notified_messages_in_room">%1$s 条在 %2$s 中</string>
     <string name="settings_deactivate_account_section">停用账户</string>
     <string name="settings_deactivate_my_account">停用我的账户</string>
-    <string name="settings_opt_in_of_analytics">发送统计分析数据</string>
-    <string name="settings_opt_in_of_analytics_summary">${app_name} 会收集匿名统计数据来帮助我们改进程序。</string>
+    <string name="settings_opt_in_of_analytics">发送数据分析数据</string>
+    <string name="settings_opt_in_of_analytics_summary">${app_name}收集匿名数据分析以允许我们改进应用。</string>
     <string name="deactivate_account_title">停用账户</string>
     <string name="deactivate_account_content">这将使你的账户永远不再可用。你将无法登录，也不能使用相同的用户 ID 重新注册。你的账户将退出所有已加入的房间，你在身份服务器上的账户信息也会被删除。&lt;b&gt;此操作是不可逆的。&lt;/b&gt;
 \n
@@ -510,25 +506,25 @@
     <string name="action_download">下载</string>
     <string name="option_send_voice">发送语音消息</string>
     <string name="error_no_external_application_found">对不起，没有可完成此操作的外部应用。</string>
-    <string name="e2e_re_request_encryption_key">从你的其他会话上重新请求加密密钥。</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">请在其他可解密此消息的设备上启动 ${app_name}，以便其将密钥发送至当前会话。</string>
+    <string name="e2e_re_request_encryption_key">从你的其它会话上重新请求加密密钥。</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">请在其它可解密此消息的设备上启动 ${app_name}，以便其将密钥发送至当前会话。</string>
     <string name="error_empty_field_your_password">请输入你的密码。</string>
     <string name="send_bug_report_description_in_english">如果可能的话，请使用英文撰写问题描述。</string>
     <string name="settings_preview_media_before_sending">发送前预览媒体文件</string>
     <string name="command_description_emote">显示动作</string>
     <string name="command_description_ban_user">按照 ID 封禁用户</string>
     <string name="command_description_unban_user">按照 ID 解禁用户</string>
-    <string name="command_description_op_user">定义用户的权力级别</string>
+    <string name="command_description_op_user">定义用户的权限等级</string>
     <string name="command_description_deop_user">按照 ID 取消用户管理员权限</string>
     <string name="command_description_invite_user">按照 ID 邀请用户进入当前房间</string>
     <string name="command_description_join_room">用给定地址加入房间</string>
     <string name="command_description_part_room">离开房间</string>
-    <string name="command_description_topic">设置房间主题</string>
-    <string name="command_description_remove_user">按照 ID 踢出用户</string>
+    <string name="command_description_topic">设置房间话题</string>
+    <string name="command_description_remove_user">从此房间移除指定ID的用户</string>
     <string name="command_description_nick">更改你显示的显示名称</string>
     <string name="command_description_markdown">打开/关闭 markdown</string>
     <string name="command_description_clear_scalar_token">修复 Matrix Apps 管理</string>
-    <string name="room_tombstone_versioned_description">这个房间已经被替换并且不再活跃。</string>
+    <string name="room_tombstone_versioned_description">此房间已被替换，不再处于活动状态。</string>
     <string name="room_tombstone_continuation_link">对话在此继续</string>
     <string name="room_tombstone_continuation_description">这个房间是另一个对话的延续</string>
     <string name="room_tombstone_predecessor_link">点击此处查看更早的消息</string>
@@ -539,8 +535,8 @@
     <string name="resource_limit_contact_admin">联系你的服务管理员</string>
     <string name="resource_limit_soft_default">本服务器其中一项资源已超出限制，<b>部分用户将无法登录</b>。</string>
     <string name="resource_limit_hard_default">本服务器其中一项资源已超出限制。</string>
-    <string name="resource_limit_soft_mau"> 本服务器已达到每月活跃用户限制，<b>部分用户将无法登录</b>。</string>
-    <string name="resource_limit_hard_mau">本服务器已达到每月活跃用户限制。</string>
+    <string name="resource_limit_soft_mau">" 此主服务器已达到其每月活跃用户限制，因此&lt;b&gt;某些用户将无法登录&lt;/b&gt;。"</string>
+    <string name="resource_limit_hard_mau">此主服务器已达到其每月活跃用户限制。</string>
     <string name="resource_limit_hard_contact">请 %s 以继续使用本服务。</string>
     <string name="resource_limit_soft_contact">请 %s 以增加此限制的额度。</string>
     <string name="action_accept">接受</string>
@@ -559,7 +555,7 @@
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">一个或多个测试没有通过，请尝试建议的修复方法。</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">一个或多个测试没有通过，请提交错误反馈以协助我们调查此问题。</string>
     <string name="settings_troubleshoot_test_system_settings_title">系统设置。</string>
-    <string name="settings_troubleshoot_test_system_settings_success">通知已在系统设置中启用。</string>
+    <string name="settings_troubleshoot_test_system_settings_success">已在系统设置中启用通知。</string>
     <string name="settings_troubleshoot_test_system_settings_failed">通知已在系统设置中禁用。
 \n请检查系统设置。</string>
     <string name="open_settings">打开设置</string>
@@ -592,13 +588,13 @@
     <string name="settings_troubleshoot_test_service_boot_quickfix">启用开机时启动</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">检查后台限制</string>
     <string name="settings_troubleshoot_test_battery_title">电池优化</string>
-    <string name="settings_inline_url_preview_summary">若主服务器支持此功能，在聊天中预览链接内容。</string>
+    <string name="settings_inline_url_preview_summary">当主服务器支持此功能时，在聊天中预览链接。</string>
     <string name="settings_send_typing_notifs">发送正在输入通知</string>
     <string name="settings_send_typing_notifs_summary">让房间中的其他用户知道你正在输入。</string>
     <string name="settings_send_markdown">Markdown 格式化</string>
     <string name="settings_send_markdown_summary">在消息发出之前使用 Markdown 语法格式化消息。这允许你使用高级的文字格式，例如使用星号显示斜体文字。</string>
-    <string name="settings_show_read_receipts">显示已阅回执</string>
-    <string name="settings_show_read_receipts_summary">点击已阅回执以显示所有已经阅读过某条消息的用户。</string>
+    <string name="settings_show_read_receipts">显示已读回执</string>
+    <string name="settings_show_read_receipts_summary">单击已读回执以获取详细列表。</string>
     <string name="settings_show_join_leave_messages">显示加入与离开事件</string>
     <string name="settings_show_join_leave_messages_summary">邀请、移除与封禁不受影响。</string>
     <string name="settings_show_avatar_display_name_changes_messages">显示账户变动事件</string>
@@ -610,7 +606,7 @@
     <string name="merged_events_expand">展开</string>
     <string name="unknown_error">抱歉，发生了一个错误</string>
     <string name="markdown_has_been_disabled">Markdown 已禁用。</string>
-    <string name="markdown_has_been_enabled">Markdown 已启用。</string>
+    <string name="markdown_has_been_enabled">已启用 Markdown。</string>
     <string name="video_call_in_progress">视频通话中……</string>
     <string name="settings_troubleshoot_test_service_boot_success">服务将在设备重启后启动。</string>
     <string name="settings_troubleshoot_test_service_boot_failed">服务不会在设备重启后启动，在你打开 ${app_name} 一次之前你将不会收到消息通知。</string>
@@ -623,16 +619,16 @@
     <string name="settings_troubleshoot_test_battery_success">${app_name} 未被电池优化影响。</string>
     <string name="settings_troubleshoot_test_battery_failed">如果设备在未充电的情况下关屏静置一段时间，其将进入低电耗模式（Doze）。这将阻止应用访问网络并延后其运行、同步与响铃。</string>
     <string name="settings_troubleshoot_test_battery_quickfix">忽略电池优化</string>
-    <string name="encryption_export_notice">请输入用于加密被导出密钥的密语。恢复此备份时，必须输入相同的密语才能导入密钥。</string>
-    <string name="passphrase_create_passphrase">创建密语</string>
-    <string name="passphrase_passphrase_does_not_match">密语必须对应</string>
+    <string name="encryption_export_notice">请输入用于加密被导出密钥的口令词组。恢复此备份时，必须输入相同的口令词组才能导入密钥。</string>
+    <string name="passphrase_create_passphrase">创建口令词组</string>
+    <string name="passphrase_passphrase_does_not_match">口令词组不匹配</string>
     <string name="command_problem_with_parameters">指令 %s 需要更多参数，或者有些参数不正确。</string>
     <string name="no_valid_google_play_services_apk">没有可用的 Google Play Services APK。消息通知可能不能正常工作。</string>
     <string name="title_activity_keys_backup_setup">密钥备份</string>
     <string name="title_activity_keys_backup_restore">使用密钥备份</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">如果你此时登出账户，你将会失去你的已加密消息</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">密钥备份进行中。如果你此时登出账户将无法再访问你的已加密消息。</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">你的所有会话都应当启用安全密钥备份以避免失去对你的已加密消息的访问权。</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">安全密钥备份应该在你的所有会话中都处于活动状态，以避免失去对加密消息的访问权限。</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">我不想要我的已加密消息</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">正在备份密钥……</string>
     <string name="are_you_sure">确定吗？</string>
@@ -662,49 +658,49 @@
     <string name="encryption_settings_manage_message_recovery_summary">管理密钥备份</string>
     <string name="notification_silent">静音</string>
     <string name="error_empty_field_enter_user_name">请输入一个用户名。</string>
-    <string name="passphrase_empty_error_message">请输入密语</string>
-    <string name="passphrase_passphrase_too_weak">密语太弱了</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">如果你想要 ${app_name} 生成一个恢复密钥，请删除密语。</string>
+    <string name="passphrase_empty_error_message">请输入口令词组</string>
+    <string name="passphrase_passphrase_too_weak">口令词组太弱了</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">如果你想要 ${app_name} 生成一个恢复密钥，请删除口令词组。</string>
     <string name="keys_backup_setup_step1_title">永不丢失已加密消息</string>
-    <string name="keys_backup_setup_step1_description">加密房间中的信息会被端对端加密以确保安全。只有你和拥有密钥的接收方可以读取这些信息。
+    <string name="keys_backup_setup_step1_description">加密房间中的消息是端到端加密的，以确保安全。只有你和接收者拥有密钥读取这些消息。
 \n
-\n安全地备份你的密钥以免丢失信息。</string>
+\n安全地备份你的密钥以免丢失消息。</string>
     <string name="keys_backup_setup">开始使用备份密钥</string>
     <string name="keys_backup_setup_step1_advanced">（高级）</string>
     <string name="keys_backup_setup_step1_manual_export">手动导出密钥</string>
-    <string name="keys_backup_setup_step2_text_title">使用密语保护你的备份。</string>
-    <string name="keys_backup_setup_step2_text_description">我们将会在主服务器上为你的密钥保存一份加密拷贝。设置一个密语来保护你的备份的安全。
+    <string name="keys_backup_setup_step2_text_title">使用口令词组保护你的备份。</string>
+    <string name="keys_backup_setup_step2_text_description">我们将会在主服务器上为你的密钥保存一份加密拷贝。设置一个口令词组来保护你的备份的安全。
 \n
-\n为了最大的安全性，此密语应当与你的账户密码不同。</string>
-    <string name="keys_backup_setup_step2_button_title">设置密语</string>
+\n为了最大的安全性，此口令词组应当与你的账户密码不同。</string>
+    <string name="keys_backup_setup_step2_button_title">设置口令词组</string>
     <string name="keys_backup_setup_creating_backup">正在创建备份</string>
     <string name="keys_backup_setup_step1_recovery_key_alternative">或者用一个恢复密钥来保护你的备份，将其保存到另一个安全的地方。</string>
     <string name="keys_backup_setup_step2_skip_button_title">（高级）设置一个恢复密钥</string>
     <string name="keys_backup_setup_step3_success_title">成功！</string>
     <string name="keys_backup_setup_step3_text_line1">正在备份你的密钥。</string>
-    <string name="keys_backup_setup_step3_text_line2">你的恢复密钥是一张安全网——如果你忘记了密语，你可以利用它重获你的已加密消息的访问权。
+    <string name="keys_backup_setup_step3_text_line2">你的恢复密钥是一张安全网——如果你忘记了口令词组，你可以利用它重获你的已加密消息的访问权。
 \n请将你的恢复密钥保存在一个非常安全的地方，比如密码管理器中（或保险箱里）</string>
     <string name="keys_backup_setup_step3_text_line2_no_passphrase">将你的恢复密钥保存在一个非常安全的地方，比如密码管理器中（或保险箱里）</string>
     <string name="keys_backup_setup_step3_button_title">完成</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">我已经制作了一份拷贝</string>
     <string name="keys_backup_setup_step3_copy_button_title">保存恢复密钥</string>
-    <string name="keys_backup_setup_step3_share_recovery_file">分享</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">共享</string>
     <string name="keys_backup_setup_step3_save_button_title">保存为文件</string>
     <string name="keys_backup_setup_step3_please_make_copy">请制作一份拷贝</string>
-    <string name="keys_backup_setup_step3_share_intent_chooser_title">分享恢复密钥…</string>
-    <string name="keys_backup_setup_step3_generating_key_status">正在使用密语来生成恢复密钥，此过程可能会花费几秒钟。</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">与…共享恢复密钥</string>
+    <string name="keys_backup_setup_step3_generating_key_status">正在使用口令词组来生成恢复密钥，此过程可能会花费几秒钟。</string>
     <string name="recovery_key">恢复密钥</string>
     <string name="unexpected_error">意外错误</string>
     <string name="keys_backup_setup_skip_title">你确定吗？</string>
     <string name="keys_backup_setup_skip_msg">如果你登出账户或者丢失此设备，你可能再也无法访问你的信息。</string>
     <string name="keys_backup_restore_is_getting_backup_version">正在获取备份的版本 …</string>
-    <string name="keys_backup_restore_with_passphrase">使用恢复密语解锁你的已加密历史消息</string>
+    <string name="keys_backup_restore_with_passphrase">使用恢复口令词组解锁你的已加密消息历史</string>
     <string name="keys_backup_restore_use_recovery_key">使用你的恢复密钥</string>
-    <string name="keys_backup_restore_with_passphrase_helper_with_link">如果不知道你的恢复密语，你可以 %s。</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">如果不知道你的恢复口令词组，你可以 %s。</string>
     <string name="keys_backup_restore_with_recovery_key">使用恢复密钥解锁你的已加密历史消息</string>
     <string name="keys_backup_restore_key_enter_hint">输入恢复密钥</string>
     <string name="keys_backup_restore_with_key_helper">丢失了恢复密钥？你可以在设置中新建一个。</string>
-    <string name="keys_backup_passphrase_error_decrypt">无法使用此密语解密备份：请检查你输入的恢复密语是否正确。</string>
+    <string name="keys_backup_passphrase_error_decrypt">无法使用此口令词组解密备份：请检查你输入的恢复口令词组是否正确。</string>
     <string name="keys_backup_restoring_waiting_message">正在恢复备份：</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">正在计算恢复密钥…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">正在下载密钥…</string>
@@ -731,13 +727,13 @@
     <string name="keys_backup_settings_valid_signature_from_unverified_device">备份具有来自未验证会话%s的有效签名</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">备份具有来自已验证会话%s的无效签名</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">备份具有来自未验证会话%s的无效签名</string>
-    <string name="keys_backup_settings_untrusted_backup">要在此会话中使用密钥备份，请立即使用密语或恢复密钥进行恢复。</string>
+    <string name="keys_backup_settings_untrusted_backup">要在此会话中使用密钥备份，请立即使用口令词组或恢复密钥进行恢复。</string>
     <string name="keys_backup_settings_deleting_backup">正在删除备份…</string>
     <string name="keys_backup_settings_delete_confirm_title">删除备份</string>
     <string name="keys_backup_settings_delete_confirm_message">要从此服务器中删除你备份的加密密钥吗？你将无法再使用恢复密钥来读取加密的历史消息。</string>
     <string name="keys_backup_banner_recover_line1">永不丢失已加密消息</string>
     <string name="keys_backup_banner_recover_line2">使用备份密钥</string>
-    <string name="keys_backup_banner_update_line1">新加密信息密钥</string>
+    <string name="keys_backup_banner_update_line1">新安全消息密钥</string>
     <string name="keys_backup_banner_update_line2">管理密钥备份</string>
     <string name="keys_backup_banner_in_progress">正在备份密钥…</string>
     <string name="keys_backup_info_keys_all_backup_up">所有密钥都已备份</string>
@@ -781,8 +777,8 @@
 \n会话名称：%1$s
 \n最近上线于：%2$s
 \n若你未曾在另一个会话上登录，则忽略此请求。</string>
-    <string name="share_without_verifying_short_label">分享</string>
-    <string name="key_share_request">密钥分享请求</string>
+    <string name="share_without_verifying_short_label">共享</string>
+    <string name="key_share_request">密钥共享请求</string>
     <string name="ignore_request_short_label">忽略</string>
     <string name="keys_backup_setup_override_replace">替换</string>
     <string name="keys_backup_setup_override_stop">终止</string>
@@ -790,7 +786,7 @@
     <string name="sas_verified">已验证！</string>
     <string name="sas_got_it">了解了</string>
     <string name="sas_incoming_request_notif_title">验证请求</string>
-    <string name="sas_incoming_request_notif_content">%s 想验证你的装置</string>
+    <string name="sas_incoming_request_notif_content">%s 想验证你的会话</string>
     <string name="sas_error_unknown">未知错误</string>
     <string name="edit">编辑</string>
     <string name="reply">回复</string>
@@ -799,7 +795,7 @@
     <string name="invited_by">由 %s 邀请</string>
     <string name="room_list_people_empty_title">对话</string>
     <string name="room_list_rooms_empty_title">房间</string>
-    <string name="title_activity_emoji_reaction_picker">反应</string>
+    <string name="title_activity_emoji_reaction_picker">回应</string>
     <string name="action_agree">同意</string>
     <string name="message_add_reaction">添加反应</string>
     <string name="message_view_reaction">查看反应</string>
@@ -808,7 +804,6 @@
     <string name="create_new_room">创建新房间</string>
     <string name="action_change">修改</string>
     <string name="please_wait">请稍候……</string>
-    <string name="group_all_communities">所有社群</string>
     <string name="room_preview_no_preview">无法预览此房间</string>
     <string name="fab_menu_create_room">房间</string>
     <string name="create_room_action_create">创建</string>
@@ -820,10 +815,10 @@
     <string name="settings_push_rules">推送规则</string>
     <string name="settings_push_rules_no_rules">尚未定义任何推送规则</string>
     <string name="settings_push_gateway_no_pushers">没有已注册的推送通道</string>
-    <string name="push_gateway_item_app_id">app_id：</string>
-    <string name="push_gateway_item_push_key">push_key：</string>
-    <string name="push_gateway_item_app_display_name">app_display_name：</string>
-    <string name="push_gateway_item_device_name">device_name：</string>
+    <string name="push_gateway_item_app_id">应用ID：</string>
+    <string name="push_gateway_item_push_key">推送密钥：</string>
+    <string name="push_gateway_item_app_display_name">应用显示名称：</string>
+    <string name="push_gateway_item_device_name">会话显示名称：</string>
     <string name="push_gateway_item_url">URL：</string>
     <string name="push_gateway_item_format">格式：</string>
     <string name="preference_voice_and_video">音频与视频</string>
@@ -833,7 +828,7 @@
     <string name="action_revoke">撤消</string>
     <string name="action_disconnect">断开连接</string>
     <string name="action_decline">拒绝</string>
-    <string name="login_error_no_homeserver_found">这不是有效的Matrix服务器地址</string>
+    <string name="login_error_no_homeserver_found">这不是有效的 Matrix 服务器地址</string>
     <string name="login_error_homeserver_not_found">无法在此 URL 找到主服务器，请检查</string>
     <string name="action_play">播放</string>
     <string name="action_dismiss">忽略</string>
@@ -842,7 +837,7 @@
     <string name="bottom_action_notification">通知</string>
     <string name="call_failed_no_connection">${app_name} 呼叫失败</string>
     <string name="call_failed_no_connection_description">无法建立实时连接。
-\n请要求你的主服务器管理员配置 TURN 服务器以使通话可靠工作。</string>
+\n请让你的主服务器的管理员配置一个 TURN 服务器，以便呼叫能够可靠地工作。</string>
     <string name="call_select_sound_device">选择声音设备</string>
     <string name="sound_device_phone">电话</string>
     <string name="sound_device_speaker">扬声器</string>
@@ -867,8 +862,8 @@
     <string name="room_participants_action_unignore_prompt_msg">取消忽略此用户将重新显示来自他们的全部消息。</string>
     <string name="room_participants_action_cancel_invite_title">取消邀请</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">你确定想要取消邀请此用户吗？</string>
-    <string name="room_participants_remove_title">踢掉用户</string>
-    <string name="room_participants_remove_reason">踢掉理由</string>
+    <string name="room_participants_remove_title">移除用户</string>
+    <string name="room_participants_remove_reason">移除的理由</string>
     <string name="room_participants_remove_prompt_msg">用户将从此房间移除。
 \n
 \n为防止他们再次加入，你应改为封禁他们。</string>
@@ -886,13 +881,13 @@
     <string name="settings_background_fdroid_sync_mode_disabled">无后台同步</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">应用在后台时你不会收到消息通知。</string>
     <string name="settings_integrations">集成</string>
-    <string name="settings_integrations_summary">使用集成管理器管理机器人、桥接、部件和贴纸包。
-\n集成管理器接收配置数据，可以代表你修改部件、发送房间邀请及设置权力级别。</string>
+    <string name="settings_integrations_summary">使用集成管理器来管理机器人、桥接、小部件和贴纸包。
+\n集成管理器接收配置数据，并可以代表你修改小部件、发送房间邀请和设置权限等级。</string>
     <string name="settings_secure_backup_section_title">安全备份</string>
     <string name="settings_secure_backup_setup">设置安全备份</string>
     <string name="settings_secure_backup_reset">重置安全备份</string>
     <string name="settings_secure_backup_enter_to_setup">在此设备上设置</string>
-    <string name="settings_secure_backup_section_info">通过在你的服务器上备份加密密钥，防止失去对加密信息和数据的访问。</string>
+    <string name="settings_secure_backup_section_info">通过在你的服务器上备份加密密钥，防止失去对加密消息和数据的访问。</string>
     <string name="reset_secure_backup_title">为你已有的备份生成新的安全密钥或设置新的安全短语。</string>
     <string name="reset_secure_backup_warning">这将替换你的当前密钥或短语。</string>
     <string name="settings_discovery_category">发现</string>
@@ -908,24 +903,24 @@
     <string name="notification_ticker_text_dm">%1$s：%2$s</string>
     <string name="notification_ticker_text_group">%1$s：%2$s %3$s</string>
     <string name="active_widget_view_action">查看</string>
-    <string name="active_widgets_title">活动挂件</string>
-    <string name="room_widget_activity_title">挂件</string>
-    <string name="room_widget_permission_title">载入挂件</string>
-    <string name="room_widget_permission_added_by">此挂件添加者：</string>
-    <string name="room_widget_permission_webview_shared_info_title">使用它可能会设置cookie并与%s分享数据：</string>
-    <string name="room_widget_permission_shared_info_title">使用它可能会与%s分享数据：</string>
-    <string name="room_widget_failed_to_load">载入挂件失败。
+    <string name="active_widgets_title">活动小部件</string>
+    <string name="room_widget_activity_title">小部件</string>
+    <string name="room_widget_permission_title">加载小部件</string>
+    <string name="room_widget_permission_added_by">此小部件由以下人员添加：</string>
+    <string name="room_widget_permission_webview_shared_info_title">使用它可能会设置 cookie 并与 %s 共享数据：</string>
+    <string name="room_widget_permission_shared_info_title">使用它可能会与 %s 共享数据：</string>
+    <string name="room_widget_failed_to_load">加载小部件失败。
 \n%s</string>
-    <string name="room_widget_reload">重载挂件</string>
+    <string name="room_widget_reload">重新加载小部件</string>
     <string name="room_widget_open_in_browser">在浏览器中打开</string>
     <string name="room_widget_revoke_access">撤消我的访问权限</string>
     <string name="room_widget_permission_display_name">你的显示名称</string>
     <string name="room_widget_permission_avatar_url">你的头像 URL</string>
     <string name="room_widget_permission_user_id">你的用户 ID</string>
     <string name="room_widget_permission_theme">你的主题</string>
-    <string name="room_widget_permission_widget_id">挂件 ID</string>
+    <string name="room_widget_permission_widget_id">小部件 ID</string>
     <string name="room_widget_permission_room_id">房间 ID</string>
-    <string name="room_widget_resource_permission_title">挂件想使用以下资源：</string>
+    <string name="room_widget_resource_permission_title">这个小部件想要使用以下资源：</string>
     <string name="room_widget_resource_grant_permission">允许</string>
     <string name="room_widget_resource_decline_permission">阻止全部</string>
     <string name="room_widget_webview_access_camera">使用相机</string>
@@ -936,7 +931,7 @@
     <string name="keys_backup_setup_override_backup_prompt_tile">你的主服务器上已存在备份</string>
     <string name="keys_backup_setup_override_backup_prompt_description">你似乎已在另一个会话中设置密钥备份。你想要将其替换为正在创建的吗？</string>
     <string name="secure_backup_banner_setup_line1">安全备份</string>
-    <string name="secure_backup_banner_setup_line2">保护加密信息及数据的访问权</string>
+    <string name="secure_backup_banner_setup_line2">保护加密消息及数据的访问权</string>
     <string name="secure_backup_setup">设置安全备份</string>
     <string name="identity_server_not_defined">你未使用身份服务器</string>
     <string name="error_user_already_logged_in">你似乎正在试图连接到另一个主服务器。你想要登出吗？</string>
@@ -957,7 +952,7 @@
     <string name="keys_backup_unable_to_get_trust_info">获取信任信息时发生错误</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">获取密钥备份数据时发生错误</string>
     <string name="import_e2e_keys_from_file">从文件“%1$s”导入端到端密钥。</string>
-    <string name="settings_other_third_party_notices">其他第三方通知</string>
+    <string name="settings_other_third_party_notices">其它第三方通知</string>
     <string name="navigate_to_room_when_already_in_the_room">你已经在查看此房间！</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">注册令牌</string>
     <string name="send_suggestion">提出建议</string>
@@ -967,7 +962,7 @@
     <string name="send_suggestion_failed">建议发送失败 (%s)</string>
     <string name="settings_labs_show_hidden_events_in_timeline">在时间线上显示隐藏事件</string>
     <string name="bottom_action_people_x">私聊消息</string>
-    <string name="send_file_step_idle">正在等待…</string>
+    <string name="send_file_step_idle">正在等待……</string>
     <string name="send_file_step_encrypting_thumbnail">正在加密缩略图…</string>
     <string name="send_file_step_sending_thumbnail">正在发送缩略图 (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">正在加密文件…</string>
@@ -975,7 +970,7 @@
     <string name="downloaded_file">文件%1$s 已被下载！</string>
     <string name="message_edits">消息编辑</string>
     <string name="no_message_edits_found">未找到编辑</string>
-    <string name="room_filtering_filter_hint">过滤对话…</string>
+    <string name="room_filtering_filter_hint">过滤对话……</string>
     <string name="room_filtering_footer_title">找不到你要找的？</string>
     <string name="room_filtering_footer_create_new_room">创建新房间</string>
     <string name="room_filtering_footer_create_new_direct_message">发送新私聊消息</string>
@@ -988,20 +983,20 @@
     <string name="message_view_edit_history">查看编辑历史</string>
     <string name="terms_of_service">服务条款</string>
     <string name="terms_description_for_identity_server">可被其他人发现</string>
-    <string name="terms_description_for_integration_manager">使用机器人，挂件和贴纸包</string>
+    <string name="terms_description_for_integration_manager">使用机器人、桥接、小部件和贴纸包</string>
     <string name="identity_server">身份服务器</string>
     <string name="disconnect_identity_server">断开身份服务器</string>
     <string name="add_identity_server">配置身份服务器</string>
     <string name="change_identity_server">更改身份服务器</string>
     <string name="settings_discovery_identity_server_info">你正在使用 %1$s 与你知道的现有联系人相互发现。</string>
     <string name="settings_discovery_identity_server_info_none">你当前未使用身份服务器。若要与你知道的现有联系人相互发现，请在下方配置。</string>
-    <string name="settings_discovery_emails_title">可发现电子邮件地址</string>
-    <string name="settings_discovery_no_mails">发现选项将在你添加电子邮件后出现。</string>
+    <string name="settings_discovery_emails_title">可发现的电子邮件地址</string>
+    <string name="settings_discovery_no_mails">发现选项将在你添加电子邮件地址后出现。</string>
     <string name="settings_discovery_no_msisdn">发现选项将在你添加电话号码后出现。</string>
-    <string name="settings_discovery_disconnect_identity_server_info">与你的身份服务器断开意味着你将无法被其它用户发现并且无法通过电子邮件和电话邀请他人。</string>
+    <string name="settings_discovery_disconnect_identity_server_info">与你的身份服务器断开连接意味着你将不会被其他用户发现，并且你将无法通过电子邮件或电话邀请其他人。</string>
     <string name="settings_discovery_msisdn_title">可发现电话号码</string>
-    <string name="settings_discovery_confirm_mail">我们向 %s 给你发送了确认电子邮件，检查你的电子邮件并点击确认链接</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">我们向 %s 给你发送了确认电子邮件，请先检查你的电子邮件并点击确认链接</string>
+    <string name="settings_discovery_confirm_mail">我们向%s发送了一封电子邮件，请检查你的电子邮件并点击确认链接</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">我们向 %s 发送了一封电子邮件，请先检查你的电子邮件并点击确认链接</string>
     <string name="settings_discovery_enter_identity_server">输入身份服务器 URL</string>
     <string name="settings_discovery_bad_identity_server">无法连接到身份服务器</string>
     <string name="settings_discovery_please_enter_server">请输入身份服务器 url</string>
@@ -1009,10 +1004,10 @@
     <string name="settings_discovery_no_terms">你选择的身份服务器无任何服务条款。仅在你信任服务所有者时继续</string>
     <string name="settings_text_message_sent">已向 %s 发送文字消息。请输入它包含的验证码。</string>
     <string name="settings_text_message_sent_wrong_code">验证码不正确。</string>
-    <string name="settings_discovery_disconnect_with_bound_pid">你当前在身份服务器 %1$s 上分享电子邮件地址或电话号码。你需要重连接 %2$s 已停止分享。</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">你当前在身份服务器 %1$s 上共享电子邮件地址或电话号码。你需要重新连接到 %2$s 才能停止共享它们。</string>
     <string name="settings_agree_to_terms">同意身份服务器 (%s) 服务条款使你可以通过电子邮件地址或电话号码被发现。</string>
     <string name="labs_allow_extended_logging">启用详细日志。</string>
-    <string name="labs_allow_extended_logging_summary">当你发送 RageShake 时详细日志将帮助开发者提供更多日志。即使启用，应用也不会记录消息内容或任何其他私有数据。</string>
+    <string name="labs_allow_extended_logging_summary">详细日志将通过在你发送愤怒摇动（RageShake）时提供更多日志来帮助开发人员。即使启用，应用程序也不会记录消息内容或任何其他私人数据。</string>
     <string name="error_terms_not_accepted">接收你的主服务器条款和条件后请重试。</string>
     <string name="error_network_timeout">服务器似乎响应时间太长，这可能是由于连接不良或服务器错误引起的。请稍后再试。</string>
     <string name="send_attachment">发送附件</string>
@@ -1110,16 +1105,16 @@
     <string name="login_registration_not_supported">应用无法在此服务器上创建账户。
 \n
 \n你想要通过网页客户端注册吗？</string>
-    <string name="login_login_with_email_error">电子邮件未关联到任何账户。</string>
+    <string name="login_login_with_email_error">此电子邮件地址未关联到任何账户。</string>
     <string name="login_reset_password_on">在 %1$s 上重置密码</string>
     <string name="login_reset_password_notice">验证邮件将发送到你的收件箱以确认设置你的新密码。</string>
     <string name="login_reset_password_submit">下一个</string>
     <string name="login_reset_password_email_hint">电子邮件</string>
     <string name="login_reset_password_password_hint">新密码</string>
-    <string name="login_reset_password_warning_title">注意！</string>
-    <string name="login_reset_password_warning_content">更改你的密码将重置所有会话上的端对端加密密钥，从而使加密聊天记录无法读取。在重设密码之前，请设置“密钥备份”或从另一个会话中导出房间密钥。</string>
+    <string name="login_reset_password_warning_title">警告！</string>
+    <string name="login_reset_password_warning_content">更改你的密码将重置所有会话上的端到端加密密钥，从而使加密聊天记录无法读取。在重设密码之前，请设置“密钥备份”或从另一个会话中导出房间密钥。</string>
     <string name="login_reset_password_warning_submit">继续</string>
-    <string name="login_reset_password_error_not_found">电子邮件未链接到任何账户</string>
+    <string name="login_reset_password_error_not_found">此电子邮件地址未链接到任何账户</string>
     <string name="login_reset_password_mail_confirmation_title">检查你的收件箱</string>
     <string name="login_reset_password_mail_confirmation_notice">验证电子邮件已发送到 %1$s。</string>
     <string name="login_reset_password_mail_confirmation_notice_2">点击链接以确认你的新密码。跟随包含的链接验证后，请点击下方。</string>
@@ -1128,12 +1123,12 @@
     <string name="login_reset_password_success_notice">你的密码已重置。</string>
     <string name="login_reset_password_success_notice_2">你已登出全部会话，不会再接收到推送通知。若要重新启用通知，请在每个设备上再次登录。</string>
     <string name="login_reset_password_success_submit">返回登录</string>
-    <string name="login_reset_password_cancel_confirmation_title">注意</string>
+    <string name="login_reset_password_cancel_confirmation_title">警告</string>
     <string name="login_reset_password_cancel_confirmation_content">你的密码尚未更改。
 \n
 \n是否中止密码更改过程？</string>
     <string name="login_set_email_title">设置电子邮件地址</string>
-    <string name="login_set_email_notice">设置电子邮件用于恢复你的账户。之后，你可以选择允许你认识的人通过电子邮件发现你。</string>
+    <string name="login_set_email_notice">设置电子邮件地址以用于恢复你的账户。之后，你可以选择允许你认识的人通过此地址发现你。</string>
     <string name="login_set_email_mandatory_hint">电子邮件</string>
     <string name="login_set_email_optional_hint">电子邮件（可选）</string>
     <string name="login_set_email_submit">下一个</string>
@@ -1148,15 +1143,15 @@
     <string name="login_msisdn_confirm_hint">输入验证码</string>
     <string name="login_msisdn_confirm_send_again">重新发送</string>
     <string name="login_msisdn_confirm_submit">下一个</string>
-    <string name="login_msisdn_error_not_international">国际电话号码必须以 ‘+’ 开头</string>
+    <string name="login_msisdn_error_not_international">国际电话号码必须以“+”开头</string>
     <string name="login_msisdn_error_other">电话号码似乎无效。请检查</string>
     <string name="login_signup_to">在 %1$s 上注册</string>
     <string name="login_signin_username_hint">用户名或电子邮件</string>
     <string name="login_signup_username_hint">用户名</string>
     <string name="login_signup_password_hint">密码</string>
     <string name="login_signup_submit">下一个</string>
-    <string name="login_signup_error_user_in_use">用户名已占用</string>
-    <string name="login_signup_cancel_confirmation_title">注意</string>
+    <string name="login_signup_error_user_in_use">该用户名已被使用</string>
+    <string name="login_signup_cancel_confirmation_title">警告</string>
     <string name="login_signup_cancel_confirmation_content">你的账户尚未创建。是否中止注册过程？</string>
     <string name="login_a11y_choose_matrix_org">选择 matrix.org</string>
     <string name="login_a11y_choose_modular">选择 Element Matrix Services</string>
@@ -1176,14 +1171,14 @@
     <string name="login_signin_matrix_id_notice">如果你在主服务器上设置了账户，在下方使用你的 Matrix ID（例 @user:domain.com）和密码。</string>
     <string name="login_signin_matrix_id_hint">Matrix ID</string>
     <string name="login_signin_matrix_id_password_notice">如果你不知道你的密码，返回并重置。</string>
-    <string name="login_signin_matrix_id_error_invalid_matrix_id">这不是一个有效的用户标识符。期望的格式：\'@user:homeserver.org\'</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">这不是有效的用户标识符。预期格式：\'@user:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">无法找到有效的主服务器。请检查你的标识符</string>
     <string name="signed_out_title">你已登出</string>
     <string name="signed_out_notice">这可能由于多种原因：
 \n
-\n• 你已在其他会话中更改了你的密码。
+\n• 你已在其它会话中更改了你的密码。
 \n
-\n• 你已从其他会话删除了此会话。
+\n• 你已从其它会话删除了此会话。
 \n
 \n• 你的服务器管理员出于安全原因已取消你的访问权限。</string>
     <string name="signed_out_submit">重新登录</string>
@@ -1194,7 +1189,7 @@
     <string name="soft_logout_signin_submit">登录</string>
     <string name="soft_logout_signin_password_hint">密码</string>
     <string name="soft_logout_clear_data_title">清除个人数据</string>
-    <string name="soft_logout_clear_data_notice">注意：你的个人数据（包括加密密钥）仍存储在此设备上。
+    <string name="soft_logout_clear_data_notice">警告：你的个人数据（包括加密密钥）仍存储在此设备上。
 \n
 \n如果你不再使用此设备，或想登录另一个账户，请清除它。</string>
     <string name="soft_logout_clear_data_submit">清除全部数据</string>
@@ -1204,25 +1199,25 @@
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">除非你登录以恢复加密密钥，否则你将无法访问安全消息。</string>
     <string name="soft_logout_sso_not_same_user_error">当前会话用于用户 %1$s 而你提供了用户 %2$s 的凭证。${app_name} 不支持此功能。
 \n请先清除数据，然后重新登录另一个账户。</string>
-    <string name="permalink_malformed">你的 matrix.to 链接更是不正确</string>
+    <string name="permalink_malformed">你的 matrix.to 链接格式错误</string>
     <string name="bug_report_error_too_short">描述太短</string>
     <string name="notification_initial_sync">初始同步…</string>
     <string name="settings_advanced_settings">高级设置</string>
     <string name="settings_developer_mode">开发者模式</string>
     <string name="settings_developer_mode_summary">开发者模式激活隐藏的功能，也可能使应用不稳定。仅供开发者使用！</string>
-    <string name="settings_rageshake">摇一摇</string>
+    <string name="settings_rageshake">愤怒摇动（Rageshake）</string>
     <string name="settings_rageshake_detection_threshold">检测阈值</string>
     <string name="settings_rageshake_detection_threshold_summary">摇动手机以测试检测阈值</string>
     <string name="rageshake_detected">检测到摇动！</string>
     <string name="settings">设置</string>
     <string name="devices_current_device">当前会话</string>
-    <string name="devices_other_devices">其他会话</string>
+    <string name="devices_other_devices">其它会话</string>
     <string name="autocomplete_limited_results">仅显示第一个结果，请输入更多字符…</string>
-    <string name="settings_developer_mode_fail_fast_title">快速失败</string>
+    <string name="settings_developer_mode_fail_fast_title">快速失败（Fail-fast）</string>
     <string name="settings_developer_mode_fail_fast_summary">发生意外错误时，${app_name} 可能更经常崩溃</string>
     <string name="command_description_shrug">在明文消息前添加 ¯\\_(ツ)_/¯</string>
     <string name="create_room_encryption_title">启用加密</string>
-    <string name="create_room_encryption_description">加密一经启用，便无法禁用。</string>
+    <string name="create_room_encryption_description">启用后，无法禁用加密。</string>
     <string name="login_error_threepid_denied">你的电子邮件域无权注册此服务器</string>
     <string name="verification_conclusion_warning">未信任的登录</string>
     <string name="verification_sas_match">匹配</string>
@@ -1232,15 +1227,15 @@
 \n
 \n - 你的主服务器
 \n - 你验证的用户连接到的主服务器
-\n - 你或其它用户的网络连接
+\n - 你或其他用户的网络连接
 \n - 你或其他用户的设备</string>
     <string name="sent_a_video">视频。</string>
     <string name="sent_an_image">图片。</string>
     <string name="sent_an_audio_file">音频</string>
     <string name="sent_a_file">文件</string>
     <string name="send_a_sticker">贴纸</string>
-    <string name="verification_request_waiting">正在等待…</string>
-    <string name="verification_request_other_cancelled">%s 已取消</string>
+    <string name="verification_request_waiting">正在等待……</string>
+    <string name="verification_request_other_cancelled">%s已取消</string>
     <string name="verification_request_you_cancelled">你已取消</string>
     <string name="verification_request_other_accepted">%s 已接受</string>
     <string name="verification_request_you_accepted">你已接受</string>
@@ -1254,9 +1249,9 @@
     <string name="verification_no_scan_emoji_title">通过比较表情符号验证</string>
     <string name="verification_verify_user">验证 %s</string>
     <string name="verification_verified_user">已验证 %s</string>
-    <string name="verification_request_waiting_for">正在等待 %s…</string>
-    <string name="room_profile_not_encrypted_subtitle">此房间的消息未经端对端加密。</string>
-    <string name="room_profile_encrypted_subtitle">该房间的消息已被端对端加密。
+    <string name="verification_request_waiting_for">正在等待%s……</string>
+    <string name="room_profile_not_encrypted_subtitle">此房间的消息未经端到端加密。</string>
+    <string name="room_profile_encrypted_subtitle">该房间的消息已端到端加密。
 \n
 \n你的消息受加密保护，并且只有你和消息接收者拥有唯一解密密钥。</string>
     <string name="room_profile_section_security">安全</string>
@@ -1281,40 +1276,40 @@
     <string name="room_member_power_level_default_in">%1$s里的默认</string>
     <string name="room_member_power_level_custom_in">%2$s里的自定义（%1$d）</string>
     <string name="rendering_event_error_type_of_event_not_handled">${app_name} 无法处理类型为 \'%1$s\' 的事件</string>
-    <string name="rendering_event_error_exception">${app_name} 在渲染 id 为 \'%1$s\' 的事件内容时遇到了一个问题</string>
+    <string name="rendering_event_error_exception">${app_name} 在呈现 ID 为“%1$s”的事件内容时遇到问题</string>
     <string name="unignore">取消忽略</string>
-    <string name="verify_cannot_cross_sign">该会话无法与你的其他会话共享此验证。
+    <string name="verify_cannot_cross_sign">该会话无法与你的其它会话共享此验证。
 \n验证将保存在本地，并在此应用的未来版本中共享。</string>
     <string name="command_description_rainbow">给给定的消息和彩虹一样上色后发送</string>
     <string name="command_description_rainbow_emote">和彩虹一样给给定的表情上色后发送</string>
     <string name="settings_category_timeline">时间线</string>
     <string name="settings_category_composer">消息编辑器</string>
-    <string name="room_settings_enable_encryption">启用端对端加密…</string>
+    <string name="room_settings_enable_encryption">启用端到端加密……</string>
     <string name="room_settings_enable_encryption_dialog_title">是否启用加密？</string>
     <string name="room_settings_enable_encryption_dialog_content">房间加密一经启用，便无法禁用。在加密房间中，发送的消息无法被服务器看到，只能被房间的参与者看到。启用加密可能会使许多机器人和桥接无法正常运作。</string>
     <string name="room_settings_enable_encryption_dialog_submit">启用加密</string>
     <string name="verification_request_notice">为保证安全，请核对一次性代码以验证 %s。</string>
-    <string name="verification_request_start_notice">为保证安全，请当面验证，或者使用其他通讯方式验证。</string>
+    <string name="verification_request_start_notice">为保证安全，请当面验证，或者使用其它通讯方式验证。</string>
     <string name="verification_emoji_notice">比较独特表情，确保它们以相同顺序出现。</string>
     <string name="verification_code_notice">与其他用户设备上显示的代码比较。</string>
-    <string name="verification_conclusion_ok_notice">与此用户的消息端对端加密，无法被第三方读取。</string>
+    <string name="verification_conclusion_ok_notice">与此用户的消息是端到端加密的，无法被第三方读取。</string>
     <string name="verification_conclusion_ok_self_notice">你的新会话已验证。它可以访问你的加密消息，其他用户会将其视为可信任。</string>
     <string name="encryption_information_cross_signing_state">交叉签名</string>
-    <string name="encryption_information_dg_xsigning_complete">交叉签名已启用
+    <string name="encryption_information_dg_xsigning_complete">已启用交叉签名
 \n设备上的私钥。</string>
-    <string name="encryption_information_dg_xsigning_trusted">交叉签名已启用
+    <string name="encryption_information_dg_xsigning_trusted">已启用交叉签名
 \n密钥可信任。
 \n私钥未知</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">交叉签名已启用。
+    <string name="encryption_information_dg_xsigning_not_trusted">已启用交叉签名。
 \n密钥未信任</string>
-    <string name="encryption_information_dg_xsigning_disabled">交叉签名未启用</string>
-    <string name="settings_hs_admin_e2e_disabled">你的服务器管理员已默认禁用私有房间和私聊消息端对端加密。</string>
-    <string name="settings_active_sessions_list">活跃的会话</string>
+    <string name="encryption_information_dg_xsigning_disabled">未启用交叉签名</string>
+    <string name="settings_hs_admin_e2e_disabled">你的服务器管理员已默认禁用私有房间和私聊消息端到端加密。</string>
+    <string name="settings_active_sessions_list">可用会话</string>
     <string name="settings_active_sessions_show_all">显示全部会话</string>
     <string name="settings_active_sessions_manage">管理会话</string>
     <string name="settings_active_sessions_signout_device">登出此会话</string>
     <string name="settings_failed_to_get_crypto_device_info">加密信息不可用</string>
-    <string name="settings_active_sessions_verified_device_desc">此会话对安全消息可信因为你已验证它：</string>
+    <string name="settings_active_sessions_verified_device_desc">因为你已验证此会话，所以其在安全地收发消息上可受信任：</string>
     <string name="settings_active_sessions_unverified_device_desc">验证此会话以将其标记为可信，并授予其访问加密消息的权限。如果你未登录此会话，则你的账户可能已被盗：</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="other">%d 个活动会话</item>
@@ -1323,17 +1318,17 @@
     <string name="verification_open_other_to_verify">使用现有会话来验证此会话，并授予其访问加密消息的权限。</string>
     <string name="verification_profile_verify">验证</string>
     <string name="verification_profile_verified">已验证</string>
-    <string name="verification_profile_warning">注意</string>
+    <string name="verification_profile_warning">警告</string>
     <string name="room_member_profile_failed_to_get_devices">无法获取会话</string>
     <string name="room_member_profile_sessions_section_title">会话</string>
     <string name="trusted">可信任</string>
     <string name="not_trusted">未信任</string>
-    <string name="verification_profile_device_verified_because">此会话可信任，可以用于收发加密消息，因为 %1$s（%2$s）已验证了它：</string>
+    <string name="verification_profile_device_verified_because">可信任此会话用于安全地收发消息，因为%1$s（%2$s）已验证了它：</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) 使用新会话登录：</string>
     <string name="verification_profile_device_untrust_info">在此用户信任此会话之前，发送到该会话和从该会话发送的消息均标有警告。或者，你可以手动进行验证。</string>
     <string name="initialize_cross_signing">初始化交叉签名</string>
     <string name="reset_cross_signing">重置密钥</string>
-    <string name="a11y_qr_code_for_verification">二维码</string>
+    <string name="a11y_qr_code_for_verification">QR码</string>
     <string name="qr_code_scanned_by_other_notice">快要完成了！%s 显示对勾了吗？</string>
     <string name="qr_code_scanned_by_other_yes">是</string>
     <string name="qr_code_scanned_by_other_no">否</string>
@@ -1341,10 +1336,10 @@
     <string name="no_connectivity_to_the_server_indicator_airplane">飞行模式已打开</string>
     <string name="settings_dev_tools">开发工具</string>
     <string name="settings_account_data">账户数据</string>
-    <string name="verification_cannot_access_other_session">使用恢复密语或密钥</string>
+    <string name="verification_cannot_access_other_session">使用恢复口令词组或密钥</string>
     <string name="verification_use_passphrase">如果你无法访问已有会话</string>
     <string name="enter_secret_storage_invalid">无法在存储中找到秘密</string>
-    <string name="message_action_item_redact">移除…</string>
+    <string name="message_action_item_redact">移除……</string>
     <string name="share_confirm_room">你想要发送此附件到 %1$s 吗？</string>
     <plurals name="send_images_with_original_size">
         <item quantity="other">发送原始尺寸图片</item>
@@ -1373,9 +1368,9 @@
 \n- 设备使用的网络连接
 \n
 \n我们推荐你在设置中立即更换你的密码和恢复密钥。</string>
-    <string name="verify_cancelled_notice">已取消验证。 您可以重新开始验证。</string>
+    <string name="verify_cancelled_notice">已取消验证。 你可以重新开始验证。</string>
     <string name="verification_cancelled">验证已取消</string>
-    <string name="recovery_passphrase">恢复密语</string>
+    <string name="recovery_passphrase">恢复口令词组</string>
     <string name="message_key">消息密钥</string>
     <string name="enter_account_password">输入你的 %s 以继续。</string>
     <string name="bootstrap_dont_reuse_pwd">不要使用你的账户密码。</string>
@@ -1386,7 +1381,7 @@
     <string name="keep_it_safe">保持安全</string>
     <string name="finish">完成</string>
     <string name="bootstrap_crosssigning_progress_initializing">发布创建的身份密钥</string>
-    <string name="bootstrap_crosssigning_progress_pbkdf2">从密语生成安全密钥</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">从口令词组生成安全密钥</string>
     <string name="bootstrap_crosssigning_progress_default_key">正在定义 SSSS 默认密钥</string>
     <string name="bootstrap_crosssigning_progress_save_msk">正在同步主密钥</string>
     <string name="bootstrap_crosssigning_progress_save_usk">正在同步用户密钥</string>
@@ -1399,7 +1394,7 @@
     <string name="command_description_spoiler">将给定信息作为剧透发送</string>
     <string name="spoiler">剧透</string>
     <string name="reaction_search_type_hint">输入关键字以查找反应。</string>
-    <string name="seen_by">已阅</string>
+    <string name="seen_by">已读</string>
     <string name="room_member_jump_to_read_receipt">跳至已读回执</string>
     <string name="event_redacted_by_admin_reason_with_reason">事件被房间管理员调整，理由：%1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">密钥已是最新！</string>
@@ -1409,7 +1404,7 @@
 \n
 \n你也可以通过设置菜单来建立保护备份以及管理你的密钥。</string>
     <string name="encryption_enabled">加密已开启</string>
-    <string name="encryption_enabled_tile_description">本房间信息已经端对端加密。验证成员时，请查看其个人档案以了解更多信息。</string>
+    <string name="encryption_enabled_tile_description">本房间的消息端到端加密。在成员用户资料中了解更多信息与验证成员。</string>
     <string name="encryption_not_enabled">加密未开启</string>
     <string name="encryption_unknown_algorithm_tile_description">不支持本房间使用的加密方式</string>
     <string name="room_created_summary_item">%s 创建并配置了房间。</string>
@@ -1419,15 +1414,15 @@
     <string name="qr_code_scanned_verif_waiting">正在等候 %s…</string>
     <string name="error_failed_to_import_keys">导入密钥失败</string>
     <string name="settings_notification_configuration">通知配置</string>
-    <string name="settings_messages_in_e2e_one_to_one">一对一聊天的加密信息</string>
-    <string name="settings_messages_in_e2e_group_chat">群聊的加密信息</string>
+    <string name="settings_messages_in_e2e_one_to_one">一对一聊天的加密消息</string>
+    <string name="settings_messages_in_e2e_group_chat">群聊的加密消息</string>
     <string name="settings_messages_at_room">消息包含 @room</string>
     <string name="settings_when_rooms_are_upgraded">当房间升级</string>
     <string name="settings_troubleshoot_title">故障诊断</string>
     <string name="command_description_plain">以纯文本形式发送消息，而不将其解释为 markdown</string>
     <string name="auth_invalid_login_param_space_in_password">用户名和/或密码不正确。输入的密码以空格开头或结尾，请检查。</string>
     <string name="auth_invalid_login_deactivated_account">此账户已停用。</string>
-    <string name="room_message_placeholder">消息…</string>
+    <string name="room_message_placeholder">消息……</string>
     <string name="upgrade_security">加密升级可用</string>
     <string name="security_prompt_text">验证你自己和其他人以保证你的聊天安全</string>
     <string name="bootstrap_enter_recovery">输入你的 %s 以继续</string>
@@ -1437,25 +1432,25 @@
     <string name="bootstrap_progress_checking_backup">检查备份密钥</string>
     <string name="bootstrap_progress_checking_backup_with_info">检查备份密钥 (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">获取曲线密钥</string>
-    <string name="bootstrap_progress_generating_ssss">从密语生成 SSSS 密钥</string>
-    <string name="bootstrap_progress_generating_ssss_with_info">从密语生成 SSSS 密钥（%s）</string>
+    <string name="bootstrap_progress_generating_ssss">从口令词组生成 SSSS 密钥</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">从口令词组生成 SSSS 密钥（%s）</string>
     <string name="bootstrap_progress_generating_ssss_recovery">从恢复密钥生成 SSSS 密钥</string>
     <string name="bootstrap_progress_storing_in_sss">正在在 SSSS 中保存密钥备份秘密</string>
-    <string name="bootstrap_migration_enter_backup_password">输入你的密钥备份密语以继续。</string>
+    <string name="bootstrap_migration_enter_backup_password">输入你的密钥备份口令词组以继续。</string>
     <string name="bootstrap_migration_use_recovery_key">使用你的密钥备份恢复密钥</string>
-    <string name="bootstrap_migration_with_passphrase_helper_with_link">不知道你的密钥备份密语，你可以 %s。</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">不知道你的密钥备份口令词组，你可以 %s。</string>
     <string name="bootstrap_migration_backup_recovery_key">密钥备份恢复密钥</string>
     <string name="settings_security_prevent_screenshots_title">阻止应用内屏幕截图</string>
-    <string name="settings_security_prevent_screenshots_summary">启用此设置添加 FLAG_SECURE 到所有活动。重启应用使更改生效。</string>
+    <string name="settings_security_prevent_screenshots_summary">启用此设置会将 FLAG_SECURE 添加到所有活动项。重新启动应用程序以使更改生效。</string>
     <string name="error_saving_media_file">无法保存媒体文件</string>
-    <string name="change_password_summary">选择新的账户密码…</string>
-    <string name="use_other_session_content_description">在你的其他设备上使用最新的${app_name} 网页版、${app_name} 桌面版、${app_name} iOS 版、${app_name} 安卓版，或其他能够交叉签名的 Matrix 客户端</string>
+    <string name="change_password_summary">设置新账户密码……</string>
+    <string name="use_other_session_content_description">在你的其它设备上使用最新的 ${app_name}、${app_name} Web、${app_name} Desktop、${app_name} iOS、${app_name} for Android 或其他支持交叉签名的 Matrix 客户端</string>
     <string name="app_desktop_web">${app_name} Web
 \n${app_name} Desktop</string>
     <string name="app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capable_client">或其他能够交叉签名的 Matrix 客户端</string>
-    <string name="use_latest_app">在你的其他设备上使用最新的 ${app_name}：</string>
+    <string name="or_other_mx_capable_client">或其它支持交叉签名的 Matrix 客户端</string>
+    <string name="use_latest_app">在你的其它设备上使用最新的 ${app_name}：</string>
     <string name="command_description_discard_session">强制丢弃加密房间中的当前出站群组会话</string>
     <string name="command_description_discard_session_not_handled">仅在加密房间中支持</string>
     <string name="enter_secret_storage_passphrase_or_key">使用你的 %1$s 或使用你的 %2$s 继续。</string>
@@ -1470,7 +1465,7 @@
     <string name="cross_signing_verify_by_text">使用文本手动验证</string>
     <string name="crosssigning_verify_session">验证登录</string>
     <string name="cross_signing_verify_by_emoji">使用表情交互式验证</string>
-    <string name="confirm_your_identity">通过从你的其他会话验证此登录确认你的身份，授权它访问你的加密消息。</string>
+    <string name="confirm_your_identity">通过从你的其它会话验证此登录确认你的身份，授权它访问你的加密消息。</string>
     <string name="error_empty_field_choose_user_name">请选择用户名。</string>
     <string name="error_empty_field_choose_password">请选择密码。</string>
     <string name="external_link_confirmation_title">仔细检查此链接</string>
@@ -1489,7 +1484,7 @@
     </plurals>
     <string name="invite_users_to_room_failure">我们无法邀请用户，请检查你想要邀请的用户并重试。</string>
     <string name="choose_locale_current_locale_title">当前语言</string>
-    <string name="choose_locale_other_locales_title">其他可用语言</string>
+    <string name="choose_locale_other_locales_title">其它可用语言</string>
     <string name="choose_locale_loading_locales">正在载入可用语言…</string>
     <string name="open_terms_of">打开 %s 条款</string>
     <string name="disconnect_identity_server_dialog_content">是否从身份服务器 %s 断开？</string>
@@ -1497,12 +1492,12 @@
     <string name="identity_server_error_outdated_home_server">无法执行此操作。主服务器已过期。</string>
     <string name="identity_server_error_no_identity_server_configured">请先配置身份服务器。</string>
     <string name="identity_server_error_terms_not_signed">请先在设置中接受身份服务器的条款。</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">为了你的隐私，${app_name} 仅支持发送用户电子邮件和电话号码的哈希值。</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">为了你的隐私，${app_name}仅支持发送经过哈希处理的用户电子邮件的和电话号码。</string>
     <string name="identity_server_error_binding_error">关联失败。</string>
     <string name="identity_server_error_no_current_binding_error">当前与此标识符没有关联。</string>
     <string name="identity_server_set_default_notice">你的主服务器（%1$s）建议使用 %2$s 作为你的身份服务器</string>
     <string name="identity_server_set_default_submit">使用 %1$s</string>
-    <string name="identity_server_set_alternative_notice">或者，你可以输入任何其他身份服务器 URL</string>
+    <string name="identity_server_set_alternative_notice">或者，你可以输入任何其它身份服务器网址</string>
     <string name="identity_server_set_alternative_notice_no_default">输入身份服务器 URL</string>
     <string name="identity_server_set_alternative_submit">提交</string>
     <string name="power_level_edit_title">设置角色</string>
@@ -1513,10 +1508,10 @@
     <string name="a11y_stop_camera">停止相机</string>
     <string name="a11y_start_camera">启动相机</string>
     <string name="bottom_sheet_setup_secure_backup_title">安全备份</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">通过在你的服务器上备份加密密钥，防止失去对加密信息和数据的访问。</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">通过在你的服务器上备份加密密钥，防止失去对加密消息和数据的访问。</string>
     <string name="bottom_sheet_setup_secure_backup_submit">设置</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">使用安全密钥</string>
-    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全密钥存储在安全的地方如密码管理器或保险箱。</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全密钥以存储在密码管理器或保险箱等安全位置。</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">使用安全短语</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">输入仅有你知道的秘密短语，生成备份用的密钥。</string>
     <string name="bottom_sheet_save_your_recovery_key_title">保存你的安全密钥</string>
@@ -1526,7 +1521,7 @@
     <string name="set_a_security_phrase_hint">安全短语</string>
     <string name="set_a_security_phrase_again_notice">再次输入你的安全短语以确认。</string>
     <string name="room_settings_name_hint">房间名称</string>
-    <string name="room_settings_topic_hint">主题</string>
+    <string name="room_settings_topic_hint">话题</string>
     <string name="room_settings_save_success">你已成功更改房间设置</string>
     <string name="notice_crypto_unable_to_decrypt_final">你无法访问此消息</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">正在等待此消息，可能会花费一些时间</string>
@@ -1536,7 +1531,7 @@
     <string name="crypto_error_withheld_generic">你无法访问此消息因为发送者有意不发送密钥</string>
     <string name="notice_crypto_unable_to_decrypt_merged">正在等待加密历史</string>
     <string name="disclaimer_title">Riot 现已成为 Element！</string>
-    <string name="disclaimer_content">我们很高兴地宣布我们改名了！你的应用已经更新到最新版本，并且你已登录你的账户。</string>
+    <string name="disclaimer_content">我们很高兴地宣布我们已经更名了！你的应用程序是最新的，并且你已登录到你的账户。</string>
     <string name="disclaimer_negative_button">明白了</string>
     <string name="disclaimer_positive_button">了解更多</string>
     <string name="save_recovery_key_chooser_hint">将恢复密钥保存到</string>
@@ -1560,20 +1555,20 @@
     <string name="settings_security_pin_code_title">启用 PIN</string>
     <string name="settings_security_pin_code_summary">如果你想要重置你的 PIN，点按忘记 PIN 登出并重置。</string>
     <string name="settings_call_show_confirmation_dialog_title">防止意外通话</string>
-    <string name="settings_call_show_confirmation_dialog_summary">发起通话之前要求确认</string>
+    <string name="settings_call_show_confirmation_dialog_summary">在开始通话之前要求确认</string>
     <string name="no_permissions_to_start_conf_call">你没有权限在此房间发起会议通话</string>
     <string name="video_meeting">发起视频会议</string>
     <string name="audio_meeting">发起音频会议</string>
-    <string name="audio_video_meeting_description">会议使用 Jitsi 安全与许可政策。你的会议进行期间当前房间内的所有人将看到加入邀请。</string>
+    <string name="audio_video_meeting_description">会议使用 Jitsi 安全和权限策略。 当前在会议室中的所有人都会在会议进行期间看到加入邀请。</string>
     <string name="cannot_call_yourself">你无法呼叫你自己</string>
     <string name="cannot_call_yourself_with_invite">你无法与自己通话，请等待参与者接受邀请</string>
-    <string name="failed_to_add_widget">添加挂件失败</string>
-    <string name="failed_to_remove_widget">移除挂件失败</string>
+    <string name="failed_to_add_widget">添加小部件失败</string>
+    <string name="failed_to_remove_widget">移除小部件失败</string>
     <plurals name="encryption_import_room_keys_success">
         <item quantity="other">成功导入 %1$d/%2$d 个密钥。</item>
     </plurals>
     <string name="room_manage_integrations">管理集成</string>
-    <string name="room_no_active_widgets">无活动挂件</string>
+    <string name="room_no_active_widgets">没有活动的小部件</string>
     <string name="create_room_federation_error">房间已创建，但由于以下原因一些邀请尚未发送：
 \n
 \n%s</string>
@@ -1588,15 +1583,15 @@
     <string name="auth_msisdn_already_defined">此电话号码已定义。</string>
     <string name="settings_phone_number_empty">你的账户尚未添加电话号码</string>
     <string name="settings_emails">电子邮件地址</string>
-    <string name="settings_emails_empty">你的账户尚未添加电子邮件</string>
+    <string name="settings_emails_empty">你的账户尚未添加电子邮件地址</string>
     <string name="settings_phone_numbers">电话号码</string>
     <string name="settings_remove_three_pid_confirmation_content">移除 %s？</string>
     <string name="error_threepid_auth_failed">请确认你已点击我们向你发送的电子邮件中的链接。</string>
     <string name="settings_emails_and_phone_numbers_title">电子邮件和电话号码</string>
-    <string name="settings_emails_and_phone_numbers_summary">管理链接到你的 Matrix 账户的电子邮件和电话号码</string>
+    <string name="settings_emails_and_phone_numbers_summary">管理与你的 Matrix 账户链接的电子邮件地址和电话号码</string>
     <string name="settings_text_message_sent_hint">代码</string>
-    <string name="login_msisdn_notice">请使用国际格式（电话号码必须以 ‘+’ 开始）</string>
-    <string name="confirm_your_identity_quad_s">通过验证此登录确认你的身份，授权它访问加密信息。</string>
+    <string name="login_msisdn_notice">请使用国际格式（电话号码必须以“+”开头）</string>
+    <string name="confirm_your_identity_quad_s">验证此登录来确认你的身份，授权其访问加密消息。</string>
     <string name="error_opening_banned_room">无法打开你被封禁的房间。</string>
     <string name="room_error_not_found">无法找到此房间。请确认它存在。</string>
     <string name="no_permissions_to_start_webrtc_call">你没有权限在此房间发起通话</string>
@@ -1610,9 +1605,9 @@
 \n
 \n小心使用，它可能导致意外行为。</string>
     <string name="universal_link_malformed">链接格式不正确</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">每次打开 ${app_name} 都要求 PIN 码。</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">在 2 分钟未使用 ${app_name} 后要求 PIN 码。</string>
-    <string name="settings_security_pin_code_grace_period_title">2 分钟后要求 PIN</string>
+    <string name="settings_security_pin_code_grace_period_summary_off">每次打开 ${app_name} 时都需要 PIN 码。</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">未使用 ${app_name} 2 分钟后需要 PIN 码。</string>
+    <string name="settings_security_pin_code_grace_period_title">2 分钟后需要 PIN 码</string>
     <string name="settings_security_pin_code_notifications_summary_off">仅在一个简单的通知中显示未读消息的数量。</string>
     <string name="settings_security_pin_code_notifications_summary_on">显示详情，如房间名称和消息内容。</string>
     <string name="settings_security_pin_code_notifications_title">在通知中显示内容</string>
@@ -1627,20 +1622,20 @@
     </plurals>
     <string name="secure_backup_reset_no_history">你将重新启动，没有历史记录，消息，受信任的设备或受信任的用户</string>
     <string name="secure_backup_reset_if_you_reset_all">如果你重置一切</string>
-    <string name="secure_backup_reset_all_no_other_devices">仅当没有其他设备可用来验证此设备时，才执行此操作。</string>
+    <string name="secure_backup_reset_all_no_other_devices">仅当没有其它设备可用来验证此设备时，才执行此操作。</string>
     <string name="secure_backup_reset_all">全部重置</string>
     <string name="bad_passphrase_key_reset_all_action">忘记或丢失了所有的恢复选项？重置一切</string>
     <string name="direct_room_created_summary_item_by_you">你已加入。</string>
     <string name="direct_room_created_summary_item">%s 已加入。</string>
-    <string name="direct_room_encryption_enabled_tile_description">此聊天的消息是端对端加密的。</string>
+    <string name="direct_room_encryption_enabled_tile_description">此聊天的消息是端到端加密的。</string>
     <string name="direct_room_profile_section_more_leave">离开</string>
     <string name="direct_room_profile_section_more_settings">设置</string>
-    <string name="direct_room_profile_encrypted_subtitle">此处的消息已被端对端加密。
+    <string name="direct_room_profile_encrypted_subtitle">此处的消息已端到端加密。
 \n
 \n你的消息受加密保护，并且只有你和消息接收者拥有唯一解密密钥。</string>
-    <string name="direct_room_profile_not_encrypted_subtitle">此处的消息未经端对端加密。</string>
-    <string name="login_error_outdated_homeserver_warning_content">此主服务器正在运行较旧版本。要求你的主服务器管理员升级。你可以继续，但一些功能可能无法正确工作。</string>
-    <string name="direct_room_join_rules_invite_by_you">你仅发出此邀请。</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">此处的消息未经端到端加密。</string>
+    <string name="login_error_outdated_homeserver_warning_content">此主服务器正在运行旧版本。 请让你的主服务器管理员升级。 你可以继续，但某些功能可能无法正常工作。</string>
+    <string name="direct_room_join_rules_invite_by_you">你将此房间设为仅邀请。</string>
     <string name="direct_room_join_rules_invite">%1$s 仅发出此邀请。</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">在加密房间显示完整历史</string>
     <string name="notification_unread_notified_messages_and_invitation">%1$s 和 %2$s</string>
@@ -1661,16 +1656,16 @@
     <string name="no_permissions_to_start_conf_call_in_direct_room">你没有权限发起会议通话</string>
     <string name="action_reset">重置</string>
     <string name="permissions_denied_add_contact">允许访问你的联系人。</string>
-    <string name="permissions_denied_qr_code">如需扫描二维码，你须允许相机访问权限。</string>
+    <string name="permissions_denied_qr_code">如需扫描QR码，你须允许相机访问权限。</string>
     <string name="no_more_results">没有更多结果</string>
-    <string name="start_chatting">开始畅聊</string>
+    <string name="start_chatting">开始聊天</string>
     <string name="room_alias_delete_confirmation">删除地址 \"%1$s\"？</string>
     <string name="room_alias_unpublish_confirmation">取消发布地址 \"%1$s\"？</string>
     <string name="room_alias_published_alias_add_manually_submit">发布</string>
     <string name="room_alias_published_alias_add_manually">手动发布新地址</string>
     <string name="room_alias_published_other">其它发布的地址：</string>
     <string name="room_alias_published_alias_main">这是主要地址</string>
-    <string name="room_alias_published_alias_subtitle">发布的地址可以被任何服务器上的任何人用来加入你的房间。要发布一个地址，它必须先被设为一个本地地址。</string>
+    <string name="room_alias_published_alias_subtitle">任何服务器上的任何人都可用发布的地址加入你的房间。一个地址必须先设置为本地地址才可发布。</string>
     <string name="room_alias_published_alias_title">发布的地址</string>
     <string name="room_settings_alias_subtitle">查看和管理此房间的地址，以及它在房间目录中的可见性。</string>
     <string name="room_settings_alias_title">房间地址</string>
@@ -1687,7 +1682,7 @@
     <string name="topic_prefix">"话题： "</string>
     <string name="add_a_topic_link_text">添加一个话题</string>
     <string name="room_created_summary_no_topic_creation_text">%s让人们知道此房间是关于什么的。</string>
-    <string name="this_is_the_beginning_of_dm">这是你和 %s 的私聊消息历史记录的开始。</string>
+    <string name="this_is_the_beginning_of_dm">这是你和%s的私聊消息历史的开始。</string>
     <string name="this_is_the_beginning_of_room_no_name">这是此对话的开始。</string>
     <string name="this_is_the_beginning_of_room">这是 %s 的开始。</string>
     <string name="settings_export_trail">导出审计</string>
@@ -1714,14 +1709,14 @@
     <string name="attachment_type_dialog_title">添加图像自</string>
     <string name="settings_discovery_consent_action_give_consent">授予许可</string>
     <string name="settings_discovery_consent_action_revoke">撤销我的许可</string>
-    <string name="settings_discovery_consent_notice_on">你已同意发送电子邮件和电话号码到身份服务器以从你的联系人发现其他用户。</string>
+    <string name="settings_discovery_consent_notice_on">你已同意发送电子邮件地址和电话号码到身份服务器以从你的联系人发现其他用户。</string>
     <string name="settings_discovery_consent_title">发送电子邮件和电话号码</string>
     <string name="direct_room_user_list_suggestions_title">建议</string>
     <string name="direct_room_user_list_known_title">已知用户</string>
-    <string name="qr_code">二维码</string>
-    <string name="add_by_qr_code">通过二维码添加</string>
+    <string name="qr_code">QR码</string>
+    <string name="add_by_qr_code">通过QR码添加</string>
     <string name="create_room_settings_section">房间设置</string>
-    <string name="create_room_topic_hint">主题</string>
+    <string name="create_room_topic_hint">话题</string>
     <string name="create_room_topic_section">房间话题（可选）</string>
     <string name="create_room_name_section">房间名称</string>
     <string name="room_preview_no_preview_join">此房间无法预览。你想加入吗？</string>
@@ -1736,14 +1731,14 @@
     <string name="room_alias_local_address_subtitle">为此房间设置地址以便用户通过你的主服务器（%1$s）找到此房间</string>
     <string name="room_alias_local_address_title">本地地址</string>
     <string name="room_alias_address_hint">新的发布的地址（例如 #alias:server）</string>
-    <string name="room_alias_address_empty">尚无其他已发布地址。</string>
+    <string name="room_alias_address_empty">尚无其它已发布地址。</string>
     <string name="room_alias_address_empty_can_add">还没有别的发布的地址，可在下方添加。</string>
-    <string name="settings_show_emoji_keyboard_summary">在消息框添加打开emoji键盘的按钮</string>
-    <string name="settings_show_emoji_keyboard">显示emoji键盘</string>
+    <string name="settings_show_emoji_keyboard_summary">在消息框添加打开 emoji 键盘的按钮</string>
+    <string name="settings_show_emoji_keyboard">显示 emoji 键盘</string>
     <string name="settings_chat_effects_description">使用 /confetti 命令或发送包含 ❄️ 或 🎉 的消息</string>
     <string name="settings_chat_effects_title">显示聊天效果</string>
     <string name="room_permissions_change_topic">更改话题</string>
-    <string name="room_permissions_upgrade_the_room">更新房间</string>
+    <string name="room_permissions_upgrade_the_room">升级房间</string>
     <string name="room_permissions_send_m_room_server_acl_events">发送 m.room.server_acl 事件</string>
     <string name="room_permissions_change_permissions">更改权限</string>
     <string name="room_permissions_change_room_name">更改房间名称</string>
@@ -1751,11 +1746,11 @@
     <string name="room_permissions_enable_room_encryption">启用房间加密</string>
     <string name="room_permissions_change_main_address_for_the_room">更改房间主要地址</string>
     <string name="room_permissions_change_room_avatar">更改房间头像</string>
-    <string name="room_permissions_modify_widgets">修改挂件</string>
+    <string name="room_permissions_modify_widgets">修改小部件</string>
     <string name="room_permissions_notify_everyone">通知每个人</string>
     <string name="room_permissions_remove_messages_sent_by_others">移除其他人发送的消息</string>
     <string name="room_permissions_ban_users">封禁用户</string>
-    <string name="room_permissions_remove_users">踢掉用户</string>
+    <string name="room_permissions_remove_users">移除用户</string>
     <string name="room_permissions_change_settings">更改设置</string>
     <string name="room_permissions_invite_users">邀请用户</string>
     <string name="room_permissions_send_messages">发送消息</string>
@@ -1763,7 +1758,7 @@
     <string name="room_permissions_notice_read_only">你没有权限更新更改房间多个部分所需角色</string>
     <string name="room_permissions_notice">选择更改房间各个部分所需的角色</string>
     <string name="room_permissions_title">权限</string>
-    <string name="room_settings_permissions_subtitle">需要查看和更新角色以更改房间多个部分。</string>
+    <string name="room_settings_permissions_subtitle">查看和更新更改房间各个部分所需的角色。</string>
     <string name="room_settings_permissions_title">房间权限</string>
     <string name="room_participants_leave_private_warning">此房间不公开。你没有邀请将无法重新加入。</string>
     <string name="call_held_by_you">你保持通话</string>
@@ -1779,7 +1774,7 @@
     <string name="notice_room_server_acl_set_allowed">• 已允许匹配 %s 的服务器。</string>
     <string name="a11y_checked">已勾选</string>
     <string name="a11y_selected">已选中</string>
-    <string name="call_only_active">活跃通话（%1$s）</string>
+    <string name="call_only_active">可用通话（%1$s）</string>
     <string name="re_authentication_activity_title">需要重新验证</string>
     <string name="event_status_a11y_delete_all">删除失败的消息</string>
     <string name="event_status_cancel_sending_dialog_message">你确定要取消发送消息吗？</string>
@@ -1809,7 +1804,7 @@
     <plurals name="entries">
         <item quantity="other">%d 个条目</item>
     </plurals>
-    <string name="not_a_valid_qr_code">不是有效的 Matrix 二维码</string>
+    <string name="not_a_valid_qr_code">这不是有效的 Matrix QR码</string>
     <string name="user_code_scan">扫描二维码</string>
     <string name="add_people">添加人员</string>
     <string name="invite_friends">邀请朋友</string>
@@ -1819,7 +1814,7 @@
     <string name="initial_sync_start_downloading">初始化同步：
 \n正在下载数据…</string>
     <string name="initial_sync_start_server_computing">初始化同步：
-\n正在等待服务器响应…</string>
+\n正在等待服务器响应……</string>
     <string name="room_displayname_empty_room_was">空房间（曾为 %s）</string>
     <plurals name="room_displayname_four_and_more_members">
         <item quantity="other">%1$s，%2$s，%3$s 和 %4$d 位其他成员</item>
@@ -1847,9 +1842,9 @@
     <string name="notice_room_server_acl_set_title_by_you">你为此房间设置了服务器访问控制列表。</string>
     <string name="phone_book_perform_lookup">在 Matrix 上查找联系人</string>
     <string name="identity_server_user_consent_not_provided">用户尚未同意条款。</string>
-    <string name="user_code_info_text">分享此二维码，其他人扫描后即可添加你，并开始聊天。</string>
+    <string name="user_code_info_text">共享此二维码，其他人扫描后即可添加你，并开始聊天。</string>
     <string name="user_code_my_code">我的二维码</string>
-    <string name="user_code_share">分享我的二维码</string>
+    <string name="user_code_share">共享我的二维码</string>
     <string name="dev_tools_error_no_message_type">消息类型缺失</string>
     <string name="dev_tools_explore_room_state">检查房间状态</string>
     <string name="a11y_view_read_receipts">查看已读回执</string>
@@ -1867,8 +1862,8 @@
     <string name="this_space_has_no_rooms">此空间没有房间</string>
     <string name="spaces_no_server_support_description">请联系你的主服务器管理员以取得进一步资讯</string>
     <string name="spaces_no_server_support_title">看来你的主服务器尚未支持空间</string>
-    <string name="spaces_feeling_experimental_subspace">想要做点实验？
-\n你可以将现有的空间添加到其他空间中。</string>
+    <string name="spaces_feeling_experimental_subspace">想要使用实验功能？
+\n你可以将现有的空间添加到其它空间中。</string>
     <string name="space_manage_rooms_and_spaces">管理房间和空间</string>
     <string name="space_mark_as_not_suggested">标记为不建议</string>
     <string name="space_mark_as_suggested">标记为建议</string>
@@ -1877,7 +1872,7 @@
     <string name="looking_for_someone_not_in_space">正在寻找不在 %s 中的人？</string>
     <string name="user_invites_you">%s 邀请了你</string>
     <string name="you_are_invited">你被邀请</string>
-    <string name="spaces_beta_welcome_to_spaces_desc">空间是一种将房间和人们进行重新分组的新方式。</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">空间是把房间和人分组的新方式。</string>
     <string name="space_add_existing_rooms">添加现有房间和空间</string>
     <string name="space_leave_prompt_msg_as_admin">你是此空间唯一的管理员。离开就意味着没人能控制它。</string>
     <string name="space_leave_prompt_msg_private">除非你被重新邀请，否则你将无法重新加入。</string>
@@ -1899,7 +1894,7 @@
     <string name="invite_just_to_this_room">刚到此房间</string>
     <string name="invite_to_space_with_name_desc">他们将可以探索 %s</string>
     <string name="invite_to_space_with_name">邀请至 %s</string>
-    <string name="invite_by_link">分享链接</string>
+    <string name="invite_by_link">共享链接</string>
     <string name="invite_by_email">通过电子邮件进行邀请</string>
     <string name="invite_people_to_your_space_desc">此刻只有你。%s与他人一道会更好。</string>
     <string name="invite_to_space">邀请至 %s</string>
@@ -1909,7 +1904,7 @@
     <string name="create_spaces_loading_message">正在创建空间……</string>
     <string name="create_spaces_default_public_random_room_name">随机</string>
     <string name="create_spaces_default_public_room_name">一般性</string>
-    <string name="create_spaces_room_private_header_desc">让我们为每个主题创建一个房间。你也可以稍后再进行增加，包括现有房间。</string>
+    <string name="create_spaces_room_private_header_desc">让我们为他们每个人创建一个房间。 你也可以稍后添加更多内容，包括已经存在的内容。</string>
     <string name="create_spaces_room_private_header">你在做些什么？</string>
     <string name="create_spaces_room_public_header_desc">我们将会为此创建房间。你也可以在稍后增加更多。</string>
     <string name="create_spaces_room_public_header">你希望在 %s 中进行哪些讨论？</string>
@@ -1938,9 +1933,9 @@
     <string name="command_description_create_space">创建空间</string>
     <string name="a11y_public_room">公开房间</string>
     <string name="a11y_unchecked">未检查</string>
-    <string name="a11y_open_widget">开启挂件</string>
+    <string name="a11y_open_widget">打开小部件</string>
     <string name="a11y_screenshot">屏幕截图</string>
-    <string name="re_authentication_default_confirm_text">${app_name} 要求你输入凭据才能执行此操作。</string>
+    <string name="re_authentication_default_confirm_text">${app_name} 需要你输入凭据才能执行此操作。</string>
     <string name="call_transfer_failure">呼叫转移时发生错误</string>
     <string name="call_transfer_consult_first">先询问</string>
     <string name="call_dial_pad_lookup_error">查找电话号码时发生了错误</string>
@@ -1948,10 +1943,10 @@
     <string name="call_tile_other_declined">%1$s 拒绝了此通话</string>
     <string name="warning_unsaved_change">有未保存的更改。要放弃更改吗？</string>
     <string name="warning_room_not_created_yet">房间尚未创建。取消创建房间？</string>
-    <string name="qr_code_not_scanned">未扫描二维码！</string>
-    <string name="invalid_qr_code_uri">无效的二维码（无效的 URI）！</string>
+    <string name="qr_code_not_scanned">未扫描QR码！</string>
+    <string name="invalid_qr_code_uri">无效的QR码（无效的标识）！</string>
     <string name="cannot_dm_self">无法向你自己发送私聊消息！</string>
-    <string name="share_by_text">通过文字分享</string>
+    <string name="share_by_text">通过文字共享</string>
     <string name="settings_security_pin_code_change_pin_summary">更改你当前的 PIN</string>
     <string name="settings_security_pin_code_change_pin_title">更改 PIN</string>
     <string name="invite_friends_rich_title">🔐️ 在 ${app_name} 上加入我的行列</string>
@@ -1970,7 +1965,7 @@
     <string name="give_feedback">提供反馈</string>
     <string name="feedback_failed">反馈发送失败（%s）</string>
     <string name="feedback_sent">感谢，你的反馈已成功送达</string>
-    <string name="you_may_contact_me">如果你后续有任何问题，欢迎联系我</string>
+    <string name="you_may_contact_me">如果你有任何后续问题，可以联系我</string>
     <string name="send_feedback_space_info">你正在使用空间的测试版。你的反馈将有助于改善下一版本。我们将会记录你的平台和用户名以帮助我们尽我们所能多发挥你的反馈的作用。</string>
     <string name="feedback">反馈</string>
     <string name="send_feedback_space_title">空间反馈</string>
@@ -2036,7 +2031,7 @@
     <string name="space_settings_alias_title">空间地址</string>
     <string name="room_upgrade_to_recommended_version">升级到推荐的房间版本</string>
     <string name="room_using_unstable_room_version">这个房间运行房间版本 %s，此主服务器已将其标记为不稳定。</string>
-    <string name="upgrade_room_no_power_to_manage">您需要权限才能升级房间</string>
+    <string name="upgrade_room_no_power_to_manage">你需要权限才能升级房间</string>
     <string name="upgrade_room_update_parent_space">自动更新空间父级</string>
     <string name="upgrade_room_auto_invite">自动邀请用户</string>
     <string name="upgrade_public_room_from_to">你将把此房间从 %1$s 升级到 %2$s。</string>
@@ -2054,7 +2049,7 @@
     <string name="settings_server_room_versions">房间版本 👓</string>
     <string name="verification_scan_self_emoji_subtitle">通过比较表情符号来验证</string>
     <string name="verification_scan_with_this_device">使用此设备扫描</string>
-    <string name="verification_scan_self_notice">使用您的其他设备扫描代码或切换并使用此设备扫描</string>
+    <string name="verification_scan_self_notice">使用其它设备扫码或切换并使用本设备扫码</string>
     <string name="hs_client_url">主服务器 API 网址</string>
     <string name="missing_permissions_title">缺少权限</string>
     <string name="denied_permission_camera">要执行此操作，请从系统设置中授予相机权限。</string>
@@ -2066,13 +2061,13 @@
         <item quantity="other">%d 个未接音频电话</item>
     </plurals>
     <string name="upgrade_room_for_restricted_note">请注意，升级将使房间焕然一新。 所有当前消息都将保留在此存档的房间中。</string>
-    <string name="upgrade_room_for_restricted_no_param">主空间中的任何人都可以找到并加入此房间 - 无需手动邀请所有人。 您可以随时在房间设置中更改此设置。</string>
-    <string name="upgrade_room_for_restricted">%s 中的任何人将可以查找并加入此房间 - 无需手动邀请所有人。 您可以随时在房间设置中更改此设置。</string>
+    <string name="upgrade_room_for_restricted_no_param">主空间中的任何人都可以找到并加入此房间 - 无需手动邀请所有人。 你可以随时在房间设置中更改此设置。</string>
+    <string name="upgrade_room_for_restricted">%s 中的任何人将可以查找并加入此房间 - 无需手动邀请所有人。 你可以随时在房间设置中更改此设置。</string>
     <string name="voice_message_reply_content">语音消息 (%1$s)</string>
     <string name="error_voice_message_cannot_reply_or_edit">语音消息处于活动状态时无法回复或编辑</string>
     <string name="error_voice_message_unable_to_record">无法录制语音消息</string>
     <string name="error_voice_message_unable_to_play">无法播放此语音消息</string>
-    <string name="voice_message_tap_to_stop_toast">点按您的录音以停止或收听</string>
+    <string name="voice_message_tap_to_stop_toast">点按你的录音以停止或收听</string>
     <string name="voice_message_n_seconds_warning_toast">剩余 %1$d秒</string>
     <string name="voice_message_release_to_send_toast">按住录音，松开发送</string>
     <string name="a11y_delete_recorded_voice_message">删除录音</string>
@@ -2083,7 +2078,7 @@
     <string name="a11y_start_voice_message">录制语音消息</string>
     <string name="upgrade_required">需要升级</string>
     <string name="sent_a_voice_message">语音</string>
-    <string name="other_spaces_or_rooms_you_might_not_know">您可能不知道的其他空间或房间</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">你可能不知道的其它空间或房间</string>
     <string name="space_you_know_that_contains_this_room">你知道的包含这个房间的空间</string>
     <string name="decide_who_can_find_and_join">决定谁能找到并加入这个房间。</string>
     <string name="tap_to_edit_spaces">点按即可编辑空间</string>
@@ -2104,22 +2099,22 @@
     <string name="settings_messages_containing_username">我的用户名</string>
     <string name="settings_messages_containing_display_name">我的显示名称</string>
     <string name="settings_notification_notify_me_for">通知事项</string>
-    <string name="settings_notification_other">其他</string>
+    <string name="settings_notification_other">其它</string>
     <string name="settings_notification_mentions_and_keywords">提及和关键词</string>
     <string name="settings_notification_default">默认通知</string>
-    <string name="call_tile_video_active">活跃视频通话</string>
-    <string name="call_tile_voice_active">活跃语音通话</string>
+    <string name="call_tile_video_active">可用视频通话</string>
+    <string name="call_tile_voice_active">可用语音通话</string>
     <string name="link_this_email_with_your_account">在 ${app_name} 中直接接收邀请的设置 %s。</string>
-    <string name="link_this_email_settings_link">将此邮箱与您的账户相链接</string>
-    <string name="this_invite_to_this_space_was_sent">加入这个空间的邀请被发送至 %s，此邮箱未与您的账户相关联</string>
-    <string name="this_invite_to_this_room_was_sent">加入这个房间的邀请被发送至 %s，此邮箱未与您的账户相关联</string>
+    <string name="link_this_email_settings_link">将此电子邮件地址与你的账户链接</string>
+    <string name="this_invite_to_this_space_was_sent">此空间的邀请已发送至与你的账户无关的 %s</string>
+    <string name="this_invite_to_this_room_was_sent">此房间的邀请已发送至与你的账户无关的 %s</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">你所在的全部房间将显示在主页上。</string>
     <string name="preference_show_all_rooms_in_home">在主页上显示所有房间</string>
     <string name="call_slide_to_end_conference">滑动结束通话</string>
     <string name="call_tap_to_return">%1$s 轻按返回</string>
-    <string name="call_one_active">活跃通话 (%1$s) ·</string>
+    <string name="call_one_active">可用通话 (%1$s) ·</string>
     <plurals name="call_active_status">
-        <item quantity="other">%1$d 个活跃通话·</item>
+        <item quantity="other">%1$d 个可用通话·</item>
     </plurals>
     <string name="call_tile_no_answer">无应答</string>
     <string name="call_tile_video_missed">未接视频通话</string>
@@ -2152,7 +2147,7 @@
     <string name="video_call_with_participant">和 %s 视频通话</string>
     <string name="call_ringing">来电响铃中…</string>
     <string name="spaces">空间</string>
-    <string name="space_add_space_to_any_space_you_manage">将一个空间添加到您管理的任何空间。</string>
+    <string name="space_add_space_to_any_space_you_manage">将一个空间添加到你管理的任何空间。</string>
     <string name="space_add_existing_spaces">添加现有空间</string>
     <string name="space_add_existing_rooms_only">添加现有房间</string>
     <string name="space_leave_prompt_msg_with_name">你确定要离开 %s 吗？</string>
@@ -2167,7 +2162,7 @@
     <string name="command_description_add_to_space">添加至给定的空间</string>
     <string name="create_space_in_progress">创建空间中…</string>
     <string name="settings_developer_mode_show_info_on_screen_summary">显示一些有用的信息以帮助调试应用程序</string>
-    <string name="settings_developer_mode_show_info_on_screen_title">在屏幕商显示调试信息</string>
+    <string name="settings_developer_mode_show_info_on_screen_title">在屏幕上显示调试信息</string>
     <string name="does_not_look_like_valid_email">看起来不像是有效的邮箱地址</string>
     <string name="open_discovery_settings">打开“发现”设置</string>
     <string name="user_directory_search_hint_2">按名称、ID或邮箱搜索</string>
@@ -2175,15 +2170,15 @@
     <string name="room_settings_space_access_public_description">任何人均可找到此空间并加入</string>
     <string name="room_settings_space_access_title">空间访问</string>
     <string name="room_settings_access_rules_pref_dialog_title">谁可以访问？</string>
-    <string name="settings_notification_emails_enable_for_email">启用 %s 的电邮通知</string>
-    <string name="settings_notification_emails_no_emails">要接收通知邮件，请将一个电子邮箱关联到你的 Matrix 账户</string>
+    <string name="settings_notification_emails_enable_for_email">为 %s 启用电子邮件通知</string>
+    <string name="settings_notification_emails_no_emails">要接收带有通知的电子邮件，请将电子邮件地址链接到你的 Matrix 账户</string>
     <string name="settings_notification_emails_category">电子邮件通知</string>
     <string name="room_permissions_upgrade_the_space">升级空间</string>
     <string name="room_permissions_change_space_name">更改空间名称</string>
     <string name="room_permissions_enable_space_encryption">启用空间加密</string>
     <string name="room_permissions_change_main_address_for_the_space">更改空间主地址</string>
     <string name="room_permissions_change_space_avatar">更改空间头像</string>
-    <string name="space_permissions_notice_read_only">您没有权限更新更改该空间的各个部分所需的角色</string>
+    <string name="space_permissions_notice_read_only">你没有权限更新更改该空间的各个部分所需的角色</string>
     <string name="space_permissions_notice">选择更改该空间的各个部分所需的角色</string>
     <string name="space_settings_permissions_subtitle">查看和更新更改空间的各个部分所需的角色。</string>
     <string name="space_settings_permissions_title">空间权限</string>
@@ -2198,9 +2193,9 @@
     <string name="settings_discovery_hide_identity_server_policy_title">隐藏身份服务器政策</string>
     <string name="settings_discovery_show_identity_server_policy_title">显示身份服务器策略</string>
     <string name="command_description_whois">显示用户信息</string>
-    <string name="command_description_avatar_for_room">仅更改您在当前房间的头像</string>
+    <string name="command_description_avatar_for_room">仅更改你在当前房间的头像</string>
     <string name="command_description_room_avatar">更改当前房间的头像</string>
-    <string name="command_description_nick_for_room">仅在当前房间更改您的显示昵称</string>
+    <string name="command_description_nick_for_room">仅在当前房间更改你的显示昵称</string>
     <string name="command_description_room_name">设置房间名称</string>
     <string name="command_description_unignore_user">停止忽略用户，继续显示他们的消息</string>
     <string name="command_description_ignore_user">忽略用户，隐藏他们的消息</string>
@@ -2208,7 +2203,7 @@
     <string name="a11y_presence_offline">离线</string>
     <string name="a11y_presence_online">在线</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">选择主服务器</string>
-    <string name="login_error_homeserver_from_url_not_found">无法访问 URL %s 上的主服务器。请检查您的链接或手动选择一个主服务器。</string>
+    <string name="login_error_homeserver_from_url_not_found">无法访问 URL %s 上的主服务器。请检查你的链接或手动选择一个主服务器。</string>
     <string name="notification_listening_for_notifications">侦听通知</string>
     <plurals name="create_poll_not_enough_options_error">
         <item quantity="other">需要至少 %1$s 个选项</item>
@@ -2218,18 +2213,18 @@
     <string name="create_poll_add_option">添加选项</string>
     <string name="create_poll_options_hint">选项 %1$d</string>
     <string name="create_poll_options_title">创建选项</string>
-    <string name="create_poll_question_hint">问题或主题</string>
-    <string name="create_poll_question_title">投票问题或主题</string>
+    <string name="create_poll_question_hint">问题或话题</string>
+    <string name="create_poll_question_title">投票问题或话题</string>
     <string name="create_poll_title">创建投票</string>
     <string name="attachment_type_poll">投票</string>
-    <string name="identity_server_consent_dialog_title_2">向 %s 发送电子邮件和电话号码</string>
-    <string name="settings_discovery_consent_notice_off_2">您的联系人是私密的。 要从您的联系人中发现用户，我们需要您的许可才能将联系信息发送到您的身份服务器。</string>
+    <string name="identity_server_consent_dialog_title_2">向%s发送电子邮件地址和电话号码</string>
+    <string name="settings_discovery_consent_notice_off_2">你的联系人是私密的。 要从你的联系人中发现用户，我们需要你的许可才能将联系信息发送到你的身份服务器。</string>
     <string name="shortcut_disabled_reason_sign_out">已登出此会话！</string>
     <string name="shortcut_disabled_reason_room_left">已离开此房间！</string>
     <string name="identity_server_consent_dialog_content_question">你同意发送此信息吗？</string>
-    <string name="identity_server_consent_dialog_content_3">要发现现有的联系人，您需要将联系人信息(电子邮件和电话号码)发送到您的身份服务器。出乎隐私考量，我们会在发送前对您的数据进行散列处理。</string>
+    <string name="identity_server_consent_dialog_content_3">要发现现有的联系人，你需要将联系人信息（电子邮件地址和电话号码）发送到你的身份服务器。出乎隐私考量，我们会在发送前对你的数据进行散列处理。</string>
     <string name="action_not_now">不是现在</string>
-    <string name="delete_poll_dialog_content">您确定要删除此投票吗？一旦移除，就无法恢复。</string>
+    <string name="delete_poll_dialog_content">你确定要删除此投票吗？一旦移除，就无法恢复。</string>
     <string name="delete_poll_dialog_title">删除投票</string>
     <string name="poll_end_room_list_preview">投票已结束</string>
     <string name="poll_response_room_list_preview">投票</string>
@@ -2265,38 +2260,38 @@
     <string name="analytics_opt_in_list_item_3">你可以随时在设置中关闭它</string>
     <string name="analytics_opt_in_list_item_2">我们<b>不</b>与第三方共享信息</string>
     <string name="analytics_opt_in_content_link">此处</string>
-    <string name="analytics_opt_in_content">通过共享匿名使用数据，帮助我们识别问题并改进 ${app_name}。为了理解人们如何使用多台设备，我们将生成一个随机标识符，由您的设备共享。
+    <string name="analytics_opt_in_content">通过共享匿名使用数据，帮助我们识别问题并改进 ${app_name}。为了理解人们如何使用多台设备，我们将生成一个随机标识符，由你的设备共享。
 \n
 \n你可以阅读我们所有的条款 %s。</string>
     <string name="analytics_opt_in_title">帮助改进 ${app_name}</string>
     <string name="action_enable">启用</string>
-    <string name="room_error_access_unauthorized">不允许加入此房间</string>
+    <string name="room_error_access_unauthorized">你不能加入这个房间</string>
     <plurals name="notice_room_server_acl_changes">
         <item quantity="other">修改服务器 %d 的 ACLs</item>
     </plurals>
     <string name="thread_list_empty_subtitle">消息列帮助你的对话不离题且易于跟踪。</string>
-    <string name="thread_list_modal_all_threads_subtitle">显示当前房间的所有子区</string>
-    <string name="thread_list_modal_all_threads_title">所有子区</string>
-    <string name="thread_list_modal_title">筛选器</string>
-    <string name="thread_timeline_title">子区</string>
-    <string name="room_threads_filter">在房间中筛选子区</string>
-    <string name="action_thread_copy_link_to_thread">复制子区的链接</string>
+    <string name="thread_list_modal_all_threads_subtitle">显示当前房间的所有消息列</string>
+    <string name="thread_list_modal_all_threads_title">所有消息列</string>
+    <string name="thread_list_modal_title">过滤器</string>
+    <string name="thread_timeline_title">消息列</string>
+    <string name="room_threads_filter">过滤房间中的消息列</string>
+    <string name="action_thread_copy_link_to_thread">复制消息列的链接</string>
     <string name="action_thread_view_in_room">在房间中查看</string>
-    <string name="room_message_autocomplete_notification">群组通知</string>
-    <string name="threads_notice_migration_message">我们越来越接近将消息列发布为公开Beta版。
+    <string name="room_message_autocomplete_notification">房间通知</string>
+    <string name="threads_notice_migration_message">我们越来越接近发布消息列的公共 Beta 版。
 \n
-\n在我们为此准备时，我们需要做一些变动：在此之前创建的消息列将会被显示为普通回复。
+\n在我们为此做准备时，我们需要进行一些更改：在此之前创建的消息列将显示为常规回复。
 \n
-\n这会是一次性的过渡，因为消息列现在是Matrix规范的一部分了。</string>
+\n这将是一次性的过渡，因为消息列现在是 Matrix 规范的一部分。</string>
     <plurals name="message_reaction_show_more">
-        <item quantity="other">还有%1$d个</item>
+        <item quantity="other">%1$d 更多</item>
     </plurals>
-    <string name="live_location_labs_promotion_description">请注意：这是一个使用临时实现的实验室功能。这意味着你将无法删除你的位置历史，并且在你停止与这个房间分享你的实时位置后，高级用户仍能看到你的位置历史。</string>
+    <string name="live_location_labs_promotion_description">请注意：这是使用临时实现的实验室功能。这意味着你将无法删除你的位置历史记录，即使你停止与此房间共享你的实时位置，高级用户也将能够看到你的位置历史记录。</string>
     <string name="settings_troubleshoot_test_current_gateway">当前网关：%s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">网关</string>
     <string name="give_feedback_threads">提供反馈</string>
-    <string name="ftue_auth_carousel_workplace_title">为你的团队传递消息。</string>
-    <string name="threads_beta_enable_notice_title">消息列beta</string>
+    <string name="ftue_auth_carousel_workplace_title">为你的团队发送消息。</string>
+    <string name="threads_beta_enable_notice_title">消息列 beta</string>
     <string name="thread_list_title">消息列</string>
     <string name="settings_show_latest_profile_description">为所有消息显示最新资料信息（头像和显示名称）。</string>
     <string name="ftue_display_name_entry_title">显示名称</string>
@@ -2304,75 +2299,74 @@
     <string name="room_member_override_nick_color">覆盖显示名称颜色</string>
     <string name="ftue_auth_reset_password_breaker_title">检查你的电子邮件。</string>
     <string name="ftue_auth_email_entry_title">电子邮件</string>
-    <string name="ftue_auth_carousel_control_title">你已掌控你的资料。</string>
+    <string name="ftue_auth_carousel_control_title">一切由你掌控。</string>
     <string name="beta">BETA</string>
-    <string name="location_share_live_select_duration_title">分享你的实时位置</string>
+    <string name="location_share_live_select_duration_title">共享你的实时位置</string>
     <string name="a11y_location_share_locate_button">缩放到当前位置</string>
-    <string name="a11y_location_share_pin_on_map">地图上选定位置的图钉</string>
+    <string name="a11y_location_share_pin_on_map">地图上选定位置的固定标记</string>
     <string name="poll_no_votes_cast">无投票</string>
     <string name="ftue_auth_email_verification_title">验证你的电子邮件</string>
     <plurals name="room_removed_messages">
-        <item quantity="other">%d条消息已移除</item>
+        <item quantity="other">%d 条消息已移除</item>
     </plurals>
-    <string name="live_location_labs_promotion_switch_title">启用位置分享</string>
+    <string name="live_location_labs_promotion_switch_title">启用位置共享</string>
     <string name="live_location_labs_promotion_title">实时位置共享</string>
     <string name="settings_troubleshoot_test_current_endpoint_failed">找不到端点。</string>
-    <string name="settings_troubleshoot_test_current_endpoint_success">目前端点：%s</string>
+    <string name="settings_troubleshoot_test_current_endpoint_success">当前端点：%s</string>
     <string name="settings_troubleshoot_test_current_endpoint_title">端点</string>
-    <string name="settings_troubleshoot_test_current_distributor">目前正在使用%s。</string>
+    <string name="settings_troubleshoot_test_current_distributor">目前正在使用 %s。</string>
     <string name="settings_troubleshoot_test_current_distributor_title">方式</string>
     <plurals name="settings_troubleshoot_test_distributors_many">
-        <item quantity="other">找到%d种方式。</item>
+        <item quantity="other">找到 %d 个方式。</item>
     </plurals>
-    <string name="settings_troubleshoot_test_distributors_fdroid">除了后台同步，没有发现其他方法。</string>
-    <string name="settings_troubleshoot_test_distributors_gplay">找不到除了Google Play服务以外的方式。</string>
+    <string name="settings_troubleshoot_test_distributors_fdroid">除了后台同步，没有发现其它方法。</string>
+    <string name="settings_troubleshoot_test_distributors_gplay">找不到除了 Google Play 服务以外的方式。</string>
     <string name="settings_troubleshoot_test_distributors_title">可用方式</string>
     <string name="settings_notification_method">通知方式</string>
     <string name="unifiedpush_distributor_background_sync">后台同步</string>
-    <string name="unifiedpush_distributor_fcm_fallback">Google服务</string>
+    <string name="unifiedpush_distributor_fcm_fallback">Google 服务</string>
     <string name="unifiedpush_getdistributors_dialog_title">选择如何接收通知</string>
     <string name="screen_sharing_notification_description">屏幕共享进行中</string>
-    <string name="screen_sharing_notification_title">${app_name}屏幕共享</string>
+    <string name="screen_sharing_notification_title">${app_name} 屏幕共享</string>
     <string name="room_message_autocomplete_users">用户</string>
     <string name="room_message_notify_everyone">通知整个房间</string>
     <string name="message_reaction_show_less">显示更少</string>
-    <string name="tooltip_attachment_location">分享位置</string>
+    <string name="tooltip_attachment_location">共享位置</string>
     <string name="message_bubbles">显示消息气泡</string>
-    <string name="live_location_share_location_item_share">分享位置</string>
-    <string name="live_location_not_enough_permission_dialog_description">你需要有正确的权限，才能在这个房间里分享实时位置。</string>
-    <string name="live_location_not_enough_permission_dialog_title">你没有权限分享实时位置</string>
-    <string name="live_location_bottom_sheet_last_updated_at">%1$s前已更新</string>
-    <string name="live_location_bottom_sheet_stop_sharing" tools:ignore="UnusedResources">停止分享</string>
+    <string name="live_location_share_location_item_share">共享位置</string>
+    <string name="live_location_not_enough_permission_dialog_description">你需要拥有正确的权限才能在此房间中共享实时位置。</string>
+    <string name="live_location_not_enough_permission_dialog_title">你没有权限共享实时位置</string>
+    <string name="live_location_bottom_sheet_last_updated_at">%1$s 前已更新</string>
     <string name="labs_enable_live_location_summary">临时执行：地点在房间历史中持续存在</string>
     <string name="labs_enable_live_location">启用实时位置共享</string>
     <string name="live_location_sharing_notification_description">位置共享正在进行中</string>
-    <string name="live_location_sharing_notification_title">${app_name}实时位置</string>
-    <string name="location_share_live_remaining_time">剩余%1$s</string>
+    <string name="live_location_sharing_notification_title">${app_name} 实时位置</string>
+    <string name="location_share_live_remaining_time">剩余 %1$s</string>
     <string name="location_share_live_stop">停止</string>
-    <string name="location_share_live_until">实时分享直到%1$s</string>
+    <string name="location_share_live_until">实时共享直到 %1$s</string>
     <string name="location_share_live_view">查看实时位置</string>
     <string name="location_share_live_ended">实时位置已结束</string>
     <string name="location_share_live_started">正在加载实时位置……</string>
-    <string name="location_share_live_enabled">实时位置已启用</string>
+    <string name="location_share_live_enabled">启用实时位置</string>
     <string name="location_timeline_failed_to_load_map">加载地图失败</string>
     <string name="location_share_external">打开，用</string>
-    <string name="location_not_available_dialog_content">${app_name}无法访问你的位置。请稍后再试。</string>
-    <string name="location_not_available_dialog_title">${app_name}无法访问你的位置</string>
+    <string name="location_not_available_dialog_content">${app_name} 无法访问你的位置。请稍后再试。</string>
+    <string name="location_not_available_dialog_title">${app_name} 无法访问你的位置</string>
     <string name="view_in_room">在房间中查看</string>
-    <string name="labs_enable_msc3061_share_history">MSC3061：为过去的消息分享房间密钥</string>
-    <string name="labs_enable_msc3061_share_history_desc">当在分享历史的加密的房间中邀请时，加密的历史将总是可见。</string>
-    <string name="location_share_live_select_duration_option_3">8小时</string>
-    <string name="location_share_live_select_duration_option_2">1小时</string>
-    <string name="location_share_live_select_duration_option_1">15分钟</string>
-    <string name="a11y_location_share_option_pinned_icon">分享此位置</string>
-    <string name="location_share_option_pinned">分享此位置</string>
-    <string name="a11y_location_share_option_user_live_icon">分享实时位置</string>
-    <string name="location_share_option_user_live">分享实时位置</string>
-    <string name="a11y_location_share_option_user_current_icon">分享我目前的位置</string>
-    <string name="location_share_option_user_current">分享我目前的位置</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061：为过去的消息共享房间密钥</string>
+    <string name="labs_enable_msc3061_share_history_desc">在共享历史的加密房间中邀请时，加密历史将可见。</string>
+    <string name="location_share_live_select_duration_option_3">8 小时</string>
+    <string name="location_share_live_select_duration_option_2">1 小时</string>
+    <string name="location_share_live_select_duration_option_1">15 分钟</string>
+    <string name="a11y_location_share_option_pinned_icon">共享此位置</string>
+    <string name="location_share_option_pinned">共享此位置</string>
+    <string name="a11y_location_share_option_user_live_icon">共享实时位置</string>
+    <string name="location_share_option_user_live">共享实时位置</string>
+    <string name="a11y_location_share_option_user_current_icon">共享我当前的位置</string>
+    <string name="location_share_option_user_current">共享我当前的位置</string>
     <string name="a11y_static_map_image">地图</string>
     <string name="location_activity_title_preview">位置</string>
-    <string name="location_activity_title_static_sharing">分享位置</string>
+    <string name="location_activity_title_static_sharing">共享位置</string>
     <string name="closed_poll_option_description">结果仅在你结束投票后展示</string>
     <string name="closed_poll_option_title">封闭式投票</string>
     <string name="open_poll_option_description">投票者一投票就能看到结果</string>
@@ -2415,7 +2409,7 @@
     <string name="tooltip_attachment_gallery">发送图片和视频</string>
     <string name="tooltip_attachment_photo">打开相机</string>
     <string name="ftue_auth_terms_title">服务器政策</string>
-    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services（EMS）是一个健壮且可靠的主机托管服务，可实现快速、安全和实时的通信。在&lt;a href=\"${ftue_ems_url}\"&gt;element.io/ems&lt;/a&gt;上了解如何使用</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) 是一种强大且可靠的托管服务，可实现快速、安全和实时的通信。 了解如何在 &lt;a href=\"${ftue_ems_url}\"&gt;element.io/ems&lt;/a&gt;</string>
     <string name="ftue_auth_choose_server_ems_title">想架设自己的服务器？</string>
     <string name="ftue_auth_choose_server_entry_hint">服务器URL</string>
     <string name="ftue_auth_choose_server_title">选择你的服务器</string>
@@ -2425,14 +2419,14 @@
     <string name="ftue_auth_use_case_subtitle">我们会帮你建立连接</string>
     <string name="ftue_auth_use_case_title">你会与谁聊最多？</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name}也非常适合工作场所。受到世界上最安全的组织信任。</string>
-    <string name="ftue_auth_carousel_control_body">选择保存你的对话的位置，给你控制权和独立性。通过Matrix连接。</string>
+    <string name="ftue_auth_carousel_control_body">选择保存你的对话的位置，给予你控制权和独立性。通过 Matrix 连接。</string>
     <string name="ftue_auth_carousel_secure_body">安全且独立的通信，为你提供和在家中面对面对话同样等级的隐私。</string>
     <string name="ftue_auth_carousel_encrypted_title">安全传送消息。</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">向主服务器注册端点token失败：
 \n%1$s</string>
-    <string name="threads_beta_enable_notice_message">Threads帮助保持你的对话不离题且易于跟踪。%s启用消息列会刷新应用。这对一些账户可能需要更长时间。</string>
+    <string name="threads_beta_enable_notice_message">消息列有助于使你的对话保持话题并易于跟踪。%s 创建消息列将刷新应用程序。对于某些账户，这可能需要更长的时间。</string>
     <string name="restart_the_application_to_apply_changes">重启应用以使更改生效。</string>
-    <string name="labs_enable_latex_maths">启用LaTeX数学</string>
+    <string name="labs_enable_latex_maths">启用 LaTeX 数学</string>
     <string name="audio_message_file_size">（%1$s）</string>
     <string name="audio_message_reply_content">%1$s（%2$s）</string>
     <string name="error_audio_message_unable_to_play">无法播放%1$s</string>
@@ -2451,17 +2445,17 @@
     <string name="space_leave_radio_button_all">离开全部</string>
     <string name="space_leave_radio_buttons_title">此空间里的东西</string>
     <string name="a11y_presence_busy">忙</string>
-    <string name="settings_security_pin_code_use_biometrics_error">无法启用生物验证。</string>
-    <string name="auth_biometric_key_invalidated_message">生物验证被停用了，因为最近新增了新的生物验证方式。你可以在设置里重新启用。</string>
+    <string name="settings_security_pin_code_use_biometrics_error">无法启用生物特征识别。</string>
+    <string name="auth_biometric_key_invalidated_message">生物特征识别被禁用，因为最近添加了新的生物特征识别方法。 你可以在“设置”中再次启用它。</string>
     <string name="error_forbidden_digits_only_username">主服务器不接收仅有数字的用户名。</string>
     <string name="send_your_first_msg_to_invite">发送你的第一条消息邀请%s聊天</string>
     <string name="encryption_misconfigured">加密配置错误</string>
-    <string name="direct_room_encryption_enabled_tile_description_future">此聊天中的消息会被端对端加密。</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">此聊天中的消息会端到端加密。</string>
     <string name="room_profile_section_restore_security">还原加密</string>
     <string name="contact_admin_to_restore_encryption">请联系管理员将加密还原到有效状态。</string>
     <string name="encryption_has_been_misconfigured">加密被错误地配置了。</string>
-    <string name="sent_live_location">分享了他们的实时位置</string>
-    <string name="sent_location">分享了他们的位置</string>
+    <string name="sent_live_location">共享了他们的实时位置</string>
+    <string name="sent_location">共享了他们的位置</string>
     <string name="permalink_unsupported_groups">无法打开此链接：社群已被空间取代</string>
     <string name="login_splash_already_have_account">我已经有账户了</string>
     <string name="login_splash_create_account">创建账户</string>
@@ -2469,7 +2463,6 @@
     <string name="ftue_personalize_complete_title">看起来不错！</string>
     <string name="ftue_personalize_lets_go">走吧</string>
     <string name="ftue_display_name_entry_footer">你可以稍后更改这个</string>
-    <string name="ftue_display_name_subtitle">这会在你发送消息时显示。</string>
     <string name="ftue_auth_login_username_entry">用户名/电子邮件/电话号码</string>
     <string name="ftue_auth_captcha_title">你是人类吗？</string>
     <string name="ftue_auth_password_reset_email_confirmation_subtitle">按照发送到%s的操作说明</string>
@@ -2480,7 +2473,7 @@
     <string name="ftue_auth_create_account_sso_section_header">或</string>
     <string name="ftue_auth_create_account_choose_server_header">你的对话将进行的地方</string>
     <string name="ftue_auth_create_account_password_entry_footer">必须有8个及以上的字符</string>
-    <string name="ftue_auth_create_account_username_entry_footer">其他人可以通过%s发现你</string>
+    <string name="ftue_auth_create_account_username_entry_footer">其他人可以通过 %s 发现你</string>
     <string name="ftue_auth_create_account_title">创建你的账户</string>
     <string name="ftue_account_created_congratulations_title">恭喜！</string>
     <string name="ftue_account_created_subtitle">你的账户%s已创建</string>
@@ -2488,7 +2481,7 @@
     <string name="ftue_auth_use_case_connect_to_server">连接服务器</string>
     <string name="ftue_auth_use_case_join_existing_server">想要加入已有的服务器？</string>
     <string name="ftue_auth_use_case_skip_partial">跳过此问题</string>
-    <string name="ftue_auth_use_case_option_one">朋友和家人</string>
+    <string name="ftue_auth_use_case_option_one">家人和朋友</string>
     <string name="ftue_auth_carousel_secure_title">拥有你的对话。</string>
     <string name="attachment_type_location">位置</string>
     <string name="send_feedback_threads_title">Threads Beta反馈</string>
@@ -2507,7 +2500,7 @@
     <string name="settings_presence_user_always_appears_offline_summary">若启用，即使正在使用应用，你也会对其他用户显示为离线状态。</string>
     <string name="settings_presence_user_always_appears_offline">离线模式</string>
     <string name="settings_presence">在场</string>
-    <string name="settings_autoplay_animated_images_summary">动画图片一出现就在时间轴中播放</string>
+    <string name="settings_autoplay_animated_images_summary">动画图片一出现就在时间线中播放</string>
     <string name="threads_labs_enable_notice_title">Threads Beta</string>
     <string name="initial_sync_request_content">${app_name} needs to perform a clear cache to be up to date, 原因如下：
 \n%s
@@ -2516,16 +2509,16 @@
     <string name="settings_autoplay_animated_images_title">自动播放动画图片</string>
     <string name="settings_troubleshoot_test_endpoint_registration_success">端点成功注册到主服务器。</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">端点注册</string>
-    <string name="threads_labs_enable_notice_message">你的主服务器当前不支持消息列，所以此功能可能不可靠。Some threaded messages may not be reliably available. %s你仍要启用消息列吗？</string>
+    <string name="threads_labs_enable_notice_message">你的主服务器当前不支持消息列，因此此功能可能不可靠。某些消息列的消息可能无法可靠地使用。 %s 你仍然要启用消息列吗？</string>
     <string name="threads_notice_migration_title">Threads接近Beta了 🎉</string>
     <string name="search_thread_from_a_thread">来自消息列</string>
     <string name="thread_list_empty_notice">实用提示：长按消息并使用“%s”。</string>
     <string name="thread_list_empty_title">使用消息列来保持讨论的条理性</string>
     <string name="thread_list_modal_my_threads_subtitle">显示你参与的所有消息列</string>
-    <string name="thread_list_modal_my_threads_title">我的消息列s</string>
+    <string name="thread_list_modal_my_threads_title">我的消息列</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">加密被错误地配置了，所以你无法发送消息。点击以打开设置。</string>
     <string name="room_unsupported_e2e_algorithm">加密被错误地配置了，所以你无法发送消息。请联系管理员将加密还原到有效的状态。</string>
-    <string name="room_notification_more_than_two_users_are_typing">%1$s、%2$s与其他人</string>
+    <string name="room_notification_more_than_two_users_are_typing">%1$s、%2$s 与其他人</string>
     <string name="room_notification_two_users_are_typing">%1$s与%2$s</string>
     <string name="call_start_screen_sharing">共享屏幕</string>
     <string name="call_stop_screen_sharing">停止共享屏幕</string>
@@ -2533,24 +2526,299 @@
     <string name="action_learn_more">进一步了解</string>
     <string name="action_try_it_out">试试看</string>
     <string name="action_disable">停用</string>
-    <string name="action_view_threads">查看Threads</string>
+    <string name="action_view_threads">查看消息列</string>
     <string name="time_unit_second_short">秒</string>
     <string name="time_unit_minute_short">分钟</string>
     <string name="time_unit_hour_short">小时</string>
     <string name="initial_sync_request_reason_unignored_users">- 一些用户已被取消忽略</string>
     <string name="initial_sync_request_title">初始同步请求</string>
     <plurals name="search_space_multiple_parents">
-        <item quantity="other">%1$s与其他%2$d人</item>
+        <item quantity="other">%1$s 与其他 %2$d人</item>
     </plurals>
     <string name="updating_your_data">正在更新你的数据……</string>
-    <string name="labs_enable_element_call_permission_shortcuts_summary">自动批准Element通话组件，授予相机/麦克风权限</string>
-    <string name="labs_enable_element_call_permission_shortcuts">启用Element通话权限捷径</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">自动允许 Element 通话小部件并授予相机/麦克风访问权限</string>
+    <string name="labs_enable_element_call_permission_shortcuts">启用 Element 通话权限快捷方式</string>
     <string name="live_location_description">实时位置</string>
-    <string name="verify_invalid_qr_notice">这个QR码看起来不正常。请尝试用另一个方法验证。</string>
+    <string name="verify_invalid_qr_notice">此QR码看起来格式不正确。请尝试使用其它方法进行验证。</string>
     <string name="crosssigning_cannot_verify_this_session_desc">你无法访问加密消息历史。重置你的安全消息备份和验证密钥以重新开始。</string>
     <string name="crosssigning_cannot_verify_this_session">无法验证此设备</string>
     <string name="ftue_auth_choose_server_sign_in_subtitle">你的服务器地址是什么？</string>
     <string name="ftue_auth_sign_in_choose_server_header">你的对话发生的地方</string>
-    <string name="search_space_two_parents">%1$s和%2$s</string>
-    <string name="auth_reset_password_error_unverified">电子邮件未确认，检查你的收件箱</string>
+    <string name="search_space_two_parents">%1$s 和 %2$s</string>
+    <string name="auth_reset_password_error_unverified">电子邮件未验证，请检查你的收件箱</string>
+    <string name="location_share_loading_map_error">无法加载地图
+\n此主服务器可能没有设置好显示地图。</string>
+    <string name="a11y_open_settings">打开设置</string>
+    <string name="all_chats">全部聊天</string>
+    <string name="device_manager_sessions_other_description">为获得最佳安全性，请验证你的会话，并从任何你不认识或不再使用的会话登出。</string>
+    <string name="device_manager_sessions_other_title">其它会话</string>
+    <string name="settings_sessions_list">会话</string>
+    <string name="a11y_open_spaces">打开空间列表</string>
+    <string name="a11y_create_message">创建新对话或房间</string>
+    <string name="room_list_filter_people">人</string>
+    <string name="room_list_filter_favourites">收藏</string>
+    <string name="room_list_filter_unreads">未读</string>
+    <string name="room_list_filter_all">全部</string>
+    <string name="home_layout_preferences_sort_name">A—Z</string>
+    <string name="home_layout_preferences_sort_activity">活动</string>
+    <string name="home_layout_preferences_sort_by">排序方式</string>
+    <string name="home_layout_preferences_recents">显示最近</string>
+    <string name="home_layout_preferences_filters">显示过滤条件</string>
+    <string name="home_layout_preferences">布局偏好</string>
+    <string name="explore_rooms">探索房间</string>
+    <string name="create_room">创建房间</string>
+    <string name="start_chat">开始聊天</string>
+    <string name="timeline_error_room_not_found">抱歉，未发现此房间。
+\n请晚些重试。%s</string>
+    <string name="device_manager_other_sessions_description_unverified">未验证 · 上次活动 %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">已验证 · 上次活动 %1$s</string>
+    <string name="device_manager_other_sessions_view_all">查看全部（%1$d）</string>
+    <string name="device_manager_view_details">查看详情</string>
+    <string name="device_manager_verify_session">验证会话</string>
+    <string name="device_manager_verification_status_unverified">未验证的会话</string>
+    <string name="device_manager_verification_status_verified">已验证的会话</string>
+    <string name="a11y_device_manager_device_type_unknown">未知的设备类型</string>
+    <string name="invites_title">邀请</string>
+    <string name="a11y_device_manager_device_type_mobile">移动设备</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_desktop">桌面</string>
+    <string name="change_space">更改空间</string>
+    <string name="space_list_empty_title">尚无空间。</string>
+    <string name="invites_empty_title">没有新的东西。</string>
+    <string name="invites_empty_message">你的新请求和邀请会在这里。</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="other">闲置 %1$d+ 天 (%2$s)</item>
+    </plurals>
+    <string name="device_manager_header_section_security_recommendations_title">安全建议</string>
+    <string name="device_manager_header_section_security_recommendations_description">按照这些建议改善你的账户安全。</string>
+    <string name="device_manager_unverified_sessions_title">未验证的会话</string>
+    <string name="device_manager_unverified_sessions_description">验证未验证的会话或从之登出。</string>
+    <string name="device_manager_inactive_sessions_title">闲置会话</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="other">请考虑从不再使用的旧会话（%1$d天或更久）登出。</item>
+    </plurals>
+    <string name="home_empty_no_rooms_title">欢迎来到 ${app_name}，
+\n%s。</string>
+    <string name="home_empty_no_unreads_message">当你有一些未读消息时，这里会显示你的未读消息。</string>
+    <string name="onboarding_new_app_layout_feedback_title">提供反馈</string>
+    <string name="onboarding_new_app_layout_feedback_message">点击右上角查看反馈选项。</string>
+    <string name="onboarding_new_app_layout_button_try">试用</string>
+    <string name="space_list_empty_message">空间是对房间和人进行分组的新方式。创建一个空间来开始吧。</string>
+    <string name="labs_enable_new_app_layout_title">启用新布局</string>
+    <string name="device_manager_session_details_device_ip_address">IP地址</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">验证你的会话以增强安全消息传递或从你不再识别或不再使用的会话中登出。</string>
+    <string name="device_manager_filter_option_unverified_description">尚未准备好安全收发消息</string>
+    <string name="device_manager_filter_option_verified_description">准备好安全收发消息</string>
+    <string name="device_manager_filter_option_verified">已验证</string>
+    <string name="device_manager_filter_option_all_sessions">全部会话</string>
+    <string name="device_manager_filter_bottom_sheet_title">过滤器</string>
+    <string name="device_manager_session_last_activity">上次活动 %1$s</string>
+    <string name="device_manager_device_title">设备</string>
+    <string name="device_manager_session_title">会话</string>
+    <string name="device_manager_current_session_title">当前会话</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">验证你的会话以增强消息传输的安全性。</string>
+    <string name="onboarding_new_app_layout_spaces_message">访问你的空间（右下角）比以前更快、更容易。</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">此会话已准备好安全地收发消息。</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">你当前的会话已准备好安全地收发消息。</string>
+    <string name="labs_enable_deferred_dm_summary">仅在首条消息创建私聊消息</string>
+    <string name="labs_enable_deferred_dm_title">启用延迟的私聊消息</string>
+    <string name="labs_enable_new_app_layout_summary">简化的 Element，带有可选的标签</string>
+    <string name="settings_security_incognito_keyboard_title">无痕键盘</string>
+    <string name="settings_security_incognito_keyboard_summary">请求键盘不要根据你在对话中输入的内容更新任何个性化数据，例如输入历史记录和字典。 请注意，某些键盘可能不遵守此设置。</string>
+    <string name="permissions_rationale_msg_notification">${app_name}需要权限来显示通知。通知可以显示消息、邀请等。
+\n
+\n请在下个弹窗允许访问以便查看通知。</string>
+    <string name="labs_enable_rich_text_editor_summary">试用富文本编辑器（纯文本模式即将到来）</string>
+    <string name="labs_enable_rich_text_editor_title">启用富文本编辑器</string>
+    <string name="a11y_collapse_space_children">折叠 %s 子空间</string>
+    <string name="a11y_expand_space_children">展开 %s 子空间</string>
+    <string name="labs_enable_session_manager_title">启用新的会话管理器</string>
+    <string name="onboarding_new_app_layout_spaces_title">访问空间</string>
+    <string name="onboarding_new_app_layout_welcome_title">欢迎使用新视图！</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ 此房间里有未经验证的设备，它们将无法解密你发送的消息。</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">永远不要向这个房间里未经验证的会话发送加密的消息。</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\n看起来有点空荡荡的。</string>
+    <string name="labs_enable_voice_broadcast_summary">能够在房间时间线中录制和发送语音广播。</string>
+    <string name="labs_enable_voice_broadcast_title">启用语音广播</string>
+    <string name="labs_enable_client_info_recording_summary">记录客户端名称、版本和网址，以便在会话管理器中更轻松地识别会话。</string>
+    <string name="labs_enable_client_info_recording_title">启用客户端信息记录</string>
+    <string name="labs_enable_session_manager_summary">对所有会话有更好的可见性和控制。</string>
+    <string name="device_manager_learn_more_session_rename">你加入的私聊消息和房间中的其他用户可以查看你的会话的完整列表。
+\n
+\n这让他们确信他们真的在与你交谈，但这也意味着他们可以看到你在此处输入的会话名称。</string>
+    <string name="device_manager_learn_more_session_rename_title">重命名会话</string>
+    <string name="device_manager_learn_more_sessions_verified">已验证会话已使用你的凭据登录，然后使用你的安全密码或通过交叉验证进行验证。
+\n
+\n这意味着他们持有你之前消息的加密密钥，并向你正在与之通信的其他用户确认这些会话确实是你。</string>
+    <string name="device_manager_learn_more_sessions_inactive">闲置会话是你一段时间未使用的会话，但它们会继续接收加密密钥。
+\n
+\n删除闲置会话可以提高安全性和性能，并使你更容易识别新会话是否可疑。</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">闲置会话</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">你可以使用此设备通过QR码登录移动设备或网络设备。 有两种方法可以做到这一点：</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">使用QR码登录</string>
+    <string name="device_manager_session_rename_warning">请注意，与你交流的人也可以看到会话名称。</string>
+    <string name="device_manager_session_rename_description">自定义会话名称可以帮助你更轻松地识别你的设备。</string>
+    <string name="device_manager_session_rename">重命名会话</string>
+    <string name="device_manager_session_details_device_operating_system">操作系统</string>
+    <string name="device_manager_session_details_device_model">型号</string>
+    <string name="device_manager_session_details_device_browser">浏览器</string>
+    <string name="device_manager_session_details_application_url">网址</string>
+    <string name="device_manager_session_details_application_version">版本</string>
+    <string name="device_manager_session_details_application_name">名称</string>
+    <string name="device_manager_session_details_application">应用</string>
+    <string name="device_manager_session_details_session_last_activity">上次活动</string>
+    <string name="device_manager_session_details_session_name">会话名称</string>
+    <string name="device_manager_push_notifications_description">接收有关此会话的推送通知。</string>
+    <string name="device_manager_push_notifications_title">推送通知</string>
+    <string name="device_manager_session_details_description">应用程序、设备和活动信息。</string>
+    <string name="device_manager_session_details_title">会话详情</string>
+    <string name="device_manager_session_overview_signout">登出此会话</string>
+    <string name="device_manager_other_sessions_clear_filter">清除过滤器</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">未找到闲置会话。</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">未找到未验证的会话。</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">未找到已验证的会话。</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="other">考虑登出你不再使用的旧会话（%1$d 天或更长时间）。</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">闲置</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">未验证</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">为获得最佳安全性，请从你不认识或不再使用的任何会话中登出。</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">已验证</string>
+    <string name="a11y_device_manager_filter">过滤器</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="other">闲置 %1$d 天或更长时间</item>
+    </plurals>
+    <string name="device_manager_filter_option_unverified">未验证</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">未验证 · 你当前的会话</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">验证你当前的会话以显示此会话的验证状态。</string>
+    <string name="device_manager_verification_status_unknown">未知的验证状态</string>
+    <string name="tooltip_attachment_voice_broadcast">开始语音广播</string>
+    <string name="a11y_voice_broadcast_buffering">正在缓冲……</string>
+    <string name="a11y_pause_voice_broadcast">暂停语音广播</string>
+    <string name="voice_broadcast_live">实时</string>
+    <string name="action_got_it">知道了</string>
+    <string name="rich_text_editor_format_underline">应用下划线格式</string>
+    <string name="rich_text_editor_format_strikethrough">应用删除线格式</string>
+    <string name="rich_text_editor_format_italic">应用斜体格式</string>
+    <string name="rich_text_editor_format_bold">应用粗体格式</string>
+    <string name="qr_code_login_confirm_security_code_description">请确保你知道此代码的来源。 通过链接设备，你将为某人提供对你账户的完全访问权限。</string>
+    <string name="qr_code_login_confirm_security_code">确认</string>
+    <string name="qr_code_login_try_again">再试一次</string>
+    <string name="qr_code_login_status_no_match">不匹配？</string>
+    <string name="qr_code_login_signing_in">登录</string>
+    <string name="qr_code_login_connecting_to_device">连接到设备</string>
+    <string name="qr_code_login_scan_qr_code_button">扫描QR码</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">登录移动设备？</string>
+    <string name="qr_code_login_show_qr_code_button">在此设备中显示QR码</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">选择“扫描QR码”</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">从登录屏幕开始</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">选择“使用QR码登录”</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">从登录屏幕开始</string>
+    <string name="qr_code_login_new_device_instruction_3">选择“显示QR码”</string>
+    <string name="qr_code_login_new_device_instruction_2">转到设置 -&gt; 安全和隐私</string>
+    <string name="qr_code_login_new_device_instruction_1">在你的其它设备上打开应用程序</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">主服务器不支持QR码登录。</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">登录已在另一台设备上取消。</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">该QR码无效。</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">另一台设备必须登录。</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">另一台设备已登录。</string>
+    <string name="qr_code_login_header_failed_timeout_description">链接未在规定时间内完成。</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">设置安全消息传递时遇到安全问题。 以下其中一项可能会受到损害：你的家庭服务器； 你的互联网连接； 你的设备；</string>
+    <string name="qr_code_login_header_failed_other_description">请求失败。</string>
+    <string name="qr_code_login_header_failed_denied_description">该请求在另一台设备上被拒绝。</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">不支持与此设备链接。</string>
+    <string name="qr_code_login_header_failed_title">连接不成功</string>
+    <string name="qr_code_login_header_connected_description">检查你已登录的设备，应显示以下代码。 确认以下代码与该设备匹配：</string>
+    <string name="qr_code_login_header_connected_title">已建立安全连接</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">使用已退出登录的设备扫描下方QR码。</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">使用你已登录的设备扫描下方QR码：</string>
+    <string name="qr_code_login_header_show_qr_code_title">使用QR码登录</string>
+    <string name="qr_code_login_header_scan_qr_code_description">使用此设备上的相机扫描其它设备上显示的QR码：</string>
+    <string name="qr_code_login_header_scan_qr_code_title">扫描QR码</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="onboarding_new_app_layout_welcome_message">为了简化你的 ${app_name}，选项卡现在是可选的。 使用右上角的菜单管理它们。</string>
+    <string name="home_empty_no_unreads_title">无需报告。</string>
+    <string name="home_empty_no_rooms_message">适用于团队、朋友和组织的一体化安全聊天应用程序。 创建一个聊天或加入一个现有的房间来开始。</string>
+    <string name="home_empty_space_no_rooms_message">空间是一种对房间和人员进行分组的新方式。 使用右下角的按钮添加现有房间或创建新房间。</string>
+    <string name="device_manager_learn_more_sessions_verified_title">已验证会话</string>
+    <string name="device_manager_learn_more_sessions_unverified">未验证会话是使用你的凭据登录但未经交叉验证的会话。
+\n
+\n你应特别确定你识别这些会话，因为它们可能代表未经授权使用你的账户。</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">未验证会话</string>
+    <string name="device_manager_filter_option_inactive">闲置</string>
+    <string name="device_manager_session_rename_edit_hint">会话名称</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">验证或登出此会话以获得最佳安全性和可靠性。</string>
+    <string name="a11y_play_voice_broadcast">播放或恢复语音广播</string>
+    <string name="key_authenticity_not_guaranteed">此设备无法保证此加密消息的真实性。</string>
+    <string name="command_description_table_flip">将 (╯°□°)╯︵ ┻━┻ 添加到纯文本消息中</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} 需要显示通知的权限。
+\n请授予权限。</string>
+    <string name="command_description_devtools">打开开发者工具屏幕</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 你已在安全设置中为所有房间启用了仅对已验证会话加密。</string>
+    <string name="grant_permission">授予权限</string>
+    <string name="a11y_stop_voice_broadcast_record">停止语音广播录制</string>
+    <string name="a11y_pause_voice_broadcast_record">暂停语音广播录制</string>
+    <string name="a11y_resume_voice_broadcast_record">继续语音广播录制</string>
+    <string name="login_scan_qr_code">扫描QR码</string>
+    <string name="attachment_type_voice_broadcast">语音广播</string>
+    <string name="push_gateway_item_enabled">已启用：</string>
+    <string name="push_gateway_item_device_id">会话ID：</string>
+    <string name="error_check_network">出了点差错。请检查你的网络连接并重试。</string>
+    <string name="attachment_type_selector_contact">联系人</string>
+    <string name="rich_text_editor_full_screen_toggle">切换全屏模式</string>
+    <string name="device_manager_other_sessions_select">选择会话</string>
+    <string name="attachment_type_selector_text_formatting">文本格式</string>
+    <string name="attachment_type_selector_camera">相机</string>
+    <string name="attachment_type_selector_location">位置</string>
+    <string name="attachment_type_selector_poll">投票</string>
+    <string name="attachment_type_selector_voice_broadcast">语音广播</string>
+    <string name="attachment_type_selector_file">附件</string>
+    <string name="attachment_type_selector_sticker">贴纸</string>
+    <string name="attachment_type_selector_gallery">照片库</string>
+    <string name="error_voice_broadcast_permission_denied_message">你没有在此房间内开始语音广播所需的权限。联系房间管理员升级你的权限。</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">其他人已经在录制语音广播。等待他们的语音广播结束以开始新的广播。</string>
+    <string name="error_voice_broadcast_already_in_progress_message">你已经在录制语音广播。请结束你当前的语音广播以开始新的语音广播。</string>
+    <string name="error_voice_broadcast_unauthorized_title">无法开始新的语音广播</string>
+    <string name="a11y_voice_broadcast_fast_forward">快进 30 秒</string>
+    <string name="a11y_voice_broadcast_fast_backward">快退 30 秒</string>
+    <string name="action_deselect_all">取消全选</string>
+    <string name="action_select_all">全选</string>
+    <plurals name="x_selected">
+        <item quantity="other">已选择 %1$d</item>
+    </plurals>
+    <string name="message_reply_to_sender_created_poll">已创建投票。</string>
+    <string name="message_reply_to_sender_sent_sticker">已发送贴纸。</string>
+    <string name="message_reply_to_sender_sent_video">已发送视频。</string>
+    <string name="message_reply_to_sender_sent_image">已发送图片。</string>
+    <string name="message_reply_to_sender_sent_voice_message">已发送语音消息。</string>
+    <string name="message_reply_to_sender_sent_audio_file">已发送音频文件。</string>
+    <string name="message_reply_to_sender_sent_file">已发送文件。</string>
+    <string name="device_manager_learn_more_sessions_verified_description">已验证的会话是在输入你的口令词组或用另一个已验证的会话确认你的身份之后你使用此账户的任何地方。
+\n
+\n这意味着你拥有解锁你的已加密消息和向其他用户证明你信任此会话所需的全部密钥。</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="other">登出%1$d个会话</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">登出</string>
+    <string name="voice_broadcast_recording_time_left">剩余%1$s</string>
+    <string name="editing">正在编辑</string>
+    <string name="replying_to">回复给%s</string>
+    <string name="quoting">引用</string>
+    <string name="device_manager_other_sessions_show_ip_address">显示IP地址</string>
+    <string name="device_manager_other_sessions_hide_ip_address">隐藏IP地址</string>
+    <string name="message_reply_to_prefix">回复给</string>
+    <string name="settings_enable_direct_share_title">启用直接分享</string>
+    <string name="settings_enable_direct_share_summary">在系统分享菜单中显示最近聊天</string>
+    <string name="review_unverified_sessions_description">复查以确保你的账户是安全的</string>
+    <string name="review_unverified_sessions_title">你有未验证的会话</string>
+    <string name="device_manager_signout_all_other_sessions">登出全部其他会话</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">这个会话不支持加密，因此不能被验证。</string>
+    <string name="settings_nightly_build_update">获取最新构建（注意：你可能在登录时遇到麻烦）</string>
+    <string name="voice_broadcast_live_broadcast">实时广播</string>
+    <string name="settings_nightly_build">Nightly构建</string>
+    <string name="notice_voice_broadcast_ended_by_you">你结束了一个语音广播。</string>
+    <string name="notice_voice_broadcast_ended">%1$s结束了一个语音广播。</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-zh-rCN/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-zh-rCN/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-zh-rCN/strings_no_weblate.xml
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
similarity index 88%
rename from vector/src/main/res/values-zh-rTW/strings.xml
rename to library/ui-strings/src/main/res/values-zh-rTW/strings.xml
index effb6e7410..934f5aa47b 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
@@ -52,8 +52,6 @@
 \n正在匯入已邀請的聊天室</string>
     <string name="initial_sync_start_importing_account_left_rooms">初始化同步：
 \n正在匯入已離開的聊天室</string>
-    <string name="initial_sync_start_importing_account_groups">初始化同步：
-\n正在匯入社群</string>
     <string name="initial_sync_start_importing_account_data">初始化同步：
 \n正在匯入帳號資料</string>
     <string name="notice_room_update">%s 已升級此聊天室。</string>
@@ -264,7 +262,6 @@
     <string name="matrix_only_filter">僅 Matrix 聯絡人</string>
     <string name="no_result_placeholder">沒有結果</string>
     <string name="rooms_header">聊天室</string>
-    <string name="groups_header">社群</string>
     <string name="send_bug_report_include_logs">傳送記錄</string>
     <string name="send_bug_report_include_crash_logs">傳送當機紀錄</string>
     <string name="send_bug_report_include_screenshot">傳送螢幕截圖</string>
@@ -298,7 +295,6 @@
     <string name="auth_email_already_defined">此電子郵件位址已經被定義。</string>
     <string name="auth_forgot_password">忘記密碼？</string>
     <string name="auth_recaptcha_message">這個家伺服器想要確定您不是機器人</string>
-    <string name="auth_reset_password_missing_email">必須輸入和您帳號關聯的電子郵件地址。</string>
     <string name="auth_reset_password_error_unauthorized">電子郵件地址驗證失敗： 請確保您已點擊郵件中的連結</string>
     <string name="login_error_invalid_home_server">請輸入有效的網址</string>
     <string name="login_error_bad_json">異常的 JSON</string>
@@ -473,7 +469,7 @@
     <string name="settings_theme">主題</string>
     <string name="encryption_information_decryption_error">解密錯誤</string>
     <string name="encryption_information_device_name">公開名稱</string>
-    <string name="encryption_information_device_id">工作階段 ID</string>
+    <string name="device_manager_session_details_session_id">工作階段 ID</string>
     <string name="encryption_information_device_key">工作階段金鑰</string>
     <string name="encryption_export_e2e_room_keys">匯出聊天室的端到端加密金鑰</string>
     <string name="encryption_export_room_keys">匯出聊天室的加密金鑰</string>
@@ -858,7 +854,6 @@
     <string name="action_change">變更</string>
     <string name="change_room_directory_network">變更網路</string>
     <string name="please_wait">請稍候……</string>
-    <string name="group_all_communities">所有社群</string>
     <string name="room_preview_no_preview">無法預覽此聊天室</string>
     <string name="fab_menu_create_room">聊天室</string>
     <string name="fab_menu_create_chat">直接訊息</string>
@@ -878,10 +873,10 @@
     <string name="settings_push_rules">推送規則</string>
     <string name="settings_push_rules_no_rules">未定義通送規則</string>
     <string name="settings_push_gateway_no_pushers">沒有已註冊的推送閘道</string>
-    <string name="push_gateway_item_app_id">app_id：</string>
-    <string name="push_gateway_item_push_key">push_key：</string>
-    <string name="push_gateway_item_app_display_name">app_display_name：</string>
-    <string name="push_gateway_item_device_name">session_name：</string>
+    <string name="push_gateway_item_app_id">App ID：</string>
+    <string name="push_gateway_item_push_key">推送金鑰：</string>
+    <string name="push_gateway_item_app_display_name">應用程式顯示名稱：</string>
+    <string name="push_gateway_item_device_name">工作階段顯示名稱：</string>
     <string name="push_gateway_item_url">Url：</string>
     <string name="push_gateway_item_format">格式：</string>
     <string name="preference_voice_and_video">音訊與視訊</string>
@@ -943,11 +938,11 @@
     <string name="settings_discovery_identity_server_info">您正在使用 %1$s 來探索與被您認識的既有聯絡人探索。</string>
     <string name="settings_discovery_identity_server_info_none">您目前並未使用身份識別伺服器。要探索與被您認識的聯絡人探索，請在下方設定一個。</string>
     <string name="settings_discovery_emails_title">可探索的電子郵件地址</string>
-    <string name="settings_discovery_no_mails">在您新增電子郵件後，探索選項將會出現。</string>
+    <string name="settings_discovery_no_mails">在您新增電子郵件地址後，探索選項將會出現。</string>
     <string name="settings_discovery_no_msisdn">在您新增電話號碼後，探索選項將會出現。</string>
     <string name="settings_discovery_disconnect_identity_server_info">與您的身份識別伺服器斷線代表您無法被其他使用者探索，且您將無法透過電子郵件或電話邀請其他人。</string>
     <string name="settings_discovery_msisdn_title">可探索的電話號碼</string>
-    <string name="settings_discovery_confirm_mail">我們將會傳送確認電子郵件到 %s 給您，請檢查您的電子郵件並在確認連結上點選</string>
+    <string name="settings_discovery_confirm_mail">我們已傳送電子郵件到 %s，請檢查您的電子郵件並在確認連結上點選</string>
     <string name="settings_discovery_enter_identity_server">輸入身份識別伺服器 URL</string>
     <string name="settings_discovery_bad_identity_server">無法連線到身份識別伺服器</string>
     <string name="settings_discovery_please_enter_server">請輸入身份識別伺服器 URL</string>
@@ -1074,7 +1069,7 @@
     <string name="login_registration_not_supported">應用程式無法在此家伺服器上建立帳號。
 \n
 \n您想要使用網路客戶端註冊嗎？</string>
-    <string name="login_login_with_email_error">此電子郵件未關聯到任何帳號。</string>
+    <string name="login_login_with_email_error">此電子郵件地址未關聯到任何帳號。</string>
     <string name="login_reset_password_on">在 %1$s 上重設密碼</string>
     <string name="login_reset_password_notice">驗證郵件已傳送到您的收件匣以確認您要設定新密碼。</string>
     <string name="login_reset_password_submit">下一步</string>
@@ -1083,7 +1078,7 @@
     <string name="login_reset_password_warning_title">警告！</string>
     <string name="login_reset_password_warning_content">變更您的密碼將會重設在您所有工作階段中任何的端到端加密金鑰，讓已加密的聊天歷史無法讀取。請在重設您的密碼前從其他工作階段設定金鑰備份或匯出您的聊天室金鑰。</string>
     <string name="login_reset_password_warning_submit">繼續</string>
-    <string name="login_reset_password_error_not_found">此電子郵件未被連結到任何帳號</string>
+    <string name="login_reset_password_error_not_found">此電子郵件地址未被連結到任何帳號</string>
     <string name="login_reset_password_mail_confirmation_title">檢查您的收件匣</string>
     <string name="login_reset_password_mail_confirmation_notice">驗證電子郵件已傳送至 %1$s。</string>
     <string name="login_reset_password_mail_confirmation_notice_2">輕點連結以確認您的新密碼。在您使用了其中包含的連結後，請點擊下方。</string>
@@ -1097,7 +1092,7 @@
 \n
 \n停止密碼變更流程？</string>
     <string name="login_set_email_title">設定電子郵件地址</string>
-    <string name="login_set_email_notice">設定電子郵件以復原您的帳號。之後您也可以選擇性地讓您認識的人透過您的電子郵件找到您。</string>
+    <string name="login_set_email_notice">設定電子郵件地址以復原您的帳號。之後您也可以選擇性地讓您認識的人透過此地址找到您。</string>
     <string name="login_set_email_mandatory_hint">電子郵件</string>
     <string name="login_set_email_optional_hint">電子郵件（選擇性）</string>
     <string name="login_set_email_submit">下一個</string>
@@ -1435,7 +1430,7 @@
     <string name="event_redacted">訊息已移除</string>
     <string name="settings_show_redacted">顯示已移除的訊息</string>
     <string name="settings_show_redacted_summary">為已移除的訊息顯示佔位符</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">我們已傳送確認電子郵件給 %s，請先檢查您的電子郵件並點擊確認連結</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">我們已傳送電子郵件到 %s，請先檢查您的電子郵件並點擊確認連結</string>
     <string name="settings_text_message_sent_wrong_code">驗證代碼不正確。</string>
     <string name="uploads_media_title">媒體</string>
     <string name="uploads_media_no_result">此聊天室中沒有媒體</string>
@@ -1458,7 +1453,7 @@
     <string name="identity_server_error_outdated_home_server">此動作是不可能的。家伺服器太舊了。</string>
     <string name="identity_server_error_no_identity_server_configured">請先設定身份識別伺服器。</string>
     <string name="identity_server_error_terms_not_signed">請先在設定中同意身份識別伺服器的條款。</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">為了保護您的隱私，${app_name} 僅支援傳送雜湊過的使用者電子郵件與電話號碼。</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">為了保護您的隱私，${app_name} 僅支援傳送雜湊過的使用者電子郵件地址與電話號碼。</string>
     <string name="identity_server_error_binding_error">關聯失敗。</string>
     <string name="identity_server_error_no_current_binding_error">目前沒有此識別符的關聯。</string>
     <string name="identity_server_set_default_notice">您的家伺服器 (%1$s) 建議將 %2$s 用於您的身份識別伺服器</string>
@@ -1628,12 +1623,12 @@
     <string name="auth_msisdn_already_defined">此電話號碼已被定義。</string>
     <string name="settings_phone_number_empty">未新增電話號碼到您的帳號</string>
     <string name="settings_emails">電子郵件地址</string>
-    <string name="settings_emails_empty">未傳送電子郵件到您的帳號</string>
+    <string name="settings_emails_empty">未新增電子郵件地址至您的帳號</string>
     <string name="settings_phone_numbers">電話號碼</string>
     <string name="settings_remove_three_pid_confirmation_content">移除 %s？</string>
     <string name="error_threepid_auth_failed">確保您已經點擊我們傳送給您的電子郵件中的連結。</string>
     <string name="settings_emails_and_phone_numbers_title">電子郵件與電話號碼</string>
-    <string name="settings_emails_and_phone_numbers_summary">管理連結到您 Matrix 帳號的電子郵件與電話號碼</string>
+    <string name="settings_emails_and_phone_numbers_summary">管理連結到您 Matrix 帳號的電子郵件地址與電話號碼</string>
     <string name="settings_text_message_sent_hint">代碼</string>
     <string name="login_msisdn_notice">請使用國際格式（電話號碼必須以 \'+\' 開頭）</string>
     <string name="confirm_your_identity_quad_s">透過確認此登入來驗證您的身份，以及授予存取加密訊息的權限。</string>
@@ -1749,7 +1744,7 @@
     <string name="attachment_viewer_item_x_of_y">%2$d 中的 %1$d</string>
     <string name="settings_discovery_consent_action_give_consent">給予同意</string>
     <string name="settings_discovery_consent_action_revoke">撤銷我的同意</string>
-    <string name="settings_discovery_consent_notice_on">您已同意傳送電子郵件與電話號碼到此身份提供者以從您的聯絡人中探索其他使用者。</string>
+    <string name="settings_discovery_consent_notice_on">您已同意傳送電子郵件地址與電話號碼到此身份提供者以從您的聯絡人中探索其他使用者。</string>
     <string name="settings_discovery_consent_title">傳送電子郵件或電話號碼</string>
     <string name="direct_room_user_list_suggestions_title">建議</string>
     <string name="direct_room_user_list_known_title">已知的使用者</string>
@@ -2108,7 +2103,7 @@
     <string name="settings_notification_mentions_and_keywords">提及與關鍵字</string>
     <string name="settings_notification_default">預設通知</string>
     <string name="link_this_email_with_your_account">設定中的 %s 可直接在 ${app_name} 中接收邀請。</string>
-    <string name="link_this_email_settings_link">將此電子郵件與您的帳號連結</string>
+    <string name="link_this_email_settings_link">將此電子郵件地址與您的帳號連結</string>
     <string name="this_invite_to_this_space_was_sent">此空間的邀請已傳送給與您的帳號無關的 %s</string>
     <string name="this_invite_to_this_room_was_sent">此聊天室的邀請已傳送給與您的帳號無關的 %s</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">您所在的所有聊天室都會顯示在 Home 中。</string>
@@ -2176,7 +2171,7 @@
     <string name="room_settings_space_access_title">空間存取</string>
     <string name="room_settings_access_rules_pref_dialog_title">誰可以存取？</string>
     <string name="settings_notification_emails_enable_for_email">啟用 %s 的電子郵件通知</string>
-    <string name="settings_notification_emails_no_emails">要收到通知用的電子郵件，請將電子郵件關聯至您的 Matrix 帳號</string>
+    <string name="settings_notification_emails_no_emails">要收到通知用的電子郵件，請將電子郵件地址關聯至您的 Matrix 帳號</string>
     <string name="settings_notification_emails_category">電子郵件通知</string>
     <string name="room_permissions_upgrade_the_space">升級空間</string>
     <string name="room_permissions_change_space_name">變更空間名稱</string>
@@ -2222,12 +2217,12 @@
     <string name="create_poll_question_title">投票問題或主題</string>
     <string name="create_poll_title">建立投票</string>
     <string name="attachment_type_poll">投票</string>
-    <string name="identity_server_consent_dialog_title_2">向 %s 傳送電子郵件與電話號碼</string>
+    <string name="identity_server_consent_dialog_title_2">向 %s 傳送電子郵件地址與電話號碼</string>
     <string name="settings_discovery_consent_notice_off_2">您的通訊錄是私人的。要從您的通訊錄中探索使用者，我們需要您的權限來傳送聯絡人資訊到您的身份識別伺服器。</string>
     <string name="shortcut_disabled_reason_sign_out">已登出工作階段！</string>
     <string name="shortcut_disabled_reason_room_left">已離開聊天室！</string>
     <string name="identity_server_consent_dialog_content_question">您同意傳送此資訊嗎？</string>
-    <string name="identity_server_consent_dialog_content_3">要探索現有聯絡人，您必須傳送聯絡人資訊（電子郵件與電話號碼）到您的身份識別伺服器。我們會在傳送前對您的資料進行雜湊處理以保護隱私。</string>
+    <string name="identity_server_consent_dialog_content_3">要探索現有聯絡人，您必須傳送聯絡人資訊（電子郵件地址與電話號碼）到您的身份識別伺服器。我們會在傳送前對您的資料進行雜湊處理以保護隱私。</string>
     <string name="action_not_now">現在不要</string>
     <string name="delete_poll_dialog_content">您確定要移除此投票？移除後將無法復原。</string>
     <string name="delete_poll_dialog_title">移除投票</string>
@@ -2385,7 +2380,6 @@
     <string name="ftue_profile_picture_title">新增個人資訊照片</string>
     <string name="ftue_display_name_entry_footer">您可以在稍後變更這個</string>
     <string name="ftue_display_name_entry_title">顯示名稱</string>
-    <string name="ftue_display_name_subtitle">這將會在您傳送訊息時顯示。</string>
     <string name="ftue_display_name_title">選擇顯示名稱</string>
     <string name="ftue_account_created_subtitle">您的帳號 %s 已建立</string>
     <string name="ftue_account_created_congratulations_title">恭喜！</string>
@@ -2435,7 +2429,6 @@
     <string name="a11y_presence_busy">忙碌</string>
     <string name="keys_backup_settings_signature_from_this_user">備份具有來自該使用者的有效簽名。</string>
     <string name="live_location_bottom_sheet_last_updated_at">%1$s 前已更新</string>
-    <string name="live_location_bottom_sheet_stop_sharing">停止分享</string>
     <string name="labs_enable_live_location_summary">暫時的實作：位置會保留在聊天室歷史紀錄中</string>
     <string name="labs_enable_live_location">啟用即時位置分享</string>
     <string name="location_share_live_remaining_time">剩餘 %1$s</string>
@@ -2553,4 +2546,292 @@
     </plurals>
     <string name="search_space_two_parents">%1$s 與 %2$s</string>
     <string name="auth_reset_password_error_unverified">電子郵件未驗證，請檢查您的收件匣</string>
+    <string name="location_share_loading_map_error">無法載入地圖
+\n此家伺服器可能未設定好顯示地圖。</string>
+    <string name="a11y_open_settings">開啟設定</string>
+    <string name="all_chats">所有聊天</string>
+    <string name="device_manager_sessions_other_description">為了取得最佳安全性，請驗證您的工作階段並登出任何您無法識別或不再使用的工作階段。</string>
+    <string name="device_manager_sessions_other_title">其他工作階段</string>
+    <string name="settings_sessions_list">工作階段</string>
+    <string name="a11y_open_spaces">開啟空間清單</string>
+    <string name="a11y_create_message">建立新的對話或聊天室</string>
+    <string name="room_list_filter_people">聯絡人</string>
+    <string name="room_list_filter_favourites">最愛</string>
+    <string name="room_list_filter_unreads">未讀</string>
+    <string name="room_list_filter_all">全部</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+    <string name="home_layout_preferences_sort_by">排序由</string>
+    <string name="home_layout_preferences_sort_activity">活動</string>
+    <string name="home_layout_preferences_recents">顯示最近的</string>
+    <string name="home_layout_preferences_filters">顯示過濾條件</string>
+    <string name="home_layout_preferences">佈局偏好設定</string>
+    <string name="explore_rooms">探索聊天室</string>
+    <string name="create_room">建立聊天室</string>
+    <string name="start_chat">開始聊天</string>
+    <string name="device_manager_other_sessions_description_unverified">未驗證 · 最後活動 %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">已驗證 · 最後活動 %1$s</string>
+    <string name="device_manager_other_sessions_view_all">檢視全部 (%1$d)</string>
+    <string name="device_manager_view_details">檢視詳細資訊</string>
+    <string name="device_manager_verify_session">驗證工作階段</string>
+    <string name="device_manager_verification_status_unverified">未驗證的工作階段</string>
+    <string name="device_manager_verification_status_verified">已驗證的工作階段</string>
+    <string name="a11y_device_manager_device_type_unknown">未知的裝置類型</string>
+    <string name="a11y_device_manager_device_type_desktop">桌面</string>
+    <string name="a11y_device_manager_device_type_web">網頁</string>
+    <string name="a11y_device_manager_device_type_mobile">行動裝置</string>
+    <string name="timeline_error_room_not_found">抱歉，找不到此聊天室。
+\n請稍後再試。%s</string>
+    <string name="invites_title">邀請</string>
+    <string name="onboarding_new_app_layout_button_try">試試看</string>
+    <string name="onboarding_new_app_layout_feedback_message">輕點右上角來檢視回饋選項。</string>
+    <string name="onboarding_new_app_layout_feedback_title">給予回饋</string>
+    <string name="onboarding_new_app_layout_spaces_message">存取您的空間（右下角）比以往任何時候都更快且更輕鬆。</string>
+    <string name="onboarding_new_app_layout_spaces_title">存取空間</string>
+    <string name="onboarding_new_app_layout_welcome_message">為了簡化您的 ${app_name}，分頁現在是選擇性的。使用右上角的選單管理它們。</string>
+    <string name="onboarding_new_app_layout_welcome_title">歡迎使用新的檢視！</string>
+    <string name="home_empty_no_unreads_message">當您有一些未讀的訊息時，這裡會顯示您的未讀訊息。</string>
+    <string name="home_empty_no_unreads_title">沒有要回報的東西。</string>
+    <string name="home_empty_no_rooms_message">適用於團隊、朋友與組織的多合一安全聊天應用程式。建立聊天室，或加入一個既有的聊天室。</string>
+    <string name="home_empty_no_rooms_title">歡迎使用 ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">空間是一種為聊天室與人們分組的新方式。使用右下角的按鈕新增既有的聊天室或建立新的。</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\n看起來有點空。</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="other">考慮登出您不再使用的舊工作階段（%1$d天或更久）。</item>
+    </plurals>
+    <string name="device_manager_inactive_sessions_title">不活躍的工作階段</string>
+    <string name="device_manager_unverified_sessions_description">驗證或從未驗證的工作階段登出。</string>
+    <string name="device_manager_unverified_sessions_title">未驗證的工作階段</string>
+    <string name="device_manager_header_section_security_recommendations_description">按照這些建議提高您的帳號安全性。</string>
+    <string name="device_manager_header_section_security_recommendations_title">安全建議</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="other">不活躍 %1$d+ 天 (%2$s)</item>
+    </plurals>
+    <string name="invites_empty_message">這是您的新請求與邀請的所在。</string>
+    <string name="invites_empty_title">沒有新東西。</string>
+    <string name="space_list_empty_message">空間是一種對聊天室與人們分組的新方式。建立空間以開始。</string>
+    <string name="space_list_empty_title">尚無空間。</string>
+    <string name="a11y_collapse_space_children">折疊 %s 個子空間</string>
+    <string name="a11y_expand_space_children">展開 %s 個子空間</string>
+    <string name="change_space">變更空間</string>
+    <string name="device_manager_session_details_device_ip_address">IP 位置</string>
+    <string name="device_manager_session_details_session_last_activity">最後活動</string>
+    <string name="device_manager_session_details_session_name">工作階段名稱</string>
+    <string name="device_manager_session_details_description">應用程式、裝置與活動資訊。</string>
+    <string name="device_manager_session_details_title">工作階段詳細資訊</string>
+    <string name="device_manager_other_sessions_clear_filter">清除過濾條件</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">找不到不活躍的工作階段。</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">找不到未驗證的工作階段。</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">找不到已驗證的工作階段。</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="other">閒置%1$d天或更久</item>
+    </plurals>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="other">考慮登出您不再使用的舊工作階段（%1$d天或更久）。</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">不活躍</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">驗證您的工作階段以強化安全通訊或從您無法識別或不再使用的工作階段登出。</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">未驗證</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">為取得最佳安全性，請從任何您無法識別或不再使用的工作階段登出。</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">已驗證</string>
+    <string name="a11y_device_manager_filter">過濾</string>
+    <string name="device_manager_filter_option_inactive">不活躍</string>
+    <string name="device_manager_filter_option_unverified_description">尚未準備好安全通訊</string>
+    <string name="device_manager_filter_option_unverified">未驗證</string>
+    <string name="device_manager_filter_option_verified_description">準備好安全通訊</string>
+    <string name="device_manager_filter_option_verified">已驗證</string>
+    <string name="device_manager_filter_option_all_sessions">所有工作階段</string>
+    <string name="device_manager_filter_bottom_sheet_title">過濾</string>
+    <string name="device_manager_session_last_activity">最後活動 %1$s</string>
+    <string name="device_manager_device_title">裝置</string>
+    <string name="device_manager_session_title">工作階段</string>
+    <string name="device_manager_current_session_title">目前的工作階段</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">驗證或從此工作階段登出以取得最佳安全性與可靠性。</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">驗證您目前的工作階段以強化安全通訊。</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">此工作階段已準備好安全通訊。</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">您目前的工作階段已準備好安全通訊。</string>
+    <string name="labs_enable_deferred_dm_summary">僅在第一則訊息上建立直接訊息</string>
+    <string name="labs_enable_deferred_dm_title">啟用延期直接訊息</string>
+    <string name="labs_enable_new_app_layout_summary">包含選擇性分頁的簡潔 Element</string>
+    <string name="labs_enable_new_app_layout_title">啟用新佈局</string>
+    <string name="device_manager_learn_more_session_rename">您加入的直接消息與聊天室中的其他使用者可以檢視您的工作階段的完整清單。
+\n
+\n這讓他們確信他們真的在與您交談，但這也意味著他們可以看到您在此處輸入的工作階段名稱。</string>
+    <string name="device_manager_learn_more_session_rename_title">正在重新命名工作階段</string>
+    <string name="device_manager_learn_more_sessions_verified">已驗證的工作階段代表使用您的憑證登入，然後使用您的安全通關密語或透過交叉驗證進行驗證。
+\n
+\n這代表了它們持有您先前訊息的加密金鑰，並向您正在與之通訊的其他使用者確認這些工作階段確實是您。</string>
+    <string name="device_manager_learn_more_sessions_verified_title">已驗證的工作階段</string>
+    <string name="device_manager_learn_more_sessions_unverified">未驗證的工作階段是使用您的憑證登入但未交叉驗證的工作階段。
+\n
+\n您應特別確定您可以識別這些工作階段，因為它們可能代表未經授權使用您的帳號。</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">未驗證的工作階段</string>
+    <string name="device_manager_learn_more_sessions_inactive">不活躍的工作階段是您有一段時間未使用的工作階段，但它們會繼續接收加密金鑰。
+\n
+\n移除不活躍的工作階段可以改善安全性與效能，並讓您可以更容易地識別新的工作階段是否可疑。</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">不活躍的工作階段</string>
+    <string name="device_manager_session_rename_warning">請注意，與您交流的人也可以看到工作階段名稱。</string>
+    <string name="device_manager_session_rename_description">自訂工作階段名稱可以協助您更輕鬆地識別您的裝置。</string>
+    <string name="device_manager_session_rename_edit_hint">工作階段名稱</string>
+    <string name="device_manager_session_rename">重新命名工作階段</string>
+    <string name="device_manager_session_overview_signout">登出此工作階段</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">未驗證 · 您目前的工作階段</string>
+    <string name="tooltip_attachment_voice_broadcast">開始語音廣播</string>
+    <string name="key_authenticity_not_guaranteed">此裝置無法保證此加密訊息的真實性。</string>
+    <string name="settings_security_incognito_keyboard_summary">要求鍵盤不要根據您在對話中輸入的內容更新任何個人化資料（如輸入歷史紀錄與字典等）。請注意，某些鍵盤可能不會遵守此設定。</string>
+    <string name="settings_security_incognito_keyboard_title">無痕式鍵盤</string>
+    <string name="command_description_table_flip">將 (╯°□°）╯︵ ┻━┻ 放到純文字訊息之前</string>
+    <string name="attachment_type_voice_broadcast">語音廣播</string>
+    <string name="command_description_devtools">開啟開發者工具畫面</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 您已在「安全」設定中為所有聊天室啟用加密驗證工作階段。</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ 此聊天室中有未驗證的裝置，它們將無法解密您傳送的訊息。</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">切莫向此聊天室中未經驗證的工作階段傳送加密訊息。</string>
+    <string name="action_got_it">知道了</string>
+    <string name="rich_text_editor_format_underline">套用底線格式</string>
+    <string name="rich_text_editor_format_strikethrough">套用刪除線格式</string>
+    <string name="rich_text_editor_format_italic">套用義式斜體格式</string>
+    <string name="rich_text_editor_format_bold">套用粗體格式</string>
+    <string name="labs_enable_client_info_recording_summary">記錄客戶端名稱、版本與 URL，以便在工作階段管理程式中可以更簡單地辨認工作階段。</string>
+    <string name="labs_enable_client_info_recording_title">啟用客戶端資訊記錄</string>
+    <string name="labs_enable_session_manager_summary">對所有工作階段有更大的能見度與控制。</string>
+    <string name="labs_enable_session_manager_title">啟用新的工作階段管理程式</string>
+    <string name="device_manager_session_details_device_operating_system">作業系統</string>
+    <string name="device_manager_session_details_device_model">模型</string>
+    <string name="device_manager_session_details_device_browser">瀏覽器</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">版本</string>
+    <string name="device_manager_session_details_application_name">名稱</string>
+    <string name="device_manager_session_details_application">應用程式</string>
+    <string name="device_manager_push_notifications_description">接收關於此工作階段的推播通知。</string>
+    <string name="device_manager_push_notifications_title">推播通知</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">驗證您目前的工作階段以顯示此工作階段的驗證狀態。</string>
+    <string name="device_manager_verification_status_unknown">未知的驗證狀態</string>
+    <string name="push_gateway_item_enabled">已啟用：</string>
+    <string name="push_gateway_item_device_id">工作階段 ID：</string>
+    <string name="error_check_network">發生了一些問題。請檢查您的網路連線並再試一次。</string>
+    <string name="grant_permission">授予權限</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} 需要權限以顯示通知。
+\n請授予權限。</string>
+    <string name="permissions_rationale_msg_notification">${app_name} 需要權限才能顯示通知。通知可以顯示您的訊息、您的邀請等等。
+\n
+\n請在下一個彈出式視窗允許存取以檢視通知。</string>
+    <string name="labs_enable_rich_text_editor_summary">試用格式化文字編輯器（純文字模式即將推出）</string>
+    <string name="labs_enable_rich_text_editor_title">啟用格式化文字編輯器</string>
+    <string name="qr_code_login_confirm_security_code_description">請確保您知道此驗證碼的來源。透過連結裝置，您將為某人提供對您帳號的完整存取權限。</string>
+    <string name="qr_code_login_confirm_security_code">確認</string>
+    <string name="qr_code_login_try_again">再試一次</string>
+    <string name="qr_code_login_status_no_match">不相符？</string>
+    <string name="qr_code_login_signing_in">登入</string>
+    <string name="qr_code_login_connecting_to_device">連線至裝置</string>
+    <string name="qr_code_login_scan_qr_code_button">掃描 QR code</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">正在使用行動裝置登入？</string>
+    <string name="qr_code_login_show_qr_code_button">在此裝置顯示 QR code</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">選取「掃描 QR code」</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">從登入畫面開始</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">選取「使用 QR code 登入」</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">從登入畫面開始</string>
+    <string name="qr_code_login_new_device_instruction_3">選取「顯示 QR code」</string>
+    <string name="qr_code_login_new_device_instruction_2">到「設定」→「安全與隱私」</string>
+    <string name="qr_code_login_new_device_instruction_1">在您的其他裝置上開啟應用程式</string>
+    <string name="qr_code_login_header_failed_denied_description">請求在另一台裝置上被拒絕。</string>
+    <string name="qr_code_login_header_failed_timeout_description">連結未在規定時間內完成。</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">不支援與其裝置連結。</string>
+    <string name="qr_code_login_header_failed_title">連線不成功</string>
+    <string name="qr_code_login_header_connected_description">請檢查您已登入的裝置，應該會顯示以下驗證碼。請確認以下驗證碼與該裝置相符：</string>
+    <string name="qr_code_login_header_connected_title">已建立安全連線</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">使用您已登出的裝置掃描以下 QR code。</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">使用您已登入的裝置來掃描下方的 QR code：</string>
+    <string name="qr_code_login_header_show_qr_code_title">使用 QR code 登入</string>
+    <string name="qr_code_login_header_scan_qr_code_description">使用此裝置的相機掃描您其他裝置上顯示的 QR code：</string>
+    <string name="qr_code_login_header_scan_qr_code_title">掃描 QR code</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">您可以使用此裝置透過 QR code 登入移動裝置或網路裝置。有兩種方法可以作到：</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">使用 QR code 登入</string>
+    <string name="login_scan_qr_code">掃描 QR code</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">家伺服器不支援使用 QR code 登入。</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">登入已在其他裝置上取消。</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">該 QR code 無效。</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">其他裝置必須登入。</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">其他裝置已登入。</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">設定安全訊息傳遞時遇到安全問題。以下其中一項可能已被駭入：您的家伺服器、您的網際網路連線、您的裝置；</string>
+    <string name="qr_code_login_header_failed_other_description">請求失敗。</string>
+    <string name="labs_enable_voice_broadcast_summary">可以在聊天室時間軸中錄製並傳送語音廣播。</string>
+    <string name="labs_enable_voice_broadcast_title">啟用語音廣播</string>
+    <string name="a11y_voice_broadcast_buffering">正在緩衝……</string>
+    <string name="a11y_pause_voice_broadcast">暫停語音廣播</string>
+    <string name="a11y_play_voice_broadcast">播放或繼續語音廣播</string>
+    <string name="a11y_stop_voice_broadcast_record">停止語音廣播錄製</string>
+    <string name="a11y_pause_voice_broadcast_record">暫停語音廣播錄製</string>
+    <string name="a11y_resume_voice_broadcast_record">繼續語音廣播錄製</string>
+    <string name="voice_broadcast_live">直播</string>
+    <string name="device_manager_other_sessions_select">選取工作階段</string>
+    <string name="attachment_type_selector_contact">聯絡人</string>
+    <string name="attachment_type_selector_camera">相機</string>
+    <string name="attachment_type_selector_location">位置</string>
+    <string name="attachment_type_selector_poll">投票</string>
+    <string name="attachment_type_selector_voice_broadcast">音訊廣播</string>
+    <string name="attachment_type_selector_file">附件</string>
+    <string name="attachment_type_selector_sticker">貼圖</string>
+    <string name="attachment_type_selector_gallery">照片媒體庫</string>
+    <string name="action_deselect_all">取消選取全部</string>
+    <string name="action_select_all">選取全部</string>
+    <plurals name="x_selected">
+        <item quantity="other">已選取 %1$d</item>
+    </plurals>
+    <string name="rich_text_editor_full_screen_toggle">切換全螢幕模式</string>
+    <string name="attachment_type_selector_text_formatting">文字格式化</string>
+    <string name="error_voice_broadcast_already_in_progress_message">您已在錄製語音廣播。請結束您目前的語音廣播以開始新的。</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">其他人已在錄製語音廣播。等待他們的語音廣播結束以開始新的。</string>
+    <string name="error_voice_broadcast_permission_denied_message">您沒有在此聊天室中開始語音廣播的必要權限。請聯絡聊天室管理員以升級您的權限。</string>
+    <string name="error_voice_broadcast_unauthorized_title">無法開始新的語音廣播</string>
+    <string name="a11y_voice_broadcast_fast_forward">快轉30秒</string>
+    <string name="a11y_voice_broadcast_fast_backward">快退30秒</string>
+    <string name="device_manager_learn_more_sessions_verified_description">已驗證的工作階段是您輸入通關密語或透過另一個已驗證工作階段確認您的身份後使用此帳號的任何地方。
+\n
+\n這代表了您擁有解鎖加密訊息並向其他使用者確認您信任此工作階段所需的所有金鑰。</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="other">登出 %1$d 個工作階段</item>
+    </plurals>
+    <string name="device_manager_other_sessions_multi_signout_selection">登出</string>
+    <string name="voice_broadcast_recording_time_left">剩餘 %1$s</string>
+    <string name="message_reply_to_sender_created_poll">已建立投票。</string>
+    <string name="message_reply_to_sender_sent_sticker">已傳送貼圖。</string>
+    <string name="message_reply_to_sender_sent_video">已傳送影片。</string>
+    <string name="message_reply_to_sender_sent_image">已傳送圖片。</string>
+    <string name="message_reply_to_sender_sent_voice_message">已傳送語音訊息。</string>
+    <string name="message_reply_to_sender_sent_audio_file">已傳送音訊檔。</string>
+    <string name="message_reply_to_sender_sent_file">已傳送檔案。</string>
+    <string name="message_reply_to_prefix">回覆給</string>
+    <string name="device_manager_other_sessions_hide_ip_address">隱藏 IP 位置</string>
+    <string name="device_manager_other_sessions_show_ip_address">顯示 IP 位置</string>
+    <string name="quoting">引用</string>
+    <string name="replying_to">回覆給 %s</string>
+    <string name="editing">正在編輯</string>
+    <string name="settings_enable_direct_share_summary">在系統分享選單中顯示最近聊天</string>
+    <string name="settings_enable_direct_share_title">啟用直接分享</string>
+    <string name="review_unverified_sessions_description">檢查以確保您的帳號安全</string>
+    <string name="review_unverified_sessions_title">您有未驗證的工作階段</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">此工作階段不支援加密，因此無法驗證。
+\n
+\n使用此工作階段時，您將無法參與啟用了加密的聊天室。
+\n
+\n為了取得最佳的安全性與隱私，建議使用支援加密的 Matrix 客戶端。</string>
+    <string name="device_manager_signout_all_other_sessions">登出其他所有工作階段</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">此工作階段不支援加密，因此無法驗證。</string>
+    <string name="settings_nightly_build_update">取得最新版本（注意：您可能會無法登入）</string>
+    <string name="settings_nightly_build">Nightly 版本</string>
+    <string name="voice_broadcast_live_broadcast">即時廣播</string>
+    <string name="notice_voice_broadcast_ended_by_you">您結束了語音廣播。</string>
+    <string name="notice_voice_broadcast_ended">%1$s 結束了語音廣播。</string>
+    <string name="stop_voice_broadcast_content">您真的想要停止您的即時廣播嗎？這將會結束廣播，完整的錄音會在聊天室中提供。</string>
+    <string name="stop_voice_broadcast_dialog_title">停止即時廣播？</string>
+    <string name="action_stop">是的，停止</string>
+    <string name="set_link_edit">編輯連結</string>
+    <string name="set_link_create">建立連結</string>
+    <string name="set_link_link">連結</string>
+    <string name="set_link_text">文字</string>
+    <string name="rich_text_editor_link">設定連結</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-zh-rTW/strings_no_weblate.xml b/library/ui-strings/src/main/res/values-zh-rTW/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values-zh-rTW/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values-zh-rTW/strings_no_weblate.xml
diff --git a/vector/src/main/res/values/array.xml b/library/ui-strings/src/main/res/values/array.xml
similarity index 100%
rename from vector/src/main/res/values/array.xml
rename to library/ui-strings/src/main/res/values/array.xml
diff --git a/vector/src/main/res/values/donottranslate.xml b/library/ui-strings/src/main/res/values/donottranslate.xml
similarity index 88%
rename from vector/src/main/res/values/donottranslate.xml
rename to library/ui-strings/src/main/res/values/donottranslate.xml
index 741d23dbc6..bfe751ef5a 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/library/ui-strings/src/main/res/values/donottranslate.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <string name="ellipsis" translatable="false">…</string>
+    <string name="no_value_placeholder" translatable="false">–</string>
 
     <!-- Temporary string -->
     <string name="not_implemented" translatable="false">Not implemented yet in ${app_name}</string>
diff --git a/vector/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
similarity index 88%
rename from vector/src/main/res/values/strings.xml
rename to library/ui-strings/src/main/res/values/strings.xml
index f204276a7f..8c5874f233 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- Cross feature -->
+    <plurals name="x_selected">
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+
+    <!-- Notice -->
     <string name="notice_room_invite_no_invitee">%s\'s invitation</string>
     <string name="notice_room_invite_no_invitee_by_you">Your invitation</string>
     <string name="notice_room_created">%1$s created the room</string>
@@ -127,6 +134,9 @@
     <string name="notice_crypto_unable_to_decrypt">** Unable to decrypt: %s **</string>
     <string name="notice_crypto_error_unknown_inbound_session_id">The sender\'s device has not sent us the keys for this message.</string>
 
+    <string name="notice_voice_broadcast_ended">%1$s ended a voice broadcast.</string>
+    <string name="notice_voice_broadcast_ended_by_you">You ended a voice broadcast.</string>
+
     <!-- Messages -->
 
     <!-- Room Screen -->
@@ -137,6 +147,14 @@
 
     <!-- Home Screen -->
     <string name="all_chats">All Chats</string>
+    <string name="start_chat">Start Chat</string>
+    <string name="create_room">Create Room</string>
+    <string name="change_space">Change Space</string>
+    <string name="explore_rooms">Explore Rooms</string>
+    <!-- Note to translators: %s refers to the space whose children is being expanded -->
+    <string name="a11y_expand_space_children">Expand %s children</string>
+    <!-- Note to translators: %s refers to the space whose children is being collapsed -->
+    <string name="a11y_collapse_space_children">Collapse %s children</string>
 
     <!-- Last seen time -->
 
@@ -175,8 +193,6 @@
     <string name="initial_sync_start_importing_account_joined_rooms">Initial sync:\nLoading your conversations\nIf you\'ve joined lots of rooms, this might take a while</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Initial sync:\nImporting invited rooms</string>
     <string name="initial_sync_start_importing_account_left_rooms">Initial sync:\nImporting left rooms</string>
-    <!--TODO:delete-->
-    <string name="initial_sync_start_importing_account_groups" tools:ignore="UnusedResources">Initial sync:\nImporting communities</string>
     <string name="initial_sync_start_importing_account_data">Initial sync:\nImporting account data</string>
 
     <string name="initial_sync_request_title">Initial sync request</string>
@@ -278,8 +294,8 @@
 
     <string name="notice_end_to_end_ok">%1$s turned on end-to-end encryption.</string>
     <string name="notice_end_to_end_ok_by_you">You turned on end-to-end encryption.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s turned on end-to-end encryption (unrecognised algorithm %2$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">You turned on end-to-end encryption (unrecognised algorithm %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s turned on end-to-end encryption (unrecognized algorithm %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">You turned on end-to-end encryption (unrecognized algorithm %1$s).</string>
 
     <!-- theme -->
     <string name="system_theme">System Default</string>
@@ -400,6 +416,10 @@
     <string name="action_reset">Reset</string>
     <string name="action_learn_more">Learn more</string>
     <string name="action_next">Next</string>
+    <string name="action_got_it">Got it</string>
+    <string name="action_select_all">Select all</string>
+    <string name="action_deselect_all">Deselect all</string>
+    <string name="action_stop">Yes, Stop</string>
 
     <string name="copied_to_clipboard">Copied to clipboard</string>
 
@@ -417,12 +437,30 @@
 
     <!-- Bottom navigation buttons -->
     <string name="bottom_action_notification">Notifications</string>
-    <string name="bottom_action_favourites">Favourites</string>
+    <string name="bottom_action_favourites">Favorites</string>
     <string name="bottom_action_people">People</string>
     <string name="bottom_action_rooms">Rooms</string>
 
     <!-- Home screen -->
     <string name="home_filter_placeholder_home">Filter room names</string>
+    <string name="home_layout_preferences">Layout preferences</string>
+
+
+    <!-- Home screen layout settings -->
+    <string name="home_layout_preferences_filters">Show filters</string>
+    <string name="home_layout_preferences_recents">Show recents</string>
+    <string name="home_layout_preferences_sort_by">Sort by</string>
+    <string name="home_layout_preferences_sort_activity">Activity</string>
+    <string name="home_layout_preferences_sort_name">A - Z</string>
+
+    <string name="labs_enable_new_app_layout_title">Enable new layout</string>
+    <string name="labs_enable_new_app_layout_summary">A simplified Element with optional tabs</string>
+
+    <string name="labs_enable_deferred_dm_title">Enable deferred DMs</string>
+    <string name="labs_enable_deferred_dm_summary">Create DM only on first message</string>
+
+    <string name="labs_enable_rich_text_editor_title">Enable rich text editor</string>
+    <string name="labs_enable_rich_text_editor_summary">Try out the rich text editor (plain text mode coming soon)</string>
 
     <!-- Home fragment -->
     <string name="invitations_header">Invites</string>
@@ -430,6 +468,16 @@
     <string name="system_alerts_header">"System Alerts"</string>
     <string name="suggested_header">Suggested Rooms</string>
 
+    <!-- Space List fragment -->
+    <string name="space_list_empty_title">No spaces yet.</string>
+    <string name="space_list_empty_message">Spaces are a new way to group rooms and people. Create a space to get started.</string>
+
+    <!-- Invites fragment -->
+    <string name="invites_title">Invites</string>
+
+    <string name="invites_empty_title">Nothing new.</string>
+    <string name="invites_empty_message">This is where your new requests and invites will be.</string>
+
     <!-- People fragment -->
     <string name="direct_chats_header">Conversations</string>
     <string name="matrix_only_filter">Matrix contacts only</string>
@@ -443,10 +491,6 @@
     <string name="settings_room_directory_show_all_rooms">Show rooms with explicit content</string>
     <string name="settings_room_directory_show_all_rooms_summary">Show all rooms in the room directory, including rooms with explicit content.</string>
 
-    <!-- Groups fragment -->
-    <!--TODO: delete-->
-    <string name="groups_header" tools:ignore="UnusedResources">Communities</string>
-
     <string name="spaces_header">Spaces</string>
 
     <string name="send_bug_report_include_logs">Send logs</string>
@@ -523,7 +567,6 @@
     <string name="auth_msisdn_already_defined">This phone number is already defined.</string>
     <string name="auth_forgot_password">Forgot password?</string>
     <string name="auth_recaptcha_message">This homeserver would like to make sure you are not a robot</string>
-    <string name="auth_reset_password_missing_email">The email address linked to your account must be entered.</string>
     <string name="auth_reset_password_error_unauthorized">Failed to verify email address: make sure you clicked the link in the email</string>
     <string name="auth_reset_password_error_unverified">Email not verified, check your inbox</string>
     <string name="auth_accept_policies">"Please review and accept the policies of this homeserver:"</string>
@@ -608,6 +651,8 @@
     <string name="permissions_rationale_msg_record_audio">${app_name} needs permission to access your microphone to perform audio calls.</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
     <string name="permissions_rationale_msg_camera_and_audio">${app_name} needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="permissions_rationale_msg_notification">${app_name} needs permission to display notifications. Notifications can display your messages, your invitations, etc.\n\nPlease allow access on the next pop-ups to be able to view notification.</string>
 
     <string name="permissions_denied_qr_code">To scan a QR code, you need to allow camera access.</string>
     <string name="permissions_denied_add_contact">Allow permission to access your contacts.</string>
@@ -747,7 +792,7 @@
     <string name="thread_list_modal_all_threads_subtitle">Shows all threads from current room</string>
     <string name="thread_list_modal_my_threads_title">My Threads</string>
     <string name="thread_list_modal_my_threads_subtitle">Shows all threads you’ve participated in</string>
-    <string name="thread_list_empty_title">Keep discussions organised with threads</string>
+    <string name="thread_list_empty_title">Keep discussions organized with threads</string>
     <string name="thread_list_empty_subtitle">Threads help keep your conversations on-topic and easy to track.</string>
     <!-- Parameter %s will be replaced by the value of string reply_in_thread -->
     <string name="thread_list_empty_notice">Tip: Long tap a message and use “%s”.</string>
@@ -792,7 +837,7 @@
     <string name="settings_app_info_link_summary">Show the application info in the system settings.</string>
 
     <string name="settings_emails">Email addresses</string>
-    <string name="settings_emails_empty">No email has been added to your account</string>
+    <string name="settings_emails_empty">No email address has been added to your account</string>
     <string name="settings_phone_numbers">Phone numbers</string>
     <string name="settings_remove_three_pid_confirmation_content">Remove %s?</string>
     <string name="error_threepid_auth_failed">Ensure that you have clicked on the link in the email we have sent to you.</string>
@@ -801,7 +846,7 @@
     <string name="settings_notification_by_event">Notification importance by event</string>
 
     <string name="settings_notification_emails_category">Email notification</string>
-    <string name="settings_notification_emails_no_emails">To receive email with notification, please associate an email to your Matrix account</string>
+    <string name="settings_notification_emails_no_emails">To receive email with notification, please associate an email address to your Matrix account</string>
 
     <!-- The variable is a single email address, eg Enable email notifications for example@matrix.org -->
     <string name="settings_notification_emails_enable_for_email">Enable email notifications for %s</string>
@@ -827,7 +872,9 @@
     <string name="settings_troubleshoot_test_system_settings_title">System Settings.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Notifications are enabled in the system settings.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Notifications are disabled in the system settings.\nPlease check system settings.</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} needs the permission to show notifications.\nPlease grant the permission.</string>
     <string name="open_settings">Open Settings</string>
+    <string name="grant_permission">Grant Permission</string>
 
     <string name="settings_troubleshoot_test_account_settings_title">Account Settings.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Notifications are enabled for your account.</string>
@@ -989,6 +1036,8 @@
     <string name="settings_chat_effects_description">Use /confetti command or send a message containing ❄️ or 🎉</string>
     <string name="settings_autoplay_animated_images_title">Autoplay animated images</string>
     <string name="settings_autoplay_animated_images_summary">Play animated images in the timeline as soon as they are visible</string>
+    <string name="settings_enable_direct_share_title">Enable direct share</string>
+    <string name="settings_enable_direct_share_summary">Show recent chats in the system share menu</string>
     <string name="settings_show_join_leave_messages">Show join and leave events</string>
     <string name="settings_show_join_leave_messages_summary">Invites, removes, and bans are unaffected.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Show account events</string>
@@ -1067,7 +1116,7 @@
     <string name="settings_unignore_user">Show all messages from %s?</string>
 
     <string name="settings_emails_and_phone_numbers_title">Emails and phone numbers</string>
-    <string name="settings_emails_and_phone_numbers_summary">Manage emails and phone numbers linked to your Matrix account</string>
+    <string name="settings_emails_and_phone_numbers_summary">Manage email addresses and phone numbers linked to your Matrix account</string>
 
     <string name="settings_select_country">Choose a country</string>
 
@@ -1189,7 +1238,6 @@
     <string name="encryption_information_decryption_error">Decryption error</string>
 
     <string name="encryption_information_device_name">Public name</string>
-    <string name="encryption_information_device_id">Session ID</string>
     <string name="encryption_information_device_key">Session key</string>
 
     <string name="encryption_export_e2e_room_keys">Export E2E room keys</string>
@@ -1208,6 +1256,9 @@
     <string name="encryption_import_import">Import</string>
     <string name="encryption_never_send_to_unverified_devices_title">Encrypt to verified sessions only</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Never send encrypted messages to unverified sessions from this session.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Never send encrypted messages to unverified sessions in this room.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ There are unverified devices in this room, they won’t be able to decrypt messages you send.</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 You have enabled encrypt to verified sessions only for all rooms in Security Settings.</string>
     <plurals name="encryption_import_room_keys_success">
         <item quantity="one">%1$d/%2$d key imported with success.</item>
         <item quantity="other">%1$d/%2$d keys imported with success.</item>
@@ -1339,6 +1390,9 @@
     <string name="settings_labs_native_camera_summary">Start the system camera instead of the custom camera screen.</string>
     <string name="widget_integration_review_terms">To continue you need to accept the Terms of this service.</string>
 
+    <!-- Room not found. %s will contain some debug info in developer mode.  -->
+    <string name="timeline_error_room_not_found">Sorry, this room has not been found.\nPlease retry later.%s</string>
+
     <!-- share keys -->
     <string name="you_added_a_new_device">You added a new session \'%s\', which is requesting encryption keys.</string>
     <string name="you_added_a_new_device_with_info">A new session is requesting encryption keys.\nSession name: %1$s\nLast seen: %2$s\nIf you didn’t log in on another session, ignore this request.</string>
@@ -1376,6 +1430,7 @@
     <string name="command_description_avatar_for_room">Changes your avatar in this current room only</string>
     <string name="command_description_markdown">On/Off markdown</string>
     <string name="command_description_clear_scalar_token">To fix Matrix Apps management</string>
+    <string name="command_description_devtools">Open the developer tools screen</string>
     <string name="command_description_whois">Displays information about a user</string>
 
     <string name="markdown_has_been_enabled">Markdown has been enabled.</string>
@@ -1593,7 +1648,10 @@
     <string name="error_user_already_logged_in">It looks like you’re trying to connect to another homeserver. Do you want to sign out?</string>
 
     <string name="edit">Edit</string>
+    <string name="editing">Editing</string>
     <string name="reply">Reply</string>
+    <string name="replying_to">Replying to %s</string>
+    <string name="quoting">Quoting</string>
     <string name="reply_in_thread">Reply in thread</string>
     <string name="view_in_room">View In Room</string>
 
@@ -1612,7 +1670,7 @@
 
     <string name="room_list_filter_all">All</string>
     <string name="room_list_filter_unreads">Unreads</string>
-    <string name="room_list_filter_favourites">Favourites</string>
+    <string name="room_list_filter_favourites">Favorites</string>
     <string name="room_list_filter_people">People</string>
 
     <string name="title_activity_emoji_reaction_picker">Reactions</string>
@@ -1630,12 +1688,11 @@
     <string name="create_new_room">Create New Room</string>
     <string name="create_new_space">Create New Space</string>
     <string name="error_no_network">No network. Please check your Internet connection.</string>
+    <!-- TODO delete -->
+    <string name="error_check_network" tools:ignore="UnusedResources">Something went wrong. Please check your network connection and try again.</string>
     <string name="change_room_directory_network">"Change network"</string>
     <string name="please_wait">"Please wait…"</string>
     <string name="updating_your_data">Updating your data…</string>
-    <!--TODO: delete-->
-    <string name="group_all_communities" tools:ignore="UnusedResources">"All Communities"</string>
-
     <string name="room_preview_no_preview">"This room can't be previewed"</string>
     <string name="room_preview_not_found">This room is not accessible at this time.\nTry again later, or ask a room admin to check if you have access.</string>
     <string name="room_preview_no_preview_join">"This room can't be previewed. Do you want to join it?"</string>
@@ -1672,13 +1729,15 @@
     <string name="settings_push_rules_no_rules">No push rules defined</string>
     <string name="settings_push_gateway_no_pushers">No registered push gateways</string>
 
-    <string name="push_gateway_item_app_id">app_id:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_id">App ID:</string>
+    <string name="push_gateway_item_push_key">Push Key:</string>
+    <string name="push_gateway_item_app_display_name">App Display Name:</string>
+    <string name="push_gateway_item_device_name">Session Display Name:</string>
+    <string name="push_gateway_item_device_id">Session ID:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="push_gateway_item_profile_tag">Profile tag:</string>
+    <string name="push_gateway_item_enabled">Enabled:</string>
 
     <string name="preference_voice_and_video">Voice &amp; Video</string>
     <string name="preference_root_help_about">Help &amp; About</string>
@@ -1774,20 +1833,20 @@
     <string name="settings_discovery_identity_server_info">You are currently using %1$s to discover and be discoverable by existing contacts you know.</string>
     <string name="settings_discovery_identity_server_info_none">You are not currently using an identity server. To discover and be discoverable by existing contacts you know, configure one below.</string>
     <string name="settings_discovery_emails_title">Discoverable email addresses</string>
-    <string name="settings_discovery_no_mails">Discovery options will appear once you have added an email.</string>
+    <string name="settings_discovery_no_mails">Discovery options will appear once you have added an email address.</string>
     <string name="settings_discovery_no_msisdn">Discovery options will appear once you have added a phone number.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Disconnecting from your identity server will mean you won’t be discoverable by other users and you won’t be able to invite others by email or phone.</string>
     <string name="settings_discovery_msisdn_title">Discoverable phone numbers</string>
-    <string name="settings_discovery_confirm_mail">We sent you a confirm email to %s, check your email and click on the confirmation link</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">We sent you a confirm email to %s, please first check your email and click on the confirmation link</string>
+    <string name="settings_discovery_confirm_mail">We sent an email to %s, check your email and click on the confirmation link</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">We sent an email to %s, please first check your email and click on the confirmation link</string>
     <string name="settings_discovery_consent_title">Send emails and phone numbers</string>
-    <string name="settings_discovery_consent_notice_on">You have given your consent to send emails and phone numbers to this identity server to discover other users from your contacts.</string>
+    <string name="settings_discovery_consent_notice_on">You have given your consent to send email addresses and phone numbers to this identity server to discover other users from your contacts.</string>
     <string name="settings_discovery_consent_notice_off_2">Your contacts are private. To discover users from your contacts, we need your permission to send contact info to your identity server.</string>
     <string name="settings_discovery_consent_action_revoke">Revoke my consent</string>
     <string name="settings_discovery_consent_action_give_consent">Give consent</string>
 
-    <string name="identity_server_consent_dialog_title_2">Send emails and phone numbers to %s</string>
-    <string name="identity_server_consent_dialog_content_3">To discover existing contacts, you need to send contact info (emails and phone numbers) to your identity server. We hash your data before sending for privacy.</string>
+    <string name="identity_server_consent_dialog_title_2">Send email addresses and phone numbers to %s</string>
+    <string name="identity_server_consent_dialog_content_3">To discover existing contacts, you need to send contact info (email addresses and phone numbers) to your identity server. We hash your data before sending for privacy.</string>
     <string name="identity_server_consent_dialog_content_question">Do you agree to send this info?</string>
 
     <string name="settings_discovery_enter_identity_server">Enter an identity server URL</string>
@@ -1817,7 +1876,7 @@
     <string name="a11y_create_menu_close">Close the create room menu…</string>
     <string name="a11y_create_direct_message">Create a new direct conversation</string>
     <string name="a11y_create_message">Create a new conversation or room</string>
-    <string name="a11y_create_room">Create a new room</string> <!-- TODO TO BE REMOVED -->
+    <string name="a11y_create_room">Create a new room</string>
     <string name="a11y_open_spaces">Open spaces list</string>
     <string name="a11y_close_keys_backup_banner">Close keys backup banner</string>
     <string name="a11y_jump_to_bottom">Jump to bottom</string>
@@ -1845,6 +1904,7 @@
     <string name="attachment_type_sticker">"Sticker"</string>
     <string name="attachment_type_poll">Poll</string>
     <string name="attachment_type_location">Location</string>
+    <string name="attachment_type_voice_broadcast">Voice Broadcast</string>
     <string name="rotate_and_crop_screen_title">Rotate and crop</string>
     <string name="error_handling_incoming_share">Couldn\'t handle share data</string>
 
@@ -1996,9 +2056,6 @@
 
     <string name="ftue_display_name_title">Choose a display name</string>
 
-    <!--  TODO remove  -->
-    <!--suppress UnusedResources -->
-    <string name="ftue_display_name_subtitle">This will be shown when you send messages.</string>
     <string name="ftue_display_name_entry_title">Display Name</string>
     <string name="ftue_display_name_entry_footer">You can change this later</string>
 
@@ -2014,7 +2071,7 @@
     <string name="login_splash_title">It\'s your conversation. Own it.</string>
     <string name="login_splash_text1">Chat with people directly or in groups</string>
     <string name="login_splash_text2">Keep conversations private with encryption</string>
-    <string name="login_splash_text3">Extend &amp; customise your experience</string>
+    <string name="login_splash_text3">Extend &amp; customize your experience</string>
     <string name="login_splash_submit">Get started</string>
     <string name="login_splash_create_account">Create account</string>
     <string name="login_splash_already_have_account">I already have an account</string>
@@ -2057,7 +2114,7 @@
     <string name="login_registration_disabled">Sorry, this server isn’t accepting new accounts.</string>
     <string name="login_registration_not_supported">The application is not able to create an account on this homeserver.\n\nDo you want to signup using a web client?</string>
 
-    <string name="login_login_with_email_error">This email is not associated to any account.</string>
+    <string name="login_login_with_email_error">This email address is not associated to any account.</string>
 
     <!-- Replaced string is the homeserver url -->
     <string name="login_reset_password_on">Reset password on %1$s</string>
@@ -2070,7 +2127,7 @@
     <string name="login_reset_password_warning_content">Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.</string>
     <string name="login_reset_password_warning_submit">Continue</string>
 
-    <string name="login_reset_password_error_not_found">This email is not linked to any account</string>
+    <string name="login_reset_password_error_not_found">This email address is not linked to any account</string>
 
     <string name="login_reset_password_mail_confirmation_title">Check your inbox</string>
     <!-- Replaced string is an email -->
@@ -2087,7 +2144,7 @@
     <string name="login_reset_password_cancel_confirmation_content">Your password is not yet changed.\n\nStop the password change process?</string>
 
     <string name="login_set_email_title">Set email address</string>
-    <string name="login_set_email_notice">Set an email to recover your account. Later, you can optionally allow people you know to discover you by your email.</string>
+    <string name="login_set_email_notice">Set an email address to recover your account. Later, you can optionally allow people you know to discover you by this address.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (optional)</string>
     <string name="login_set_email_submit">Next</string>
@@ -2145,6 +2202,7 @@
     <string name="login_signin_matrix_id_password_notice">If you don’t know your password, go back to reset it.</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">This is not a valid user identifier. Expected format: \'@user:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">Unable to find a valid homeserver. Please check your identifier</string>
+    <string name="login_scan_qr_code">Scan QR code</string>
 
     <string name="seen_by">Seen by</string>
 
@@ -2197,6 +2255,7 @@
 
     <string name="command_description_shrug">Prepends ¯\\_(ツ)_/¯ to a plain-text message</string>
     <string name="command_description_lenny">Prepends ( ͡° ͜ʖ ͡°) to a plain-text message</string>
+    <string name="command_description_table_flip">Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message</string>
 
     <string name="create_room_encryption_title">"Enable encryption"</string>
     <string name="create_room_encryption_description">"Once enabled, encryption cannot be disabled."</string>
@@ -2237,8 +2296,8 @@
     <string name="sent_live_location">Shared their live location</string>
 
     <string name="verification_request_waiting">Waiting…</string>
-    <string name="verification_request_other_cancelled">%s cancelled</string>
-    <string name="verification_request_you_cancelled">You cancelled</string>
+    <string name="verification_request_other_cancelled">%s canceled</string>
+    <string name="verification_request_you_cancelled">You canceled</string>
     <string name="verification_request_other_accepted">%s accepted</string>
     <string name="verification_request_you_accepted">You accepted</string>
     <string name="verification_sent">Verification Sent</string>
@@ -2342,7 +2401,6 @@
     <string name="settings_active_sessions_manage">Manage Sessions</string>
     <string name="settings_active_sessions_signout_device">Sign out of this session</string>
     <string name="settings_sessions_list">Sessions</string>
-
     <string name="settings_server_name">Server name</string>
     <string name="settings_server_version">Server version</string>
     <string name="settings_server_upload_size_title">Server file upload limit</string>
@@ -2381,7 +2439,7 @@
 
     <string name="verification_profile_device_verified_because">This session is trusted for secure messaging because %1$s (%2$s) verified it:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) signed in using a new session:</string>
-    <string name="verification_profile_device_untrust_info">Until this user trusts this session, messages sent to and from it are labelled with warnings. Alternatively, you can manually verify it.</string>
+    <string name="verification_profile_device_untrust_info">Until this user trusts this session, messages sent to and from it are labeled with warnings. Alternatively, you can manually verify it.</string>
 
 
     <string name="initialize_cross_signing">Initialize CrossSigning</string>
@@ -2433,6 +2491,9 @@
     <string name="settings_key_requests">Key Requests</string>
     <string name="settings_export_trail">Export Audit</string>
 
+    <string name="settings_nightly_build">Nightly build</string>
+    <string name="settings_nightly_build_update">Get the latest build (note: you may have trouble to sign in)</string>
+
     <string name="e2e_use_keybackup">Unlock encrypted messages history</string>
 
     <string name="refresh">Refresh</string>
@@ -2450,9 +2511,9 @@
         One of the following may be compromised:\n\n- Your password\n- Your homeserver\n- This device, or the other device\n- The internet connection either device is using\n\nWe recommend you change your password &amp; recovery key in Settings immediately.
     </string>
 
-    <string name="verify_cancelled_notice">Verification has been cancelled. You can start verification again.</string>
+    <string name="verify_cancelled_notice">Verification has been canceled. You can start verification again.</string>
     <string name="verify_invalid_qr_notice">This QR code looks malformed. Please try to verify with another method.</string>
-    <string name="verification_cancelled">Verification Cancelled</string>
+    <string name="verification_cancelled">Verification Canceled</string>
 
     <string name="recovery_passphrase">Recovery Passphrase</string>
     <string name="message_key">Message Key</string>
@@ -2553,6 +2614,9 @@
     <string name="settings_security_prevent_screenshots_title">Prevent screenshots of the application</string>
     <string name="settings_security_prevent_screenshots_summary">Enabling this setting adds the FLAG_SECURE to all Activities. Restart the application for the change to take effect.</string>
 
+    <string name="settings_security_incognito_keyboard_title">Incognito keyboard</string>
+    <string name="settings_security_incognito_keyboard_summary">"Request that the keyboard should not update any personalized data such as typing history and dictionary based on what you've typed in conversations. Notice that some keyboards may not respect this setting."</string>
+
     <string name="error_saving_media_file">Could not save media file</string>
     <string name="change_password_summary">Set a new account password…</string>
 
@@ -2591,8 +2655,13 @@
 
     <string name="unencrypted">Unencrypted</string>
     <string name="encrypted_unverified">Encrypted by an unverified device</string>
-    <string name="review_logins">Review where you’re logged in</string>
-    <string name="verify_other_sessions">Verify all your sessions to ensure your account &amp; messages are safe</string>
+    <string name="key_authenticity_not_guaranteed">The authenticity of this encrypted message can\'t be guaranteed on this device.</string>
+    <!-- TODO TO BE REMOVED -->
+    <string name="review_logins" tools:ignore="UnusedResources">Review where you’re logged in</string>
+    <!-- TODO TO BE REMOVED -->
+    <string name="verify_other_sessions" tools:ignore="UnusedResources">Verify all your sessions to ensure your account &amp; messages are safe</string>
+    <string name="review_unverified_sessions_title">You have unverified sessions</string>
+    <string name="review_unverified_sessions_description">Review to ensure your account is safe</string>
     <!-- Argument will be replaced by the other session name (e.g, Desktop, mobile) -->
     <string name="verify_this_session">Verify the new login accessing your account: %1$s</string>
 
@@ -2648,7 +2717,7 @@
     <string name="identity_server_error_no_identity_server_configured">Please first configure an identity server.</string>
     <string name="identity_server_error_terms_not_signed">Please first accepts the terms of the identity server in the settings.</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="identity_server_error_bulk_sha256_not_supported">For your privacy, ${app_name} only supports sending hashed user emails and phone number.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">For your privacy, ${app_name} only supports sending hashed user email addresses and phone numbers.</string>
     <string name="identity_server_error_binding_error">The association has failed.</string>
     <string name="identity_server_error_no_current_binding_error">There is no current association with this identifier.</string>
     <string name="identity_server_user_consent_not_provided">The user consent has not been provided.</string>
@@ -2887,7 +2956,7 @@
     <string name="create_spaces_who_are_you_working_with">Who are you working with?</string>
     <string name="create_spaces_make_sure_access">Make sure the right people have access to %s.</string>
     <string name="create_spaces_just_me">Just me</string>
-    <string name="create_spaces_organise_rooms">A private space to organise your rooms</string>
+    <string name="create_spaces_organise_rooms">A private space to organize your rooms</string>
     <string name="create_spaces_me_and_teammates">Me and teammates</string>
     <string name="create_spaces_private_teammates">A private space for you &amp; your teammates</string>
     <string name="space_type_public">Public</string>
@@ -2967,7 +3036,7 @@
 
     <string name="labs_auto_report_uisi">Auto Report Decryption Errors.</string>
     <string name="labs_auto_report_uisi_desc">Your system will automatically send logs when an unable to decrypt error occurs</string>
-    <string name="labs_enable_thread_messages">Enable Thread Messages</string>
+    <string name="labs_enable_thread_messages">Enable threaded messages</string>
     <string name="labs_enable_thread_messages_desc">Note: app will be restarted</string>
     <string name="settings_show_latest_profile">Show latest user info</string>
     <string name="settings_show_latest_profile_description">Show the latest profile info (avatar and display name) for all the messages.</string>
@@ -3035,6 +3104,26 @@
     <string name="audio_message_reply_content">%1$s (%2$s)</string>
     <string name="audio_message_file_size">(%1$s)</string>
 
+    <string name="voice_broadcast_live">Live</string>
+    <string name="voice_broadcast_live_broadcast">Live broadcast</string>
+    <!-- TODO Rename id to voice_broadcast_buffering -->
+    <string name="a11y_voice_broadcast_buffering">Buffering…</string>
+    <string name="a11y_resume_voice_broadcast_record">Resume voice broadcast record</string>
+    <string name="a11y_pause_voice_broadcast_record">Pause voice broadcast record</string>
+    <string name="a11y_stop_voice_broadcast_record">Stop voice broadcast record</string>
+    <string name="a11y_play_voice_broadcast">Play or resume voice broadcast</string>
+    <string name="a11y_pause_voice_broadcast">Pause voice broadcast</string>
+    <string name="a11y_voice_broadcast_fast_backward">Fast backward 30 seconds</string>
+    <string name="a11y_voice_broadcast_fast_forward">Fast forward 30 seconds</string>
+    <string name="error_voice_broadcast_unauthorized_title">Can’t start a new voice broadcast</string>
+    <string name="error_voice_broadcast_permission_denied_message">You don’t have the required permissions to start a voice broadcast in this room. Contact a room administrator to upgrade your permissions.</string>
+    <string name="error_voice_broadcast_blocked_by_someone_else_message">Someone else is already recording a voice broadcast. Wait for their voice broadcast to end to start a new one.</string>
+    <string name="error_voice_broadcast_already_in_progress_message">You are already recording a voice broadcast. Please end your current voice broadcast to start a new one.</string>
+    <!-- Examples of usage: 6h 15min 30sec left / 15min 30sec left / 30sec left -->
+    <string name="voice_broadcast_recording_time_left">%1$s left</string>
+    <string name="stop_voice_broadcast_dialog_title">Stop live broadcasting?</string>
+    <string name="stop_voice_broadcast_content">Are you sure you want to stop your live broadcast? This will end the broadcast and the full recording will be available in the room.</string>
+
     <string name="upgrade_room_for_restricted">Anyone in %s will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string>
     <string name="upgrade_room_for_restricted_no_param">Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string>
 
@@ -3045,7 +3134,7 @@
     <!-- %s will be replaced by an email at runtime -->
     <string name="this_invite_to_this_space_was_sent">This invite to this space was sent to %s which is not associated with your account</string>
 
-    <string name="link_this_email_settings_link">Link this email with your account</string>
+    <string name="link_this_email_settings_link">Link this email address with your account</string>
     <!-- %s will be replaced by the value of link_this_email_settings_link and styled as a link -->
     <string name="link_this_email_with_your_account">%s in Settings to receive invites directly in ${app_name}.</string>
 
@@ -3136,8 +3225,6 @@
     <string name="live_location_sharing_notification_description">Location sharing is in progress</string>
     <string name="labs_enable_live_location">Enable Live Location Sharing</string>
     <string name="labs_enable_live_location_summary">Temporary implementation: locations persist in room history</string>
-    <!-- TODO remove key -->
-    <string name="live_location_bottom_sheet_stop_sharing" tools:ignore="UnusedResources">Stop sharing</string>
     <string name="live_location_bottom_sheet_last_updated_at">Updated %1$s ago</string>
     <string name="live_location_not_enough_permission_dialog_title">You don’t have permission to share live location</string>
     <string name="live_location_not_enough_permission_dialog_description">You need to have the right permissions in order to share live location in this room.</string>
@@ -3154,6 +3241,17 @@
     <string name="tooltip_attachment_contact">Open contacts</string>
     <string name="tooltip_attachment_poll">Create poll</string>
     <string name="tooltip_attachment_location">Share location</string>
+    <string name="tooltip_attachment_voice_broadcast">Start a voice broadcast</string>
+
+    <string name="attachment_type_selector_gallery">Photo library</string>
+    <string name="attachment_type_selector_sticker">Stickers</string>
+    <string name="attachment_type_selector_file">Attachments</string>
+    <string name="attachment_type_selector_voice_broadcast">Voice broadcast</string>
+    <string name="attachment_type_selector_poll">Polls</string>
+    <string name="attachment_type_selector_location">Location</string>
+    <string name="attachment_type_selector_camera">Camera</string>
+    <string name="attachment_type_selector_contact">Contact</string>
+    <string name="attachment_type_selector_text_formatting">Text formatting</string>
 
     <string name="message_reaction_show_less">Show less</string>
     <plurals name="message_reaction_show_more">
@@ -3201,4 +3299,208 @@
     <!-- Element Call Widget -->
     <string name="labs_enable_element_call_permission_shortcuts">Enable Element Call permission shortcuts</string>
     <string name="labs_enable_element_call_permission_shortcuts_summary">Auto-approve Element Call widgets and grant camera / mic access</string>
+
+    <!-- Device Manager -->
+    <string name="device_manager_sessions_other_title">Other sessions</string>
+    <string name="device_manager_sessions_other_description">For best security, verify your sessions and sign out from any session that you don’t recognize or use anymore.</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobile</string>
+    <string name="a11y_device_manager_device_type_web">Web</string>
+    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="a11y_device_manager_device_type_unknown">Unknown device type</string>
+    <string name="device_manager_verification_status_verified">Verified session</string>
+    <string name="device_manager_verification_status_unverified">Unverified session</string>
+    <string name="device_manager_verification_status_unknown">Unknown verification status</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Your current session is ready for secure messaging.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">This session is ready for secure messaging.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verify your current session for enhanced secure messaging.</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verify or sign out from this session for best security and reliability.</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verify your current session to reveal this session\'s verification status.</string>
+    <string name="device_manager_verification_status_detail_session_encryption_not_supported">This session doesn\'t support encryption and thus can\'t be verified.</string>
+    <string name="device_manager_verify_session">Verify Session</string>
+    <string name="device_manager_view_details">View Details</string>
+    <string name="device_manager_other_sessions_view_all">View All (%1$d)</string>
+    <!--  Examples: Verified · Last activity Yesterday at 6PM, Verified · Last activity Aug 31 at 5:47PM -->
+    <string name="device_manager_other_sessions_description_verified">Verified · Last activity %1$s</string>
+    <!--  Examples: Unverified · Last activity Yesterday at 6PM, Unverified · Last activity Aug 31 at 5:47PM -->
+    <string name="device_manager_other_sessions_description_unverified">Unverified · Last activity %1$s</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Unverified · Your current session</string>
+    <!--  Example: Inactive for 90+ days (Dec 25, 2021) -->
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inactive for %1$d+ day (%2$s)</item>
+        <item quantity="other">Inactive for %1$d+ days (%2$s)</item>
+    </plurals>
+    <string name="device_manager_header_section_security_recommendations_title">Security recommendations</string>
+    <string name="device_manager_header_section_security_recommendations_description">Improve your account security by following these recommendations.</string>
+    <string name="device_manager_unverified_sessions_title">Unverified sessions</string>
+    <string name="device_manager_unverified_sessions_description">Verify or sign out from unverified sessions.</string>
+    <string name="device_manager_inactive_sessions_title">Inactive sessions</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Consider signing out from old sessions (%1$d day or more) that you don’t use anymore.</item>
+        <item quantity="other">Consider signing out from old sessions (%1$d days or more) that you don’t use anymore.</item>
+    </plurals>
+    <string name="device_manager_current_session_title">Current session</string>
+    <string name="device_manager_session_title">Session</string>
+    <string name="device_manager_device_title">Device</string>
+    <!--  Examples: Last activity Yesterday at 6PM, Last activity Aug 31 at 5:47PM -->
+    <string name="device_manager_session_last_activity">Last activity %1$s</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filter</string>
+    <string name="device_manager_filter_option_all_sessions">All sessions</string>
+    <string name="device_manager_filter_option_verified">Verified</string>
+    <string name="device_manager_filter_option_verified_description">Ready for secure messaging</string>
+    <string name="device_manager_filter_option_unverified">Unverified</string>
+    <string name="device_manager_filter_option_unverified_description">Not ready for secure messaging</string>
+    <string name="device_manager_filter_option_inactive">Inactive</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Inactive for %1$d day or longer</item>
+        <item quantity="other">Inactive for %1$d days or longer</item>
+    </plurals>
+    <string name="a11y_device_manager_filter">Filter</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Verified</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">For best security, sign out from any session that you don’t recognize or use anymore.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Unverified</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verify your sessions for enhanced secure messaging or sign out from those you don’t recognize or use anymore.</string>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inactive</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Consider signing out from old sessions (%1$d day or more) you don’t use anymore.</item>
+        <item quantity="other">Consider signing out from old sessions (%1$d days or more) you don’t use anymore.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">No verified sessions found.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">No unverified sessions found.</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">No inactive sessions found.</string>
+    <string name="device_manager_other_sessions_clear_filter">Clear Filter</string>
+    <string name="device_manager_other_sessions_select">Select sessions</string>
+    <string name="device_manager_other_sessions_multi_signout_selection">Sign out</string>
+    <plurals name="device_manager_other_sessions_multi_signout_all">
+        <item quantity="one">Sign out of %1$d session</item>
+        <item quantity="other">Sign out of %1$d sessions</item>
+    </plurals>
+    <string name="device_manager_signout_all_other_sessions">Sign out of all other sessions</string>
+    <string name="device_manager_other_sessions_show_ip_address">Show IP address</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Hide IP address</string>
+    <string name="device_manager_session_overview_signout">Sign out of this session</string>
+    <string name="device_manager_session_details_title">Session details</string>
+    <string name="device_manager_session_details_description">Application, device, and activity information.</string>
+    <string name="device_manager_push_notifications_title">Push notifications</string>
+    <string name="device_manager_push_notifications_description">Receive push notifications on this session.</string>
+    <string name="device_manager_session_details_session_name">Session name</string>
+    <string name="device_manager_session_details_session_id">Session ID</string>
+    <string name="device_manager_session_details_session_last_activity">Last activity</string>
+    <string name="device_manager_session_details_application">Application</string>
+    <string name="device_manager_session_details_application_name">Name</string>
+    <string name="device_manager_session_details_application_version">Version</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_operating_system">Operating system</string>
+    <string name="device_manager_session_details_device_ip_address">IP address</string>
+    <string name="device_manager_session_rename">Rename session</string>
+    <string name="device_manager_session_rename_edit_hint">Session name</string>
+    <string name="device_manager_session_rename_description">Custom session names can help you recognize your devices more easily.</string>
+    <string name="device_manager_session_rename_warning">Please be aware that session names are also visible to people you communicate with.</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Sign in with QR Code</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">You can use this device to sign in a mobile or web device with a QR code. There are two ways to do this:</string>
+
+    <string name="device_manager_learn_more_sessions_inactive_title">Inactive sessions</string>
+    <string name="device_manager_learn_more_sessions_inactive">Inactive sessions are sessions you have not used in some time, but they continue to receive encryption keys.\n\nRemoving inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Unverified sessions</string>
+    <string name="device_manager_learn_more_sessions_unverified">Unverified sessions are sessions that have logged in with your credentials but not been cross-verified.\n\nYou should make especially certain that you recognise these sessions as they could represent an unauthorised use of your account.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Verified sessions</string>
+    <!-- TODO TO BE REMOVED -->
+    <string name="device_manager_learn_more_sessions_verified" tools:ignore="UnusedResources">Verified sessions have logged in with your credentials and then been verified, either using your secure passphrase or by cross-verifying.\n\nThis means they hold encryption keys for your previous messages, and confirm to other users you are communicating with that these sessions are really you.</string>
+    <string name="device_manager_learn_more_sessions_verified_description">Verified sessions are anywhere you are using this account after entering your passphrase or confirming your identity with another verified session.\n\nThis means that you have all the keys needed to unlock your encrypted messages and confirm to other users that you trust this session.</string>
+    <string name="device_manager_learn_more_sessions_encryption_not_supported">This session doesn\'t support encryption, so it can\'t be verified.\n\nYou won\'t be able to participate in rooms where encryption is enabled when using this session.\n\nFor best security and privacy, it is recommended to use Matrix clients that support encryption.</string>
+    <string name="device_manager_learn_more_session_rename_title">Renaming sessions</string>
+    <string name="device_manager_learn_more_session_rename">Other users in direct messages and rooms that you join are able to view a full list of your sessions.\n\nThis provides them with confidence that they are really speaking to you, but it also means they can see the session name you enter here.</string>
+    <string name="labs_enable_session_manager_title">Enable new session manager</string>
+    <string name="labs_enable_session_manager_summary">Have greater visibility and control over all your sessions.</string>
+    <string name="labs_enable_client_info_recording_title">Enable client info recording</string>
+    <string name="labs_enable_client_info_recording_summary">Record the client name, version, and url to recognise sessions more easily in session manager.</string>
+    <string name="labs_enable_voice_broadcast_title">Enable voice broadcast</string>
+    <string name="labs_enable_voice_broadcast_summary">Be able to record and send voice broadcast in room timeline.</string>
+
+    <!-- Note to translators: %s will be replaces with selected space name -->
+    <string name="home_empty_space_no_rooms_title">%s\nis looking a little empty.</string>
+    <!-- Note to translators: for RTL languages, Spaces will be at the bottom left. Please translate "bottom-left" instead of "bottom-right". Thanks!-->
+    <string name="home_empty_space_no_rooms_message">Spaces are a new way to group rooms and people. Add an existing room, or create a new one, using the bottom-right button.</string>
+    <!--  Note to translators: %s will be replaces with current user displayname -->
+    <string name="home_empty_no_rooms_title">Welcome to ${app_name},\n%s.</string>
+    <string name="home_empty_no_rooms_message">The all-in-one secure chat app for teams, friends and organisations. Create a chat, or join an existing room, to get started.</string>
+    <string name="home_empty_no_unreads_title">Nothing to report.</string>
+    <string name="home_empty_no_unreads_message">This is where your unread messages will show up, when you have some.</string>
+
+    <string name="onboarding_new_app_layout_welcome_title">Welcome to a new view!</string>
+    <!--    Note to translators: for RTL languages, menu will be at the bottom left. Please translate "bottom-left" instead of "bottom-right". Thanks!-->
+    <string name="onboarding_new_app_layout_welcome_message">To simplify your ${app_name}, tabs are now optional. Manage them using the top-right menu.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Access Spaces</string>
+    <!--    Note to translators: for RTL languages, Spaces will be at the bottom left. Please translate "bottom-left" instead of "bottom-right". Thanks!-->
+    <string name="onboarding_new_app_layout_spaces_message">Access your Spaces (bottom-right) faster and easier than ever before.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Give Feedback</string>
+    <!--    Note to translators: for RTL languages, context menu will be at top left corner instead of top right corner. Thanks!-->
+    <string name="onboarding_new_app_layout_feedback_message">Tap top right to see the option to feedback.</string>
+    <string name="onboarding_new_app_layout_button_try">Try it out</string>
+
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+
+    <!-- QR Code Login -->
+    <string name="qr_code_login_header_scan_qr_code_title">Scan QR code</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Use the camera on this device to scan the QR code shown on your other device:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Sign in with QR code</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Use your signed in device to scan the QR code below:</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scan the QR code below with your device that’s signed out.</string>
+    <string name="qr_code_login_header_connected_title">Secure connection established</string>
+    <string name="qr_code_login_header_connected_description">Check your signed in device, the code below should be displayed. Confirm that the code below matches with that device:</string>
+    <string name="qr_code_login_header_failed_title">Unsuccessful connection</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Linking with this device is not supported.</string>
+    <string name="qr_code_login_header_failed_timeout_description">The linking wasn’t completed in the required time.</string>
+    <string name="qr_code_login_header_failed_denied_description">The request was denied on the other device.</string>
+    <string name="qr_code_login_header_failed_other_description">The request failed.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">A security issue was encountered setting up secure messaging. One of the following may be compromised: Your homeserver; Your internet connection(s); Your device(s);</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">The other device is already signed in.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">The other device must be signed in.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">That QR code is invalid.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">The sign in was cancelled on the other device.</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">The homeserver doesn\'t support sign in with QR code.</string>
+    <string name="qr_code_login_new_device_instruction_1">Open the app on your other device</string>
+    <string name="qr_code_login_new_device_instruction_2">Go to Settings -> Security &amp; Privacy</string>
+    <string name="qr_code_login_new_device_instruction_3">Select \'Show QR code\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Start at the sign in screen</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Select \'Sign in with QR code\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Start at the sign in screen</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Select \'Scan QR code\'</string>
+    <string name="qr_code_login_show_qr_code_button">Show QR code in this device</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Signing in a mobile device?</string>
+    <string name="qr_code_login_scan_qr_code_button">Scan QR code</string>
+    <string name="qr_code_login_connecting_to_device">Connecting to device</string>
+    <string name="qr_code_login_signing_in">Signing you in</string>
+    <string name="qr_code_login_status_no_match">No match?</string>
+    <string name="qr_code_login_try_again">Try again</string>
+    <string name="qr_code_login_confirm_security_code">Confirm</string>
+    <string name="qr_code_login_confirm_security_code_description">Please ensure that you know the origin of this code. By linking devices, you will provide someone with full access to your account.</string>
+
+    <!-- Rich text editor -->
+    <string name="rich_text_editor_format_bold">Apply bold format</string>
+    <string name="rich_text_editor_format_italic">Apply italic format</string>
+    <string name="rich_text_editor_format_strikethrough">Apply strikethrough format</string>
+    <string name="rich_text_editor_format_underline">Apply underline format</string>
+    <string name="rich_text_editor_link">Set link</string>
+    <string name="rich_text_editor_numbered_list">Toggle numbered list</string>
+    <string name="rich_text_editor_bullet_list">Toggle bullet list</string>
+    <string name="rich_text_editor_full_screen_toggle">Toggle full screen mode</string>
+
+    <string name="set_link_text">Text</string>
+    <string name="set_link_link">Link</string>
+    <string name="set_link_create">Create a link</string>
+    <string name="set_link_edit">Edit link</string>
+
+    <!-- ReplyTo events -->
+    <string name="message_reply_to_prefix">In reply to</string>
+    <string name="message_reply_to_sender_sent_file">sent a file.</string>
+    <string name="message_reply_to_sender_sent_audio_file">sent an audio file.</string>
+    <string name="message_reply_to_sender_sent_voice_message">sent a voice message.</string>
+    <string name="message_reply_to_sender_sent_image">sent an image.</string>
+    <string name="message_reply_to_sender_sent_video">sent a video.</string>
+    <string name="message_reply_to_sender_sent_sticker">sent a sticker.</string>
+    <string name="message_reply_to_sender_created_poll">created a poll.</string>
 </resources>
diff --git a/vector/src/main/res/values/strings_no_weblate.xml b/library/ui-strings/src/main/res/values/strings_no_weblate.xml
similarity index 100%
rename from vector/src/main/res/values/strings_no_weblate.xml
rename to library/ui-strings/src/main/res/values/strings_no_weblate.xml
diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index c85f26dbc4..c805153e1d 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -21,6 +21,8 @@ plugins {
 
 android {
 
+    namespace "im.vector.lib.ui.styles"
+
     compileSdk versions.compileSdk
     defaultConfig {
         minSdk versions.minSdk
@@ -58,5 +60,5 @@ dependencies {
     // Pref theme
     implementation libs.androidx.preferenceKtx
     // dialpad dimen
-    implementation 'im.dlg:android-dialer:1.2.5'
+    implementation project(":library:external:dialpad")
 }
diff --git a/library/ui-styles/src/debug/AndroidManifest.xml b/library/ui-styles/src/debug/AndroidManifest.xml
index e32676136d..be7aeafb07 100644
--- a/library/ui-styles/src/debug/AndroidManifest.xml
+++ b/library/ui-styles/src/debug/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.lib.ui.styles">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:theme="@style/Theme.Vector.Light">
         <activity
diff --git a/library/ui-styles/src/debug/res/menu/menu_debug.xml b/library/ui-styles/src/debug/res/menu/menu_debug.xml
index c58a29db8f..ac98ce8e2c 100644
--- a/library/ui-styles/src/debug/res/menu/menu_debug.xml
+++ b/library/ui-styles/src/debug/res/menu/menu_debug.xml
@@ -14,6 +14,7 @@
         android:id="@+id/menuDebug2"
         android:icon="@drawable/ic_debug_icon"
         android:title="Send"
-        app:showAsAction="always" />
+        app:showAsAction="always"
+        tools:ignore="AlwaysShowAction" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/library/ui-styles/src/main/AndroidManifest.xml b/library/ui-styles/src/main/AndroidManifest.xml
index 254827465d..6dc9cbfb8b 100644
--- a/library/ui-styles/src/main/AndroidManifest.xml
+++ b/library/ui-styles/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.lib.ui.styles">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:supportsRtl="true" />
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/library/ui-styles/src/main/res/values-h720dp/dimens.xml b/library/ui-styles/src/main/res/values-h720dp/dimens.xml
index 1a7791720d..2a7b12cf2f 100644
--- a/library/ui-styles/src/main/res/values-h720dp/dimens.xml
+++ b/library/ui-styles/src/main/res/values-h720dp/dimens.xml
@@ -2,4 +2,8 @@
 <resources>
     <item name="ftue_auth_carousel_item_spacing" format="float" type="dimen">0.05</item>
     <item name="ftue_auth_carousel_item_image_height" format="float" type="dimen">0.40</item>
-</resources>
\ No newline at end of file
+
+    <dimen name="release_notes_vertical_margin_small">16dp</dimen>
+    <dimen name="release_notes_vertical_margin">40dp</dimen>
+    <dimen name="release_notes_vertical_margin_large">46dp</dimen>
+</resources>
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index e72d02f51e..9d8645a707 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -141,12 +141,21 @@
 
     <!-- Shield colors -->
     <color name="shield_color_trust">#0DBD8B</color>
+    <color name="shield_color_trust_background">#0F0DBD8B</color>
     <color name="shield_color_black">#17191C</color>
+    <color name="shield_color_gray">#91A1C0</color>
     <color name="shield_color_warning">#FF4B55</color>
+    <color name="shield_color_warning_background">#0FFF4B55</color>
+    <color name="shield_color_unknown">@color/palette_gray_200</color>
 
     <!-- Badge Colors -->
     <attr name="vctr_badge_color_border" format="color" />
     <color name="vctr_badge_color_border_light">@color/palette_white</color>
     <color name="vctr_badge_color_border_dark">@color/palette_black_950</color>
 
+    <!-- WYSIWYG Colors -->
+    <attr name="vctr_rich_text_editor_menu_button_background" format="color" />
+    <color name="vctr_rich_text_editor_menu_button_background_light">#EEF8F4</color>
+    <color name="vctr_rich_text_editor_menu_button_background_dark">#1D292A</color>
+
 </resources>
diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index 53f1044a12..4c911c9e97 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -47,12 +47,14 @@
     <dimen name="composer_min_height">56dp</dimen>
     <dimen name="composer_attachment_size">52dp</dimen>
     <dimen name="composer_attachment_margin">1dp</dimen>
-
+    <dimen name="rich_text_composer_corner_radius_single_line">28dp</dimen>
+    <dimen name="rich_text_composer_corner_radius_expanded">14dp</dimen>
+    <dimen name="rich_text_composer_menu_item_size">44dp</dimen>
 
     <dimen name="chat_bubble_margin_start">28dp</dimen>
-    <dimen name="chat_bubble_margin_end">62dp</dimen>
-    <dimen name="chat_bubble_fixed_size">300dp</dimen>
-    <dimen name="chat_bubble_corner_radius">12dp</dimen>
+    <dimen name="chat_bubble_margin_end">6dp</dimen>
+    <dimen name="chat_bubble_fixed_size">350sp</dimen>
+    <dimen name="chat_bubble_corner_radius">8dp</dimen>
 
     <!--  Onboarding   -->
     <item name="ftue_auth_gutter_start_percent" format="float" type="dimen">0.05</item>
@@ -72,6 +74,15 @@
     <dimen name="location_sharing_live_duration_choice_margin_horizontal">12dp</dimen>
     <dimen name="location_sharing_live_duration_choice_margin_vertical">22dp</dimen>
 
+    <!-- Voice Broadcast -->
+    <dimen name="voice_broadcast_recorder_button_size">48dp</dimen>
+    <dimen name="voice_broadcast_player_button_size">36dp</dimen>
+
     <!-- Material 3 -->
     <dimen name="collapsing_toolbar_layout_medium_size">112dp</dimen>
+
+
+    <dimen name="release_notes_vertical_margin_small">8dp</dimen>
+    <dimen name="release_notes_vertical_margin">16dp</dimen>
+    <dimen name="release_notes_vertical_margin_large">28dp</dimen>
 </resources>
diff --git a/library/ui-styles/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml
index 73ac768919..999dccf167 100644
--- a/library/ui-styles/src/main/res/values/palette.xml
+++ b/library/ui-styles/src/main/res/values/palette.xml
@@ -44,4 +44,4 @@
     <color name="palette_black_800">#15191E</color>
     <color name="palette_black_950">#21262C</color>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library/ui-styles/src/main/res/values/stylable_other_sessions_security_recommendation_view.xml b/library/ui-styles/src/main/res/values/stylable_other_sessions_security_recommendation_view.xml
new file mode 100644
index 0000000000..6a46132b13
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_other_sessions_security_recommendation_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="OtherSessionsSecurityRecommendationView">
+        <attr name="otherSessionsRecommendationTitle" format="string" />
+        <attr name="otherSessionsRecommendationDescription" format="string" />
+        <attr name="otherSessionsRecommendationImageResource" format="reference" />
+        <attr name="otherSessionsRecommendationImageBackgroundTint" format="color" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/stylable_qr_code_instructions_view.xml b/library/ui-styles/src/main/res/values/stylable_qr_code_instructions_view.xml
new file mode 100644
index 0000000000..c9a4bb9d05
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_qr_code_instructions_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="QrCodeLoginInstructionsView">
+        <attr name="qrCodeLoginInstruction1" format="string" />
+        <attr name="qrCodeLoginInstruction2" format="string" />
+        <attr name="qrCodeLoginInstruction3" format="string" />
+        <attr name="qrCodeLoginInstruction4" format="string" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/stylable_qr_code_login_header_view.xml b/library/ui-styles/src/main/res/values/stylable_qr_code_login_header_view.xml
new file mode 100644
index 0000000000..99f56084d9
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_qr_code_login_header_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="QrCodeLoginHeaderView">
+        <attr name="qrCodeLoginHeaderTitle" format="string" />
+        <attr name="qrCodeLoginHeaderDescription" format="string" />
+        <attr name="qrCodeLoginHeaderImageResource" format="reference" />
+        <attr name="qrCodeLoginHeaderImageBackgroundTint" format="color" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/stylable_security_recommendation_view.xml b/library/ui-styles/src/main/res/values/stylable_security_recommendation_view.xml
new file mode 100644
index 0000000000..4283c8da8a
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_security_recommendation_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="SecurityRecommendationView">
+        <attr name="recommendationTitle" format="string" />
+        <attr name="recommendationDescription" format="string" />
+        <attr name="recommendationImageResource" format="reference" />
+        <attr name="recommendationImageBackgroundTint" format="color" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/stylable_session_overview_entry_view.xml b/library/ui-styles/src/main/res/values/stylable_session_overview_entry_view.xml
new file mode 100644
index 0000000000..6428cd6eac
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_session_overview_entry_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="SessionOverviewEntryView">
+        <attr name="sessionOverviewEntryTitle" format="string" />
+        <attr name="sessionOverviewEntryDescription" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="SessionOverviewEntrySwitchView">
+        <attr name="sessionOverviewEntrySwitchTitle" format="string" />
+        <attr name="sessionOverviewEntrySwitchDescription" format="string" />
+        <attr name="sessionOverviewEntrySwitchEnabled" format="boolean" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/stylable_session_warning_info_view.xml b/library/ui-styles/src/main/res/values/stylable_session_warning_info_view.xml
new file mode 100644
index 0000000000..6236b31f46
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_session_warning_info_view.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="SessionWarningInfoView">
+        <attr name="sessionsWarningInfoDescription" format="string" />
+        <attr name="sessionsWarningInfoHasLearnMore" format="boolean" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml b/library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
new file mode 100644
index 0000000000..c1a51000b7
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="SessionsListHeaderView">
+        <attr name="sessionsListHeaderTitle" format="string" />
+        <attr name="sessionsListHeaderDescription" format="string" />
+        <attr name="sessionsListHeaderHasLearnMoreLink" format="boolean" />
+        <attr name="sessionsListHeaderMenu" format="reference" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/stylable_voice_broadcast_metadata_view.xml b/library/ui-styles/src/main/res/values/stylable_voice_broadcast_metadata_view.xml
new file mode 100644
index 0000000000..1f72eeb396
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_voice_broadcast_metadata_view.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="VoiceBroadcastMetadataView">
+        <attr name="metadataIcon" format="reference" />
+        <attr name="metadataValue" format="string" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/styles_buttons.xml b/library/ui-styles/src/main/res/values/styles_buttons.xml
index 702f427cc0..db78fcf338 100644
--- a/library/ui-styles/src/main/res/values/styles_buttons.xml
+++ b/library/ui-styles/src/main/res/values/styles_buttons.xml
@@ -41,6 +41,10 @@
         <item name="lineHeight">24sp</item>
     </style>
 
+    <style name="Widget.Vector.Button.Text.Destructive">
+        <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
+    </style>
+
     <style name="Widget.Vector.Button.Text.OnPrimary">
         <item name="colorControlHighlight">?colorOnPrimary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
diff --git a/library/ui-styles/src/main/res/values/styles_devices_management.xml b/library/ui-styles/src/main/res/values/styles_devices_management.xml
new file mode 100644
index 0000000000..6b42b85ffd
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_devices_management.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TextAppearance.Vector.Subtitle.DevicesManagement">
+        <item name="android:textColor">?vctr_content_primary</item>
+    </style>
+
+    <style name="TextAppearance.Vector.Subtitle.Medium.DevicesManagement">
+        <item name="android:textColor">?vctr_content_primary</item>
+    </style>
+
+    <style name="TextAppearance.Vector.Body.DevicesManagement">
+        <item name="android:textColor">?vctr_content_secondary</item>
+        <item name="android:drawablePadding">12dp</item>
+    </style>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/styles_edit_text.xml b/library/ui-styles/src/main/res/values/styles_edit_text.xml
index 8de548dd03..94f4d86160 100644
--- a/library/ui-styles/src/main/res/values/styles_edit_text.xml
+++ b/library/ui-styles/src/main/res/values/styles_edit_text.xml
@@ -4,11 +4,24 @@
     <style name="Widget.Vector.EditText.Composer" parent="Widget.AppCompat.EditText">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:inputType">textCapSentences|textMultiLine</item>
-        <item name="android:maxLines">12</item>
+        <item name="android:maxLines">10</item>
         <item name="android:minHeight">48dp</item>
         <item name="android:padding">8dp</item>
         <item name="android:textSize">15sp</item>
         <item name="android:textColor">?vctr_message_text_color</item>
     </style>
 
-</resources>
\ No newline at end of file
+    <style name="Widget.Vector.EditText.RichTextComposer" parent="Widget.AppCompat.EditText">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:inputType">textCapSentences|textMultiLine</item>
+        <item name="android:maxLines">10</item>
+        <item name="android:minHeight">40dp</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="paddingStart">12dp</item>
+        <item name="android:clipToPadding">false</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">?vctr_message_text_color</item>
+    </style>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/styles_voice_broadcast.xml b/library/ui-styles/src/main/res/values/styles_voice_broadcast.xml
new file mode 100644
index 0000000000..eb85378141
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_voice_broadcast.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VoiceBroadcastLiveIndicator" parent="Widget.AppCompat.TextView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">20dp</item>
+        <item name="android:backgroundTint">?colorError</item>
+        <item name="android:drawablePadding">4dp</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:maxWidth">100dp</item>
+        <item name="android:paddingEnd">4dp</item>
+        <item name="android:paddingStart">4dp</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textColor">?colorOnError</item>
+        <item name="drawableTint">?colorOnError</item>
+    </style>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 9f4e5c1e28..9665b7335c 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -53,7 +53,7 @@
         <item name="vctr_list_separator">?vctr_content_quinary</item>
         <item name="vctr_list_separator_system">?vctr_system</item>
         <item name="vctr_list_separator_on_surface">?vctr_system</item>
-        <item name="vctr_unread_background">?vctr_content_tertiary</item>
+        <item name="vctr_unread_background">?vctr_notice_secondary</item>
 
         <!-- Material color -->
         <item name="colorPrimary">@color/element_accent_dark</item>
@@ -152,6 +152,9 @@
 
         <!-- Material 3 -->
         <item name="collapsingToolbarLayoutMediumSize">@dimen/collapsing_toolbar_layout_medium_size</item>
+
+        <!-- WYSIWYG Editor -->
+        <item name="vctr_rich_text_editor_menu_button_background">@color/vctr_rich_text_editor_menu_button_background_dark</item>
     </style>
 
     <style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index c8182abecc..c19fe8a111 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -53,7 +53,7 @@
         <item name="vctr_list_separator">?vctr_content_quinary</item>
         <item name="vctr_list_separator_system">?vctr_system</item>
         <item name="vctr_list_separator_on_surface">?vctr_system</item>
-        <item name="vctr_unread_background">?vctr_content_tertiary</item>
+        <item name="vctr_unread_background">?vctr_notice_secondary</item>
 
         <!-- Material color -->
         <item name="colorPrimary">@color/element_accent_light</item>
@@ -153,6 +153,9 @@
 
         <!-- Material 3 -->
         <item name="collapsingToolbarLayoutMediumSize">@dimen/collapsing_toolbar_layout_medium_size</item>
+
+        <!-- WYSIWYG Editor -->
+        <item name="vctr_rich_text_editor_menu_button_background">@color/vctr_rich_text_editor_menu_button_background_light</item>
     </style>
 
     <style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />
diff --git a/matrix-sdk-android-flow/build.gradle b/matrix-sdk-android-flow/build.gradle
index fb69af2d82..0a29334ea8 100644
--- a/matrix-sdk-android-flow/build.gradle
+++ b/matrix-sdk-android-flow/build.gradle
@@ -5,6 +5,8 @@ plugins {
 }
 
 android {
+    namespace "org.matrix.android.sdk.flow"
+
     compileSdk versions.compileSdk
 
     defaultConfig {
diff --git a/matrix-sdk-android-flow/src/main/AndroidManifest.xml b/matrix-sdk-android-flow/src/main/AndroidManifest.xml
index 2392c0bfcb..b2d3ea1235 100644
--- a/matrix-sdk-android-flow/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android-flow/src/main/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.matrix.android.sdk.flow">
-
-</manifest>
\ No newline at end of file
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowRoom.kt b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowRoom.kt
index 8be8e83569..94f09e0bf5 100644
--- a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowRoom.kt
+++ b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowRoom.kt
@@ -25,12 +25,12 @@ import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
+import org.matrix.android.sdk.api.session.room.model.LocalRoomSummary
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import org.matrix.android.sdk.api.session.room.send.UserDraft
-import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummary
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
@@ -46,6 +46,13 @@ class FlowRoom(private val room: Room) {
                 }
     }
 
+    fun liveLocalRoomSummary(): Flow<Optional<LocalRoomSummary>> {
+        return room.getLocalRoomSummaryLive().asFlow()
+                .startWith(room.coroutineDispatchers.io) {
+                    room.localRoomSummary().toOptional()
+                }
+    }
+
     fun liveRoomMembers(queryParams: RoomMemberQueryParams): Flow<List<RoomMemberSummary>> {
         return room.membershipService().getRoomMembersLive(queryParams).asFlow()
                 .startWith(room.coroutineDispatchers.io) {
@@ -92,8 +99,8 @@ class FlowRoom(private val room: Room) {
         return room.readService().getReadMarkerLive().asFlow()
     }
 
-    fun liveReadReceipt(): Flow<Optional<String>> {
-        return room.readService().getMyReadReceiptLive().asFlow()
+    fun liveReadReceipt(threadId: String?): Flow<Optional<String>> {
+        return room.readService().getMyReadReceiptLive(threadId).asFlow()
     }
 
     fun liveEventReadReceipts(eventId: String): Flow<List<ReadReceipt>> {
@@ -111,13 +118,6 @@ class FlowRoom(private val room: Room) {
         return room.roomPushRuleService().getLiveRoomNotificationState().asFlow()
     }
 
-    fun liveThreadSummaries(): Flow<List<ThreadSummary>> {
-        return room.threadsService().getAllThreadSummariesLive().asFlow()
-                .startWith(room.coroutineDispatchers.io) {
-                    room.threadsService().getAllThreadSummaries()
-                }
-    }
-
     fun liveThreadList(): Flow<List<ThreadRootEvent>> {
         return room.threadsLocalService().getAllThreadsLive().asFlow()
                 .startWith(room.coroutineDispatchers.io) {
diff --git a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt
index f22cfa369a..80ed311901 100644
--- a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt
+++ b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt
@@ -72,7 +72,7 @@ class FlowSession(private val session: Session) {
     }
 
     fun liveMyDevicesInfo(): Flow<List<DeviceInfo>> {
-        return session.cryptoService().getLiveMyDevicesInfo().asFlow()
+        return session.cryptoService().getMyDevicesInfoLive().asFlow()
                 .startWith(session.coroutineDispatchers.io) {
                     session.cryptoService().getMyDevicesInfo()
                 }
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index e6b526585b..d132158615 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "io.realm:realm-gradle-plugin:10.11.0"
+        classpath "io.realm:realm-gradle-plugin:10.11.1"
     }
 }
 
@@ -43,6 +43,8 @@ dokkaHtml {
 }
 
 android {
+    namespace "org.matrix.android.sdk"
+
     testOptions.unitTests.includeAndroidResources = true
 
     compileSdk versions.compileSdk
@@ -60,7 +62,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.4.34\""
+        buildConfigField "String", "SDK_VERSION", "\"1.5.20\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
@@ -163,6 +165,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor'
 
     implementation libs.squareup.moshi
+    implementation libs.squareup.moshiAdapters
     kapt libs.squareup.moshiKotlin
 
     api "com.atlassian.commonmark:commonmark:0.13.0"
@@ -198,8 +201,7 @@ dependencies {
     // Exif data handling
     implementation libs.apache.commonsImaging
 
-    // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.53'
+    implementation libs.google.phonenumber
 
     testImplementation libs.tests.junit
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
@@ -221,6 +223,8 @@ dependencies {
     androidTestImplementation libs.mockk.mockkAndroid
     androidTestImplementation libs.androidx.coreTesting
     androidTestImplementation libs.jetbrains.coroutinesAndroid
+    androidTestImplementation libs.jetbrains.coroutinesTest
+
     // Plant Timber tree for test
     androidTestImplementation libs.tests.timberJunitRule
 
diff --git a/matrix-sdk-android/src/androidTest/assets/crypto_store_20.realm b/matrix-sdk-android/src/androidTest/assets/crypto_store_20.realm
new file mode 100644
index 0000000000..cfdd2e6da6
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/assets/crypto_store_20.realm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7acd69f37612bab0a1ab7f456656712d7ba19dbb679f81b97b58ef44e239f42
+size 8523776
diff --git a/matrix-sdk-android/src/androidTest/assets/session_42.realm b/matrix-sdk-android/src/androidTest/assets/session_42.realm
new file mode 100644
index 0000000000..9268111699
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/assets/session_42.realm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab134a3d77862db7097a507ec363ae17c60b183c98dac460bc7fb227bfd51f2e
+size 270336
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
index 260e8dbe05..403f697778 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
@@ -43,9 +43,7 @@ class ChangePasswordTest : InstrumentedTest {
         val session = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = false))
 
         // Change password
-        commonTestHelper.runBlockingTest {
-            session.accountService().changePassword(TestConstants.PASSWORD, NEW_PASSWORD)
-        }
+        session.accountService().changePassword(TestConstants.PASSWORD, NEW_PASSWORD)
 
         // Try to login with the previous password, it will fail
         val throwable = commonTestHelper.logAccountWithError(session.myUserId, TestConstants.PASSWORD)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
index 0b21f85742..bb5618b816 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
@@ -40,26 +40,24 @@ import kotlin.coroutines.resume
 class DeactivateAccountTest : InstrumentedTest {
 
     @Test
-    fun deactivateAccountTest() = runSessionTest(context(), false /* session will be deactivated */) { commonTestHelper ->
+    fun deactivateAccountTest() = runSessionTest(context(), autoSignoutOnClose = false /* session will be deactivated */) { commonTestHelper ->
         val session = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = true))
 
         // Deactivate the account
-        commonTestHelper.runBlockingTest {
-            session.accountService().deactivateAccount(
-                    eraseAllData = false,
-                    userInteractiveAuthInterceptor = object : UserInteractiveAuthInterceptor {
-                        override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
-                            promise.resume(
-                                    UserPasswordAuth(
-                                            user = session.myUserId,
-                                            password = TestConstants.PASSWORD,
-                                            session = flowResponse.session
-                                    )
-                            )
-                        }
+        session.accountService().deactivateAccount(
+                eraseAllData = false,
+                userInteractiveAuthInterceptor = object : UserInteractiveAuthInterceptor {
+                    override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                        promise.resume(
+                                UserPasswordAuth(
+                                        user = session.myUserId,
+                                        password = TestConstants.PASSWORD,
+                                        session = flowResponse.session
+                                )
+                        )
                     }
-            )
-        }
+                }
+        )
 
         // Try to login on the previous account, it will fail (M_USER_DEACTIVATED)
         val throwable = commonTestHelper.logAccountWithError(session.myUserId, TestConstants.PASSWORD)
@@ -74,23 +72,19 @@ class DeactivateAccountTest : InstrumentedTest {
         // Try to create an account with the deactivate account user id, it will fail (M_USER_IN_USE)
         val hs = commonTestHelper.createHomeServerConfig()
 
-        commonTestHelper.runBlockingTest {
-            commonTestHelper.matrix.authenticationService.getLoginFlow(hs)
-        }
+        commonTestHelper.matrix.authenticationService.getLoginFlow(hs)
 
         var accountCreationError: Throwable? = null
-        commonTestHelper.runBlockingTest {
-            try {
-                commonTestHelper.matrix.authenticationService
-                        .getRegistrationWizard()
-                        .createAccount(
-                                session.myUserId.substringAfter("@").substringBefore(":"),
-                                TestConstants.PASSWORD,
-                                null
-                        )
-            } catch (failure: Throwable) {
-                accountCreationError = failure
-            }
+        try {
+            commonTestHelper.matrix.authenticationService
+                    .getRegistrationWizard()
+                    .createAccount(
+                            session.myUserId.substringAfter("@").substringBefore(":"),
+                            TestConstants.PASSWORD,
+                            null
+                    )
+        } catch (failure: Throwable) {
+            accountCreationError = failure
         }
 
         // Test the error
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index a78953caac..eeb2def582 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -19,25 +19,25 @@ package org.matrix.android.sdk.common
 import android.content.Context
 import android.net.Uri
 import android.util.Log
-import androidx.lifecycle.Observer
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withTimeout
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.withContext
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.SyncConfig
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -50,46 +50,56 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.api.session.sync.SyncState
 import timber.log.Timber
 import java.util.UUID
-import java.util.concurrent.CancellationException
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
 /**
  * This class exposes methods to be used in common cases
  * Registration, login, Sync, Sending messages...
  */
-class CommonTestHelper internal constructor(context: Context) {
+class CommonTestHelper internal constructor(context: Context, val cryptoConfig: MXCryptoConfig? = null) {
 
     companion object {
-        internal fun runSessionTest(context: Context, autoSignoutOnClose: Boolean = true, block: (CommonTestHelper) -> Unit) {
-            val testHelper = CommonTestHelper(context)
-            return try {
-                block(testHelper)
-            } finally {
-                if (autoSignoutOnClose) {
-                    testHelper.cleanUpOpenedSessions()
+
+        @OptIn(ExperimentalCoroutinesApi::class)
+        internal fun runSessionTest(context: Context, cryptoConfig: MXCryptoConfig? = null, autoSignoutOnClose: Boolean = true, block: suspend CoroutineScope.(CommonTestHelper) -> Unit) {
+            val testHelper = CommonTestHelper(context, cryptoConfig)
+            return runTest(dispatchTimeoutMs = TestConstants.timeOutMillis) {
+                try {
+                    withContext(Dispatchers.Default) {
+                        block(testHelper)
+                    }
+                } finally {
+                    if (autoSignoutOnClose) {
+                        testHelper.cleanUpOpenedSessions()
+                    }
                 }
             }
         }
 
-        internal fun runCryptoTest(context: Context, autoSignoutOnClose: Boolean = true, block: (CryptoTestHelper, CommonTestHelper) -> Unit) {
-            val testHelper = CommonTestHelper(context)
+        @OptIn(ExperimentalCoroutinesApi::class)
+        internal fun runCryptoTest(context: Context, cryptoConfig: MXCryptoConfig? = null,  autoSignoutOnClose: Boolean = true, block: suspend CoroutineScope.(CryptoTestHelper, CommonTestHelper) -> Unit) {
+            val testHelper = CommonTestHelper(context, cryptoConfig)
             val cryptoTestHelper = CryptoTestHelper(testHelper)
-            return try {
-                block(cryptoTestHelper, testHelper)
-            } finally {
-                if (autoSignoutOnClose) {
-                    testHelper.cleanUpOpenedSessions()
+            return runTest(dispatchTimeoutMs = TestConstants.timeOutMillis) {
+                try {
+                    withContext(Dispatchers.Default) {
+                        block(cryptoTestHelper, testHelper)
+                    }
+                } finally {
+                    if (autoSignoutOnClose) {
+                        testHelper.cleanUpOpenedSessions()
+                    }
                 }
             }
         }
     }
 
     internal val matrix: TestMatrix
-    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
     private var accountNumber = 0
 
     private val trackedSessions = mutableListOf<Session>()
@@ -103,26 +113,26 @@ class CommonTestHelper internal constructor(context: Context) {
                     context,
                     MatrixConfiguration(
                             applicationFlavor = "TestFlavor",
-                            roomDisplayNameFallbackProvider = TestRoomDisplayNameFallbackProvider()
+                            roomDisplayNameFallbackProvider = TestRoomDisplayNameFallbackProvider(),
+                            syncConfig = SyncConfig(longPollTimeout = 5_000L),
+                            cryptoConfig = cryptoConfig ?: MXCryptoConfig()
                     )
             )
         }
         matrix = _matrix!!
     }
 
-    fun createAccount(userNamePrefix: String, testParams: SessionTestParams): Session {
+    suspend fun createAccount(userNamePrefix: String, testParams: SessionTestParams): Session {
         return createAccount(userNamePrefix, TestConstants.PASSWORD, testParams)
     }
 
-    fun logIntoAccount(userId: String, testParams: SessionTestParams): Session {
+    suspend fun logIntoAccount(userId: String, testParams: SessionTestParams): Session {
         return logIntoAccount(userId, TestConstants.PASSWORD, testParams)
     }
 
-    fun cleanUpOpenedSessions() {
+    suspend fun cleanUpOpenedSessions() {
         trackedSessions.forEach {
-            runBlockingTest {
-                it.signOutService().signOut(true)
-            }
+            it.signOutService().signOut(true)
         }
         trackedSessions.clear()
     }
@@ -136,27 +146,10 @@ class CommonTestHelper internal constructor(context: Context) {
                 .build()
     }
 
-    /**
-     * This methods init the event stream and check for initial sync
-     *
-     * @param session the session to sync
-     */
-    fun syncSession(session: Session, timeout: Long = TestConstants.timeOutMillis * 10) {
-        val lock = CountDownLatch(1)
-        coroutineScope.launch {
-            session.syncService().startSync(true)
-            val syncLiveData = session.syncService().getSyncStateLive()
-            val syncObserver = object : Observer<SyncState> {
-                override fun onChanged(t: SyncState?) {
-                    if (session.syncService().hasAlreadySynced()) {
-                        lock.countDown()
-                        syncLiveData.removeObserver(this)
-                    }
-                }
-            }
-            syncLiveData.observeForever(syncObserver)
-        }
-        await(lock, timeout)
+    suspend fun syncSession(session: Session, timeout: Long = TestConstants.timeOutMillis * 10) {
+        session.syncService().startSync(true)
+        val syncLiveData = session.syncService().getSyncStateLive()
+        syncLiveData.first(timeout) { session.syncService().hasAlreadySynced() }
     }
 
     /**
@@ -164,22 +157,11 @@ class CommonTestHelper internal constructor(context: Context) {
      *
      * @param session the session to sync
      */
-    fun clearCacheAndSync(session: Session, timeout: Long = TestConstants.timeOutMillis) {
-        waitWithLatch(timeout) { latch ->
-            session.clearCache()
-            val syncLiveData = session.syncService().getSyncStateLive()
-            val syncObserver = object : Observer<SyncState> {
-                override fun onChanged(t: SyncState?) {
-                    if (session.syncService().hasAlreadySynced()) {
-                        Timber.v("Clear cache and synced")
-                        syncLiveData.removeObserver(this)
-                        latch.countDown()
-                    }
-                }
-            }
-            syncLiveData.observeForever(syncObserver)
-            session.syncService().startSync(true)
-        }
+    suspend fun clearCacheAndSync(session: Session, timeout: Long = TestConstants.timeOutMillis) {
+        session.clearCache()
+        syncSession(session, timeout)
+        session.syncService().getSyncStateLive().first(timeout) { session.syncService().hasAlreadySynced() }
+        Timber.v("Clear cache and synced")
     }
 
     /**
@@ -189,7 +171,7 @@ class CommonTestHelper internal constructor(context: Context) {
      * @param message the message to send
      * @param nbOfMessages the number of time the message will be sent
      */
-    fun sendTextMessage(room: Room, message: String, nbOfMessages: Int, timeout: Long = TestConstants.timeOutMillis): List<TimelineEvent> {
+    suspend fun sendTextMessage(room: Room, message: String, nbOfMessages: Int, timeout: Long = TestConstants.timeOutMillis): List<TimelineEvent> {
         val timeline = room.timelineService().createTimeline(null, TimelineSettings(10))
         timeline.start()
         val sentEvents = sendTextMessagesBatched(timeline, room, message, nbOfMessages, timeout)
@@ -202,66 +184,72 @@ class CommonTestHelper internal constructor(context: Context) {
     /**
      * Will send nb of messages provided by count parameter but waits every 10 messages to avoid gap in sync
      */
-    private fun sendTextMessagesBatched(timeline: Timeline, room: Room, message: String, count: Int, timeout: Long, rootThreadEventId: String? = null): List<TimelineEvent> {
+    private suspend fun sendTextMessagesBatched(timeline: Timeline, room: Room, message: String, count: Int, timeout: Long, rootThreadEventId: String? = null): List<TimelineEvent> {
         val sentEvents = ArrayList<TimelineEvent>(count)
         (1 until count + 1)
                 .map { "$message #$it" }
                 .chunked(10)
                 .forEach { batchedMessages ->
-                    batchedMessages.forEach { formattedMessage ->
-                        if (rootThreadEventId != null) {
-                            room.relationService().replyInThread(
-                                    rootThreadEventId = rootThreadEventId,
-                                    replyInThreadText = formattedMessage
-                            )
-                        } else {
-                            room.sendService().sendTextMessage(formattedMessage)
-                        }
-                    }
-                    waitWithLatch(timeout) { latch ->
-                        val timelineListener = object : Timeline.Listener {
+                    waitFor(
+                            continueWhen = {
+                                wrapWithTimeout(timeout) {
+                                    suspendCoroutine<Unit> { continuation ->
+                                        val timelineListener = object : Timeline.Listener {
 
-                            override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
-                                val allSentMessages = snapshot
-                                        .filter { it.root.sendState == SendState.SYNCED }
-                                        .filter { it.root.getClearType() == EventType.MESSAGE }
-                                        .filter { it.root.getClearContent().toModel<MessageContent>()?.body?.startsWith(message) == true }
+                                            override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
+                                                val allSentMessages = snapshot
+                                                        .filter { it.root.sendState == SendState.SYNCED }
+                                                        .filter { it.root.getClearType() == EventType.MESSAGE }
+                                                        .filter { it.root.getClearContent().toModel<MessageContent>()?.body?.startsWith(message) == true }
 
-                                val hasSyncedAllBatchedMessages = allSentMessages
-                                        .map {
-                                            it.root.getClearContent().toModel<MessageContent>()?.body
+                                                val hasSyncedAllBatchedMessages = allSentMessages
+                                                        .map {
+                                                            it.root.getClearContent().toModel<MessageContent>()?.body
+                                                        }
+                                                        .containsAll(batchedMessages)
+
+                                                if (allSentMessages.size == count) {
+                                                    sentEvents.addAll(allSentMessages)
+                                                }
+                                                if (hasSyncedAllBatchedMessages) {
+                                                    timeline.removeListener(this)
+                                                    continuation.resume(Unit)
+                                                }
+                                            }
                                         }
-                                        .containsAll(batchedMessages)
-
-                                if (allSentMessages.size == count) {
-                                    sentEvents.addAll(allSentMessages)
+                                        timeline.addListener(timelineListener)
+                                    }
                                 }
-                                if (hasSyncedAllBatchedMessages) {
-                                    timeline.removeListener(this)
-                                    latch.countDown()
+                            },
+                            action = {
+                                batchedMessages.forEach { formattedMessage ->
+                                    if (rootThreadEventId != null) {
+                                        room.relationService().replyInThread(
+                                                rootThreadEventId = rootThreadEventId,
+                                                replyInThreadText = formattedMessage
+                                        )
+                                    } else {
+                                        room.sendService().sendTextMessage(formattedMessage)
+                                    }
                                 }
                             }
-                        }
-                        timeline.addListener(timelineListener)
-                    }
+                    )
                 }
         return sentEvents
     }
 
-    fun waitForAndAcceptInviteInRoom(otherSession: Session, roomID: String) {
-        waitWithLatch { latch ->
-            retryPeriodicallyWithLatch(latch) {
-                val roomSummary = otherSession.getRoomSummary(roomID)
-                (roomSummary != null && roomSummary.membership == Membership.INVITE).also {
-                    if (it) {
-                        Log.v("# TEST", "${otherSession.myUserId} can see the invite")
-                    }
+    suspend fun waitForAndAcceptInviteInRoom(otherSession: Session, roomID: String) {
+        retryPeriodically {
+            val roomSummary = otherSession.getRoomSummary(roomID)
+            (roomSummary != null && roomSummary.membership == Membership.INVITE).also {
+                if (it) {
+                    Log.v("# TEST", "${otherSession.myUserId} can see the invite")
                 }
             }
         }
 
         // not sure why it's taking so long :/
-        runBlockingTest(90_000) {
+        wrapWithTimeout(90_000) {
             Log.v("#E2E TEST", "${otherSession.myUserId} tries to join room $roomID")
             try {
                 otherSession.roomService().joinRoom(roomID)
@@ -271,11 +259,9 @@ class CommonTestHelper internal constructor(context: Context) {
         }
 
         Log.v("#E2E TEST", "${otherSession.myUserId} waiting for join echo ...")
-        waitWithLatch {
-            retryPeriodicallyWithLatch(it) {
-                val roomSummary = otherSession.getRoomSummary(roomID)
-                roomSummary != null && roomSummary.membership == Membership.JOIN
-            }
+        retryPeriodically {
+            val roomSummary = otherSession.getRoomSummary(roomID)
+            roomSummary != null && roomSummary.membership == Membership.JOIN
         }
     }
 
@@ -285,7 +271,7 @@ class CommonTestHelper internal constructor(context: Context) {
      * @param message the message to send
      * @param numberOfMessages the number of time the message will be sent
      */
-    fun replyInThreadMessage(
+    suspend fun replyInThreadMessage(
             room: Room,
             message: String,
             numberOfMessages: Int,
@@ -303,15 +289,7 @@ class CommonTestHelper internal constructor(context: Context) {
 
     // PRIVATE METHODS *****************************************************************************
 
-    /**
-     * Creates a unique account
-     *
-     * @param userNamePrefix the user name prefix
-     * @param password the password
-     * @param testParams test params about the session
-     * @return the session associated with the newly created account
-     */
-    private fun createAccount(
+    private suspend fun createAccount(
             userNamePrefix: String,
             password: String,
             testParams: SessionTestParams
@@ -329,15 +307,7 @@ class CommonTestHelper internal constructor(context: Context) {
         }
     }
 
-    /**
-     * Logs into an existing account
-     *
-     * @param userId the userId to log in
-     * @param password the password to log in
-     * @param testParams test params about the session
-     * @return the session associated with the existing account
-     */
-    fun logIntoAccount(
+    suspend fun logIntoAccount(
             userId: String,
             password: String,
             testParams: SessionTestParams
@@ -349,32 +319,25 @@ class CommonTestHelper internal constructor(context: Context) {
         }
     }
 
-    /**
-     * Create an account and a dedicated session
-     *
-     * @param userName the account username
-     * @param password the password
-     * @param sessionTestParams parameters for the test
-     */
-    private fun createAccountAndSync(
+    private suspend fun createAccountAndSync(
             userName: String,
             password: String,
             sessionTestParams: SessionTestParams
     ): Session {
         val hs = createHomeServerConfig()
 
-        runBlockingTest {
+        wrapWithTimeout(TestConstants.timeOutMillis) {
             matrix.authenticationService.getLoginFlow(hs)
         }
 
-        runBlockingTest(timeout = 60_000) {
+        wrapWithTimeout(60_000L) {
             matrix.authenticationService
                     .getRegistrationWizard()
                     .createAccount(userName, password, null)
         }
 
         // Perform dummy step
-        val registrationResult = runBlockingTest(timeout = 60_000) {
+        val registrationResult = wrapWithTimeout(timeout = 60_000) {
             matrix.authenticationService
                     .getRegistrationWizard()
                     .dummy()
@@ -389,29 +352,14 @@ class CommonTestHelper internal constructor(context: Context) {
         return session
     }
 
-    /**
-     * Start an account login
-     *
-     * @param userName the account username
-     * @param password the password
-     * @param sessionTestParams session test params
-     */
-    private fun logAccountAndSync(
-            userName: String,
-            password: String,
-            sessionTestParams: SessionTestParams
-    ): Session {
+    private suspend fun logAccountAndSync(userName: String, password: String, sessionTestParams: SessionTestParams): Session {
         val hs = createHomeServerConfig()
 
-        runBlockingTest {
-            matrix.authenticationService.getLoginFlow(hs)
-        }
+        matrix.authenticationService.getLoginFlow(hs)
 
-        val session = runBlockingTest {
-            matrix.authenticationService
-                    .getLoginWizard()
-                    .login(userName, password, "myDevice")
-        }
+        val session = matrix.authenticationService
+                .getLoginWizard()
+                .login(userName, password, "myDevice")
         session.open()
         if (sessionTestParams.withInitialSync) {
             syncSession(session)
@@ -426,25 +374,21 @@ class CommonTestHelper internal constructor(context: Context) {
      * @param userName the account username
      * @param password the password
      */
-    fun logAccountWithError(
+    suspend fun logAccountWithError(
             userName: String,
             password: String
     ): Throwable {
         val hs = createHomeServerConfig()
 
-        runBlockingTest {
-            matrix.authenticationService.getLoginFlow(hs)
-        }
+        matrix.authenticationService.getLoginFlow(hs)
 
         var requestFailure: Throwable? = null
-        runBlockingTest {
-            try {
-                matrix.authenticationService
-                        .getLoginWizard()
-                        .login(userName, password, "myDevice")
-            } catch (failure: Throwable) {
-                requestFailure = failure
-            }
+        try {
+            matrix.authenticationService
+                    .getLoginWizard()
+                    .login(userName, password, "myDevice")
+        } catch (failure: Throwable) {
+            requestFailure = failure
         }
 
         assertNotNull(requestFailure)
@@ -480,65 +424,48 @@ class CommonTestHelper internal constructor(context: Context) {
         )
     }
 
-    suspend fun retryPeriodicallyWithLatch(latch: CountDownLatch, condition: (() -> Boolean)) {
-        while (true) {
-            try {
-                delay(1000)
-            } catch (ex: CancellationException) {
-                // the job was canceled, just stop
-                return
-            }
-            if (condition()) {
-                latch.countDown()
-                return
+    suspend fun retryPeriodically(timeout: Long = TestConstants.timeOutMillis, predicate: suspend () -> Boolean) {
+        wrapWithTimeout(timeout) {
+            while (!predicate()) {
+                runBlocking { delay(500) }
             }
         }
     }
 
-    fun waitWithLatch(timeout: Long? = TestConstants.timeOutMillis, dispatcher: CoroutineDispatcher = Dispatchers.Main, block: suspend (CountDownLatch) -> Unit) {
-        val latch = CountDownLatch(1)
-        val job = coroutineScope.launch(dispatcher) {
-            block(latch)
-        }
-        await(latch, timeout, job)
-    }
-
-    fun <T> runBlockingTest(timeout: Long = TestConstants.timeOutMillis, block: suspend () -> T): T {
-        return runBlocking {
-            withTimeout(timeout) {
-                block()
+    suspend fun <T> waitForCallback(timeout: Long = TestConstants.timeOutMillis, block: (MatrixCallback<T>) -> Unit): T {
+        return wrapWithTimeout(timeout) {
+            suspendCoroutine { continuation ->
+                val callback = object : MatrixCallback<T> {
+                    override fun onSuccess(data: T) {
+                        continuation.resume(data)
+                    }
+                }
+                block(callback)
             }
         }
     }
 
-    // Transform a method with a MatrixCallback to a synchronous method
-    inline fun <reified T> doSync(timeout: Long? = TestConstants.timeOutMillis, block: (MatrixCallback<T>) -> Unit): T {
-        val lock = CountDownLatch(1)
-        var result: T? = null
-
-        val callback = object : TestMatrixCallback<T>(lock) {
-            override fun onSuccess(data: T) {
-                result = data
-                super.onSuccess(data)
+    suspend fun <T> waitForCallbackError(timeout: Long = TestConstants.timeOutMillis, block: (MatrixCallback<T>) -> Unit): Throwable {
+        return wrapWithTimeout(timeout) {
+            suspendCoroutine { continuation ->
+                val callback = object : MatrixCallback<T> {
+                    override fun onFailure(failure: Throwable) {
+                        continuation.resume(failure)
+                    }
+                }
+                block(callback)
             }
         }
-
-        block.invoke(callback)
-
-        await(lock, timeout)
-
-        assertNotNull(result)
-        return result!!
     }
 
     /**
      * Clear all provided sessions
      */
-    fun Iterable<Session>.signOutAndClose() = forEach { signOutAndClose(it) }
+    suspend fun Iterable<Session>.signOutAndClose() = forEach { signOutAndClose(it) }
 
-    fun signOutAndClose(session: Session) {
+    suspend fun signOutAndClose(session: Session) {
         trackedSessions.remove(session)
-        runBlockingTest(timeout = 60_000) {
+        wrapWithTimeout(timeout = 60_000L) {
             session.signOutService().signOut(true)
         }
         // no need signout will close
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
index 41d0d3a7e8..8cd5bee569 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
@@ -32,7 +32,7 @@ data class CryptoTestData(
     val thirdSession: Session?
         get() = sessions.getOrNull(2)
 
-    fun cleanUp(testHelper: CommonTestHelper) {
+    suspend fun cleanUp(testHelper: CommonTestHelper) {
         sessions.forEach {
             testHelper.signOutAndClose(it)
         }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index f36bfb6210..74292daf15 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -16,19 +16,15 @@
 
 package org.matrix.android.sdk.common
 
-import android.os.SystemClock
 import android.util.Log
-import androidx.lifecycle.Observer
 import org.amshove.kluent.fail
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
-import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
@@ -46,22 +42,16 @@ import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerific
 import org.matrix.android.sdk.api.session.crypto.verification.OutgoingSasVerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
-import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
-import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.securestorage.EmptyKeySigner
 import org.matrix.android.sdk.api.session.securestorage.KeyRef
-import org.matrix.android.sdk.api.util.Optional
-import org.matrix.android.sdk.api.util.awaitCallback
 import org.matrix.android.sdk.api.util.toBase64NoPadding
 import java.util.UUID
 import kotlin.coroutines.Continuation
@@ -77,30 +67,19 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
     /**
      * @return alice session
      */
-    fun doE2ETestWithAliceInARoom(encryptedRoom: Boolean = true, roomHistoryVisibility: RoomHistoryVisibility? = null): CryptoTestData {
+    suspend fun doE2ETestWithAliceInARoom(encryptedRoom: Boolean = true, roomHistoryVisibility: RoomHistoryVisibility? = null): CryptoTestData {
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
 
-        val roomId = testHelper.runBlockingTest {
-            aliceSession.roomService().createRoom(CreateRoomParams().apply {
-                historyVisibility = roomHistoryVisibility
-                name = "MyRoom"
-            })
-        }
+        val roomId = aliceSession.roomService().createRoom(CreateRoomParams().apply {
+            historyVisibility = roomHistoryVisibility
+            name = "MyRoom"
+        })
         if (encryptedRoom) {
-            testHelper.waitWithLatch { latch ->
-                val room = aliceSession.getRoom(roomId)!!
-                room.roomCryptoService().enableEncryption()
-                val roomSummaryLive = room.getRoomSummaryLive()
-                val roomSummaryObserver = object : Observer<Optional<RoomSummary>> {
-                    override fun onChanged(roomSummary: Optional<RoomSummary>) {
-                        if (roomSummary.getOrNull()?.isEncrypted.orFalse()) {
-                            roomSummaryLive.removeObserver(this)
-                            latch.countDown()
-                        }
-                    }
-                }
-                roomSummaryLive.observeForever(roomSummaryObserver)
-            }
+            val room = aliceSession.getRoom(roomId)!!
+            waitFor(
+                    continueWhen = { room.onMain { getRoomSummaryLive() }.first { it.getOrNull()?.isEncrypted.orFalse() } },
+                    action = { room.roomCryptoService().enableEncryption() }
+            )
         }
         return CryptoTestData(roomId, listOf(aliceSession))
     }
@@ -108,7 +87,7 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
     /**
      * @return alice and bob sessions
      */
-    fun doE2ETestWithAliceAndBobInARoom(encryptedRoom: Boolean = true, roomHistoryVisibility: RoomHistoryVisibility? = null): CryptoTestData {
+    suspend fun doE2ETestWithAliceAndBobInARoom(encryptedRoom: Boolean = true, roomHistoryVisibility: RoomHistoryVisibility? = null): CryptoTestData {
         val cryptoTestData = doE2ETestWithAliceInARoom(encryptedRoom, roomHistoryVisibility)
         val aliceSession = cryptoTestData.firstSession
         val aliceRoomId = cryptoTestData.roomId
@@ -117,36 +96,23 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
 
         val bobSession = testHelper.createAccount(TestConstants.USER_BOB, defaultSessionParams)
 
-        testHelper.waitWithLatch { latch ->
-            val bobRoomSummariesLive = bobSession.roomService().getRoomSummariesLive(roomSummaryQueryParams { })
-            val newRoomObserver = object : Observer<List<RoomSummary>> {
-                override fun onChanged(t: List<RoomSummary>?) {
-                    if (t?.isNotEmpty() == true) {
-                        bobRoomSummariesLive.removeObserver(this)
-                        latch.countDown()
-                    }
-                }
-            }
-            bobRoomSummariesLive.observeForever(newRoomObserver)
-            aliceRoom.membershipService().invite(bobSession.myUserId)
-        }
+        waitFor(
+                continueWhen = { bobSession.roomService().onMain { getRoomSummariesLive(roomSummaryQueryParams { }) }.first { it.isNotEmpty() } },
+                action = { aliceRoom.membershipService().invite(bobSession.myUserId) }
+        )
 
-        testHelper.waitWithLatch { latch ->
-            val bobRoomSummariesLive = bobSession.roomService().getRoomSummariesLive(roomSummaryQueryParams { })
-            val roomJoinedObserver = object : Observer<List<RoomSummary>> {
-                override fun onChanged(t: List<RoomSummary>?) {
-                    if (bobSession.getRoom(aliceRoomId)
-                                    ?.membershipService()
-                                    ?.getRoomMember(bobSession.myUserId)
-                                    ?.membership == Membership.JOIN) {
-                        bobRoomSummariesLive.removeObserver(this)
-                        latch.countDown()
+        waitFor(
+                continueWhen = {
+                    bobSession.roomService().onMain { getRoomSummariesLive(roomSummaryQueryParams { }) }.first {
+                        bobSession.getRoom(aliceRoomId)
+                                ?.membershipService()
+                                ?.getRoomMember(bobSession.myUserId)
+                                ?.membership == Membership.JOIN
                     }
-                }
-            }
-            bobRoomSummariesLive.observeForever(roomJoinedObserver)
-            bobSession.roomService().joinRoom(aliceRoomId)
-        }
+                },
+                action = { bobSession.roomService().joinRoom(aliceRoomId) }
+        )
+
         // Ensure bob can send messages to the room
 //        val roomFromBobPOV = bobSession.getRoom(aliceRoomId)!!
 //        assertNotNull(roomFromBobPOV.powerLevels)
@@ -155,46 +121,10 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
         return CryptoTestData(aliceRoomId, listOf(aliceSession, bobSession))
     }
 
-    /**
-     * @return Alice, Bob and Sam session
-     */
-    fun doE2ETestWithAliceAndBobAndSamInARoom(): CryptoTestData {
-        val cryptoTestData = doE2ETestWithAliceAndBobInARoom()
-        val aliceSession = cryptoTestData.firstSession
-        val aliceRoomId = cryptoTestData.roomId
-
-        val room = aliceSession.getRoom(aliceRoomId)!!
-
-        val samSession = createSamAccountAndInviteToTheRoom(room)
-
-        // wait the initial sync
-        SystemClock.sleep(1000)
-
-        return CryptoTestData(aliceRoomId, listOf(aliceSession, cryptoTestData.secondSession!!, samSession))
-    }
-
-    /**
-     * Create Sam account and invite him in the room. He will accept the invitation
-     * @Return Sam session
-     */
-    fun createSamAccountAndInviteToTheRoom(room: Room): Session {
-        val samSession = testHelper.createAccount(TestConstants.USER_SAM, defaultSessionParams)
-
-        testHelper.runBlockingTest {
-            room.membershipService().invite(samSession.myUserId, null)
-        }
-
-        testHelper.runBlockingTest {
-            samSession.roomService().joinRoom(room.roomId, null, emptyList())
-        }
-
-        return samSession
-    }
-
     /**
      * @return Alice and Bob sessions
      */
-    fun doE2ETestWithAliceAndBobInARoomWithEncryptedMessages(): CryptoTestData {
+    suspend fun doE2ETestWithAliceAndBobInARoomWithEncryptedMessages(): CryptoTestData {
         val cryptoTestData = doE2ETestWithAliceAndBobInARoom()
         val aliceSession = cryptoTestData.firstSession
         val aliceRoomId = cryptoTestData.roomId
@@ -235,49 +165,20 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
         return cryptoTestData
     }
 
-    private fun ensureEventReceived(roomId: String, eventId: String, session: Session, andCanDecrypt: Boolean) {
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val timeLineEvent = session.getRoom(roomId)?.timelineService()?.getTimelineEvent(eventId)
-                if (andCanDecrypt) {
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
-                } else {
-                    timeLineEvent != null
-                }
+    private suspend fun ensureEventReceived(roomId: String, eventId: String, session: Session, andCanDecrypt: Boolean) {
+        testHelper.retryPeriodically {
+            val timeLineEvent = session.getRoom(roomId)?.timelineService()?.getTimelineEvent(eventId)
+            if (andCanDecrypt) {
+                timeLineEvent != null &&
+                        timeLineEvent.isEncrypted() &&
+                        timeLineEvent.root.getClearType() == EventType.MESSAGE
+            } else {
+                timeLineEvent != null
             }
         }
     }
 
-    fun checkEncryptedEvent(event: Event, roomId: String, clearMessage: String, senderSession: Session) {
-        assertEquals(EventType.ENCRYPTED, event.type)
-        assertNotNull(event.content)
-
-        val eventWireContent = event.content.toContent()
-        assertNotNull(eventWireContent)
-
-        assertNull(eventWireContent["body"])
-        assertEquals(MXCRYPTO_ALGORITHM_MEGOLM, eventWireContent["algorithm"])
-
-        assertNotNull(eventWireContent["ciphertext"])
-        assertNotNull(eventWireContent["session_id"])
-        assertNotNull(eventWireContent["sender_key"])
-
-        assertEquals(senderSession.sessionParams.deviceId, eventWireContent["device_id"])
-
-        assertNotNull(event.eventId)
-        assertEquals(roomId, event.roomId)
-        assertEquals(EventType.MESSAGE, event.getClearType())
-        // TODO assertTrue(event.getAge() < 10000)
-
-        val eventContent = event.toContent()
-        assertNotNull(eventContent)
-        assertEquals(clearMessage, eventContent["body"])
-        assertEquals(senderSession.myUserId, event.senderId)
-    }
-
-    fun createFakeMegolmBackupAuthData(): MegolmBackupAuthData {
+    private fun createFakeMegolmBackupAuthData(): MegolmBackupAuthData {
         return MegolmBackupAuthData(
                 publicKey = "abcdefg",
                 signatures = mapOf("something" to mapOf("ed25519:something" to "hijklmnop"))
@@ -292,44 +193,35 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
         )
     }
 
-    fun createDM(alice: Session, bob: Session): String {
-        var roomId: String = ""
-        testHelper.waitWithLatch { latch ->
-            roomId = alice.roomService().createDirectRoom(bob.myUserId)
-            val bobRoomSummariesLive = bob.roomService().getRoomSummariesLive(roomSummaryQueryParams { })
-            val newRoomObserver = object : Observer<List<RoomSummary>> {
-                override fun onChanged(t: List<RoomSummary>?) {
-                    if (t?.any { it.roomId == roomId }.orFalse()) {
-                        bobRoomSummariesLive.removeObserver(this)
-                        latch.countDown()
-                    }
-                }
-            }
-            bobRoomSummariesLive.observeForever(newRoomObserver)
-        }
-
-        testHelper.waitWithLatch { latch ->
-            val bobRoomSummariesLive = bob.roomService().getRoomSummariesLive(roomSummaryQueryParams { })
-            val newRoomObserver = object : Observer<List<RoomSummary>> {
-                override fun onChanged(t: List<RoomSummary>?) {
-                    if (bob.getRoom(roomId)
-                                    ?.membershipService()
-                                    ?.getRoomMember(bob.myUserId)
-                                    ?.membership == Membership.JOIN) {
-                        bobRoomSummariesLive.removeObserver(this)
-                        latch.countDown()
-                    }
-                }
-            }
-            bobRoomSummariesLive.observeForever(newRoomObserver)
-            bob.roomService().joinRoom(roomId)
-        }
+    suspend fun createDM(alice: Session, bob: Session): String {
+        var roomId = ""
+        waitFor(
+                continueWhen = {
+                    bob.roomService()
+                            .onMain { getRoomSummariesLive(roomSummaryQueryParams { }) }
+                            .first { it.any { it.roomId == roomId }.orFalse() }
+                },
+                action = { roomId = alice.roomService().createDirectRoom(bob.myUserId) }
+        )
 
+        waitFor(
+                continueWhen = {
+                    bob.roomService()
+                            .onMain { getRoomSummariesLive(roomSummaryQueryParams { }) }
+                            .first {
+                                bob.getRoom(roomId)
+                                        ?.membershipService()
+                                        ?.getRoomMember(bob.myUserId)
+                                        ?.membership == Membership.JOIN
+                            }
+                },
+                action = { bob.roomService().joinRoom(roomId) }
+        )
         return roomId
     }
 
-    fun initializeCrossSigning(session: Session) {
-        testHelper.doSync<Unit> {
+    suspend fun initializeCrossSigning(session: Session) {
+        testHelper.waitForCallback<Unit> {
             session.cryptoService().crossSigningService()
                     .initializeCrossSigning(
                             object : UserInteractiveAuthInterceptor {
@@ -350,57 +242,55 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
     /**
      * Initialize cross-signing, set up megolm backup and save all in 4S
      */
-    fun bootstrapSecurity(session: Session) {
+    suspend fun bootstrapSecurity(session: Session) {
         initializeCrossSigning(session)
         val ssssService = session.sharedSecretStorageService()
-        testHelper.runBlockingTest {
-            val keyInfo = ssssService.generateKey(
-                    UUID.randomUUID().toString(),
-                    null,
-                    "ssss_key",
-                    EmptyKeySigner()
-            )
-            ssssService.setDefaultKey(keyInfo.keyId)
+        val keyInfo = ssssService.generateKey(
+                UUID.randomUUID().toString(),
+                null,
+                "ssss_key",
+                EmptyKeySigner()
+        )
+        ssssService.setDefaultKey(keyInfo.keyId)
 
+        ssssService.storeSecret(
+                MASTER_KEY_SSSS_NAME,
+                session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()!!.master!!,
+                listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
+        )
+
+        ssssService.storeSecret(
+                SELF_SIGNING_KEY_SSSS_NAME,
+                session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()!!.selfSigned!!,
+                listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
+        )
+
+        ssssService.storeSecret(
+                USER_SIGNING_KEY_SSSS_NAME,
+                session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()!!.user!!,
+                listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
+        )
+
+        // set up megolm backup
+        val creationInfo = testHelper.waitForCallback<MegolmBackupCreationInfo> {
+            session.cryptoService().keysBackupService().prepareKeysBackupVersion(null, null, it)
+        }
+        val version = testHelper.waitForCallback<KeysVersion> {
+            session.cryptoService().keysBackupService().createKeysBackupVersion(creationInfo, it)
+        }
+        // Save it for gossiping
+        session.cryptoService().keysBackupService().saveBackupRecoveryKey(creationInfo.recoveryKey, version = version.version)
+
+        extractCurveKeyFromRecoveryKey(creationInfo.recoveryKey)?.toBase64NoPadding()?.let { secret ->
             ssssService.storeSecret(
-                    MASTER_KEY_SSSS_NAME,
-                    session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()!!.master!!,
+                    KEYBACKUP_SECRET_SSSS_NAME,
+                    secret,
                     listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
             )
-
-            ssssService.storeSecret(
-                    SELF_SIGNING_KEY_SSSS_NAME,
-                    session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()!!.selfSigned!!,
-                    listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
-            )
-
-            ssssService.storeSecret(
-                    USER_SIGNING_KEY_SSSS_NAME,
-                    session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()!!.user!!,
-                    listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
-            )
-
-            // set up megolm backup
-            val creationInfo = awaitCallback<MegolmBackupCreationInfo> {
-                session.cryptoService().keysBackupService().prepareKeysBackupVersion(null, null, it)
-            }
-            val version = awaitCallback<KeysVersion> {
-                session.cryptoService().keysBackupService().createKeysBackupVersion(creationInfo, it)
-            }
-            // Save it for gossiping
-            session.cryptoService().keysBackupService().saveBackupRecoveryKey(creationInfo.recoveryKey, version = version.version)
-
-            extractCurveKeyFromRecoveryKey(creationInfo.recoveryKey)?.toBase64NoPadding()?.let { secret ->
-                ssssService.storeSecret(
-                        KEYBACKUP_SECRET_SSSS_NAME,
-                        secret,
-                        listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
-                )
-            }
         }
     }
 
-    fun verifySASCrossSign(alice: Session, bob: Session, roomId: String) {
+    suspend fun verifySASCrossSign(alice: Session, bob: Session, roomId: String) {
         assertTrue(alice.cryptoService().crossSigningService().canCrossSign())
         assertTrue(bob.cryptoService().crossSigningService().canCrossSign())
 
@@ -415,30 +305,26 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
                 roomId = roomId
         ).transactionId
 
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                bobVerificationService.getExistingVerificationRequests(alice.myUserId).firstOrNull {
-                    it.requestInfo?.fromDevice == alice.sessionParams.deviceId
-                } != null
-            }
+        testHelper.retryPeriodically {
+            bobVerificationService.getExistingVerificationRequests(alice.myUserId).firstOrNull {
+                it.requestInfo?.fromDevice == alice.sessionParams.deviceId
+            } != null
         }
         val incomingRequest = bobVerificationService.getExistingVerificationRequests(alice.myUserId).first {
             it.requestInfo?.fromDevice == alice.sessionParams.deviceId
         }
-        bobVerificationService.readyPendingVerification(listOf(VerificationMethod.SAS), alice.myUserId, incomingRequest.transactionId!!)
+        bobVerificationService.readyPendingVerificationInDMs(listOf(VerificationMethod.SAS), alice.myUserId, roomId, incomingRequest.transactionId!!)
 
         var requestID: String? = null
         // wait for it to be readied
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                val outgoingRequest = aliceVerificationService.getExistingVerificationRequests(bob.myUserId)
-                        .firstOrNull { it.localId == localId }
-                if (outgoingRequest?.isReady == true) {
-                    requestID = outgoingRequest.transactionId!!
-                    true
-                } else {
-                    false
-                }
+        testHelper.retryPeriodically {
+            val outgoingRequest = aliceVerificationService.getExistingVerificationRequests(bob.myUserId)
+                    .firstOrNull { it.localId == localId }
+            if (outgoingRequest?.isReady == true) {
+                requestID = outgoingRequest.transactionId!!
+                true
+            } else {
+                false
             }
         }
 
@@ -454,23 +340,19 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
         var alicePovTx: OutgoingSasVerificationTransaction? = null
         var bobPovTx: IncomingSasVerificationTransaction? = null
 
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                alicePovTx = aliceVerificationService.getExistingTransaction(bob.myUserId, requestID!!) as? OutgoingSasVerificationTransaction
-                Log.v("TEST", "== alicePovTx is ${alicePovTx?.uxState}")
-                alicePovTx?.state == VerificationTxState.ShortCodeReady
-            }
+        testHelper.retryPeriodically {
+            alicePovTx = aliceVerificationService.getExistingTransaction(bob.myUserId, requestID!!) as? OutgoingSasVerificationTransaction
+            Log.v("TEST", "== alicePovTx is ${alicePovTx?.uxState}")
+            alicePovTx?.state == VerificationTxState.ShortCodeReady
         }
         // wait for alice to get the ready
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                bobPovTx = bobVerificationService.getExistingTransaction(alice.myUserId, requestID!!) as? IncomingSasVerificationTransaction
-                Log.v("TEST", "== bobPovTx is ${alicePovTx?.uxState}")
-                if (bobPovTx?.state == VerificationTxState.OnStarted) {
-                    bobPovTx?.performAccept()
-                }
-                bobPovTx?.state == VerificationTxState.ShortCodeReady
+        testHelper.retryPeriodically {
+            bobPovTx = bobVerificationService.getExistingTransaction(alice.myUserId, requestID!!) as? IncomingSasVerificationTransaction
+            Log.v("TEST", "== bobPovTx is ${alicePovTx?.uxState}")
+            if (bobPovTx?.state == VerificationTxState.OnStarted) {
+                bobPovTx?.performAccept()
             }
+            bobPovTx?.state == VerificationTxState.ShortCodeReady
         }
 
         assertEquals("SAS code do not match", alicePovTx!!.getDecimalCodeRepresentation(), bobPovTx!!.getDecimalCodeRepresentation())
@@ -478,38 +360,30 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
         bobPovTx!!.userHasVerifiedShortCode()
         alicePovTx!!.userHasVerifiedShortCode()
 
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                alice.cryptoService().crossSigningService().isUserTrusted(bob.myUserId)
-            }
+        testHelper.retryPeriodically {
+            alice.cryptoService().crossSigningService().isUserTrusted(bob.myUserId)
         }
 
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                alice.cryptoService().crossSigningService().isUserTrusted(bob.myUserId)
-            }
+        testHelper.retryPeriodically {
+            bob.cryptoService().crossSigningService().isUserTrusted(alice.myUserId)
         }
     }
 
-    fun doE2ETestWithManyMembers(numberOfMembers: Int): CryptoTestData {
+    suspend fun doE2ETestWithManyMembers(numberOfMembers: Int): CryptoTestData {
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
         aliceSession.cryptoService().setWarnOnUnknownDevices(false)
 
-        val roomId = testHelper.runBlockingTest {
-            aliceSession.roomService().createRoom(CreateRoomParams().apply { name = "MyRoom" })
-        }
+        val roomId = aliceSession.roomService().createRoom(CreateRoomParams().apply { name = "MyRoom" })
         val room = aliceSession.getRoom(roomId)!!
 
-        testHelper.runBlockingTest {
-            room.roomCryptoService().enableEncryption()
-        }
+        room.roomCryptoService().enableEncryption()
 
         val sessions = mutableListOf(aliceSession)
         for (index in 1 until numberOfMembers) {
             val session = testHelper.createAccount("User_$index", defaultSessionParams)
-            testHelper.runBlockingTest(timeout = 600_000) { room.membershipService().invite(session.myUserId, null) }
+            room.membershipService().invite(session.myUserId, null)
             println("TEST -> " + session.myUserId + " invited")
-            testHelper.runBlockingTest { session.roomService().joinRoom(room.roomId, null, emptyList()) }
+            session.roomService().joinRoom(room.roomId, null, emptyList())
             println("TEST -> " + session.myUserId + " joined")
             sessions.add(session)
         }
@@ -517,47 +391,43 @@ class CryptoTestHelper(val testHelper: CommonTestHelper) {
         return CryptoTestData(roomId, sessions)
     }
 
-    fun ensureCanDecrypt(sentEventIds: List<String>, session: Session, e2eRoomID: String, messagesText: List<String>) {
+    suspend fun ensureCanDecrypt(sentEventIds: List<String>, session: Session, e2eRoomID: String, messagesText: List<String>) {
         sentEventIds.forEachIndexed { index, sentEventId ->
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val event = session.getRoom(e2eRoomID)!!.timelineService().getTimelineEvent(sentEventId)!!.root
-                    testHelper.runBlockingTest {
-                        try {
-                            session.cryptoService().decryptEvent(event, "").let { result ->
-                                event.mxDecryptionResult = OlmDecryptionResult(
-                                        payload = result.clearEvent,
-                                        senderKey = result.senderCurve25519Key,
-                                        keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
-                                        forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
-                                )
-                            }
-                        } catch (error: MXCryptoError) {
-                            // nop
-                        }
+            testHelper.retryPeriodically {
+                val event = session.getRoom(e2eRoomID)?.timelineService()?.getTimelineEvent(sentEventId)?.root
+                        ?: return@retryPeriodically false
+                try {
+                    session.cryptoService().decryptEvent(event, "").let { result ->
+                        event.mxDecryptionResult = OlmDecryptionResult(
+                                payload = result.clearEvent,
+                                senderKey = result.senderCurve25519Key,
+                                keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
+                                forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
+                                isSafe = result.isSafe
+                        )
                     }
-                    Log.v("TEST", "ensureCanDecrypt ${event.getClearType()} is ${event.getClearContent()}")
-                    event.getClearType() == EventType.MESSAGE &&
-                            messagesText[index] == event.getClearContent()?.toModel<MessageContent>()?.body
+                } catch (error: MXCryptoError) {
+                    // nop
                 }
+                Log.v("TEST", "ensureCanDecrypt ${event.getClearType()} is ${event.getClearContent()}")
+                event.getClearType() == EventType.MESSAGE &&
+                        messagesText[index] == event.getClearContent()?.toModel<MessageContent>()?.body
             }
         }
     }
 
-    fun ensureCannotDecrypt(sentEventIds: List<String>, session: Session, e2eRoomID: String, expectedError: MXCryptoError.ErrorType? = null) {
+    suspend fun ensureCannotDecrypt(sentEventIds: List<String>, session: Session, e2eRoomID: String, expectedError: MXCryptoError.ErrorType? = null) {
         sentEventIds.forEach { sentEventId ->
             val event = session.getRoom(e2eRoomID)!!.timelineService().getTimelineEvent(sentEventId)!!.root
-            testHelper.runBlockingTest {
-                try {
-                    session.cryptoService().decryptEvent(event, "")
-                    fail("Should not be able to decrypt event")
-                } catch (error: MXCryptoError) {
-                    val errorType = (error as? MXCryptoError.Base)?.errorType
-                    if (expectedError == null) {
-                        assertNotNull(errorType)
-                    } else {
-                        assertEquals("Unexpected reason", expectedError, errorType)
-                    }
+            try {
+                session.cryptoService().decryptEvent(event, "")
+                fail("Should not be able to decrypt event")
+            } catch (error: MXCryptoError) {
+                val errorType = (error as? MXCryptoError.Base)?.errorType
+                if (expectedError == null) {
+                    assertNotNull(errorType)
+                } else {
+                    assertEquals("Unexpected reason", expectedError, errorType)
                 }
             }
         }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestExtensions.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestExtensions.kt
new file mode 100644
index 0000000000..8f89d42ac0
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestExtensions.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.common
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import kotlin.coroutines.resume
+
+suspend fun <T, R> T.onMain(block: T.() -> R): R {
+    return withContext(Dispatchers.Main) {
+        block(this@onMain)
+    }
+}
+
+suspend fun <T> LiveData<T>.first(timeout: Long = TestConstants.timeOutMillis, predicate: (T) -> Boolean): T {
+    return wrapWithTimeout(timeout) {
+        withContext(Dispatchers.Main) {
+            suspendCancellableCoroutine { continuation ->
+                val observer = object : Observer<T> {
+                    override fun onChanged(data: T) {
+                        if (predicate(data)) {
+                            removeObserver(this)
+                            continuation.resume(data)
+                        }
+                    }
+                }
+                observeForever(observer)
+                continuation.invokeOnCancellation { removeObserver(observer) }
+            }
+        }
+    }
+}
+
+suspend fun <T> waitFor(continueWhen: suspend () -> T, action: suspend () -> Unit) {
+    coroutineScope {
+        val deferred = async { continueWhen() }
+        action()
+        deferred.await()
+    }
+}
+
+suspend fun <T> wrapWithTimeout(timeout: Long = TestConstants.timeOutMillis, block: suspend () -> T): T {
+    val deferred = coroutineScope {
+        async { block() }
+    }
+    return withTimeout(timeout) { deferred.await() }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
index af2d57f9ce..a74f5010c2 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
@@ -16,7 +16,7 @@
 
 package org.matrix.android.sdk.common
 
-import org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider
+import org.matrix.android.sdk.api.provider.RoomDisplayNameFallbackProvider
 
 class TestRoomDisplayNameFallbackProvider : RoomDisplayNameFallbackProvider {
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
index ba1afd4758..48cfbebe5b 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
@@ -21,6 +21,7 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore
 import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule
 import org.matrix.android.sdk.internal.crypto.store.db.mapper.CrossSigningKeysMapper
+import org.matrix.android.sdk.internal.crypto.store.db.mapper.MyDeviceLastSeenInfoEntityMapper
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.util.time.DefaultClock
 import kotlin.random.Random
@@ -37,6 +38,7 @@ internal class CryptoStoreHelper {
                 userId = "userId_" + Random.nextInt(),
                 deviceId = "deviceId_sample",
                 clock = DefaultClock(),
+                myDeviceLastSeenInfoEntityMapper = MyDeviceLastSeenInfoEntityMapper()
         )
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/DecryptRedactedEventTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/DecryptRedactedEventTest.kt
index a48b45a1f5..4e1efbb700 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/DecryptRedactedEventTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/DecryptRedactedEventTest.kt
@@ -46,30 +46,26 @@ class DecryptRedactedEventTest : InstrumentedTest {
         roomALicePOV.sendService().redactEvent(timelineEvent.root, redactionReason)
 
         // get the event from bob
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                bobSession.getRoom(e2eRoomID)?.getTimelineEvent(timelineEvent.eventId)?.root?.isRedacted() == true
-            }
+        testHelper.retryPeriodically {
+            bobSession.getRoom(e2eRoomID)?.getTimelineEvent(timelineEvent.eventId)?.root?.isRedacted() == true
         }
 
         val eventBobPov = bobSession.getRoom(e2eRoomID)?.getTimelineEvent(timelineEvent.eventId)!!
 
-        testHelper.runBlockingTest {
-            try {
-                val result = bobSession.cryptoService().decryptEvent(eventBobPov.root, "")
-                Assert.assertEquals(
-                        "Unexpected redacted reason",
-                        redactionReason,
-                        result.clearEvent.toModel<Event>()?.unsignedData?.redactedEvent?.content?.get("reason")
-                )
-                Assert.assertEquals(
-                        "Unexpected Redacted event id",
-                        timelineEvent.eventId,
-                        result.clearEvent.toModel<Event>()?.unsignedData?.redactedEvent?.redacts
-                )
-            } catch (failure: Throwable) {
-                Assert.fail("Should not throw when decrypting a redacted event")
-            }
+        try {
+            val result = bobSession.cryptoService().decryptEvent(eventBobPov.root, "")
+            Assert.assertEquals(
+                    "Unexpected redacted reason",
+                    redactionReason,
+                    result.clearEvent.toModel<Event>()?.unsignedData?.redactedEvent?.content?.get("reason")
+            )
+            Assert.assertEquals(
+                    "Unexpected Redacted event id",
+                    timelineEvent.eventId,
+                    result.clearEvent.toModel<Event>()?.unsignedData?.redactedEvent?.redacts
+            )
+        } catch (failure: Throwable) {
+            Assert.fail("Should not throw when decrypting a redacted event")
         }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2EShareKeysConfigTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2EShareKeysConfigTest.kt
index 32d63a1934..cbbc4dc74e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2EShareKeysConfigTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2EShareKeysConfigTest.kt
@@ -40,7 +40,6 @@ import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.CryptoTestData
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
-import org.matrix.android.sdk.common.TestMatrixCallback
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -57,18 +56,14 @@ class E2EShareKeysConfigTest : InstrumentedTest {
     fun ensureKeysAreNotSharedIfOptionDisabled() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val aliceSession = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = true))
         aliceSession.cryptoService().enableShareKeyOnInvite(false)
-        val roomId = commonTestHelper.runBlockingTest {
-            aliceSession.roomService().createRoom(CreateRoomParams().apply {
-                historyVisibility = RoomHistoryVisibility.SHARED
-                name = "MyRoom"
-                enableEncryption()
-            })
-        }
+        val roomId = aliceSession.roomService().createRoom(CreateRoomParams().apply {
+            historyVisibility = RoomHistoryVisibility.SHARED
+            name = "MyRoom"
+            enableEncryption()
+        })
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                aliceSession.roomService().getRoomSummary(roomId)?.isEncrypted == true
-            }
+        commonTestHelper.retryPeriodically {
+            aliceSession.roomService().getRoomSummary(roomId)?.isEncrypted == true
         }
         val roomAlice = aliceSession.roomService().getRoom(roomId)!!
 
@@ -81,9 +76,7 @@ class E2EShareKeysConfigTest : InstrumentedTest {
         val bobSession = commonTestHelper.createAccount(TestConstants.USER_BOB, SessionTestParams(withInitialSync = true))
 
         // Let alice invite bob
-        commonTestHelper.runBlockingTest {
-            roomAlice.membershipService().invite(bobSession.myUserId)
-        }
+        roomAlice.membershipService().invite(bobSession.myUserId)
 
         commonTestHelper.waitForAndAcceptInviteInRoom(bobSession, roomId)
 
@@ -114,9 +107,7 @@ class E2EShareKeysConfigTest : InstrumentedTest {
         val samSession = commonTestHelper.createAccount(TestConstants.USER_SAM, SessionTestParams(withInitialSync = true))
 
         // Let alice invite sam
-        commonTestHelper.runBlockingTest {
-            roomAlice.membershipService().invite(samSession.myUserId)
-        }
+        roomAlice.membershipService().invite(samSession.myUserId)
 
         commonTestHelper.waitForAndAcceptInviteInRoom(samSession, roomId)
 
@@ -135,7 +126,7 @@ class E2EShareKeysConfigTest : InstrumentedTest {
     }
 
     @Test
-    fun ifSharingDisabledOnAliceSideBobShouldNotShareAliceHistoty() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
+    fun ifSharingDisabledOnAliceSideBobShouldNotShareAliceHistory() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(roomHistoryVisibility = RoomHistoryVisibility.SHARED)
         val aliceSession = testData.firstSession.also {
             it.cryptoService().enableShareKeyOnInvite(false)
@@ -162,7 +153,7 @@ class E2EShareKeysConfigTest : InstrumentedTest {
     }
 
     @Test
-    fun ifSharingEnabledOnAliceSideBobShouldShareAliceHistoty() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
+    fun ifSharingEnabledOnAliceSideBobShouldShareAliceHistory() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(roomHistoryVisibility = RoomHistoryVisibility.SHARED)
         val aliceSession = testData.firstSession.also {
             it.cryptoService().enableShareKeyOnInvite(true)
@@ -186,7 +177,7 @@ class E2EShareKeysConfigTest : InstrumentedTest {
                 fromBobSharable.map { it.root.getClearContent()?.get("body") as String })
     }
 
-    private fun commonAliceAndBobSendMessages(commonTestHelper: CommonTestHelper, aliceSession: Session, testData: CryptoTestData, bobSession: Session): Triple<List<TimelineEvent>, List<TimelineEvent>, Session> {
+    private suspend fun commonAliceAndBobSendMessages(commonTestHelper: CommonTestHelper, aliceSession: Session, testData: CryptoTestData, bobSession: Session): Triple<List<TimelineEvent>, List<TimelineEvent>, Session> {
         val fromAliceNotSharable = commonTestHelper.sendTextMessage(aliceSession.getRoom(testData.roomId)!!, "Hello from alice", 1)
         val fromBobSharable = commonTestHelper.sendTextMessage(bobSession.getRoom(testData.roomId)!!, "Hello from bob", 1)
 
@@ -195,9 +186,7 @@ class E2EShareKeysConfigTest : InstrumentedTest {
         val samSession = commonTestHelper.createAccount(TestConstants.USER_SAM, SessionTestParams(withInitialSync = true))
 
         // Let bob invite sam
-        commonTestHelper.runBlockingTest {
-            bobSession.getRoom(testData.roomId)!!.membershipService().invite(samSession.myUserId)
-        }
+        bobSession.getRoom(testData.roomId)!!.membershipService().invite(samSession.myUserId)
 
         commonTestHelper.waitForAndAcceptInviteInRoom(samSession, testData.roomId)
         return Triple(fromAliceNotSharable, fromBobSharable, samSession)
@@ -209,18 +198,14 @@ class E2EShareKeysConfigTest : InstrumentedTest {
     fun testBackupFlagIsCorrect() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val aliceSession = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = true))
         aliceSession.cryptoService().enableShareKeyOnInvite(false)
-        val roomId = commonTestHelper.runBlockingTest {
-            aliceSession.roomService().createRoom(CreateRoomParams().apply {
-                historyVisibility = RoomHistoryVisibility.SHARED
-                name = "MyRoom"
-                enableEncryption()
-            })
-        }
+        val roomId = aliceSession.roomService().createRoom(CreateRoomParams().apply {
+            historyVisibility = RoomHistoryVisibility.SHARED
+            name = "MyRoom"
+            enableEncryption()
+        })
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                aliceSession.roomService().getRoomSummary(roomId)?.isEncrypted == true
-            }
+        commonTestHelper.retryPeriodically {
+            aliceSession.roomService().getRoomSummary(roomId)?.isEncrypted == true
         }
         val roomAlice = aliceSession.roomService().getRoom(roomId)!!
 
@@ -232,18 +217,15 @@ class E2EShareKeysConfigTest : InstrumentedTest {
         Log.v("#E2E TEST", "Create and start key backup for bob ...")
         val keysBackupService = aliceSession.cryptoService().keysBackupService()
         val keyBackupPassword = "FooBarBaz"
-        val megolmBackupCreationInfo = commonTestHelper.doSync<MegolmBackupCreationInfo> {
+        val megolmBackupCreationInfo = commonTestHelper.waitForCallback<MegolmBackupCreationInfo> {
             keysBackupService.prepareKeysBackupVersion(keyBackupPassword, null, it)
         }
-        val version = commonTestHelper.doSync<KeysVersion> {
+        val version = commonTestHelper.waitForCallback<KeysVersion> {
             keysBackupService.createKeysBackupVersion(megolmBackupCreationInfo, it)
         }
 
-        commonTestHelper.waitWithLatch { latch ->
-            keysBackupService.backupAllGroupSessions(
-                    null,
-                    TestMatrixCallback(latch, true)
-            )
+        commonTestHelper.waitForCallback<Unit> {
+            keysBackupService.backupAllGroupSessions(null, it)
         }
 
         // signout
@@ -253,11 +235,11 @@ class E2EShareKeysConfigTest : InstrumentedTest {
         newAliceSession.cryptoService().enableShareKeyOnInvite(true)
 
         newAliceSession.cryptoService().keysBackupService().let { kbs ->
-            val keyVersionResult = commonTestHelper.doSync<KeysVersionResult?> {
+            val keyVersionResult = commonTestHelper.waitForCallback<KeysVersionResult?> {
                 kbs.getVersion(version.version, it)
             }
 
-            val importedResult = commonTestHelper.doSync<ImportRoomKeysResult> {
+            val importedResult = commonTestHelper.waitForCallback<ImportRoomKeysResult> {
                 kbs.restoreKeyBackupWithPassword(
                         keyVersionResult!!,
                         keyBackupPassword,
@@ -276,9 +258,7 @@ class E2EShareKeysConfigTest : InstrumentedTest {
         val samSession = commonTestHelper.createAccount(TestConstants.USER_SAM, SessionTestParams(withInitialSync = true))
 
         // Let alice invite sam
-        commonTestHelper.runBlockingTest {
-            newAliceSession.getRoom(roomId)!!.membershipService().invite(samSession.myUserId)
-        }
+        newAliceSession.getRoom(roomId)!!.membershipService().invite(samSession.myUserId)
 
         commonTestHelper.waitForAndAcceptInviteInRoom(samSession, roomId)
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt
new file mode 100644
index 0000000000..8b12092b79
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.crypto
+
+import androidx.test.filters.LargeTest
+import org.amshove.kluent.shouldBe
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+@LargeTest
+class E2eeConfigTest : InstrumentedTest {
+
+    @Test
+    fun testBlacklistUnverifiedDefault() = runCryptoTest(context()) { cryptoTestHelper, _ ->
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+        cryptoTestData.firstSession.cryptoService().getGlobalBlacklistUnverifiedDevices() shouldBe false
+        cryptoTestData.firstSession.cryptoService().isRoomBlacklistUnverifiedDevices(cryptoTestData.roomId) shouldBe false
+        cryptoTestData.secondSession!!.cryptoService().getGlobalBlacklistUnverifiedDevices() shouldBe false
+        cryptoTestData.secondSession!!.cryptoService().isRoomBlacklistUnverifiedDevices(cryptoTestData.roomId) shouldBe false
+    }
+
+    @Test
+    fun testCantDecryptIfGlobalUnverified() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+        cryptoTestData.firstSession.cryptoService().setGlobalBlacklistUnverifiedDevices(true)
+
+        val roomAlicePOV = cryptoTestData.firstSession.roomService().getRoom(cryptoTestData.roomId)!!
+
+        val sentMessage = testHelper.sendTextMessage(roomAlicePOV, "you are blocked", 1).first()
+
+        val roomBobPOV = cryptoTestData.secondSession!!.roomService().getRoom(cryptoTestData.roomId)!!
+        // ensure other received
+        testHelper.retryPeriodically {
+            roomBobPOV.timelineService().getTimelineEvent(sentMessage.eventId) != null
+        }
+
+        cryptoTestHelper.ensureCannotDecrypt(listOf(sentMessage.eventId), cryptoTestData.secondSession!!, cryptoTestData.roomId)
+    }
+
+    @Test
+    fun testCanDecryptIfGlobalUnverifiedAndUserTrusted() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+        cryptoTestHelper.initializeCrossSigning(cryptoTestData.firstSession)
+        cryptoTestHelper.initializeCrossSigning(cryptoTestData.secondSession!!)
+
+        cryptoTestHelper.verifySASCrossSign(cryptoTestData.firstSession, cryptoTestData.secondSession!!, cryptoTestData.roomId)
+
+        cryptoTestData.firstSession.cryptoService().setGlobalBlacklistUnverifiedDevices(true)
+
+        val roomAlicePOV = cryptoTestData.firstSession.roomService().getRoom(cryptoTestData.roomId)!!
+
+        val sentMessage = testHelper.sendTextMessage(roomAlicePOV, "you can read", 1).first()
+
+        val roomBobPOV = cryptoTestData.secondSession!!.roomService().getRoom(cryptoTestData.roomId)!!
+        // ensure other received
+        testHelper.retryPeriodically {
+            roomBobPOV.timelineService().getTimelineEvent(sentMessage.eventId) != null
+        }
+
+        cryptoTestHelper.ensureCanDecrypt(
+                listOf(sentMessage.eventId),
+                cryptoTestData.secondSession!!,
+                cryptoTestData.roomId,
+                listOf(sentMessage.getLastMessageContent()!!.body)
+        )
+    }
+
+    @Test
+    fun testCantDecryptIfPerRoomUnverified() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+        val roomAlicePOV = cryptoTestData.firstSession.roomService().getRoom(cryptoTestData.roomId)!!
+
+        val beforeMessage = testHelper.sendTextMessage(roomAlicePOV, "you can read", 1).first()
+
+        val roomBobPOV = cryptoTestData.secondSession!!.roomService().getRoom(cryptoTestData.roomId)!!
+        // ensure other received
+        testHelper.retryPeriodically {
+            roomBobPOV.timelineService().getTimelineEvent(beforeMessage.eventId) != null
+        }
+
+        cryptoTestHelper.ensureCanDecrypt(
+                listOf(beforeMessage.eventId),
+                cryptoTestData.secondSession!!,
+                cryptoTestData.roomId,
+                listOf(beforeMessage.getLastMessageContent()!!.body)
+        )
+
+        cryptoTestData.firstSession.cryptoService().setRoomBlockUnverifiedDevices(cryptoTestData.roomId, true)
+
+        val afterMessage = testHelper.sendTextMessage(roomAlicePOV, "you are blocked", 1).first()
+
+        // ensure received
+        testHelper.retryPeriodically {
+            cryptoTestData.secondSession?.getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(afterMessage.eventId)?.root != null
+        }
+
+        cryptoTestHelper.ensureCannotDecrypt(
+                listOf(afterMessage.eventId),
+                cryptoTestData.secondSession!!,
+                cryptoTestData.roomId,
+                MXCryptoError.ErrorType.KEYS_WITHHELD
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index 251c13ccbf..a36ba8ac02 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -18,20 +18,28 @@ package org.matrix.android.sdk.internal.crypto
 
 import android.util.Log
 import androidx.test.filters.LargeTest
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.suspendCancellableCoroutine
 import org.amshove.kluent.fail
 import org.amshove.kluent.internal.assertEquals
 import org.junit.Assert
 import org.junit.FixMethodOrder
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.auth.UIABaseAuth
+import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
+import org.matrix.android.sdk.api.auth.UserPasswordAuth
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
-import org.matrix.android.sdk.api.session.crypto.RequestResult
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysVersion
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysVersionResult
 import org.matrix.android.sdk.api.session.crypto.keysbackup.MegolmBackupCreationInfo
@@ -45,7 +53,6 @@ import org.matrix.android.sdk.api.session.crypto.verification.VerificationServic
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
-import org.matrix.android.sdk.api.session.events.model.content.WithHeldCode
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
@@ -57,12 +64,12 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
-import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
-import org.matrix.android.sdk.common.TestMatrixCallback
 import org.matrix.android.sdk.mustFail
-import java.util.concurrent.CountDownLatch
+import timber.log.Timber
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
 
 // @Ignore("This test fails with an unhandled exception thrown from a coroutine which terminates the entire test run.")
 @RunWith(JUnit4::class)
@@ -70,8 +77,6 @@ import java.util.concurrent.CountDownLatch
 @LargeTest
 class E2eeSanityTests : InstrumentedTest {
 
-    @get:Rule val rule = RetryTestRule(3)
-
     /**
      * Simple test that create an e2ee room.
      * Some new members are added, and a message is sent.
@@ -104,10 +109,8 @@ class E2eeSanityTests : InstrumentedTest {
         Log.v("#E2E TEST", "All accounts created")
         // we want to invite them in the room
         otherAccounts.forEach {
-            testHelper.runBlockingTest {
-                Log.v("#E2E TEST", "Alice invites ${it.myUserId}")
-                aliceRoomPOV.membershipService().invite(it.myUserId)
-            }
+            Log.v("#E2E TEST", "Alice invites ${it.myUserId}")
+            aliceRoomPOV.membershipService().invite(it.myUserId)
         }
 
         // All user should accept invite
@@ -129,13 +132,12 @@ class E2eeSanityTests : InstrumentedTest {
 
         // All should be able to decrypt
         otherAccounts.forEach { otherSession ->
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = otherSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId!!)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
-                }
+            testHelper.retryPeriodically {
+                val timeLineEvent = otherSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId!!)
+                timeLineEvent != null &&
+                        timeLineEvent.isEncrypted() &&
+                        timeLineEvent.root.getClearType() == EventType.MESSAGE &&
+                        timeLineEvent.root.mxDecryptionResult?.isSafe == true
             }
         }
 
@@ -146,10 +148,8 @@ class E2eeSanityTests : InstrumentedTest {
                 }
 
         newAccount.forEach {
-            testHelper.runBlockingTest {
-                Log.v("#E2E TEST", "Alice invites ${it.myUserId}")
-                aliceRoomPOV.membershipService().invite(it.myUserId)
-            }
+            Log.v("#E2E TEST", "Alice invites ${it.myUserId}")
+            aliceRoomPOV.membershipService().invite(it.myUserId)
         }
 
         newAccount.forEach {
@@ -159,21 +159,17 @@ class E2eeSanityTests : InstrumentedTest {
         ensureMembersHaveJoined(testHelper, aliceSession, newAccount, e2eRoomID)
 
         // wait a bit
-        testHelper.runBlockingTest {
-            delay(3_000)
-        }
+        delay(3_000)
 
         // check that messages are encrypted (uisi)
         newAccount.forEach { otherSession ->
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timelineEvent = otherSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId!!).also {
-                        Log.v("#E2E TEST", "Event seen by new user ${it?.root?.getClearType()}|${it?.root?.mCryptoError}")
-                    }
-                    timelineEvent != null &&
-                            timelineEvent.root.getClearType() == EventType.ENCRYPTED &&
-                            timelineEvent.root.mCryptoError == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID
+            testHelper.retryPeriodically {
+                val timelineEvent = otherSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId!!).also {
+                    Log.v("#E2E TEST", "Event seen by new user ${it?.root?.getClearType()}|${it?.root?.mCryptoError}")
                 }
+                timelineEvent != null &&
+                        timelineEvent.root.getClearType() == EventType.ENCRYPTED &&
+                        timelineEvent.root.mCryptoError == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID
             }
         }
 
@@ -185,15 +181,13 @@ class E2eeSanityTests : InstrumentedTest {
 
         // new members should be able to decrypt it
         newAccount.forEach { otherSession ->
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timelineEvent = otherSession.getRoom(e2eRoomID)?.getTimelineEvent(secondSentEventId!!).also {
-                        Log.v("#E2E TEST", "Second Event seen by new user ${it?.root?.getClearType()}|${it?.root?.mCryptoError}")
-                    }
-                    timelineEvent != null &&
-                            timelineEvent.root.getClearType() == EventType.MESSAGE &&
-                            secondMessage == timelineEvent.root.getClearContent().toModel<MessageContent>()?.body
+            testHelper.retryPeriodically {
+                val timelineEvent = otherSession.getRoom(e2eRoomID)?.getTimelineEvent(secondSentEventId!!).also {
+                    Log.v("#E2E TEST", "Second Event seen by new user ${it?.root?.getClearType()}|${it?.root?.mCryptoError}")
                 }
+                timelineEvent != null &&
+                        timelineEvent.root.getClearType() == EventType.MESSAGE &&
+                        secondMessage == timelineEvent.root.getClearContent().toModel<MessageContent>()?.body
             }
         }
     }
@@ -229,10 +223,10 @@ class E2eeSanityTests : InstrumentedTest {
         Log.v("#E2E TEST", "Create and start key backup for bob ...")
         val bobKeysBackupService = bobSession.cryptoService().keysBackupService()
         val keyBackupPassword = "FooBarBaz"
-        val megolmBackupCreationInfo = testHelper.doSync<MegolmBackupCreationInfo> {
+        val megolmBackupCreationInfo = testHelper.waitForCallback<MegolmBackupCreationInfo> {
             bobKeysBackupService.prepareKeysBackupVersion(keyBackupPassword, null, it)
         }
-        val version = testHelper.doSync<KeysVersion> {
+        val version = testHelper.waitForCallback<KeysVersion> {
             bobKeysBackupService.createKeysBackupVersion(megolmBackupCreationInfo, it)
         }
         Log.v("#E2E TEST", "... Key backup started and enabled for bob")
@@ -248,32 +242,21 @@ class E2eeSanityTests : InstrumentedTest {
                 sentEventIds.add(it)
             }
 
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = bobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
-                }
+            testHelper.retryPeriodically {
+                val timeLineEvent = bobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)
+                timeLineEvent != null &&
+                        timeLineEvent.isEncrypted() &&
+                        timeLineEvent.root.getClearType() == EventType.MESSAGE
             }
             // we want more so let's discard the session
             aliceSession.cryptoService().discardOutboundSession(e2eRoomID)
-
-            testHelper.runBlockingTest {
-                delay(1_000)
-            }
         }
         Log.v("#E2E TEST", "Bob received all and can decrypt")
 
         // Let's wait a bit to be sure that bob has backed up the session
 
         Log.v("#E2E TEST", "Force key backup for Bob...")
-        testHelper.waitWithLatch { latch ->
-            bobKeysBackupService.backupAllGroupSessions(
-                    null,
-                    TestMatrixCallback(latch, true)
-            )
-        }
+        testHelper.waitForCallback<Unit> { bobKeysBackupService.backupAllGroupSessions(null, it) }
         Log.v("#E2E TEST", "... Key backup done for Bob")
 
         // Now lets logout both alice and bob to ensure that we won't have any gossiping
@@ -284,9 +267,7 @@ class E2eeSanityTests : InstrumentedTest {
         testHelper.signOutAndClose(bobSession)
         Log.v("#E2E TEST", "..Logout alice and bob...")
 
-        testHelper.runBlockingTest {
-            delay(1_000)
-        }
+        delay(1_000)
 
         // Create a new session for bob
         Log.v("#E2E TEST", "Create a new session for Bob")
@@ -295,14 +276,11 @@ class E2eeSanityTests : InstrumentedTest {
         // check that bob can't currently decrypt
         Log.v("#E2E TEST", "check that bob can't currently decrypt")
         sentEventIds.forEach { sentEventId ->
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timelineEvent = newBobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)?.also {
-                        Log.v("#E2E TEST", "Event seen by new user ${it.root.getClearType()}|${it.root.mCryptoError}")
-                    }
-                    timelineEvent != null &&
-                            timelineEvent.root.getClearType() == EventType.ENCRYPTED
+            testHelper.retryPeriodically {
+                val timelineEvent = newBobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)?.also {
+                    Log.v("#E2E TEST", "Event seen by new user ${it.root.getClearType()}|${it.root.mCryptoError}")
                 }
+                timelineEvent != null && timelineEvent.root.getClearType() == EventType.ENCRYPTED
             }
         }
         // after initial sync events are not decrypted, so we have to try manually
@@ -311,11 +289,11 @@ class E2eeSanityTests : InstrumentedTest {
         // Let's now import keys from backup
 
         newBobSession.cryptoService().keysBackupService().let { kbs ->
-            val keyVersionResult = testHelper.doSync<KeysVersionResult?> {
+            val keyVersionResult = testHelper.waitForCallback<KeysVersionResult?> {
                 kbs.getVersion(version.version, it)
             }
 
-            val importedResult = testHelper.doSync<ImportRoomKeysResult> {
+            val importedResult = testHelper.waitForCallback<ImportRoomKeysResult> {
                 kbs.restoreKeyBackupWithPassword(
                         keyVersionResult!!,
                         keyBackupPassword,
@@ -331,6 +309,13 @@ class E2eeSanityTests : InstrumentedTest {
 
         // ensure bob can now decrypt
         cryptoTestHelper.ensureCanDecrypt(sentEventIds, newBobSession, e2eRoomID, messagesText)
+
+        // Check key trust
+        sentEventIds.forEach { sentEventId ->
+            val timelineEvent = newBobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)!!
+            val result = newBobSession.cryptoService().decryptEvent(timelineEvent.root, "")
+            assertEquals("Keys from history should be deniable", false, result.isSafe)
+        }
     }
 
     /**
@@ -357,13 +342,11 @@ class E2eeSanityTests : InstrumentedTest {
                 sentEventIds.add(it)
             }
 
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = bobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
-                }
+            testHelper.retryPeriodically {
+                val timeLineEvent = bobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)
+                timeLineEvent != null &&
+                        timeLineEvent.isEncrypted() &&
+                        timeLineEvent.root.getClearType() == EventType.MESSAGE
             }
         }
 
@@ -379,10 +362,6 @@ class E2eeSanityTests : InstrumentedTest {
         Log.v("#E2E TEST", "check that new bob can't currently decrypt")
 
         cryptoTestHelper.ensureCannotDecrypt(sentEventIds, newBobSession, e2eRoomID, null)
-//        newBobSession.cryptoService().getOutgoingRoomKeyRequests()
-//                .firstOrNull {
-//                    it.sessionId ==
-//                }
 
         // Try to request
         sentEventIds.forEach { sentEventId ->
@@ -390,33 +369,27 @@ class E2eeSanityTests : InstrumentedTest {
             newBobSession.cryptoService().requestRoomKeyForEvent(event)
         }
 
-        // wait a bit
-        // we need to wait a couple of syncs to let sharing occurs
-//        testHelper.waitFewSyncs(newBobSession, 6)
-
         // Ensure that new bob still can't decrypt (keys must have been withheld)
-        sentEventIds.forEach { sentEventId ->
-            val megolmSessionId = newBobSession.getRoom(e2eRoomID)!!
-                    .getTimelineEvent(sentEventId)!!
-                    .root.content.toModel<EncryptedEventContent>()!!.sessionId
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val aliceReply = newBobSession.cryptoService().getOutgoingRoomKeyRequests()
-                            .first {
-                                it.sessionId == megolmSessionId &&
-                                        it.roomId == e2eRoomID
-                            }
-                            .results.also {
-                                Log.w("##TEST", "result list is $it")
-                            }
-                            .firstOrNull { it.userId == aliceSession.myUserId }
-                            ?.result
-                    aliceReply != null &&
-                            aliceReply is RequestResult.Failure &&
-                            WithHeldCode.UNAUTHORISED == aliceReply.code
-                }
-            }
-        }
+//        sentEventIds.forEach { sentEventId ->
+//            val megolmSessionId = newBobSession.getRoom(e2eRoomID)!!
+//                    .getTimelineEvent(sentEventId)!!
+//                    .root.content.toModel<EncryptedEventContent>()!!.sessionId
+//            testHelper.retryPeriodically {
+//                val aliceReply = newBobSession.cryptoService().getOutgoingRoomKeyRequests()
+//                        .first {
+//                            it.sessionId == megolmSessionId &&
+//                                    it.roomId == e2eRoomID
+//                        }
+//                        .results.also {
+//                            Log.w("##TEST", "result list is $it")
+//                        }
+//                        .firstOrNull { it.userId == aliceSession.myUserId }
+//                        ?.result
+//                aliceReply != null &&
+//                        aliceReply is RequestResult.Failure &&
+//                        WithHeldCode.UNAUTHORISED == aliceReply.code
+//            }
+//        }
 
         cryptoTestHelper.ensureCannotDecrypt(sentEventIds, newBobSession, e2eRoomID, null)
 
@@ -438,7 +411,10 @@ class E2eeSanityTests : InstrumentedTest {
      * Test that if a better key is forwarded (lower index, it is then used)
      */
     @Test
-    fun testForwardBetterKey() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+    fun testForwardBetterKey() = runCryptoTest(
+            context(),
+            cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false)
+    ) { cryptoTestHelper, testHelper ->
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = cryptoTestData.firstSession
@@ -455,13 +431,11 @@ class E2eeSanityTests : InstrumentedTest {
         firstMessage.let { text ->
             firstEventId = sendMessageInRoom(testHelper, aliceRoomPOV, text)!!
 
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = bobSessionWithBetterKey.getRoom(e2eRoomID)?.getTimelineEvent(firstEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
-                }
+            testHelper.retryPeriodically {
+                val timeLineEvent = bobSessionWithBetterKey.getRoom(e2eRoomID)?.getTimelineEvent(firstEventId)
+                timeLineEvent != null &&
+                        timeLineEvent.isEncrypted() &&
+                        timeLineEvent.root.getClearType() == EventType.MESSAGE
             }
         }
 
@@ -483,13 +457,11 @@ class E2eeSanityTests : InstrumentedTest {
         secondMessage.let { text ->
             secondEventId = sendMessageInRoom(testHelper, aliceRoomPOV, text)!!
 
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = newBobSession.getRoom(e2eRoomID)?.getTimelineEvent(secondEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
-                }
+            testHelper.retryPeriodically {
+                val timeLineEvent = newBobSession.getRoom(e2eRoomID)?.getTimelineEvent(secondEventId)
+                timeLineEvent != null &&
+                        timeLineEvent.isEncrypted() &&
+                        timeLineEvent.root.getClearType() == EventType.MESSAGE
             }
         }
 
@@ -503,18 +475,14 @@ class E2eeSanityTests : InstrumentedTest {
         Assert.assertTrue("Should be the same session id", firstSessionId == secondSessionId)
 
         // Confirm we can decrypt one but not the other
-        testHelper.runBlockingTest {
-            mustFail(message = "Should not be able to decrypt event") {
-                newBobSession.cryptoService().decryptEvent(firstEventNewBobPov.root, "")
-            }
+        mustFail(message = "Should not be able to decrypt event") {
+            newBobSession.cryptoService().decryptEvent(firstEventNewBobPov.root, "")
         }
 
-        testHelper.runBlockingTest {
-            try {
-                newBobSession.cryptoService().decryptEvent(secondEventNewBobPov.root, "")
-            } catch (error: MXCryptoError) {
-                fail("Should be able to decrypt event")
-            }
+        try {
+            newBobSession.cryptoService().decryptEvent(secondEventNewBobPov.root, "")
+        } catch (error: MXCryptoError) {
+            fail("Should be able to decrypt event")
         }
 
         // Now let's verify bobs session, and re-request keys
@@ -533,50 +501,42 @@ class E2eeSanityTests : InstrumentedTest {
 
         // old session should have shared the key at earliest known index now
         // we should be able to decrypt both
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                val canDecryptFirst = try {
-                    testHelper.runBlockingTest {
-                        newBobSession.cryptoService().decryptEvent(firstEventNewBobPov.root, "")
-                    }
-                    true
-                } catch (error: MXCryptoError) {
-                    false
-                }
-                val canDecryptSecond = try {
-                    testHelper.runBlockingTest {
-                        newBobSession.cryptoService().decryptEvent(secondEventNewBobPov.root, "")
-                    }
-                    true
-                } catch (error: MXCryptoError) {
-                    false
-                }
-                canDecryptFirst && canDecryptSecond
+        testHelper.retryPeriodically {
+            val canDecryptFirst = try {
+                newBobSession.cryptoService().decryptEvent(firstEventNewBobPov.root, "")
+                true
+            } catch (error: MXCryptoError) {
+                false
             }
+            val canDecryptSecond = try {
+                newBobSession.cryptoService().decryptEvent(secondEventNewBobPov.root, "")
+                true
+            } catch (error: MXCryptoError) {
+                false
+            }
+            canDecryptFirst && canDecryptSecond
         }
     }
 
-    private fun sendMessageInRoom(testHelper: CommonTestHelper, aliceRoomPOV: Room, text: String): String? {
-        aliceRoomPOV.sendService().sendTextMessage(text)
+    private suspend fun sendMessageInRoom(testHelper: CommonTestHelper, aliceRoomPOV: Room, text: String): String? {
         var sentEventId: String? = null
-        testHelper.waitWithLatch(4 * TestConstants.timeOutMillis) { latch ->
-            val timeline = aliceRoomPOV.timelineService().createTimeline(null, TimelineSettings(60))
-            timeline.start()
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val decryptedMsg = timeline.getSnapshot()
-                        .filter { it.root.getClearType() == EventType.MESSAGE }
-                        .also { list ->
-                            val message = list.joinToString(",", "[", "]") { "${it.root.type}|${it.root.sendState}" }
-                            Log.v("#E2E TEST", "Timeline snapshot is $message")
-                        }
-                        .filter { it.root.sendState == SendState.SYNCED }
-                        .firstOrNull { it.root.getClearContent().toModel<MessageContent>()?.body?.startsWith(text) == true }
-                sentEventId = decryptedMsg?.eventId
-                decryptedMsg != null
-            }
+        aliceRoomPOV.sendService().sendTextMessage(text)
 
-            timeline.dispose()
+        val timeline = aliceRoomPOV.timelineService().createTimeline(null, TimelineSettings(60))
+        timeline.start()
+        testHelper.retryPeriodically {
+            val decryptedMsg = timeline.getSnapshot()
+                    .filter { it.root.getClearType() == EventType.MESSAGE }
+                    .also { list ->
+                        val message = list.joinToString(",", "[", "]") { "${it.root.type}|${it.root.sendState}" }
+                        Log.v("#E2E TEST", "Timeline snapshot is $message")
+                    }
+                    .filter { it.root.sendState == SendState.SYNCED }
+                    .firstOrNull { it.root.getClearContent().toModel<MessageContent>()?.body?.startsWith(text) == true }
+            sentEventId = decryptedMsg?.eventId
+            decryptedMsg != null
         }
+        timeline.dispose()
         return sentEventId
     }
 
@@ -593,106 +553,35 @@ class E2eeSanityTests : InstrumentedTest {
 
         val aliceNewSession = testHelper.logIntoAccount(aliceSession.myUserId, SessionTestParams(true))
 
-        val oldCompleteLatch = CountDownLatch(1)
-        lateinit var oldCode: String
-        aliceSession.cryptoService().verificationService().addListener(object : VerificationService.Listener {
-
-            override fun verificationRequestUpdated(pr: PendingVerificationRequest) {
-                val readyInfo = pr.readyInfo
-                if (readyInfo != null) {
-                    aliceSession.cryptoService().verificationService().beginKeyVerification(
-                            VerificationMethod.SAS,
-                            aliceSession.myUserId,
-                            readyInfo.fromDevice,
-                            readyInfo.transactionId
-
-                    )
-                }
-            }
-
-            override fun transactionUpdated(tx: VerificationTransaction) {
-                Log.d("##TEST", "exitsingPov: $tx")
-                val sasTx = tx as OutgoingSasVerificationTransaction
-                when (sasTx.uxState) {
-                    OutgoingSasVerificationTransaction.UxState.SHOW_SAS -> {
-                        // for the test we just accept?
-                        oldCode = sasTx.getDecimalCodeRepresentation()
-                        sasTx.userHasVerifiedShortCode()
-                    }
-                    OutgoingSasVerificationTransaction.UxState.VERIFIED -> {
-                        // we can release this latch?
-                        oldCompleteLatch.countDown()
-                    }
-                    else -> Unit
-                }
-            }
-        })
-
-        val newCompleteLatch = CountDownLatch(1)
-        lateinit var newCode: String
-        aliceNewSession.cryptoService().verificationService().addListener(object : VerificationService.Listener {
-
-            override fun verificationRequestCreated(pr: PendingVerificationRequest) {
-                // let's ready
-                aliceNewSession.cryptoService().verificationService().readyPendingVerification(
-                        listOf(VerificationMethod.SAS, VerificationMethod.QR_CODE_SCAN, VerificationMethod.QR_CODE_SHOW),
-                        aliceSession.myUserId,
-                        pr.transactionId!!
-                )
-            }
-
-            var matchOnce = true
-            override fun transactionUpdated(tx: VerificationTransaction) {
-                Log.d("##TEST", "newPov: $tx")
-
-                val sasTx = tx as IncomingSasVerificationTransaction
-                when (sasTx.uxState) {
-                    IncomingSasVerificationTransaction.UxState.SHOW_ACCEPT -> {
-                        // no need to accept as there was a request first it will auto accept
-                    }
-                    IncomingSasVerificationTransaction.UxState.SHOW_SAS -> {
-                        if (matchOnce) {
-                            sasTx.userHasVerifiedShortCode()
-                            newCode = sasTx.getDecimalCodeRepresentation()
-                            matchOnce = false
-                        }
-                    }
-                    IncomingSasVerificationTransaction.UxState.VERIFIED -> {
-                        newCompleteLatch.countDown()
-                    }
-                    else -> Unit
-                }
-            }
-        })
-
+        val deferredOldCode = aliceSession.cryptoService().verificationService().readOldVerificationCodeAsync(this, aliceSession.myUserId)
+        val deferredNewCode = aliceNewSession.cryptoService().verificationService().readNewVerificationCodeAsync(this, aliceSession.myUserId)
         // initiate self verification
         aliceSession.cryptoService().verificationService().requestKeyVerification(
                 listOf(VerificationMethod.SAS, VerificationMethod.QR_CODE_SCAN, VerificationMethod.QR_CODE_SHOW),
                 aliceNewSession.myUserId,
                 listOf(aliceNewSession.sessionParams.deviceId!!)
         )
-        testHelper.await(oldCompleteLatch)
-        testHelper.await(newCompleteLatch)
+
+        val (oldCode, newCode) = awaitAll(deferredOldCode, deferredNewCode)
+
         assertEquals("Decimal code should have matched", oldCode, newCode)
 
         // Assert that devices are verified
-        val newDeviceFromOldPov: CryptoDeviceInfo? = aliceSession.cryptoService().getDeviceInfo(aliceSession.myUserId, aliceNewSession.sessionParams.deviceId)
-        val oldDeviceFromNewPov: CryptoDeviceInfo? = aliceSession.cryptoService().getDeviceInfo(aliceSession.myUserId, aliceSession.sessionParams.deviceId)
+        val newDeviceFromOldPov: CryptoDeviceInfo? =
+                aliceSession.cryptoService().getCryptoDeviceInfo(aliceSession.myUserId, aliceNewSession.sessionParams.deviceId)
+        val oldDeviceFromNewPov: CryptoDeviceInfo? =
+                aliceSession.cryptoService().getCryptoDeviceInfo(aliceSession.myUserId, aliceSession.sessionParams.deviceId)
 
         Assert.assertTrue("new device should be verified from old point of view", newDeviceFromOldPov!!.isVerified)
         Assert.assertTrue("old device should be verified from new point of view", oldDeviceFromNewPov!!.isVerified)
 
         // wait for secret gossiping to happen
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                aliceNewSession.cryptoService().crossSigningService().allPrivateKeysKnown()
-            }
+        testHelper.retryPeriodically {
+            aliceNewSession.cryptoService().crossSigningService().allPrivateKeysKnown()
         }
 
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                aliceNewSession.cryptoService().keysBackupService().getKeyBackupRecoveryKeyInfo() != null
-            }
+        testHelper.retryPeriodically {
+            aliceNewSession.cryptoService().keysBackupService().getKeyBackupRecoveryKeyInfo() != null
         }
 
         assertEquals(
@@ -725,27 +614,191 @@ class E2eeSanityTests : InstrumentedTest {
         )
     }
 
-    private fun ensureMembersHaveJoined(testHelper: CommonTestHelper, aliceSession: Session, otherAccounts: List<Session>, e2eRoomID: String) {
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                otherAccounts.map {
-                    aliceSession.roomService().getRoomMember(it.myUserId, e2eRoomID)?.membership
-                }.all {
-                    it == Membership.JOIN
+    @Test
+    fun test_EncryptionDoesNotHinderVerification() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
+
+        val aliceSession = cryptoTestData.firstSession
+        val bobSession = cryptoTestData.secondSession
+
+        val aliceAuthParams = UserPasswordAuth(
+                user = aliceSession.myUserId,
+                password = TestConstants.PASSWORD
+        )
+        val bobAuthParams = UserPasswordAuth(
+                user = bobSession!!.myUserId,
+                password = TestConstants.PASSWORD
+        )
+
+        testHelper.waitForCallback {
+            aliceSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+                override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                    promise.resume(aliceAuthParams)
                 }
+            }, it)
+        }
+
+        testHelper.waitForCallback {
+            bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+                override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                    promise.resume(bobAuthParams)
+                }
+            }, it)
+        }
+
+        // add a second session for bob but not cross signed
+
+        val secondBobSession = testHelper.logIntoAccount(bobSession.myUserId, SessionTestParams(true))
+
+        aliceSession.cryptoService().setGlobalBlacklistUnverifiedDevices(true)
+
+        // The two bob session should not be able to decrypt any message
+
+        val roomFromAlicePOV = aliceSession.getRoom(cryptoTestData.roomId)!!
+        Timber.v("#TEST: Send a first message that should be withheld")
+        val sentEvent = sendMessageInRoom(testHelper, roomFromAlicePOV, "Hello")!!
+
+        // wait for it to be synced back the other side
+        Timber.v("#TEST: Wait for message to be synced back")
+        testHelper.retryPeriodically {
+            bobSession.roomService().getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(sentEvent) != null
+        }
+
+        testHelper.retryPeriodically {
+            secondBobSession.roomService().getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(sentEvent) != null
+        }
+
+        // bob should not be able to decrypt
+        Timber.v("#TEST: Ensure cannot be decrytped")
+        cryptoTestHelper.ensureCannotDecrypt(listOf(sentEvent), bobSession, cryptoTestData.roomId)
+        cryptoTestHelper.ensureCannotDecrypt(listOf(sentEvent), secondBobSession, cryptoTestData.roomId)
+
+        // let's try to verify, it should work even if bob devices are untrusted
+        Timber.v("#TEST: Do the verification")
+        cryptoTestHelper.verifySASCrossSign(aliceSession, bobSession, cryptoTestData.roomId)
+
+        Timber.v("#TEST: Send a second message, outbound session should have rotated and only bob 1rst session should decrypt")
+
+        val secondEvent = sendMessageInRoom(testHelper, roomFromAlicePOV, "World")!!
+        Timber.v("#TEST: Wait for message to be synced back")
+        testHelper.retryPeriodically {
+            bobSession.roomService().getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(secondEvent) != null
+        }
+
+        testHelper.retryPeriodically {
+            secondBobSession.roomService().getRoom(cryptoTestData.roomId)?.timelineService()?.getTimelineEvent(secondEvent) != null
+        }
+
+        cryptoTestHelper.ensureCanDecrypt(listOf(secondEvent), bobSession, cryptoTestData.roomId, listOf("World"))
+        cryptoTestHelper.ensureCannotDecrypt(listOf(secondEvent), secondBobSession, cryptoTestData.roomId)
+    }
+
+    private suspend fun VerificationService.readOldVerificationCodeAsync(scope: CoroutineScope, userId: String): Deferred<String> {
+        return scope.async {
+            suspendCancellableCoroutine { continuation ->
+                var oldCode: String? = null
+                val listener = object : VerificationService.Listener {
+
+                    override fun verificationRequestUpdated(pr: PendingVerificationRequest) {
+                        val readyInfo = pr.readyInfo
+                        if (readyInfo != null) {
+                            beginKeyVerification(
+                                    VerificationMethod.SAS,
+                                    userId,
+                                    readyInfo.fromDevice,
+                                    readyInfo.transactionId
+
+                            )
+                        }
+                    }
+
+                    override fun transactionUpdated(tx: VerificationTransaction) {
+                        Log.d("##TEST", "exitsingPov: $tx")
+                        val sasTx = tx as OutgoingSasVerificationTransaction
+                        when (sasTx.uxState) {
+                            OutgoingSasVerificationTransaction.UxState.SHOW_SAS -> {
+                                // for the test we just accept?
+                                oldCode = sasTx.getDecimalCodeRepresentation()
+                                sasTx.userHasVerifiedShortCode()
+                            }
+                            OutgoingSasVerificationTransaction.UxState.VERIFIED -> {
+                                removeListener(this)
+                                // we can release this latch?
+                                continuation.resume(oldCode!!)
+                            }
+                            else -> Unit
+                        }
+                    }
+                }
+                addListener(listener)
+                continuation.invokeOnCancellation { removeListener(listener) }
             }
         }
     }
 
-    private fun ensureIsDecrypted(testHelper: CommonTestHelper, sentEventIds: List<String>, session: Session, e2eRoomID: String) {
-        testHelper.waitWithLatch { latch ->
-            sentEventIds.forEach { sentEventId ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = session.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
+    private suspend fun VerificationService.readNewVerificationCodeAsync(scope: CoroutineScope, userId: String): Deferred<String> {
+        return scope.async {
+            suspendCancellableCoroutine { continuation ->
+                var newCode: String? = null
+
+                val listener = object : VerificationService.Listener {
+
+                    override fun verificationRequestCreated(pr: PendingVerificationRequest) {
+                        // let's ready
+                        readyPendingVerification(
+                                listOf(VerificationMethod.SAS, VerificationMethod.QR_CODE_SCAN, VerificationMethod.QR_CODE_SHOW),
+                                userId,
+                                pr.transactionId!!
+                        )
+                    }
+
+                    var matchOnce = true
+                    override fun transactionUpdated(tx: VerificationTransaction) {
+                        Log.d("##TEST", "newPov: $tx")
+
+                        val sasTx = tx as IncomingSasVerificationTransaction
+                        when (sasTx.uxState) {
+                            IncomingSasVerificationTransaction.UxState.SHOW_ACCEPT -> {
+                                // no need to accept as there was a request first it will auto accept
+                            }
+                            IncomingSasVerificationTransaction.UxState.SHOW_SAS -> {
+                                if (matchOnce) {
+                                    sasTx.userHasVerifiedShortCode()
+                                    newCode = sasTx.getDecimalCodeRepresentation()
+                                    matchOnce = false
+                                }
+                            }
+                            IncomingSasVerificationTransaction.UxState.VERIFIED -> {
+                                removeListener(this)
+                                continuation.resume(newCode!!)
+                            }
+                            else -> Unit
+                        }
+                    }
                 }
+                addListener(listener)
+                continuation.invokeOnCancellation { removeListener(listener) }
+            }
+        }
+    }
+
+    private suspend fun ensureMembersHaveJoined(testHelper: CommonTestHelper, aliceSession: Session, otherAccounts: List<Session>, e2eRoomID: String) {
+        testHelper.retryPeriodically {
+            otherAccounts.map {
+                aliceSession.roomService().getRoomMember(it.myUserId, e2eRoomID)?.membership
+            }.all {
+                it == Membership.JOIN
+            }
+        }
+    }
+
+    private suspend fun ensureIsDecrypted(testHelper: CommonTestHelper, sentEventIds: List<String>, session: Session, e2eRoomID: String) {
+        sentEventIds.forEach { sentEventId ->
+            testHelper.retryPeriodically {
+                val timeLineEvent = session.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)
+                timeLineEvent != null &&
+                        timeLineEvent.isEncrypted() &&
+                        timeLineEvent.root.getClearType() == EventType.MESSAGE
             }
         }
     }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt
index 32a95008b1..91e0026c93 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt
@@ -41,8 +41,8 @@ import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityConten
 import org.matrix.android.sdk.api.session.room.model.shouldShareHistory
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
-import org.matrix.android.sdk.common.CryptoTestHelper
 import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.wrapWithTimeout
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -77,6 +77,7 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
      */
     private fun testShareHistoryWithRoomVisibility(roomHistoryVisibility: RoomHistoryVisibility? = null) =
             runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+                val aliceMessageText = "Hello Bob, I am Alice!"
                 val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true, roomHistoryVisibility)
 
                 val e2eRoomID = cryptoTestData.roomId
@@ -96,22 +97,21 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
                 assertEquals(bobRoomPOV.roomSummary()?.joinedMembersCount, 2)
                 Log.v("#E2E TEST", "Alice and Bob are in roomId: $e2eRoomID")
 
-                val aliceMessageId: String? = sendMessageInRoom(aliceRoomPOV, "Hello Bob, I am Alice!", testHelper)
+                val aliceMessageId: String? = sendMessageInRoom(aliceRoomPOV, aliceMessageText, testHelper)
                 Assert.assertTrue("Message should be sent", aliceMessageId != null)
                 Log.v("#E2E TEST", "Alice sent message to roomId: $e2eRoomID")
 
                 // Bob should be able to decrypt the message
-                testHelper.waitWithLatch { latch ->
-                    testHelper.retryPeriodicallyWithLatch(latch) {
+                testHelper.retryPeriodically {
                         val timelineEvent = bobSession.roomService().getRoom(e2eRoomID)?.timelineService()?.getTimelineEvent(aliceMessageId!!)
                         (timelineEvent != null &&
                                 timelineEvent.isEncrypted() &&
-                                timelineEvent.root.getClearType() == EventType.MESSAGE).also {
+                                timelineEvent.root.getClearType() == EventType.MESSAGE &&
+                                timelineEvent.root.mxDecryptionResult?.isSafe == true).also {
                             if (it) {
                                 Log.v("#E2E TEST", "Bob can decrypt the message: ${timelineEvent?.root?.getDecryptedTextSummary()}")
                             }
                         }
-                    }
                 }
 
                 // Create a new user
@@ -121,10 +121,8 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
                 Log.v("#E2E TEST", "Aris user created")
 
                 // Alice invites new user to the room
-                testHelper.runBlockingTest {
-                    Log.v("#E2E TEST", "Alice invites ${arisSession.myUserId}")
-                    aliceRoomPOV.membershipService().invite(arisSession.myUserId)
-                }
+                Log.v("#E2E TEST", "Alice invites ${arisSession.myUserId}")
+                aliceRoomPOV.membershipService().invite(arisSession.myUserId)
 
                 waitForAndAcceptInviteInRoom(arisSession, e2eRoomID, testHelper)
 
@@ -137,30 +135,27 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
                     null
                     -> {
                         // Aris should be able to decrypt the message
-                        testHelper.waitWithLatch { latch ->
-                            testHelper.retryPeriodicallyWithLatch(latch) {
+                        testHelper.retryPeriodically {
                                 val timelineEvent = arisSession.roomService().getRoom(e2eRoomID)?.timelineService()?.getTimelineEvent(aliceMessageId!!)
                                 (timelineEvent != null &&
                                         timelineEvent.isEncrypted() &&
-                                        timelineEvent.root.getClearType() == EventType.MESSAGE
+                                        timelineEvent.root.getClearType() == EventType.MESSAGE &&
+                                        timelineEvent.root.mxDecryptionResult?.isSafe == false
                                         ).also {
                                             if (it) {
                                                 Log.v("#E2E TEST", "Aris can decrypt the message: ${timelineEvent?.root?.getDecryptedTextSummary()}")
                                             }
                                         }
-                            }
                         }
                     }
                     RoomHistoryVisibility.INVITED,
                     RoomHistoryVisibility.JOINED -> {
                         // Aris should not even be able to get the message
-                        testHelper.waitWithLatch { latch ->
-                            testHelper.retryPeriodicallyWithLatch(latch) {
-                                val timelineEvent = arisSession.roomService().getRoom(e2eRoomID)
-                                        ?.timelineService()
-                                        ?.getTimelineEvent(aliceMessageId!!)
-                                timelineEvent == null
-                            }
+                        testHelper.retryPeriodically {
+                            val timelineEvent = arisSession.roomService().getRoom(e2eRoomID)
+                                    ?.timelineService()
+                                    ?.getTimelineEvent(aliceMessageId!!)
+                            timelineEvent == null
                         }
                     }
                 }
@@ -238,10 +233,7 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
     private fun testRotationDueToVisibilityChange(
             initRoomHistoryVisibility: RoomHistoryVisibility,
             nextRoomHistoryVisibility: RoomHistoryVisibilityContent
-    ) {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
-
+    ) = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true, initRoomHistoryVisibility)
         val e2eRoomID = cryptoTestData.roomId
 
@@ -267,21 +259,19 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
         // Bob should be able to decrypt the message
         var firstAliceMessageMegolmSessionId: String? = null
         val bobRoomPov = bobSession.roomService().getRoom(e2eRoomID)
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val timelineEvent = bobRoomPov
-                        ?.timelineService()
-                        ?.getTimelineEvent(aliceMessageId!!)
-                (timelineEvent != null &&
-                        timelineEvent.isEncrypted() &&
-                        timelineEvent.root.getClearType() == EventType.MESSAGE).also {
-                    if (it) {
-                        firstAliceMessageMegolmSessionId = timelineEvent?.root?.content?.get("session_id") as? String
-                        Log.v(
-                                "#E2E TEST",
-                                "Bob can decrypt the message (sid:$firstAliceMessageMegolmSessionId): ${timelineEvent?.root?.getDecryptedTextSummary()}"
-                        )
-                    }
+        testHelper.retryPeriodically {
+            val timelineEvent = bobRoomPov
+                    ?.timelineService()
+                    ?.getTimelineEvent(aliceMessageId!!)
+            (timelineEvent != null &&
+                    timelineEvent.isEncrypted() &&
+                    timelineEvent.root.getClearType() == EventType.MESSAGE).also {
+                if (it) {
+                    firstAliceMessageMegolmSessionId = timelineEvent?.root?.content?.get("session_id") as? String
+                    Log.v(
+                            "#E2E TEST",
+                            "Bob can decrypt the message (sid:$firstAliceMessageMegolmSessionId): ${timelineEvent?.root?.getDecryptedTextSummary()}"
+                    )
                 }
             }
         }
@@ -290,21 +280,19 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
 
         var secondAliceMessageSessionId: String? = null
         sendMessageInRoom(aliceRoomPOV, "Other msg", testHelper)?.let { secondMessage ->
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timelineEvent = bobRoomPov
-                            ?.timelineService()
-                            ?.getTimelineEvent(secondMessage)
-                    (timelineEvent != null &&
-                            timelineEvent.isEncrypted() &&
-                            timelineEvent.root.getClearType() == EventType.MESSAGE).also {
-                        if (it) {
-                            secondAliceMessageSessionId = timelineEvent?.root?.content?.get("session_id") as? String
-                            Log.v(
-                                    "#E2E TEST",
-                                    "Bob can decrypt the message (sid:$secondAliceMessageSessionId): ${timelineEvent?.root?.getDecryptedTextSummary()}"
-                            )
-                        }
+            testHelper.retryPeriodically {
+                val timelineEvent = bobRoomPov
+                        ?.timelineService()
+                        ?.getTimelineEvent(secondMessage)
+                (timelineEvent != null &&
+                        timelineEvent.isEncrypted() &&
+                        timelineEvent.root.getClearType() == EventType.MESSAGE).also {
+                    if (it) {
+                        secondAliceMessageSessionId = timelineEvent?.root?.content?.get("session_id") as? String
+                        Log.v(
+                                "#E2E TEST",
+                                "Bob can decrypt the message (sid:$secondAliceMessageSessionId): ${timelineEvent?.root?.getDecryptedTextSummary()}"
+                        )
                     }
                 }
             }
@@ -313,50 +301,42 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
         Log.v("#E2E TEST ROTATION", "No rotation needed yet")
 
         // Let's change the room history visibility
-        testHelper.runBlockingTest {
-            aliceRoomPOV.stateService()
-                    .sendStateEvent(
-                            eventType = EventType.STATE_ROOM_HISTORY_VISIBILITY,
-                            stateKey = "",
-                            body = RoomHistoryVisibilityContent(
-                                    historyVisibilityStr = nextRoomHistoryVisibility.historyVisibilityStr
-                            ).toContent()
-                    )
-        }
+        aliceRoomPOV.stateService()
+                .sendStateEvent(
+                        eventType = EventType.STATE_ROOM_HISTORY_VISIBILITY,
+                        stateKey = "",
+                        body = RoomHistoryVisibilityContent(
+                                historyVisibilityStr = nextRoomHistoryVisibility.historyVisibilityStr
+                        ).toContent()
+                )
 
         // ensure that the state did synced down
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                aliceRoomPOV.stateService().getStateEvent(EventType.STATE_ROOM_HISTORY_VISIBILITY, QueryStringValue.IsEmpty)?.content
-                        ?.toModel<RoomHistoryVisibilityContent>()?.historyVisibility == nextRoomHistoryVisibility.historyVisibility
-            }
+        testHelper.retryPeriodically {
+            aliceRoomPOV.stateService().getStateEvent(EventType.STATE_ROOM_HISTORY_VISIBILITY, QueryStringValue.IsEmpty)?.content
+                    ?.toModel<RoomHistoryVisibilityContent>()?.historyVisibility == nextRoomHistoryVisibility.historyVisibility
         }
 
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val roomVisibility = aliceSession.getRoom(e2eRoomID)!!
-                        .stateService()
-                        .getStateEvent(EventType.STATE_ROOM_HISTORY_VISIBILITY, QueryStringValue.IsEmpty)
-                        ?.content
-                        ?.toModel<RoomHistoryVisibilityContent>()
-                Log.v("#E2E TEST ROTATION", "Room visibility changed from: ${initRoomHistoryVisibility.name} to: ${roomVisibility?.historyVisibility?.name}")
-                roomVisibility?.historyVisibility == nextRoomHistoryVisibility.historyVisibility
-            }
+        testHelper.retryPeriodically {
+            val roomVisibility = aliceSession.getRoom(e2eRoomID)!!
+                    .stateService()
+                    .getStateEvent(EventType.STATE_ROOM_HISTORY_VISIBILITY, QueryStringValue.IsEmpty)
+                    ?.content
+                    ?.toModel<RoomHistoryVisibilityContent>()
+            Log.v("#E2E TEST ROTATION", "Room visibility changed from: ${initRoomHistoryVisibility.name} to: ${roomVisibility?.historyVisibility?.name}")
+            roomVisibility?.historyVisibility == nextRoomHistoryVisibility.historyVisibility
         }
 
         var aliceThirdMessageSessionId: String? = null
         sendMessageInRoom(aliceRoomPOV, "Message after visibility change", testHelper)?.let { thirdMessage ->
-            testHelper.waitWithLatch { latch ->
-                testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timelineEvent = bobRoomPov
-                            ?.timelineService()
-                            ?.getTimelineEvent(thirdMessage)
-                    (timelineEvent != null &&
-                            timelineEvent.isEncrypted() &&
-                            timelineEvent.root.getClearType() == EventType.MESSAGE).also {
-                        if (it) {
-                            aliceThirdMessageSessionId = timelineEvent?.root?.content?.get("session_id") as? String
-                        }
+            testHelper.retryPeriodically {
+                val timelineEvent = bobRoomPov
+                        ?.timelineService()
+                        ?.getTimelineEvent(thirdMessage)
+                (timelineEvent != null &&
+                        timelineEvent.isEncrypted() &&
+                        timelineEvent.root.getClearType() == EventType.MESSAGE).also {
+                    if (it) {
+                        aliceThirdMessageSessionId = timelineEvent?.root?.content?.get("session_id") as? String
                     }
                 }
             }
@@ -376,35 +356,34 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
         cryptoTestData.cleanUp(testHelper)
     }
 
-    private fun sendMessageInRoom(aliceRoomPOV: Room, text: String, testHelper: CommonTestHelper): String? {
-        return testHelper.sendTextMessage(aliceRoomPOV, text, 1).firstOrNull()?.eventId
+    private suspend fun sendMessageInRoom(aliceRoomPOV: Room, text: String, testHelper: CommonTestHelper): String? {
+        return testHelper.sendTextMessage(aliceRoomPOV, text, 1).firstOrNull()?.let {
+            Log.v("#E2E TEST", "Message sent with session ${it.root.content?.get("session_id")}")
+            return it.eventId
+        }
     }
 
-    private fun ensureMembersHaveJoined(aliceSession: Session, otherAccounts: List<Session>, e2eRoomID: String, testHelper: CommonTestHelper) {
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                otherAccounts.map {
-                    aliceSession.roomService().getRoomMember(it.myUserId, e2eRoomID)?.membership
-                }.all {
-                    it == Membership.JOIN
-                }
+    private suspend fun ensureMembersHaveJoined(aliceSession: Session, otherAccounts: List<Session>, e2eRoomID: String, testHelper: CommonTestHelper) {
+        testHelper.retryPeriodically {
+            otherAccounts.map {
+                aliceSession.roomService().getRoomMember(it.myUserId, e2eRoomID)?.membership
+            }.all {
+                it == Membership.JOIN
             }
         }
     }
 
-    private fun waitForAndAcceptInviteInRoom(otherSession: Session, e2eRoomID: String, testHelper: CommonTestHelper) {
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val roomSummary = otherSession.roomService().getRoomSummary(e2eRoomID)
-                (roomSummary != null && roomSummary.membership == Membership.INVITE).also {
-                    if (it) {
-                        Log.v("#E2E TEST", "${otherSession.myUserId} can see the invite from alice")
-                    }
+    private suspend fun waitForAndAcceptInviteInRoom(otherSession: Session, e2eRoomID: String, testHelper: CommonTestHelper) {
+        testHelper.retryPeriodically {
+            val roomSummary = otherSession.roomService().getRoomSummary(e2eRoomID)
+            (roomSummary != null && roomSummary.membership == Membership.INVITE).also {
+                if (it) {
+                    Log.v("#E2E TEST", "${otherSession.myUserId} can see the invite from alice")
                 }
             }
         }
 
-        testHelper.runBlockingTest(60_000) {
+        wrapWithTimeout(60_000) {
             Log.v("#E2E TEST", "${otherSession.myUserId} tries to join room $e2eRoomID")
             try {
                 otherSession.roomService().joinRoom(e2eRoomID)
@@ -414,11 +393,9 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
         }
 
         Log.v("#E2E TEST", "${otherSession.myUserId} waiting for join echo ...")
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                val roomSummary = otherSession.roomService().getRoomSummary(e2eRoomID)
-                roomSummary != null && roomSummary.membership == Membership.JOIN
-            }
+        testHelper.retryPeriodically {
+            val roomSummary = otherSession.roomService().getRoomSummary(e2eRoomID)
+            roomSummary != null && roomSummary.membership == Membership.JOIN
         }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
index e8e7b1d708..5c817443ce 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
@@ -52,15 +52,13 @@ class PreShareKeysTest : InstrumentedTest {
         Log.d("#Test", "Room Key Received from alice $preShareCount")
 
         // Force presharing of new outbound key
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             aliceSession.cryptoService().prepareToEncrypt(e2eRoomID, it)
         }
 
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val newKeysCount = bobSession.cryptoService().keysBackupService().getTotalNumbersOfKeys()
-                newKeysCount > preShareCount
-            }
+        testHelper.retryPeriodically {
+            val newKeysCount = bobSession.cryptoService().keysBackupService().getTotalNumbersOfKeys()
+            newKeysCount > preShareCount
         }
 
         val aliceCryptoStore = (aliceSession.cryptoService() as DefaultCryptoService).cryptoStoreForTesting
@@ -85,10 +83,8 @@ class PreShareKeysTest : InstrumentedTest {
         val sentEvent = testHelper.sendTextMessage(aliceSession.getRoom(e2eRoomID)!!, "Allo", 1).first()
 
         assertEquals("Unexpected megolm session", megolmSessionId, sentEvent.root.content.toModel<EncryptedEventContent>()?.sessionId)
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                bobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEvent.eventId)?.root?.getClearType() == EventType.MESSAGE
-            }
+        testHelper.retryPeriodically {
+            bobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEvent.eventId)?.root?.getClearType() == EventType.MESSAGE
         }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
index 5fe7376184..889cc9a562 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
@@ -17,7 +17,8 @@
 package org.matrix.android.sdk.internal.crypto
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.amshove.kluent.shouldBe
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.amshove.kluent.shouldBeEqualTo
 import org.junit.Assert
 import org.junit.Before
 import org.junit.FixMethodOrder
@@ -29,6 +30,7 @@ import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -45,7 +47,6 @@ import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
 import org.matrix.android.sdk.internal.crypto.store.db.serializeForRealm
 import org.matrix.olm.OlmSession
 import timber.log.Timber
-import java.util.concurrent.CountDownLatch
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 
@@ -82,7 +83,10 @@ class UnwedgingTest : InstrumentedTest {
      * -> This is automatically fixed after SDKs restarted the olm session
      */
     @Test
-    fun testUnwedging() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+    fun testUnwedging() = runCryptoTest(
+            context(),
+            cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false)
+    ) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -98,69 +102,37 @@ class UnwedgingTest : InstrumentedTest {
         val bobTimeline = roomFromBobPOV.timelineService().createTimeline(null, TimelineSettings(20))
         bobTimeline.start()
 
-        val bobFinalLatch = CountDownLatch(1)
-        val bobHasThreeDecryptedEventsListener = object : Timeline.Listener {
-            override fun onTimelineFailure(throwable: Throwable) {
-                // noop
-            }
-
-            override fun onNewTimelineEvents(eventIds: List<String>) {
-                // noop
-            }
-
-            override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
-                val decryptedEventReceivedByBob = snapshot.filter { it.root.type == EventType.ENCRYPTED }
-                Timber.d("Bob can now decrypt ${decryptedEventReceivedByBob.size} messages")
-                if (decryptedEventReceivedByBob.size == 3) {
-                    if (decryptedEventReceivedByBob[0].root.mCryptoError == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID) {
-                        bobFinalLatch.countDown()
-                    }
-                }
-            }
-        }
-        bobTimeline.addListener(bobHasThreeDecryptedEventsListener)
-
-        var latch = CountDownLatch(1)
-        var bobEventsListener = createEventListener(latch, 1)
-        bobTimeline.addListener(bobEventsListener)
         messagesReceivedByBob = emptyList()
 
         // - Alice sends a 1st message with a 1st megolm session
         roomFromAlicePOV.sendService().sendTextMessage("First message")
 
         // Wait for the message to be received by Bob
-        testHelper.await(latch)
-        bobTimeline.removeListener(bobEventsListener)
+        messagesReceivedByBob = bobTimeline.waitForMessages(expectedCount = 1)
 
-        messagesReceivedByBob.size shouldBe 1
+        messagesReceivedByBob.size shouldBeEqualTo 1
         val firstMessageSession = messagesReceivedByBob[0].root.content.toModel<EncryptedEventContent>()!!.sessionId!!
 
         //  - Store the olm session between A&B devices
         // Let us pickle our session with bob here so we can later unpickle it
         // and wedge our session.
         val sessionIdsForBob = aliceCryptoStore.getDeviceSessionIds(bobSession.cryptoService().getMyDevice().identityKey()!!)
-        sessionIdsForBob!!.size shouldBe 1
+        sessionIdsForBob!!.size shouldBeEqualTo 1
         val olmSession = aliceCryptoStore.getDeviceSession(sessionIdsForBob.first(), bobSession.cryptoService().getMyDevice().identityKey()!!)!!
 
         val oldSession = serializeForRealm(olmSession.olmSession)
 
         aliceSession.cryptoService().discardOutboundSession(roomFromAlicePOV.roomId)
-        Thread.sleep(6_000)
 
-        latch = CountDownLatch(1)
-        bobEventsListener = createEventListener(latch, 2)
-        bobTimeline.addListener(bobEventsListener)
         messagesReceivedByBob = emptyList()
-
         Timber.i("## CRYPTO | testUnwedging:  Alice sends a 2nd message with a 2nd megolm session")
         // - Alice sends a 2nd message with a 2nd megolm session
         roomFromAlicePOV.sendService().sendTextMessage("Second message")
 
         // Wait for the message to be received by Bob
-        testHelper.await(latch)
-        bobTimeline.removeListener(bobEventsListener)
+        messagesReceivedByBob = bobTimeline.waitForMessages(expectedCount = 2)
 
-        messagesReceivedByBob.size shouldBe 2
+        messagesReceivedByBob.size shouldBeEqualTo 2
         // Session should have changed
         val secondMessageSession = messagesReceivedByBob[0].root.content.toModel<EncryptedEventContent>()!!.sessionId!!
         Assert.assertNotEquals(firstMessageSession, secondMessageSession)
@@ -173,25 +145,18 @@ class UnwedgingTest : InstrumentedTest {
                 bobSession.cryptoService().getMyDevice().identityKey()!!
         )
         olmDevice.clearOlmSessionCache()
-        Thread.sleep(6_000)
 
         // Force new session, and key share
         aliceSession.cryptoService().discardOutboundSession(roomFromAlicePOV.roomId)
 
+        Timber.i("## CRYPTO | testUnwedging: Alice sends a 3rd message with a 3rd megolm session but a wedged olm session")
+        // - Alice sends a 3rd message with a 3rd megolm session but a wedged olm session
+        roomFromAlicePOV.sendService().sendTextMessage("Third message")
+        // Bob should not be able to decrypt, because the session key could not be sent
         // Wait for the message to be received by Bob
-        testHelper.waitWithLatch {
-            bobEventsListener = createEventListener(it, 3)
-            bobTimeline.addListener(bobEventsListener)
-            messagesReceivedByBob = emptyList()
+        messagesReceivedByBob = bobTimeline.waitForMessages(expectedCount = 3)
 
-            Timber.i("## CRYPTO | testUnwedging: Alice sends a 3rd message with a 3rd megolm session but a wedged olm session")
-            // - Alice sends a 3rd message with a 3rd megolm session but a wedged olm session
-            roomFromAlicePOV.sendService().sendTextMessage("Third message")
-            // Bob should not be able to decrypt, because the session key could not be sent
-        }
-        bobTimeline.removeListener(bobEventsListener)
-
-        messagesReceivedByBob.size shouldBe 3
+        messagesReceivedByBob.size shouldBeEqualTo 3
 
         val thirdMessageSession = messagesReceivedByBob[0].root.content.toModel<EncryptedEventContent>()!!.sessionId!!
         Timber.i("## CRYPTO | testUnwedging: third message session ID $thirdMessageSession")
@@ -201,11 +166,11 @@ class UnwedgingTest : InstrumentedTest {
         Assert.assertEquals(EventType.MESSAGE, messagesReceivedByBob[1].root.getClearType())
         Assert.assertEquals(EventType.MESSAGE, messagesReceivedByBob[2].root.getClearType())
         // Bob Should not be able to decrypt last message, because session could not be sent as the olm channel was wedged
-        testHelper.await(bobFinalLatch)
-        bobTimeline.removeListener(bobHasThreeDecryptedEventsListener)
+
+        Assert.assertTrue(messagesReceivedByBob[0].root.mCryptoError == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID)
 
         // It's a trick to force key request on fail to decrypt
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             bobSession.cryptoService().crossSigningService()
                     .initializeCrossSigning(
                             object : UserInteractiveAuthInterceptor {
@@ -223,24 +188,22 @@ class UnwedgingTest : InstrumentedTest {
         }
 
         // Wait until we received back the key
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                // we should get back the key and be able to decrypt
-                val result = testHelper.runBlockingTest {
-                    tryOrNull {
-                        bobSession.cryptoService().decryptEvent(messagesReceivedByBob[0].root, "")
-                    }
-                }
-                Timber.i("## CRYPTO | testUnwedging: decrypt result  ${result?.clearEvent}")
-                result != null
+        testHelper.retryPeriodically {
+            // we should get back the key and be able to decrypt
+            val result = tryOrNull {
+                bobSession.cryptoService().decryptEvent(messagesReceivedByBob[0].root, "")
             }
+            Timber.i("## CRYPTO | testUnwedging: decrypt result  ${result?.clearEvent}")
+            result != null
         }
 
         bobTimeline.dispose()
     }
+}
 
-    private fun createEventListener(latch: CountDownLatch, expectedNumberOfMessages: Int): Timeline.Listener {
-        return object : Timeline.Listener {
+private suspend fun Timeline.waitForMessages(expectedCount: Int): List<TimelineEvent> {
+    return suspendCancellableCoroutine { continuation ->
+        val listener = object : Timeline.Listener {
             override fun onTimelineFailure(throwable: Throwable) {
                 // noop
             }
@@ -250,12 +213,16 @@ class UnwedgingTest : InstrumentedTest {
             }
 
             override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
-                messagesReceivedByBob = snapshot.filter { it.root.type == EventType.ENCRYPTED }
+                val messagesReceived = snapshot.filter { it.root.type == EventType.ENCRYPTED }
 
-                if (messagesReceivedByBob.size == expectedNumberOfMessages) {
-                    latch.countDown()
+                if (messagesReceived.size == expectedCount) {
+                    removeListener(this)
+                    continuation.resume(messagesReceived)
                 }
             }
         }
+
+        addListener(listener)
+        continuation.invokeOnCancellation { removeListener(listener) }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index 8cb38ddc87..c4fb896934 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -25,7 +25,6 @@ import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -42,20 +41,20 @@ import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
+import timber.log.Timber
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @LargeTest
-@Ignore
 class XSigningTest : InstrumentedTest {
 
     @Test
     fun test_InitializeAndStoreKeys() = runSessionTest(context()) { testHelper ->
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             aliceSession.cryptoService().crossSigningService()
                     .initializeCrossSigning(object : UserInteractiveAuthInterceptor {
                         override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
@@ -101,14 +100,14 @@ class XSigningTest : InstrumentedTest {
                 password = TestConstants.PASSWORD
         )
 
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             aliceSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
                 override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                     promise.resume(aliceAuthParams)
                 }
             }, it)
         }
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
                 override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                     promise.resume(bobAuthParams)
@@ -117,7 +116,7 @@ class XSigningTest : InstrumentedTest {
         }
 
         // Check that alice can see bob keys
-        testHelper.doSync<MXUsersDevicesMap<CryptoDeviceInfo>> { aliceSession.cryptoService().downloadKeys(listOf(bobSession.myUserId), true, it) }
+        testHelper.waitForCallback<MXUsersDevicesMap<CryptoDeviceInfo>> { aliceSession.cryptoService().downloadKeys(listOf(bobSession.myUserId), true, it) }
 
         val bobKeysFromAlicePOV = aliceSession.cryptoService().crossSigningService().getUserCrossSigningKeys(bobSession.myUserId)
         assertNotNull("Alice can see bob Master key", bobKeysFromAlicePOV!!.masterKey())
@@ -154,14 +153,14 @@ class XSigningTest : InstrumentedTest {
                 password = TestConstants.PASSWORD
         )
 
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             aliceSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
                 override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                     promise.resume(aliceAuthParams)
                 }
             }, it)
         }
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
                 override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                     promise.resume(bobAuthParams)
@@ -171,12 +170,12 @@ class XSigningTest : InstrumentedTest {
 
         // Check that alice can see bob keys
         val bobUserId = bobSession.myUserId
-        testHelper.doSync<MXUsersDevicesMap<CryptoDeviceInfo>> { aliceSession.cryptoService().downloadKeys(listOf(bobUserId), true, it) }
+        testHelper.waitForCallback<MXUsersDevicesMap<CryptoDeviceInfo>> { aliceSession.cryptoService().downloadKeys(listOf(bobUserId), true, it) }
 
         val bobKeysFromAlicePOV = aliceSession.cryptoService().crossSigningService().getUserCrossSigningKeys(bobUserId)
         assertTrue("Bob keys from alice pov should not be trusted", bobKeysFromAlicePOV?.isTrusted() == false)
 
-        testHelper.doSync<Unit> { aliceSession.cryptoService().crossSigningService().trustUser(bobUserId, it) }
+        testHelper.waitForCallback<Unit> { aliceSession.cryptoService().crossSigningService().trustUser(bobUserId, it) }
 
         // Now bobs logs in on a new device and verifies it
         // We will want to test that in alice POV, this new device would be trusted by cross signing
@@ -185,7 +184,7 @@ class XSigningTest : InstrumentedTest {
         val bobSecondDeviceId = bobSession2.sessionParams.deviceId!!
 
         // Check that bob first session sees the new login
-        val data = testHelper.doSync<MXUsersDevicesMap<CryptoDeviceInfo>> {
+        val data = testHelper.waitForCallback<MXUsersDevicesMap<CryptoDeviceInfo>> {
             bobSession.cryptoService().downloadKeys(listOf(bobUserId), true, it)
         }
 
@@ -193,16 +192,16 @@ class XSigningTest : InstrumentedTest {
             fail("Bob should see the new device")
         }
 
-        val bobSecondDevicePOVFirstDevice = bobSession.cryptoService().getDeviceInfo(bobUserId, bobSecondDeviceId)
+        val bobSecondDevicePOVFirstDevice = bobSession.cryptoService().getCryptoDeviceInfo(bobUserId, bobSecondDeviceId)
         assertNotNull("Bob Second device should be known and persisted from first", bobSecondDevicePOVFirstDevice)
 
         // Manually mark it as trusted from first session
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             bobSession.cryptoService().crossSigningService().trustDevice(bobSecondDeviceId, it)
         }
 
         // Now alice should cross trust bob's second device
-        val data2 = testHelper.doSync<MXUsersDevicesMap<CryptoDeviceInfo>> {
+        val data2 = testHelper.waitForCallback<MXUsersDevicesMap<CryptoDeviceInfo>> {
             aliceSession.cryptoService().downloadKeys(listOf(bobUserId), true, it)
         }
 
@@ -214,4 +213,104 @@ class XSigningTest : InstrumentedTest {
         val result = aliceSession.cryptoService().crossSigningService().checkDeviceTrust(bobUserId, bobSecondDeviceId, null)
         assertTrue("Bob second device should be trusted from alice POV", result.isCrossSignedVerified())
     }
+
+    @Test
+    fun testWarnOnCrossSigningReset() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
+
+        val aliceSession = cryptoTestData.firstSession
+        val bobSession = cryptoTestData.secondSession
+
+        val aliceAuthParams = UserPasswordAuth(
+                user = aliceSession.myUserId,
+                password = TestConstants.PASSWORD
+        )
+        val bobAuthParams = UserPasswordAuth(
+                user = bobSession!!.myUserId,
+                password = TestConstants.PASSWORD
+        )
+
+        testHelper.waitForCallback<Unit> {
+            aliceSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+                override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                    promise.resume(aliceAuthParams)
+                }
+            }, it)
+        }
+        testHelper.waitForCallback<Unit> {
+            bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+                override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                    promise.resume(bobAuthParams)
+                }
+            }, it)
+        }
+
+        cryptoTestHelper.verifySASCrossSign(aliceSession, bobSession, cryptoTestData.roomId)
+
+        testHelper.retryPeriodically {
+            aliceSession.cryptoService().crossSigningService().isUserTrusted(bobSession.myUserId)
+        }
+
+        testHelper.retryPeriodically {
+            aliceSession.cryptoService().crossSigningService().checkUserTrust(bobSession.myUserId).isVerified()
+        }
+
+        aliceSession.cryptoService()
+        // Ensure also that bob device is trusted
+        testHelper.retryPeriodically {
+            val deviceInfo = aliceSession.cryptoService().getUserDevices(bobSession.myUserId).firstOrNull()
+            Timber.v("#TEST device:${deviceInfo?.shortDebugString()} trust ${deviceInfo?.trustLevel}")
+            deviceInfo?.trustLevel?.crossSigningVerified == true
+        }
+
+        val currentBobMSK = aliceSession.cryptoService().crossSigningService()
+                .getUserCrossSigningKeys(bobSession.myUserId)!!
+                .masterKey()!!.unpaddedBase64PublicKey!!
+
+        testHelper.waitForCallback<Unit> {
+            bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+                override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                    promise.resume(bobAuthParams)
+                }
+            }, it)
+        }
+
+        testHelper.retryPeriodically {
+            val newBobMsk = aliceSession.cryptoService().crossSigningService()
+                    .getUserCrossSigningKeys(bobSession.myUserId)
+                    ?.masterKey()?.unpaddedBase64PublicKey
+            newBobMsk != null && newBobMsk != currentBobMSK
+        }
+
+        // trick to force event to sync
+        bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userIsTyping()
+
+        // assert that bob is not trusted anymore from alice s
+        testHelper.retryPeriodically {
+            val trust = aliceSession.cryptoService().crossSigningService().checkUserTrust(bobSession.myUserId)
+            !trust.isVerified()
+        }
+
+        // trick to force event to sync
+        bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userStopsTyping()
+        bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userIsTyping()
+
+        testHelper.retryPeriodically {
+            val info = aliceSession.cryptoService().crossSigningService().getUserCrossSigningKeys(bobSession.myUserId)
+            info?.wasTrustedOnce == true
+        }
+
+        // trick to force event to sync
+        bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userStopsTyping()
+        bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userIsTyping()
+
+        testHelper.retryPeriodically {
+            !aliceSession.cryptoService().crossSigningService().isUserTrusted(bobSession.myUserId)
+        }
+
+        // Ensure also that bob device are not trusted
+        testHelper.retryPeriodically {
+            aliceSession.cryptoService().getUserDevices(bobSession.myUserId).first().trustLevel?.crossSigningVerified != true
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
index 5f26fda946..42a04dbe3f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
@@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.crypto.encryption
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.suspendCancellableCoroutine
 import org.amshove.kluent.shouldBe
 import org.junit.FixMethodOrder
 import org.junit.Test
@@ -34,54 +34,59 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.CryptoTestHelper
-import java.util.concurrent.CountDownLatch
+import org.matrix.android.sdk.common.waitFor
+import kotlin.coroutines.resume
 
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 class EncryptionTest : InstrumentedTest {
 
     @Test
-    fun test_EncryptionEvent() {
-        runCryptoTest(context()) { cryptoTestHelper, testHelper ->
-            performTest(cryptoTestHelper, testHelper, roomShouldBeEncrypted = false) { room ->
-                // Send an encryption Event as an Event (and not as a state event)
-                room.sendService().sendEvent(
-                        eventType = EventType.STATE_ROOM_ENCRYPTION,
-                        content = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
-                )
-            }
+    fun test_EncryptionEvent() = runCryptoTest(context()) { cryptoTestHelper, _ ->
+        performTest(cryptoTestHelper, roomShouldBeEncrypted = false) { room ->
+            // Send an encryption Event as an Event (and not as a state event)
+            room.sendService().sendEvent(
+                    eventType = EventType.STATE_ROOM_ENCRYPTION,
+                    content = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
+            )
         }
     }
 
     @Test
-    fun test_EncryptionStateEvent() {
-        runCryptoTest(context()) { cryptoTestHelper, testHelper ->
-            performTest(cryptoTestHelper, testHelper, roomShouldBeEncrypted = true) { room ->
-                runBlocking {
-                    // Send an encryption Event as a State Event
-                    room.stateService().sendStateEvent(
-                            eventType = EventType.STATE_ROOM_ENCRYPTION,
-                            stateKey = "",
-                            body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
-                    )
-                }
-            }
+    fun test_EncryptionStateEvent() = runCryptoTest(context()) { cryptoTestHelper, _ ->
+        performTest(cryptoTestHelper, roomShouldBeEncrypted = true) { room ->
+            // Send an encryption Event as a State Event
+            room.stateService().sendStateEvent(
+                    eventType = EventType.STATE_ROOM_ENCRYPTION,
+                    stateKey = "",
+                    body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
+            )
         }
     }
 
-    private fun performTest(cryptoTestHelper: CryptoTestHelper, testHelper: CommonTestHelper, roomShouldBeEncrypted: Boolean, action: (Room) -> Unit) {
+    private suspend fun performTest(cryptoTestHelper: CryptoTestHelper, roomShouldBeEncrypted: Boolean, action: suspend (Room) -> Unit) {
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(encryptedRoom = false)
-
         val aliceSession = cryptoTestData.firstSession
         val room = aliceSession.getRoom(cryptoTestData.roomId)!!
 
         room.roomCryptoService().isEncrypted() shouldBe false
 
         val timeline = room.timelineService().createTimeline(null, TimelineSettings(10))
-        val latch = CountDownLatch(1)
+        timeline.start()
+        waitFor(
+                continueWhen = { timeline.waitForEncryptedMessages() },
+                action = { action.invoke(room) }
+        )
+        timeline.dispose()
+
+        room.roomCryptoService().isEncrypted() shouldBe roomShouldBeEncrypted
+    }
+}
+
+private suspend fun Timeline.waitForEncryptedMessages() {
+    suspendCancellableCoroutine<Unit> { continuation ->
         val timelineListener = object : Timeline.Listener {
             override fun onTimelineFailure(throwable: Throwable) {
             }
@@ -96,20 +101,12 @@ class EncryptionTest : InstrumentedTest {
                         .filter { it.root.getClearType() == EventType.STATE_ROOM_ENCRYPTION }
 
                 if (newMessages.isNotEmpty()) {
-                    timeline.removeListener(this)
-                    latch.countDown()
+                    removeListener(this)
+                    continuation.resume(Unit)
                 }
             }
         }
-        timeline.start()
-        timeline.addListener(timelineListener)
-
-        action.invoke(room)
-        testHelper.await(latch)
-        timeline.dispose()
-        testHelper.waitWithLatch {
-            room.roomCryptoService().isEncrypted() shouldBe roomShouldBeEncrypted
-            it.countDown()
-        }
+        addListener(timelineListener)
+        continuation.invokeOnCancellation { removeListener(timelineListener) }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index 7bb53e139c..8e001b84d3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -22,15 +22,16 @@ import androidx.test.filters.LargeTest
 import junit.framework.TestCase.assertNotNull
 import junit.framework.TestCase.assertTrue
 import org.amshove.kluent.internal.assertEquals
+import org.amshove.kluent.shouldBeEqualTo
 import org.junit.Assert
 import org.junit.Assert.assertNull
 import org.junit.FixMethodOrder
-import org.junit.Ignore
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_OLM
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import org.matrix.android.sdk.api.session.crypto.OutgoingRoomKeyRequestState
 import org.matrix.android.sdk.api.session.crypto.RequestResult
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
@@ -43,7 +44,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
-import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 import org.matrix.android.sdk.mustFail
@@ -51,26 +51,23 @@ import org.matrix.android.sdk.mustFail
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
 @LargeTest
-@Ignore
 class KeyShareTests : InstrumentedTest {
 
-    @get:Rule val rule = RetryTestRule(3)
+    // @get:Rule val rule = RetryTestRule(3)
 
     @Test
     fun test_DoNotSelfShareIfNotTrusted() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
 
         val aliceSession = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
-        Log.v("TEST", "=======> AliceSession 1 is ${aliceSession.sessionParams.deviceId}")
+        Log.v("#TEST", "=======> AliceSession 1 is ${aliceSession.sessionParams.deviceId}")
 
         // Create an encrypted room and add a message
-        val roomId = commonTestHelper.runBlockingTest {
-            aliceSession.roomService().createRoom(
-                    CreateRoomParams().apply {
-                        visibility = RoomDirectoryVisibility.PRIVATE
-                        enableEncryption()
-                    }
-            )
-        }
+        val roomId = aliceSession.roomService().createRoom(
+                CreateRoomParams().apply {
+                    visibility = RoomDirectoryVisibility.PRIVATE
+                    enableEncryption()
+                }
+        )
         val room = aliceSession.getRoom(roomId)
         assertNotNull(room)
         Thread.sleep(4_000)
@@ -86,7 +83,7 @@ class KeyShareTests : InstrumentedTest {
         aliceSession2.cryptoService().enableKeyGossiping(false)
         commonTestHelper.syncSession(aliceSession2)
 
-        Log.v("TEST", "=======> AliceSession 2 is ${aliceSession2.sessionParams.deviceId}")
+        Log.v("#TEST", "=======> AliceSession 2 is ${aliceSession2.sessionParams.deviceId}")
 
         val roomSecondSessionPOV = aliceSession2.getRoom(roomId)
 
@@ -94,10 +91,8 @@ class KeyShareTests : InstrumentedTest {
         assertNotNull(receivedEvent)
         assert(receivedEvent!!.isEncrypted())
 
-        commonTestHelper.runBlockingTest {
-            mustFail {
-                aliceSession2.cryptoService().decryptEvent(receivedEvent.root, "foo")
-            }
+        mustFail {
+            aliceSession2.cryptoService().decryptEvent(receivedEvent.root, "foo")
         }
 
         val outgoingRequestsBefore = aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
@@ -111,17 +106,15 @@ class KeyShareTests : InstrumentedTest {
 
         var outGoingRequestId: String? = null
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
-                        .let {
-                            val outgoing = it.firstOrNull { it.sessionId == eventMegolmSessionId }
-                            outGoingRequestId = outgoing?.requestId
-                            outgoing != null
-                        }
-            }
+        commonTestHelper.retryPeriodically {
+            aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
+                    .let {
+                        val outgoing = it.firstOrNull { it.sessionId == eventMegolmSessionId }
+                        outGoingRequestId = outgoing?.requestId
+                        outgoing != null
+                    }
         }
-        Log.v("TEST", "=======> Outgoing requet Id is $outGoingRequestId")
+        Log.v("#TEST", "=======> Outgoing requet Id is $outGoingRequestId")
 
         val outgoingRequestAfter = aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
 
@@ -131,52 +124,62 @@ class KeyShareTests : InstrumentedTest {
 
         // The first session should see an incoming request
         // the request should be refused, because the device is not trusted
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                // DEBUG LOGS
-//                aliceSession.cryptoService().getIncomingRoomKeyRequests().let {
-//                    Log.v("TEST", "Incoming request Session 1 (looking for $outGoingRequestId)")
-//                    Log.v("TEST", "=========================")
-//                    it.forEach { keyRequest ->
-//                        Log.v("TEST", "[ts${keyRequest.localCreationTimestamp}] requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId}")
-//                    }
-//                    Log.v("TEST", "=========================")
-//                }
-
-                val incoming = aliceSession.cryptoService().getIncomingRoomKeyRequests().firstOrNull { it.requestId == outGoingRequestId }
-                incoming != null
-            }
-        }
-
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                // DEBUG LOGS
-                aliceSession2.cryptoService().getOutgoingRoomKeyRequests().forEach { keyRequest ->
-                    Log.v("TEST", "=========================")
-                    Log.v("TEST", "requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId}")
-                    Log.v("TEST", "replies -> ${keyRequest.results.joinToString { it.toString() }}")
-                    Log.v("TEST", "=========================")
+        commonTestHelper.retryPeriodically {
+            // DEBUG LOGS
+            aliceSession.cryptoService().getIncomingRoomKeyRequests().let {
+                Log.v("#TEST", "Incoming request Session 1 (looking for $outGoingRequestId)")
+                Log.v("#TEST", "=========================")
+                it.forEach { keyRequest ->
+                    Log.v(
+                            "#TEST",
+                            "[ts${keyRequest.localCreationTimestamp}] requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId}"
+                    )
                 }
-
-                val outgoing = aliceSession2.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.requestId == outGoingRequestId }
-                val reply = outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
-                val resultCode = (reply?.result as? RequestResult.Failure)?.code
-                resultCode == WithHeldCode.UNVERIFIED
+                Log.v("#TEST", "=========================")
             }
+
+            val incoming = aliceSession.cryptoService().getIncomingRoomKeyRequests().firstOrNull { it.requestId == outGoingRequestId }
+            incoming != null
         }
 
-        commonTestHelper.runBlockingTest {
-            mustFail {
-                aliceSession2.cryptoService().decryptEvent(receivedEvent.root, "foo")
+        commonTestHelper.retryPeriodically {
+            // DEBUG LOGS
+            aliceSession2.cryptoService().getOutgoingRoomKeyRequests().forEach { keyRequest ->
+                Log.v("#TEST", "=========================")
+                Log.v("#TEST", "requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId}")
+                Log.v("#TEST", "replies -> ${keyRequest.results.joinToString { it.toString() }}")
+                Log.v("#TEST", "=========================")
             }
+
+            val outgoing = aliceSession2.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.requestId == outGoingRequestId }
+            val reply = outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
+            val resultCode = (reply?.result as? RequestResult.Failure)?.code
+            resultCode == WithHeldCode.UNVERIFIED
+        }
+
+        mustFail {
+            aliceSession2.cryptoService().decryptEvent(receivedEvent.root, "foo")
         }
 
         // Mark the device as trusted
+
+        Log.v("#TEST", "=======> Alice device 1 is ${aliceSession.sessionParams.deviceId}|${aliceSession.cryptoService().getMyDevice().identityKey()}")
+        val aliceSecondSession = aliceSession2.cryptoService().getMyDevice()
+        Log.v("#TEST", "=======> Alice device 2 is ${aliceSession2.sessionParams.deviceId}|${aliceSecondSession.identityKey()}")
+
         aliceSession.cryptoService().setDeviceVerification(
                 DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true), aliceSession.myUserId,
                 aliceSession2.sessionParams.deviceId ?: ""
         )
 
+        // We only accept forwards from trusted session, so we need to trust on other side to
+        aliceSession2.cryptoService().setDeviceVerification(
+                DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true), aliceSession.myUserId,
+                aliceSession.sessionParams.deviceId ?: ""
+        )
+
+        aliceSession.cryptoService().deviceWithIdentityKey(aliceSecondSession.identityKey()!!, MXCRYPTO_ALGORITHM_OLM)!!.isVerified shouldBeEqualTo true
+
         // Re request
         aliceSession2.cryptoService().reRequestRoomKeyForEvent(receivedEvent.root)
 
@@ -193,7 +196,10 @@ class KeyShareTests : InstrumentedTest {
      * if the key was originally shared with him
      */
     @Test
-    fun test_reShareIfWasIntendedToBeShared() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
+    fun test_reShareIfWasIntendedToBeShared() = runCryptoTest(
+            context(),
+            cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false)
+    ) { cryptoTestHelper, commonTestHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = testData.firstSession
@@ -210,12 +216,10 @@ class KeyShareTests : InstrumentedTest {
         // As it was share previously alice should accept to reshare
         bobSession.cryptoService().reRequestRoomKeyForEvent(sentEvent.root)
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val outgoing = bobSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
-                val aliceReply = outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
-                aliceReply != null && aliceReply.result is RequestResult.Success
-            }
+        commonTestHelper.retryPeriodically {
+            val outgoing = bobSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
+            val aliceReply = outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
+            aliceReply != null && aliceReply.result is RequestResult.Success
         }
     }
 
@@ -224,7 +228,10 @@ class KeyShareTests : InstrumentedTest {
      * if the key was originally shared with him
      */
     @Test
-    fun test_reShareToUnverifiedIfWasIntendedToBeShared() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
+    fun test_reShareToUnverifiedIfWasIntendedToBeShared() = runCryptoTest(
+            context(),
+            cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false)
+    ) { cryptoTestHelper, commonTestHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceInARoom(true)
         val aliceSession = testData.firstSession
@@ -233,27 +240,22 @@ class KeyShareTests : InstrumentedTest {
         val aliceNewSession = commonTestHelper.logIntoAccount(aliceSession.myUserId, SessionTestParams(true))
 
         // we wait for alice first session to be aware of that session?
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val newSession = aliceSession.cryptoService().getUserDevices(aliceSession.myUserId)
-                        .firstOrNull { it.deviceId == aliceNewSession.sessionParams.deviceId }
-                newSession != null
-            }
+        commonTestHelper.retryPeriodically {
+            val newSession = aliceSession.cryptoService().getUserDevices(aliceSession.myUserId)
+                    .firstOrNull { it.deviceId == aliceNewSession.sessionParams.deviceId }
+            newSession != null
         }
         val sentEvent = commonTestHelper.sendTextMessage(roomFromAlice, "Hello", 1).first()
         val sentEventMegolmSession = sentEvent.root.content.toModel<EncryptedEventContent>()!!.sessionId!!
-
         // Let's try to request any how.
         // As it was share previously alice should accept to reshare
         aliceNewSession.cryptoService().reRequestRoomKeyForEvent(sentEvent.root)
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
-                val ownDeviceReply =
-                        outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
-                ownDeviceReply != null && ownDeviceReply.result is RequestResult.Success
-            }
+        commonTestHelper.retryPeriodically {
+            val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
+            val ownDeviceReply =
+                    outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
+            ownDeviceReply != null && ownDeviceReply.result is RequestResult.Success
         }
     }
 
@@ -261,7 +263,10 @@ class KeyShareTests : InstrumentedTest {
      * Tests that keys reshared with own verified session are done from the earliest known index
      */
     @Test
-    fun test_reShareFromTheEarliestKnownIndexWithOwnVerifiedSession() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
+    fun test_reShareFromTheEarliestKnownIndexWithOwnVerifiedSession() = runCryptoTest(
+            context(),
+            cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false)
+    ) { cryptoTestHelper, commonTestHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = testData.firstSession
@@ -277,12 +282,10 @@ class KeyShareTests : InstrumentedTest {
         commonTestHelper.syncSession(aliceNewSession)
 
         // we wait bob first session to be aware of that session?
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val newSession = bobSession.cryptoService().getUserDevices(aliceSession.myUserId)
-                        .firstOrNull { it.deviceId == aliceNewSession.sessionParams.deviceId }
-                newSession != null
-            }
+        commonTestHelper.retryPeriodically {
+            val newSession = bobSession.cryptoService().getUserDevices(aliceSession.myUserId)
+                    .firstOrNull { it.deviceId == aliceNewSession.sessionParams.deviceId }
+            newSession != null
         }
 
         val newEvent = commonTestHelper.sendTextMessage(roomFromBob, "The New", 1).first()
@@ -304,26 +307,22 @@ class KeyShareTests : InstrumentedTest {
         aliceNewSession.cryptoService().enableKeyGossiping(true)
         aliceNewSession.cryptoService().reRequestRoomKeyForEvent(newEvent.root)
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
-                val ownDeviceReply = outgoing?.results
-                        ?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
-                val result = ownDeviceReply?.result
-                Log.v("TEST", "own device result is $result")
-                result != null && result is RequestResult.Failure && result.code == WithHeldCode.UNVERIFIED
-            }
+        commonTestHelper.retryPeriodically {
+            val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
+            val ownDeviceReply = outgoing?.results
+                    ?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
+            val result = ownDeviceReply?.result
+            Log.v("TEST", "own device result is $result")
+            result != null && result is RequestResult.Failure && result.code == WithHeldCode.UNVERIFIED
         }
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
-                val bobDeviceReply = outgoing?.results
-                        ?.firstOrNull { it.userId == bobSession.myUserId && it.fromDevice == bobSession.sessionParams.deviceId }
-                val result = bobDeviceReply?.result
-                Log.v("TEST", "bob device result is $result")
-                result != null && result is RequestResult.Success && result.chainIndex > 0
-            }
+        commonTestHelper.retryPeriodically {
+            val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
+            val bobDeviceReply = outgoing?.results
+                    ?.firstOrNull { it.userId == bobSession.myUserId && it.fromDevice == bobSession.sessionParams.deviceId }
+            val result = bobDeviceReply?.result
+            Log.v("TEST", "bob device result is $result")
+            result != null && result is RequestResult.Success && result.chainIndex > 0
         }
 
         // it's a success but still can't decrypt first message
@@ -333,25 +332,26 @@ class KeyShareTests : InstrumentedTest {
         aliceSession.cryptoService()
                 .verificationService()
                 .markedLocallyAsManuallyVerified(aliceNewSession.myUserId, aliceNewSession.sessionParams.deviceId!!)
+        aliceNewSession.cryptoService()
+                .verificationService()
+                .markedLocallyAsManuallyVerified(aliceSession.myUserId, aliceSession.sessionParams.deviceId!!)
 
         // Let's now try to request
         aliceNewSession.cryptoService().reRequestRoomKeyForEvent(sentEvents.first().root)
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                // DEBUG LOGS
-                aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().forEach { keyRequest ->
-                    Log.v("TEST", "=========================")
-                    Log.v("TEST", "requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId}")
-                    Log.v("TEST", "replies -> ${keyRequest.results.joinToString { it.toString() }}")
-                    Log.v("TEST", "=========================")
-                }
-                val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
-                val ownDeviceReply =
-                        outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
-                val result = ownDeviceReply?.result
-                result != null && result is RequestResult.Success && result.chainIndex == 0
+        commonTestHelper.retryPeriodically {
+            // DEBUG LOGS
+            aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().forEach { keyRequest ->
+                Log.v("TEST", "=========================")
+                Log.v("TEST", "requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId}")
+                Log.v("TEST", "replies -> ${keyRequest.results.joinToString { it.toString() }}")
+                Log.v("TEST", "=========================")
             }
+            val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
+            val ownDeviceReply =
+                    outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
+            val result = ownDeviceReply?.result
+            result != null && result is RequestResult.Success && result.chainIndex == 0
         }
 
         // now the new session should be able to decrypt all!
@@ -363,13 +363,11 @@ class KeyShareTests : InstrumentedTest {
         )
 
         // Additional test, can we check that bob replied successfully but with a ratcheted key
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
-                val bobReply = outgoing?.results?.firstOrNull { it.userId == bobSession.myUserId }
-                val result = bobReply?.result
-                result != null && result is RequestResult.Success && result.chainIndex == 3
-            }
+        commonTestHelper.retryPeriodically {
+            val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
+            val bobReply = outgoing?.results?.firstOrNull { it.userId == bobSession.myUserId }
+            val result = bobReply?.result
+            result != null && result is RequestResult.Success && result.chainIndex == 3
         }
 
         commonTestHelper.signOutAndClose(aliceNewSession)
@@ -381,7 +379,10 @@ class KeyShareTests : InstrumentedTest {
      * Tests that we don't cancel a request to early on first forward if the index is not good enough
      */
     @Test
-    fun test_dontCancelToEarly() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
+    fun test_dontCancelToEarly() = runCryptoTest(
+            context(),
+            cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false)
+    ) { cryptoTestHelper, commonTestHelper ->
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = testData.firstSession
         val bobSession = testData.secondSession!!
@@ -394,12 +395,10 @@ class KeyShareTests : InstrumentedTest {
         val aliceNewSession = commonTestHelper.logIntoAccount(aliceSession.myUserId, SessionTestParams(true))
 
         // we wait bob first session to be aware of that session?
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val newSession = bobSession.cryptoService().getUserDevices(aliceSession.myUserId)
-                        .firstOrNull { it.deviceId == aliceNewSession.sessionParams.deviceId }
-                newSession != null
-            }
+        commonTestHelper.retryPeriodically {
+            val newSession = bobSession.cryptoService().getUserDevices(aliceSession.myUserId)
+                    .firstOrNull { it.deviceId == aliceNewSession.sessionParams.deviceId }
+            newSession != null
         }
 
         val newEvent = commonTestHelper.sendTextMessage(roomFromBob, "The New", 1).first()
@@ -421,6 +420,9 @@ class KeyShareTests : InstrumentedTest {
         aliceSession.cryptoService()
                 .verificationService()
                 .markedLocallyAsManuallyVerified(aliceNewSession.myUserId, aliceNewSession.sessionParams.deviceId!!)
+        aliceNewSession.cryptoService()
+                .verificationService()
+                .markedLocallyAsManuallyVerified(aliceSession.myUserId, aliceSession.sessionParams.deviceId!!)
 
         // /!\ Stop initial alice session syncing so that it can't reply
         aliceSession.cryptoService().enableKeyGossiping(false)
@@ -430,14 +432,12 @@ class KeyShareTests : InstrumentedTest {
         aliceNewSession.cryptoService().reRequestRoomKeyForEvent(sentEvents.first().root)
 
         // Should get a reply from bob and not from alice
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                //  Log.d("#TEST", "outgoing key requests :${aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().joinToString { it.sessionId ?: "?" }}")
-                val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
-                val bobReply = outgoing?.results?.firstOrNull { it.userId == bobSession.myUserId }
-                val result = bobReply?.result
-                result != null && result is RequestResult.Success && result.chainIndex == 3
-            }
+        commonTestHelper.retryPeriodically {
+            //  Log.d("#TEST", "outgoing key requests :${aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().joinToString { it.sessionId ?: "?" }}")
+            val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
+            val bobReply = outgoing?.results?.firstOrNull { it.userId == bobSession.myUserId }
+            val result = bobReply?.result
+            result != null && result is RequestResult.Success && result.chainIndex == 3
         }
 
         val outgoingReq = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
@@ -450,14 +450,12 @@ class KeyShareTests : InstrumentedTest {
         aliceSession.syncService().startSync(true)
 
         // We should now get a reply from first session
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
-                val ownDeviceReply =
-                        outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
-                val result = ownDeviceReply?.result
-                result != null && result is RequestResult.Success && result.chainIndex == 0
-            }
+        commonTestHelper.retryPeriodically {
+            val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
+            val ownDeviceReply =
+                    outgoing?.results?.firstOrNull { it.userId == aliceSession.myUserId && it.fromDevice == aliceSession.sessionParams.deviceId }
+            val result = ownDeviceReply?.result
+            result != null && result is RequestResult.Success && result.chainIndex == 0
         }
 
         // It should be in sent then cancel
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index 0aac4297e4..b55ddbc970 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -27,6 +27,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.RequestResult
@@ -80,10 +81,8 @@ class WithHeldTests : InstrumentedTest {
         val timelineEvent = testHelper.sendTextMessage(roomAlicePOV, "Hello Bob", 1).first()
 
         // await for bob unverified session to get the message
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                bobUnverifiedSession.getRoom(roomId)?.getTimelineEvent(timelineEvent.eventId) != null
-            }
+        testHelper.retryPeriodically {
+            bobUnverifiedSession.getRoom(roomId)?.getTimelineEvent(timelineEvent.eventId) != null
         }
 
         val eventBobPOV = bobUnverifiedSession.getRoom(roomId)?.getTimelineEvent(timelineEvent.eventId)!!
@@ -95,65 +94,60 @@ class WithHeldTests : InstrumentedTest {
 
         // Bob should not be able to decrypt because the keys is withheld
         // .. might need to wait a bit for stability?
-        testHelper.runBlockingTest {
-            mustFail(
-                    message = "This session should not be able to decrypt",
-                    failureBlock = { failure ->
-                        val type = (failure as MXCryptoError.Base).errorType
-                        val technicalMessage = failure.technicalMessage
-                        Assert.assertEquals("Error should be withheld", MXCryptoError.ErrorType.KEYS_WITHHELD, type)
-                        Assert.assertEquals("Cause should be unverified", WithHeldCode.UNVERIFIED.value, technicalMessage)
-                    }
-            ) {
-                bobUnverifiedSession.cryptoService().decryptEvent(eventBobPOV.root, "")
-            }
+        mustFail(
+                message = "This session should not be able to decrypt",
+                failureBlock = { failure ->
+                    val type = (failure as MXCryptoError.Base).errorType
+                    val technicalMessage = failure.technicalMessage
+                    Assert.assertEquals("Error should be withheld", MXCryptoError.ErrorType.KEYS_WITHHELD, type)
+                    Assert.assertEquals("Cause should be unverified", WithHeldCode.UNVERIFIED.value, technicalMessage)
+                }
+        ) {
+            bobUnverifiedSession.cryptoService().decryptEvent(eventBobPOV.root, "")
         }
 
         // Let's see if the reply we got from bob first session is unverified
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                bobUnverifiedSession.cryptoService().getOutgoingRoomKeyRequests()
-                        .firstOrNull { it.sessionId == megolmSessionId }
-                        ?.results
-                        ?.firstOrNull { it.fromDevice == bobSession.sessionParams.deviceId }
-                        ?.result
-                        ?.let {
-                            it as? RequestResult.Failure
-                        }
-                        ?.code == WithHeldCode.UNVERIFIED
-            }
+        testHelper.retryPeriodically {
+            bobUnverifiedSession.cryptoService().getOutgoingRoomKeyRequests()
+                    .firstOrNull { it.sessionId == megolmSessionId }
+                    ?.results
+                    ?.firstOrNull { it.fromDevice == bobSession.sessionParams.deviceId }
+                    ?.result
+                    ?.let {
+                        it as? RequestResult.Failure
+                    }
+                    ?.code == WithHeldCode.UNVERIFIED
         }
         // enable back sending to unverified
         aliceSession.cryptoService().setGlobalBlacklistUnverifiedDevices(false)
 
         val secondEvent = testHelper.sendTextMessage(roomAlicePOV, "Verify your device!!", 1).first()
 
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val ev = bobUnverifiedSession.getRoom(roomId)?.getTimelineEvent(secondEvent.eventId)
-                // wait until it's decrypted
-                ev?.root?.getClearType() == EventType.MESSAGE
-            }
+        testHelper.retryPeriodically {
+            val ev = bobUnverifiedSession.getRoom(roomId)?.getTimelineEvent(secondEvent.eventId)
+            // wait until it's decrypted
+            ev?.root?.getClearType() == EventType.MESSAGE
         }
 
         // Previous message should still be undecryptable (partially withheld session)
         // .. might need to wait a bit for stability?
-        testHelper.runBlockingTest {
-            mustFail(
-                    message = "This session should not be able to decrypt",
-                    failureBlock = { failure ->
-                        val type = (failure as MXCryptoError.Base).errorType
-                        val technicalMessage = failure.technicalMessage
-                        Assert.assertEquals("Error should be withheld", MXCryptoError.ErrorType.KEYS_WITHHELD, type)
-                        Assert.assertEquals("Cause should be unverified", WithHeldCode.UNVERIFIED.value, technicalMessage)
-                    }) {
-                bobUnverifiedSession.cryptoService().decryptEvent(eventBobPOV.root, "")
-            }
+        mustFail(
+                message = "This session should not be able to decrypt",
+                failureBlock = { failure ->
+                    val type = (failure as MXCryptoError.Base).errorType
+                    val technicalMessage = failure.technicalMessage
+                    Assert.assertEquals("Error should be withheld", MXCryptoError.ErrorType.KEYS_WITHHELD, type)
+                    Assert.assertEquals("Cause should be unverified", WithHeldCode.UNVERIFIED.value, technicalMessage)
+                }) {
+            bobUnverifiedSession.cryptoService().decryptEvent(eventBobPOV.root, "")
         }
     }
 
     @Test
-    fun test_WithHeldNoOlm() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+    fun test_WithHeldNoOlm() = runCryptoTest(
+            context(),
+            cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false)
+    ) { cryptoTestHelper, testHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
         val aliceSession = testData.firstSession
@@ -177,26 +171,22 @@ class WithHeldTests : InstrumentedTest {
         val eventId = testHelper.sendTextMessage(roomAlicePov, "first message", 1).first().eventId
 
         // await for bob session to get the message
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                bobSession.getRoom(testData.roomId)?.getTimelineEvent(eventId) != null
-            }
+        testHelper.retryPeriodically {
+            bobSession.getRoom(testData.roomId)?.getTimelineEvent(eventId) != null
         }
 
         // Previous message should still be undecryptable (partially withheld session)
         val eventBobPOV = bobSession.getRoom(testData.roomId)?.getTimelineEvent(eventId)
         // .. might need to wait a bit for stability?
-        testHelper.runBlockingTest {
-            mustFail(
-                    message = "This session should not be able to decrypt",
-                    failureBlock = { failure ->
-                        val type = (failure as MXCryptoError.Base).errorType
-                        val technicalMessage = failure.technicalMessage
-                        Assert.assertEquals("Error should be withheld", MXCryptoError.ErrorType.KEYS_WITHHELD, type)
-                        Assert.assertEquals("Cause should be unverified", WithHeldCode.NO_OLM.value, technicalMessage)
-                    }) {
-                bobSession.cryptoService().decryptEvent(eventBobPOV!!.root, "")
-            }
+        mustFail(
+                message = "This session should not be able to decrypt",
+                failureBlock = { failure ->
+                    val type = (failure as MXCryptoError.Base).errorType
+                    val technicalMessage = failure.technicalMessage
+                    Assert.assertEquals("Error should be withheld", MXCryptoError.ErrorType.KEYS_WITHHELD, type)
+                    Assert.assertEquals("Cause should be unverified", WithHeldCode.NO_OLM.value, technicalMessage)
+                }) {
+            bobSession.cryptoService().decryptEvent(eventBobPOV!!.root, "")
         }
 
         // Ensure that alice has marked the session to be shared with bob
@@ -216,10 +206,8 @@ class WithHeldTests : InstrumentedTest {
 
         // Check that the
         // await for bob SecondSession session to get the message
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                bobSecondSession.getRoom(testData.roomId)?.getTimelineEvent(secondMessageId) != null
-            }
+        testHelper.retryPeriodically {
+            bobSecondSession.getRoom(testData.roomId)?.getTimelineEvent(secondMessageId) != null
         }
 
         val chainIndex2 = aliceSession.cryptoService().getSharedWithInfo(testData.roomId, sessionId).getObject(
@@ -233,7 +221,10 @@ class WithHeldTests : InstrumentedTest {
     }
 
     @Test
-    fun test_WithHeldKeyRequest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+    fun test_WithHeldKeyRequest() = runCryptoTest(
+            context(),
+            cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false)
+    ) { cryptoTestHelper, testHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
         val aliceSession = testData.firstSession
@@ -258,27 +249,21 @@ class WithHeldTests : InstrumentedTest {
         var sessionId: String? = null
         // Check that the
         // await for bob SecondSession session to get the message
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val timeLineEvent = bobSecondSession.getRoom(testData.roomId)?.getTimelineEvent(eventId)?.also {
-                    // try to decrypt and force key request
-                    tryOrNull {
-                        testHelper.runBlockingTest {
-                            bobSecondSession.cryptoService().decryptEvent(it.root, "")
-                        }
-                    }
+        testHelper.retryPeriodically {
+            val timeLineEvent = bobSecondSession.getRoom(testData.roomId)?.getTimelineEvent(eventId)?.also {
+                // try to decrypt and force key request
+                tryOrNull {
+                    bobSecondSession.cryptoService().decryptEvent(it.root, "")
                 }
-                sessionId = timeLineEvent?.root?.content?.toModel<EncryptedEventContent>()?.sessionId
-                timeLineEvent != null
             }
+            sessionId = timeLineEvent?.root?.content?.toModel<EncryptedEventContent>()?.sessionId
+            timeLineEvent != null
         }
 
         // Check that bob second session requested the key
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val wc = bobSecondSession.cryptoService().getWithHeldMegolmSession(roomAlicePov.roomId, sessionId!!)
-                wc?.code == WithHeldCode.UNAUTHORISED
-            }
+        testHelper.retryPeriodically {
+            val wc = bobSecondSession.cryptoService().getWithHeldMegolmSession(roomAlicePov.roomId, sessionId!!)
+            wc?.code == WithHeldCode.UNAUTHORISED
         }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
index cf201611a0..8679cf3c99 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
@@ -30,7 +30,7 @@ internal data class KeysBackupScenarioData(
         val prepareKeysBackupDataResult: PrepareKeysBackupDataResult,
         val aliceSession2: Session
 ) {
-    fun cleanUp(testHelper: CommonTestHelper) {
+    suspend fun cleanUp(testHelper: CommonTestHelper) {
         cryptoTestData.cleanUp(testHelper)
         testHelper.signOutAndClose(aliceSession2)
     }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
index 2439119f01..01c03b8001 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -18,10 +18,10 @@ package org.matrix.android.sdk.internal.crypto.keysbackup
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
+import kotlinx.coroutines.suspendCancellableCoroutine
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder
 import org.junit.Rule
@@ -48,9 +48,11 @@ import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.TestConstants
-import org.matrix.android.sdk.common.TestMatrixCallback
+import org.matrix.android.sdk.common.waitFor
+import java.security.InvalidParameterException
 import java.util.Collections
 import java.util.concurrent.CountDownLatch
+import kotlin.coroutines.resume
 
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -116,7 +118,7 @@ class KeysBackupTest : InstrumentedTest {
 
         assertFalse(keysBackup.isEnabled())
 
-        val megolmBackupCreationInfo = testHelper.doSync<MegolmBackupCreationInfo> {
+        val megolmBackupCreationInfo = testHelper.waitForCallback<MegolmBackupCreationInfo> {
             keysBackup.prepareKeysBackupVersion(null, null, it)
         }
 
@@ -133,7 +135,6 @@ class KeysBackupTest : InstrumentedTest {
      */
     @Test
     fun createKeysBackupVersionTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
-
         val bobSession = testHelper.createAccount(TestConstants.USER_BOB, KeysBackupTestConstants.defaultSessionParams)
         cryptoTestHelper.initializeCrossSigning(bobSession)
 
@@ -143,14 +144,14 @@ class KeysBackupTest : InstrumentedTest {
 
         assertFalse(keysBackup.isEnabled())
 
-        val megolmBackupCreationInfo = testHelper.doSync<MegolmBackupCreationInfo> {
+        val megolmBackupCreationInfo = testHelper.waitForCallback<MegolmBackupCreationInfo> {
             keysBackup.prepareKeysBackupVersion(null, null, it)
         }
 
         assertFalse(keysBackup.isEnabled())
 
         // Create the version
-        val version = testHelper.doSync<KeysVersion> {
+        val version = testHelper.waitForCallback<KeysVersion> {
             keysBackup.createKeysBackupVersion(megolmBackupCreationInfo, it)
         }
 
@@ -158,10 +159,10 @@ class KeysBackupTest : InstrumentedTest {
         assertTrue(keysBackup.isEnabled())
 
         // Check that it's signed with MSK
-        val versionResult = testHelper.doSync<KeysVersionResult?> {
+        val versionResult = testHelper.waitForCallback<KeysVersionResult?> {
             keysBackup.getVersion(version.version, it)
         }
-        val trust = testHelper.doSync<KeysBackupVersionTrust> {
+        val trust = testHelper.waitForCallback<KeysBackupVersionTrust> {
             keysBackup.getKeysBackupTrust(versionResult!!, it)
         }
 
@@ -257,7 +258,7 @@ class KeysBackupTest : InstrumentedTest {
 
         var lastBackedUpKeysProgress = 0
 
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             keysBackup.backupAllGroupSessions(object : ProgressListener {
                 override fun onProgress(progress: Int, total: Int) {
                     assertEquals(nbOfKeys, total)
@@ -299,7 +300,7 @@ class KeysBackupTest : InstrumentedTest {
         val keyBackupCreationInfo = keysBackupTestHelper.prepareAndCreateKeysBackupData(keysBackup).megolmBackupCreationInfo
 
         // - Check encryptGroupSession() returns stg
-        val keyBackupData = testHelper.runBlockingTest { keysBackup.encryptGroupSession(session) }
+        val keyBackupData = keysBackup.encryptGroupSession(session)
         assertNotNull(keyBackupData)
         assertNotNull(keyBackupData!!.sessionData)
 
@@ -334,7 +335,7 @@ class KeysBackupTest : InstrumentedTest {
         val testData = keysBackupTestHelper.createKeysBackupScenarioWithPassword(null)
 
         // - Restore the e2e backup from the homeserver
-        val importRoomKeysResult = testHelper.doSync<ImportRoomKeysResult> {
+        val importRoomKeysResult = testHelper.waitForCallback<ImportRoomKeysResult> {
             testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(
                     testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
                     testData.prepareKeysBackupDataResult.megolmBackupCreationInfo.recoveryKey,
@@ -379,7 +380,7 @@ class KeysBackupTest : InstrumentedTest {
 //        assertTrue(unsentRequest != null || sentRequest != null)
 //
 //        // - Restore the e2e backup from the homeserver
-//        val importRoomKeysResult = mTestHelper.doSync<ImportRoomKeysResult> {
+//        val importRoomKeysResult = mTestHelper.doSyncSuspending<> {  }<ImportRoomKeysResult> {
 //            testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
 //                    testData.prepareKeysBackupDataResult.megolmBackupCreationInfo.recoveryKey,
 //                    null,
@@ -429,7 +430,7 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Trust the backup from the new device
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             testData.aliceSession2.cryptoService().keysBackupService().trustKeysBackupVersion(
                     testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
                     true,
@@ -445,14 +446,14 @@ class KeysBackupTest : InstrumentedTest {
         assertTrue(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
 
         // - Retrieve the last version from the server
-        val keysVersionResult = testHelper.doSync<KeysBackupLastVersionResult> {
+        val keysVersionResult = testHelper.waitForCallback<KeysBackupLastVersionResult> {
             testData.aliceSession2.cryptoService().keysBackupService().getCurrentVersion(it)
         }.toKeysVersionResult()
 
         // - It must be the same
         assertEquals(testData.prepareKeysBackupDataResult.version, keysVersionResult!!.version)
 
-        val keysBackupVersionTrust = testHelper.doSync<KeysBackupVersionTrust> {
+        val keysBackupVersionTrust = testHelper.waitForCallback<KeysBackupVersionTrust> {
             testData.aliceSession2.cryptoService().keysBackupService().getKeysBackupTrust(keysVersionResult, it)
         }
 
@@ -489,7 +490,7 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Trust the backup from the new device with the recovery key
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             testData.aliceSession2.cryptoService().keysBackupService().trustKeysBackupVersionWithRecoveryKey(
                     testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
                     testData.prepareKeysBackupDataResult.megolmBackupCreationInfo.recoveryKey,
@@ -505,14 +506,14 @@ class KeysBackupTest : InstrumentedTest {
         assertTrue(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
 
         // - Retrieve the last version from the server
-        val keysVersionResult = testHelper.doSync<KeysBackupLastVersionResult> {
+        val keysVersionResult = testHelper.waitForCallback<KeysBackupLastVersionResult> {
             testData.aliceSession2.cryptoService().keysBackupService().getCurrentVersion(it)
         }.toKeysVersionResult()
 
         // - It must be the same
         assertEquals(testData.prepareKeysBackupDataResult.version, keysVersionResult!!.version)
 
-        val keysBackupVersionTrust = testHelper.doSync<KeysBackupVersionTrust> {
+        val keysBackupVersionTrust = testHelper.waitForCallback<KeysBackupVersionTrust> {
             testData.aliceSession2.cryptoService().keysBackupService().getKeysBackupTrust(keysVersionResult, it)
         }
 
@@ -547,13 +548,13 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Try to trust the backup from the new device with a wrong recovery key
-        val latch = CountDownLatch(1)
-        testData.aliceSession2.cryptoService().keysBackupService().trustKeysBackupVersionWithRecoveryKey(
-                testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
-                "Bad recovery key",
-                TestMatrixCallback(latch, false)
-        )
-        testHelper.await(latch)
+        testHelper.waitForCallbackError<Unit> {
+            testData.aliceSession2.cryptoService().keysBackupService().trustKeysBackupVersionWithRecoveryKey(
+                    testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
+                    "Bad recovery key",
+                    it
+            )
+        }
 
         // - The new device must still see the previous backup as not trusted
         assertNotNull(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion)
@@ -591,7 +592,7 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Trust the backup from the new device with the password
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             testData.aliceSession2.cryptoService().keysBackupService().trustKeysBackupVersionWithPassphrase(
                     testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
                     password,
@@ -607,14 +608,14 @@ class KeysBackupTest : InstrumentedTest {
         assertTrue(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
 
         // - Retrieve the last version from the server
-        val keysVersionResult = testHelper.doSync<KeysBackupLastVersionResult> {
+        val keysVersionResult = testHelper.waitForCallback<KeysBackupLastVersionResult> {
             testData.aliceSession2.cryptoService().keysBackupService().getCurrentVersion(it)
         }.toKeysVersionResult()
 
         // - It must be the same
         assertEquals(testData.prepareKeysBackupDataResult.version, keysVersionResult!!.version)
 
-        val keysBackupVersionTrust = testHelper.doSync<KeysBackupVersionTrust> {
+        val keysBackupVersionTrust = testHelper.waitForCallback<KeysBackupVersionTrust> {
             testData.aliceSession2.cryptoService().keysBackupService().getKeysBackupTrust(keysVersionResult, it)
         }
 
@@ -652,13 +653,13 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Try to trust the backup from the new device with a wrong password
-        val latch = CountDownLatch(1)
-        testData.aliceSession2.cryptoService().keysBackupService().trustKeysBackupVersionWithPassphrase(
-                testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
-                badPassword,
-                TestMatrixCallback(latch, false)
-        )
-        testHelper.await(latch)
+        testHelper.waitForCallbackError<Unit> {
+            testData.aliceSession2.cryptoService().keysBackupService().trustKeysBackupVersionWithPassphrase(
+                    testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
+                    badPassword,
+                    it
+            )
+        }
 
         // - The new device must still see the previous backup as not trusted
         assertNotNull(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion)
@@ -679,26 +680,21 @@ class KeysBackupTest : InstrumentedTest {
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val testData = keysBackupTestHelper.createKeysBackupScenarioWithPassword(null)
+        val keysBackupService = testData.aliceSession2.cryptoService().keysBackupService()
 
         // - Try to restore the e2e backup with a wrong recovery key
-        val latch2 = CountDownLatch(1)
-        var importRoomKeysResult: ImportRoomKeysResult? = null
-        testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
-                "EsTc LW2K PGiF wKEA 3As5 g5c4 BXwk qeeJ ZJV8 Q9fu gUMN UE4d",
-                null,
-                null,
-                null,
-                object : TestMatrixCallback<ImportRoomKeysResult>(latch2, false) {
-                    override fun onSuccess(data: ImportRoomKeysResult) {
-                        importRoomKeysResult = data
-                        super.onSuccess(data)
-                    }
-                }
-        )
-        testHelper.await(latch2)
+        val importRoomKeysResult = testHelper.waitForCallbackError<ImportRoomKeysResult> {
+            keysBackupService.restoreKeysWithRecoveryKey(
+                    keysBackupService.keysBackupVersion!!,
+                    "EsTc LW2K PGiF wKEA 3As5 g5c4 BXwk qeeJ ZJV8 Q9fu gUMN UE4d",
+                    null,
+                    null,
+                    null,
+                    it
+            )
+        }
 
-        // onSuccess may not have been called
-        assertNull(importRoomKeysResult)
+        assertTrue(importRoomKeysResult is InvalidParameterException)
     }
 
     /**
@@ -718,7 +714,7 @@ class KeysBackupTest : InstrumentedTest {
         // - Restore the e2e backup with the password
         val steps = ArrayList<StepProgressListener.Step>()
 
-        val importRoomKeysResult = testHelper.doSync<ImportRoomKeysResult> {
+        val importRoomKeysResult = testHelper.waitForCallback<ImportRoomKeysResult> {
             testData.aliceSession2.cryptoService().keysBackupService().restoreKeyBackupWithPassword(
                     testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
                     password,
@@ -771,26 +767,21 @@ class KeysBackupTest : InstrumentedTest {
         val wrongPassword = "passw0rd"
 
         val testData = keysBackupTestHelper.createKeysBackupScenarioWithPassword(password)
+        val keysBackupService = testData.aliceSession2.cryptoService().keysBackupService()
 
         // - Try to restore the e2e backup with a wrong password
-        val latch2 = CountDownLatch(1)
-        var importRoomKeysResult: ImportRoomKeysResult? = null
-        testData.aliceSession2.cryptoService().keysBackupService().restoreKeyBackupWithPassword(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
-                wrongPassword,
-                null,
-                null,
-                null,
-                object : TestMatrixCallback<ImportRoomKeysResult>(latch2, false) {
-                    override fun onSuccess(data: ImportRoomKeysResult) {
-                        importRoomKeysResult = data
-                        super.onSuccess(data)
-                    }
-                }
-        )
-        testHelper.await(latch2)
+        val importRoomKeysResult = testHelper.waitForCallbackError<ImportRoomKeysResult> {
+            keysBackupService.restoreKeyBackupWithPassword(
+                    keysBackupService.keysBackupVersion!!,
+                    wrongPassword,
+                    null,
+                    null,
+                    null,
+                    it
+            )
+        }
 
-        // onSuccess may not have been called
-        assertNull(importRoomKeysResult)
+        assertTrue(importRoomKeysResult is InvalidParameterException)
     }
 
     /**
@@ -808,7 +799,7 @@ class KeysBackupTest : InstrumentedTest {
         val testData = keysBackupTestHelper.createKeysBackupScenarioWithPassword(password)
 
         // - Restore the e2e backup with the recovery key.
-        val importRoomKeysResult = testHelper.doSync<ImportRoomKeysResult> {
+        val importRoomKeysResult = testHelper.waitForCallback<ImportRoomKeysResult> {
             testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(
                     testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
                     testData.prepareKeysBackupDataResult.megolmBackupCreationInfo.recoveryKey,
@@ -833,26 +824,21 @@ class KeysBackupTest : InstrumentedTest {
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val testData = keysBackupTestHelper.createKeysBackupScenarioWithPassword(null)
+        val keysBackupService = testData.aliceSession2.cryptoService().keysBackupService()
 
         // - Try to restore the e2e backup with a password
-        val latch2 = CountDownLatch(1)
-        var importRoomKeysResult: ImportRoomKeysResult? = null
-        testData.aliceSession2.cryptoService().keysBackupService().restoreKeyBackupWithPassword(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
-                "password",
-                null,
-                null,
-                null,
-                object : TestMatrixCallback<ImportRoomKeysResult>(latch2, false) {
-                    override fun onSuccess(data: ImportRoomKeysResult) {
-                        importRoomKeysResult = data
-                        super.onSuccess(data)
-                    }
-                }
-        )
-        testHelper.await(latch2)
+        val importRoomKeysResult = testHelper.waitForCallbackError<ImportRoomKeysResult> {
+            keysBackupService.restoreKeyBackupWithPassword(
+                    keysBackupService.keysBackupVersion!!,
+                    "password",
+                    null,
+                    null,
+                    null,
+                    it
+            )
+        }
 
-        // onSuccess may not have been called
-        assertNull(importRoomKeysResult)
+        assertTrue(importRoomKeysResult is IllegalStateException)
     }
 
     /**
@@ -874,12 +860,12 @@ class KeysBackupTest : InstrumentedTest {
         keysBackupTestHelper.prepareAndCreateKeysBackupData(keysBackup)
 
         // Get key backup version from the homeserver
-        val keysVersionResult = testHelper.doSync<KeysBackupLastVersionResult> {
+        val keysVersionResult = testHelper.waitForCallback<KeysBackupLastVersionResult> {
             keysBackup.getCurrentVersion(it)
         }.toKeysVersionResult()
 
         // - Check the returned KeyBackupVersion is trusted
-        val keysBackupVersionTrust = testHelper.doSync<KeysBackupVersionTrust> {
+        val keysBackupVersionTrust = testHelper.waitForCallback<KeysBackupVersionTrust> {
             keysBackup.getKeysBackupTrust(keysVersionResult!!, it)
         }
 
@@ -918,34 +904,39 @@ class KeysBackupTest : InstrumentedTest {
         assertFalse(keysBackup.isEnabled())
 
         // Wait for keys backup to be finished
-        val latch0 = CountDownLatch(1)
         var count = 0
-        keysBackup.addListener(object : KeysBackupStateListener {
-            override fun onStateChange(newState: KeysBackupState) {
-                // Check the backup completes
-                if (newState == KeysBackupState.ReadyToBackUp) {
-                    count++
+        waitFor(
+                continueWhen = {
+                    suspendCancellableCoroutine<Unit> { continuation ->
+                        val listener = object : KeysBackupStateListener {
+                            override fun onStateChange(newState: KeysBackupState) {
+                                // Check the backup completes
+                                if (newState == KeysBackupState.ReadyToBackUp) {
+                                    count++
 
-                    if (count == 2) {
-                        // Remove itself from the list of listeners
-                        keysBackup.removeListener(this)
-
-                        latch0.countDown()
+                                    if (count == 2) {
+                                        // Remove itself from the list of listeners
+                                        keysBackup.removeListener(this)
+                                        continuation.resume(Unit)
+                                    }
+                                }
+                            }
+                        }
+                        keysBackup.addListener(listener)
+                        continuation.invokeOnCancellation { keysBackup.removeListener(listener) }
                     }
-                }
-            }
-        })
-
-        // - Make alice back up her keys to her homeserver
-        keysBackupTestHelper.prepareAndCreateKeysBackupData(keysBackup)
+                },
+                action = {
+                    // - Make alice back up her keys to her homeserver
+                    keysBackupTestHelper.prepareAndCreateKeysBackupData(keysBackup)
+                },
+        )
 
         assertTrue(keysBackup.isEnabled())
 
-        testHelper.await(latch0)
-
         // - Create a new backup with fake data on the homeserver, directly using the rest client
         val megolmBackupCreationInfo = cryptoTestHelper.createFakeMegolmBackupCreationInfo()
-        testHelper.doSync<KeysVersion> {
+        testHelper.waitForCallback<KeysVersion> {
             (keysBackup as DefaultKeysBackupService).createFakeKeysBackupVersion(megolmBackupCreationInfo, it)
         }
 
@@ -953,9 +944,7 @@ class KeysBackupTest : InstrumentedTest {
         (cryptoTestData.firstSession.cryptoService().keysBackupService() as DefaultKeysBackupService).store.resetBackupMarkers()
 
         // - Make alice back up all her keys again
-        val latch2 = CountDownLatch(1)
-        keysBackup.backupAllGroupSessions(null, TestMatrixCallback(latch2, false))
-        testHelper.await(latch2)
+        testHelper.waitForCallbackError<Unit> { keysBackup.backupAllGroupSessions(null, it) }
 
         // -> That must fail and her backup state must be WrongBackUpVersion
         assertEquals(KeysBackupState.WrongBackUpVersion, keysBackup.getState())
@@ -991,7 +980,7 @@ class KeysBackupTest : InstrumentedTest {
         keysBackupTestHelper.prepareAndCreateKeysBackupData(keysBackup)
 
         // Wait for keys backup to finish by asking again to backup keys.
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             keysBackup.backupAllGroupSessions(null, it)
         }
 
@@ -1016,19 +1005,7 @@ class KeysBackupTest : InstrumentedTest {
 
         val stateObserver2 = StateObserver(keysBackup2)
 
-        var isSuccessful = false
-        val latch2 = CountDownLatch(1)
-        keysBackup2.backupAllGroupSessions(
-                null,
-                object : TestMatrixCallback<Unit>(latch2, false) {
-                    override fun onSuccess(data: Unit) {
-                        isSuccessful = true
-                        super.onSuccess(data)
-                    }
-                })
-        testHelper.await(latch2)
-
-        assertFalse(isSuccessful)
+        testHelper.waitForCallbackError<Unit> { keysBackup2.backupAllGroupSessions(null, it) }
 
         // Backup state must be NotTrusted
         assertEquals("Backup state must be NotTrusted", KeysBackupState.NotTrusted, keysBackup2.getState())
@@ -1042,24 +1019,25 @@ class KeysBackupTest : InstrumentedTest {
         )
 
         // -> Backup should automatically enable on the new device
-        val latch4 = CountDownLatch(1)
-        keysBackup2.addListener(object : KeysBackupStateListener {
-            override fun onStateChange(newState: KeysBackupState) {
-                // Check the backup completes
-                if (keysBackup2.getState() == KeysBackupState.ReadyToBackUp) {
-                    // Remove itself from the list of listeners
-                    keysBackup2.removeListener(this)
-
-                    latch4.countDown()
+        suspendCancellableCoroutine<Unit> { continuation ->
+            val listener = object : KeysBackupStateListener {
+                override fun onStateChange(newState: KeysBackupState) {
+                    // Check the backup completes
+                    if (keysBackup2.getState() == KeysBackupState.ReadyToBackUp) {
+                        // Remove itself from the list of listeners
+                        keysBackup2.removeListener(this)
+                        continuation.resume(Unit)
+                    }
                 }
             }
-        })
-        testHelper.await(latch4)
+            keysBackup2.addListener(listener)
+            continuation.invokeOnCancellation { keysBackup2.removeListener(listener) }
+        }
 
         // -> It must use the same backup version
         assertEquals(oldKeyBackupVersion, aliceSession2.cryptoService().keysBackupService().currentBackupVersion)
 
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             aliceSession2.cryptoService().keysBackupService().backupAllGroupSessions(null, it)
         }
 
@@ -1092,7 +1070,7 @@ class KeysBackupTest : InstrumentedTest {
         assertTrue(keysBackup.isEnabled())
 
         // Delete the backup
-        testHelper.doSync<Unit> { keysBackup.deleteBackup(keyBackupCreationInfo.version, it) }
+        testHelper.waitForCallback<Unit> { keysBackup.deleteBackup(keyBackupCreationInfo.version, it) }
 
         // Backup is now disabled
         assertFalse(keysBackup.isEnabled())
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
index 2cc2b506b9..10abf93bcb 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.crypto.keysbackup
 
+import kotlinx.coroutines.suspendCancellableCoroutine
 import org.junit.Assert
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.Session
@@ -29,7 +30,7 @@ import org.matrix.android.sdk.common.CryptoTestHelper
 import org.matrix.android.sdk.common.assertDictEquals
 import org.matrix.android.sdk.common.assertListEquals
 import org.matrix.android.sdk.internal.crypto.MegolmSessionData
-import java.util.concurrent.CountDownLatch
+import kotlin.coroutines.resume
 
 internal class KeysBackupTestHelper(
         private val testHelper: CommonTestHelper,
@@ -47,7 +48,7 @@ internal class KeysBackupTestHelper(
      *
      * @param password optional password
      */
-    fun createKeysBackupScenarioWithPassword(password: String?): KeysBackupScenarioData {
+    suspend fun createKeysBackupScenarioWithPassword(password: String?): KeysBackupScenarioData {
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoomWithEncryptedMessages()
 
         waitForKeybackUpBatching()
@@ -64,7 +65,7 @@ internal class KeysBackupTestHelper(
 
         var lastProgress = 0
         var lastTotal = 0
-        testHelper.doSync<Unit> {
+        testHelper.waitForCallback<Unit> {
             keysBackup.backupAllGroupSessions(object : ProgressListener {
                 override fun onProgress(progress: Int, total: Int) {
                     lastProgress = progress
@@ -97,13 +98,13 @@ internal class KeysBackupTestHelper(
         )
     }
 
-    fun prepareAndCreateKeysBackupData(
+    suspend fun prepareAndCreateKeysBackupData(
             keysBackup: KeysBackupService,
             password: String? = null
     ): PrepareKeysBackupDataResult {
         val stateObserver = StateObserver(keysBackup)
 
-        val megolmBackupCreationInfo = testHelper.doSync<MegolmBackupCreationInfo> {
+        val megolmBackupCreationInfo = testHelper.waitForCallback<MegolmBackupCreationInfo> {
             keysBackup.prepareKeysBackupVersion(password, null, it)
         }
 
@@ -112,7 +113,7 @@ internal class KeysBackupTestHelper(
         Assert.assertFalse("Key backup should not be enabled before creation", keysBackup.isEnabled())
 
         // Create the version
-        val keysVersion = testHelper.doSync<KeysVersion> {
+        val keysVersion = testHelper.waitForCallback<KeysVersion> {
             keysBackup.createKeysBackupVersion(megolmBackupCreationInfo, it)
         }
 
@@ -129,25 +130,26 @@ internal class KeysBackupTestHelper(
      * As KeysBackup is doing asynchronous call to update its internal state, this method help to wait for the
      * KeysBackup object to be in the specified state
      */
-    fun waitForKeysBackupToBeInState(session: Session, state: KeysBackupState) {
+    suspend fun waitForKeysBackupToBeInState(session: Session, state: KeysBackupState) {
         // If already in the wanted state, return
-        if (session.cryptoService().keysBackupService().getState() == state) {
+        val keysBackupService = session.cryptoService().keysBackupService()
+        if (keysBackupService.getState() == state) {
             return
         }
 
         // Else observe state changes
-        val latch = CountDownLatch(1)
-
-        session.cryptoService().keysBackupService().addListener(object : KeysBackupStateListener {
-            override fun onStateChange(newState: KeysBackupState) {
-                if (newState == state) {
-                    session.cryptoService().keysBackupService().removeListener(this)
-                    latch.countDown()
+        suspendCancellableCoroutine<Unit> { continuation ->
+            val listener = object : KeysBackupStateListener {
+                override fun onStateChange(newState: KeysBackupState) {
+                    if (newState == state) {
+                        keysBackupService.removeListener(this)
+                        continuation.resume(Unit)
+                    }
                 }
             }
-        })
-
-        testHelper.await(latch)
+            keysBackupService.addListener(listener)
+            continuation.invokeOnCancellation { keysBackupService.removeListener(listener) }
+        }
     }
 
     fun assertKeysEquals(keys1: MegolmSessionData?, keys2: MegolmSessionData?) {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/replayattack/ReplayAttackTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/replayattack/ReplayAttackTest.kt
index 53cf802b91..0dfecffbde 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/replayattack/ReplayAttackTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/replayattack/ReplayAttackTest.kt
@@ -58,18 +58,16 @@ class ReplayAttackTest : InstrumentedTest {
         val fakeEventWithTheSameIndex =
                 sentEvents[0].copy(eventId = fakeEventId, root = sentEvents[0].root.copy(eventId = fakeEventId))
 
-        testHelper.runBlockingTest {
-            // Lets assume we are from the main timelineId
-            val timelineId = "timelineId"
-            // Lets decrypt the original event
-            aliceSession.cryptoService().decryptEvent(sentEvents[0].root, timelineId)
-            // Lets decrypt the fake event that will have the same message index
-            val exception = assertFailsWith<MXCryptoError.Base> {
-                // An exception should be thrown while the same index would have been used for the previous decryption
-                aliceSession.cryptoService().decryptEvent(fakeEventWithTheSameIndex.root, timelineId)
-            }
-            assertEquals(MXCryptoError.ErrorType.DUPLICATED_MESSAGE_INDEX, exception.errorType)
+        // Lets assume we are from the main timelineId
+        val timelineId = "timelineId"
+        // Lets decrypt the original event
+        aliceSession.cryptoService().decryptEvent(sentEvents[0].root, timelineId)
+        // Lets decrypt the fake event that will have the same message index
+        val exception = assertFailsWith<MXCryptoError.Base> {
+            // An exception should be thrown while the same index would have been used for the previous decryption
+            aliceSession.cryptoService().decryptEvent(fakeEventWithTheSameIndex.root, timelineId)
         }
+        assertEquals(MXCryptoError.ErrorType.DUPLICATED_MESSAGE_INDEX, exception.errorType)
         cryptoTestData.cleanUp(testHelper)
     }
 
@@ -93,17 +91,15 @@ class ReplayAttackTest : InstrumentedTest {
         Assert.assertTrue("Message should be sent", sentEvents.size == 1)
         assertEquals(sentEvents.size, 1)
 
-        testHelper.runBlockingTest {
-            // Lets assume we are from the main timelineId
-            val timelineId = "timelineId"
-            // Lets decrypt the original event
+        // Lets assume we are from the main timelineId
+        val timelineId = "timelineId"
+        // Lets decrypt the original event
+        aliceSession.cryptoService().decryptEvent(sentEvents[0].root, timelineId)
+        try {
+            // Lets try to decrypt the same event
             aliceSession.cryptoService().decryptEvent(sentEvents[0].root, timelineId)
-            try {
-                // Lets try to decrypt the same event
-                aliceSession.cryptoService().decryptEvent(sentEvents[0].root, timelineId)
-            } catch (ex: Throwable) {
-                fail("Shouldn't throw a decryption error for same event")
-            }
+        } catch (ex: Throwable) {
+            fail("Shouldn't throw a decryption error for same event")
         }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index c8be6aae74..0467d082a3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.crypto.ssss
 
-import androidx.lifecycle.Observer
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -37,12 +36,12 @@ import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
 import org.matrix.android.sdk.api.session.securestorage.SecretStorageKeyContent
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageError
 import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
-import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toBase64NoPadding
-import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.common.first
+import org.matrix.android.sdk.common.onMain
 import org.matrix.android.sdk.internal.crypto.secrets.DefaultSharedSecretStorageService
 
 @RunWith(AndroidJUnit4::class)
@@ -64,22 +63,14 @@ class QuadSTests : InstrumentedTest {
 
         val TEST_KEY_ID = "my.test.Key"
 
-        testHelper.runBlockingTest {
-            quadS.generateKey(TEST_KEY_ID, null, "Test Key", emptyKeySigner)
-        }
+        quadS.generateKey(TEST_KEY_ID, null, "Test Key", emptyKeySigner)
 
-        var accountData: UserAccountDataEvent? = null
         // Assert Account data is updated
-        testHelper.waitWithLatch {
-            val liveAccountData = aliceSession.accountDataService().getLiveUserAccountDataEvent("${DefaultSharedSecretStorageService.KEY_ID_BASE}.$TEST_KEY_ID")
-            val accountDataObserver = Observer<Optional<UserAccountDataEvent>?> { t ->
-                if (t?.getOrNull()?.type == "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$TEST_KEY_ID") {
-                    accountData = t.getOrNull()
-                }
-                it.countDown()
-            }
-            liveAccountData.observeForever(accountDataObserver)
-        }
+        val accountData = aliceSession.accountDataService()
+                .onMain { getLiveUserAccountDataEvent("${DefaultSharedSecretStorageService.KEY_ID_BASE}.$TEST_KEY_ID") }
+                .first { it.getOrNull()?.type == "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$TEST_KEY_ID" }
+                .getOrNull()
+
         assertNotNull("Key should be stored in account data", accountData)
         val parsed = SecretStorageKeyContent.fromJson(accountData!!.content)
         assertNotNull("Key Content cannot be parsed", parsed)
@@ -87,20 +78,13 @@ class QuadSTests : InstrumentedTest {
         assertEquals("Unexpected key name", "Test Key", parsed.name)
         assertNull("Key was not generated from passphrase", parsed.passphrase)
 
-        var defaultKeyAccountData: UserAccountDataEvent? = null
+        quadS.setDefaultKey(TEST_KEY_ID)
+        val defaultKeyAccountData = aliceSession.accountDataService()
+                .onMain { getLiveUserAccountDataEvent(DefaultSharedSecretStorageService.DEFAULT_KEY_ID) }
+                .first { it.getOrNull()?.type == DefaultSharedSecretStorageService.DEFAULT_KEY_ID }
+                .getOrNull()
+
         // Set as default key
-        testHelper.waitWithLatch { latch ->
-            quadS.setDefaultKey(TEST_KEY_ID)
-            val liveDefAccountData =
-                    aliceSession.accountDataService().getLiveUserAccountDataEvent(DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
-            val accountDefDataObserver = Observer<Optional<UserAccountDataEvent>?> { t ->
-                if (t?.getOrNull()?.type == DefaultSharedSecretStorageService.DEFAULT_KEY_ID) {
-                    defaultKeyAccountData = t.getOrNull()!!
-                    latch.countDown()
-                }
-            }
-            liveDefAccountData.observeForever(accountDefDataObserver)
-        }
         assertNotNull(defaultKeyAccountData?.content)
         assertEquals("Unexpected default key ${defaultKeyAccountData?.content}", TEST_KEY_ID, defaultKeyAccountData?.content?.get("key"))
 
@@ -112,21 +96,19 @@ class QuadSTests : InstrumentedTest {
 
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
         val keyId = "My.Key"
-        val info = generatedSecret(testHelper, aliceSession, keyId, true)
+        val info = generatedSecret(aliceSession, keyId, true)
 
         val keySpec = RawBytesKeySpec.fromRecoveryKey(info.recoveryKey)
 
         // Store a secret
         val clearSecret = "42".toByteArray().toBase64NoPadding()
-        testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService().storeSecret(
-                    "secret.of.life",
-                    clearSecret,
-                    listOf(KeyRef(null, keySpec)) // default key
-            )
-        }
+        aliceSession.sharedSecretStorageService().storeSecret(
+                "secret.of.life",
+                clearSecret,
+                listOf(KeyRef(null, keySpec)) // default key
+        )
 
-        val secretAccountData = assertAccountData(testHelper, aliceSession, "secret.of.life")
+        val secretAccountData = assertAccountData(aliceSession, "secret.of.life")
 
         val encryptedContent = secretAccountData.content["encrypted"] as? Map<*, *>
         assertNotNull("Element should be encrypted", encryptedContent)
@@ -139,13 +121,11 @@ class QuadSTests : InstrumentedTest {
 
         // Try to decrypt??
 
-        val decryptedSecret = testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService().getSecret(
-                    "secret.of.life",
-                    null, // default key
-                    keySpec!!
-            )
-        }
+        val decryptedSecret = aliceSession.sharedSecretStorageService().getSecret(
+                "secret.of.life",
+                null, // default key
+                keySpec!!
+        )
 
         assertEquals("Secret mismatch", clearSecret, decryptedSecret)
     }
@@ -159,14 +139,10 @@ class QuadSTests : InstrumentedTest {
 
         val TEST_KEY_ID = "my.test.Key"
 
-        testHelper.runBlockingTest {
-            quadS.generateKey(TEST_KEY_ID, null, "Test Key", emptyKeySigner)
-        }
+        quadS.generateKey(TEST_KEY_ID, null, "Test Key", emptyKeySigner)
 
         // Test that we don't need to wait for an account data sync to access directly the keyid from DB
-        testHelper.runBlockingTest {
-            quadS.setDefaultKey(TEST_KEY_ID)
-        }
+        quadS.setDefaultKey(TEST_KEY_ID)
     }
 
     @Test
@@ -174,22 +150,20 @@ class QuadSTests : InstrumentedTest {
 
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
         val keyId1 = "Key.1"
-        val key1Info = generatedSecret(testHelper, aliceSession, keyId1, true)
+        val key1Info = generatedSecret(aliceSession, keyId1, true)
         val keyId2 = "Key2"
-        val key2Info = generatedSecret(testHelper, aliceSession, keyId2, true)
+        val key2Info = generatedSecret(aliceSession, keyId2, true)
 
         val mySecretText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
 
-        testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService().storeSecret(
-                    "my.secret",
-                    mySecretText.toByteArray().toBase64NoPadding(),
-                    listOf(
-                            KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)),
-                            KeyRef(keyId2, RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey))
-                    )
-            )
-        }
+        aliceSession.sharedSecretStorageService().storeSecret(
+                "my.secret",
+                mySecretText.toByteArray().toBase64NoPadding(),
+                listOf(
+                        KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)),
+                        KeyRef(keyId2, RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey))
+                )
+        )
 
         val accountDataEvent = aliceSession.accountDataService().getUserAccountDataEvent("my.secret")
         val encryptedContent = accountDataEvent?.content?.get("encrypted") as? Map<*, *>
@@ -200,21 +174,17 @@ class QuadSTests : InstrumentedTest {
         assertNotNull(encryptedContent?.get(keyId2))
 
         // Assert that can decrypt with both keys
-        testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService().getSecret(
-                    "my.secret",
-                    keyId1,
-                    RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)!!
-            )
-        }
+        aliceSession.sharedSecretStorageService().getSecret(
+                "my.secret",
+                keyId1,
+                RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)!!
+        )
 
-        testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService().getSecret(
-                    "my.secret",
-                    keyId2,
-                    RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey)!!
-            )
-        }
+        aliceSession.sharedSecretStorageService().getSecret(
+                "my.secret",
+                keyId2,
+                RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey)!!
+        )
     }
 
     @Test
@@ -224,104 +194,84 @@ class QuadSTests : InstrumentedTest {
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
         val keyId1 = "Key.1"
         val passphrase = "The good pass phrase"
-        val key1Info = generatedSecretFromPassphrase(testHelper, aliceSession, passphrase, keyId1, true)
+        val key1Info = generatedSecretFromPassphrase(aliceSession, passphrase, keyId1, true)
 
         val mySecretText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
 
-        testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService().storeSecret(
-                    "my.secret",
-                    mySecretText.toByteArray().toBase64NoPadding(),
-                    listOf(KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)))
-            )
-        }
+        aliceSession.sharedSecretStorageService().storeSecret(
+                "my.secret",
+                mySecretText.toByteArray().toBase64NoPadding(),
+                listOf(KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)))
+        )
 
-        testHelper.runBlockingTest {
-            try {
-                aliceSession.sharedSecretStorageService().getSecret(
-                        "my.secret",
-                        keyId1,
-                        RawBytesKeySpec.fromPassphrase(
-                                "A bad passphrase",
-                                key1Info.content?.passphrase?.salt ?: "",
-                                key1Info.content?.passphrase?.iterations ?: 0,
-                                null
-                        )
-                )
-            } catch (throwable: Throwable) {
-                assert(throwable is SharedSecretStorageError.BadMac)
-            }
-        }
-
-        // Now try with correct key
-        testHelper.runBlockingTest {
+        try {
             aliceSession.sharedSecretStorageService().getSecret(
                     "my.secret",
                     keyId1,
                     RawBytesKeySpec.fromPassphrase(
-                            passphrase,
+                            "A bad passphrase",
                             key1Info.content?.passphrase?.salt ?: "",
                             key1Info.content?.passphrase?.iterations ?: 0,
                             null
                     )
             )
+        } catch (throwable: Throwable) {
+            assert(throwable is SharedSecretStorageError.BadMac)
         }
+
+        // Now try with correct key
+        aliceSession.sharedSecretStorageService().getSecret(
+                "my.secret",
+                keyId1,
+                RawBytesKeySpec.fromPassphrase(
+                        passphrase,
+                        key1Info.content?.passphrase?.salt ?: "",
+                        key1Info.content?.passphrase?.iterations ?: 0,
+                        null
+                )
+        )
     }
 
-    private fun assertAccountData(testHelper: CommonTestHelper, session: Session, type: String): UserAccountDataEvent {
-        var accountData: UserAccountDataEvent? = null
-        testHelper.waitWithLatch {
-            val liveAccountData = session.accountDataService().getLiveUserAccountDataEvent(type)
-            val accountDataObserver = Observer<Optional<UserAccountDataEvent>?> { t ->
-                if (t?.getOrNull()?.type == type) {
-                    accountData = t.getOrNull()
-                    it.countDown()
-                }
-            }
-            liveAccountData.observeForever(accountDataObserver)
-        }
+    private suspend fun assertAccountData(session: Session, type: String): UserAccountDataEvent {
+        val accountData = session.accountDataService()
+                .onMain { getLiveUserAccountDataEvent(type) }
+                .first { it.getOrNull()?.type == type }
+                .getOrNull()
+
         assertNotNull("Account Data type:$type should be found", accountData)
         return accountData!!
     }
 
-    private fun generatedSecret(testHelper: CommonTestHelper, session: Session, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
+    private suspend fun generatedSecret(session: Session, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
         val quadS = session.sharedSecretStorageService()
 
-        val creationInfo = testHelper.runBlockingTest {
-            quadS.generateKey(keyId, null, keyId, emptyKeySigner)
-        }
+        val creationInfo = quadS.generateKey(keyId, null, keyId, emptyKeySigner)
 
-        assertAccountData(testHelper, session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
+        assertAccountData(session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
 
         if (asDefault) {
-            testHelper.runBlockingTest {
-                quadS.setDefaultKey(keyId)
-            }
-            assertAccountData(testHelper, session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
+            quadS.setDefaultKey(keyId)
+            assertAccountData(session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
         }
 
         return creationInfo
     }
 
-    private fun generatedSecretFromPassphrase(testHelper: CommonTestHelper, session: Session, passphrase: String, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
+    private suspend fun generatedSecretFromPassphrase(session: Session, passphrase: String, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
         val quadS = session.sharedSecretStorageService()
 
-        val creationInfo = testHelper.runBlockingTest {
-            quadS.generateKeyWithPassphrase(
-                    keyId,
-                    keyId,
-                    passphrase,
-                    emptyKeySigner,
-                    null
-            )
-        }
+        val creationInfo = quadS.generateKeyWithPassphrase(
+                keyId,
+                keyId,
+                passphrase,
+                emptyKeySigner,
+                null
+        )
 
-        assertAccountData(testHelper, session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
+        assertAccountData(session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
         if (asDefault) {
-            testHelper.runBlockingTest {
-                quadS.setDefaultKey(keyId)
-            }
-            assertAccountData(testHelper, session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
+            quadS.setDefaultKey(keyId)
+            assertAccountData(session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
         }
 
         return creationInfo
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
index c2e74abc59..fd2136edd5 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
@@ -521,9 +521,9 @@ class SASTest : InstrumentedTest {
         testHelper.await(bobSASLatch)
 
         // Assert that devices are verified
-        val bobDeviceInfoFromAlicePOV: CryptoDeviceInfo? = aliceSession.cryptoService().getDeviceInfo(bobUserId, bobDeviceId)
+        val bobDeviceInfoFromAlicePOV: CryptoDeviceInfo? = aliceSession.cryptoService().getCryptoDeviceInfo(bobUserId, bobDeviceId)
         val aliceDeviceInfoFromBobPOV: CryptoDeviceInfo? =
-                bobSession.cryptoService().getDeviceInfo(aliceSession.myUserId, aliceSession.cryptoService().getMyDevice().deviceId)
+                bobSession.cryptoService().getCryptoDeviceInfo(aliceSession.myUserId, aliceSession.cryptoService().getMyDevice().deviceId)
 
         assertTrue("alice device should be verified from bob point of view", aliceDeviceInfoFromBobPOV!!.isVerified)
         assertTrue("bob device should be verified from alice point of view", bobDeviceInfoFromAlicePOV!!.isVerified)
@@ -547,23 +547,19 @@ class SASTest : InstrumentedTest {
 
         var requestID: String? = null
 
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                val prAlicePOV = aliceVerificationService.getExistingVerificationRequests(bobSession.myUserId).firstOrNull()
-                requestID = prAlicePOV?.transactionId
-                Log.v("TEST", "== alicePOV is $prAlicePOV")
-                prAlicePOV?.transactionId != null && prAlicePOV.localId == req.localId
-            }
+        testHelper.retryPeriodically {
+            val prAlicePOV = aliceVerificationService.getExistingVerificationRequests(bobSession.myUserId).firstOrNull()
+            requestID = prAlicePOV?.transactionId
+            Log.v("TEST", "== alicePOV is $prAlicePOV")
+            prAlicePOV?.transactionId != null && prAlicePOV.localId == req.localId
         }
 
         Log.v("TEST", "== requestID is $requestID")
 
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                val prBobPOV = bobVerificationService.getExistingVerificationRequests(aliceSession.myUserId).firstOrNull()
-                Log.v("TEST", "== prBobPOV is $prBobPOV")
-                prBobPOV?.transactionId == requestID
-            }
+        testHelper.retryPeriodically {
+            val prBobPOV = bobVerificationService.getExistingVerificationRequests(aliceSession.myUserId).firstOrNull()
+            Log.v("TEST", "== prBobPOV is $prBobPOV")
+            prBobPOV?.transactionId == requestID
         }
 
         bobVerificationService.readyPendingVerification(
@@ -573,12 +569,10 @@ class SASTest : InstrumentedTest {
         )
 
         // wait for alice to get the ready
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                val prAlicePOV = aliceVerificationService.getExistingVerificationRequests(bobSession.myUserId).firstOrNull()
-                Log.v("TEST", "== prAlicePOV is $prAlicePOV")
-                prAlicePOV?.transactionId == requestID && prAlicePOV?.isReady != null
-            }
+        testHelper.retryPeriodically {
+            val prAlicePOV = aliceVerificationService.getExistingVerificationRequests(bobSession.myUserId).firstOrNull()
+            Log.v("TEST", "== prAlicePOV is $prAlicePOV")
+            prAlicePOV?.transactionId == requestID && prAlicePOV?.isReady != null
         }
 
         // Start concurrent!
@@ -602,20 +596,16 @@ class SASTest : InstrumentedTest {
         var alicePovTx: SasVerificationTransaction?
         var bobPovTx: SasVerificationTransaction?
 
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                alicePovTx = aliceVerificationService.getExistingTransaction(bobSession.myUserId, requestID!!) as? SasVerificationTransaction
-                Log.v("TEST", "== alicePovTx is $alicePovTx")
-                alicePovTx?.state == VerificationTxState.ShortCodeReady
-            }
+        testHelper.retryPeriodically {
+            alicePovTx = aliceVerificationService.getExistingTransaction(bobSession.myUserId, requestID!!) as? SasVerificationTransaction
+            Log.v("TEST", "== alicePovTx is $alicePovTx")
+            alicePovTx?.state == VerificationTxState.ShortCodeReady
         }
         // wait for alice to get the ready
-        testHelper.waitWithLatch {
-            testHelper.retryPeriodicallyWithLatch(it) {
-                bobPovTx = bobVerificationService.getExistingTransaction(aliceSession.myUserId, requestID!!) as? SasVerificationTransaction
-                Log.v("TEST", "== bobPovTx is $bobPovTx")
-                bobPovTx?.state == VerificationTxState.ShortCodeReady
-            }
+        testHelper.retryPeriodically {
+            bobPovTx = bobVerificationService.getExistingTransaction(aliceSession.myUserId, requestID!!) as? SasVerificationTransaction
+            Log.v("TEST", "== bobPovTx is $bobPovTx")
+            bobPovTx?.state == VerificationTxState.ShortCodeReady
         }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
index 3f22906965..4ecfe5be8f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
@@ -164,7 +164,7 @@ class VerificationTest : InstrumentedTest {
         val aliceSession = cryptoTestData.firstSession
         val bobSession = cryptoTestData.secondSession!!
 
-        testHelper.doSync<Unit> { callback ->
+        testHelper.waitForCallback<Unit> { callback ->
             aliceSession.cryptoService().crossSigningService()
                     .initializeCrossSigning(
                             object : UserInteractiveAuthInterceptor {
@@ -181,7 +181,7 @@ class VerificationTest : InstrumentedTest {
                     )
         }
 
-        testHelper.doSync<Unit> { callback ->
+        testHelper.waitForCallback<Unit> { callback ->
             bobSession.cryptoService().crossSigningService()
                     .initializeCrossSigning(
                             object : UserInteractiveAuthInterceptor {
@@ -261,7 +261,11 @@ class VerificationTest : InstrumentedTest {
 
         val aliceSessionToVerify = testHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
         val aliceSessionThatVerifies = testHelper.logIntoAccount(aliceSessionToVerify.myUserId, TestConstants.PASSWORD, defaultSessionParams)
-        val aliceSessionThatReceivesCanceledEvent = testHelper.logIntoAccount(aliceSessionToVerify.myUserId, TestConstants.PASSWORD, defaultSessionParams)
+        val aliceSessionThatReceivesCanceledEvent = testHelper.logIntoAccount(
+                aliceSessionToVerify.myUserId,
+                TestConstants.PASSWORD,
+                defaultSessionParams
+        )
 
         val verificationMethods = listOf(VerificationMethod.SAS, VerificationMethod.QR_CODE_SCAN, VerificationMethod.QR_CODE_SHOW)
 
@@ -286,11 +290,9 @@ class VerificationTest : InstrumentedTest {
                 otherDevices = listOfNotNull(aliceSessionThatVerifies.sessionParams.deviceId, aliceSessionThatReceivesCanceledEvent.sessionParams.deviceId),
         )
 
-        testHelper.waitWithLatch { latch ->
-            testHelper.retryPeriodicallyWithLatch(latch) {
-                val requests = serviceOfUserWhoReceivesCancellation.getExistingVerificationRequests(aliceSessionToVerify.myUserId)
-                requests.any { it.cancelConclusion == CancelCode.AcceptedByAnotherDevice }
-            }
+        testHelper.retryPeriodically {
+            val requests = serviceOfUserWhoReceivesCancellation.getExistingVerificationRequests(aliceSessionToVerify.myUserId)
+            requests.any { it.cancelConclusion == CancelCode.AcceptedByAnotherDevice }
         }
 
         testHelper.signOutAndClose(aliceSessionToVerify)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/CryptoSanityMigrationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/CryptoSanityMigrationTest.kt
new file mode 100644
index 0000000000..2643bf643a
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/CryptoSanityMigrationTest.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database
+
+import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
+import io.realm.Realm
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreMigration
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule
+import org.matrix.android.sdk.internal.util.time.Clock
+
+class CryptoSanityMigrationTest {
+    @get:Rule val configurationFactory = TestRealmConfigurationFactory()
+
+    lateinit var context: Context
+    var realm: Realm? = null
+
+    @Before
+    fun setUp() {
+        context = InstrumentationRegistry.getInstrumentation().context
+    }
+
+    @After
+    fun tearDown() {
+        realm?.close()
+    }
+
+    @Test
+    fun cryptoDatabaseShouldMigrateGracefully() {
+        val realmName = "crypto_store_20.realm"
+        val migration = RealmCryptoStoreMigration(object : Clock {
+            override fun epochMillis(): Long {
+                return 0L
+            }
+        })
+        val realmConfiguration = configurationFactory.createConfiguration(
+                realmName,
+                "7b9a21a8a311e85d75b069a343c23fc952fc3fec5e0c83ecfa13f24b787479c487c3ed587db3dd1f5805d52041fc0ac246516e94b27ffa699ff928622e621aca",
+                RealmCryptoStoreModule(),
+                migration.schemaVersion,
+                migration
+        )
+        configurationFactory.copyRealmFromAssets(context, realmName, realmName)
+
+        realm = Realm.getInstance(realmConfiguration)
+    }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt
new file mode 100644
index 0000000000..e74aa52495
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database
+
+import android.content.Context
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import io.realm.Realm
+import org.amshove.kluent.fail
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldNotBe
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.internal.database.mapper.EventMapper
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SessionRealmModule
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.util.Normalizer
+
+@RunWith(AndroidJUnit4::class)
+class RealmSessionStoreMigration43Test {
+
+    @get:Rule val configurationFactory = TestRealmConfigurationFactory()
+
+    lateinit var context: Context
+    var realm: Realm? = null
+
+    @Before
+    fun setUp() {
+        context = InstrumentationRegistry.getInstrumentation().context
+    }
+
+    @After
+    fun tearDown() {
+        realm?.close()
+    }
+
+    @Test
+    fun migrationShouldBeNeeed() {
+        val realmName = "session_42.realm"
+        val realmConfiguration = configurationFactory.createConfiguration(
+                realmName,
+                "efa9ab2c77ae06b0e767ffdb1c45b12be3c77d48d94f1ac41a7cd1d637fc59ac41f869a250453074e21ce13cfe7ed535593e7d150c08ce2bad7a2ab8c7b841f0",
+                SessionRealmModule(),
+                43,
+                null
+        )
+        configurationFactory.copyRealmFromAssets(context, realmName, realmName)
+
+        try {
+            realm = Realm.getInstance(realmConfiguration)
+            fail("Should need a migration")
+        } catch (failure: Throwable) {
+            // nop
+        }
+    }
+
+    //  Database key for alias `session_db_e00482619b2597069b1f192b86de7da9`: efa9ab2c77ae06b0e767ffdb1c45b12be3c77d48d94f1ac41a7cd1d637fc59ac41f869a250453074e21ce13cfe7ed535593e7d150c08ce2bad7a2ab8c7b841f0
+    // $WEJ8U6Zsx3TDZx3qmHIOKh-mXe5kqL_MnPcIkStEwwI
+    // $11EtAQ8RYcudJVtw7e6B5Vm4ufCqKTOWKblY2U_wrpo
+    @Test
+    fun testMigration43() {
+        val realmName = "session_42.realm"
+        val migration = RealmSessionStoreMigration(Normalizer())
+        val realmConfiguration = configurationFactory.createConfiguration(
+                realmName,
+                "efa9ab2c77ae06b0e767ffdb1c45b12be3c77d48d94f1ac41a7cd1d637fc59ac41f869a250453074e21ce13cfe7ed535593e7d150c08ce2bad7a2ab8c7b841f0",
+                SessionRealmModule(),
+                43,
+                migration
+        )
+        configurationFactory.copyRealmFromAssets(context, realmName, realmName)
+
+        realm = Realm.getInstance(realmConfiguration)
+
+        // assert that the edit from 42 are migrated
+        val editions = EventAnnotationsSummaryEntity
+                .where(realm!!, "\$WEJ8U6Zsx3TDZx3qmHIOKh-mXe5kqL_MnPcIkStEwwI")
+                .findFirst()
+                ?.editSummary
+                ?.editions
+
+        editions shouldNotBe null
+        editions!!.size shouldBe 1
+        val firstEdition = editions.first()
+        firstEdition?.eventId shouldBeEqualTo "\$DvOyA8vJxwGfTaJG3OEJVcL4isShyaVDnprihy38W28"
+        firstEdition?.isLocalEcho shouldBeEqualTo false
+
+        val editEvent = EventMapper.map(firstEdition!!.event!!)
+        val body = editEvent.content.toModel<MessageContent>()?.body
+        body shouldBeEqualTo "* Message 2 with edit"
+
+        // assert that the edit from 42 are migrated
+        val editionsOfE2E = EventAnnotationsSummaryEntity
+                .where(realm!!, "\$11EtAQ8RYcudJVtw7e6B5Vm4ufCqKTOWKblY2U_wrpo")
+                .findFirst()
+                ?.editSummary
+                ?.editions
+
+        editionsOfE2E shouldNotBe null
+        editionsOfE2E!!.size shouldBe 1
+        val firstEditionE2E = editionsOfE2E.first()
+        firstEditionE2E?.eventId shouldBeEqualTo "\$HUwJOQRCJwfPv7XSKvBPcvncjM0oR3q2tGIIIdv9Zts"
+        firstEditionE2E?.isLocalEcho shouldBeEqualTo false
+
+        val editEventE2E = EventMapper.map(firstEditionE2E!!.event!!)
+        val body2 = editEventE2E.getClearContent().toModel<MessageContent>()?.body
+        body2 shouldBeEqualTo "* Message 2, e2e edit"
+    }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/SessionSanityMigrationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/SessionSanityMigrationTest.kt
new file mode 100644
index 0000000000..fc1a78835b
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/SessionSanityMigrationTest.kt
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+package org.matrix.android.sdk.internal.database
+
+import android.content.Context
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import io.realm.Realm
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.matrix.android.sdk.internal.database.model.SessionRealmModule
+import org.matrix.android.sdk.internal.util.Normalizer
+
+@RunWith(AndroidJUnit4::class)
+class SessionSanityMigrationTest {
+
+    @get:Rule val configurationFactory = TestRealmConfigurationFactory()
+
+    lateinit var context: Context
+    var realm: Realm? = null
+
+    @Before
+    fun setUp() {
+        context = InstrumentationRegistry.getInstrumentation().context
+    }
+
+    @After
+    fun tearDown() {
+        realm?.close()
+    }
+
+    @Test
+    fun sessionDatabaseShouldMigrateGracefully() {
+        val realmName = "session_42.realm"
+        val migration = RealmSessionStoreMigration(Normalizer())
+        val realmConfiguration = configurationFactory.createConfiguration(
+                realmName,
+                "efa9ab2c77ae06b0e767ffdb1c45b12be3c77d48d94f1ac41a7cd1d637fc59ac41f869a250453074e21ce13cfe7ed535593e7d150c08ce2bad7a2ab8c7b841f0",
+                SessionRealmModule(),
+                migration.schemaVersion,
+                migration
+        )
+        configurationFactory.copyRealmFromAssets(context, realmName, realmName)
+
+        realm = Realm.getInstance(realmConfiguration)
+    }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/TestRealmConfigurationFactory.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/TestRealmConfigurationFactory.kt
new file mode 100644
index 0000000000..fc5a017287
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/TestRealmConfigurationFactory.kt
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2022 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.
+ */
+package org.matrix.android.sdk.internal.database
+
+import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
+import io.realm.Realm
+import io.realm.RealmConfiguration
+import io.realm.RealmMigration
+import org.junit.rules.TemporaryFolder
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.InputStream
+import java.lang.IllegalStateException
+import java.util.Collections
+import java.util.Locale
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.Throws
+
+/**
+ * Based on https://github.com/realm/realm-java/blob/master/realm/realm-library/src/testUtils/java/io/realm/TestRealmConfigurationFactory.java
+ */
+class TestRealmConfigurationFactory : TemporaryFolder() {
+    private val map: Map<RealmConfiguration, Boolean> = ConcurrentHashMap()
+    private val configurations = Collections.newSetFromMap(map)
+    @get:Synchronized private var isUnitTestFailed = false
+    private var testName = ""
+    private var tempFolder: File? = null
+
+    override fun apply(base: Statement, description: Description): Statement {
+        return object : Statement() {
+            @Throws(Throwable::class)
+            override fun evaluate() {
+                setTestName(description)
+                before()
+                try {
+                    base.evaluate()
+                } catch (throwable: Throwable) {
+                    setUnitTestFailed()
+                    throw throwable
+                } finally {
+                    after()
+                }
+            }
+        }
+    }
+
+    @Throws(Throwable::class)
+    override fun before() {
+        Realm.init(InstrumentationRegistry.getInstrumentation().targetContext)
+        super.before()
+    }
+
+    override fun after() {
+        try {
+            for (configuration in configurations) {
+                Realm.deleteRealm(configuration)
+            }
+        } catch (e: IllegalStateException) {
+            // Only throws the exception caused by deleting the opened Realm if the test case itself doesn't throw.
+            if (!isUnitTestFailed) {
+                throw e
+            }
+        } finally {
+            // This will delete the temp directory.
+            super.after()
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun create() {
+        super.create()
+        tempFolder = File(super.getRoot(), testName)
+        check(!(tempFolder!!.exists() && !tempFolder!!.delete())) { "Could not delete folder: " + tempFolder!!.absolutePath }
+        check(tempFolder!!.mkdir()) { "Could not create folder: " + tempFolder!!.absolutePath }
+    }
+
+    override fun getRoot(): File {
+        checkNotNull(tempFolder) { "the temporary folder has not yet been created" }
+        return tempFolder!!
+    }
+
+    /**
+     * To be called in the [.apply].
+     */
+    protected fun setTestName(description: Description) {
+        testName = description.displayName
+    }
+
+    @Synchronized
+    fun setUnitTestFailed() {
+        isUnitTestFailed = true
+    }
+
+    // This builder creates a configuration that is *NOT* managed.
+    // You have to delete it yourself.
+    private fun createConfigurationBuilder(): RealmConfiguration.Builder {
+        return RealmConfiguration.Builder().directory(root)
+    }
+
+    fun String.decodeHex(): ByteArray {
+        check(length % 2 == 0) { "Must have an even length" }
+        return chunked(2)
+                .map { it.toInt(16).toByte() }
+                .toByteArray()
+    }
+
+    fun createConfiguration(
+            name: String,
+            key: String?,
+            module: Any,
+            schemaVersion: Long,
+            migration: RealmMigration?
+    ): RealmConfiguration {
+        val builder = createConfigurationBuilder()
+        builder
+                .directory(root)
+                .name(name)
+                .apply {
+                    if (key != null) {
+                        encryptionKey(key.decodeHex())
+                    }
+                }
+                .modules(module)
+                // Allow writes on UI
+                .allowWritesOnUiThread(true)
+                .schemaVersion(schemaVersion)
+                .apply {
+                    migration?.let { migration(it) }
+                }
+        val configuration = builder.build()
+        configurations.add(configuration)
+        return configuration
+    }
+
+    // Copies a Realm file from assets to temp dir
+    @Throws(IOException::class)
+    fun copyRealmFromAssets(context: Context, realmPath: String, newName: String) {
+        val config = RealmConfiguration.Builder()
+                .directory(root)
+                .name(newName)
+                .build()
+        copyRealmFromAssets(context, realmPath, config)
+    }
+
+    @Throws(IOException::class)
+    fun copyRealmFromAssets(context: Context, realmPath: String, config: RealmConfiguration) {
+        check(!File(config.path).exists()) { String.format(Locale.ENGLISH, "%s exists!", config.path) }
+        val outFile = File(config.realmDirectory, config.realmFileName)
+        copyFileFromAssets(context, realmPath, outFile)
+    }
+
+    @Throws(IOException::class)
+    fun copyFileFromAssets(context: Context, assetPath: String?, outFile: File?) {
+        var stream: InputStream? = null
+        var os: FileOutputStream? = null
+        try {
+            stream = context.assets.open(assetPath!!)
+            os = FileOutputStream(outFile)
+            val buf = ByteArray(1024)
+            var bytesRead: Int
+            while (stream.read(buf).also { bytesRead = it } > -1) {
+                os.write(buf, 0, bytesRead)
+            }
+        } finally {
+            if (stream != null) {
+                try {
+                    stream.close()
+                } catch (ignore: IOException) {
+                }
+            }
+            if (os != null) {
+                try {
+                    os.close()
+                } catch (ignore: IOException) {
+                }
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt
index a37d2ce015..a52e3cd7c7 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt
@@ -66,7 +66,7 @@ class PollAggregationTest : InstrumentedTest {
 
         val aliceEventsListener = object : Timeline.Listener {
             override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
-                snapshot.firstOrNull { it.root.getClearType() in EventType.POLL_START }?.let { pollEvent ->
+                snapshot.firstOrNull { it.root.getClearType() in EventType.POLL_START.values }?.let { pollEvent ->
                     val pollEventId = pollEvent.eventId
                     val pollContent = pollEvent.root.content?.toModel<MessagePollContent>()
                     val pollSummary = pollEvent.annotations?.pollResponseSummary
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
index 59b3b14532..656e00bcbd 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
@@ -17,7 +17,7 @@
 package org.matrix.android.sdk.session.room.timeline
 
 import androidx.test.filters.LargeTest
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.suspendCancellableCoroutine
 import org.amshove.kluent.internal.assertEquals
 import org.junit.FixMethodOrder
 import org.junit.Ignore
@@ -35,6 +35,9 @@ import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.common.waitFor
+import org.matrix.android.sdk.common.wrapWithTimeout
+import kotlin.coroutines.resume
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -69,30 +72,36 @@ class TimelineSimpleBackPaginationTest : InstrumentedTest {
         val bobTimeline = roomFromBobPOV.timelineService().createTimeline(null, TimelineSettings(30))
         bobTimeline.start()
 
-        commonTestHelper.waitWithLatch(timeout = TestConstants.timeOutMillis * 10) {
-            val listener = object : Timeline.Listener {
+        waitFor(
+                continueWhen = {
+                    wrapWithTimeout(timeout = TestConstants.timeOutMillis * 10) {
+                        suspendCancellableCoroutine<Unit> { continuation ->
+                            val listener = object : Timeline.Listener {
 
-                override fun onStateUpdated(direction: Timeline.Direction, state: Timeline.PaginationState) {
-                    if (direction == Timeline.Direction.FORWARDS) {
-                        return
+                                override fun onStateUpdated(direction: Timeline.Direction, state: Timeline.PaginationState) {
+                                    if (direction == Timeline.Direction.FORWARDS) {
+                                        return
+                                    }
+                                    if (state.hasMoreToLoad && !state.loading) {
+                                        bobTimeline.paginate(Timeline.Direction.BACKWARDS, 30)
+                                    } else if (!state.hasMoreToLoad) {
+                                        bobTimeline.removeListener(this)
+                                        continuation.resume(Unit)
+                                    }
+                                }
+                            }
+                            bobTimeline.addListener(listener)
+                            continuation.invokeOnCancellation { bobTimeline.removeListener(listener) }
+                        }
                     }
-                    if (state.hasMoreToLoad && !state.loading) {
-                        bobTimeline.paginate(Timeline.Direction.BACKWARDS, 30)
-                    } else if (!state.hasMoreToLoad) {
-                        bobTimeline.removeListener(this)
-                        it.countDown()
-                    }
-                }
-            }
-            bobTimeline.addListener(listener)
-            bobTimeline.paginate(Timeline.Direction.BACKWARDS, 30)
-        }
+                },
+                action = { bobTimeline.paginate(Timeline.Direction.BACKWARDS, 30) }
+        )
+
         assertEquals(false, bobTimeline.hasMoreToLoad(Timeline.Direction.FORWARDS))
         assertEquals(false, bobTimeline.hasMoreToLoad(Timeline.Direction.BACKWARDS))
 
-        val onlySentEvents = runBlocking {
-            bobTimeline.getSnapshot()
-        }
+        val onlySentEvents = bobTimeline.getSnapshot()
                 .filter {
                     it.root.isTextMessage()
                 }.filter {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index 7c97426c39..81351523e9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.session.search
 
+import org.amshove.kluent.shouldBeEqualTo
 import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder
 import org.junit.Test
@@ -43,7 +44,7 @@ class SearchMessagesTest : InstrumentedTest {
             cryptoTestData.firstSession
                     .searchService()
                     .search(
-                            searchTerm = "lore",
+                            searchTerm = "lorem",
                             limit = 10,
                             includeProfile = true,
                             afterLimit = 0,
@@ -61,7 +62,7 @@ class SearchMessagesTest : InstrumentedTest {
             cryptoTestData.firstSession
                     .searchService()
                     .search(
-                            searchTerm = "lore",
+                            searchTerm = "lorem",
                             roomId = cryptoTestData.roomId,
                             limit = 10,
                             includeProfile = true,
@@ -73,7 +74,28 @@ class SearchMessagesTest : InstrumentedTest {
         }
     }
 
-    private fun doTest(block: suspend (CryptoTestData) -> SearchResult) = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
+    @Test
+    fun sendTextMessageAndSearchPartOfItIncompleteWord() {
+        doTest(expectedNumberOfResult = 0) { cryptoTestData ->
+            cryptoTestData.firstSession
+                    .searchService()
+                    .search(
+                            searchTerm = "lore", /* incomplete word */
+                            roomId = cryptoTestData.roomId,
+                            limit = 10,
+                            includeProfile = true,
+                            afterLimit = 0,
+                            beforeLimit = 10,
+                            orderByRecent = true,
+                            nextBatch = null
+                    )
+        }
+    }
+
+    private fun doTest(
+            expectedNumberOfResult: Int = 2,
+            block: suspend (CryptoTestData) -> SearchResult,
+    ) = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(false)
         val aliceSession = cryptoTestData.firstSession
         val aliceRoomId = cryptoTestData.roomId
@@ -85,11 +107,9 @@ class SearchMessagesTest : InstrumentedTest {
                 2
         )
 
-        val data = commonTestHelper.runBlockingTest {
-            block.invoke(cryptoTestData)
-        }
+        val data = block.invoke(cryptoTestData)
 
-        assertTrue(data.results?.size == 2)
+        data.results?.size shouldBeEqualTo expectedNumberOfResult
         assertTrue(
                 data.results
                         ?.all {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 2cd579df24..df131cc19a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -55,15 +55,11 @@ class SpaceCreationTest : InstrumentedTest {
         val session = commonTestHelper.createAccount("Hubble", SessionTestParams(true))
         val roomName = "My Space"
         val topic = "A public space for test"
-        var spaceId: String = ""
-        commonTestHelper.runBlockingTest {
-            spaceId = session.spaceService().createSpace(roomName, topic, null, true)
-        }
+        val spaceId = session.spaceService().createSpace(roomName, topic, null, true)
 
-        commonTestHelper.waitWithLatch {
-            commonTestHelper.retryPeriodicallyWithLatch(it) {
-                session.spaceService().getSpace(spaceId)?.asRoom()?.roomSummary()?.name != null
-            }
+        commonTestHelper.retryPeriodically {
+            val roomSummary = session.spaceService().getSpace(spaceId)?.asRoom()?.roomSummary()
+            roomSummary?.name == roomName && roomSummary.topic == topic
         }
 
         val syncedSpace = session.spaceService().getSpace(spaceId)
@@ -79,14 +75,12 @@ class SpaceCreationTest : InstrumentedTest {
         assertEquals("Room type should be space", RoomType.SPACE, createContent?.type)
 
         var powerLevelsContent: PowerLevelsContent? = null
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                powerLevelsContent = syncedSpace.asRoom()
-                        .getStateEvent(EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.IsEmpty)
-                        ?.content
-                        ?.toModel<PowerLevelsContent>()
-                powerLevelsContent != null
-            }
+        commonTestHelper.retryPeriodically {
+            powerLevelsContent = syncedSpace.asRoom()
+                    .getStateEvent(EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.IsEmpty)
+                    ?.content
+                    ?.toModel<PowerLevelsContent>()
+            powerLevelsContent != null
         }
         assertEquals("Space-rooms should be created with a power level for events_default of 100", 100, powerLevelsContent?.eventsDefault)
 
@@ -116,19 +110,13 @@ class SpaceCreationTest : InstrumentedTest {
 
         val roomName = "My Space"
         val topic = "A public space for test"
-        val spaceId: String
-        runBlocking {
-            spaceId = aliceSession.spaceService().createSpace(roomName, topic, null, true)
-            // wait a bit to let the summary update it self :/
-            delay(400)
-        }
+        val spaceId = aliceSession.spaceService().createSpace(roomName, topic, null, true)
+        // wait a bit to let the summary update it self :/
+        delay(400)
 
         // Try to join from bob, it's a public space no need to invite
 
-        val joinResult: JoinSpaceResult
-        runBlocking {
-            joinResult = bobSession.spaceService().joinSpace(spaceId)
-        }
+        val joinResult = bobSession.spaceService().joinSpace(spaceId)
 
         assertEquals(JoinSpaceResult.Success, joinResult)
 
@@ -152,43 +140,24 @@ class SpaceCreationTest : InstrumentedTest {
         val syncedSpace = aliceSession.spaceService().getSpace(spaceId)
 
         // create a room
-        var firstChild: String? = null
-        commonTestHelper.waitWithLatch {
-            firstChild = aliceSession.roomService().createRoom(CreateRoomParams().apply {
-                this.name = "FirstRoom"
-                this.topic = "Description of first room"
-                this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
-            })
-            it.countDown()
-        }
+        val firstChild: String = aliceSession.roomService().createRoom(CreateRoomParams().apply {
+            this.name = "FirstRoom"
+            this.topic = "Description of first room"
+            this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+        })
 
-        commonTestHelper.waitWithLatch {
-            syncedSpace?.addChildren(firstChild!!, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "a", suggested = true)
-            it.countDown()
-        }
+        syncedSpace?.addChildren(firstChild, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "a", suggested = true)
 
-        var secondChild: String? = null
-        commonTestHelper.waitWithLatch {
-            secondChild = aliceSession.roomService().createRoom(CreateRoomParams().apply {
-                this.name = "SecondRoom"
-                this.topic = "Description of second room"
-                this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
-            })
-            it.countDown()
-        }
+        val secondChild = aliceSession.roomService().createRoom(CreateRoomParams().apply {
+            this.name = "SecondRoom"
+            this.topic = "Description of second room"
+            this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+        })
 
-        commonTestHelper.waitWithLatch {
-            syncedSpace?.addChildren(secondChild!!, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "b", suggested = true)
-            it.countDown()
-        }
+        syncedSpace?.addChildren(secondChild, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "b", suggested = true)
 
         // Try to join from bob, it's a public space no need to invite
-        var joinResult: JoinSpaceResult? = null
-        commonTestHelper.waitWithLatch {
-            joinResult = bobSession.spaceService().joinSpace(spaceId)
-            // wait a bit to let the summary update it self :/
-            it.countDown()
-        }
+        val joinResult = bobSession.spaceService().joinSpace(spaceId)
 
         assertEquals(JoinSpaceResult.Success, joinResult)
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index 18645fd6d9..abe9af5e38 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -17,8 +17,6 @@
 package org.matrix.android.sdk.session.space
 
 import android.util.Log
-import androidx.lifecycle.Observer
-import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder
@@ -39,16 +37,17 @@ import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.create.RestrictedRoomPreset
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.first
+import org.matrix.android.sdk.common.onMain
+import org.matrix.android.sdk.common.waitFor
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -60,40 +59,28 @@ class SpaceHierarchyTest : InstrumentedTest {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
         val spaceName = "My Space"
         val topic = "A public space for test"
-        var spaceId = ""
-        commonTestHelper.runBlockingTest {
-            spaceId = session.spaceService().createSpace(spaceName, topic, null, true)
-        }
+        val spaceId = session.spaceService().createSpace(spaceName, topic, null, true)
 
         val syncedSpace = session.spaceService().getSpace(spaceId)
 
-        var roomId = ""
-        commonTestHelper.runBlockingTest {
-            roomId = session.roomService().createRoom(CreateRoomParams().apply { name = "General" })
-        }
+        val roomId = session.roomService().createRoom(CreateRoomParams().apply { name = "General" })
 
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
 
-        commonTestHelper.runBlockingTest {
-            syncedSpace!!.addChildren(roomId, viaServers, null, true)
-        }
+        syncedSpace!!.addChildren(roomId, viaServers, null, true)
 
-        commonTestHelper.runBlockingTest {
-            session.spaceService().setSpaceParent(roomId, spaceId, true, viaServers)
-        }
+        session.spaceService().setSpaceParent(roomId, spaceId, true, viaServers)
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val parents = session.getRoom(roomId)?.roomSummary()?.spaceParents
-                val canonicalParents = session.getRoom(roomId)?.roomSummary()?.spaceParents?.filter { it.canonical == true }
-                parents?.forEach {
-                    Log.d("## TEST", "parent : $it")
-                }
-                parents?.size == 1 &&
-                        parents.first().roomSummary?.name == spaceName &&
-                        canonicalParents?.size == 1 &&
-                        canonicalParents.first().roomSummary?.name == spaceName
+        commonTestHelper.retryPeriodically {
+            val parents = session.getRoom(roomId)?.roomSummary()?.spaceParents
+            val canonicalParents = session.getRoom(roomId)?.roomSummary()?.spaceParents?.filter { it.canonical == true }
+            parents?.forEach {
+                Log.d("## TEST", "parent : $it")
             }
+            parents?.size == 1 &&
+                    parents.first().roomSummary?.name == spaceName &&
+                    canonicalParents?.size == 1 &&
+                    canonicalParents.first().roomSummary?.name == spaceName
         }
     }
 
@@ -169,7 +156,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
         val spaceAInfo = createPublicSpace(
-                commonTestHelper,
                 session, "SpaceA",
                 listOf(
                         Triple("A1", true /*auto-join*/, true/*canonical*/),
@@ -178,7 +164,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         )
 
         /* val spaceBInfo = */ createPublicSpace(
-            commonTestHelper,
             session, "SpaceB",
             listOf(
                     Triple("B1", true /*auto-join*/, true/*canonical*/),
@@ -188,7 +173,6 @@ class SpaceHierarchyTest : InstrumentedTest {
     )
 
         val spaceCInfo = createPublicSpace(
-                commonTestHelper,
                 session, "SpaceC",
                 listOf(
                         Triple("C1", true /*auto-join*/, true/*canonical*/),
@@ -199,22 +183,12 @@ class SpaceHierarchyTest : InstrumentedTest {
         // add C as a subspace of A
         val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
-        commonTestHelper.runBlockingTest {
-            spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
-            session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
-        }
+        spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
+        session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
 
         // Create orphan rooms
-
-        var orphan1 = ""
-        commonTestHelper.runBlockingTest {
-            orphan1 = session.roomService().createRoom(CreateRoomParams().apply { name = "O1" })
-        }
-
-        var orphan2 = ""
-        commonTestHelper.runBlockingTest {
-            orphan2 = session.roomService().createRoom(CreateRoomParams().apply { name = "O2" })
-        }
+        val orphan1 = session.roomService().createRoom(CreateRoomParams().apply { name = "O1" })
+        val orphan2 = session.roomService().createRoom(CreateRoomParams().apply { name = "O2" })
 
         val allRooms = session.roomService().getRoomSummaries(roomSummaryQueryParams { excludeType = listOf(RoomType.SPACE) })
 
@@ -235,15 +209,15 @@ class SpaceHierarchyTest : InstrumentedTest {
         assertTrue("A1 should be a grand child of A", aChildren.any { it.name == "C2" })
 
         // Add a non canonical child and check that it does not appear as orphan
-        commonTestHelper.runBlockingTest {
-            val a3 = session.roomService().createRoom(CreateRoomParams().apply { name = "A3" })
-            spaceA!!.addChildren(a3, viaServers, null, false)
-        }
+        val a3 = session.roomService().createRoom(CreateRoomParams().apply { name = "A3" })
+        spaceA.addChildren(a3, viaServers, null, false)
+
+        val orphansUpdate = session.roomService().onMain {
+            getRoomSummariesLive(roomSummaryQueryParams {
+                spaceFilter = SpaceFilter.OrphanRooms
+            })
+        }.first { it.size == 2 }
 
-        Thread.sleep(6_000)
-        val orphansUpdate = session.roomService().getRoomSummaries(roomSummaryQueryParams {
-            spaceFilter = SpaceFilter.OrphanRooms
-        })
         assertEquals("Unexpected number of orphan rooms ${orphansUpdate.map { it.name }}", 2, orphansUpdate.size)
     }
 
@@ -253,7 +227,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
         val spaceAInfo = createPublicSpace(
-                commonTestHelper,
                 session, "SpaceA",
                 listOf(
                         Triple("A1", true /*auto-join*/, true/*canonical*/),
@@ -262,7 +235,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         )
 
         val spaceCInfo = createPublicSpace(
-                commonTestHelper,
                 session, "SpaceC",
                 listOf(
                         Triple("C1", true /*auto-join*/, true/*canonical*/),
@@ -273,16 +245,12 @@ class SpaceHierarchyTest : InstrumentedTest {
         // add C as a subspace of A
         val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
-        commonTestHelper.runBlockingTest {
-            spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
-            session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
-        }
+        spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
+        session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
 
         // add back A as subspace of C
-        commonTestHelper.runBlockingTest {
-            val spaceC = session.spaceService().getSpace(spaceCInfo.spaceId)
-            spaceC!!.addChildren(spaceAInfo.spaceId, viaServers, null, true)
-        }
+        val spaceC = session.spaceService().getSpace(spaceCInfo.spaceId)
+        spaceC!!.addChildren(spaceAInfo.spaceId, viaServers, null, true)
 
         // A -> C -> A
 
@@ -300,7 +268,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
         val spaceAInfo = createPublicSpace(
-                commonTestHelper,
                 session,
                 "SpaceA",
                 listOf(
@@ -310,7 +277,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         )
 
         val spaceBInfo = createPublicSpace(
-                commonTestHelper,
                 session,
                 "SpaceB",
                 listOf(
@@ -323,13 +289,10 @@ class SpaceHierarchyTest : InstrumentedTest {
         // add B as a subspace of A
         val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
-        commonTestHelper.runBlockingTest {
-            spaceA!!.addChildren(spaceBInfo.spaceId, viaServers, null, true)
-            session.spaceService().setSpaceParent(spaceBInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
-        }
+        spaceA!!.addChildren(spaceBInfo.spaceId, viaServers, null, true)
+        session.spaceService().setSpaceParent(spaceBInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
 
         val spaceCInfo = createPublicSpace(
-                commonTestHelper,
                 session,
                 "SpaceC",
                 listOf(
@@ -338,52 +301,39 @@ class SpaceHierarchyTest : InstrumentedTest {
                 )
         )
 
-        commonTestHelper.waitWithLatch { latch ->
-
-            val flatAChildren = session.roomService().getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId)
-            val childObserver = object : Observer<List<RoomSummary>> {
-                override fun onChanged(children: List<RoomSummary>?) {
-//                    Log.d("## TEST", "Space A flat children update : ${children?.map { it.name }}")
-                    System.out.println("## TEST | Space A flat children update : ${children?.map { it.name }}")
-                    if (children?.any { it.name == "C1" } == true && children.any { it.name == "C2" }) {
-                        // B1 has been added live!
-                        latch.countDown()
-                        flatAChildren.removeObserver(this)
+        val spaceB = session.spaceService().getSpace(spaceBInfo.spaceId)
+        waitFor(
+                continueWhen = {
+                    session.roomService().onMain { getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId) }.first { children ->
+                        println("## TEST | Space A flat children update : ${children.map { it.name }}")
+                        children.any { it.name == "C1" } && children.any { it.name == "C2" }
                     }
+                },
+                action = {
+                    // add C as subspace of B
+                    spaceB!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
                 }
-            }
-
-            flatAChildren.observeForever(childObserver)
-
-            // add C as subspace of B
-            val spaceB = session.spaceService().getSpace(spaceBInfo.spaceId)
-            spaceB!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
-
-            // C1 and C2 should be in flatten child of A now
-        }
+        )
+        // C1 and C2 should be in flatten child of A now
 
         // Test part one of the rooms
 
         val bRoomId = spaceBInfo.roomIds.first()
 
-        commonTestHelper.waitWithLatch { latch ->
-            val flatAChildren = session.roomService().getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId)
-            val childObserver = object : Observer<List<RoomSummary>> {
-                override fun onChanged(children: List<RoomSummary>?) {
-                    System.out.println("## TEST | Space A flat children update : ${children?.map { it.name }}")
-                    if (children?.any { it.roomId == bRoomId } == false) {
-                        // B1 has been added live!
-                        latch.countDown()
-                        flatAChildren.removeObserver(this)
+        waitFor(
+                continueWhen = {
+                    // The room should have disappear from flat children
+                    session.roomService().onMain { getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId) }.first { children ->
+                        println("## TEST | Space A flat children update : ${children.map { it.name }}")
+                        !children.any { it.roomId == bRoomId }
                     }
+                },
+                action = {
+                    // part from b room
+                    session.roomService().leaveRoom(bRoomId)
                 }
-            }
+        )
 
-            // The room should have disapear from flat children
-            flatAChildren.observeForever(childObserver)
-            // part from b room
-            session.roomService().leaveRoom(bRoomId)
-        }
         commonTestHelper.signOutAndClose(session)
     }
 
@@ -392,68 +342,57 @@ class SpaceHierarchyTest : InstrumentedTest {
             val roomIds: List<String>
     )
 
-    private fun createPublicSpace(
-            commonTestHelper: CommonTestHelper,
+    private suspend fun createPublicSpace(
             session: Session,
             spaceName: String,
             childInfo: List<Triple<String, Boolean, Boolean?>>
             /** Name, auto-join, canonical*/
     ): TestSpaceCreationResult {
-        var spaceId = ""
-        var roomIds: List<String> = emptyList()
-        commonTestHelper.runBlockingTest {
-            spaceId = session.spaceService().createSpace(spaceName, "Test Topic", null, true)
-            val syncedSpace = session.spaceService().getSpace(spaceId)
-            val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+        val spaceId = session.spaceService().createSpace(spaceName, "Test Topic", null, true)
+        val syncedSpace = session.spaceService().getSpace(spaceId)
+        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
 
-            roomIds = childInfo.map { entry ->
-                session.roomService().createRoom(CreateRoomParams().apply { name = entry.first })
-            }
-            roomIds.forEachIndexed { index, roomId ->
-                syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
-                val canonical = childInfo[index].third
-                if (canonical != null) {
-                    session.spaceService().setSpaceParent(roomId, spaceId, canonical, viaServers)
-                }
+        val roomIds = childInfo.map { entry ->
+            session.roomService().createRoom(CreateRoomParams().apply { name = entry.first })
+        }
+        roomIds.forEachIndexed { index, roomId ->
+            syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
+            val canonical = childInfo[index].third
+            if (canonical != null) {
+                session.spaceService().setSpaceParent(roomId, spaceId, canonical, viaServers)
             }
         }
         return TestSpaceCreationResult(spaceId, roomIds)
     }
 
-    private fun createPrivateSpace(
-            commonTestHelper: CommonTestHelper,
+    private suspend fun createPrivateSpace(
             session: Session,
             spaceName: String,
             childInfo: List<Triple<String, Boolean, Boolean?>>
             /** Name, auto-join, canonical*/
     ): TestSpaceCreationResult {
-        var spaceId = ""
-        var roomIds: List<String> = emptyList()
-        commonTestHelper.runBlockingTest {
-            spaceId = session.spaceService().createSpace(spaceName, "My Private Space", null, false)
-            val syncedSpace = session.spaceService().getSpace(spaceId)
-            val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
-            roomIds =
-                    childInfo.map { entry ->
-                        val homeServerCapabilities = session
-                                .homeServerCapabilitiesService()
-                                .getHomeServerCapabilities()
-                        session.roomService().createRoom(CreateRoomParams().apply {
-                            name = entry.first
-                            this.featurePreset = RestrictedRoomPreset(
-                                    homeServerCapabilities,
-                                    listOf(
-                                            RoomJoinRulesAllowEntry.restrictedToRoom(spaceId)
-                                    )
-                            )
-                        })
-                    }
-            roomIds.forEachIndexed { index, roomId ->
-                syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
-                val canonical = childInfo[index].third
-                if (canonical != null) {
-                    session.spaceService().setSpaceParent(roomId, spaceId, canonical, viaServers)
-                }
+        val spaceId = session.spaceService().createSpace(spaceName, "My Private Space", null, false)
+        val syncedSpace = session.spaceService().getSpace(spaceId)
+        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+        val roomIds = childInfo.map { entry ->
+            val homeServerCapabilities = session
+                    .homeServerCapabilitiesService()
+                    .getHomeServerCapabilities()
+            session.roomService().createRoom(CreateRoomParams().apply {
+                name = entry.first
+                this.featurePreset = RestrictedRoomPreset(
+                        homeServerCapabilities,
+                        listOf(
+                                RoomJoinRulesAllowEntry.restrictedToRoom(spaceId)
+                        )
+                )
+            })
+        }
+        roomIds.forEachIndexed { index, roomId ->
+            syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
+            val canonical = childInfo[index].third
+            if (canonical != null) {
+                session.spaceService().setSpaceParent(roomId, spaceId, canonical, viaServers)
             }
         }
         return TestSpaceCreationResult(spaceId, roomIds)
@@ -464,7 +403,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
         /* val spaceAInfo = */ createPublicSpace(
-            commonTestHelper,
             session, "SpaceA",
             listOf(
                     Triple("A1", true /*auto-join*/, true/*canonical*/),
@@ -473,7 +411,6 @@ class SpaceHierarchyTest : InstrumentedTest {
     )
 
         val spaceBInfo = createPublicSpace(
-                commonTestHelper,
                 session, "SpaceB",
                 listOf(
                         Triple("B1", true /*auto-join*/, true/*canonical*/),
@@ -483,7 +420,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         )
 
         val spaceCInfo = createPublicSpace(
-                commonTestHelper,
                 session, "SpaceC",
                 listOf(
                         Triple("C1", true /*auto-join*/, true/*canonical*/),
@@ -494,10 +430,8 @@ class SpaceHierarchyTest : InstrumentedTest {
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
 
         // add C as subspace of B
-        runBlocking {
-            val spaceB = session.spaceService().getSpace(spaceBInfo.spaceId)
-            spaceB!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
-        }
+        val spaceB = session.spaceService().getSpace(spaceBInfo.spaceId)
+        spaceB!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
 
 //        Thread.sleep(4_000)
         // + A
@@ -507,11 +441,9 @@ class SpaceHierarchyTest : InstrumentedTest {
         //   + C
         //     + c1, c2
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val rootSpaces = commonTestHelper.runBlockingTest { session.spaceService().getRootSpaceSummaries() }
-                rootSpaces.size == 2
-            }
+        commonTestHelper.retryPeriodically {
+            val rootSpaces = session.spaceService().getRootSpaceSummaries()
+            rootSpaces.size == 2
         }
     }
 
@@ -521,7 +453,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         val bobSession = commonTestHelper.createAccount("Bib", SessionTestParams(true))
 
         val spaceAInfo = createPrivateSpace(
-                commonTestHelper,
                 aliceSession, "Private Space A",
                 listOf(
                         Triple("General", true /*suggested*/, true/*canonical*/),
@@ -529,85 +460,58 @@ class SpaceHierarchyTest : InstrumentedTest {
                 )
         )
 
-        commonTestHelper.runBlockingTest {
-            aliceSession.getRoom(spaceAInfo.spaceId)!!.membershipService().invite(bobSession.myUserId, null)
+        aliceSession.getRoom(spaceAInfo.spaceId)!!.membershipService().invite(bobSession.myUserId, null)
+
+        bobSession.roomService().joinRoom(spaceAInfo.spaceId, null, emptyList())
+
+        val bobRoomId = bobSession.roomService().createRoom(CreateRoomParams().apply { name = "A Bob Room" })
+        bobSession.getRoom(bobRoomId)!!.membershipService().invite(aliceSession.myUserId)
+
+        aliceSession.roomService().joinRoom(bobRoomId)
+
+        commonTestHelper.retryPeriodically {
+            aliceSession.getRoomSummary(bobRoomId)?.membership?.isActive() == true
         }
 
-        commonTestHelper.runBlockingTest {
-            bobSession.roomService().joinRoom(spaceAInfo.spaceId, null, emptyList())
-        }
+        bobSession.spaceService().setSpaceParent(bobRoomId, spaceAInfo.spaceId, false, listOf(bobSession.sessionParams.homeServerHost ?: ""))
 
-        var bobRoomId = ""
-        commonTestHelper.runBlockingTest {
-            bobRoomId = bobSession.roomService().createRoom(CreateRoomParams().apply { name = "A Bob Room" })
-            bobSession.getRoom(bobRoomId)!!.membershipService().invite(aliceSession.myUserId)
-        }
-
-        commonTestHelper.runBlockingTest {
-            aliceSession.roomService().joinRoom(bobRoomId)
-        }
-
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                aliceSession.getRoomSummary(bobRoomId)?.membership?.isActive() == true
-            }
-        }
-
-        commonTestHelper.runBlockingTest {
-            bobSession.spaceService().setSpaceParent(bobRoomId, spaceAInfo.spaceId, false, listOf(bobSession.sessionParams.homeServerHost ?: ""))
-        }
-
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val stateEvent = aliceSession.getRoom(bobRoomId)!!.getStateEvent(EventType.STATE_SPACE_PARENT, QueryStringValue.Equals(spaceAInfo.spaceId))
-                stateEvent != null
-            }
+        commonTestHelper.retryPeriodically {
+            val stateEvent = aliceSession.getRoom(bobRoomId)!!.getStateEvent(EventType.STATE_SPACE_PARENT, QueryStringValue.Equals(spaceAInfo.spaceId))
+            stateEvent != null
         }
 
         // This should be an invalid space parent relation, because no opposite child and bob is not admin of the space
-        commonTestHelper.runBlockingTest {
-            // we can see the state event
-            // but it is not valid and room is not in hierarchy
-            assertTrue("Bob Room should not be listed as a child of the space", aliceSession.getRoomSummary(bobRoomId)?.flattenParentIds?.isEmpty() == true)
-        }
+        // we can see the state event
+        // but it is not valid and room is not in hierarchy
+        assertTrue("Bob Room should not be listed as a child of the space", aliceSession.getRoomSummary(bobRoomId)?.flattenParentIds?.isEmpty() == true)
 
         // Let's now try to make alice admin of the room
 
-        commonTestHelper.waitWithLatch {
-            val room = bobSession.getRoom(bobRoomId)!!
-            val currentPLContent = room
+        val room = bobSession.getRoom(bobRoomId)!!
+        val currentPLContent = room
+                .getStateEvent(EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.IsEmpty)
+                ?.content
+                .toModel<PowerLevelsContent>()
+
+        val newPowerLevelsContent = currentPLContent
+                ?.setUserPowerLevel(aliceSession.myUserId, Role.Admin.value)
+                ?.toContent()
+
+        room.stateService().sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent!!)
+
+        commonTestHelper.retryPeriodically {
+            val powerLevelsHelper = aliceSession.getRoom(bobRoomId)!!
                     .getStateEvent(EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.IsEmpty)
                     ?.content
-                    .toModel<PowerLevelsContent>()
-
-            val newPowerLevelsContent = currentPLContent
-                    ?.setUserPowerLevel(aliceSession.myUserId, Role.Admin.value)
-                    ?.toContent()
-
-            room.stateService().sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent!!)
-            it.countDown()
+                    ?.toModel<PowerLevelsContent>()
+                    ?.let { PowerLevelsHelper(it) }
+            powerLevelsHelper!!.isUserAllowedToSend(aliceSession.myUserId, true, EventType.STATE_SPACE_PARENT)
         }
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val powerLevelsHelper = aliceSession.getRoom(bobRoomId)!!
-                        .getStateEvent(EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.IsEmpty)
-                        ?.content
-                        ?.toModel<PowerLevelsContent>()
-                        ?.let { PowerLevelsHelper(it) }
-                powerLevelsHelper!!.isUserAllowedToSend(aliceSession.myUserId, true, EventType.STATE_SPACE_PARENT)
-            }
-        }
+        aliceSession.spaceService().setSpaceParent(bobRoomId, spaceAInfo.spaceId, false, listOf(bobSession.sessionParams.homeServerHost ?: ""))
 
-        commonTestHelper.waitWithLatch {
-            aliceSession.spaceService().setSpaceParent(bobRoomId, spaceAInfo.spaceId, false, listOf(bobSession.sessionParams.homeServerHost ?: ""))
-            it.countDown()
-        }
-
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                bobSession.getRoomSummary(bobRoomId)?.flattenParentIds?.contains(spaceAInfo.spaceId) == true
-            }
+        commonTestHelper.retryPeriodically {
+            bobSession.getRoomSummary(bobRoomId)?.flattenParentIds?.contains(spaceAInfo.spaceId) == true
         }
     }
 
@@ -616,7 +520,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         val aliceSession = commonTestHelper.createAccount("Alice", SessionTestParams(true))
 
         val spaceAInfo = createPublicSpace(
-                commonTestHelper,
                 aliceSession, "SpaceA",
                 listOf(
                         Triple("A1", true /*auto-join*/, true/*canonical*/),
@@ -625,7 +528,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         )
 
         val spaceBInfo = createPublicSpace(
-                commonTestHelper,
                 aliceSession, "SpaceB",
                 listOf(
                         Triple("B1", true /*auto-join*/, true/*canonical*/),
@@ -641,51 +543,39 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         val spaceA = aliceSession.spaceService().getSpace(spaceAInfo.spaceId)
         val spaceB = aliceSession.spaceService().getSpace(spaceBInfo.spaceId)
-        commonTestHelper.runBlockingTest {
-            spaceA!!.addChildren(B1roomId, viaServers, null, true)
+        spaceA!!.addChildren(B1roomId, viaServers, null, true)
+
+        commonTestHelper.retryPeriodically {
+            val roomSummary = aliceSession.getRoomSummary(B1roomId)
+            roomSummary != null &&
+                    roomSummary.directParentNames.size == 2 &&
+                    roomSummary.directParentNames.contains(spaceA.spaceSummary()!!.name) &&
+                    roomSummary.directParentNames.contains(spaceB!!.spaceSummary()!!.name)
         }
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val roomSummary = aliceSession.getRoomSummary(B1roomId)
-                roomSummary != null &&
-                        roomSummary.directParentNames.size == 2 &&
-                        roomSummary.directParentNames.contains(spaceA!!.spaceSummary()!!.name) &&
-                        roomSummary.directParentNames.contains(spaceB!!.spaceSummary()!!.name)
-            }
-        }
-
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val roomSummary = aliceSession.getRoomSummary(spaceAInfo.roomIds.first())
-                roomSummary != null &&
-                        roomSummary.directParentNames.size == 1 &&
-                        roomSummary.directParentNames.contains(spaceA!!.spaceSummary()!!.name)
-            }
+        commonTestHelper.retryPeriodically {
+            val roomSummary = aliceSession.getRoomSummary(spaceAInfo.roomIds.first())
+            roomSummary != null &&
+                    roomSummary.directParentNames.size == 1 &&
+                    roomSummary.directParentNames.contains(spaceA.spaceSummary()!!.name)
         }
 
         val newAName = "FooBar"
-        commonTestHelper.runBlockingTest {
-            spaceA!!.asRoom().stateService().updateName(newAName)
+        spaceA.asRoom().stateService().updateName(newAName)
+
+        commonTestHelper.retryPeriodically {
+            val roomSummary = aliceSession.getRoomSummary(B1roomId)
+            roomSummary != null &&
+                    roomSummary.directParentNames.size == 2 &&
+                    roomSummary.directParentNames.contains(newAName) &&
+                    roomSummary.directParentNames.contains(spaceB!!.spaceSummary()!!.name)
         }
 
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val roomSummary = aliceSession.getRoomSummary(B1roomId)
-                roomSummary != null &&
-                        roomSummary.directParentNames.size == 2 &&
-                        roomSummary.directParentNames.contains(newAName) &&
-                        roomSummary.directParentNames.contains(spaceB!!.spaceSummary()!!.name)
-            }
-        }
-
-        commonTestHelper.waitWithLatch { latch ->
-            commonTestHelper.retryPeriodicallyWithLatch(latch) {
-                val roomSummary = aliceSession.getRoomSummary(spaceAInfo.roomIds.first())
-                roomSummary != null &&
-                        roomSummary.directParentNames.size == 1 &&
-                        roomSummary.directParentNames.contains(newAName)
-            }
+        commonTestHelper.retryPeriodically {
+            val roomSummary = aliceSession.getRoomSummary(spaceAInfo.roomIds.first())
+            roomSummary != null &&
+                    roomSummary.directParentNames.size == 1 &&
+                    roomSummary.directParentNames.contains(newAName)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml
index de0731422c..7f940d4e1c 100644
--- a/matrix-sdk-android/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.matrix.android.sdk">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
index 893e90fb3e..68b6a2ddf8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
@@ -19,6 +19,10 @@ package org.matrix.android.sdk.api
 import okhttp3.ConnectionSpec
 import okhttp3.Interceptor
 import org.matrix.android.sdk.api.crypto.MXCryptoConfig
+import org.matrix.android.sdk.api.metrics.MetricPlugin
+import org.matrix.android.sdk.api.provider.CustomEventTypesProvider
+import org.matrix.android.sdk.api.provider.MatrixItemDisplayNameFallbackProvider
+import org.matrix.android.sdk.api.provider.RoomDisplayNameFallbackProvider
 import java.net.Proxy
 
 data class MatrixConfiguration(
@@ -65,9 +69,21 @@ data class MatrixConfiguration(
         /**
          * Thread messages default enable/disabled value.
          */
-        val threadMessagesEnabledDefault: Boolean = false,
+        val threadMessagesEnabledDefault: Boolean = true,
         /**
          * List of network interceptors, they will be added when building an OkHttp client.
          */
         val networkInterceptors: List<Interceptor> = emptyList(),
+        /**
+         * Sync configuration.
+         */
+        val syncConfig: SyncConfig = SyncConfig(),
+        /**
+         * Metrics plugin that can be used to capture metrics from matrix-sdk-android.
+         */
+        val metricPlugins: List<MetricPlugin> = emptyList(),
+        /**
+         * CustomEventTypesProvider to provide custom event types to the sdk which should be processed with internal events.
+         */
+        val customEventTypesProvider: CustomEventTypesProvider? = null,
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/SyncConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/SyncConfig.kt
new file mode 100644
index 0000000000..84650da72f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/SyncConfig.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api
+
+import org.matrix.android.sdk.api.session.sync.filter.SyncFilterParams
+
+data class SyncConfig(
+        /**
+         * Time to keep sync connection alive for before making another request in milliseconds.
+         */
+        val longPollTimeout: Long = 30_000L,
+
+        val syncFilterParams: SyncFilterParams = SyncFilterParams()
+)
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/account/LocalNotificationSettingsContent.kt
similarity index 60%
rename from vector/src/main/java/im/vector/app/core/di/FragmentKey.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/account/LocalNotificationSettingsContent.kt
index bc2dc40a15..75d04f340a 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/account/LocalNotificationSettingsContent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2022 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.
@@ -12,16 +12,15 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-package im.vector.app.core.di
+package org.matrix.android.sdk.api.account
 
-import androidx.fragment.app.Fragment
-import dagger.MapKey
-import kotlin.reflect.KClass
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
-@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
-@Retention(AnnotationRetention.RUNTIME)
-@MapKey
-annotation class FragmentKey(val value: KClass<out Fragment>)
+@JsonClass(generateAdapter = true)
+data class LocalNotificationSettingsContent(
+        @Json(name = "is_silenced")
+        val isSilenced: Boolean?
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index e67d67c7f0..c6fab7762f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -124,4 +124,18 @@ interface AuthenticationService {
             initialDeviceName: String,
             deviceId: String? = null
     ): Session
+
+    /**
+     * Authenticate using m.login.token method during sign in with QR code.
+     * @param homeServerConnectionConfig the information about the homeserver and other configuration
+     * @param loginToken the m.login.token
+     * @param initialDeviceName the initial device name
+     * @param deviceId the device id, optional. If not provided or null, the server will generate one.
+     */
+    suspend fun loginUsingQrLoginToken(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            loginToken: String,
+            initialDeviceName: String? = null,
+            deviceId: String? = null
+    ): Session
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
index 627a825679..991b7b654d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
@@ -22,7 +22,8 @@ enum class LoginType {
     UNSUPPORTED,
     CUSTOM,
     DIRECT,
-    UNKNOWN;
+    UNKNOWN,
+    QR;
 
     companion object {
 
@@ -32,6 +33,7 @@ enum class LoginType {
             UNSUPPORTED.name -> UNSUPPORTED
             CUSTOM.name -> CUSTOM
             DIRECT.name -> DIRECT
+            QR.name -> QR
             else -> UNKNOWN
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
index a2125f3a66..5d737b716b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
@@ -23,5 +23,6 @@ data class LoginFlowResult(
         val homeServerUrl: String,
         val isOutdatedHomeserver: Boolean,
         val hasOidcCompatibilityFlow: Boolean,
-        val isLogoutDevicesSupported: Boolean
+        val isLogoutDevicesSupported: Boolean,
+        val isLoginWithQrSupported: Boolean,
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
index 015cb6a1a2..38f522586f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
@@ -35,8 +35,9 @@ data class MXCryptoConfig constructor(
 
         /**
          * Currently megolm keys are requested to the sender device and to all of our devices.
-         * You can limit request only to your sessions by turning this setting to `true`
+         * You can limit request only to your sessions by turning this setting to `true`.
+         * Forwarded keys coming from other users will also be ignored if set to true.
          */
-        val limitRoomKeyRequestsToMyDevices: Boolean = false,
+        val limitRoomKeyRequestsToMyDevices: Boolean = true,
 
         )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/debug/DebugService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/debug/DebugService.kt
index d0cee08831..7f5e4f2ee7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/debug/DebugService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/debug/DebugService.kt
@@ -28,7 +28,7 @@ interface DebugService {
     fun getAllRealmConfigurations(): List<RealmConfiguration>
 
     /**
-     * Prints out info on DB size to logcat.
+     * Get info on DB size.
      */
-    fun logDbUsageInfo()
+    fun getDbUsageInfo(): String
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MetricsExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MetricsExtensions.kt
new file mode 100644
index 0000000000..7f0e828f62
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MetricsExtensions.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.extensions
+
+import org.matrix.android.sdk.api.metrics.MetricPlugin
+import org.matrix.android.sdk.api.metrics.SpannableMetricPlugin
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+
+/**
+ * Executes the given [block] while measuring the transaction.
+ *
+ * @param block Action/Task to be executed within this span.
+ */
+@OptIn(ExperimentalContracts::class)
+inline fun List<MetricPlugin>.measureMetric(block: () -> Unit) {
+    contract {
+        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+    }
+    try {
+        this.forEach { plugin -> plugin.startTransaction() } // Start the transaction.
+        block()
+    } catch (throwable: Throwable) {
+        this.forEach { plugin -> plugin.onError(throwable) } // Capture if there is any exception thrown.
+        throw throwable
+    } finally {
+        this.forEach { plugin -> plugin.finishTransaction() } // Finally, finish this transaction.
+    }
+}
+
+/**
+ * Executes the given [block] while measuring a span.
+ *
+ * @param operation Name of the new span.
+ * @param description Description of the new span.
+ * @param block Action/Task to be executed within this span.
+ */
+@OptIn(ExperimentalContracts::class)
+inline fun List<SpannableMetricPlugin>.measureSpan(operation: String, description: String, block: () -> Unit) {
+    contract {
+        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+    }
+    try {
+        this.forEach { plugin -> plugin.startSpan(operation, description) } // Start the transaction.
+        block()
+    } catch (throwable: Throwable) {
+        this.forEach { plugin -> plugin.onError(throwable) } // Capture if there is any exception thrown.
+        throw throwable
+    } finally {
+        this.forEach { plugin -> plugin.finishSpan() } // Finally, finish this transaction.
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
index 68b931b33c..5b41ddaaec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
@@ -89,10 +89,14 @@ fun Throwable.isInvalidUIAAuth() = this is Failure.ServerError &&
 fun Throwable.isHomeserverUnavailable() = this is Failure.NetworkConnection &&
         this.ioException is UnknownHostException
 
+fun Throwable.isHomeserverConnectionError() = this is Failure.NetworkConnection
+
 fun Throwable.isMissingEmailVerification() = this is Failure.ServerError &&
         error.code == MatrixError.M_UNAUTHORIZED &&
         error.message == "Unable to get validated threepid"
 
+fun Throwable.isUnrecognisedCertificate() = this is Failure.UnrecognizedCertificateFailure
+
 /**
  * Try to convert to a RegistrationFlowResponse. Return null in the cases it's not possible
  */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt
index ae65963f37..22af8cebbd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt
@@ -27,6 +27,7 @@ open class LoggerTag(name: String, parentTag: LoggerTag? = null) {
     object SYNC : LoggerTag("SYNC")
     object VOIP : LoggerTag("VOIP")
     object CRYPTO : LoggerTag("CRYPTO")
+    object RENDEZVOUS : LoggerTag("RZ")
 
     val value: String = if (parentTag == null) {
         name
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/DownloadDeviceKeysMetricsPlugin.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/DownloadDeviceKeysMetricsPlugin.kt
new file mode 100644
index 0000000000..66ec0abf51
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/DownloadDeviceKeysMetricsPlugin.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.metrics
+
+import org.matrix.android.sdk.api.logger.LoggerTag
+import timber.log.Timber
+
+private val loggerTag = LoggerTag("DownloadKeysMetricsPlugin", LoggerTag.CRYPTO)
+
+/**
+ * Extension of MetricPlugin for download_device_keys task.
+ */
+interface DownloadDeviceKeysMetricsPlugin : MetricPlugin {
+
+    override fun logTransaction(message: String?) {
+        Timber.tag(loggerTag.value).v("## downloadDeviceKeysMetricPlugin() : $message")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/MetricPlugin.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/MetricPlugin.kt
new file mode 100644
index 0000000000..3a4b13c494
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/MetricPlugin.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.metrics
+
+/**
+ * A plugin that can be used to capture metrics in Client.
+ */
+interface MetricPlugin {
+    /**
+     * Start the measurement of the metrics as soon as task is started.
+     */
+    fun startTransaction()
+
+    /**
+     * Mark the measuring transaction finished once the task is completed.
+     */
+    fun finishTransaction()
+
+    /**
+     * Invoked when there is any error in the ongoing task. The metrics tool can use this information to attach to the ongoing transaction.
+     *
+     * @param throwable Exception thrown in the running task.
+     */
+    fun onError(throwable: Throwable)
+
+    /**
+     * Can be used to log this transaction.
+     */
+    fun logTransaction(message: String? = "") {
+        // no-op
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/SpannableMetricPlugin.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/SpannableMetricPlugin.kt
new file mode 100644
index 0000000000..54aa21877e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/SpannableMetricPlugin.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.api.metrics
+
+/**
+ * A plugin that tracks span along with transactions.
+ */
+interface SpannableMetricPlugin : MetricPlugin {
+
+    /**
+     * Starts the span for a sub-task.
+     *
+     * @param operation Name of the new span.
+     * @param description Description of the new span.
+     */
+    fun startSpan(operation: String, description: String)
+
+    /**
+     * Finish the span when sub-task is completed.
+     */
+    fun finishSpan()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/SyncDurationMetricPlugin.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/SyncDurationMetricPlugin.kt
new file mode 100644
index 0000000000..79ece002e9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/SyncDurationMetricPlugin.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.metrics
+
+import org.matrix.android.sdk.api.logger.LoggerTag
+import timber.log.Timber
+
+private val loggerTag = LoggerTag("SyncDurationMetricPlugin", LoggerTag.CRYPTO)
+
+/**
+ * An spannable metric plugin for sync response handling task.
+ */
+interface SyncDurationMetricPlugin : SpannableMetricPlugin {
+
+    override fun logTransaction(message: String?) {
+        Timber.tag(loggerTag.value).v("## syncResponseHandler() : $message")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/provider/CustomEventTypesProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/provider/CustomEventTypesProvider.kt
new file mode 100644
index 0000000000..c0f66dc1c2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/provider/CustomEventTypesProvider.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.provider
+
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+/**
+ * Provide custom event types which should be processed with the internal event types.
+ */
+interface CustomEventTypesProvider {
+
+    /**
+     * Custom event types to include when computing [RoomSummary.latestPreviewableEvent].
+     */
+    val customPreviewableEventTypes: List<String>
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixItemDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/provider/MatrixItemDisplayNameFallbackProvider.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixItemDisplayNameFallbackProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/provider/MatrixItemDisplayNameFallbackProvider.kt
index 82008cda8c..971845eae7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixItemDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/provider/MatrixItemDisplayNameFallbackProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api
+package org.matrix.android.sdk.api.provider
 
 import org.matrix.android.sdk.api.util.MatrixItem
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/provider/RoomDisplayNameFallbackProvider.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/provider/RoomDisplayNameFallbackProvider.kt
index 3c376b55ee..37d9b46b0b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/provider/RoomDisplayNameFallbackProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api
+package org.matrix.android.sdk.api.provider
 
 /**
  * This interface exists to let the implementation provide localized room display name fallback.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
index d3f6ec2287..1d6e79c8f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
@@ -68,6 +68,11 @@ sealed interface QueryStringValue {
      */
     data class Contains(override val string: String, override val case: Case = Case.SENSITIVE) : ContentQueryStringValue
 
+    /**
+     * The tested field must not contain the [string].
+     */
+    data class NotContains(override val string: String, override val case: Case = Case.SENSITIVE) : ContentQueryStringValue
+
     /**
      * Case enum for [ContentQueryStringValue].
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
new file mode 100644
index 0000000000..e5b2d6bf12
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -0,0 +1,240 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous
+
+import android.net.Uri
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.api.rendezvous.channels.ECDHRendezvousChannel
+import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.api.rendezvous.model.Outcome
+import org.matrix.android.sdk.api.rendezvous.model.Payload
+import org.matrix.android.sdk.api.rendezvous.model.PayloadType
+import org.matrix.android.sdk.api.rendezvous.model.Protocol
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
+import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransport
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.api.util.MatrixJsonParser
+import org.matrix.android.sdk.api.util.awaitCallback
+import timber.log.Timber
+
+/**
+ * Implementation of MSC3906 to sign in + E2EE set up using a QR code.
+ */
+class Rendezvous(
+        val channel: RendezvousChannel,
+        val theirIntent: RendezvousIntent,
+) {
+    companion object {
+        private val TAG = LoggerTag(Rendezvous::class.java.simpleName, LoggerTag.RENDEZVOUS).value
+
+        @Throws(RendezvousError::class)
+        fun buildChannelFromCode(code: String): Rendezvous {
+            val parsed = try {
+                // we rely on moshi validating the code and throwing exception if invalid JSON or doesn't
+                MatrixJsonParser.getMoshi().adapter(ECDHRendezvousCode::class.java).fromJson(code)
+            } catch (a: Throwable) {
+                throw RendezvousError("Invalid code", RendezvousFailureReason.InvalidCode)
+            } ?: throw RendezvousError("Invalid code", RendezvousFailureReason.InvalidCode)
+
+            val transport = SimpleHttpRendezvousTransport(parsed.rendezvous.transport.uri)
+
+            return Rendezvous(
+                    ECDHRendezvousChannel(transport, parsed.rendezvous.key),
+                    parsed.intent
+            )
+        }
+    }
+
+    private val adapter = MatrixJsonParser.getMoshi().adapter(Payload::class.java)
+
+    // not yet implemented: RendezvousIntent.RECIPROCATE_LOGIN_ON_EXISTING_DEVICE
+    val ourIntent: RendezvousIntent = RendezvousIntent.LOGIN_ON_NEW_DEVICE
+
+    @Throws(RendezvousError::class)
+    private suspend fun checkCompatibility() {
+        val incompatible = theirIntent == ourIntent
+
+        Timber.tag(TAG).d("ourIntent: $ourIntent, theirIntent: $theirIntent, incompatible: $incompatible")
+
+        if (incompatible) {
+            // inform the other side
+            send(Payload(PayloadType.FINISH, intent = ourIntent))
+            if (ourIntent == RendezvousIntent.LOGIN_ON_NEW_DEVICE) {
+                throw RendezvousError("The other device isn't signed in", RendezvousFailureReason.OtherDeviceNotSignedIn)
+            } else {
+                throw RendezvousError("The other device is already signed in", RendezvousFailureReason.OtherDeviceAlreadySignedIn)
+            }
+        }
+    }
+
+    @Throws(RendezvousError::class)
+    suspend fun startAfterScanningCode(): String {
+        val checksum = channel.connect()
+
+        Timber.tag(TAG).i("Connected to secure channel with checksum: $checksum")
+
+        checkCompatibility()
+
+        // get protocols
+        Timber.tag(TAG).i("Waiting for protocols")
+        val protocolsResponse = receive()
+
+        if (protocolsResponse?.protocols == null || !protocolsResponse.protocols.contains(Protocol.LOGIN_TOKEN)) {
+            send(Payload(PayloadType.FINISH, outcome = Outcome.UNSUPPORTED))
+            throw RendezvousError("Unsupported protocols", RendezvousFailureReason.UnsupportedHomeserver)
+        }
+
+        send(Payload(PayloadType.PROGRESS, protocol = Protocol.LOGIN_TOKEN))
+
+        return checksum
+    }
+
+    @Throws(RendezvousError::class)
+    suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session {
+        Timber.tag(TAG).i("Waiting for login_token")
+
+        val loginToken = receive()
+
+        if (loginToken?.type == PayloadType.FINISH) {
+            when (loginToken.outcome) {
+                Outcome.DECLINED -> {
+                    throw RendezvousError("Login declined by other device", RendezvousFailureReason.UserDeclined)
+                }
+                Outcome.UNSUPPORTED -> {
+                    throw RendezvousError("Homeserver lacks support", RendezvousFailureReason.UnsupportedHomeserver)
+                }
+                else -> {
+                    throw RendezvousError("Unknown error", RendezvousFailureReason.Unknown)
+                }
+            }
+        }
+
+        val homeserver = loginToken?.homeserver ?: throw RendezvousError("No homeserver returned", RendezvousFailureReason.ProtocolError)
+        val token = loginToken.loginToken ?: throw RendezvousError("No login token returned", RendezvousFailureReason.ProtocolError)
+
+        Timber.tag(TAG).i("Got login_token now attempting to sign in with $homeserver")
+
+        val hsConfig = HomeServerConnectionConfig(homeServerUri = Uri.parse(homeserver))
+        return authenticationService.loginUsingQrLoginToken(hsConfig, token)
+    }
+
+    @Throws(RendezvousError::class)
+    suspend fun completeVerificationOnNewDevice(session: Session) {
+        val userId = session.myUserId
+        val crypto = session.cryptoService()
+        val deviceId = crypto.getMyDevice().deviceId
+        val deviceKey = crypto.getMyDevice().fingerprint()
+        send(Payload(PayloadType.PROGRESS, outcome = Outcome.SUCCESS, deviceId = deviceId, deviceKey = deviceKey))
+
+        try {
+            // explicitly download keys for ourself rather than racing with initial sync which might not complete in time
+            awaitCallback<MXUsersDevicesMap<CryptoDeviceInfo>> { crypto.downloadKeys(listOf(userId), false, it) }
+        } catch (e: Throwable) {
+            // log as warning and continue as initial sync might still complete
+            Timber.tag(TAG).w(e, "Failed to download keys for self")
+        }
+
+        // await confirmation of verification
+        val verificationResponse = receive()
+        if (verificationResponse?.outcome == Outcome.VERIFIED) {
+            val verifyingDeviceId = verificationResponse.verifyingDeviceId
+                    ?: throw RendezvousError("No verifying device id returned", RendezvousFailureReason.ProtocolError)
+            val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
+            if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifyingDeviceKey) {
+                Timber.tag(TAG).w(
+                        "Verifying device $verifyingDeviceId key doesn't match: ${
+                            verifyingDeviceFromServer?.fingerprint()
+                        } vs ${verificationResponse.verifyingDeviceKey})"
+                )
+                // inform the other side
+                send(Payload(PayloadType.FINISH, outcome = Outcome.E2EE_SECURITY_ERROR))
+                throw RendezvousError("Key from verifying device doesn't match", RendezvousFailureReason.E2EESecurityIssue)
+            }
+
+            verificationResponse.masterKey?.let { masterKeyFromVerifyingDevice ->
+                // verifying device provided us with a master key, so use it to check integrity
+
+                // see what the homeserver told us
+                val localMasterKey = crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()
+
+                // n.b. if no local master key this is a problem, as well as it not matching
+                if (localMasterKey?.unpaddedBase64PublicKey != masterKeyFromVerifyingDevice) {
+                    Timber.tag(TAG).w("Master key from verifying device doesn't match: $masterKeyFromVerifyingDevice vs $localMasterKey")
+                    // inform the other side
+                    send(Payload(PayloadType.FINISH, outcome = Outcome.E2EE_SECURITY_ERROR))
+                    throw RendezvousError("Master key from verifying device doesn't match", RendezvousFailureReason.E2EESecurityIssue)
+                }
+
+                // set other device as verified
+                Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
+                crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
+
+                Timber.tag(TAG).i("Setting master key as trusted")
+                crypto.crossSigningService().markMyMasterKeyAsTrusted()
+            } ?: run {
+                // set other device as verified anyway
+                Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
+                crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
+
+                Timber.tag(TAG).i("No master key given by verifying device")
+            }
+
+            // request secrets from the verifying device
+            Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId")
+
+            session.sharedSecretStorageService().let {
+                it.requestSecret(MASTER_KEY_SSSS_NAME, verifyingDeviceId)
+                it.requestSecret(SELF_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
+                it.requestSecret(USER_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
+                it.requestSecret(KEYBACKUP_SECRET_SSSS_NAME, verifyingDeviceId)
+            }
+        } else {
+            Timber.tag(TAG).i("Not doing verification")
+        }
+    }
+
+    @Throws(RendezvousError::class)
+    private suspend fun receive(): Payload? {
+        val data = channel.receive() ?: return null
+        val payload = try {
+            adapter.fromJson(data.toString(Charsets.UTF_8))
+        } catch (e: Exception) {
+            Timber.tag(TAG).w(e, "Failed to parse payload")
+            throw RendezvousError("Invalid payload received", RendezvousFailureReason.Unknown)
+        }
+
+        return payload
+    }
+
+    private suspend fun send(payload: Payload) {
+        channel.send(adapter.toJson(payload).toByteArray(Charsets.UTF_8))
+    }
+
+    suspend fun close() {
+        channel.close()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
new file mode 100644
index 0000000000..0956a5b0a0
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous
+
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
+
+/**
+ * Representation of a rendezvous channel such as that described by MSC3903.
+ */
+interface RendezvousChannel {
+    val transport: RendezvousTransport
+
+    /**
+     * @returns the checksum/confirmation digits to be shown to the user
+     */
+    @Throws(RendezvousError::class)
+    suspend fun connect(): String
+
+    /**
+     * Send a payload via the channel.
+     * @param data payload to send
+     */
+    @Throws(RendezvousError::class)
+    suspend fun send(data: ByteArray)
+
+    /**
+     * Receive a payload from the channel.
+     * @returns the received payload
+     */
+    @Throws(RendezvousError::class)
+    suspend fun receive(): ByteArray?
+
+    /**
+     * Closes the channel and cleans up.
+     */
+    suspend fun close()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt
new file mode 100644
index 0000000000..18e625d825
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous
+
+enum class RendezvousFailureReason(val canRetry: Boolean = true) {
+    UserDeclined,
+    OtherDeviceNotSignedIn,
+    OtherDeviceAlreadySignedIn,
+    Unknown,
+    Expired,
+    UserCancelled,
+    InvalidCode,
+    UnsupportedAlgorithm(false),
+    UnsupportedTransport(false),
+    UnsupportedHomeserver(false),
+    ProtocolError,
+    E2EESecurityIssue(false)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
new file mode 100644
index 0000000000..81632e951a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous
+
+import okhttp3.MediaType
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportDetails
+
+interface RendezvousTransport {
+    var ready: Boolean
+
+    @Throws(RendezvousError::class)
+    suspend fun details(): RendezvousTransportDetails
+
+    @Throws(RendezvousError::class)
+    suspend fun send(contentType: MediaType, data: ByteArray)
+
+    @Throws(RendezvousError::class)
+    suspend fun receive(): ByteArray?
+
+    suspend fun close()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
new file mode 100644
index 0000000000..c1d6b1b70e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.channels
+
+import android.util.Base64
+import com.squareup.moshi.JsonClass
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import okhttp3.MediaType.Companion.toMediaType
+import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.api.rendezvous.RendezvousChannel
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.RendezvousTransport
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
+import org.matrix.android.sdk.api.rendezvous.model.SecureRendezvousChannelAlgorithm
+import org.matrix.android.sdk.api.util.MatrixJsonParser
+import org.matrix.android.sdk.internal.crypto.verification.SASDefaultVerificationTransaction
+import org.matrix.olm.OlmSAS
+import timber.log.Timber
+import java.security.SecureRandom
+import java.util.LinkedList
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+/**
+ *  Implements X25519 ECDH key agreement and AES-256-GCM encryption channel as per MSC3903:
+ *  https://github.com/matrix-org/matrix-spec-proposals/pull/3903
+ */
+class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPublicKeyBase64: String?) : RendezvousChannel {
+    companion object {
+        private const val ALGORITHM_SPEC = "AES/GCM/NoPadding"
+        private const val KEY_SPEC = "AES"
+        private val TAG = LoggerTag(ECDHRendezvousChannel::class.java.simpleName, LoggerTag.RENDEZVOUS).value
+    }
+
+    @JsonClass(generateAdapter = true)
+    internal data class ECDHPayload(
+            val algorithm: SecureRendezvousChannelAlgorithm? = null,
+            val key: String? = null,
+            val ciphertext: String? = null,
+            val iv: String? = null
+    )
+
+    private val olmSASMutex = Mutex()
+    private var olmSAS: OlmSAS?
+    private val ourPublicKey: ByteArray
+    private val ecdhAdapter = MatrixJsonParser.getMoshi().adapter(ECDHPayload::class.java)
+    private var theirPublicKey: ByteArray? = null
+    private var aesKey: ByteArray? = null
+
+    init {
+        theirPublicKeyBase64?.let {
+            theirPublicKey = Base64.decode(it, Base64.NO_WRAP)
+        }
+        olmSAS = OlmSAS()
+        ourPublicKey = Base64.decode(olmSAS!!.publicKey, Base64.NO_WRAP)
+    }
+
+    @Throws(RendezvousError::class)
+    override suspend fun connect(): String {
+        val sas = olmSAS ?: throw RendezvousError("Channel closed", RendezvousFailureReason.Unknown)
+        val isInitiator = theirPublicKey == null
+
+        if (isInitiator) {
+            Timber.tag(TAG).i("Waiting for other device to send their public key")
+            val res = this.receiveAsPayload() ?: throw RendezvousError("No reply from other device", RendezvousFailureReason.ProtocolError)
+
+            if (res.key == null) {
+                throw RendezvousError(
+                        "Unsupported algorithm: ${res.algorithm}",
+                        RendezvousFailureReason.UnsupportedAlgorithm,
+                )
+            }
+            theirPublicKey = Base64.decode(res.key, Base64.NO_WRAP)
+        } else {
+            // send our public key unencrypted
+            Timber.tag(TAG).i("Sending public key")
+            send(
+                    ECDHPayload(
+                            algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
+                            key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
+                    )
+            )
+        }
+
+        olmSASMutex.withLock {
+            sas.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
+            sas.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
+
+            val initiatorKey = Base64.encodeToString(if (isInitiator) ourPublicKey else theirPublicKey, Base64.NO_WRAP)
+            val recipientKey = Base64.encodeToString(if (isInitiator) theirPublicKey else ourPublicKey, Base64.NO_WRAP)
+            val aesInfo = "${SecureRendezvousChannelAlgorithm.ECDH_V1.value}|$initiatorKey|$recipientKey"
+
+            aesKey = sas.generateShortCode(aesInfo, 32)
+
+            val rawChecksum = sas.generateShortCode(aesInfo, 5)
+            return SASDefaultVerificationTransaction.getDecimalCodeRepresentation(rawChecksum, separator = "-")
+        }
+    }
+
+    private suspend fun send(payload: ECDHPayload) {
+        transport.send("application/json".toMediaType(), ecdhAdapter.toJson(payload).toByteArray(Charsets.UTF_8))
+    }
+
+    override suspend fun send(data: ByteArray) {
+        if (aesKey == null) {
+            throw IllegalStateException("Shared secret not established")
+        }
+        send(encrypt(data))
+    }
+
+    private suspend fun receiveAsPayload(): ECDHPayload? {
+        transport.receive()?.toString(Charsets.UTF_8)?.let {
+            return ecdhAdapter.fromJson(it)
+        } ?: return null
+    }
+
+    override suspend fun receive(): ByteArray? {
+        if (aesKey == null) {
+            throw IllegalStateException("Shared secret not established")
+        }
+        val payload = receiveAsPayload() ?: return null
+        return decrypt(payload)
+    }
+
+    override suspend fun close() {
+        val sas = olmSAS ?: throw IllegalStateException("Channel already closed")
+        olmSASMutex.withLock {
+            // this does a double release check already so we don't re-check ourselves
+            sas.releaseSas()
+            olmSAS = null
+        }
+        transport.close()
+    }
+
+    private fun encrypt(plainText: ByteArray): ECDHPayload {
+        val iv = ByteArray(16)
+        SecureRandom().nextBytes(iv)
+
+        val cipherText = LinkedList<Byte>()
+
+        val encryptCipher = Cipher.getInstance(ALGORITHM_SPEC)
+        val secretKeySpec = SecretKeySpec(aesKey, KEY_SPEC)
+        val ivParameterSpec = IvParameterSpec(iv)
+        encryptCipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec)
+        cipherText.addAll(encryptCipher.update(plainText).toList())
+        cipherText.addAll(encryptCipher.doFinal().toList())
+
+        return ECDHPayload(
+                ciphertext = Base64.encodeToString(cipherText.toByteArray(), Base64.NO_WRAP),
+                iv = Base64.encodeToString(iv, Base64.NO_WRAP)
+        )
+    }
+
+    private fun decrypt(payload: ECDHPayload): ByteArray {
+        val iv = Base64.decode(payload.iv, Base64.NO_WRAP)
+        val encryptCipher = Cipher.getInstance(ALGORITHM_SPEC)
+        val secretKeySpec = SecretKeySpec(aesKey, KEY_SPEC)
+        val ivParameterSpec = IvParameterSpec(iv)
+        encryptCipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec)
+
+        val plainText = LinkedList<Byte>()
+        plainText.addAll(encryptCipher.update(Base64.decode(payload.ciphertext, Base64.NO_WRAP)).toList())
+        plainText.addAll(encryptCipher.doFinal().toList())
+
+        return plainText.toByteArray()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
new file mode 100644
index 0000000000..55bac6397e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class ECDHRendezvous(
+        val transport: SimpleHttpRendezvousTransportDetails,
+        val algorithm: SecureRendezvousChannelAlgorithm,
+        val key: String
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
new file mode 100644
index 0000000000..575b5d4bfd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class ECDHRendezvousCode(
+        val intent: RendezvousIntent,
+        val rendezvous: ECDHRendezvous
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
new file mode 100644
index 0000000000..0ebd1f88b3
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = false)
+enum class Outcome(val value: String) {
+    @Json(name = "success")
+    SUCCESS("success"),
+
+    @Json(name = "declined")
+    DECLINED("declined"),
+
+    @Json(name = "unsupported")
+    UNSUPPORTED("unsupported"),
+
+    @Json(name = "verified")
+    VERIFIED("verified"),
+
+    @Json(name = "e2ee_security_error")
+    E2EE_SECURITY_ERROR("e2ee_security_error")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
new file mode 100644
index 0000000000..04631ce959
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class Payload(
+        val type: PayloadType,
+        val intent: RendezvousIntent? = null,
+        val outcome: Outcome? = null,
+        val protocols: List<Protocol>? = null,
+        val protocol: Protocol? = null,
+        val homeserver: String? = null,
+        @Json(name = "login_token") val loginToken: String? = null,
+        @Json(name = "device_id") val deviceId: String? = null,
+        @Json(name = "device_key") val deviceKey: String? = null,
+        @Json(name = "verifying_device_id") val verifyingDeviceId: String? = null,
+        @Json(name = "verifying_device_key") val verifyingDeviceKey: String? = null,
+        @Json(name = "master_key") val masterKey: String? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
new file mode 100644
index 0000000000..33beb1f525
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = false)
+internal enum class PayloadType(val value: String) {
+    @Json(name = "m.login.start")
+    START("m.login.start"),
+
+    @Json(name = "m.login.finish")
+    FINISH("m.login.finish"),
+
+    @Json(name = "m.login.progress")
+    PROGRESS("m.login.progress")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
new file mode 100644
index 0000000000..6fce2fa11c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = false)
+enum class Protocol(val value: String) {
+    @Json(name = "org.matrix.msc3906.login_token")
+    LOGIN_TOKEN("org.matrix.msc3906.login_token")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
new file mode 100644
index 0000000000..c52b11a322
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
+
+class RendezvousError(val description: String, val reason: RendezvousFailureReason) : Exception(description)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
new file mode 100644
index 0000000000..65037e1252
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = false)
+enum class RendezvousIntent {
+    @Json(name = "login.start") LOGIN_ON_NEW_DEVICE,
+    @Json(name = "login.reciprocate") RECIPROCATE_LOGIN_ON_EXISTING_DEVICE
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt
new file mode 100644
index 0000000000..1bde43ab7e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+open class RendezvousTransportDetails(
+    val type: RendezvousTransportType
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
new file mode 100644
index 0000000000..6fca7efa71
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = false)
+enum class RendezvousTransportType(val value: String) {
+    @Json(name = "org.matrix.msc3886.http.v1")
+    MSC3886_SIMPLE_HTTP_V1("org.matrix.msc3886.http.v1")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
new file mode 100644
index 0000000000..75f0024fda
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = false)
+enum class SecureRendezvousChannelAlgorithm(val value: String) {
+    @Json(name = "org.matrix.msc3903.rendezvous.v1.curve25519-aes-sha256")
+    ECDH_V1("org.matrix.msc3903.rendezvous.v1.curve25519-aes-sha256")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt
new file mode 100644
index 0000000000..049aa8b756
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.model
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class SimpleHttpRendezvousTransportDetails(
+        val uri: String
+) : RendezvousTransportDetails(type = RendezvousTransportType.MSC3886_SIMPLE_HTTP_V1)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
new file mode 100644
index 0000000000..620b599e3d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.rendezvous.transports
+
+import kotlinx.coroutines.delay
+import okhttp3.MediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.RendezvousTransport
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportDetails
+import org.matrix.android.sdk.api.rendezvous.model.SimpleHttpRendezvousTransportDetails
+import timber.log.Timber
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+/**
+ * Implementation of the Simple HTTP transport MSC3886: https://github.com/matrix-org/matrix-spec-proposals/pull/3886
+ */
+class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTransport {
+    companion object {
+        private val TAG = LoggerTag(SimpleHttpRendezvousTransport::class.java.simpleName, LoggerTag.RENDEZVOUS).value
+    }
+
+    override var ready = false
+    private var cancelled = false
+    private var uri: String?
+    private var etag: String? = null
+    private var expiresAt: Date? = null
+
+    init {
+        uri = rendezvousUri
+    }
+
+    override suspend fun details(): RendezvousTransportDetails {
+        val uri = uri ?: throw IllegalStateException("Rendezvous not set up")
+
+        return SimpleHttpRendezvousTransportDetails(uri)
+    }
+
+    @Throws(RendezvousError::class)
+    override suspend fun send(contentType: MediaType, data: ByteArray) {
+        if (cancelled) {
+            throw IllegalStateException("Rendezvous cancelled")
+        }
+
+        val method = if (uri != null) "PUT" else "POST"
+        val uri = this.uri ?: throw RuntimeException("No rendezvous URI")
+
+        val httpClient = okhttp3.OkHttpClient.Builder().build()
+
+        val request = Request.Builder()
+                .url(uri)
+                .method(method, data.toRequestBody())
+                .header("content-type", contentType.toString())
+
+        etag?.let {
+            request.header("if-match", it)
+        }
+
+        val response = httpClient.newCall(request.build()).execute()
+
+        if (response.code == 404) {
+            throw get404Error()
+        }
+        etag = response.header("etag")
+
+        Timber.tag(TAG).i("Sent data to $uri new etag $etag")
+
+        if (method == "POST") {
+            val location = response.header("location") ?: throw RuntimeException("No rendezvous URI found in response")
+
+            response.header("expires")?.let {
+                val format = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US)
+                expiresAt = format.parse(it)
+            }
+
+            // resolve location header which could be relative or absolute
+            this.uri = response.request.url.toUri().resolve(location).toString()
+            ready = true
+        }
+    }
+
+    @Throws(RendezvousError::class)
+    override suspend fun receive(): ByteArray? {
+        if (cancelled) {
+            throw IllegalStateException("Rendezvous cancelled")
+        }
+        val uri = uri ?: throw IllegalStateException("Rendezvous not set up")
+        val httpClient = okhttp3.OkHttpClient.Builder().build()
+        while (true) {
+            Timber.tag(TAG).i("Polling: $uri after etag $etag")
+            val request = Request.Builder()
+                    .url(uri)
+                    .get()
+
+            etag?.let {
+                request.header("if-none-match", it)
+            }
+
+            val response = httpClient.newCall(request.build()).execute()
+
+            try {
+                // expired
+                if (response.code == 404) {
+                    throw get404Error()
+                }
+
+                // rely on server expiring the channel rather than checking ourselves
+
+                if (response.header("content-type") != "application/json") {
+                    response.header("etag")?.let {
+                        etag = it
+                    }
+                } else if (response.code == 200) {
+                    response.header("etag")?.let {
+                        etag = it
+                    }
+                    return response.body?.bytes()
+                }
+
+                // sleep for a second before polling again
+                // we rely on the server expiring the channel rather than checking it ourselves
+                delay(1000)
+            } finally {
+                response.close()
+            }
+        }
+    }
+
+    private fun get404Error(): RendezvousError {
+        if (expiresAt != null && Date() > expiresAt) {
+            return RendezvousError("Expired", RendezvousFailureReason.Expired)
+        }
+
+        return RendezvousError("Received unexpected 404", RendezvousFailureReason.Unknown)
+    }
+
+    override suspend fun close() {
+        cancelled = true
+        ready = false
+
+        uri?.let {
+            try {
+                val httpClient = okhttp3.OkHttpClient.Builder().build()
+                val request = Request.Builder()
+                        .url(it)
+                        .delete()
+                        .build()
+                httpClient.newCall(request).execute()
+            } catch (e: Throwable) {
+                Timber.tag(TAG).w(e, "Failed to delete channel")
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/securestorage/SecretStoringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/securestorage/SecretStoringUtils.kt
index e701e0f3ba..234a8eee98 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/securestorage/SecretStoringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/securestorage/SecretStoringUtils.kt
@@ -131,11 +131,10 @@ class SecretStoringUtils @Inject constructor(
      *
      * The secret is encrypted using the following method: AES/GCM/NoPadding
      */
-    @SuppressLint("NewApi")
     @Throws(Exception::class)
     fun securelyStoreBytes(secret: ByteArray, keyAlias: String): ByteArray {
         return when {
-            buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M -> encryptBytesM(secret, keyAlias)
+            buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.M) -> encryptBytesM(secret, keyAlias)
             else -> encryptBytes(secret, keyAlias)
         }
     }
@@ -156,10 +155,9 @@ class SecretStoringUtils @Inject constructor(
         }
     }
 
-    @SuppressLint("NewApi")
     fun securelyStoreObject(any: Any, keyAlias: String, output: OutputStream) {
         when {
-            buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M -> saveSecureObjectM(keyAlias, output, any)
+            buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.M) -> saveSecureObjectM(keyAlias, output, any)
             else -> saveSecureObject(keyAlias, output, any)
         }
     }
@@ -189,7 +187,6 @@ class SecretStoringUtils @Inject constructor(
         return cipher
     }
 
-    @SuppressLint("NewApi")
     @RequiresApi(Build.VERSION_CODES.M)
     private fun getOrGenerateSymmetricKeyForAliasM(alias: String): SecretKey {
         val secretKeyEntry = (keyStore.getEntry(alias, null) as? KeyStore.SecretKeyEntry)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 63c1c25130..cf0f4bdce0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -50,7 +50,6 @@ import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageServi
 import org.matrix.android.sdk.api.session.signout.SignOutService
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.statistics.StatisticsListener
-import org.matrix.android.sdk.api.session.sync.FilterService
 import org.matrix.android.sdk.api.session.sync.SyncService
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.api.session.thirdparty.ThirdPartyService
@@ -163,11 +162,6 @@ interface Session {
      */
     fun signOutService(): SignOutService
 
-    /**
-     * Returns the FilterService associated with the session.
-     */
-    fun filterService(): FilterService
-
     /**
      * Returns the PushRuleService associated with the session.
      */
@@ -323,9 +317,9 @@ interface Session {
     fun getUiaSsoFallbackUrl(authenticationSessionId: String): String
 
     /**
-     * Debug API, will print out info on DB size to logcat.
+     * Debug API, will return info about the DB.
      */
-    fun logDbUsageInfo()
+    fun getDbUsageInfo(): String
 
     /**
      * Debug API, return the list of all RealmConfiguration used by this session.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionExtensions.kt
index a15e73eb88..96dac27618 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionExtensions.kt
@@ -32,5 +32,13 @@ fun Session.getRoomSummary(roomIdOrAlias: String): RoomSummary? = roomService().
 
 /**
  * Get a user using the UserService of a Session.
+ * @param userId the userId to look for.
+ * @return a user with userId or null if the User is not known yet by the SDK.
+ * See [org.matrix.android.sdk.api.session.user.UserService.resolveUser] to ensure that a User is retrieved.
  */
 fun Session.getUser(userId: String): User? = userService().getUser(userId)
+
+/**
+ * Similar to [getUser], but fallback to a User without details if the User is not known by the SDK, or if Session is null.
+ */
+fun Session?.getUserOrDefault(userId: String): User = this?.userService()?.getUser(userId) ?: User(userId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/SessionAccountDataService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/SessionAccountDataService.kt
index a22dd33774..8addb0782e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/SessionAccountDataService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/SessionAccountDataService.kt
@@ -63,4 +63,17 @@ interface SessionAccountDataService {
      * Update the account data with the provided type and the provided account data content.
      */
     suspend fun updateUserAccountData(type: String, content: Content)
+
+    /**
+     * Retrieve user account data list whose type starts with the given type.
+     * @param type the type or the starting part of a type
+     * @return list of account data whose type starts with the given type
+     */
+    fun getUserAccountDataEventsStartWith(type: String): List<UserAccountDataEvent>
+
+    /**
+     * Deletes user account data of the given type.
+     * @param type the type to delete from user account data
+     */
+    suspend fun deleteUserAccountData(type: String)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
index 91167d896f..0edd824c26 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
@@ -28,4 +28,5 @@ object UserAccountDataTypes {
     const val TYPE_IDENTITY_SERVER = "m.identity_server"
     const val TYPE_ACCEPTED_TERMS = "m.accepted_terms"
     const val TYPE_OVERRIDE_COLORS = "im.vector.setting.override_colors"
+    const val TYPE_LOCAL_NOTIFICATION_SETTINGS = "org.matrix.msc3890.local_notification_settings."
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
index a5e05f69e0..971d04261e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.api.session.crypto
 
 import android.content.Context
+import androidx.annotation.Size
 import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
 import org.matrix.android.sdk.api.MatrixCallback
@@ -40,6 +41,7 @@ import org.matrix.android.sdk.api.session.crypto.verification.VerificationServic
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.content.RoomKeyWithHeldContent
+import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.model.SessionInfo
 
 interface CryptoService {
@@ -54,12 +56,16 @@ interface CryptoService {
 
     fun deleteDevice(deviceId: String, userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor, callback: MatrixCallback<Unit>)
 
+    fun deleteDevices(@Size(min = 1) deviceIds: List<String>, userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor, callback: MatrixCallback<Unit>)
+
     fun getCryptoVersion(context: Context, longFormat: Boolean): String
 
     fun isCryptoEnabled(): Boolean
 
     fun isRoomBlacklistUnverifiedDevices(roomId: String?): Boolean
 
+    fun getLiveBlockUnverifiedDevices(roomId: String): LiveData<Boolean>
+
     fun setWarnOnUnknownDevices(warn: Boolean)
 
     fun setDeviceVerification(trustLevel: DeviceTrustLevel, userId: String, deviceId: String)
@@ -76,6 +82,8 @@ interface CryptoService {
 
     fun setGlobalBlacklistUnverifiedDevices(block: Boolean)
 
+    fun getLiveGlobalCryptoConfig(): LiveData<GlobalCryptoConfig>
+
     /**
      * Enable or disable key gossiping.
      * Default is true.
@@ -99,7 +107,7 @@ interface CryptoService {
      */
     fun isShareKeysOnInviteEnabled(): Boolean
 
-    fun setRoomUnBlacklistUnverifiedDevices(roomId: String)
+    fun setRoomUnBlockUnverifiedDevices(roomId: String)
 
     fun getDeviceTrackingStatus(userId: String): Int
 
@@ -111,9 +119,21 @@ interface CryptoService {
 
     suspend fun exportRoomKeys(password: String): ByteArray
 
-    fun setRoomBlacklistUnverifiedDevices(roomId: String)
+    fun setRoomBlockUnverifiedDevices(roomId: String, block: Boolean)
 
-    fun getDeviceInfo(userId: String, deviceId: String?): CryptoDeviceInfo?
+    fun getCryptoDeviceInfo(userId: String, deviceId: String?): CryptoDeviceInfo?
+
+    fun getCryptoDeviceInfo(deviceId: String, callback: MatrixCallback<DeviceInfo>)
+
+    fun getCryptoDeviceInfo(userId: String): List<CryptoDeviceInfo>
+
+    fun getLiveCryptoDeviceInfo(): LiveData<List<CryptoDeviceInfo>>
+
+    fun getLiveCryptoDeviceInfoWithId(deviceId: String): LiveData<Optional<CryptoDeviceInfo>>
+
+    fun getLiveCryptoDeviceInfo(userId: String): LiveData<List<CryptoDeviceInfo>>
+
+    fun getLiveCryptoDeviceInfo(userIds: List<String>): LiveData<List<CryptoDeviceInfo>>
 
     fun requestRoomKeyForEvent(event: Event)
 
@@ -127,9 +147,9 @@ interface CryptoService {
 
     fun getMyDevicesInfo(): List<DeviceInfo>
 
-    fun getLiveMyDevicesInfo(): LiveData<List<DeviceInfo>>
+    fun getMyDevicesInfoLive(): LiveData<List<DeviceInfo>>
 
-    fun getDeviceInfo(deviceId: String, callback: MatrixCallback<DeviceInfo>)
+    fun getMyDevicesInfoLive(deviceId: String): LiveData<Optional<DeviceInfo>>
 
     fun inboundGroupSessionsCount(onlyBackedUp: Boolean): Int
 
@@ -156,14 +176,6 @@ interface CryptoService {
 
     fun downloadKeys(userIds: List<String>, forceDownload: Boolean, callback: MatrixCallback<MXUsersDevicesMap<CryptoDeviceInfo>>)
 
-    fun getCryptoDeviceInfo(userId: String): List<CryptoDeviceInfo>
-
-    fun getLiveCryptoDeviceInfo(): LiveData<List<CryptoDeviceInfo>>
-
-    fun getLiveCryptoDeviceInfo(userId: String): LiveData<List<CryptoDeviceInfo>>
-
-    fun getLiveCryptoDeviceInfo(userIds: List<String>): LiveData<List<CryptoDeviceInfo>>
-
     fun addNewSessionListener(newSessionListener: NewSessionListener)
     fun removeSessionListener(listener: NewSessionListener)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/GlobalCryptoConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/GlobalCryptoConfig.kt
new file mode 100644
index 0000000000..6405652a68
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/GlobalCryptoConfig.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.crypto
+
+data class GlobalCryptoConfig(
+        val globalBlockUnverifiedDevices: Boolean,
+        val globalEnableKeyGossiping: Boolean,
+        val enableKeyForwardingOnInvite: Boolean,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
index 9604decd62..30a2cfd719 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
@@ -18,7 +18,8 @@ package org.matrix.android.sdk.api.session.crypto.crosssigning
 
 data class MXCrossSigningInfo(
         val userId: String,
-        val crossSigningKeys: List<CryptoCrossSigningKey>
+        val crossSigningKeys: List<CryptoCrossSigningKey>,
+        val wasTrustedOnce: Boolean
 ) {
 
     fun isTrusted(): Boolean = masterKey()?.trustLevel?.isVerified() == true &&
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/DeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/DeviceInfo.kt
index b144069b99..500d016002 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/DeviceInfo.kt
@@ -52,9 +52,17 @@ data class DeviceInfo(
          * The last ip address.
          */
         @Json(name = "last_seen_ip")
-        val lastSeenIp: String? = null
+        val lastSeenIp: String? = null,
+
+        @Json(name = "org.matrix.msc3852.last_seen_user_agent")
+        val unstableLastSeenUserAgent: String? = null,
+
+        @Json(name = "last_seen_user_agent")
+        val lastSeenUserAgent: String? = null,
 ) : DatedObject {
 
     override val date: Long
         get() = lastSeenTs ?: 0
+
+    fun getBestLastSeenUserAgent() = lastSeenUserAgent ?: unstableLastSeenUserAgent
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/MXEventDecryptionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/MXEventDecryptionResult.kt
index 0a0ccc2db3..66d7558fe2 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/MXEventDecryptionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/MXEventDecryptionResult.kt
@@ -43,5 +43,7 @@ data class MXEventDecryptionResult(
          * List of curve25519 keys involved in telling us about the senderCurve25519Key and
          * claimedEd25519Key. See MXEvent.forwardingCurve25519KeyChain.
          */
-        val forwardingCurve25519KeyChain: List<String> = emptyList()
+        val forwardingCurve25519KeyChain: List<String> = emptyList(),
+
+        val isSafe: Boolean = false
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/OlmDecryptionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/OlmDecryptionResult.kt
index a26f6606ed..6d57318f87 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/OlmDecryptionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/OlmDecryptionResult.kt
@@ -44,5 +44,10 @@ data class OlmDecryptionResult(
         /**
          * Devices which forwarded this session to us (normally empty).
          */
-        @Json(name = "forwardingCurve25519KeyChain") val forwardingCurve25519KeyChain: List<String>? = null
+        @Json(name = "forwardingCurve25519KeyChain") val forwardingCurve25519KeyChain: List<String>? = null,
+
+        /**
+         * True if the key used to decrypt is considered safe (trusted).
+         */
+        @Json(name = "key_safety") val isSafe: Boolean? = null,
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/UserVerificationLevel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/UserVerificationLevel.kt
new file mode 100644
index 0000000000..e3c7057b6b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/UserVerificationLevel.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.crypto.model
+
+enum class UserVerificationLevel {
+
+    VERIFIED_ALL_DEVICES_TRUSTED,
+
+    VERIFIED_WITH_DEVICES_UNTRUSTED,
+
+    UNVERIFIED_BUT_WAS_PREVIOUSLY,
+
+    WAS_NEVER_VERIFIED,
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt
index 239f749993..5b2ab77467 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt
@@ -38,5 +38,4 @@ data class AggregatedAnnotation(
         override val limited: Boolean? = false,
         override val count: Int? = 0,
         val chunk: List<RelationChunkInfo>? = null
-
 ) : UnsignedRelationInfo
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt
index ae8ed3941f..6577a9b41e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt
@@ -19,7 +19,8 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /**
- * <code>
+ * Server side relation aggregation.
+ * ```
  *  {
  *       "m.annotation": {
  *          "chunk": [
@@ -43,12 +44,13 @@ import com.squareup.moshi.JsonClass
  *           "count": 1
  *           }
  *      }
- * </code>
+ * ```
  */
 
 @JsonClass(generateAdapter = true)
 data class AggregatedRelations(
         @Json(name = "m.annotation") val annotations: AggregatedAnnotation? = null,
         @Json(name = "m.reference") val references: DefaultUnsignedRelationInfo? = null,
+        @Json(name = "m.replace") val replaces: AggregatedReplace? = null,
         @Json(name = RelationType.THREAD) val latestThread: LatestThreadUnsignedRelation? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedReplace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedReplace.kt
new file mode 100644
index 0000000000..2ae091a1a4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedReplace.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.events.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * Note that there can be multiple events with an m.replace relationship to a given event (for example, if an event is edited multiple times).
+ * These should be aggregated by the homeserver.
+ * https://spec.matrix.org/v1.4/client-server-api/#server-side-aggregation-of-mreplace-relationships
+ *
+ */
+@JsonClass(generateAdapter = true)
+data class AggregatedReplace(
+        @Json(name = "event_id") val eventId: String? = null,
+        @Json(name = "origin_server_ts") val originServerTs: Long? = null,
+        @Json(name = "sender") val senderId: String? = null,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index 59dc6c434d..9a928c61fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -26,12 +26,12 @@ import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
 import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.room.model.relation.isReply
 import org.matrix.android.sdk.api.session.room.model.relation.shouldRenderInThread
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.threads.ThreadDetails
@@ -52,7 +52,7 @@ inline fun <reified T> Content?.toModel(catchError: Boolean = true): T? {
     val moshiAdapter = moshi.adapter(T::class.java)
     return try {
         moshiAdapter.fromJsonValue(this)
-    } catch (e: Exception) {
+    } catch (e: Throwable) {
         if (catchError) {
             Timber.e(e, "To model failed : $e")
             null
@@ -126,8 +126,37 @@ data class Event(
     /**
      * Copy all fields, including transient fields.
      */
-    fun copyAll(): Event {
-        return copy().also {
+
+    fun copyAll(
+            type: String? = this.type,
+            eventId: String? = this.eventId,
+            content: Content? = this.content,
+            prevContent: Content? = this.prevContent,
+            originServerTs: Long? = this.originServerTs,
+            senderId: String? = this.senderId,
+            stateKey: String? = this.stateKey,
+            roomId: String? = this.roomId,
+            unsignedData: UnsignedData? = this.unsignedData,
+            redacts: String? = this.redacts,
+            mxDecryptionResult: OlmDecryptionResult? = this.mxDecryptionResult,
+            mCryptoError: MXCryptoError.ErrorType? = this.mCryptoError,
+            mCryptoErrorReason: String? = this.mCryptoErrorReason,
+            sendState: SendState = this.sendState,
+            ageLocalTs: Long? = this.ageLocalTs,
+            threadDetails: ThreadDetails? = this.threadDetails,
+    ): Event {
+        return copy(
+                type = type,
+                eventId = eventId,
+                content = content,
+                prevContent = prevContent,
+                originServerTs = originServerTs,
+                senderId = senderId,
+                stateKey = stateKey,
+                roomId = roomId,
+                unsignedData = unsignedData,
+                redacts = redacts
+        ).also {
             it.mxDecryptionResult = mxDecryptionResult
             it.mCryptoError = mCryptoError
             it.mCryptoErrorReason = mCryptoErrorReason
@@ -174,15 +203,29 @@ data class Event(
      * @return the event type
      */
     fun getClearType(): String {
-        return mxDecryptionResult?.payload?.get("type")?.toString() ?: type ?: EventType.MISSING_TYPE
+        return getDecryptedType() ?: type ?: EventType.MISSING_TYPE
+    }
+
+    /**
+     * @return The decrypted type, or null. Won't fallback to the wired type
+     */
+    fun getDecryptedType(): String? {
+        return mxDecryptionResult?.payload?.get("type")?.toString()
     }
 
     /**
      * @return the event content
      */
     fun getClearContent(): Content? {
+        return getDecryptedContent() ?: content
+    }
+
+    /**
+     * @return the decrypted event content or null, Won't fallback to the wired content
+     */
+    fun getDecryptedContent(): Content? {
         @Suppress("UNCHECKED_CAST")
-        return mxDecryptionResult?.payload?.get("content") as? Content ?: content
+        return mxDecryptionResult?.payload?.get("content") as? Content
     }
 
     fun toContentStringWithIndent(): String {
@@ -213,11 +256,14 @@ data class Event(
         return when {
             isReplyRenderedInThread() || isQuote() -> ContentUtils.extractUsefulTextFromReply(text)
             isFileMessage() -> "sent a file."
+            isVoiceMessage() -> "sent a voice message."
             isAudioMessage() -> "sent an audio file."
             isImageMessage() -> "sent an image."
             isVideoMessage() -> "sent a video."
-            isSticker() -> "sent a sticker"
+            isSticker() -> "sent a sticker."
             isPoll() -> getPollQuestion() ?: "created a poll."
+            isLiveLocation() -> "Live location."
+            isLocationMessage() -> "has shared their location."
             else -> text
         }
     }
@@ -343,6 +389,10 @@ fun Event.isAudioMessage(): Boolean {
     }
 }
 
+fun Event.isVoiceMessage(): Boolean {
+    return this.asMessageAudioEvent()?.content?.voiceMessageIndicator != null
+}
+
 fun Event.isFileMessage(): Boolean {
     return when (getMsgType()) {
         MessageType.MSGTYPE_FILE -> true
@@ -367,24 +417,24 @@ fun Event.isLocationMessage(): Boolean {
     }
 }
 
-fun Event.isPoll(): Boolean = getClearType() in EventType.POLL_START || getClearType() in EventType.POLL_END
+fun Event.isPoll(): Boolean = isPollStart() || isPollEnd()
+
+fun Event.isPollStart(): Boolean = getClearType() in EventType.POLL_START.values
+
+fun Event.isPollResponse(): Boolean = getClearType() in EventType.POLL_RESPONSE.values
+
+fun Event.isPollEnd(): Boolean = getClearType() in EventType.POLL_END.values
 
 fun Event.isSticker(): Boolean = getClearType() == EventType.STICKER
 
-fun Event.isLiveLocation(): Boolean = getClearType() in EventType.STATE_ROOM_BEACON_INFO
+fun Event.isLiveLocation(): Boolean = getClearType() in EventType.STATE_ROOM_BEACON_INFO.values
 
 fun Event.getRelationContent(): RelationDefaultContent? {
     return if (isEncrypted()) {
         content.toModel<EncryptedEventContent>()?.relatesTo
     } else {
-        content.toModel<MessageContent>()?.relatesTo ?: run {
-            // Special cases when there is only a local msgtype for some event types
-            when (getClearType()) {
-                EventType.STICKER -> getClearContent().toModel<MessageStickerContent>()?.relatesTo
-                in EventType.BEACON_LOCATION_DATA -> getClearContent().toModel<MessageBeaconLocationDataContent>()?.relatesTo
-                else -> null
-            }
-        }
+        content.toModel<MessageContent>()?.relatesTo
+                ?: getClearContent()?.get("m.relates_to")?.toContent().toModel() // Special cases when there is only a local msgtype for some event types
     }
 }
 
@@ -401,14 +451,14 @@ fun Event.getRelationContentForType(type: String): RelationDefaultContent? =
         getRelationContent()?.takeIf { it.type == type }
 
 fun Event.isReply(): Boolean {
-    return getRelationContent()?.inReplyTo?.eventId != null
+    return getRelationContent().isReply()
 }
 
 fun Event.isReplyRenderedInThread(): Boolean {
     return isReply() && getRelationContent()?.shouldRenderInThread() == true
 }
 
-fun Event.isThread(): Boolean = getRelationContentForType(RelationType.THREAD)?.eventId != null
+fun Event.isThread(): Boolean = getRootThreadEventId() != null
 
 fun Event.getRootThreadEventId(): String? = getRelationContentForType(RelationType.THREAD)?.eventId
 
@@ -424,11 +474,11 @@ fun Event.isInvitation(): Boolean = type == EventType.STATE_ROOM_MEMBER &&
         content?.toModel<RoomMemberContent>()?.membership == Membership.INVITE
 
 fun Event.getPollContent(): MessagePollContent? {
-    return content.toModel<MessagePollContent>()
+    return getClearContent().toModel<MessagePollContent>()
 }
 
 fun Event.supportsNotification() =
-        this.getClearType() in EventType.MESSAGE + EventType.POLL_START + EventType.STATE_ROOM_BEACON_INFO
+        this.getClearType() in EventType.MESSAGE + EventType.POLL_START.values + EventType.STATE_ROOM_BEACON_INFO.values
 
 fun Event.isContentReportable() =
-        this.getClearType() in EventType.MESSAGE + EventType.STATE_ROOM_BEACON_INFO
+        this.getClearType() in EventType.MESSAGE + EventType.STATE_ROOM_BEACON_INFO.values
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventExt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventExt.kt
new file mode 100644
index 0000000000..32d5ebed8c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventExt.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.events.model
+
+fun Event.toValidDecryptedEvent(): ValidDecryptedEvent? {
+    if (!this.isEncrypted()) return null
+    val decryptedContent = this.getDecryptedContent() ?: return null
+    val eventId = this.eventId ?: return null
+    val roomId = this.roomId ?: return null
+    val type = this.getDecryptedType() ?: return null
+    val senderKey = this.getSenderKey() ?: return null
+    val algorithm = this.content?.get("algorithm") as? String ?: return null
+
+    // copy the relation as it's in clear in the encrypted content
+    val updatedContent = this.content.get("m.relates_to")?.let {
+        decryptedContent.toMutableMap().apply {
+            put("m.relates_to", it)
+        }
+    } ?: decryptedContent
+    return ValidDecryptedEvent(
+            type = type,
+            eventId = eventId,
+            clearContent = updatedContent,
+            prevContent = this.prevContent,
+            originServerTs = this.originServerTs ?: 0,
+            cryptoSenderKey = senderKey,
+            roomId = roomId,
+            unsignedData = this.unsignedData,
+            redacts = this.redacts,
+            algorithm = algorithm
+    )
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index 8fdbba21c5..013b452ced 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -16,6 +16,8 @@
 
 package org.matrix.android.sdk.api.session.events.model
 
+import org.matrix.android.sdk.api.session.room.model.message.MessageType.MSGTYPE_VERIFICATION_REQUEST
+
 /**
  * Constants defining known event types from Matrix specifications.
  */
@@ -49,11 +51,10 @@ object EventType {
     const val STATE_ROOM_JOIN_RULES = "m.room.join_rules"
     const val STATE_ROOM_GUEST_ACCESS = "m.room.guest_access"
     const val STATE_ROOM_POWER_LEVELS = "m.room.power_levels"
-    val STATE_ROOM_BEACON_INFO = listOf("org.matrix.msc3672.beacon_info", "m.beacon_info")
-    val BEACON_LOCATION_DATA = listOf("org.matrix.msc3672.beacon", "m.beacon")
+    val STATE_ROOM_BEACON_INFO = StableUnstableId(stable = "m.beacon_info", unstable = "org.matrix.msc3672.beacon_info")
+    val BEACON_LOCATION_DATA = StableUnstableId(stable = "m.beacon", unstable = "org.matrix.msc3672.beacon")
 
     const val STATE_SPACE_CHILD = "m.space.child"
-
     const val STATE_SPACE_PARENT = "m.space.parent"
 
     /**
@@ -70,6 +71,9 @@ object EventType {
     const val STATE_ROOM_ENCRYPTION = "m.room.encryption"
     const val STATE_ROOM_SERVER_ACL = "m.room.server_acl"
 
+    // This type is for local purposes, it should never be processed by the server
+    const val LOCAL_STATE_ROOM_THIRD_PARTY_INVITE = "local.room.third_party_invite"
+
     // Call Events
     const val CALL_INVITE = "m.call.invite"
     const val CALL_CANDIDATES = "m.call.candidates"
@@ -78,8 +82,7 @@ object EventType {
     const val CALL_NEGOTIATE = "m.call.negotiate"
     const val CALL_REJECT = "m.call.reject"
     const val CALL_HANGUP = "m.call.hangup"
-    const val CALL_ASSERTED_IDENTITY = "m.call.asserted_identity"
-    const val CALL_ASSERTED_IDENTITY_PREFIX = "org.matrix.call.asserted_identity"
+    val CALL_ASSERTED_IDENTITY = StableUnstableId(stable = "m.call.asserted_identity", unstable = "org.matrix.call.asserted_identity")
 
     // This type is not processed by the client, just sent to the server
     const val CALL_REPLACES = "m.call.replaces"
@@ -87,10 +90,7 @@ object EventType {
     // Key share events
     const val ROOM_KEY_REQUEST = "m.room_key_request"
     const val FORWARDED_ROOM_KEY = "m.forwarded_room_key"
-    val ROOM_KEY_WITHHELD = StableUnstableId(
-            stable = "m.room_key.withheld",
-            unstable = "org.matrix.room_key.withheld"
-    )
+    val ROOM_KEY_WITHHELD = StableUnstableId(stable = "m.room_key.withheld", unstable = "org.matrix.room_key.withheld")
 
     const val REQUEST_SECRET = "m.secret.request"
     const val SEND_SECRET = "m.secret.send"
@@ -108,9 +108,9 @@ object EventType {
     const val REACTION = "m.reaction"
 
     // Poll
-    val POLL_START = listOf("org.matrix.msc3381.poll.start", "m.poll.start")
-    val POLL_RESPONSE = listOf("org.matrix.msc3381.poll.response", "m.poll.response")
-    val POLL_END = listOf("org.matrix.msc3381.poll.end", "m.poll.end")
+    val POLL_START = StableUnstableId(stable = "m.poll.start", unstable = "org.matrix.msc3381.poll.start")
+    val POLL_RESPONSE = StableUnstableId(stable = "m.poll.response", unstable = "org.matrix.msc3381.poll.response")
+    val POLL_END = StableUnstableId(stable = "m.poll.end", unstable = "org.matrix.msc3381.poll.end")
 
     // Unwedging
     internal const val DUMMY = "m.dummy"
@@ -125,4 +125,18 @@ object EventType {
                 type == CALL_REJECT ||
                 type == CALL_REPLACES
     }
+
+    fun isVerificationEvent(type: String): Boolean {
+        return when (type) {
+            MSGTYPE_VERIFICATION_REQUEST,
+            KEY_VERIFICATION_START,
+            KEY_VERIFICATION_ACCEPT,
+            KEY_VERIFICATION_KEY,
+            KEY_VERIFICATION_MAC,
+            KEY_VERIFICATION_CANCEL,
+            KEY_VERIFICATION_DONE,
+            KEY_VERIFICATION_READY -> true
+            else -> false
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/ValidDecryptedEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/ValidDecryptedEvent.kt
new file mode 100644
index 0000000000..b305bf19b0
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/ValidDecryptedEvent.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.events.model
+
+import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+
+data class ValidDecryptedEvent(
+        val type: String,
+        val eventId: String,
+        val clearContent: Content,
+        val prevContent: Content? = null,
+        val originServerTs: Long,
+        val cryptoSenderKey: String,
+        val roomId: String,
+        val unsignedData: UnsignedData? = null,
+        val redacts: String? = null,
+        val algorithm: String,
+)
+
+fun ValidDecryptedEvent.getRelationContent(): RelationDefaultContent? {
+    return clearContent.toModel<MessageRelationContent?>()?.relatesTo
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
index b5d6d891e4..11638837cc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
@@ -59,7 +59,22 @@ data class HomeServerCapabilities(
         /**
          * True if the home server supports controlling the logout of all devices when changing password.
          */
-        val canControlLogoutDevices: Boolean = false
+        val canControlLogoutDevices: Boolean = false,
+
+        /**
+         * True if the home server supports login via qr code, false otherwise.
+         */
+        val canLoginWithQrCode: Boolean = false,
+
+        /**
+         * True if the home server supports threaded read receipts and unread notifications.
+         */
+        val canUseThreadReadReceiptsAndNotifications: Boolean = false,
+
+        /**
+         * True if the home server supports remote toggle of Pusher for a given device.
+         */
+        val canRemotelyTogglePushNotificationsOfDevices: Boolean = false,
 ) {
 
     enum class RoomCapabilitySupport {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
index 9d2c48e194..c65a5382fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
@@ -16,6 +16,9 @@
 
 package org.matrix.android.sdk.api.session.homeserver
 
+import androidx.lifecycle.LiveData
+import org.matrix.android.sdk.api.util.Optional
+
 /**
  * This interface defines a method to retrieve the homeserver capabilities.
  */
@@ -30,4 +33,9 @@ interface HomeServerCapabilitiesService {
      * Get the HomeServer capabilities.
      */
     fun getHomeServerCapabilities(): HomeServerCapabilities
+
+    /**
+     * Get a LiveData on the HomeServer capabilities.
+     */
+    fun getHomeServerCapabilitiesLive(): LiveData<Optional<HomeServerCapabilities>>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt
index 6bcf576824..24748f88e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt
@@ -18,10 +18,14 @@ package org.matrix.android.sdk.api.session.identity
 
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
+import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.internal.session.profile.ThirdPartyIdentifier
 
 sealed class ThreePid(open val value: String) {
+    @JsonClass(generateAdapter = true)
     data class Email(val email: String) : ThreePid(email)
+
+    @JsonClass(generateAdapter = true)
     data class Msisdn(val msisdn: String) : ThreePid(msisdn)
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/HttpPusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/HttpPusher.kt
index 1ae23e2b70..1258c5c02f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/HttpPusher.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/HttpPusher.kt
@@ -58,6 +58,16 @@ data class HttpPusher(
          */
         val url: String,
 
+        /**
+         * Whether the pusher should actively create push notifications.
+         */
+        val enabled: Boolean,
+
+        /**
+         * The device ID of the session that registered the pusher.
+         */
+        val deviceId: String,
+
         /**
          * If true, the homeserver should add another pusher with the given pushkey and App ID in addition
          * to any others with different user IDs. Otherwise, the homeserver must remove any other pushers
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
index b85ab32b21..92ac6c483b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
@@ -24,8 +24,9 @@ data class Pusher(
         val profileTag: String? = null,
         val lang: String?,
         val data: PusherData,
-
-        val state: PusherState
+        val enabled: Boolean,
+        val deviceId: String?,
+        val state: PusherState,
 ) {
     companion object {
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index d7958ea3cd..6a27f7af61 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -67,6 +67,14 @@ interface PushersService {
             append: Boolean = true
     )
 
+    /**
+     * Enables or disables a registered pusher.
+     *
+     * @param pusher The pusher being toggled
+     * @param enable Whether the pusher should be enabled or disabled
+     */
+    suspend fun togglePusher(pusher: Pusher, enable: Boolean)
+
     /**
      * Directly ask the push gateway to send a push to this device.
      * If successful, the push gateway has accepted the request. In this case, the app should receive a Push with the provided eventId.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 5d2769ac3c..8031fcaeea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -24,6 +24,7 @@ import org.matrix.android.sdk.api.session.room.call.RoomCallService
 import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
 import org.matrix.android.sdk.api.session.room.location.LocationSharingService
 import org.matrix.android.sdk.api.session.room.members.MembershipService
+import org.matrix.android.sdk.api.session.room.model.LocalRoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.relation.RelationService
 import org.matrix.android.sdk.api.session.room.notification.RoomPushRuleService
@@ -60,11 +61,22 @@ interface Room {
      */
     fun getRoomSummaryLive(): LiveData<Optional<RoomSummary>>
 
+    /**
+     * A live [LocalRoomSummary] associated with the room.
+     * You can observe this summary to get dynamic data from this room.
+     */
+    fun getLocalRoomSummaryLive(): LiveData<Optional<LocalRoomSummary>>
+
     /**
      * A current snapshot of [RoomSummary] associated with the room.
      */
     fun roomSummary(): RoomSummary?
 
+    /**
+     * A current snapshot of [LocalRoomSummary] associated with the room.
+     */
+    fun localRoomSummary(): LocalRoomSummary?
+
     /**
      * Use this room as a Space, if the type is correct.
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index ad8106c9c1..65383f1007 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.identity.model.SignInvitationResult
 import org.matrix.android.sdk.api.session.room.alias.RoomAliasDescription
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.LocalRoomSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -117,6 +118,12 @@ interface RoomService {
      */
     fun getRoomSummaryLive(roomId: String): LiveData<Optional<RoomSummary>>
 
+    /**
+     * A live [LocalRoomSummary] associated with the room with id [roomId].
+     * You can observe this summary to get dynamic data from this room, even if the room is not joined yet
+     */
+    fun getLocalRoomSummaryLive(roomId: String): LiveData<Optional<LocalRoomSummary>>
+
     /**
      * Get a snapshot list of room summaries.
      * @return the immutable list of [RoomSummary]
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index 60963ef25a..d651f06e23 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -20,8 +20,10 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.query.SpaceFilter
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams.Builder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 
 /**
@@ -52,6 +54,10 @@ fun spaceSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) =
  * [roomSummaryQueryParams] and [spaceSummaryQueryParams] can also be used to build an instance of this class.
  */
 data class RoomSummaryQueryParams(
+        /**
+         * Query for the roomId.
+         */
+        val roomId: QueryStringValue,
         /**
          * Query for the displayName of the room. The display name can be the value of the state event,
          * or a value returned by [org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider].
@@ -94,6 +100,7 @@ data class RoomSummaryQueryParams(
      * [roomSummaryQueryParams] and [spaceSummaryQueryParams] can also be used to build an instance of [RoomSummaryQueryParams].
      */
     class Builder {
+        var roomId: QueryStringValue = QueryStringValue.NotContains(RoomLocalEcho.PREFIX)
         var displayName: QueryStringValue = QueryStringValue.NoCondition
         var canonicalAlias: QueryStringValue = QueryStringValue.NoCondition
         var memberships: List<Membership> = Membership.all()
@@ -104,6 +111,7 @@ data class RoomSummaryQueryParams(
         var spaceFilter: SpaceFilter = SpaceFilter.NoFilter
 
         fun build() = RoomSummaryQueryParams(
+                roomId = roomId,
                 displayName = displayName,
                 canonicalAlias = canonicalAlias,
                 memberships = memberships,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/location/LocationSharingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/location/LocationSharingService.kt
index cd8acbcccc..93208be27b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/location/LocationSharingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/location/LocationSharingService.kt
@@ -47,10 +47,9 @@ interface LocationSharingService {
     /**
      * Starts sharing live location in the room.
      * @param timeoutMillis timeout of the live in milliseconds
-     * @param description description of the live for text fallback
      * @return the result of the update of the live
      */
-    suspend fun startLiveLocationShare(timeoutMillis: Long, description: String): UpdateLiveLocationShareResult
+    suspend fun startLiveLocationShare(timeoutMillis: Long): UpdateLiveLocationShareResult
 
     /**
      * Stops sharing live location in the room.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
index 67bab626cb..7d445a5cc6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
@@ -15,10 +15,10 @@
  */
 package org.matrix.android.sdk.api.session.room.model
 
-import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
 
 data class EditAggregatedSummary(
-        val latestContent: Content? = null,
+        val latestEdit: Event? = null,
         // The list of the eventIDs used to build the summary (might be out of sync if chunked received from message chunk)
         val sourceEvents: List<String>,
         val localEchos: List<String>,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/LocalRoomCreationState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/LocalRoomCreationState.kt
new file mode 100644
index 0000000000..4fc99225c4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/LocalRoomCreationState.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.room.model
+
+enum class LocalRoomCreationState {
+    NOT_CREATED,
+    CREATING,
+    FAILURE,
+    CREATED
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/LocalRoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/LocalRoomSummary.kt
new file mode 100644
index 0000000000..eced1dd581
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/LocalRoomSummary.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.room.model
+
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+
+/**
+ * This class holds some data of a local room.
+ * It can be retrieved by [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
+ */
+data class LocalRoomSummary(
+        /**
+         * The roomId of the room.
+         */
+        val roomId: String,
+        /**
+         * The room summary of the room.
+         */
+        val roomSummary: RoomSummary?,
+        /**
+         * The creation params attached to the room.
+         */
+        val createRoomParams: CreateRoomParams?,
+        /**
+         * The roomId of the created room (ie. created on the server), if any.
+         */
+        val replacementRoomId: String?,
+        /**
+         * The creation state of the room.
+         */
+        val creationState: LocalRoomCreationState,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt
index 5639730219..da7e4ea928 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt
@@ -18,5 +18,6 @@ package org.matrix.android.sdk.api.session.room.model
 
 data class ReadReceipt(
         val roomMember: RoomMemberSummary,
-        val originServerTs: Long
+        val originServerTs: Long,
+        val threadId: String?
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index ff4977491f..b63656dc50 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -97,6 +97,14 @@ data class RoomSummary(
          * Number of unread and highlighted message in this room.
          */
         val highlightCount: Int = 0,
+        /**
+         * Number of threads with unread messages in this room.
+         */
+        val threadNotificationCount: Int = 0,
+        /**
+         * Number of threads with highlighted messages in this room.
+         */
+        val threadHighlightCount: Int = 0,
         /**
          * True if this room has unread messages.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
index 7d3109fb6e..2388bee0ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
@@ -34,5 +34,4 @@ data class SpaceChildInfo(
         val canonicalAlias: String?,
         val aliases: List<String>?,
         val worldReadable: Boolean
-
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index b7b0cc890b..d6eb7b30d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -17,13 +17,16 @@
 package org.matrix.android.sdk.api.session.room.model.create
 
 import android.net.Uri
+import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.internal.di.MoshiProvider
 
+@JsonClass(generateAdapter = true)
 open class CreateRoomParams {
     /**
      * A public visibility indicates that the room will be shown in the published room list.
@@ -61,12 +64,12 @@ open class CreateRoomParams {
      * A list of user IDs to invite to the room.
      * This will tell the server to invite everyone in the list to the newly created room.
      */
-    val invitedUserIds = mutableListOf<String>()
+    var invitedUserIds = mutableListOf<String>()
 
     /**
      * A list of objects representing third party IDs to invite into the room.
      */
-    val invite3pids = mutableListOf<ThreePid>()
+    var invite3pids = mutableListOf<ThreePid>()
 
     /**
      * Initial Guest Access.
@@ -99,14 +102,14 @@ open class CreateRoomParams {
      * The server will clobber the following keys: creator.
      * Future versions of the specification may allow the server to clobber other keys.
      */
-    val creationContent = mutableMapOf<String, Any>()
+    var creationContent = mutableMapOf<String, Any>()
 
     /**
      * A list of state events to set in the new room. This allows the user to override the default state events
      * set in the new room. The expected format of the state events are an object with type, state_key and content keys set.
      * Takes precedence over events set by preset, but gets overridden by name and topic keys.
      */
-    val initialStates = mutableListOf<CreateRoomStateEvent>()
+    var initialStates = mutableListOf<CreateRoomStateEvent>()
 
     /**
      * Set to true to disable federation of this room.
@@ -151,7 +154,7 @@ open class CreateRoomParams {
      * Supported value: MXCRYPTO_ALGORITHM_MEGOLM.
      */
     var algorithm: String? = null
-        private set
+        internal set
 
     var historyVisibility: RoomHistoryVisibility? = null
 
@@ -161,10 +164,18 @@ open class CreateRoomParams {
 
     var roomVersion: String? = null
 
-    var featurePreset: RoomFeaturePreset? = null
+    @Transient var featurePreset: RoomFeaturePreset? = null
 
     companion object {
-        private const val CREATION_CONTENT_KEY_M_FEDERATE = "m.federate"
-        private const val CREATION_CONTENT_KEY_ROOM_TYPE = "type"
+        internal const val CREATION_CONTENT_KEY_M_FEDERATE = "m.federate"
+        internal const val CREATION_CONTENT_KEY_ROOM_TYPE = "type"
+
+        fun fromJson(json: String?): CreateRoomParams? {
+            return json?.let { MoshiProvider.providesMoshi().adapter(CreateRoomParams::class.java).fromJson(it) }
+        }
     }
 }
+
+internal fun CreateRoomParams.toJSONString(): String {
+    return MoshiProvider.providesMoshi().adapter(CreateRoomParams::class.java).toJson(this)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomStateEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomStateEvent.kt
index fcfdc3e333..d89c72c513 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomStateEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomStateEvent.kt
@@ -16,8 +16,10 @@
 
 package org.matrix.android.sdk.api.session.room.model.create
 
+import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Content
 
+@JsonClass(generateAdapter = true)
 data class CreateRoomStateEvent(
         /**
          * Required. The type of event to send.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/localecho/RoomLocalEcho.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/localecho/RoomLocalEcho.kt
index 7ef0d63924..ec0e642ad3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/localecho/RoomLocalEcho.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/localecho/RoomLocalEcho.kt
@@ -20,7 +20,7 @@ import java.util.UUID
 
 object RoomLocalEcho {
 
-    private const val PREFIX = "!local."
+    const val PREFIX = "!local."
 
     /**
      * Tell whether the provider room id is a local id.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioEvent.kt
new file mode 100644
index 0000000000..38ced8f385
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioEvent.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.room.model.message
+
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+
+/**
+ * [Event] wrapper for [EventType.MESSAGE] event type.
+ * Provides additional fields and functions related to this event type.
+ */
+@JvmInline
+value class MessageAudioEvent(val root: Event) {
+
+    /**
+     * The mapped [MessageAudioContent] model of the event content.
+     */
+    val content: MessageAudioContent
+        get() = root.getClearContent().toModel<MessageContent>() as MessageAudioContent
+
+    init {
+        require(tryOrNull { content } != null)
+    }
+}
+
+/**
+ * Map a [EventType.MESSAGE] event to a [MessageAudioEvent].
+ */
+fun Event.asMessageAudioEvent() = if (getClearType() == EventType.MESSAGE) {
+    tryOrNull { MessageAudioEvent(this) }
+} else null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
index f8c1c0d798..627ce53df6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
@@ -34,7 +34,7 @@ data class MessageStickerContent(
          * Required. A textual representation of the image. This could be the alt text of the image, the filename of the image,
          * or some kind of content description for accessibility e.g. 'image attachment'.
          */
-        @Json(name = "body") override val body: String,
+        @Json(name = "body") override val body: String = "",
 
         /**
          * Metadata about the image referred to in url.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
index b12d9ed6c8..e97a5be303 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
@@ -43,4 +43,7 @@ object MessageType {
     // Fake message types for live location events to be able to inherit them from MessageContent
     const val MSGTYPE_BEACON_INFO = "org.matrix.android.sdk.beacon.info"
     const val MSGTYPE_BEACON_LOCATION_DATA = "org.matrix.android.sdk.beacon.location.data"
+
+    // Fake message types for voice broadcast events to be able to inherit them from MessageContent
+    const val MSGTYPE_VOICE_BROADCAST_INFO = "io.element.voicebroadcast.info"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt
index 5dcb1b4323..b9f9335dbd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt
@@ -28,3 +28,5 @@ data class RelationDefaultContent(
 ) : RelationContent
 
 fun RelationDefaultContent.shouldRenderInThread(): Boolean = isFallingBack == false
+
+fun RelationDefaultContent?.isReply(): Boolean = this?.inReplyTo?.eventId != null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
index d34ea3c7d3..e7fcabf386 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
@@ -91,7 +91,8 @@ interface RelationService {
      * Edit a text message body. Limited to "m.text" contentType.
      * @param targetEvent The event to edit
      * @param msgType the message type
-     * @param newBodyText The edited body
+     * @param newBodyText The edited body in plain text
+     * @param newFormattedBodyText The edited body with format
      * @param newBodyAutoMarkdown true to parse markdown on the new body
      * @param compatibilityBodyText The text that will appear on clients that don't support yet edition
      */
@@ -99,6 +100,7 @@ interface RelationService {
             targetEvent: TimelineEvent,
             msgType: String,
             newBodyText: CharSequence,
+            newFormattedBodyText: CharSequence? = null,
             newBodyAutoMarkdown: Boolean,
             compatibilityBodyText: String = "* $newBodyText"
     ): Cancelable
@@ -108,13 +110,15 @@ interface RelationService {
      * This method will take the new body (stripped from fallbacks) and re-add them before sending.
      * @param replyToEdit The event to edit
      * @param originalTimelineEvent the message that this reply (being edited) is relating to
-     * @param newBodyText The edited body (stripped from in reply to content)
+     * @param newBodyText The plain text edited body (stripped from in reply to content)
+     * @param newFormattedBodyText The formatted edited body (stripped from in reply to content)
      * @param compatibilityBodyText The text that will appear on clients that don't support yet edition
      */
     fun editReply(
             replyToEdit: TimelineEvent,
             originalTimelineEvent: TimelineEvent,
             newBodyText: String,
+            newFormattedBodyText: String? = null,
             compatibilityBodyText: String = "* $newBodyText"
     ): Cancelable
 
@@ -133,6 +137,7 @@ interface RelationService {
      * by the sdk into pills.
      * @param eventReplied the event referenced by the reply
      * @param replyText the reply text
+     * @param replyFormattedText the reply text, formatted
      * @param autoMarkdown If true, the SDK will generate a formatted HTML message from the body text if markdown syntax is present
      * @param showInThread If true, relation will be added to the reply in order to be visible from within threads
      * @param rootThreadEventId If show in thread is true then we need the rootThreadEventId to generate the relation
@@ -140,6 +145,7 @@ interface RelationService {
     fun replyToMessage(
             eventReplied: TimelineEvent,
             replyText: CharSequence,
+            replyFormattedText: CharSequence? = null,
             autoMarkdown: Boolean = false,
             showInThread: Boolean = false,
             rootThreadEventId: String? = null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
index dac1a1a773..83680ec2d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
@@ -34,12 +34,14 @@ interface ReadService {
     /**
      * Force the read marker to be set on the latest event.
      */
-    suspend fun markAsRead(params: MarkAsReadParams = MarkAsReadParams.BOTH)
+    suspend fun markAsRead(params: MarkAsReadParams = MarkAsReadParams.BOTH, mainTimeLineOnly: Boolean = true)
 
     /**
      * Set the read receipt on the event with provided eventId.
+     * @param eventId the id of the event where read receipt will be set
+     * @param threadId the id of the thread in which read receipt will be set. For main thread use [ReadService.THREAD_ID_MAIN] constant
      */
-    suspend fun setReadReceipt(eventId: String)
+    suspend fun setReadReceipt(eventId: String, threadId: String)
 
     /**
      * Set the read marker on the event with provided eventId.
@@ -59,10 +61,10 @@ interface ReadService {
     /**
      * Returns a live read receipt id for the room.
      */
-    fun getMyReadReceiptLive(): LiveData<Optional<String>>
+    fun getMyReadReceiptLive(threadId: String?): LiveData<Optional<String>>
 
     /**
-     * Get the eventId where the read receipt for the provided user is.
+     * Get the eventId from the main timeline where the read receipt for the provided user is.
      * @param userId the id of the user to look for
      *
      * @return the eventId where the read receipt for the provided user is attached, or null if not found
@@ -74,4 +76,8 @@ interface ReadService {
      * @param eventId the event
      */
     fun getEventReadReceiptsLive(eventId: String): LiveData<List<ReadReceipt>>
+
+    companion object {
+        const val THREAD_ID_MAIN = "main"
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
index 9cf062356f..6a6fadc95a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
@@ -21,6 +21,7 @@ import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.PollType
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Cancelable
 
@@ -44,28 +45,49 @@ interface SendService {
      * @param text the text message to send
      * @param msgType the message type: MessageType.MSGTYPE_TEXT (default) or MessageType.MSGTYPE_EMOTE
      * @param autoMarkdown If true, the SDK will generate a formatted HTML message from the body text if markdown syntax is present
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun sendTextMessage(text: CharSequence, msgType: String = MessageType.MSGTYPE_TEXT, autoMarkdown: Boolean = false): Cancelable
+    fun sendTextMessage(
+            text: CharSequence,
+            msgType: String = MessageType.MSGTYPE_TEXT,
+            autoMarkdown: Boolean = false,
+            additionalContent: Content? = null,
+    ): Cancelable
 
     /**
      * Method to send a text message with a formatted body.
      * @param text the text message to send
      * @param formattedText The formatted body using MessageType#FORMAT_MATRIX_HTML
      * @param msgType the message type: MessageType.MSGTYPE_TEXT (default) or MessageType.MSGTYPE_EMOTE
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun sendFormattedTextMessage(text: String, formattedText: String, msgType: String = MessageType.MSGTYPE_TEXT): Cancelable
+    fun sendFormattedTextMessage(
+            text: String,
+            formattedText: String,
+            msgType: String = MessageType.MSGTYPE_TEXT,
+            additionalContent: Content? = null,
+    ): Cancelable
 
     /**
      * Method to quote an events content.
      * @param quotedEvent The event to which we will quote it's content.
-     * @param text the text message to send
+     * @param text the plain text message to send
+     * @param formattedText the formatted text message to send
      * @param autoMarkdown If true, the SDK will generate a formatted HTML message from the body text if markdown syntax is present
      * @param rootThreadEventId when this param is not null, the message will be sent in this specific thread
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun sendQuotedTextMessage(quotedEvent: TimelineEvent, text: String, autoMarkdown: Boolean, rootThreadEventId: String? = null): Cancelable
+    fun sendQuotedTextMessage(
+            quotedEvent: TimelineEvent,
+            text: String,
+            formattedText: String? = null,
+            autoMarkdown: Boolean,
+            rootThreadEventId: String? = null,
+            additionalContent: Content? = null,
+    ): Cancelable
 
     /**
      * Method to send a media asynchronously.
@@ -74,13 +96,17 @@ interface SendService {
      * @param roomIds set of roomIds to where the media will be sent. The current roomId will be add to this set if not present.
      *                It can be useful to send media to multiple room. It's safe to include the current roomId in this set
      * @param rootThreadEventId when this param is not null, the Media will be sent in this specific thread
+     * @param relatesTo add a relation content to the media event
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
     fun sendMedia(
             attachment: ContentAttachmentData,
             compressBeforeSending: Boolean,
             roomIds: Set<String>,
-            rootThreadEventId: String? = null
+            rootThreadEventId: String? = null,
+            relatesTo: RelationDefaultContent? = null,
+            additionalContent: Content? = null,
     ): Cancelable
 
     /**
@@ -90,13 +116,15 @@ interface SendService {
      * @param roomIds set of roomIds to where the media will be sent. The current roomId will be add to this set if not present.
      *                It can be useful to send media to multiple room. It's safe to include the current roomId in this set
      * @param rootThreadEventId when this param is not null, all the Media will be sent in this specific thread
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
     fun sendMedias(
             attachments: List<ContentAttachmentData>,
             compressBeforeSending: Boolean,
             roomIds: Set<String>,
-            rootThreadEventId: String? = null
+            rootThreadEventId: String? = null,
+            additionalContent: Content? = null,
     ): Cancelable
 
     /**
@@ -104,31 +132,35 @@ interface SendService {
      * @param pollType indicates open or closed polls
      * @param question the question
      * @param options list of options
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun sendPoll(pollType: PollType, question: String, options: List<String>): Cancelable
+    fun sendPoll(pollType: PollType, question: String, options: List<String>, additionalContent: Content? = null): Cancelable
 
     /**
      * Method to send a poll response.
      * @param pollEventId the poll currently replied to
      * @param answerId The id of the answer
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun voteToPoll(pollEventId: String, answerId: String): Cancelable
+    fun voteToPoll(pollEventId: String, answerId: String, additionalContent: Content? = null): Cancelable
 
     /**
      * End a poll in the room.
      * @param pollEventId event id of the poll
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun endPoll(pollEventId: String): Cancelable
+    fun endPoll(pollEventId: String, additionalContent: Content? = null): Cancelable
 
     /**
      * Redact (delete) the given event.
      * @param event The event to redact
      * @param reason Optional reason string
+     * @param additionalContent additional content to put in the event content
      */
-    fun redactEvent(event: Event, reason: String?): Cancelable
+    fun redactEvent(event: Event, reason: String?, additionalContent: Content? = null): Cancelable
 
     /**
      * Schedule this message to be resent.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
index 8f214e0f89..634e71c43b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
@@ -33,5 +33,7 @@ object RoomSummaryConstants {
             EventType.ENCRYPTED,
             EventType.STICKER,
             EventType.REACTION
-    ) + EventType.POLL_START + EventType.STATE_ROOM_BEACON_INFO
+    ) +
+            EventType.POLL_START.values +
+            EventType.STATE_ROOM_BEACON_INFO.values
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/FetchThreadsResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/FetchThreadsResult.kt
new file mode 100644
index 0000000000..5d4d67a65e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/FetchThreadsResult.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.room.threads
+
+sealed class FetchThreadsResult {
+    data class ShouldFetchMore(val nextBatch: String) : FetchThreadsResult()
+    object ReachedEnd : FetchThreadsResult()
+    object Failed : FetchThreadsResult()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadFilter.kt
new file mode 100644
index 0000000000..3f3576728f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadFilter.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.room.threads
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = false)
+enum class ThreadFilter {
+    @Json(name = "all") ALL,
+    @Json(name = "participated") PARTICIPATED,
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadLivePageResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadLivePageResult.kt
new file mode 100644
index 0000000000..7693dc6fde
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadLivePageResult.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package org.matrix.android.sdk.api.session.room.threads
+
+import androidx.lifecycle.LiveData
+import androidx.paging.PagedList
+import org.matrix.android.sdk.api.session.room.ResultBoundaries
+import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummary
+
+data class ThreadLivePageResult(
+        val livePagedList: LiveData<PagedList<ThreadSummary>>,
+        val liveBoundaries: LiveData<ResultBoundaries>
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadsService.kt
index 9587be68f1..bb6f6b51d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadsService.kt
@@ -16,7 +16,7 @@
 
 package org.matrix.android.sdk.api.session.room.threads
 
-import androidx.lifecycle.LiveData
+import androidx.paging.PagedList
 import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummary
 
 /**
@@ -27,15 +27,14 @@ import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummary
  */
 interface ThreadsService {
 
-    /**
-     * Returns a [LiveData] list of all the [ThreadSummary] that exists at the room level.
-     */
-    fun getAllThreadSummariesLive(): LiveData<List<ThreadSummary>>
+    suspend fun getPagedThreadsList(userParticipating: Boolean, pagedListConfig: PagedList.Config): ThreadLivePageResult
+
+    suspend fun fetchThreadList(nextBatchId: String?, limit: Int, filter: ThreadFilter = ThreadFilter.ALL): FetchThreadsResult
 
     /**
      * Returns a list of all the [ThreadSummary] that exists at the room level.
      */
-    fun getAllThreadSummaries(): List<ThreadSummary>
+    suspend fun getAllThreadSummaries(): List<ThreadSummary>
 
     /**
      * Enhance the provided ThreadSummary[List] by adding the latest
@@ -51,9 +50,4 @@ interface ThreadsService {
      * @param limit defines the number of max results the api will respond with
      */
     suspend fun fetchThreadTimeline(rootThreadEventId: String, from: String, limit: Int)
-
-    /**
-     * Fetch all thread summaries for the current room using the enhanced /messages api.
-     */
-    suspend fun fetchThreadSummaries()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
index 1824d5dc6c..9ac33c0545 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
@@ -106,6 +106,8 @@ interface Timeline {
 
         /**
          * Called when new events come through the sync.
+         * Note that the corresponding events may not be available yet in the database.
+         * [onTimelineUpdated] will be called with the event content.
          */
         fun onNewTimelineEvents(eventIds: List<String>) = Unit
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
index d391abf1e6..9053425a39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.api.session.room.timeline
 
 import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.RelationType
@@ -33,6 +34,7 @@ import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContentWithFormattedBody
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
@@ -141,13 +143,21 @@ fun TimelineEvent.getEditedEventId(): String? {
 fun TimelineEvent.getLastMessageContent(): MessageContent? {
     return when (root.getClearType()) {
         EventType.STICKER -> root.getClearContent().toModel<MessageStickerContent>()
-        in EventType.POLL_START -> (annotations?.editSummary?.latestContent ?: root.getClearContent()).toModel<MessagePollContent>()
-        in EventType.STATE_ROOM_BEACON_INFO -> (annotations?.editSummary?.latestContent ?: root.getClearContent()).toModel<MessageBeaconInfoContent>()
-        in EventType.BEACON_LOCATION_DATA -> (annotations?.editSummary?.latestContent ?: root.getClearContent()).toModel<MessageBeaconLocationDataContent>()
-        else -> (annotations?.editSummary?.latestContent ?: root.getClearContent()).toModel()
+        // XXX
+        // Polls/Beacon are not message contents like others as there is no msgtype subtype to discriminate moshi parsing
+        // so toModel<MessageContent> won't parse them correctly
+        // It's discriminated on event type instead. Maybe it shouldn't be MessageContent at all to avoid confusion?
+        in EventType.POLL_START.values -> (getLastEditNewContent() ?: root.getClearContent()).toModel<MessagePollContent>()
+        in EventType.STATE_ROOM_BEACON_INFO.values -> (getLastEditNewContent() ?: root.getClearContent()).toModel<MessageBeaconInfoContent>()
+        in EventType.BEACON_LOCATION_DATA.values -> (getLastEditNewContent() ?: root.getClearContent()).toModel<MessageBeaconLocationDataContent>()
+        else -> (getLastEditNewContent() ?: root.getClearContent()).toModel()
     }
 }
 
+fun TimelineEvent.getLastEditNewContent(): Content? {
+    return annotations?.editSummary?.latestEdit?.getClearContent()?.toModel<MessageContent>()?.newContent
+}
+
 /**
  * Returns true if it's a reply.
  */
@@ -179,9 +189,16 @@ fun TimelineEvent.isRootThread(): Boolean {
 
 /**
  * Get the latest message body, after a possible edition, stripping the reply prefix if necessary.
+ * @param formatted Indicates whether the formatted HTML body of the message should be retrieved of the plain text one.
+ * @return If [formatted] is `true`, the HTML body of the message will be retrieved if available. Otherwise, the plain text/markdown version will be returned.
  */
-fun TimelineEvent.getTextEditableContent(): String {
-    val lastContentBody = getLastMessageContent()?.body ?: return ""
+fun TimelineEvent.getTextEditableContent(formatted: Boolean): String {
+    val lastMessageContent = getLastMessageContent()
+    val lastContentBody = if (formatted && lastMessageContent is MessageContentWithFormattedBody) {
+        lastMessageContent.formattedBody ?: lastMessageContent.body
+    } else {
+        lastMessageContent?.body
+    } ?: return ""
     return if (isReply()) {
         extractUsefulTextFromReply(lastContentBody)
     } else {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
index 46433f387d..aa9afd5c8c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
@@ -55,4 +55,9 @@ interface TimelineService {
      * Returns a snapshot list of TimelineEvent with EventType.MESSAGE and MessageType.MSGTYPE_IMAGE or MessageType.MSGTYPE_VIDEO.
      */
     fun getAttachmentMessages(): List<TimelineEvent>
+
+    /**
+     * Returns a snapshot list of TimelineEvent with a content relation of the given type to the given eventId.
+     */
+    fun getTimelineEventsRelatedTo(relationType: String, eventId: String): List<TimelineEvent>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchyData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchyData.kt
index ecc3eb5224..d03f4c42cf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchyData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchyData.kt
@@ -16,13 +16,13 @@
 
 package org.matrix.android.sdk.api.session.space
 
-import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.session.space.model.SpaceChildSummaryEvent
 
 data class SpaceHierarchyData(
         val rootSummary: RoomSummary,
         val children: List<SpaceChildInfo>,
-        val childrenState: List<Event>,
+        val childrenState: List<SpaceChildSummaryEvent>,
         val nextToken: String? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index c7a6405014..5d2a9412d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -18,10 +18,10 @@ package org.matrix.android.sdk.api.session.space
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.space.model.SpaceChildSummaryEvent
 import org.matrix.android.sdk.api.session.space.peeking.SpacePeekResult
 
 typealias SpaceSummaryQueryParams = RoomSummaryQueryParams
@@ -75,12 +75,12 @@ interface SpaceService {
             suggestedOnly: Boolean? = null,
             limit: Int? = null,
             from: String? = null,
-            knownStateList: List<Event>? = null
+            knownStateList: List<SpaceChildSummaryEvent>? = null
     ): SpaceHierarchyData
 
     /**
      * Get a live list of space summaries. This list is refreshed as soon as the data changes.
-     * @return the [LiveData] of List[SpaceSummary]
+     * @return the [LiveData] of List[RoomSummary]
      */
     fun getSpaceSummariesLive(
             queryParams: SpaceSummaryQueryParams,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildSummaryEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildSummaryEvent.kt
new file mode 100644
index 0000000000..13aa0336e5
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildSummaryEvent.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.space.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.events.model.Content
+
+@JsonClass(generateAdapter = true)
+data class SpaceChildSummaryEvent(
+        @Json(name = "type") val type: String? = null,
+        @Json(name = "state_key") val stateKey: String? = null,
+        @Json(name = "content") val content: Content? = null,
+        @Json(name = "sender") val senderId: String? = null,
+        @Json(name = "origin_server_ts") val originServerTs: Long? = null,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncService.kt
index 71f7ab8494..6640b8a9af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncService.kt
@@ -53,6 +53,11 @@ interface SyncService {
      */
     fun getSyncState(): SyncState
 
+    /**
+     * This method returns true if the sync thread is alive, i.e. started.
+     */
+    fun isSyncThreadAlive(): Boolean
+
     /**
      * This method allows to listen the sync state.
      * @return a [LiveData] of [SyncState].
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/filter/SyncFilterParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/filter/SyncFilterParams.kt
new file mode 100644
index 0000000000..02c5b0f8ef
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/filter/SyncFilterParams.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.sync.filter
+
+data class SyncFilterParams(
+        val lazyLoadMembersForStateEvents: Boolean? = null,
+        val lazyLoadMembersForMessageEvents: Boolean? = null,
+        val useThreadNotifications: Boolean? = null,
+        val listOfSupportedEventTypes: List<String>? = null,
+        val listOfSupportedStateEventTypes: List<String>? = null,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
index e5ac0a39b2..7eb44c1350 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
@@ -47,6 +47,11 @@ data class RoomSync(
          */
         @Json(name = "unread_notifications") val unreadNotifications: RoomSyncUnreadNotifications? = null,
 
+        /**
+         * The count of threads with unread notifications (not the total # of notifications in all threads).
+         */
+        @Json(name = "unread_thread_notifications") val unreadThreadNotifications: Map<String, RoomSyncUnreadThreadNotifications>? = null,
+
         /**
          * The room summary.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadThreadNotifications.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadThreadNotifications.kt
new file mode 100644
index 0000000000..70524d299a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadThreadNotifications.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.api.session.sync.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class RoomSyncUnreadThreadNotifications(
+        /**
+         * The number of threads with unread messages that match the push notification rules.
+         */
+        @Json(name = "notification_count") val notificationCount: Int? = null,
+
+        /**
+         * The number of threads with highlighted unread messages (subset of notifications).
+         */
+        @Json(name = "highlight_count") val highlightCount: Int? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
index 0c5465e12a..7075023798 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
@@ -29,7 +29,7 @@ interface UserService {
     /**
      * Get a user from a userId.
      * @param userId the userId to look for.
-     * @return a user with userId or null
+     * @return a user with userId or null if the User is not known yet by the SDK. See [resolveUser] to ensure that a User is retrieved.
      */
     fun getUser(userId: String): User?
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/BuildVersionSdkIntProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/BuildVersionSdkIntProvider.kt
index 900a2e237f..c8c328c92c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/BuildVersionSdkIntProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/BuildVersionSdkIntProvider.kt
@@ -16,6 +16,8 @@
 
 package org.matrix.android.sdk.api.util
 
+import androidx.annotation.ChecksSdkIntAtLeast
+
 interface BuildVersionSdkIntProvider {
     /**
      * Return the current version of the Android SDK.
@@ -26,9 +28,13 @@ interface BuildVersionSdkIntProvider {
      * Checks the if the current OS version is equal or greater than [version].
      * @return A `non-null` result if true, `null` otherwise.
      */
+    @ChecksSdkIntAtLeast(parameter = 0, lambda = 1)
     fun <T> whenAtLeast(version: Int, result: () -> T): T? {
         return if (get() >= version) {
             result()
         } else null
     }
+
+    @ChecksSdkIntAtLeast(parameter = 0)
+    fun isAtLeast(version: Int) = get() >= version
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Compat.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Compat.kt
new file mode 100644
index 0000000000..b685c49713
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Compat.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.api.util
+
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.os.Build
+
+fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int): ApplicationInfo {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getApplicationInfo(
+                packageName,
+                PackageManager.ApplicationInfoFlags.of(flags.toLong())
+        )
+        else -> @Suppress("DEPRECATION") getApplicationInfo(packageName, flags)
+    }
+}
+
+fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int): PackageInfo {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getPackageInfo(
+                packageName,
+                PackageManager.PackageInfoFlags.of(flags.toLong())
+        )
+        else -> @Suppress("DEPRECATION") getPackageInfo(packageName, flags)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
index 42724746c0..2da6d4cbf8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
@@ -15,15 +15,13 @@
  */
 package org.matrix.android.sdk.api.util
 
-data class Optional<T : Any> constructor(private val value: T?) {
+data class Optional<T : Any>(private val value: T?) {
 
-    fun get(): T {
-        return value!!
-    }
+    fun get(): T = value!!
 
-    fun getOrNull(): T? {
-        return value
-    }
+    fun orNull(): T? = value
+
+    fun getOrNull(): T? = value
 
     fun <U : Any> map(fn: (T) -> U?): Optional<U> {
         return if (value == null) {
@@ -33,23 +31,19 @@ data class Optional<T : Any> constructor(private val value: T?) {
         }
     }
 
-    fun getOrElse(fn: () -> T): T {
+    fun orElse(fn: () -> T): T {
         return value ?: fn()
     }
 
-    fun hasValue(): Boolean {
-        return value != null
-    }
+    fun hasValue(): Boolean = value != null
 
     companion object {
-        fun <T : Any> from(value: T?): Optional<T> {
-            return Optional(value)
-        }
+        fun <T : Any> from(value: T?): Optional<T> = Optional(value)
 
-        fun <T : Any> empty(): Optional<T> {
-            return Optional(null)
-        }
+        fun <T : Any> empty(): Optional<T> = Optional(null)
     }
 }
 
+fun <T : Any> T?.toOption() = Optional(this)
+
 fun <T : Any> T?.toOptional() = Optional(this)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
index 463692e574..b1f65194f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
@@ -29,7 +29,9 @@ import org.matrix.android.sdk.internal.auth.db.AuthRealmModule
 import org.matrix.android.sdk.internal.auth.db.RealmPendingSessionStore
 import org.matrix.android.sdk.internal.auth.db.RealmSessionParamsStore
 import org.matrix.android.sdk.internal.auth.login.DefaultDirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.DefaultQrLoginTokenTask
 import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.QrLoginTokenTask
 import org.matrix.android.sdk.internal.database.RealmKeysUtils
 import org.matrix.android.sdk.internal.di.AuthDatabase
 import org.matrix.android.sdk.internal.legacy.DefaultLegacySessionImporter
@@ -94,4 +96,7 @@ internal abstract class AuthModule {
 
     @Binds
     abstract fun bindHomeServerHistoryService(service: DefaultHomeServerHistoryService): HomeServerHistoryService
+
+    @Binds
+    abstract fun bindQrLoginTokenTask(task: DefaultQrLoginTokenTask): QrLoginTokenTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 479ba2810a..acbfc42dcc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -40,9 +40,11 @@ import org.matrix.android.sdk.internal.auth.data.WebClientConfig
 import org.matrix.android.sdk.internal.auth.db.PendingSessionData
 import org.matrix.android.sdk.internal.auth.login.DefaultLoginWizard
 import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.QrLoginTokenTask
 import org.matrix.android.sdk.internal.auth.registration.DefaultRegistrationWizard
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportLogoutDevices
+import org.matrix.android.sdk.internal.auth.version.doesServerSupportQrCodeLogin
 import org.matrix.android.sdk.internal.auth.version.isLoginAndRegistrationSupportedBySdk
 import org.matrix.android.sdk.internal.auth.version.isSupportedBySdk
 import org.matrix.android.sdk.internal.di.Unauthenticated
@@ -63,7 +65,8 @@ internal class DefaultAuthenticationService @Inject constructor(
         private val sessionCreator: SessionCreator,
         private val pendingSessionStore: PendingSessionStore,
         private val getWellknownTask: GetWellknownTask,
-        private val directLoginTask: DirectLoginTask
+        private val directLoginTask: DirectLoginTask,
+        private val qrLoginTokenTask: QrLoginTokenTask
 ) : AuthenticationService {
 
     private var pendingSessionData: PendingSessionData? = pendingSessionStore.getPendingSessionData()
@@ -305,7 +308,8 @@ internal class DefaultAuthenticationService @Inject constructor(
                 homeServerUrl = homeServerUrl,
                 isOutdatedHomeserver = !versions.isSupportedBySdk(),
                 hasOidcCompatibilityFlow = oidcCompatibilityFlow != null,
-                isLogoutDevicesSupported = versions.doesServerSupportLogoutDevices()
+                isLogoutDevicesSupported = versions.doesServerSupportLogoutDevices(),
+                isLoginWithQrSupported = versions.doesServerSupportQrCodeLogin(),
         )
     }
 
@@ -414,6 +418,22 @@ internal class DefaultAuthenticationService @Inject constructor(
         )
     }
 
+    override suspend fun loginUsingQrLoginToken(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            loginToken: String,
+            initialDeviceName: String?,
+            deviceId: String?,
+    ): Session {
+        return qrLoginTokenTask.execute(
+                QrLoginTokenTask.Params(
+                        homeServerConnectionConfig = homeServerConnectionConfig,
+                        loginToken = loginToken,
+                        deviceName = initialDeviceName,
+                        deviceId = deviceId
+                )
+        )
+    }
+
     private fun buildAuthAPI(homeServerConnectionConfig: HomeServerConnectionConfig): AuthAPI {
         val retrofit = retrofitFactory.create(buildClient(homeServerConnectionConfig), homeServerConnectionConfig.homeServerUriBase.toString())
         return retrofit.create(AuthAPI::class.java)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
index ea8578ed8c..8646752083 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
@@ -18,4 +18,6 @@ package org.matrix.android.sdk.internal.auth.data
 
 internal interface LoginParams {
     val type: String
+    val deviceDisplayName: String?
+    val deviceId: String?
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
index 5f0a2298cb..062b2466e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
@@ -30,8 +30,8 @@ internal data class PasswordLoginParams(
         @Json(name = "identifier") val identifier: Map<String, String>,
         @Json(name = "password") val password: String,
         @Json(name = "type") override val type: String,
-        @Json(name = "initial_device_display_name") val deviceDisplayName: String?,
-        @Json(name = "device_id") val deviceId: String?
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String?,
+        @Json(name = "device_id") override val deviceId: String?
 ) : LoginParams {
 
     companion object {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
index 0c6fb45e78..52045a1d7a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
@@ -23,5 +23,7 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 @JsonClass(generateAdapter = true)
 internal data class TokenLoginParams(
         @Json(name = "type") override val type: String = LoginFlowTypes.TOKEN,
-        @Json(name = "token") val token: String
+        @Json(name = "token") val token: String,
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String? = null,
+        @Json(name = "device_id") override val deviceId: String? = null
 ) : LoginParams
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt
new file mode 100644
index 0000000000..477719f607
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.auth.login
+
+import dagger.Lazy
+import okhttp3.OkHttpClient
+import org.matrix.android.sdk.api.auth.LoginType
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.auth.SessionCreator
+import org.matrix.android.sdk.internal.auth.data.TokenLoginParams
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.httpclient.addSocketFactory
+import org.matrix.android.sdk.internal.network.ssl.UnrecognizedCertificateException
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface QrLoginTokenTask : Task<QrLoginTokenTask.Params, Session> {
+    data class Params(
+            val homeServerConnectionConfig: HomeServerConnectionConfig,
+            val loginToken: String,
+            val deviceName: String?,
+            val deviceId: String?
+    )
+}
+
+internal class DefaultQrLoginTokenTask @Inject constructor(
+        @Unauthenticated
+        private val okHttpClient: Lazy<OkHttpClient>,
+        private val retrofitFactory: RetrofitFactory,
+        private val sessionCreator: SessionCreator,
+) : QrLoginTokenTask {
+
+    override suspend fun execute(params: QrLoginTokenTask.Params): Session {
+        val client = buildClient(params.homeServerConnectionConfig)
+        val homeServerUrl = params.homeServerConnectionConfig.homeServerUriBase.toString()
+
+        val authAPI = retrofitFactory.create(client, homeServerUrl)
+                .create(AuthAPI::class.java)
+
+        val loginParams = TokenLoginParams(
+                token = params.loginToken,
+                deviceDisplayName = params.deviceName,
+                deviceId = params.deviceId
+        )
+
+        val credentials = try {
+            executeRequest(null) {
+                authAPI.login(loginParams)
+            }
+        } catch (throwable: Throwable) {
+            throw when (throwable) {
+                is UnrecognizedCertificateException -> Failure.UnrecognizedCertificateFailure(
+                        homeServerUrl,
+                        throwable.fingerprint
+                )
+                else -> throwable
+            }
+        }
+
+        return sessionCreator.createSession(credentials, params.homeServerConnectionConfig, LoginType.QR)
+    }
+
+    private fun buildClient(homeServerConnectionConfig: HomeServerConnectionConfig): OkHttpClient {
+        return okHttpClient.get()
+                .newBuilder()
+                .addSocketFactory(homeServerConnectionConfig)
+                .build()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
index 75639c6a21..d443d6e3c8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
@@ -60,5 +60,6 @@ internal data class HomeServerVersion(
         val r0_6_0 = HomeServerVersion(major = 0, minor = 6, patch = 0)
         val r0_6_1 = HomeServerVersion(major = 0, minor = 6, patch = 1)
         val v1_3_0 = HomeServerVersion(major = 1, minor = 3, patch = 0)
+        val v1_4_0 = HomeServerVersion(major = 1, minor = 4, patch = 0)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
index 915b25134b..f4de6a9ae9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.auth.version
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.extensions.orFalse
 
 /**
  * Model for https://matrix.org/docs/spec/client_server/latest#get-matrix-client-versions.
@@ -53,6 +54,10 @@ private const val FEATURE_ID_ACCESS_TOKEN = "m.id_access_token"
 private const val FEATURE_SEPARATE_ADD_AND_BIND = "m.separate_add_and_bind"
 private const val FEATURE_THREADS_MSC3440 = "org.matrix.msc3440"
 private const val FEATURE_THREADS_MSC3440_STABLE = "org.matrix.msc3440.stable"
+private const val FEATURE_QR_CODE_LOGIN = "org.matrix.msc3882"
+private const val FEATURE_THREADS_MSC3771 = "org.matrix.msc3771"
+private const val FEATURE_THREADS_MSC3773 = "org.matrix.msc3773"
+private const val FEATURE_REMOTE_TOGGLE_PUSH_NOTIFICATIONS_MSC3881 = "org.matrix.msc3881"
 
 /**
  * Return true if the SDK supports this homeserver version.
@@ -78,6 +83,19 @@ internal fun Versions.doesServerSupportThreads(): Boolean {
     return unstableFeatures?.get(FEATURE_THREADS_MSC3440_STABLE) ?: false
 }
 
+/**
+ * Indicate if the homeserver support MSC3771 and MSC3773 for threaded read receipts and unread notifications.
+ */
+internal fun Versions.doesServerSupportThreadUnreadNotifications(): Boolean {
+    val msc3771 = unstableFeatures?.get(FEATURE_THREADS_MSC3771) ?: false
+    val msc3773 = unstableFeatures?.get(FEATURE_THREADS_MSC3773) ?: false
+    return getMaxVersion() >= HomeServerVersion.v1_4_0 || (msc3771 && msc3773)
+}
+
+internal fun Versions.doesServerSupportQrCodeLogin(): Boolean {
+    return unstableFeatures?.get(FEATURE_QR_CODE_LOGIN) ?: false
+}
+
 /**
  * Return true if the server support the lazy loading of room members.
  *
@@ -126,3 +144,12 @@ private fun Versions.getMaxVersion(): HomeServerVersion {
             ?.maxOrNull()
             ?: HomeServerVersion.r0_0_0
 }
+
+/**
+ * Indicate if the server supports MSC3881: https://github.com/matrix-org/matrix-spec-proposals/pull/3881.
+ *
+ * @return true if remote toggle of push notifications is supported
+ */
+internal fun Versions.doesServerSupportRemoteToggleOfPushNotifications(): Boolean {
+    return unstableFeatures?.get(FEATURE_REMOTE_TOGGLE_PUSH_NOTIFICATIONS_MSC3881).orFalse()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 35c066dea8..7862da1c17 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -40,6 +40,7 @@ import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.NewSessionListener
 import org.matrix.android.sdk.api.session.crypto.OutgoingKeyRequest
@@ -73,11 +74,13 @@ import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityConten
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.shouldShareHistory
 import org.matrix.android.sdk.api.session.sync.model.SyncResponse
+import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.actions.MegolmSessionDataImporter
 import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
 import org.matrix.android.sdk.internal.crypto.algorithms.IMXEncrypting
 import org.matrix.android.sdk.internal.crypto.algorithms.IMXGroupEncryption
 import org.matrix.android.sdk.internal.crypto.algorithms.megolm.MXMegolmEncryptionFactory
+import org.matrix.android.sdk.internal.crypto.algorithms.megolm.UnRequestedForwardManager
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.MXOlmEncryptionFactory
 import org.matrix.android.sdk.internal.crypto.crosssigning.DefaultCrossSigningService
 import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupService
@@ -182,7 +185,8 @@ internal class DefaultCryptoService @Inject constructor(
         private val cryptoCoroutineScope: CoroutineScope,
         private val eventDecryptor: EventDecryptor,
         private val verificationMessageProcessor: VerificationMessageProcessor,
-        private val liveEventManager: Lazy<StreamEventsManager>
+        private val liveEventManager: Lazy<StreamEventsManager>,
+        private val unrequestedForwardManager: UnRequestedForwardManager,
 ) : CryptoService {
 
     private val isStarting = AtomicBoolean(false)
@@ -238,8 +242,12 @@ internal class DefaultCryptoService @Inject constructor(
     }
 
     override fun deleteDevice(deviceId: String, userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor, callback: MatrixCallback<Unit>) {
+        deleteDevices(listOf(deviceId), userInteractiveAuthInterceptor, callback)
+    }
+
+    override fun deleteDevices(deviceIds: List<String>, userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor, callback: MatrixCallback<Unit>) {
         deleteDeviceTask
-                .configureWith(DeleteDeviceTask.Params(deviceId, userInteractiveAuthInterceptor, null)) {
+                .configureWith(DeleteDeviceTask.Params(deviceIds, userInteractiveAuthInterceptor, null)) {
                     this.executionThread = TaskThread.CRYPTO
                     this.callback = callback
                 }
@@ -273,23 +281,18 @@ internal class DefaultCryptoService @Inject constructor(
                 .executeBy(taskExecutor)
     }
 
-    override fun getLiveMyDevicesInfo(): LiveData<List<DeviceInfo>> {
+    override fun getMyDevicesInfoLive(): LiveData<List<DeviceInfo>> {
         return cryptoStore.getLiveMyDevicesInfo()
     }
 
+    override fun getMyDevicesInfoLive(deviceId: String): LiveData<Optional<DeviceInfo>> {
+        return cryptoStore.getLiveMyDevicesInfo(deviceId)
+    }
+
     override fun getMyDevicesInfo(): List<DeviceInfo> {
         return cryptoStore.getMyDevicesInfo()
     }
 
-    override fun getDeviceInfo(deviceId: String, callback: MatrixCallback<DeviceInfo>) {
-        getDeviceInfoTask
-                .configureWith(GetDeviceInfoTask.Params(deviceId)) {
-                    this.executionThread = TaskThread.CRYPTO
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
-    }
-
     override fun inboundGroupSessionsCount(onlyBackedUp: Boolean): Int {
         return cryptoStore.inboundGroupSessionsCount(onlyBackedUp)
     }
@@ -403,6 +406,7 @@ internal class DefaultCryptoService @Inject constructor(
         cryptoCoroutineScope.coroutineContext.cancelChildren(CancellationException("Closing crypto module"))
         incomingKeyRequestManager.close()
         outgoingKeyRequestManager.close()
+        unrequestedForwardManager.close()
         olmDevice.release()
         cryptoStore.close()
     }
@@ -489,6 +493,14 @@ internal class DefaultCryptoService @Inject constructor(
                     // just for safety but should not throw
                     Timber.tag(loggerTag.value).w("failed to process incoming room key requests")
                 }
+
+                unrequestedForwardManager.postSyncProcessParkedKeysIfNeeded(clock.epochMillis()) { events ->
+                    cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
+                        events.forEach {
+                            onRoomKeyEvent(it, true)
+                        }
+                    }
+                }
             }
         }
     }
@@ -513,7 +525,7 @@ internal class DefaultCryptoService @Inject constructor(
      * @param userId the user id
      * @param deviceId the device id
      */
-    override fun getDeviceInfo(userId: String, deviceId: String?): CryptoDeviceInfo? {
+    override fun getCryptoDeviceInfo(userId: String, deviceId: String?): CryptoDeviceInfo? {
         return if (userId.isNotEmpty() && !deviceId.isNullOrEmpty()) {
             cryptoStore.getUserDevice(userId, deviceId)
         } else {
@@ -521,6 +533,15 @@ internal class DefaultCryptoService @Inject constructor(
         }
     }
 
+    override fun getCryptoDeviceInfo(deviceId: String, callback: MatrixCallback<DeviceInfo>) {
+        getDeviceInfoTask
+                .configureWith(GetDeviceInfoTask.Params(deviceId)) {
+                    this.executionThread = TaskThread.CRYPTO
+                    this.callback = callback
+                }
+                .executeBy(taskExecutor)
+    }
+
     override fun getCryptoDeviceInfo(userId: String): List<CryptoDeviceInfo> {
         return cryptoStore.getUserDeviceList(userId).orEmpty()
     }
@@ -529,6 +550,10 @@ internal class DefaultCryptoService @Inject constructor(
         return cryptoStore.getLiveDeviceList()
     }
 
+    override fun getLiveCryptoDeviceInfoWithId(deviceId: String): LiveData<Optional<CryptoDeviceInfo>> {
+        return cryptoStore.getLiveDeviceWithId(deviceId)
+    }
+
     override fun getLiveCryptoDeviceInfo(userId: String): LiveData<List<CryptoDeviceInfo>> {
         return cryptoStore.getLiveDeviceList(userId)
     }
@@ -835,10 +860,12 @@ internal class DefaultCryptoService @Inject constructor(
      * Handle a key event.
      *
      * @param event the key event.
+     * @param acceptUnrequested, if true it will force to accept unrequested keys.
      */
-    private fun onRoomKeyEvent(event: Event) {
-        val roomKeyContent = event.getClearContent().toModel<RoomKeyContent>() ?: return
-        Timber.tag(loggerTag.value).i("onRoomKeyEvent() from: ${event.senderId} type<${event.getClearType()}> , sessionId<${roomKeyContent.sessionId}>")
+    private fun onRoomKeyEvent(event: Event, acceptUnrequested: Boolean = false) {
+        val roomKeyContent = event.getDecryptedContent().toModel<RoomKeyContent>() ?: return
+        Timber.tag(loggerTag.value)
+                .i("onRoomKeyEvent(f:$acceptUnrequested) from: ${event.senderId} type<${event.getClearType()}> , session<${roomKeyContent.sessionId}>")
         if (roomKeyContent.roomId.isNullOrEmpty() || roomKeyContent.algorithm.isNullOrEmpty()) {
             Timber.tag(loggerTag.value).e("onRoomKeyEvent() : missing fields")
             return
@@ -848,7 +875,7 @@ internal class DefaultCryptoService @Inject constructor(
             Timber.tag(loggerTag.value).e("GOSSIP onRoomKeyEvent() : Unable to handle keys for ${roomKeyContent.algorithm}")
             return
         }
-        alg.onRoomKeyEvent(event, keysBackupService)
+        alg.onRoomKeyEvent(event, keysBackupService, acceptUnrequested)
     }
 
     private fun onKeyWithHeldReceived(event: Event) {
@@ -941,6 +968,15 @@ internal class DefaultCryptoService @Inject constructor(
      * @param event the membership event causing the change
      */
     private fun onRoomMembershipEvent(roomId: String, event: Event) {
+        // because the encryption event can be after the join/invite in the same batch
+        event.stateKey?.let { _ ->
+            val roomMember: RoomMemberContent? = event.content.toModel()
+            val membership = roomMember?.membership
+            if (membership == Membership.INVITE) {
+                unrequestedForwardManager.onInviteReceived(roomId, event.senderId.orEmpty(), clock.epochMillis())
+            }
+        }
+
         roomEncryptorsStore.get(roomId) ?: /* No encrypting in this room */ return
 
         event.stateKey?.let { userId ->
@@ -1132,6 +1168,10 @@ internal class DefaultCryptoService @Inject constructor(
         return cryptoStore.getGlobalBlacklistUnverifiedDevices()
     }
 
+    override fun getLiveGlobalCryptoConfig(): LiveData<GlobalCryptoConfig> {
+        return cryptoStore.getLiveGlobalCryptoConfig()
+    }
+
     /**
      * Tells whether the client should encrypt messages only for the verified devices
      * in this room.
@@ -1140,39 +1180,28 @@ internal class DefaultCryptoService @Inject constructor(
      * @param roomId the room id
      * @return true if the client should encrypt messages only for the verified devices.
      */
-// TODO add this info in CryptoRoomEntity?
     override fun isRoomBlacklistUnverifiedDevices(roomId: String?): Boolean {
-        return roomId?.let { cryptoStore.getRoomsListBlacklistUnverifiedDevices().contains(it) }
+        return roomId?.let { cryptoStore.getBlockUnverifiedDevices(roomId) }
                 ?: false
     }
 
     /**
-     * Manages the room black-listing for unverified devices.
+     * A live status regarding sharing keys for unverified devices in this room.
      *
-     * @param roomId the room id
-     * @param add true to add the room id to the list, false to remove it.
+     * @return Live status
      */
-    private fun setRoomBlacklistUnverifiedDevices(roomId: String, add: Boolean) {
-        val roomIds = cryptoStore.getRoomsListBlacklistUnverifiedDevices().toMutableList()
-
-        if (add) {
-            if (roomId !in roomIds) {
-                roomIds.add(roomId)
-            }
-        } else {
-            roomIds.remove(roomId)
-        }
-
-        cryptoStore.setRoomsListBlacklistUnverifiedDevices(roomIds)
+    override fun getLiveBlockUnverifiedDevices(roomId: String): LiveData<Boolean> {
+        return cryptoStore.getLiveBlockUnverifiedDevices(roomId)
     }
 
     /**
      * Add this room to the ones which don't encrypt messages to unverified devices.
      *
      * @param roomId the room id
+     * @param block if true will block sending keys to unverified devices
      */
-    override fun setRoomBlacklistUnverifiedDevices(roomId: String) {
-        setRoomBlacklistUnverifiedDevices(roomId, true)
+    override fun setRoomBlockUnverifiedDevices(roomId: String, block: Boolean) {
+        cryptoStore.blockUnverifiedDevicesInRoom(roomId, block)
     }
 
     /**
@@ -1180,8 +1209,8 @@ internal class DefaultCryptoService @Inject constructor(
      *
      * @param roomId the room id
      */
-    override fun setRoomUnBlacklistUnverifiedDevices(roomId: String) {
-        setRoomBlacklistUnverifiedDevices(roomId, false)
+    override fun setRoomUnBlockUnverifiedDevices(roomId: String) {
+        setRoomBlockUnverifiedDevices(roomId, false)
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index 4f3900adb9..7e9e156003 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -18,13 +18,17 @@ package org.matrix.android.sdk.internal.crypto
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.extensions.measureMetric
+import org.matrix.android.sdk.api.metrics.DownloadDeviceKeysMetricsPlugin
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.internal.crypto.model.CryptoInfoMapper
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryResponse
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.DownloadKeysForUsersTask
 import org.matrix.android.sdk.internal.session.SessionScope
@@ -47,8 +51,11 @@ internal class DeviceListManager @Inject constructor(
         coroutineDispatchers: MatrixCoroutineDispatchers,
         private val taskExecutor: TaskExecutor,
         private val clock: Clock,
+        matrixConfiguration: MatrixConfiguration
 ) {
 
+    private val metricPlugins = matrixConfiguration.metricPlugins
+
     interface UserDevicesUpdateListener {
         fun onUsersDeviceUpdate(userIds: List<String>)
     }
@@ -345,19 +352,25 @@ internal class DeviceListManager @Inject constructor(
             return MXUsersDevicesMap()
         }
         val params = DownloadKeysForUsersTask.Params(filteredUsers, syncTokenStore.getLastToken())
-        val response = try {
-            downloadKeysForUsersTask.execute(params)
-        } catch (throwable: Throwable) {
-            Timber.e(throwable, "## CRYPTO | doKeyDownloadForUsers(): error")
-            if (throwable is CancellationException) {
-                // the crypto module is getting closed, so we cannot access the DB anymore
-                Timber.w("The crypto module is closed, ignoring this error")
-            } else {
-                onKeysDownloadFailed(filteredUsers)
+        val relevantPlugins = metricPlugins.filterIsInstance<DownloadDeviceKeysMetricsPlugin>()
+
+        val response: KeysQueryResponse
+        relevantPlugins.measureMetric {
+            response = try {
+                downloadKeysForUsersTask.execute(params)
+            } catch (throwable: Throwable) {
+                Timber.e(throwable, "## CRYPTO | doKeyDownloadForUsers(): error")
+                if (throwable is CancellationException) {
+                    // the crypto module is getting closed, so we cannot access the DB anymore
+                    Timber.w("The crypto module is closed, ignoring this error")
+                } else {
+                    onKeysDownloadFailed(filteredUsers)
+                }
+                throw throwable
             }
-            throw throwable
+            Timber.v("## CRYPTO | doKeyDownloadForUsers() : Got keys for " + filteredUsers.size + " users")
         }
-        Timber.v("## CRYPTO | doKeyDownloadForUsers() : Got keys for " + filteredUsers.size + " users")
+
         for (userId in filteredUsers) {
             // al devices =
             val models = response.deviceKeys?.get(userId)?.mapValues { entry -> CryptoInfoMapper.map(entry.value) }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
index bc3309132a..c9eabeab48 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
@@ -24,10 +24,12 @@ import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_OLM
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.model.MXEventDecryptionResult
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.OlmEventContent
@@ -85,6 +87,27 @@ internal class EventDecryptor @Inject constructor(
         return internalDecryptEvent(event, timeline)
     }
 
+    /**
+     * Decrypt an event and save the result in the given event.
+     *
+     * @param event the raw event.
+     * @param timeline the id of the timeline where the event is decrypted. It is used to prevent replay attack.
+     */
+    suspend fun decryptEventAndSaveResult(event: Event, timeline: String) {
+        tryOrNull(message = "Unable to decrypt the event") {
+            decryptEvent(event, timeline)
+        }
+                ?.let { result ->
+                    event.mxDecryptionResult = OlmDecryptionResult(
+                            payload = result.clearEvent,
+                            senderKey = result.senderCurve25519Key,
+                            keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
+                            forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
+                            isSafe = result.isSafe
+                    )
+                }
+    }
+
     /**
      * Decrypt an event asynchronously.
      *
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
index 39dfb72149..6d197a09ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
@@ -91,6 +91,21 @@ internal class InboundGroupSessionStore @Inject constructor(
         internalStoreGroupSession(new, sessionId, senderKey)
     }
 
+    @Synchronized
+    fun updateToSafe(old: InboundGroupSessionHolder, sessionId: String, senderKey: String) {
+        Timber.tag(loggerTag.value).v("## updateToSafe for session ${old.wrapper.roomId}-${old.wrapper.senderKey}")
+
+        store.storeInboundGroupSessions(
+                listOf(
+                        old.wrapper.copy(
+                                sessionData = old.wrapper.sessionData.copy(trusted = true)
+                        )
+                )
+        )
+        // will release it :/
+        sessionCache.remove(CacheKey(sessionId, senderKey))
+    }
+
     @Synchronized
     fun storeInBoundGroupSession(holder: InboundGroupSessionHolder, sessionId: String, senderKey: String) {
         internalStoreGroupSession(holder, sessionId, senderKey)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
index 96ccba51dc..faadf339e9 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.crypto
 import androidx.annotation.VisibleForTesting
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
@@ -602,6 +603,7 @@ internal class MXOlmDevice @Inject constructor(
      * @param keysClaimed Other keys the sender claims.
      * @param exportFormat true if the megolm keys are in export format
      * @param sharedHistory MSC3061, this key is sharable on invite
+     * @param trusted True if the key is coming from a trusted source
      * @return true if the operation succeeds.
      */
     fun addInboundGroupSession(
@@ -612,7 +614,8 @@ internal class MXOlmDevice @Inject constructor(
             forwardingCurve25519KeyChain: List<String>,
             keysClaimed: Map<String, String>,
             exportFormat: Boolean,
-            sharedHistory: Boolean
+            sharedHistory: Boolean,
+            trusted: Boolean
     ): AddSessionResult {
         val candidateSession = tryOrNull("Failed to create inbound session in room $roomId") {
             if (exportFormat) {
@@ -620,6 +623,8 @@ internal class MXOlmDevice @Inject constructor(
             } else {
                 OlmInboundGroupSession(sessionKey)
             }
+        } ?: return AddSessionResult.NotImported.also {
+            Timber.tag(loggerTag.value).d("## addInboundGroupSession() : failed to import key candidate $senderKey/$sessionId")
         }
 
         val existingSessionHolder = tryOrNull { getInboundGroupSession(sessionId, senderKey, roomId) }
@@ -631,31 +636,49 @@ internal class MXOlmDevice @Inject constructor(
                 val existingFirstKnown = tryOrNull { existingSession.session.firstKnownIndex } ?: return AddSessionResult.NotImported.also {
                     // This is quite unexpected, could throw if native was released?
                     Timber.tag(loggerTag.value).e("## addInboundGroupSession() null firstKnownIndex on existing session")
-                    candidateSession?.releaseSession()
+                    candidateSession.releaseSession()
                     // Probably should discard it?
                 }
-                val newKnownFirstIndex = tryOrNull("Failed to get candidate first known index") { candidateSession?.firstKnownIndex }
-                // If our existing session is better we keep it
-                if (newKnownFirstIndex != null && existingFirstKnown <= newKnownFirstIndex) {
-                    Timber.tag(loggerTag.value).d("## addInboundGroupSession() : ignore session our is better $senderKey/$sessionId")
-                    candidateSession?.releaseSession()
-                    return AddSessionResult.NotImportedHigherIndex(newKnownFirstIndex.toInt())
+                val newKnownFirstIndex = tryOrNull("Failed to get candidate first known index") { candidateSession.firstKnownIndex }
+                        ?: return AddSessionResult.NotImported.also {
+                            candidateSession.releaseSession()
+                            Timber.tag(loggerTag.value).d("## addInboundGroupSession() : Failed to get new session index")
+                        }
+
+                val keyConnects = existingSession.session.connects(candidateSession)
+                if (!keyConnects) {
+                    Timber.tag(loggerTag.value)
+                            .e("## addInboundGroupSession() Unconnected key")
+                    if (!trusted) {
+                        // Ignore the not connecting unsafe, keep existing
+                        Timber.tag(loggerTag.value)
+                                .e("## addInboundGroupSession() Received unsafe unconnected key")
+                        return AddSessionResult.NotImported
+                    }
+                    // else if the new one is safe and does not connect with existing, import the new one
+                } else {
+                    // If our existing session is better we keep it
+                    if (existingFirstKnown <= newKnownFirstIndex) {
+                        val shouldUpdateTrust = trusted && (existingSession.sessionData.trusted != true)
+                        Timber.tag(loggerTag.value).d("## addInboundGroupSession() : updateTrust for $sessionId")
+                        if (shouldUpdateTrust) {
+                            // the existing as a better index but the new one is trusted so update trust
+                            inboundGroupSessionStore.updateToSafe(existingSessionHolder, sessionId, senderKey)
+                        }
+                        Timber.tag(loggerTag.value).d("## addInboundGroupSession() : ignore session our is better $senderKey/$sessionId")
+                        candidateSession.releaseSession()
+                        return AddSessionResult.NotImportedHigherIndex(newKnownFirstIndex.toInt())
+                    }
                 }
             } catch (failure: Throwable) {
                 Timber.tag(loggerTag.value).e("## addInboundGroupSession() Failed to add inbound: ${failure.localizedMessage}")
-                candidateSession?.releaseSession()
+                candidateSession.releaseSession()
                 return AddSessionResult.NotImported
             }
         }
 
         Timber.tag(loggerTag.value).d("## addInboundGroupSession() : Candidate session should be added $senderKey/$sessionId")
 
-        // sanity check on the new session
-        if (null == candidateSession) {
-            Timber.tag(loggerTag.value).e("## addInboundGroupSession : invalid session <null>")
-            return AddSessionResult.NotImported
-        }
-
         try {
             if (candidateSession.sessionIdentifier() != sessionId) {
                 Timber.tag(loggerTag.value).e("## addInboundGroupSession : ERROR: Mismatched group session ID from senderKey: $senderKey")
@@ -674,6 +697,7 @@ internal class MXOlmDevice @Inject constructor(
                 keysClaimed = keysClaimed,
                 forwardingCurve25519KeyChain = forwardingCurve25519KeyChain,
                 sharedHistory = sharedHistory,
+                trusted = trusted
         )
 
         val wrapper = MXInboundMegolmSessionWrapper(
@@ -689,6 +713,16 @@ internal class MXOlmDevice @Inject constructor(
         return AddSessionResult.Imported(candidateSession.firstKnownIndex.toInt())
     }
 
+    fun OlmInboundGroupSession.connects(other: OlmInboundGroupSession): Boolean {
+        return try {
+            val lowestCommonIndex = this.firstKnownIndex.coerceAtLeast(other.firstKnownIndex)
+            this.export(lowestCommonIndex) == other.export(lowestCommonIndex)
+        } catch (failure: Throwable) {
+            // native error? key disposed?
+            false
+        }
+    }
+
     /**
      * Import an inbound group sessions to the session store.
      *
@@ -821,7 +855,8 @@ internal class MXOlmDevice @Inject constructor(
                 payload,
                 wrapper.sessionData.keysClaimed,
                 senderKey,
-                wrapper.sessionData.forwardingCurve25519KeyChain
+                wrapper.sessionData.forwardingCurve25519KeyChain,
+                isSafe = sessionHolder.wrapper.sessionData.trusted.orFalse()
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SecretShareManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SecretShareManager.kt
index a79e1a8901..5691f24d17 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SecretShareManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SecretShareManager.kt
@@ -267,13 +267,24 @@ internal class SecretShareManager @Inject constructor(
             Timber.tag(loggerTag.value).e("onSecretSend() :Received unencrypted secret send event")
             return
         }
+        // no need to download keys, after a verification we already forced download
+        val sendingDevice = toDevice.getSenderKey()?.let { cryptoStore.deviceWithIdentityKey(it) }
+        if (sendingDevice == null) {
+            Timber.tag(loggerTag.value).e("onSecretSend() : Ignore secret from unknown  device ${toDevice.getSenderKey()}")
+            return
+        }
 
         // Was that sent by us?
-        if (toDevice.senderId != credentials.userId) {
+        if (sendingDevice.userId != credentials.userId) {
             Timber.tag(loggerTag.value).e("onSecretSend() : Ignore secret from other user ${toDevice.senderId}")
             return
         }
 
+        if (!sendingDevice.isVerified) {
+            Timber.tag(loggerTag.value).e("onSecretSend() : Ignore secret from untrusted device ${toDevice.getSenderKey()}")
+            return
+        }
+
         val secretContent = toDevice.getClearContent().toModel<SecretSendEventContent>() ?: return
 
         val existingRequest = verifMutex.withLock {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
index 6847a46369..d9fd5f10ce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
@@ -41,6 +41,7 @@ internal interface IMXDecrypting {
      *
      * @param event the key event.
      * @param defaultKeysBackupService the keys backup service
+     * @param forceAccept the keys backup service
      */
-    fun onRoomKeyEvent(event: Event, defaultKeysBackupService: DefaultKeysBackupService) {}
+    fun onRoomKeyEvent(event: Event, defaultKeysBackupService: DefaultKeysBackupService, forceAccept: Boolean = false) {}
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index 410b74e19f..64bd52dd3b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -17,7 +17,8 @@
 package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
 import dagger.Lazy
-import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.NewSessionListener
@@ -34,16 +35,20 @@ import org.matrix.android.sdk.internal.crypto.algorithms.IMXDecrypting
 import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupService
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.session.StreamEventsManager
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 
 private val loggerTag = LoggerTag("MXMegolmDecryption", LoggerTag.CRYPTO)
 
 internal class MXMegolmDecryption(
         private val olmDevice: MXOlmDevice,
+        private val myUserId: String,
         private val outgoingKeyRequestManager: OutgoingKeyRequestManager,
         private val cryptoStore: IMXCryptoStore,
-        private val matrixConfiguration: MatrixConfiguration,
-        private val liveEventManager: Lazy<StreamEventsManager>
+        private val liveEventManager: Lazy<StreamEventsManager>,
+        private val unrequestedForwardManager: UnRequestedForwardManager,
+        private val cryptoConfig: MXCryptoConfig,
+        private val clock: Clock,
 ) : IMXDecrypting {
 
     var newSessionListener: NewSessionListener? = null
@@ -94,7 +99,8 @@ internal class MXMegolmDecryption(
                                         senderCurve25519Key = olmDecryptionResult.senderKey,
                                         claimedEd25519Key = olmDecryptionResult.keysClaimed?.get("ed25519"),
                                         forwardingCurve25519KeyChain = olmDecryptionResult.forwardingCurve25519KeyChain
-                                                .orEmpty()
+                                                .orEmpty(),
+                                        isSafe = olmDecryptionResult.isSafe.orFalse()
                                 ).also {
                                     liveEventManager.get().dispatchLiveEventDecrypted(event, it)
                                 }
@@ -181,13 +187,23 @@ internal class MXMegolmDecryption(
      *
      * @param event the key event.
      * @param defaultKeysBackupService the keys backup service
+     * @param forceAccept if true will force to accept the forwarded key
      */
-    override fun onRoomKeyEvent(event: Event, defaultKeysBackupService: DefaultKeysBackupService) {
-        Timber.tag(loggerTag.value).v("onRoomKeyEvent()")
+    override fun onRoomKeyEvent(event: Event, defaultKeysBackupService: DefaultKeysBackupService, forceAccept: Boolean) {
+        Timber.tag(loggerTag.value).v("onRoomKeyEvent(${event.getSenderKey()})")
         var exportFormat = false
-        val roomKeyContent = event.getClearContent().toModel<RoomKeyContent>() ?: return
+        val roomKeyContent = event.getDecryptedContent()?.toModel<RoomKeyContent>() ?: return
+
+        val eventSenderKey: String = event.getSenderKey() ?: return Unit.also {
+            Timber.tag(loggerTag.value).e("onRoom Key/Forward Event() : event is missing sender_key field")
+        }
+
+        // this device might not been downloaded now?
+        val fromDevice = cryptoStore.deviceWithIdentityKey(eventSenderKey)
+
+        lateinit var sessionInitiatorSenderKey: String
+        val trusted: Boolean
 
-        var senderKey: String? = event.getSenderKey()
         var keysClaimed: MutableMap<String, String> = HashMap()
         val forwardingCurve25519KeyChain: MutableList<String> = ArrayList()
 
@@ -195,32 +211,25 @@ internal class MXMegolmDecryption(
             Timber.tag(loggerTag.value).e("onRoomKeyEvent() :  Key event is missing fields")
             return
         }
-        if (event.getClearType() == EventType.FORWARDED_ROOM_KEY) {
+        if (event.getDecryptedType() == EventType.FORWARDED_ROOM_KEY) {
             if (!cryptoStore.isKeyGossipingEnabled()) {
                 Timber.tag(loggerTag.value)
                         .i("onRoomKeyEvent(), ignore forward adding as per crypto config : ${roomKeyContent.roomId}|${roomKeyContent.sessionId}")
                 return
             }
             Timber.tag(loggerTag.value).i("onRoomKeyEvent(), forward adding key : ${roomKeyContent.roomId}|${roomKeyContent.sessionId}")
-            val forwardedRoomKeyContent = event.getClearContent().toModel<ForwardedRoomKeyContent>()
+            val forwardedRoomKeyContent = event.getDecryptedContent()?.toModel<ForwardedRoomKeyContent>()
                     ?: return
 
             forwardedRoomKeyContent.forwardingCurve25519KeyChain?.let {
                 forwardingCurve25519KeyChain.addAll(it)
             }
 
-            if (senderKey == null) {
-                Timber.tag(loggerTag.value).e("onRoomKeyEvent() : event is missing sender_key field")
-                return
-            }
-
-            forwardingCurve25519KeyChain.add(senderKey)
+            forwardingCurve25519KeyChain.add(eventSenderKey)
 
             exportFormat = true
-            senderKey = forwardedRoomKeyContent.senderKey
-            if (null == senderKey) {
+            sessionInitiatorSenderKey = forwardedRoomKeyContent.senderKey ?: return Unit.also {
                 Timber.tag(loggerTag.value).e("onRoomKeyEvent() : forwarded_room_key event is missing sender_key field")
-                return
             }
 
             if (null == forwardedRoomKeyContent.senderClaimedEd25519Key) {
@@ -229,13 +238,52 @@ internal class MXMegolmDecryption(
             }
 
             keysClaimed["ed25519"] = forwardedRoomKeyContent.senderClaimedEd25519Key
-        } else {
-            Timber.tag(loggerTag.value).i("onRoomKeyEvent(), Adding key : ${roomKeyContent.roomId}|${roomKeyContent.sessionId}")
-            if (null == senderKey) {
-                Timber.tag(loggerTag.value).e("## onRoomKeyEvent() : key event has no sender key (not encrypted?)")
+
+            // checking if was requested once.
+            // should we check if the request is sort of active?
+            val wasNotRequested = cryptoStore.getOutgoingRoomKeyRequest(
+                    roomId = forwardedRoomKeyContent.roomId.orEmpty(),
+                    sessionId = forwardedRoomKeyContent.sessionId.orEmpty(),
+                    algorithm = forwardedRoomKeyContent.algorithm.orEmpty(),
+                    senderKey = forwardedRoomKeyContent.senderKey.orEmpty(),
+            ).isEmpty()
+
+            trusted = false
+
+            if (!forceAccept && wasNotRequested) {
+//                val senderId = cryptoStore.deviceWithIdentityKey(event.getSenderKey().orEmpty())?.userId.orEmpty()
+                unrequestedForwardManager.onUnRequestedKeyForward(roomKeyContent.roomId, event, clock.epochMillis())
+                // Ignore unsolicited
+                Timber.tag(loggerTag.value).w("Ignoring forwarded_room_key_event for ${roomKeyContent.sessionId} that was not requested")
                 return
             }
 
+            // Check who sent the request, as we requested we have the device keys (no need to download)
+            val sessionThatIsSharing = cryptoStore.deviceWithIdentityKey(eventSenderKey)
+            if (sessionThatIsSharing == null) {
+                Timber.tag(loggerTag.value).w("Ignoring forwarded_room_key from unknown device with identity $eventSenderKey")
+                return
+            }
+            val isOwnDevice = myUserId == sessionThatIsSharing.userId
+            val isDeviceVerified = sessionThatIsSharing.isVerified
+            val isFromSessionInitiator = sessionThatIsSharing.identityKey() == sessionInitiatorSenderKey
+
+            val isLegitForward = (isOwnDevice && isDeviceVerified) ||
+                    (!cryptoConfig.limitRoomKeyRequestsToMyDevices && isFromSessionInitiator)
+
+            val shouldAcceptForward = forceAccept || isLegitForward
+
+            if (!shouldAcceptForward) {
+                Timber.tag(loggerTag.value)
+                        .w("Ignoring forwarded_room_key device:$eventSenderKey, ownVerified:{$isOwnDevice&&$isDeviceVerified}," +
+                                " fromInitiator:$isFromSessionInitiator")
+                return
+            }
+        } else {
+            // It's a m.room_key so safe
+            trusted = true
+            sessionInitiatorSenderKey = eventSenderKey
+            Timber.tag(loggerTag.value).i("onRoomKeyEvent(), Adding key : ${roomKeyContent.roomId}|${roomKeyContent.sessionId}")
             // inherit the claimed ed25519 key from the setup message
             keysClaimed = event.getKeysClaimed().toMutableMap()
         }
@@ -245,12 +293,15 @@ internal class MXMegolmDecryption(
                 sessionId = roomKeyContent.sessionId,
                 sessionKey = roomKeyContent.sessionKey,
                 roomId = roomKeyContent.roomId,
-                senderKey = senderKey,
+                senderKey = sessionInitiatorSenderKey,
                 forwardingCurve25519KeyChain = forwardingCurve25519KeyChain,
                 keysClaimed = keysClaimed,
                 exportFormat = exportFormat,
-                sharedHistory = roomKeyContent.getSharedKey()
-        )
+                sharedHistory = roomKeyContent.getSharedKey(),
+                trusted = trusted
+        ).also {
+            Timber.tag(loggerTag.value).v(".. onRoomKeyEvent addInboundGroupSession ${roomKeyContent.sessionId} result: $it")
+        }
 
         when (addSessionResult) {
             is MXOlmDevice.AddSessionResult.Imported -> addSessionResult.ratchetIndex
@@ -258,35 +309,28 @@ internal class MXMegolmDecryption(
             else -> null
         }?.let { index ->
             if (event.getClearType() == EventType.FORWARDED_ROOM_KEY) {
-                val fromDevice = (event.content?.get("sender_key") as? String)?.let { senderDeviceIdentityKey ->
-                    cryptoStore.getUserDeviceList(event.senderId ?: "")
-                            ?.firstOrNull {
-                                it.identityKey() == senderDeviceIdentityKey
-                            }
-                }?.deviceId
-
                 outgoingKeyRequestManager.onRoomKeyForwarded(
                         sessionId = roomKeyContent.sessionId,
                         algorithm = roomKeyContent.algorithm ?: "",
                         roomId = roomKeyContent.roomId,
-                        senderKey = senderKey,
+                        senderKey = sessionInitiatorSenderKey,
                         fromIndex = index,
-                        fromDevice = fromDevice,
+                        fromDevice = fromDevice?.deviceId,
                         event = event
                 )
 
                 cryptoStore.saveIncomingForwardKeyAuditTrail(
                         roomId = roomKeyContent.roomId,
                         sessionId = roomKeyContent.sessionId,
-                        senderKey = senderKey,
+                        senderKey = sessionInitiatorSenderKey,
                         algorithm = roomKeyContent.algorithm ?: "",
-                        userId = event.senderId ?: "",
-                        deviceId = fromDevice ?: "",
+                        userId = event.senderId.orEmpty(),
+                        deviceId = fromDevice?.deviceId.orEmpty(),
                         chainIndex = index.toLong()
                 )
 
                 // The index is used to decide if we cancel sent request or if we wait for a better key
-                outgoingKeyRequestManager.postCancelRequestForSessionIfNeeded(roomKeyContent.sessionId, roomKeyContent.roomId, senderKey, index)
+                outgoingKeyRequestManager.postCancelRequestForSessionIfNeeded(roomKeyContent.sessionId, roomKeyContent.roomId, sessionInitiatorSenderKey, index)
             }
         }
 
@@ -295,7 +339,7 @@ internal class MXMegolmDecryption(
                     .d("onRoomKeyEvent(${event.getClearType()}) : Added megolm session ${roomKeyContent.sessionId} in ${roomKeyContent.roomId}")
             defaultKeysBackupService.maybeBackupKeys()
 
-            onNewSession(roomKeyContent.roomId, senderKey, roomKeyContent.sessionId)
+            onNewSession(roomKeyContent.roomId, sessionInitiatorSenderKey, roomKeyContent.sessionId)
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
index 38edbb7430..99f8bc69e0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
@@ -17,28 +17,36 @@
 package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
 import dagger.Lazy
-import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import org.matrix.android.sdk.internal.crypto.MXOlmDevice
 import org.matrix.android.sdk.internal.crypto.OutgoingKeyRequestManager
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.StreamEventsManager
+import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
 
 internal class MXMegolmDecryptionFactory @Inject constructor(
         private val olmDevice: MXOlmDevice,
+        @UserId private val myUserId: String,
         private val outgoingKeyRequestManager: OutgoingKeyRequestManager,
         private val cryptoStore: IMXCryptoStore,
-        private val matrixConfiguration: MatrixConfiguration,
-        private val eventsManager: Lazy<StreamEventsManager>
+        private val eventsManager: Lazy<StreamEventsManager>,
+        private val unrequestedForwardManager: UnRequestedForwardManager,
+        private val mxCryptoConfig: MXCryptoConfig,
+        private val clock: Clock,
 ) {
 
     fun create(): MXMegolmDecryption {
         return MXMegolmDecryption(
-                olmDevice,
-                outgoingKeyRequestManager,
-                cryptoStore,
-                matrixConfiguration,
-                eventsManager
+                olmDevice = olmDevice,
+                myUserId = myUserId,
+                outgoingKeyRequestManager = outgoingKeyRequestManager,
+                cryptoStore = cryptoStore,
+                liveEventManager = eventsManager,
+                unrequestedForwardManager = unrequestedForwardManager,
+                cryptoConfig = mxCryptoConfig,
+                clock = clock,
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index 771b5f9a62..0b7af9f4d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -31,6 +31,8 @@ import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.RoomKeyWithHeldContent
 import org.matrix.android.sdk.api.session.events.model.content.WithHeldCode
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.internal.crypto.DeviceListManager
 import org.matrix.android.sdk.internal.crypto.InboundGroupSessionHolder
 import org.matrix.android.sdk.internal.crypto.MXOlmDevice
@@ -92,7 +94,18 @@ internal class MXMegolmEncryption(
     ): Content {
         val ts = clock.epochMillis()
         Timber.tag(loggerTag.value).v("encryptEventContent : getDevicesInRoom")
-        val devices = getDevicesInRoom(userIds)
+
+        /**
+         * When using in-room messages and the room has encryption enabled,
+         * clients should ensure that encryption does not hinder the verification.
+         * For example, if the verification messages are encrypted, clients must ensure that all the recipient’s
+         * unverified devices receive the keys necessary to decrypt the messages,
+         * even if they would normally not be given the keys to decrypt messages in the room.
+         */
+        val shouldSendToUnverified = isVerificationEvent(eventType, eventContent)
+
+        val devices = getDevicesInRoom(userIds, forceDistributeToUnverified = shouldSendToUnverified)
+
         Timber.tag(loggerTag.value).d("encrypt event in room=$roomId - devices count in room ${devices.allowedDevices.toDebugCount()}")
         Timber.tag(loggerTag.value).v("encryptEventContent ${clock.epochMillis() - ts}: getDevicesInRoom ${devices.allowedDevices.toDebugString()}")
         val outboundSession = ensureOutboundSession(devices.allowedDevices)
@@ -107,6 +120,11 @@ internal class MXMegolmEncryption(
                 }
     }
 
+    private fun isVerificationEvent(eventType: String, eventContent: Content) =
+            EventType.isVerificationEvent(eventType) ||
+                    (eventType == EventType.MESSAGE &&
+                            eventContent.get(MessageContent.MSG_TYPE_JSON_KEY) == MessageType.MSGTYPE_VERIFICATION_REQUEST)
+
     private fun notifyWithheldForSession(devices: MXUsersDevicesMap<WithHeldCode>, outboundSession: MXOutboundSessionInfo) {
         // offload to computation thread
         cryptoCoroutineScope.launch(coroutineDispatchers.computation) {
@@ -162,7 +180,8 @@ internal class MXMegolmEncryption(
                 forwardingCurve25519KeyChain = emptyList(),
                 keysClaimed = keysClaimedMap,
                 exportFormat = false,
-                sharedHistory = sharedHistory
+                sharedHistory = sharedHistory,
+                trusted = true
         )
 
         defaultKeysBackupService.maybeBackupKeys()
@@ -415,15 +434,17 @@ internal class MXMegolmEncryption(
      * This method must be called in getDecryptingThreadHandler() thread.
      *
      * @param userIds the user ids whose devices must be checked.
+     * @param forceDistributeToUnverified If true the unverified devices will be included in valid recipients even if
+     * such devices are blocked in crypto settings
      */
-    private suspend fun getDevicesInRoom(userIds: List<String>): DeviceInRoomInfo {
+    private suspend fun getDevicesInRoom(userIds: List<String>, forceDistributeToUnverified: Boolean = false): DeviceInRoomInfo {
         // We are happy to use a cached version here: we assume that if we already
         // have a list of the user's devices, then we already share an e2e room
         // with them, which means that they will have announced any new devices via
         // an m.new_device.
         val keys = deviceListManager.downloadKeys(userIds, false)
         val encryptToVerifiedDevicesOnly = cryptoStore.getGlobalBlacklistUnverifiedDevices() ||
-                cryptoStore.getRoomsListBlacklistUnverifiedDevices().contains(roomId)
+                cryptoStore.getBlockUnverifiedDevices(roomId)
 
         val devicesInRoom = DeviceInRoomInfo()
         val unknownDevices = MXUsersDevicesMap<CryptoDeviceInfo>()
@@ -443,7 +464,7 @@ internal class MXMegolmEncryption(
                     continue
                 }
 
-                if (!deviceInfo.isVerified && encryptToVerifiedDevicesOnly) {
+                if (!deviceInfo.isVerified && encryptToVerifiedDevicesOnly && !forceDistributeToUnverified) {
                     devicesInRoom.withHeldDevices.setObject(userId, deviceId, WithHeldCode.UNVERIFIED)
                     continue
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/UnRequestedForwardManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/UnRequestedForwardManager.kt
new file mode 100644
index 0000000000..9235cd2abf
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/UnRequestedForwardManager.kt
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.crypto.algorithms.megolm
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.task.SemaphoreCoroutineSequencer
+import timber.log.Timber
+import java.util.concurrent.Executors
+import javax.inject.Inject
+import kotlin.math.abs
+
+private const val INVITE_VALIDITY_TIME_WINDOW_MILLIS = 10 * 60_000
+
+@SessionScope
+internal class UnRequestedForwardManager @Inject constructor(
+        private val deviceListManager: DeviceListManager,
+) {
+
+    private val dispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+    private val scope = CoroutineScope(SupervisorJob() + dispatcher)
+    private val sequencer = SemaphoreCoroutineSequencer()
+
+    // For now only in memory storage. Maybe we should persist? in case of gappy sync and long catchups?
+    private val forwardedKeysPerRoom = mutableMapOf<String, MutableMap<String, MutableList<ForwardInfo>>>()
+
+    data class InviteInfo(
+            val roomId: String,
+            val fromMxId: String,
+            val timestamp: Long
+    )
+
+    data class ForwardInfo(
+            val event: Event,
+            val timestamp: Long
+    )
+
+    // roomId, local timestamp of invite
+    private val recentInvites = mutableListOf<InviteInfo>()
+
+    fun close() {
+        try {
+            scope.cancel("User Terminate")
+        } catch (failure: Throwable) {
+            Timber.w(failure, "Failed to shutDown UnrequestedForwardManager")
+        }
+    }
+
+    fun onInviteReceived(roomId: String, fromUserId: String, localTimeStamp: Long) {
+        Timber.w("Invite received in room:$roomId from:$fromUserId at $localTimeStamp")
+        scope.launch {
+            sequencer.post {
+                if (!recentInvites.any { it.roomId == roomId && it.fromMxId == fromUserId }) {
+                    recentInvites.add(
+                            InviteInfo(
+                                    roomId,
+                                    fromUserId,
+                                    localTimeStamp
+                            )
+                    )
+                }
+            }
+        }
+    }
+
+    fun onUnRequestedKeyForward(roomId: String, event: Event, localTimeStamp: Long) {
+        Timber.w("Received unrequested forward in room:$roomId from:${event.senderId} at $localTimeStamp")
+        scope.launch {
+            sequencer.post {
+                val claimSenderId = event.senderId.orEmpty()
+                val senderKey = event.getSenderKey()
+                // we might want to download keys, as this user might not be known yet, cache is ok
+                val ownerMxId =
+                        tryOrNull {
+                            deviceListManager.downloadKeys(listOf(claimSenderId), false)
+                                    .map[claimSenderId]
+                                    ?.values
+                                    ?.firstOrNull { it.identityKey() == senderKey }
+                                    ?.userId
+                        }
+                // Not sure what to do if the device has been deleted? I can't proove the mxid
+                if (ownerMxId == null || claimSenderId != ownerMxId) {
+                    Timber.w("Mismatch senderId between event and olm owner")
+                    return@post
+                }
+
+                forwardedKeysPerRoom
+                        .getOrPut(roomId) { mutableMapOf() }
+                        .getOrPut(ownerMxId) { mutableListOf() }
+                        .add(ForwardInfo(event, localTimeStamp))
+            }
+        }
+    }
+
+    fun postSyncProcessParkedKeysIfNeeded(currentTimestamp: Long, handleForwards: suspend (List<Event>) -> Unit) {
+        scope.launch {
+            sequencer.post {
+                // Prune outdated invites
+                recentInvites.removeAll { currentTimestamp - it.timestamp > INVITE_VALIDITY_TIME_WINDOW_MILLIS }
+                val cleanUpEvents = mutableListOf<Pair<String, String>>()
+                forwardedKeysPerRoom.forEach { (roomId, senderIdToForwardMap) ->
+                    senderIdToForwardMap.forEach { (senderId, eventList) ->
+                        // is there a matching invite in a valid timewindow?
+                        val matchingInvite = recentInvites.firstOrNull { it.fromMxId == senderId && it.roomId == roomId }
+                        if (matchingInvite != null) {
+                            Timber.v("match  for room:$roomId from sender:$senderId -> count =${eventList.size}")
+
+                            eventList.filter {
+                                abs(matchingInvite.timestamp - it.timestamp) <= INVITE_VALIDITY_TIME_WINDOW_MILLIS
+                            }.map {
+                                it.event
+                            }.takeIf { it.isNotEmpty() }?.let {
+                                Timber.w("Re-processing forwarded_room_key_event that was not requested after invite")
+                                scope.launch {
+                                    handleForwards.invoke(it)
+                                }
+                            }
+                            cleanUpEvents.add(roomId to senderId)
+                        }
+                    }
+                }
+
+                cleanUpEvents.forEach { roomIdToSenderPair ->
+                    forwardedKeysPerRoom[roomIdToSenderPair.first]?.get(roomIdToSenderPair.second)?.clear()
+                }
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
index d5a8bdfd7c..cfe4681bfd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.crypto.api
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.DevicesListResponse
 import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDeviceParams
+import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDevicesParams
 import org.matrix.android.sdk.internal.crypto.model.rest.KeyChangesResponse
 import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimBody
 import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimResponse
@@ -136,6 +137,17 @@ internal interface CryptoApi {
             @Body params: DeleteDeviceParams
     )
 
+    /**
+     * Deletes the given devices, and invalidates any access token associated with them.
+     * Doc: https://spec.matrix.org/v1.4/client-server-api/#post_matrixclientv3delete_devices
+     *
+     * @param params the deletion parameters
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_V3 + "delete_devices")
+    suspend fun deleteDevices(
+            @Body params: DeleteDevicesParams
+    )
+
     /**
      * Update the device information.
      * Doc: https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-devices-deviceid
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/CrossSigningOlm.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/CrossSigningOlm.kt
index 3218b99948..0f29404d4f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/CrossSigningOlm.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/CrossSigningOlm.kt
@@ -83,9 +83,7 @@ internal class CrossSigningOlm @Inject constructor(
         val signaturesMadeByMyKey = signatures[myUserID] // Signatures made by me
                 ?.get("ed25519:$pubKey")
 
-        if (signaturesMadeByMyKey.isNullOrBlank()) {
-            throw IllegalArgumentException("Not signed with my key $type")
-        }
+        require(signaturesMadeByMyKey.orEmpty().isNotBlank()) { "Not signed with my key $type" }
 
         // Check that Alice USK signature of Bob MSK is valid
         olmUtility.verifyEd25519Signature(signaturesMadeByMyKey, pubKey, JsonCanonicalizer.getCanonicalJson(Map::class.java, signable))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index e466def1a1..f4796155c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -60,7 +60,7 @@ import javax.inject.Inject
 
 @SessionScope
 internal class DefaultCrossSigningService @Inject constructor(
-        @UserId private val userId: String,
+        @UserId private val myUserId: String,
         @SessionId private val sessionId: String,
         private val cryptoStore: IMXCryptoStore,
         private val deviceListManager: DeviceListManager,
@@ -127,7 +127,7 @@ internal class DefaultCrossSigningService @Inject constructor(
                 }
 
                 // Recover local trust in case private key are there?
-                setUserKeysAsTrusted(userId, checkUserTrust(userId).isVerified())
+                setUserKeysAsTrusted(myUserId, checkUserTrust(myUserId).isVerified())
             }
         } catch (e: Throwable) {
             // Mmm this kind of a big issue
@@ -167,9 +167,13 @@ internal class DefaultCrossSigningService @Inject constructor(
                 }
 
                 override fun onSuccess(data: InitializeCrossSigningTask.Result) {
-                    val crossSigningInfo = MXCrossSigningInfo(userId, listOf(data.masterKeyInfo, data.userKeyInfo, data.selfSignedKeyInfo))
+                    val crossSigningInfo = MXCrossSigningInfo(
+                            myUserId,
+                            listOf(data.masterKeyInfo, data.userKeyInfo, data.selfSignedKeyInfo),
+                            true
+                    )
                     cryptoStore.setMyCrossSigningInfo(crossSigningInfo)
-                    setUserKeysAsTrusted(userId, true)
+                    setUserKeysAsTrusted(myUserId, true)
                     cryptoStore.storePrivateKeysInfo(data.masterKeyPK, data.userKeyPK, data.selfSigningKeyPK)
                     crossSigningOlm.masterPkSigning = OlmPkSigning().apply { initWithSeed(data.masterKeyPK.fromBase64()) }
                     crossSigningOlm.userPkSigning = OlmPkSigning().apply { initWithSeed(data.userKeyPK.fromBase64()) }
@@ -266,7 +270,7 @@ internal class DefaultCrossSigningService @Inject constructor(
             uskKeyPrivateKey: String?,
             sskPrivateKey: String?
     ): UserTrustResult {
-        val mxCrossSigningInfo = getMyCrossSigningKeys() ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+        val mxCrossSigningInfo = getMyCrossSigningKeys() ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
 
         var masterKeyIsTrusted = false
         var userKeyIsTrusted = false
@@ -330,7 +334,7 @@ internal class DefaultCrossSigningService @Inject constructor(
             val checkSelfTrust = checkSelfTrust()
             if (checkSelfTrust.isVerified()) {
                 cryptoStore.storePrivateKeysInfo(masterKeyPrivateKey, uskKeyPrivateKey, sskPrivateKey)
-                setUserKeysAsTrusted(userId, true)
+                setUserKeysAsTrusted(myUserId, true)
             }
             return checkSelfTrust
         }
@@ -351,7 +355,7 @@ internal class DefaultCrossSigningService @Inject constructor(
      * .
      */
     override fun isUserTrusted(otherUserId: String): Boolean {
-        return cryptoStore.getCrossSigningInfo(userId)?.isTrusted() == true
+        return cryptoStore.getCrossSigningInfo(otherUserId)?.isTrusted() == true
     }
 
     override fun isCrossSigningVerified(): Boolean {
@@ -363,7 +367,7 @@ internal class DefaultCrossSigningService @Inject constructor(
      */
     override fun checkUserTrust(otherUserId: String): UserTrustResult {
         Timber.v("## CrossSigning  checkUserTrust for $otherUserId")
-        if (otherUserId == userId) {
+        if (otherUserId == myUserId) {
             return checkSelfTrust()
         }
         // I trust a user if I trust his master key
@@ -371,16 +375,14 @@ internal class DefaultCrossSigningService @Inject constructor(
         // TODO what if the master key is signed by a device key that i have verified
 
         // First let's get my user key
-        val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(userId)
+        val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(myUserId)
 
-        checkOtherMSKTrusted(myCrossSigningInfo, cryptoStore.getCrossSigningInfo(otherUserId))
-
-        return UserTrustResult.Success
+        return checkOtherMSKTrusted(myCrossSigningInfo, cryptoStore.getCrossSigningInfo(otherUserId))
     }
 
     fun checkOtherMSKTrusted(myCrossSigningInfo: MXCrossSigningInfo?, otherInfo: MXCrossSigningInfo?): UserTrustResult {
         val myUserKey = myCrossSigningInfo?.userKey()
-                ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+                ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
 
         if (!myCrossSigningInfo.isTrusted()) {
             return UserTrustResult.KeysNotTrusted(myCrossSigningInfo)
@@ -391,7 +393,7 @@ internal class DefaultCrossSigningService @Inject constructor(
                 ?: return UserTrustResult.UnknownCrossSignatureInfo(otherInfo?.userId ?: "")
 
         val masterKeySignaturesMadeByMyUserKey = otherMasterKey.signatures
-                ?.get(userId) // Signatures made by me
+                ?.get(myUserId) // Signatures made by me
                 ?.get("ed25519:${myUserKey.unpaddedBase64PublicKey}")
 
         if (masterKeySignaturesMadeByMyUserKey.isNullOrBlank()) {
@@ -417,9 +419,9 @@ internal class DefaultCrossSigningService @Inject constructor(
         // Special case when it's me,
         // I have to check that MSK -> USK -> SSK
         // and that MSK is trusted (i know the private key, or is signed by a trusted device)
-        val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(userId)
+        val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(myUserId)
 
-        return checkSelfTrust(myCrossSigningInfo, cryptoStore.getUserDeviceList(userId))
+        return checkSelfTrust(myCrossSigningInfo, cryptoStore.getUserDeviceList(myUserId))
     }
 
     fun checkSelfTrust(myCrossSigningInfo: MXCrossSigningInfo?, myDevices: List<CryptoDeviceInfo>?): UserTrustResult {
@@ -429,7 +431,7 @@ internal class DefaultCrossSigningService @Inject constructor(
 //        val myCrossSigningInfo = cryptoStore.getCrossSigningInfo(userId)
 
         val myMasterKey = myCrossSigningInfo?.masterKey()
-                ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+                ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
 
         // Is the master key trusted
         // 1) check if I know the private key
@@ -453,7 +455,7 @@ internal class DefaultCrossSigningService @Inject constructor(
             olmPkSigning?.releaseSigning()
         } else {
             // Maybe it's signed by a locally trusted device?
-            myMasterKey.signatures?.get(userId)?.forEach { (key, value) ->
+            myMasterKey.signatures?.get(myUserId)?.forEach { (key, value) ->
                 val potentialDeviceId = key.removePrefix("ed25519:")
                 val potentialDevice = myDevices?.firstOrNull { it.deviceId == potentialDeviceId } // cryptoStore.getUserDevice(userId, potentialDeviceId)
                 if (potentialDevice != null && potentialDevice.isVerified) {
@@ -475,14 +477,14 @@ internal class DefaultCrossSigningService @Inject constructor(
         }
 
         val myUserKey = myCrossSigningInfo.userKey()
-                ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+                ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
 
         val userKeySignaturesMadeByMyMasterKey = myUserKey.signatures
-                ?.get(userId) // Signatures made by me
+                ?.get(myUserId) // Signatures made by me
                 ?.get("ed25519:${myMasterKey.unpaddedBase64PublicKey}")
 
         if (userKeySignaturesMadeByMyMasterKey.isNullOrBlank()) {
-            Timber.d("## CrossSigning  checkUserTrust false for $userId, USK not signed by MSK")
+            Timber.d("## CrossSigning  checkUserTrust false for $myUserId, USK not signed by MSK")
             return UserTrustResult.KeyNotSigned(myUserKey)
         }
 
@@ -498,14 +500,14 @@ internal class DefaultCrossSigningService @Inject constructor(
         }
 
         val mySSKey = myCrossSigningInfo.selfSigningKey()
-                ?: return UserTrustResult.CrossSigningNotConfigured(userId)
+                ?: return UserTrustResult.CrossSigningNotConfigured(myUserId)
 
         val ssKeySignaturesMadeByMyMasterKey = mySSKey.signatures
-                ?.get(userId) // Signatures made by me
+                ?.get(myUserId) // Signatures made by me
                 ?.get("ed25519:${myMasterKey.unpaddedBase64PublicKey}")
 
         if (ssKeySignaturesMadeByMyMasterKey.isNullOrBlank()) {
-            Timber.d("## CrossSigning  checkUserTrust false for $userId, SSK not signed by MSK")
+            Timber.d("## CrossSigning  checkUserTrust false for $myUserId, SSK not signed by MSK")
             return UserTrustResult.KeyNotSigned(mySSKey)
         }
 
@@ -555,14 +557,14 @@ internal class DefaultCrossSigningService @Inject constructor(
 
     override fun trustUser(otherUserId: String, callback: MatrixCallback<Unit>) {
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
-            Timber.d("## CrossSigning - Mark user $userId as trusted ")
+            Timber.d("## CrossSigning - Mark user $otherUserId as trusted ")
             // We should have this user keys
             val otherMasterKeys = getUserCrossSigningKeys(otherUserId)?.masterKey()
             if (otherMasterKeys == null) {
                 callback.onFailure(Throwable("## CrossSigning - Other master signing key is not known"))
                 return@launch
             }
-            val myKeys = getUserCrossSigningKeys(userId)
+            val myKeys = getUserCrossSigningKeys(myUserId)
             if (myKeys == null) {
                 callback.onFailure(Throwable("## CrossSigning - CrossSigning is not setup for this account"))
                 return@launch
@@ -586,16 +588,22 @@ internal class DefaultCrossSigningService @Inject constructor(
             }
 
             cryptoStore.setUserKeysAsTrusted(otherUserId, true)
-            // TODO update local copy with new signature directly here? kind of local echo of trust?
 
-            Timber.d("## CrossSigning - Upload signature of $userId MSK signed by USK")
+            Timber.d("## CrossSigning - Upload signature of $otherUserId MSK signed by USK")
             val uploadQuery = UploadSignatureQueryBuilder()
-                    .withSigningKeyInfo(otherMasterKeys.copyForSignature(userId, userPubKey, newSignature))
+                    .withSigningKeyInfo(otherMasterKeys.copyForSignature(myUserId, userPubKey, newSignature))
                     .build()
             uploadSignaturesTask.configureWith(UploadSignaturesTask.Params(uploadQuery)) {
                 this.executionThread = TaskThread.CRYPTO
                 this.callback = callback
             }.executeBy(taskExecutor)
+
+            // Local echo for device cross trust, to avoid having to wait for a notification of key change
+            cryptoStore.getUserDeviceList(otherUserId)?.forEach { device ->
+                val updatedTrust = checkDeviceTrust(device.userId, device.deviceId, device.trustLevel?.isLocallyVerified() ?: false)
+                Timber.v("## CrossSigning - update trust for device ${device.deviceId} of user $otherUserId , verified=$updatedTrust")
+                cryptoStore.setDeviceTrust(device.userId, device.deviceId, updatedTrust.isCrossSignedVerified(), updatedTrust.isLocallyVerified())
+            }
         }
     }
 
@@ -604,20 +612,20 @@ internal class DefaultCrossSigningService @Inject constructor(
             cryptoStore.markMyMasterKeyAsLocallyTrusted(true)
             checkSelfTrust()
             // re-verify all trusts
-            onUsersDeviceUpdate(listOf(userId))
+            onUsersDeviceUpdate(listOf(myUserId))
         }
     }
 
     override fun trustDevice(deviceId: String, callback: MatrixCallback<Unit>) {
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
             // This device should be yours
-            val device = cryptoStore.getUserDevice(userId, deviceId)
+            val device = cryptoStore.getUserDevice(myUserId, deviceId)
             if (device == null) {
                 callback.onFailure(IllegalArgumentException("This device [$deviceId] is not known, or not yours"))
                 return@launch
             }
 
-            val myKeys = getUserCrossSigningKeys(userId)
+            val myKeys = getUserCrossSigningKeys(myUserId)
             if (myKeys == null) {
                 callback.onFailure(Throwable("CrossSigning is not setup for this account"))
                 return@launch
@@ -639,7 +647,7 @@ internal class DefaultCrossSigningService @Inject constructor(
             }
             val toUpload = device.copy(
                     signatures = mapOf(
-                            userId
+                            myUserId
                                     to
                                     mapOf(
                                             "ed25519:$ssPubKey" to newSignature
@@ -661,8 +669,8 @@ internal class DefaultCrossSigningService @Inject constructor(
         val otherDevice = cryptoStore.getUserDevice(otherUserId, otherDeviceId)
                 ?: return DeviceTrustResult.UnknownDevice(otherDeviceId)
 
-        val myKeys = getUserCrossSigningKeys(userId)
-                ?: return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.CrossSigningNotConfigured(userId))
+        val myKeys = getUserCrossSigningKeys(myUserId)
+                ?: return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.CrossSigningNotConfigured(myUserId))
 
         if (!myKeys.isTrusted()) return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.KeysNotTrusted(myKeys))
 
@@ -717,7 +725,7 @@ internal class DefaultCrossSigningService @Inject constructor(
 
     fun checkDeviceTrust(myKeys: MXCrossSigningInfo?, otherKeys: MXCrossSigningInfo?, otherDevice: CryptoDeviceInfo): DeviceTrustResult {
         val locallyTrusted = otherDevice.trustLevel?.isLocallyVerified()
-        myKeys ?: return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.CrossSigningNotConfigured(userId))
+        myKeys ?: return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.CrossSigningNotConfigured(myUserId))
 
         if (!myKeys.isTrusted()) return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.KeysNotTrusted(myKeys))
 
@@ -779,6 +787,11 @@ internal class DefaultCrossSigningService @Inject constructor(
 
     override fun onUsersDeviceUpdate(userIds: List<String>) {
         Timber.d("## CrossSigning - onUsersDeviceUpdate for users: ${userIds.logLimit()}")
+        checkTrustAndAffectedRoomShields(userIds)
+    }
+
+    fun checkTrustAndAffectedRoomShields(userIds: List<String>) {
+        Timber.d("## CrossSigning - checkTrustAndAffectedRoomShields for users: ${userIds.logLimit()}")
         val workerParams = UpdateTrustWorker.Params(
                 sessionId = sessionId,
                 filename = updateTrustWorkerDataRepository.createParam(userIds)
@@ -800,7 +813,7 @@ internal class DefaultCrossSigningService @Inject constructor(
         cryptoStore.setUserKeysAsTrusted(otherUserId, trusted)
         // If it's me, recheck trust of all users and devices?
         val users = ArrayList<String>()
-        if (otherUserId == userId && currentTrust != trusted) {
+        if (otherUserId == myUserId && currentTrust != trusted) {
             // notify key requester
             outgoingKeyRequestManager.onSelfCrossSigningTrustChanged(trusted)
             cryptoStore.updateUsersTrust {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
index f1dc060e10..fffc6707d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
@@ -161,6 +161,7 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
             // i have all the new trusts, update DB
             trusts.forEach {
                 val verified = it.value?.isVerified() == true
+                Timber.v("[$myUserId] ## CrossSigning - Updating user trust: ${it.key} to $verified")
                 updateCrossSigningKeysTrust(cryptoRealm, it.key, verified)
             }
 
@@ -207,6 +208,7 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
     private suspend fun updateTrustStep2(userList: List<String>, myCrossSigningInfo: MXCrossSigningInfo?) {
         Timber.d("## CrossSigning - Updating shields for impacted rooms...")
         awaitTransaction(sessionRealmConfiguration) { sessionRealm ->
+            Timber.d("## CrossSigning - Updating shields for impacted rooms - in transaction")
             Realm.getInstance(cryptoRealmConfiguration).use { cryptoRealm ->
                 sessionRealm.where(RoomMemberSummaryEntity::class.java)
                         .`in`(RoomMemberSummaryEntityFields.USER_ID, userList.toTypedArray())
@@ -239,6 +241,7 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
                         }
             }
         }
+        Timber.d("## CrossSigning - Updating shields for impacted rooms - END")
     }
 
     private fun getCrossSigningInfo(cryptoRealm: Realm, userId: String): MXCrossSigningInfo? {
@@ -257,21 +260,27 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
         cryptoRealm.where(CrossSigningInfoEntity::class.java)
                 .equalTo(CrossSigningInfoEntityFields.USER_ID, userId)
                 .findFirst()
-                ?.crossSigningKeys
-                ?.forEach { info ->
-                    // optimization to avoid trigger updates when there is no change..
-                    if (info.trustLevelEntity?.isVerified() != verified) {
-                        Timber.d("## CrossSigning - Trust change for $userId : $verified")
-                        val level = info.trustLevelEntity
-                        if (level == null) {
-                            info.trustLevelEntity = cryptoRealm.createObject(TrustLevelEntity::class.java).also {
-                                it.locallyVerified = verified
-                                it.crossSignedVerified = verified
+                ?.let { userKeyInfo ->
+                    userKeyInfo
+                            .crossSigningKeys
+                            .forEach { key ->
+                                // optimization to avoid trigger updates when there is no change..
+                                if (key.trustLevelEntity?.isVerified() != verified) {
+                                    Timber.d("## CrossSigning - Trust change for $userId : $verified")
+                                    val level = key.trustLevelEntity
+                                    if (level == null) {
+                                        key.trustLevelEntity = cryptoRealm.createObject(TrustLevelEntity::class.java).also {
+                                            it.locallyVerified = verified
+                                            it.crossSignedVerified = verified
+                                        }
+                                    } else {
+                                        level.locallyVerified = verified
+                                        level.crossSignedVerified = verified
+                                    }
+                                }
                             }
-                        } else {
-                            level.locallyVerified = verified
-                            level.crossSignedVerified = verified
-                        }
+                    if (verified) {
+                        userKeyInfo.wasUserVerifiedOnce = true
                     }
                 }
     }
@@ -297,8 +306,18 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
                     getCrossSigningInfo(cryptoRealm, userId)?.isTrusted() == true
                 }
 
+        val resetTrust = listToCheck
+                .filter { userId ->
+                    val crossSigningInfo = getCrossSigningInfo(cryptoRealm, userId)
+                    crossSigningInfo?.isTrusted() != true && crossSigningInfo?.wasTrustedOnce == true
+                }
+
         return if (allTrustedUserIds.isEmpty()) {
-            RoomEncryptionTrustLevel.Default
+            if (resetTrust.isEmpty()) {
+                RoomEncryptionTrustLevel.Default
+            } else {
+                RoomEncryptionTrustLevel.Warning
+            }
         } else {
             // If one of the verified user as an untrusted device -> warning
             // If all devices of all verified users are trusted -> green
@@ -325,11 +344,15 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
                         if (hasWarning) {
                             RoomEncryptionTrustLevel.Warning
                         } else {
-                            if (listToCheck.size == allTrustedUserIds.size) {
-                                // all users are trusted and all devices are verified
-                                RoomEncryptionTrustLevel.Trusted
+                            if (resetTrust.isEmpty()) {
+                                if (listToCheck.size == allTrustedUserIds.size) {
+                                    // all users are trusted and all devices are verified
+                                    RoomEncryptionTrustLevel.Trusted
+                                } else {
+                                    RoomEncryptionTrustLevel.Default
+                                }
                             } else {
-                                RoomEncryptionTrustLevel.Default
+                                RoomEncryptionTrustLevel.Warning
                             }
                         }
                     }
@@ -342,7 +365,8 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
                 userId = userId,
                 crossSigningKeys = xsignInfo.crossSigningKeys.mapNotNull {
                     crossSigningKeysMapper.map(userId, it)
-                }
+                },
+                wasTrustedOnce = xsignInfo.wasUserVerifiedOnce
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
index 8691c08779..e8700b7809 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
@@ -652,14 +652,7 @@ internal class DefaultKeysBackupService @Inject constructor(
                         }
                 val recoveryKey = computeRecoveryKey(secret.fromBase64())
                 if (isValidRecoveryKeyForKeysBackupVersion(recoveryKey, keysBackupVersion)) {
-                    awaitCallback<Unit> {
-                        trustKeysBackupVersion(keysBackupVersion, true, it)
-                    }
                     // we don't want to start immediately downloading all as it can take very long
-
-//                    val importResult = awaitCallback<ImportRoomKeysResult> {
-//                        restoreKeysWithRecoveryKey(keysBackupVersion, recoveryKey, null, null, null, it)
-//                    }
                     withContext(coroutineDispatchers.crypto) {
                         cryptoStore.saveBackupRecoveryKey(recoveryKey, keysBackupVersion.version)
                     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/InboundGroupSessionData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/InboundGroupSessionData.kt
index 2ce36aa209..15e8ba835b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/InboundGroupSessionData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/InboundGroupSessionData.kt
@@ -38,9 +38,6 @@ data class InboundGroupSessionData(
         @Json(name = "forwarding_curve25519_key_chain")
         var forwardingCurve25519KeyChain: List<String>? = emptyList(),
 
-        /** Not yet used, will be in backup v2
-        val untrusted?: Boolean = false */
-
         /**
          * Flag that indicates whether or not the current inboundSession will be shared to
          * invited users to decrypt past messages.
@@ -48,4 +45,10 @@ data class InboundGroupSessionData(
         @Json(name = "shared_history")
         val sharedHistory: Boolean = false,
 
+        /**
+         * Flag indicating that this key is trusted.
+         */
+        @Json(name = "trusted")
+        val trusted: Boolean? = null,
+
         )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXInboundMegolmSessionWrapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXInboundMegolmSessionWrapper.kt
index 2772b34835..2c6a0a967a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXInboundMegolmSessionWrapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXInboundMegolmSessionWrapper.kt
@@ -86,6 +86,7 @@ data class MXInboundMegolmSessionWrapper(
                     keysClaimed = megolmSessionData.senderClaimedKeys,
                     forwardingCurve25519KeyChain = megolmSessionData.forwardingCurve25519KeyChain,
                     sharedHistory = megolmSessionData.sharedHistory,
+                    trusted = false
             )
 
             return MXInboundMegolmSessionWrapper(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
index c26c6107c4..24dccc4d90 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
@@ -23,6 +23,9 @@ import com.squareup.moshi.JsonClass
  */
 @JsonClass(generateAdapter = true)
 internal data class DeleteDeviceParams(
+        /**
+         * Additional authentication information for the user-interactive authentication API.
+         */
         @Json(name = "auth")
-        val auth: Map<String, *>? = null
+        val auth: Map<String, *>? = null,
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDevicesParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDevicesParams.kt
new file mode 100644
index 0000000000..19b33b2a69
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDevicesParams.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 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.
+ */
+package org.matrix.android.sdk.internal.crypto.model.rest
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * This class provides the parameter to delete several devices.
+ */
+@JsonClass(generateAdapter = true)
+internal data class DeleteDevicesParams(
+        /**
+         * Additional authentication information for the user-interactive authentication API.
+         */
+        @Json(name = "auth")
+        val auth: Map<String, *>? = null,
+
+        /**
+         * Required: The list of device IDs to delete.
+         */
+        @Json(name = "devices")
+        val deviceIds: List<String>,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
index 0413fc730c..21e3342365 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.crypto.store
 
 import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
+import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
 import org.matrix.android.sdk.api.session.crypto.NewSessionListener
 import org.matrix.android.sdk.api.session.crypto.OutgoingKeyRequest
 import org.matrix.android.sdk.api.session.crypto.OutgoingRoomKeyRequestState
@@ -120,11 +121,26 @@ internal interface IMXCryptoStore {
     fun getRoomsListBlacklistUnverifiedDevices(): List<String>
 
     /**
-     * Updates the rooms ids list in which the messages are not encrypted for the unverified devices.
+     * A live status regarding sharing keys for unverified devices in this room.
      *
-     * @param roomIds the room ids list
+     * @return Live status
      */
-    fun setRoomsListBlacklistUnverifiedDevices(roomIds: List<String>)
+    fun getLiveBlockUnverifiedDevices(roomId: String): LiveData<Boolean>
+
+    /**
+     * Tell if unverified devices should be blacklisted when sending keys.
+     *
+     * @return true if should not send keys to unverified devices
+     */
+    fun getBlockUnverifiedDevices(roomId: String): Boolean
+
+    /**
+     * Define if encryption keys should be sent to unverified devices in this room.
+     *
+     * @param roomId the roomId
+     * @param block if true will not send keys to unverified devices
+     */
+    fun blockUnverifiedDevicesInRoom(roomId: String, block: Boolean)
 
     /**
      * Get the current keys backup version.
@@ -238,10 +254,14 @@ internal interface IMXCryptoStore {
     // TODO temp
     fun getLiveDeviceList(): LiveData<List<CryptoDeviceInfo>>
 
+    fun getLiveDeviceWithId(deviceId: String): LiveData<Optional<CryptoDeviceInfo>>
+
     fun getMyDevicesInfo(): List<DeviceInfo>
 
     fun getLiveMyDevicesInfo(): LiveData<List<DeviceInfo>>
 
+    fun getLiveMyDevicesInfo(deviceId: String): LiveData<Optional<DeviceInfo>>
+
     fun saveMyDevicesInfo(info: List<DeviceInfo>)
 
     /**
@@ -512,6 +532,9 @@ internal interface IMXCryptoStore {
     fun getCrossSigningPrivateKeys(): PrivateKeysInfo?
     fun getLiveCrossSigningPrivateKeys(): LiveData<Optional<PrivateKeysInfo>>
 
+    fun getGlobalCryptoConfig(): GlobalCryptoConfig
+    fun getLiveGlobalCryptoConfig(): LiveData<GlobalCryptoConfig>
+
     fun saveBackupRecoveryKey(recoveryKey: String?, version: String?)
     fun getKeyBackupRecoveryKeyInfo(): SavedKeyBackupKeyInfo?
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index f5468634cb..1b52b79746 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -29,6 +29,7 @@ import io.realm.kotlin.where
 import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
 import org.matrix.android.sdk.api.session.crypto.NewSessionListener
 import org.matrix.android.sdk.api.session.crypto.OutgoingKeyRequest
 import org.matrix.android.sdk.api.session.crypto.OutgoingRoomKeyRequestState
@@ -55,6 +56,7 @@ import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
 import org.matrix.android.sdk.internal.crypto.model.OutboundGroupSessionWrapper
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.store.db.mapper.CrossSigningKeysMapper
+import org.matrix.android.sdk.internal.crypto.store.db.mapper.MyDeviceLastSeenInfoEntityMapper
 import org.matrix.android.sdk.internal.crypto.store.db.model.AuditTrailEntity
 import org.matrix.android.sdk.internal.crypto.store.db.model.AuditTrailEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.AuditTrailMapper
@@ -68,6 +70,7 @@ import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntity
 import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntity
 import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntity
 import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntity
@@ -112,6 +115,7 @@ internal class RealmCryptoStore @Inject constructor(
         @UserId private val userId: String,
         @DeviceId private val deviceId: String?,
         private val clock: Clock,
+        private val myDeviceLastSeenInfoEntityMapper: MyDeviceLastSeenInfoEntityMapper,
 ) : IMXCryptoStore {
 
     /* ==========================================================================================
@@ -442,6 +446,38 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
+    override fun getGlobalCryptoConfig(): GlobalCryptoConfig {
+        return doWithRealm(realmConfiguration) { realm ->
+            realm.where<CryptoMetadataEntity>().findFirst()
+                    ?.let {
+                        GlobalCryptoConfig(
+                                globalBlockUnverifiedDevices = it.globalBlacklistUnverifiedDevices,
+                                globalEnableKeyGossiping = it.globalEnableKeyGossiping,
+                                enableKeyForwardingOnInvite = it.enableKeyForwardingOnInvite
+                        )
+                    } ?: GlobalCryptoConfig(false, false, false)
+        }
+    }
+
+    override fun getLiveGlobalCryptoConfig(): LiveData<GlobalCryptoConfig> {
+        val liveData = monarchy.findAllMappedWithChanges(
+                { realm: Realm ->
+                    realm
+                            .where<CryptoMetadataEntity>()
+                },
+                {
+                    GlobalCryptoConfig(
+                            globalBlockUnverifiedDevices = it.globalBlacklistUnverifiedDevices,
+                            globalEnableKeyGossiping = it.globalEnableKeyGossiping,
+                            enableKeyForwardingOnInvite = it.enableKeyForwardingOnInvite
+                    )
+                }
+        )
+        return Transformations.map(liveData) {
+            it.firstOrNull() ?: GlobalCryptoConfig(false, false, false)
+        }
+    }
+
     override fun storePrivateKeysInfo(msk: String?, usk: String?, ssk: String?) {
         Timber.v("## CRYPTO | *** storePrivateKeysInfo ${msk != null}, ${usk != null}, ${ssk != null}")
         doRealmTransaction(realmConfiguration) { realm ->
@@ -578,6 +614,12 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
+    override fun getLiveDeviceWithId(deviceId: String): LiveData<Optional<CryptoDeviceInfo>> {
+        return Transformations.map(getLiveDeviceList()) { devices ->
+            devices.firstOrNull { it.deviceId == deviceId }.toOptional()
+        }
+    }
+
     override fun getMyDevicesInfo(): List<DeviceInfo> {
         return monarchy.fetchAllCopiedSync {
             it.where<MyDeviceLastSeenInfoEntity>()
@@ -596,26 +638,26 @@ internal class RealmCryptoStore @Inject constructor(
                 { realm: Realm ->
                     realm.where<MyDeviceLastSeenInfoEntity>()
                 },
-                { entity ->
-                    DeviceInfo(
-                            deviceId = entity.deviceId,
-                            lastSeenIp = entity.lastSeenIp,
-                            lastSeenTs = entity.lastSeenTs,
-                            displayName = entity.displayName
-                    )
-                }
+                { entity -> myDeviceLastSeenInfoEntityMapper.map(entity) }
         )
     }
 
-    override fun saveMyDevicesInfo(info: List<DeviceInfo>) {
-        val entities = info.map {
-            MyDeviceLastSeenInfoEntity(
-                    lastSeenTs = it.lastSeenTs,
-                    lastSeenIp = it.lastSeenIp,
-                    displayName = it.displayName,
-                    deviceId = it.deviceId
-            )
+    override fun getLiveMyDevicesInfo(deviceId: String): LiveData<Optional<DeviceInfo>> {
+        val liveData = monarchy.findAllMappedWithChanges(
+                { realm: Realm ->
+                    realm.where<MyDeviceLastSeenInfoEntity>()
+                            .equalTo(MyDeviceLastSeenInfoEntityFields.DEVICE_ID, deviceId)
+                },
+                { entity -> myDeviceLastSeenInfoEntityMapper.map(entity) }
+        )
+
+        return Transformations.map(liveData) {
+            it.firstOrNull().toOptional()
         }
+    }
+
+    override fun saveMyDevicesInfo(info: List<DeviceInfo>) {
+        val entities = info.map { myDeviceLastSeenInfoEntityMapper.map(it) }
         doRealmTransactionAsync(realmConfiguration) { realm ->
             realm.where<MyDeviceLastSeenInfoEntity>().findAll().deleteAllFromRealm()
             entities.forEach {
@@ -1037,25 +1079,6 @@ internal class RealmCryptoStore @Inject constructor(
         } ?: false
     }
 
-    override fun setRoomsListBlacklistUnverifiedDevices(roomIds: List<String>) {
-        doRealmTransaction(realmConfiguration) {
-            // Reset all
-            it.where<CryptoRoomEntity>()
-                    .findAll()
-                    .forEach { room ->
-                        room.blacklistUnverifiedDevices = false
-                    }
-
-            // Enable those in the list
-            it.where<CryptoRoomEntity>()
-                    .`in`(CryptoRoomEntityFields.ROOM_ID, roomIds.toTypedArray())
-                    .findAll()
-                    .forEach { room ->
-                        room.blacklistUnverifiedDevices = true
-                    }
-        }
-    }
-
     override fun getRoomsListBlacklistUnverifiedDevices(): List<String> {
         return doWithRealm(realmConfiguration) {
             it.where<CryptoRoomEntity>()
@@ -1067,6 +1090,37 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
+    override fun getLiveBlockUnverifiedDevices(roomId: String): LiveData<Boolean> {
+        val liveData = monarchy.findAllMappedWithChanges(
+                { realm: Realm ->
+                    realm.where<CryptoRoomEntity>()
+                            .equalTo(CryptoRoomEntityFields.ROOM_ID, roomId)
+                },
+                {
+                    it.blacklistUnverifiedDevices
+                }
+        )
+        return Transformations.map(liveData) {
+            it.firstOrNull() ?: false
+        }
+    }
+
+    override fun getBlockUnverifiedDevices(roomId: String): Boolean {
+        return doWithRealm(realmConfiguration) { realm ->
+            realm.where<CryptoRoomEntity>()
+                    .equalTo(CryptoRoomEntityFields.ROOM_ID, roomId)
+                    .findFirst()
+                    ?.blacklistUnverifiedDevices ?: false
+        }
+    }
+
+    override fun blockUnverifiedDevicesInRoom(roomId: String, block: Boolean) {
+        doRealmTransaction(realmConfiguration) { realm ->
+            CryptoRoomEntity.getById(realm, roomId)
+                    ?.blacklistUnverifiedDevices = block
+        }
+    }
+
     override fun getDeviceTrackingStatuses(): Map<String, Int> {
         return doWithRealm(realmConfiguration) {
             it.where<UserEntity>()
@@ -1595,7 +1649,8 @@ internal class RealmCryptoStore @Inject constructor(
                 userId = userId,
                 crossSigningKeys = xsignInfo.crossSigningKeys.mapNotNull {
                     crossSigningKeysMapper.map(userId, it)
-                }
+                },
+                wasTrustedOnce = xsignInfo.wasUserVerifiedOnce
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
index c36d572da6..9129453c8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
@@ -34,6 +34,9 @@ import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo015
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo016
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo017
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo018
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo019
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo020
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
@@ -48,7 +51,7 @@ internal class RealmCryptoStoreMigration @Inject constructor(
         private val clock: Clock,
 ) : MatrixRealmMigration(
         dbName = "Crypto",
-        schemaVersion = 17L,
+        schemaVersion = 20L,
 ) {
     /**
      * Forces all RealmCryptoStoreMigration instances to be equal.
@@ -75,5 +78,8 @@ internal class RealmCryptoStoreMigration @Inject constructor(
         if (oldVersion < 15) MigrateCryptoTo015(realm).perform()
         if (oldVersion < 16) MigrateCryptoTo016(realm).perform()
         if (oldVersion < 17) MigrateCryptoTo017(realm).perform()
+        if (oldVersion < 18) MigrateCryptoTo018(realm).perform()
+        if (oldVersion < 19) MigrateCryptoTo019(realm).perform()
+        if (oldVersion < 20) MigrateCryptoTo020(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/MyDeviceLastSeenInfoEntityMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/MyDeviceLastSeenInfoEntityMapper.kt
new file mode 100644
index 0000000000..b81883fb38
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/MyDeviceLastSeenInfoEntityMapper.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.crypto.store.db.mapper
+
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
+import javax.inject.Inject
+
+internal class MyDeviceLastSeenInfoEntityMapper @Inject constructor() {
+
+    fun map(entity: MyDeviceLastSeenInfoEntity): DeviceInfo {
+        return DeviceInfo(
+                deviceId = entity.deviceId,
+                lastSeenIp = entity.lastSeenIp,
+                lastSeenTs = entity.lastSeenTs,
+                displayName = entity.displayName,
+                unstableLastSeenUserAgent = entity.lastSeenUserAgent,
+        )
+    }
+
+    fun map(deviceInfo: DeviceInfo): MyDeviceLastSeenInfoEntity {
+        return MyDeviceLastSeenInfoEntity(
+                deviceId = deviceInfo.deviceId,
+                lastSeenIp = deviceInfo.lastSeenIp,
+                lastSeenTs = deviceInfo.lastSeenTs,
+                displayName = deviceInfo.displayName,
+                lastSeenUserAgent = deviceInfo.getBestLastSeenUserAgent(),
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo018.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo018.kt
new file mode 100644
index 0000000000..3bedf58ca2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo018.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.crypto.model.InboundGroupSessionData
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+/**
+ * This migration is adding support for trusted flags on megolm sessions.
+ * We can't really assert the trust of existing keys, so for the sake of simplicity we are going to
+ * mark existing keys as safe.
+ * This migration can take long depending on the account
+ */
+internal class MigrateCryptoTo018(realm: DynamicRealm) : RealmMigrator(realm, 18) {
+
+    private val moshiAdapter = MoshiProvider.providesMoshi().adapter(InboundGroupSessionData::class.java)
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("OlmInboundGroupSessionEntity")
+                ?.transform { dynamicObject ->
+                    try {
+                        dynamicObject.getString(OlmInboundGroupSessionEntityFields.INBOUND_GROUP_SESSION_DATA_JSON)?.let { oldData ->
+                            moshiAdapter.fromJson(oldData)?.let { dataToMigrate ->
+                                dataToMigrate.copy(trusted = true).let {
+                                    dynamicObject.setString(OlmInboundGroupSessionEntityFields.INBOUND_GROUP_SESSION_DATA_JSON, moshiAdapter.toJson(it))
+                                }
+                            }
+                        }
+                    } catch (failure: Throwable) {
+                        Timber.e(failure, "Failed to migrate megolm session")
+                    }
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo019.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo019.kt
new file mode 100644
index 0000000000..65280300ab
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo019.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import io.realm.DynamicRealmObject
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KeyUsage
+import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeyInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+/**
+ * This migration is adding support for trusted flags on megolm sessions.
+ * We can't really assert the trust of existing keys, so for the sake of simplicity we are going to
+ * mark existing keys as safe.
+ * This migration can take long depending on the account
+ */
+internal class MigrateCryptoTo019(realm: DynamicRealm) : RealmMigrator(realm, 19) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("CrossSigningInfoEntity")
+                ?.addField(CrossSigningInfoEntityFields.WAS_USER_VERIFIED_ONCE, Boolean::class.java)
+                ?.transform { dynamicObject ->
+
+                    val knowKeys = dynamicObject.getList(CrossSigningInfoEntityFields.CROSS_SIGNING_KEYS.`$`)
+                    val msk = knowKeys.firstOrNull {
+                        it.getList(KeyInfoEntityFields.USAGES.`$`, String::class.java).orEmpty().contains(KeyUsage.MASTER.value)
+                    }
+                    val ssk = knowKeys.firstOrNull {
+                        it.getList(KeyInfoEntityFields.USAGES.`$`, String::class.java).orEmpty().contains(KeyUsage.SELF_SIGNING.value)
+                    }
+                    val isTrusted = isDynamicKeyInfoTrusted(msk?.get<DynamicRealmObject>(KeyInfoEntityFields.TRUST_LEVEL_ENTITY.`$`)) &&
+                            isDynamicKeyInfoTrusted(ssk?.get<DynamicRealmObject>(KeyInfoEntityFields.TRUST_LEVEL_ENTITY.`$`))
+
+                    dynamicObject.setBoolean(CrossSigningInfoEntityFields.WAS_USER_VERIFIED_ONCE, isTrusted)
+                }
+    }
+
+    private fun isDynamicKeyInfoTrusted(keyInfo: DynamicRealmObject?): Boolean {
+        if (keyInfo == null) return false
+        return !keyInfo.isNull(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED) && keyInfo.getBoolean(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED) &&
+                !keyInfo.isNull(TrustLevelEntityFields.LOCALLY_VERIFIED) && keyInfo.getBoolean(TrustLevelEntityFields.LOCALLY_VERIFIED)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo020.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo020.kt
new file mode 100644
index 0000000000..44d07ab538
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo020.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+/**
+ * This migration adds a new field into MyDeviceLastSeenInfoEntity corresponding to the last seen user agent.
+ */
+internal class MigrateCryptoTo020(realm: DynamicRealm) : RealmMigrator(realm, 20) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("MyDeviceLastSeenInfoEntity")
+                ?.addField(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_USER_AGENT, String::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
index 5aba9bb9ba..033b7662c5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.internal.extensions.clearWith
 internal open class CrossSigningInfoEntity(
         @PrimaryKey
         var userId: String? = null,
+        var wasUserVerifiedOnce: Boolean = false,
         var crossSigningKeys: RealmList<KeyInfoEntity> = RealmList()
 ) : RealmObject() {
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
index 74a81d5b01..3e6dc2de16 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
@@ -27,7 +27,9 @@ internal open class MyDeviceLastSeenInfoEntity(
         /** The last time this device has been seen. */
         var lastSeenTs: Long? = null,
         /** The last ip address. */
-        var lastSeenIp: String? = null
+        var lastSeenIp: String? = null,
+        /** The last user agent. */
+        var lastSeenUserAgent: String? = null,
 ) : RealmObject() {
 
     companion object
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
index 0a77d33acc..549122447e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
@@ -16,12 +16,14 @@
 
 package org.matrix.android.sdk.internal.crypto.tasks
 
+import androidx.annotation.Size
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.session.uia.UiaResult
 import org.matrix.android.sdk.internal.auth.registration.handleUIA
 import org.matrix.android.sdk.internal.crypto.api.CryptoApi
 import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDeviceParams
+import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDevicesParams
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
@@ -30,7 +32,7 @@ import javax.inject.Inject
 
 internal interface DeleteDeviceTask : Task<DeleteDeviceTask.Params, Unit> {
     data class Params(
-            val deviceId: String,
+            @Size(min = 1) val deviceIds: List<String>,
             val userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor?,
             val userAuthParam: UIABaseAuth?
     )
@@ -42,9 +44,24 @@ internal class DefaultDeleteDeviceTask @Inject constructor(
 ) : DeleteDeviceTask {
 
     override suspend fun execute(params: DeleteDeviceTask.Params) {
+        require(params.deviceIds.isNotEmpty())
+
         try {
             executeRequest(globalErrorReceiver) {
-                cryptoApi.deleteDevice(params.deviceId, DeleteDeviceParams(params.userAuthParam?.asMap()))
+                val userAuthParam = params.userAuthParam?.asMap()
+                if (params.deviceIds.size == 1) {
+                    cryptoApi.deleteDevice(
+                            deviceId = params.deviceIds.first(),
+                            DeleteDeviceParams(auth = userAuthParam)
+                    )
+                } else {
+                    cryptoApi.deleteDevices(
+                            DeleteDevicesParams(
+                                    auth = userAuthParam,
+                                    deviceIds = params.deviceIds
+                            )
+                    )
+                }
             }
         } catch (throwable: Throwable) {
             if (params.userInteractiveAuthInterceptor == null ||
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
index a4b4cd0761..5d2797a6af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
@@ -47,9 +47,8 @@ internal class DefaultEncryptEventTask @Inject constructor(
         // don't want to wait for any query
         // if (!params.crypto.isRoomEncrypted(params.roomId)) return params.event
         val localEvent = params.event
-        if (localEvent.eventId == null || localEvent.type == null) {
-            throw IllegalArgumentException()
-        }
+        require(localEvent.eventId != null)
+        require(localEvent.type != null)
 
         localEchoRepository.updateSendState(localEvent.eventId, localEvent.roomId, SendState.ENCRYPTING)
 
@@ -82,7 +81,8 @@ internal class DefaultEncryptEventTask @Inject constructor(
                         ).toContent(),
                         forwardingCurve25519KeyChain = emptyList(),
                         senderCurve25519Key = result.eventContent["sender_key"] as? String,
-                        claimedEd25519Key = cryptoService.get().getMyDevice().fingerprint()
+                        claimedEd25519Key = cryptoService.get().getMyDevice().fingerprint(),
+                        isSafe = true
                 )
             } else {
                 null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index bb14b417dd..405757e3b3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -16,10 +16,12 @@
 package org.matrix.android.sdk.internal.crypto.tasks
 
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomFromLocalRoomTask
 import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.task.Task
@@ -37,12 +39,17 @@ internal class DefaultSendEventTask @Inject constructor(
         private val localEchoRepository: LocalEchoRepository,
         private val encryptEventTask: EncryptEventTask,
         private val loadRoomMembersTask: LoadRoomMembersTask,
+        private val createRoomFromLocalRoomTask: CreateRoomFromLocalRoomTask,
         private val roomAPI: RoomAPI,
         private val globalErrorReceiver: GlobalErrorReceiver
 ) : SendEventTask {
 
     override suspend fun execute(params: SendEventTask.Params): String {
         try {
+            if (params.event.isLocalRoomEvent) {
+                return createRoomAndSendEvent(params)
+            }
+
             // Make sure to load all members in the room before sending the event.
             params.event.roomId
                     ?.takeIf { params.encrypt }
@@ -78,6 +85,12 @@ internal class DefaultSendEventTask @Inject constructor(
         }
     }
 
+    private suspend fun createRoomAndSendEvent(params: SendEventTask.Params): String {
+        val roomId = createRoomFromLocalRoomTask.execute(CreateRoomFromLocalRoomTask.Params(params.event.roomId.orEmpty()))
+        Timber.d("State event: convert local room (${params.event.roomId}) to existing room ($roomId) before sending the event.")
+        return execute(params.copy(event = params.event.copy(roomId = roomId)))
+    }
+
     @Throws
     private suspend fun handleEncryption(params: SendEventTask.Params): Event {
         if (params.encrypt && !params.event.isEncrypted()) {
@@ -91,4 +104,7 @@ internal class DefaultSendEventTask @Inject constructor(
         }
         return params.event
     }
+
+    private val Event.isLocalRoomEvent
+        get() = RoomLocalEcho.isLocalEchoId(roomId.orEmpty())
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
index fc4d422360..a7e93202ef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
@@ -17,14 +17,22 @@
 package org.matrix.android.sdk.internal.crypto.tasks
 
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.internal.crypto.api.CryptoApi
 import org.matrix.android.sdk.internal.crypto.model.rest.SendToDeviceBody
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
+import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
 
+const val TO_DEVICE_TRACING_ID_KEY = "org.matrix.msgid"
+
+fun Event.toDeviceTracingId(): String? = content?.get(TO_DEVICE_TRACING_ID_KEY) as? String
+
 internal interface SendToDeviceTask : Task<SendToDeviceTask.Params, Unit> {
     data class Params(
             // the type of event to send
@@ -32,7 +40,9 @@ internal interface SendToDeviceTask : Task<SendToDeviceTask.Params, Unit> {
             // the content to send. Map from user_id to device_id to content dictionary.
             val contentMap: MXUsersDevicesMap<Any>,
             // the transactionId. If not provided, a transactionId will be created by the task
-            val transactionId: String? = null
+            val transactionId: String? = null,
+            // add tracing id, notice that to device events that do signature on content might be broken by it
+            val addTracingIds: Boolean = !EventType.isVerificationEvent(eventType),
     )
 }
 
@@ -42,15 +52,22 @@ internal class DefaultSendToDeviceTask @Inject constructor(
 ) : SendToDeviceTask {
 
     override suspend fun execute(params: SendToDeviceTask.Params) {
-        val sendToDeviceBody = SendToDeviceBody(
-                messages = params.contentMap.map
-        )
-
         // If params.transactionId is not provided, we create a unique txnId.
         // It's important to do that outside the requestBlock parameter of executeRequest()
         // to use the same value if the request is retried
         val txnId = params.transactionId ?: createUniqueTxnId()
 
+        // add id tracing to debug
+        val decorated = if (params.addTracingIds) {
+            decorateWithToDeviceTracingIds(params)
+        } else {
+            params.contentMap.map to emptyList()
+        }
+
+        val sendToDeviceBody = SendToDeviceBody(
+                messages = decorated.first
+        )
+
         return executeRequest(
                 globalErrorReceiver,
                 canRetry = true,
@@ -61,8 +78,35 @@ internal class DefaultSendToDeviceTask @Inject constructor(
                     transactionId = txnId,
                     body = sendToDeviceBody
             )
+            Timber.i("Sent to device type=${params.eventType} txnid=$txnId [${decorated.second.joinToString(",")}]")
         }
     }
+
+    /**
+     * To make it easier to track down where to-device messages are getting lost,
+     * add a custom property to each one, and that will be logged after sent and on reception. Synapse will also log
+     * this property.
+     * @return A pair, first is the decorated content, and second info to log out after sending
+     */
+    private fun decorateWithToDeviceTracingIds(params: SendToDeviceTask.Params): Pair<Map<String, Map<String, Any>>, List<String>> {
+        val tracingInfo = mutableListOf<String>()
+        val decoratedContent = params.contentMap.map.map { userToDeviceMap ->
+            val userId = userToDeviceMap.key
+            userId to userToDeviceMap.value.map {
+                val deviceId = it.key
+                deviceId to it.value.toContent().toMutableMap().apply {
+                    put(
+                            TO_DEVICE_TRACING_ID_KEY,
+                            UUID.randomUUID().toString().also {
+                                tracingInfo.add("$userId/$deviceId (msgid $it)")
+                            }
+                    )
+                }
+            }.toMap()
+        }.toMap()
+
+        return decoratedContent to tracingInfo
+    }
 }
 
 internal fun createUniqueTxnId() = UUID.randomUUID().toString()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
index 1a04ee0302..5b400aa63f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
@@ -1140,28 +1140,25 @@ internal class DefaultVerificationService @Inject constructor(
     override fun beginKeyVerification(method: VerificationMethod, otherUserId: String, otherDeviceId: String, transactionId: String?): String? {
         val txID = transactionId?.takeIf { it.isNotEmpty() } ?: createUniqueIDForTransaction(otherUserId, otherDeviceId)
         // should check if already one (and cancel it)
-        if (method == VerificationMethod.SAS) {
-            val tx = DefaultOutgoingSASDefaultVerificationTransaction(
-                    setDeviceVerificationAction,
-                    userId,
-                    deviceId,
-                    cryptoStore,
-                    crossSigningService,
-                    outgoingKeyRequestManager,
-                    secretShareManager,
-                    myDeviceInfoHolder.get().myDevice.fingerprint()!!,
-                    txID,
-                    otherUserId,
-                    otherDeviceId
-            )
-            tx.transport = verificationTransportToDeviceFactory.createTransport(tx)
-            addTransaction(tx)
+        require(method == VerificationMethod.SAS) { "Unknown verification method" }
+        val tx = DefaultOutgoingSASDefaultVerificationTransaction(
+                setDeviceVerificationAction,
+                userId,
+                deviceId,
+                cryptoStore,
+                crossSigningService,
+                outgoingKeyRequestManager,
+                secretShareManager,
+                myDeviceInfoHolder.get().myDevice.fingerprint()!!,
+                txID,
+                otherUserId,
+                otherDeviceId
+        )
+        tx.transport = verificationTransportToDeviceFactory.createTransport(tx)
+        addTransaction(tx)
 
-            tx.start()
-            return txID
-        } else {
-            throw IllegalArgumentException("Unknown verification method")
-        }
+        tx.start()
+        return txID
     }
 
     override fun requestKeyVerificationInDMs(
@@ -1343,28 +1340,25 @@ internal class DefaultVerificationService @Inject constructor(
             otherUserId: String,
             otherDeviceId: String
     ): String {
-        if (method == VerificationMethod.SAS) {
-            val tx = DefaultOutgoingSASDefaultVerificationTransaction(
-                    setDeviceVerificationAction,
-                    userId,
-                    deviceId,
-                    cryptoStore,
-                    crossSigningService,
-                    outgoingKeyRequestManager,
-                    secretShareManager,
-                    myDeviceInfoHolder.get().myDevice.fingerprint()!!,
-                    transactionId,
-                    otherUserId,
-                    otherDeviceId
-            )
-            tx.transport = verificationTransportRoomMessageFactory.createTransport(roomId, tx)
-            addTransaction(tx)
+        require(method == VerificationMethod.SAS) { "Unknown verification method" }
+        val tx = DefaultOutgoingSASDefaultVerificationTransaction(
+                setDeviceVerificationAction,
+                userId,
+                deviceId,
+                cryptoStore,
+                crossSigningService,
+                outgoingKeyRequestManager,
+                secretShareManager,
+                myDeviceInfoHolder.get().myDevice.fingerprint()!!,
+                transactionId,
+                otherUserId,
+                otherDeviceId
+        )
+        tx.transport = verificationTransportRoomMessageFactory.createTransport(roomId, tx)
+        addTransaction(tx)
 
-            tx.start()
-            return transactionId
-        } else {
-            throw IllegalArgumentException("Unknown verification method")
-        }
+        tx.start()
+        return transactionId
     }
 
     override fun readyPendingVerificationInDMs(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index 1cbaff059a..29b416bb82 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -82,6 +82,33 @@ internal abstract class SASDefaultVerificationTransaction(
         // older devices have limited support of emoji but SDK offers images for the 64 verification emojis
         // so always send that we support EMOJI
         val KNOWN_SHORT_CODES = listOf(SasMode.EMOJI, SasMode.DECIMAL)
+
+        /**
+         * decimal: generate five bytes by using HKDF.
+         * Take the first 13 bits and convert it to a decimal number (which will be a number between 0 and 8191 inclusive),
+         * and add 1000 (resulting in a number between 1000 and 9191 inclusive).
+         * Do the same with the second 13 bits, and the third 13 bits, giving three 4-digit numbers.
+         * In other words, if the five bytes are B0, B1, B2, B3, and B4, then the first number is (B0 << 5 | B1 >> 3) + 1000,
+         * the second number is ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000, and the third number is ((B3 & 0x3f) << 7 | B4 >> 1) + 1000.
+         * (This method of converting 13 bits at a time is used to avoid requiring 32-bit clients to do big-number arithmetic,
+         * and adding 1000 to the number avoids having clients to worry about properly zero-padding the number when displaying to the user.)
+         * The three 4-digit numbers are displayed to the user either with dashes (or another appropriate separator) separating the three numbers,
+         * or with the three numbers on separate lines.
+         */
+        fun getDecimalCodeRepresentation(byteArray: ByteArray, separator: String = " "): String {
+            val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
+            val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
+            val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
+            val b3 = byteArray[3].toUnsignedInt() // need unsigned byte
+            val b4 = byteArray[4].toUnsignedInt() // need unsigned byte
+            // (B0 << 5 | B1 >> 3) + 1000
+            val first = (b0.shl(5) or b1.shr(3)) + 1000
+            // ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
+            val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
+            // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
+            val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
+            return "$first$separator$second$separator$third"
+        }
     }
 
     override var state: VerificationTxState = VerificationTxState.None
@@ -371,33 +398,6 @@ internal abstract class SASDefaultVerificationTransaction(
         return getDecimalCodeRepresentation(shortCodeBytes!!)
     }
 
-    /**
-     * decimal: generate five bytes by using HKDF.
-     * Take the first 13 bits and convert it to a decimal number (which will be a number between 0 and 8191 inclusive),
-     * and add 1000 (resulting in a number between 1000 and 9191 inclusive).
-     * Do the same with the second 13 bits, and the third 13 bits, giving three 4-digit numbers.
-     * In other words, if the five bytes are B0, B1, B2, B3, and B4, then the first number is (B0 << 5 | B1 >> 3) + 1000,
-     * the second number is ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000, and the third number is ((B3 & 0x3f) << 7 | B4 >> 1) + 1000.
-     * (This method of converting 13 bits at a time is used to avoid requiring 32-bit clients to do big-number arithmetic,
-     * and adding 1000 to the number avoids having clients to worry about properly zero-padding the number when displaying to the user.)
-     * The three 4-digit numbers are displayed to the user either with dashes (or another appropriate separator) separating the three numbers,
-     * or with the three numbers on separate lines.
-     */
-    fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
-        val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
-        val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
-        val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
-        val b3 = byteArray[3].toUnsignedInt() // need unsigned byte
-        val b4 = byteArray[4].toUnsignedInt() // need unsigned byte
-        // (B0 << 5 | B1 >> 3) + 1000
-        val first = (b0.shl(5) or b1.shr(3)) + 1000
-        // ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
-        val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
-        // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
-        val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
-        return "$first $second $third"
-    }
-
     override fun getEmojiCodeRepresentation(): List<EmojiRepresentation> {
         return getEmojiCodeRepresentation(shortCodeBytes!!)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
index 861a7a3a77..23a75d2bb3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
@@ -76,12 +76,12 @@ internal class VerificationTransportToDevice(
                 .configureWith(SendToDeviceTask.Params(MessageType.MSGTYPE_VERIFICATION_REQUEST, contentMap)) {
                     this.callback = object : MatrixCallback<Unit> {
                         override fun onSuccess(data: Unit) {
-                            Timber.v("## verification [$tx.transactionId] send toDevice request success")
+                            Timber.v("## verification [${tx?.transactionId}] send toDevice request success")
                             callback.invoke(localId, validKeyReq)
                         }
 
                         override fun onFailure(failure: Throwable) {
-                            Timber.e("## verification [$tx.transactionId] failed to send toDevice request")
+                            Timber.e("## verification [${tx?.transactionId}] failed to send toDevice request")
                         }
                     }
                 }
@@ -103,12 +103,12 @@ internal class VerificationTransportToDevice(
                 .configureWith(SendToDeviceTask.Params(EventType.KEY_VERIFICATION_READY, contentMap)) {
                     this.callback = object : MatrixCallback<Unit> {
                         override fun onSuccess(data: Unit) {
-                            Timber.v("## verification [$tx.transactionId] send toDevice request success")
+                            Timber.v("## verification [${tx?.transactionId}] send toDevice request success")
                             callback?.invoke()
                         }
 
                         override fun onFailure(failure: Throwable) {
-                            Timber.e("## verification [$tx.transactionId] failed to send toDevice request")
+                            Timber.e("## verification [${tx?.transactionId}] failed to send toDevice request")
                         }
                     }
                 }
@@ -136,7 +136,7 @@ internal class VerificationTransportToDevice(
                 .configureWith(SendToDeviceTask.Params(type, contentMap)) {
                     this.callback = object : MatrixCallback<Unit> {
                         override fun onSuccess(data: Unit) {
-                            Timber.v("## SAS verification [$tx.transactionId] toDevice type '$type' success.")
+                            Timber.v("## SAS verification [${tx.transactionId}] toDevice type '$type' success.")
                             if (onDone != null) {
                                 onDone()
                             } else {
@@ -149,7 +149,7 @@ internal class VerificationTransportToDevice(
                         }
 
                         override fun onFailure(failure: Throwable) {
-                            Timber.e("## SAS verification [$tx.transactionId] failed to send toDevice in state : $tx.state")
+                            Timber.e("## SAS verification [${tx.transactionId}] failed to send toDevice in state : ${tx.state}")
                             tx.cancel(onErrorReason)
                         }
                     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
index 7d263f1937..a1ea88a70c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
@@ -26,17 +26,17 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 import kotlin.system.measureTimeMillis
 
-internal fun <T> CoroutineScope.asyncTransaction(monarchy: Monarchy, transaction: suspend (realm: Realm) -> T) {
+internal fun <T> CoroutineScope.asyncTransaction(monarchy: Monarchy, transaction: (realm: Realm) -> T) {
     asyncTransaction(monarchy.realmConfiguration, transaction)
 }
 
-internal fun <T> CoroutineScope.asyncTransaction(realmConfiguration: RealmConfiguration, transaction: suspend (realm: Realm) -> T) {
+internal fun <T> CoroutineScope.asyncTransaction(realmConfiguration: RealmConfiguration, transaction: (realm: Realm) -> T) {
     launch {
         awaitTransaction(realmConfiguration, transaction)
     }
 }
 
-internal suspend fun <T> awaitTransaction(config: RealmConfiguration, transaction: suspend (realm: Realm) -> T): T {
+internal suspend fun <T> awaitTransaction(config: RealmConfiguration, transaction: (realm: Realm) -> T): T {
     return withContext(Realm.WRITE_EXECUTOR.asCoroutineDispatcher()) {
         Realm.getInstance(config).use { bgRealm ->
             bgRealm.beginTransaction()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmCompactOnLaunch.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmCompactOnLaunch.kt
new file mode 100644
index 0000000000..1efb2541a7
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmCompactOnLaunch.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database
+
+import io.realm.DefaultCompactOnLaunchCallback
+
+class RealmCompactOnLaunch : DefaultCompactOnLaunchCallback() {
+    /**
+     * Forces all RealmCompactOnLaunch instances to be equal.
+     * Avoids Realm throwing when multiple instances of this class are used.
+     */
+    override fun equals(other: Any?) = other is RealmCompactOnLaunch
+    override fun hashCode() = 0x1000
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
index f2f88e216b..020b42b3b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
@@ -38,7 +38,7 @@ internal abstract class RealmLiveEntityObserver<T : RealmObject>(protected val r
         LiveEntityObserver, RealmChangeListener<RealmResults<T>> {
 
     private companion object {
-        val BACKGROUND_HANDLER = createBackgroundHandler("LIVE_ENTITY_BACKGROUND")
+        val BACKGROUND_HANDLER = createBackgroundHandler("Matrix-LIVE_ENTITY_BACKGROUND")
     }
 
     protected val observerScope = CoroutineScope(SupervisorJob() + BACKGROUND_HANDLER.asCoroutineDispatcher())
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index b733aa6fc0..ba102a7a48 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -52,6 +52,18 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo032
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo033
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo034
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo035
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo036
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo037
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo038
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo039
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo040
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo041
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo042
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo043
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo044
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo045
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo046
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo047
 import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import javax.inject.Inject
@@ -60,7 +72,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
         private val normalizer: Normalizer
 ) : MatrixRealmMigration(
         dbName = "Session",
-        schemaVersion = 35L,
+        schemaVersion = 47L,
 ) {
     /**
      * Forces all RealmSessionStoreMigration instances to be equal.
@@ -105,5 +117,17 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion < 33) MigrateSessionTo033(realm).perform()
         if (oldVersion < 34) MigrateSessionTo034(realm).perform()
         if (oldVersion < 35) MigrateSessionTo035(realm).perform()
+        if (oldVersion < 36) MigrateSessionTo036(realm).perform()
+        if (oldVersion < 37) MigrateSessionTo037(realm).perform()
+        if (oldVersion < 38) MigrateSessionTo038(realm).perform()
+        if (oldVersion < 39) MigrateSessionTo039(realm).perform()
+        if (oldVersion < 40) MigrateSessionTo040(realm).perform()
+        if (oldVersion < 41) MigrateSessionTo041(realm).perform()
+        if (oldVersion < 42) MigrateSessionTo042(realm).perform()
+        if (oldVersion < 43) MigrateSessionTo043(realm).perform()
+        if (oldVersion < 44) MigrateSessionTo044(realm).perform()
+        if (oldVersion < 45) MigrateSessionTo045(realm).perform()
+        if (oldVersion < 46) MigrateSessionTo046(realm).perform()
+        if (oldVersion < 47) MigrateSessionTo047(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 949dd5daa1..16a55c22ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -64,7 +64,7 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
         }
 
         val realmConfiguration = RealmConfiguration.Builder()
-                .compactOnLaunch()
+                .compactOnLaunch(RealmCompactOnLaunch())
                 .directory(directory)
                 .name(REALM_NAME)
                 .apply {
@@ -93,7 +93,7 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
             return
         }
 
-        listOf(REALM_NAME, "$REALM_NAME.lock", "$REALM_NAME.note", "$REALM_NAME.management").forEach { file ->
+        listOf(REALM_NAME, "${REALM_NAME}.lock", "${REALM_NAME}.note", "${REALM_NAME}.management").forEach { file ->
             try {
                 File(directory, file).deleteRecursively()
             } catch (e: Exception) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
index 221abe0df5..43f84e771a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
@@ -83,7 +83,6 @@ internal fun ChunkEntity.addTimelineEvent(
         this.eventId = eventId
         this.roomId = roomId
         this.annotations = EventAnnotationsSummaryEntity.where(realm, roomId, eventId).findFirst()
-                ?.also { it.cleanUp(eventEntity.sender) }
         this.readReceipts = readReceiptsSummaryEntity
         this.displayIndex = displayIndex
         this.ownedByThreadChunk = ownedByThreadChunk
@@ -133,7 +132,7 @@ private fun handleReadReceipts(realm: Realm, roomId: String, eventEntity: EventE
     val originServerTs = eventEntity.originServerTs
     if (originServerTs != null) {
         val timestampOfEvent = originServerTs.toDouble()
-        val readReceiptOfSender = ReadReceiptEntity.getOrCreate(realm, roomId = roomId, userId = senderId)
+        val readReceiptOfSender = ReadReceiptEntity.getOrCreate(realm, roomId = roomId, userId = senderId, threadId = eventEntity.rootThreadEventId)
         // If the synced RR is older, update
         if (timestampOfEvent > readReceiptOfSender.originServerTs) {
             val previousReceiptsSummary = ReadReceiptsSummaryEntity.where(realm, eventId = readReceiptOfSender.eventId).findFirst()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
index dfac7f6708..7999a2ea14 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
@@ -65,11 +65,11 @@ internal fun Map<String, EventEntity>.updateThreadSummaryIfNeeded(
                     inThreadMessages = inThreadMessages,
                     latestMessageTimelineEventEntity = latestEventInThread
             )
-        }
-    }
 
-    if (shouldUpdateNotifications) {
-        updateNotificationsNew(roomId, realm, currentUserId)
+            if (shouldUpdateNotifications) {
+                updateThreadNotifications(roomId, realm, currentUserId, rootThreadEventId)
+            }
+        }
     }
 }
 
@@ -273,8 +273,8 @@ internal fun TimelineEventEntity.Companion.isUserMentionedInThread(realm: Realm,
 /**
  * Find the read receipt for the current user.
  */
-internal fun findMyReadReceipt(realm: Realm, roomId: String, userId: String): String? =
-        ReadReceiptEntity.where(realm, roomId = roomId, userId = userId)
+internal fun findMyReadReceipt(realm: Realm, roomId: String, userId: String, threadId: String?): String? =
+        ReadReceiptEntity.where(realm, roomId = roomId, userId = userId, threadId = threadId)
                 .findFirst()
                 ?.eventId
 
@@ -293,28 +293,29 @@ internal fun isUserMentioned(currentUserId: String, timelineEventEntity: Timelin
  * Important: It will work only with the latest chunk, while read marker will be changed
  * immediately so we should not display wrong notifications
  */
-internal fun updateNotificationsNew(roomId: String, realm: Realm, currentUserId: String) {
-    val readReceipt = findMyReadReceipt(realm, roomId, currentUserId) ?: return
+internal fun updateThreadNotifications(roomId: String, realm: Realm, currentUserId: String, rootThreadEventId: String) {
+    val readReceipt = findMyReadReceipt(realm, roomId, currentUserId, threadId = rootThreadEventId) ?: return
 
     val readReceiptChunk = ChunkEntity
             .findIncludingEvent(realm, readReceipt) ?: return
 
-    val readReceiptChunkTimelineEvents = readReceiptChunk
+    val readReceiptChunkThreadEvents = readReceiptChunk
             .timelineEvents
             .where()
             .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
+            .equalTo(TimelineEventEntityFields.ROOT.ROOT_THREAD_EVENT_ID, rootThreadEventId)
             .sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.ASCENDING)
             .findAll() ?: return
 
-    val readReceiptChunkPosition = readReceiptChunkTimelineEvents.indexOfFirst { it.eventId == readReceipt }
+    val readReceiptChunkPosition = readReceiptChunkThreadEvents.indexOfFirst { it.eventId == readReceipt }
 
     if (readReceiptChunkPosition == -1) return
 
-    if (readReceiptChunkPosition < readReceiptChunkTimelineEvents.lastIndex) {
+    if (readReceiptChunkPosition < readReceiptChunkThreadEvents.lastIndex) {
         // If the read receipt is found inside the chunk
 
-        val threadEventsAfterReadReceipt = readReceiptChunkTimelineEvents
-                .slice(readReceiptChunkPosition..readReceiptChunkTimelineEvents.lastIndex)
+        val threadEventsAfterReadReceipt = readReceiptChunkThreadEvents
+                .slice(readReceiptChunkPosition..readReceiptChunkThreadEvents.lastIndex)
                 .filter { it.root?.isThread() == true }
 
         // In order for the below code to work for old events, we should save the previous read receipt
@@ -343,26 +344,21 @@ internal fun updateNotificationsNew(roomId: String, realm: Realm, currentUserId:
                     it.root?.rootThreadEventId
                 }
 
-        // Find the root events in the new thread events
-        val rootThreads = threadEventsAfterReadReceipt.distinctBy { it.root?.rootThreadEventId }.mapNotNull { it.root?.rootThreadEventId }
+        // Update root thread event only if the user have participated in
+        val isUserParticipating = TimelineEventEntity.isUserParticipatingInThread(
+                realm = realm,
+                roomId = roomId,
+                rootThreadEventId = rootThreadEventId,
+                senderId = currentUserId
+        )
+        val rootThreadEventEntity = EventEntity.where(realm, rootThreadEventId).findFirst()
 
-        // Update root thread events only if the user have participated in
-        rootThreads.forEach { eventId ->
-            val isUserParticipating = TimelineEventEntity.isUserParticipatingInThread(
-                    realm = realm,
-                    roomId = roomId,
-                    rootThreadEventId = eventId,
-                    senderId = currentUserId
-            )
-            val rootThreadEventEntity = EventEntity.where(realm, eventId).findFirst()
+        if (isUserParticipating) {
+            rootThreadEventEntity?.threadNotificationState = ThreadNotificationState.NEW_MESSAGE
+        }
 
-            if (isUserParticipating) {
-                rootThreadEventEntity?.threadNotificationState = ThreadNotificationState.NEW_MESSAGE
-            }
-
-            if (userMentionsList.contains(eventId)) {
-                rootThreadEventEntity?.threadNotificationState = ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
-            }
+        if (userMentionsList.contains(rootThreadEventId)) {
+            rootThreadEventEntity?.threadNotificationState = ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
index 0a6d4bf833..908c710df4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.database.helper
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.Sort
-import io.realm.kotlin.createObject
 import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
@@ -38,9 +37,11 @@ import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.EventInsertType
 import org.matrix.android.sdk.internal.database.model.RoomEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.threads.ThreadListPageEntity
 import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntity
 import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntityFields
 import org.matrix.android.sdk.internal.database.query.copyToRealmOrIgnore
+import org.matrix.android.sdk.internal.database.query.get
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.getOrNull
 import org.matrix.android.sdk.internal.database.query.where
@@ -103,32 +104,6 @@ internal fun ThreadSummaryEntity.updateThreadSummaryLatestEvent(
     }
 }
 
-private fun EventEntity.toTimelineEventEntity(roomMemberContentsByUser: HashMap<String, RoomMemberContent?>): TimelineEventEntity {
-    val roomId = roomId
-    val eventId = eventId
-    val localId = TimelineEventEntity.nextId(realm)
-    val senderId = sender ?: ""
-
-    val timelineEventEntity = realm.createObject<TimelineEventEntity>().apply {
-        this.localId = localId
-        this.root = this@toTimelineEventEntity
-        this.eventId = eventId
-        this.roomId = roomId
-        this.annotations = EventAnnotationsSummaryEntity.where(realm, roomId, eventId).findFirst()
-                ?.also { it.cleanUp(sender) }
-        this.ownedByThreadChunk = true  // To skip it from the original event flow
-        val roomMemberContent = roomMemberContentsByUser[senderId]
-        this.senderAvatar = roomMemberContent?.avatarUrl
-        this.senderName = roomMemberContent?.displayName
-        isUniqueDisplayName = if (roomMemberContent?.displayName != null) {
-            computeIsUnique(realm, roomId, false, roomMemberContent, roomMemberContentsByUser)
-        } else {
-            true
-        }
-    }
-    return timelineEventEntity
-}
-
 internal fun ThreadSummaryEntity.Companion.createOrUpdate(
         threadSummaryType: ThreadSummaryUpdateType,
         realm: Realm,
@@ -140,16 +115,16 @@ internal fun ThreadSummaryEntity.Companion.createOrUpdate(
         userId: String,
         cryptoService: CryptoService? = null,
         currentTimeMillis: Long,
-) {
+): ThreadSummaryEntity? {
     when (threadSummaryType) {
         ThreadSummaryUpdateType.REPLACE -> {
-            rootThreadEvent?.eventId ?: return
-            rootThreadEvent.senderId ?: return
+            rootThreadEvent?.eventId ?: return null
+            rootThreadEvent.senderId ?: return null
 
-            val numberOfThreads = rootThreadEvent.unsignedData?.relations?.latestThread?.count ?: return
+            val numberOfThreads = rootThreadEvent.unsignedData?.relations?.latestThread?.count ?: return null
 
             // Something is wrong with the server return
-            if (numberOfThreads <= 0) return
+            if (numberOfThreads <= 0) return null
 
             val threadSummary = ThreadSummaryEntity.getOrCreate(realm, roomId, rootThreadEvent.eventId).also {
                 Timber.i("###THREADS ThreadSummaryHelper REPLACE eventId:${it.rootThreadEventId} ")
@@ -180,12 +155,13 @@ internal fun ThreadSummaryEntity.Companion.createOrUpdate(
             )
 
             roomEntity.addIfNecessary(threadSummary)
+            return threadSummary
         }
         ThreadSummaryUpdateType.ADD -> {
-            val rootThreadEventId = threadEventEntity?.rootThreadEventId ?: return
+            val rootThreadEventId = threadEventEntity?.rootThreadEventId ?: return null
             Timber.i("###THREADS ThreadSummaryHelper ADD for root eventId:$rootThreadEventId")
 
-            val threadSummary = ThreadSummaryEntity.getOrNull(realm, roomId, rootThreadEventId)
+            var threadSummary = ThreadSummaryEntity.getOrNull(realm, roomId, rootThreadEventId)
             if (threadSummary != null) {
                 // ThreadSummary exists so lets add the latest event
                 Timber.i("###THREADS ThreadSummaryHelper ADD root eventId:$rootThreadEventId exists, lets update latest thread event.")
@@ -199,7 +175,7 @@ internal fun ThreadSummaryEntity.Companion.createOrUpdate(
                 Timber.i("###THREADS ThreadSummaryHelper ADD root eventId:$rootThreadEventId do not exists, lets try to create one")
                 threadEventEntity.findRootThreadEvent()?.let { rootThreadEventEntity ->
                     // Root thread event entity exists so lets create a new record
-                    ThreadSummaryEntity.getOrCreate(realm, roomId, rootThreadEventEntity.eventId).let {
+                    threadSummary = ThreadSummaryEntity.getOrCreate(realm, roomId, rootThreadEventEntity.eventId).also {
                         it.updateThreadSummary(
                                 rootThreadEventEntity = rootThreadEventEntity,
                                 numberOfThreads = 1,
@@ -210,7 +186,12 @@ internal fun ThreadSummaryEntity.Companion.createOrUpdate(
                         roomEntity.addIfNecessary(it)
                     }
                 }
+
+                threadSummary?.let {
+                    ThreadListPageEntity.get(realm, roomId)?.threadSummaries?.add(it)
+                }
             }
+            return threadSummary
         }
     }
 }
@@ -228,7 +209,8 @@ private fun decryptIfNeeded(cryptoService: CryptoService?, eventEntity: EventEnt
                     payload = result.clearEvent,
                     senderKey = result.senderCurve25519Key,
                     keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
-                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
+                    isSafe = result.isSafe
             )
             // Save decryption result, to not decrypt every time we enter the thread list
             eventEntity.setDecryptionResult(result)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EditAggregatedSummaryEntityMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EditAggregatedSummaryEntityMapper.kt
new file mode 100644
index 0000000000..8c209f2f2a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EditAggregatedSummaryEntityMapper.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package org.matrix.android.sdk.internal.database.mapper
+
+import org.matrix.android.sdk.api.session.room.model.EditAggregatedSummary
+import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EditionOfEvent
+
+internal object EditAggregatedSummaryEntityMapper {
+
+    fun map(summary: EditAggregatedSummaryEntity?): EditAggregatedSummary? {
+        summary ?: return null
+        /**
+         * The most recent event is determined by comparing origin_server_ts;
+         * if two or more replacement events have identical origin_server_ts,
+         * the event with the lexicographically largest event_id is treated as more recent.
+         */
+        val latestEdition = summary.editions.sortedWith(compareBy<EditionOfEvent> { it.timestamp }.thenBy { it.eventId })
+                .lastOrNull() ?: return null
+        val editEvent = latestEdition.event
+
+        return EditAggregatedSummary(
+                latestEdit = editEvent?.asDomain(),
+                sourceEvents = summary.editions.filter { editionOfEvent -> !editionOfEvent.isLocalEcho }
+                        .map { editionOfEvent -> editionOfEvent.eventId },
+                localEchos = summary.editions.filter { editionOfEvent -> editionOfEvent.isLocalEcho }
+                        .map { editionOfEvent -> editionOfEvent.eventId },
+                lastEditTs = latestEdition.timestamp
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
index 6bbeb17fdd..d4bb5791a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.database.mapper
 
-import org.matrix.android.sdk.api.session.room.model.EditAggregatedSummary
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
 import org.matrix.android.sdk.api.session.room.model.ReactionAggregatedSummary
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedSummary
@@ -35,18 +34,7 @@ internal object EventAnnotationsSummaryMapper {
                             it.sourceLocalEcho.toList()
                     )
                 },
-                editSummary = annotationsSummary.editSummary
-                        ?.let {
-                            val latestEdition = it.editions.maxByOrNull { editionOfEvent -> editionOfEvent.timestamp } ?: return@let null
-                            EditAggregatedSummary(
-                                    latestContent = ContentMapper.map(latestEdition.content),
-                                    sourceEvents = it.editions.filter { editionOfEvent -> !editionOfEvent.isLocalEcho }
-                                            .map { editionOfEvent -> editionOfEvent.eventId },
-                                    localEchos = it.editions.filter { editionOfEvent -> editionOfEvent.isLocalEcho }
-                                            .map { editionOfEvent -> editionOfEvent.eventId },
-                                    lastEditTs = latestEdition.timestamp
-                            )
-                        },
+                editSummary = EditAggregatedSummaryEntityMapper.map(annotationsSummary.editSummary),
                 referencesAggregatedSummary = annotationsSummary.referencesSummaryEntity?.let {
                     ReferencesAggregatedSummary(
                             ContentMapper.map(it.content),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
index 184a0108b9..89657ad882 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
@@ -43,7 +43,10 @@ internal object HomeServerCapabilitiesMapper {
                 defaultIdentityServerUrl = entity.defaultIdentityServerUrl,
                 roomVersions = mapRoomVersion(entity.roomVersionsJson),
                 canUseThreading = entity.canUseThreading,
-                canControlLogoutDevices = entity.canControlLogoutDevices
+                canControlLogoutDevices = entity.canControlLogoutDevices,
+                canLoginWithQrCode = entity.canLoginWithQrCode,
+                canUseThreadReadReceiptsAndNotifications = entity.canUseThreadReadReceiptsAndNotifications,
+                canRemotelyTogglePushNotificationsOfDevices = entity.canRemotelyTogglePushNotificationsOfDevices,
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LocalRoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LocalRoomSummaryMapper.kt
new file mode 100644
index 0000000000..09cb5985f3
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LocalRoomSummaryMapper.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.mapper
+
+import org.matrix.android.sdk.api.session.room.model.LocalRoomSummary
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntity
+import javax.inject.Inject
+
+internal class LocalRoomSummaryMapper @Inject constructor(
+        private val roomSummaryMapper: RoomSummaryMapper,
+) {
+
+    fun map(localRoomSummaryEntity: LocalRoomSummaryEntity): LocalRoomSummary {
+        return LocalRoomSummary(
+                roomId = localRoomSummaryEntity.roomId,
+                roomSummary = localRoomSummaryEntity.roomSummaryEntity?.let { roomSummaryMapper.map(it) },
+                createRoomParams = localRoomSummaryEntity.createRoomParams,
+                replacementRoomId = localRoomSummaryEntity.replacementRoomId,
+                creationState = localRoomSummaryEntity.creationState
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt
index 2dba2c228b..c3a37f5b95 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt
@@ -33,7 +33,9 @@ internal object PushersMapper {
                 profileTag = pushEntity.profileTag,
                 lang = pushEntity.lang,
                 data = PusherData(pushEntity.data?.url, pushEntity.data?.format),
-                state = pushEntity.state
+                enabled = pushEntity.enabled,
+                deviceId = pushEntity.deviceId,
+                state = pushEntity.state,
         )
     }
 
@@ -46,7 +48,9 @@ internal object PushersMapper {
                 deviceDisplayName = pusher.deviceDisplayName,
                 profileTag = pusher.profileTag,
                 lang = pusher.lang,
-                data = PusherDataEntity(pusher.data?.url, pusher.data?.format)
+                data = PusherDataEntity(pusher.data?.url, pusher.data?.format),
+                enabled = pusher.enabled,
+                deviceId = pusher.deviceId,
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt
index 2be4510b6f..3b71ae3dea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt
@@ -50,7 +50,7 @@ internal class ReadReceiptsSummaryMapper @Inject constructor(
                 .mapNotNull {
                     val roomMember = RoomMemberSummaryEntity.where(realm, roomId = it.roomId, userId = it.userId).findFirst()
                             ?: return@mapNotNull null
-                    ReadReceipt(roomMember.asDomain(), it.originServerTs.toLong())
+                    ReadReceipt(roomMember.asDomain(), it.originServerTs.toLong(), it.threadId)
                 }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 72b0f7a043..6e9fff78e1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -61,6 +61,8 @@ internal class RoomSummaryMapper @Inject constructor(
                 otherMemberIds = roomSummaryEntity.otherMemberIds.toList(),
                 highlightCount = roomSummaryEntity.highlightCount,
                 notificationCount = roomSummaryEntity.notificationCount,
+                threadHighlightCount = roomSummaryEntity.threadHighlightCount,
+                threadNotificationCount = roomSummaryEntity.threadNotificationCount,
                 hasUnreadMessages = roomSummaryEntity.hasUnreadMessages,
                 tags = tags,
                 typingUsers = typingUsers,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo008.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo008.kt
index b61bf7e6fa..f85a0661c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo008.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo008.kt
@@ -25,11 +25,11 @@ internal class MigrateSessionTo008(realm: DynamicRealm) : RealmMigrator(realm, 8
 
     override fun doMigrate(realm: DynamicRealm) {
         val editionOfEventSchema = realm.schema.create("EditionOfEvent")
-                .addField(EditionOfEventFields.CONTENT, String::class.java)
+                .addField("content", String::class.java)
                 .addField(EditionOfEventFields.EVENT_ID, String::class.java)
                 .setRequired(EditionOfEventFields.EVENT_ID, true)
-                .addField(EditionOfEventFields.SENDER_ID, String::class.java)
-                .setRequired(EditionOfEventFields.SENDER_ID, true)
+                .addField("senderId", String::class.java)
+                .setRequired("senderId", true)
                 .addField(EditionOfEventFields.TIMESTAMP, Long::class.java)
                 .addField(EditionOfEventFields.IS_LOCAL_ECHO, Boolean::class.java)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo036.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo036.kt
new file mode 100644
index 0000000000..efcb181ecb
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo036.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo036(realm: DynamicRealm) : RealmMigrator(realm, 36) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("LocalRoomSummaryEntity")
+                .addField(LocalRoomSummaryEntityFields.ROOM_ID, String::class.java)
+                .addPrimaryKey(LocalRoomSummaryEntityFields.ROOM_ID)
+                .setRequired(LocalRoomSummaryEntityFields.ROOM_ID, true)
+                .addField(LocalRoomSummaryEntityFields.CREATE_ROOM_PARAMS_STR, String::class.java)
+                .addRealmObjectField(LocalRoomSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo037.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo037.kt
new file mode 100644
index 0000000000..cdb0b6c682
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo037.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.api.session.room.model.LocalRoomCreationState
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo037(realm: DynamicRealm) : RealmMigrator(realm, 37) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("LocalRoomSummaryEntity")
+                ?.addField(LocalRoomSummaryEntityFields.REPLACEMENT_ROOM_ID, String::class.java)
+                ?.addField(LocalRoomSummaryEntityFields.STATE_STR, String::class.java)
+                ?.transform { obj ->
+                    obj.set(LocalRoomSummaryEntityFields.STATE_STR, LocalRoomCreationState.NOT_CREATED.name)
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
new file mode 100644
index 0000000000..b5848f04cd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.PusherEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo038(realm: DynamicRealm) : RealmMigrator(realm, 38) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("PusherEntity")
+                ?.addField(PusherEntityFields.ENABLED, Boolean::class.java)
+                ?.addField(PusherEntityFields.DEVICE_ID, String::class.java)
+                ?.transform { obj -> obj.set(PusherEntityFields.ENABLED, true) }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo039.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo039.kt
new file mode 100644
index 0000000000..190a71c9be
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo039.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo039(realm: DynamicRealm) : RealmMigrator(realm, 39) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_LOGIN_WITH_QR_CODE, Boolean::class.java)
+                ?.transform { obj ->
+                    obj.set(HomeServerCapabilitiesEntityFields.CAN_LOGIN_WITH_QR_CODE, false)
+                }
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.kt
new file mode 100644
index 0000000000..b3e02342dd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo040(realm: DynamicRealm) : RealmMigrator(realm, 40) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_USE_THREAD_READ_RECEIPTS_AND_NOTIFICATIONS, Boolean::class.java)
+                ?.transform { obj ->
+                    obj.set(HomeServerCapabilitiesEntityFields.CAN_USE_THREAD_READ_RECEIPTS_AND_NOTIFICATIONS, false)
+                }
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo041.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo041.kt
new file mode 100644
index 0000000000..b58d80e50a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo041.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo041(realm: DynamicRealm) : RealmMigrator(realm, 41) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.THREAD_HIGHLIGHT_COUNT, Int::class.java)
+                ?.addField(RoomSummaryEntityFields.THREAD_NOTIFICATION_COUNT, Int::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo042.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo042.kt
new file mode 100644
index 0000000000..8826d894c1
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo042.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo042(realm: DynamicRealm) : RealmMigrator(realm, 42) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_REMOTELY_TOGGLE_PUSH_NOTIFICATIONS_OF_DEVICES, Boolean::class.java)
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo043.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo043.kt
new file mode 100644
index 0000000000..49e9bac18c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo043.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.EditionOfEventFields
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo043(realm: DynamicRealm) : RealmMigrator(realm, 43) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        // content(string) & senderId(string) have been removed and replaced by a link to the actual event
+        realm.schema.get("EditionOfEvent")
+                ?.addRealmObjectField(EditionOfEventFields.EVENT.`$`, realm.schema.get("EventEntity")!!)
+                ?.transform { dynamicObject ->
+                    realm.where("EventEntity")
+                            .equalTo(EventEntityFields.EVENT_ID, dynamicObject.getString(EditionOfEventFields.EVENT_ID))
+                            .equalTo(EventEntityFields.SENDER, dynamicObject.getString("senderId"))
+                            .findFirst()
+                            .let {
+                                dynamicObject.setObject(EditionOfEventFields.EVENT.`$`, it)
+                            }
+                }
+                ?.removeField("senderId")
+                ?.removeField("content")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo044.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo044.kt
new file mode 100644
index 0000000000..2d3efc8338
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo044.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.ReadReceiptEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo044(realm: DynamicRealm) : RealmMigrator(realm, 44) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("ReadReceiptEntity")
+                ?.addField(ReadReceiptEntityFields.THREAD_ID, String::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo045.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo045.kt
new file mode 100644
index 0000000000..d2b43ded28
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo045.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.SyncFilterParamsEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo045(realm: DynamicRealm) : RealmMigrator(realm, 45) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("SyncFilterParamsEntity")
+                .addField(SyncFilterParamsEntityFields.LAZY_LOAD_MEMBERS_FOR_STATE_EVENTS, Boolean::class.java)
+                .setNullable(SyncFilterParamsEntityFields.LAZY_LOAD_MEMBERS_FOR_STATE_EVENTS, true)
+                .addField(SyncFilterParamsEntityFields.LAZY_LOAD_MEMBERS_FOR_MESSAGE_EVENTS, Boolean::class.java)
+                .setNullable(SyncFilterParamsEntityFields.LAZY_LOAD_MEMBERS_FOR_MESSAGE_EVENTS, true)
+                .addField(SyncFilterParamsEntityFields.LIST_OF_SUPPORTED_EVENT_TYPES_HAS_BEEN_SET, Boolean::class.java)
+                .addField(SyncFilterParamsEntityFields.LIST_OF_SUPPORTED_STATE_EVENT_TYPES_HAS_BEEN_SET, Boolean::class.java)
+                .addField(SyncFilterParamsEntityFields.USE_THREAD_NOTIFICATIONS, Boolean::class.java)
+                .setNullable(SyncFilterParamsEntityFields.USE_THREAD_NOTIFICATIONS, true)
+                .addRealmListField(SyncFilterParamsEntityFields.LIST_OF_SUPPORTED_EVENT_TYPES.`$`, String::class.java)
+                .addRealmListField(SyncFilterParamsEntityFields.LIST_OF_SUPPORTED_STATE_EVENT_TYPES.`$`, String::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo046.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo046.kt
new file mode 100644
index 0000000000..4b1d2059a4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo046.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.threads.ThreadListPageEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo046(realm: DynamicRealm) : RealmMigrator(realm, 46) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("ThreadListPageEntity")
+                .addField(ThreadListPageEntityFields.ROOM_ID, String::class.java)
+                .addPrimaryKey(ThreadListPageEntityFields.ROOM_ID)
+                .setRequired(ThreadListPageEntityFields.ROOM_ID, true)
+                .addRealmListField(ThreadListPageEntityFields.THREAD_SUMMARIES.`$`, realm.schema.get("ThreadSummaryEntity")!!)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo047.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo047.kt
new file mode 100644
index 0000000000..5bfaaa760c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo047.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo047(realm: DynamicRealm) : RealmMigrator(realm, 47) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.remove("SyncFilterParamsEntity")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
index 61acd51dd4..7b7b90f82d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
@@ -32,9 +32,8 @@ internal open class EditAggregatedSummaryEntity(
 
 @RealmClass(embedded = true)
 internal open class EditionOfEvent(
-        var senderId: String = "",
         var eventId: String = "",
-        var content: String? = null,
         var timestamp: Long = 0,
-        var isLocalEcho: Boolean = false
+        var isLocalEcho: Boolean = false,
+        var event: EventEntity? = null,
 ) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
index 645998d0c0..9a201ab4e8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
@@ -19,7 +19,6 @@ import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
-import timber.log.Timber
 
 internal open class EventAnnotationsSummaryEntity(
         @PrimaryKey
@@ -32,21 +31,6 @@ internal open class EventAnnotationsSummaryEntity(
         var liveLocationShareAggregatedSummary: LiveLocationShareAggregatedSummaryEntity? = null,
 ) : RealmObject() {
 
-    /**
-     * Cleanup undesired editions, done by users different from the originalEventSender.
-     */
-    fun cleanUp(originalEventSenderId: String?) {
-        originalEventSenderId ?: return
-
-        editSummary?.editions?.filter {
-            it.senderId != originalEventSenderId
-        }
-                ?.forEach {
-                    Timber.w("Deleting an edition from ${it.senderId} of event sent by $originalEventSenderId")
-                    it.deleteFromRealm()
-                }
-    }
-
     companion object
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
index 8b5a211fba..ee5c3d90c1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
@@ -87,7 +87,8 @@ internal open class EventEntity(
                 payload = result.clearEvent,
                 senderKey = result.senderCurve25519Key,
                 keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
-                forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
+                isSafe = result.isSafe
         )
         val adapter = MoshiProvider.providesMoshi().adapter(OlmDecryptionResult::class.java)
         decryptionResultJson = adapter.toJson(decryptionResult)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
index 9d90973f8a..2b60f7723c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
@@ -30,7 +30,10 @@ internal open class HomeServerCapabilitiesEntity(
         var defaultIdentityServerUrl: String? = null,
         var lastUpdatedTimestamp: Long = 0L,
         var canUseThreading: Boolean = false,
-        var canControlLogoutDevices: Boolean = false
+        var canControlLogoutDevices: Boolean = false,
+        var canLoginWithQrCode: Boolean = false,
+        var canUseThreadReadReceiptsAndNotifications: Boolean = false,
+        var canRemotelyTogglePushNotificationsOfDevices: Boolean = false,
 ) : RealmObject() {
 
     companion object
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/LocalRoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/LocalRoomSummaryEntity.kt
new file mode 100644
index 0000000000..a978e3719d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/LocalRoomSummaryEntity.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+import org.matrix.android.sdk.api.session.room.model.LocalRoomCreationState
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.room.model.create.toJSONString
+
+internal open class LocalRoomSummaryEntity(
+        @PrimaryKey var roomId: String = "",
+        var roomSummaryEntity: RoomSummaryEntity? = null,
+        var replacementRoomId: String? = null,
+) : RealmObject() {
+
+    private var stateStr: String = LocalRoomCreationState.NOT_CREATED.name
+    var creationState: LocalRoomCreationState
+        get() = LocalRoomCreationState.valueOf(stateStr)
+        set(value) {
+            stateStr = value.name
+        }
+
+    private var createRoomParamsStr: String? = null
+    var createRoomParams: CreateRoomParams?
+        get() {
+            return CreateRoomParams.fromJson(createRoomParamsStr)
+        }
+        set(value) {
+            createRoomParamsStr = value?.toJSONString()
+        }
+
+    companion object
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt
index af8e4f2d37..c08f695168 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt
@@ -18,15 +18,6 @@ package org.matrix.android.sdk.internal.database.model
 import io.realm.RealmObject
 import org.matrix.android.sdk.api.session.pushers.PusherState
 
-// TODO
-//        at java.lang.Thread.run(Thread.java:764)
-//     Caused by: java.lang.IllegalArgumentException: 'value' is not a valid managed object.
-//        at io.realm.ProxyState.checkValidObject(ProxyState.java:213)
-//        at io.realm.im_vector_matrix_android_internal_database_model_PusherEntityRealmProxy
-//            .realmSet$data(im_vector_matrix_android_internal_database_model_PusherEntityRealmProxy.java:413)
-//        at org.matrix.android.sdk.internal.database.model.PusherEntity.setData(PusherEntity.kt:16)
-//        at org.matrix.android.sdk.internal.session.pushers.AddHttpPusherWorker$doWork$$inlined$fold$lambda$2.execute(AddHttpPusherWorker.kt:70)
-//        at io.realm.Realm.executeTransaction(Realm.java:1493)
 internal open class PusherEntity(
         var pushKey: String = "",
         var kind: String? = null,
@@ -35,7 +26,9 @@ internal open class PusherEntity(
         var deviceDisplayName: String? = null,
         var profileTag: String? = null,
         var lang: String? = null,
-        var data: PusherDataEntity? = null
+        var data: PusherDataEntity? = null,
+        var enabled: Boolean = true,
+        var deviceId: String? = null,
 ) : RealmObject() {
     private var stateStr: String = PusherState.UNREGISTERED.name
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
index 9623c95359..cedd5e7424 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
@@ -26,6 +26,7 @@ internal open class ReadReceiptEntity(
         var eventId: String = "",
         var roomId: String = "",
         var userId: String = "",
+        var threadId: String? = null,
         var originServerTs: Double = 0.0
 ) : RealmObject() {
     companion object
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index 471bec59af..650dd3c5cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -115,6 +115,16 @@ internal open class RoomSummaryEntity(
             if (value != field) field = value
         }
 
+    var threadNotificationCount: Int = 0
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var threadHighlightCount: Int = 0
+        set(value) {
+            if (value != field) field = value
+        }
+
     var readMarkerId: String? = null
         set(value) {
             if (value != field) field = value
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index d131589dd1..0d998e8fe1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.database.model
 import io.realm.annotations.RealmModule
 import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
 import org.matrix.android.sdk.internal.database.model.presence.UserPresenceEntity
+import org.matrix.android.sdk.internal.database.model.threads.ThreadListPageEntity
 import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntity
 
 /**
@@ -35,6 +36,7 @@ import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntit
             ReadReceiptEntity::class,
             RoomEntity::class,
             RoomSummaryEntity::class,
+            LocalRoomSummaryEntity::class,
             RoomTagEntity::class,
             SyncEntity::class,
             PendingThreePidEntity::class,
@@ -69,7 +71,8 @@ import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntit
             SpaceChildSummaryEntity::class,
             SpaceParentSummaryEntity::class,
             UserPresenceEntity::class,
-            ThreadSummaryEntity::class
+            ThreadSummaryEntity::class,
+            ThreadListPageEntity::class
         ]
 )
 internal class SessionRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncFilterParamsEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncFilterParamsEntity.kt
new file mode 100644
index 0000000000..e4b62f28e8
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncFilterParamsEntity.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+import io.realm.RealmList
+import io.realm.RealmObject
+
+/**
+ * This entity stores Sync Filter configuration data, provided by the client.
+ */
+internal open class SyncFilterParamsEntity(
+        var lazyLoadMembersForStateEvents: Boolean? = null,
+        var lazyLoadMembersForMessageEvents: Boolean? = null,
+        var useThreadNotifications: Boolean? = null,
+        var listOfSupportedEventTypes: RealmList<String>? = null,
+        var listOfSupportedEventTypesHasBeenSet: Boolean = false,
+        var listOfSupportedStateEventTypes: RealmList<String>? = null,
+        var listOfSupportedStateEventTypesHasBeenSet: Boolean = false,
+) : RealmObject() {
+
+    companion object
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
index c8f22dc2cc..1deca47b70 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
@@ -20,6 +20,7 @@ import io.realm.RealmObject
 import io.realm.RealmResults
 import io.realm.annotations.Index
 import io.realm.annotations.LinkingObjects
+import org.matrix.android.sdk.api.session.room.read.ReadService
 import org.matrix.android.sdk.internal.extensions.assertIsManaged
 
 internal open class TimelineEventEntity(
@@ -52,3 +53,7 @@ internal fun TimelineEventEntity.deleteOnCascade(canDeleteRoot: Boolean) {
     }
     deleteFromRealm()
 }
+
+internal fun TimelineEventEntity.getThreadId(): String {
+    return root?.rootThreadEventId ?: ReadService.THREAD_ID_MAIN
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadListPageEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadListPageEntity.kt
new file mode 100644
index 0000000000..1d64c64ddf
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadListPageEntity.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.model.threads
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+internal open class ThreadListPageEntity(
+        @PrimaryKey var roomId: String = "",
+        var threadSummaries: RealmList<ThreadSummaryEntity> = RealmList()
+) : RealmObject() {
+    companion object
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadSummaryEntity.kt
index 45f9e3aa20..487be3747a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadSummaryEntity.kt
@@ -40,5 +40,8 @@ internal open class ThreadSummaryEntity(
     @LinkingObjects("threadSummaries")
     val room: RealmResults<RoomEntity>? = null
 
+    @LinkingObjects("threadSummaries")
+    val page: RealmResults<ThreadListPageEntity>? = null
+
     companion object
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LocalRoomSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LocalRoomSummaryEntityQueries.kt
new file mode 100644
index 0000000000..44730eb75d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LocalRoomSummaryEntityQueries.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.query
+
+import io.realm.Realm
+import io.realm.RealmQuery
+import io.realm.kotlin.where
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntityFields
+
+internal fun LocalRoomSummaryEntity.Companion.where(realm: Realm, roomId: String): RealmQuery<LocalRoomSummaryEntity> {
+    return realm.where<LocalRoomSummaryEntity>().equalTo(LocalRoomSummaryEntityFields.ROOM_ID, roomId)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
index 0b0f01a67d..ebfe23105e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
@@ -18,17 +18,20 @@ package org.matrix.android.sdk.internal.database.query
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.room.read.ReadService
 import org.matrix.android.sdk.internal.database.helper.isMoreRecentThan
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.ReadMarkerEntity
 import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.getThreadId
 
 internal fun isEventRead(
         realmConfiguration: RealmConfiguration,
         userId: String?,
         roomId: String?,
-        eventId: String?
+        eventId: String?,
+        shouldCheckIfReadInEventsThread: Boolean
 ): Boolean {
     if (userId.isNullOrBlank() || roomId.isNullOrBlank() || eventId.isNullOrBlank()) {
         return false
@@ -45,7 +48,8 @@ internal fun isEventRead(
             eventToCheck.root?.sender == userId -> true
             // If new event exists and the latest event is from ourselves we can infer the event is read
             latestEventIsFromSelf(realm, roomId, userId) -> true
-            eventToCheck.isBeforeLatestReadReceipt(realm, roomId, userId) -> true
+            eventToCheck.isBeforeLatestReadReceipt(realm, roomId, userId, null) -> true
+            (shouldCheckIfReadInEventsThread && eventToCheck.isBeforeLatestReadReceipt(realm, roomId, userId, eventToCheck.getThreadId())) -> true
             else -> false
         }
     }
@@ -54,27 +58,33 @@ internal fun isEventRead(
 private fun latestEventIsFromSelf(realm: Realm, roomId: String, userId: String) = TimelineEventEntity.latestEvent(realm, roomId, true)
         ?.root?.sender == userId
 
-private fun TimelineEventEntity.isBeforeLatestReadReceipt(realm: Realm, roomId: String, userId: String): Boolean {
-    return ReadReceiptEntity.where(realm, roomId, userId).findFirst()?.let { readReceipt ->
+private fun TimelineEventEntity.isBeforeLatestReadReceipt(realm: Realm, roomId: String, userId: String, threadId: String?): Boolean {
+    val isMoreRecent = ReadReceiptEntity.where(realm, roomId, userId, threadId).findFirst()?.let { readReceipt ->
         val readReceiptEvent = TimelineEventEntity.where(realm, roomId, readReceipt.eventId).findFirst()
         readReceiptEvent?.isMoreRecentThan(this)
     } ?: false
+    return isMoreRecent
 }
 
 /**
  * Missing events can be caused by the latest timeline chunk no longer contain an older event or
  * by fast lane eagerly displaying events before the database has finished updating.
  */
-private fun hasReadMissingEvent(realm: Realm, latestChunkEntity: ChunkEntity, roomId: String, userId: String, eventId: String): Boolean {
-    return realm.doesEventExistInChunkHistory(eventId) && realm.hasReadReceiptInLatestChunk(latestChunkEntity, roomId, userId)
+private fun hasReadMissingEvent(realm: Realm,
+                                latestChunkEntity: ChunkEntity,
+                                roomId: String,
+                                userId: String,
+                                eventId: String,
+                                threadId: String? = ReadService.THREAD_ID_MAIN): Boolean {
+    return realm.doesEventExistInChunkHistory(eventId) && realm.hasReadReceiptInLatestChunk(latestChunkEntity, roomId, userId, threadId)
 }
 
 private fun Realm.doesEventExistInChunkHistory(eventId: String): Boolean {
     return ChunkEntity.findIncludingEvent(this, eventId) != null
 }
 
-private fun Realm.hasReadReceiptInLatestChunk(latestChunkEntity: ChunkEntity, roomId: String, userId: String): Boolean {
-    return ReadReceiptEntity.where(this, roomId = roomId, userId = userId).findFirst()?.let {
+private fun Realm.hasReadReceiptInLatestChunk(latestChunkEntity: ChunkEntity, roomId: String, userId: String, threadId: String?): Boolean {
+    return ReadReceiptEntity.where(this, roomId = roomId, userId = userId, threadId = threadId).findFirst()?.let {
         latestChunkEntity.timelineEvents.find(it.eventId)
     } != null
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt
index b180c06e2c..0f9f56b938 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt
@@ -20,12 +20,20 @@ import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
+import org.matrix.android.sdk.api.session.room.read.ReadService
 import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
 import org.matrix.android.sdk.internal.database.model.ReadReceiptEntityFields
 
-internal fun ReadReceiptEntity.Companion.where(realm: Realm, roomId: String, userId: String): RealmQuery<ReadReceiptEntity> {
+internal fun ReadReceiptEntity.Companion.where(realm: Realm, roomId: String, userId: String, threadId: String?): RealmQuery<ReadReceiptEntity> {
     return realm.where<ReadReceiptEntity>()
-            .equalTo(ReadReceiptEntityFields.PRIMARY_KEY, buildPrimaryKey(roomId, userId))
+            .equalTo(ReadReceiptEntityFields.PRIMARY_KEY, buildPrimaryKey(roomId, userId, threadId))
+}
+
+internal fun ReadReceiptEntity.Companion.forMainTimelineWhere(realm: Realm, roomId: String, userId: String): RealmQuery<ReadReceiptEntity> {
+    return realm.where<ReadReceiptEntity>()
+            .equalTo(ReadReceiptEntityFields.PRIMARY_KEY, buildPrimaryKey(roomId, userId, ReadService.THREAD_ID_MAIN))
+            .or()
+            .equalTo(ReadReceiptEntityFields.PRIMARY_KEY, buildPrimaryKey(roomId, userId, null))
 }
 
 internal fun ReadReceiptEntity.Companion.whereUserId(realm: Realm, userId: String): RealmQuery<ReadReceiptEntity> {
@@ -33,23 +41,42 @@ internal fun ReadReceiptEntity.Companion.whereUserId(realm: Realm, userId: Strin
             .equalTo(ReadReceiptEntityFields.USER_ID, userId)
 }
 
-internal fun ReadReceiptEntity.Companion.createUnmanaged(roomId: String, eventId: String, userId: String, originServerTs: Double): ReadReceiptEntity {
+internal fun ReadReceiptEntity.Companion.whereRoomId(realm: Realm, roomId: String): RealmQuery<ReadReceiptEntity> {
+    return realm.where<ReadReceiptEntity>()
+            .equalTo(ReadReceiptEntityFields.ROOM_ID, roomId)
+}
+
+internal fun ReadReceiptEntity.Companion.createUnmanaged(
+        roomId: String,
+        eventId: String,
+        userId: String,
+        threadId: String?,
+        originServerTs: Double
+): ReadReceiptEntity {
     return ReadReceiptEntity().apply {
-        this.primaryKey = "${roomId}_$userId"
+        this.primaryKey = buildPrimaryKey(roomId, userId, threadId)
         this.eventId = eventId
         this.roomId = roomId
         this.userId = userId
+        this.threadId = threadId
         this.originServerTs = originServerTs
     }
 }
 
-internal fun ReadReceiptEntity.Companion.getOrCreate(realm: Realm, roomId: String, userId: String): ReadReceiptEntity {
-    return ReadReceiptEntity.where(realm, roomId, userId).findFirst()
-            ?: realm.createObject<ReadReceiptEntity>(buildPrimaryKey(roomId, userId))
+internal fun ReadReceiptEntity.Companion.getOrCreate(realm: Realm, roomId: String, userId: String, threadId: String?): ReadReceiptEntity {
+    return ReadReceiptEntity.where(realm, roomId, userId, threadId).findFirst()
+            ?: realm.createObject<ReadReceiptEntity>(buildPrimaryKey(roomId, userId, threadId))
                     .apply {
                         this.roomId = roomId
                         this.userId = userId
+                        this.threadId = threadId
                     }
 }
 
-private fun buildPrimaryKey(roomId: String, userId: String) = "${roomId}_$userId"
+private fun buildPrimaryKey(roomId: String, userId: String, threadId: String?): String {
+    return if (threadId == null) {
+        "${roomId}_${userId}"
+    } else {
+        "${roomId}_${userId}_${threadId}"
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt
index 08bb9e7ff3..0489fe690f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt
@@ -21,6 +21,7 @@ import io.realm.RealmQuery
 import io.realm.kotlin.where
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.RoomAccountDataEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomEntity
 import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 
@@ -44,3 +45,11 @@ internal fun RoomEntity.Companion.where(realm: Realm, membership: Membership? =
 internal fun RoomEntity.fastContains(eventId: String): Boolean {
     return EventEntity.where(realm, eventId = eventId).findFirst() != null
 }
+
+internal fun RoomEntity.removeAccountData(type: String) {
+    accountData
+            .where()
+            .equalTo(RoomAccountDataEntityFields.TYPE, type)
+            .findFirst()
+            ?.deleteFromRealm()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryPageEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryPageEntityQueries.kt
new file mode 100644
index 0000000000..9525e55787
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryPageEntityQueries.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.query
+
+import io.realm.Realm
+import io.realm.kotlin.createObject
+import io.realm.kotlin.where
+import org.matrix.android.sdk.internal.database.model.threads.ThreadListPageEntity
+import org.matrix.android.sdk.internal.database.model.threads.ThreadListPageEntityFields
+
+internal fun ThreadListPageEntity.Companion.get(realm: Realm, roomId: String): ThreadListPageEntity? {
+    return realm.where<ThreadListPageEntity>().equalTo(ThreadListPageEntityFields.ROOM_ID, roomId).findFirst()
+}
+
+internal fun ThreadListPageEntity.Companion.getOrCreate(realm: Realm, roomId: String): ThreadListPageEntity {
+    return get(realm, roomId) ?: realm.createObject(roomId)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
index 30010f90fd..ab90801b7f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
@@ -22,6 +22,7 @@ import io.realm.RealmQuery
 import io.realm.RealmResults
 import io.realm.Sort
 import io.realm.kotlin.where
+import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEventFilters
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
@@ -94,14 +95,27 @@ internal fun RealmQuery<TimelineEventEntity>.filterEvents(filters: TimelineEvent
     if (filters.filterTypes && filters.allowedTypes.isNotEmpty()) {
         beginGroup()
         filters.allowedTypes.forEachIndexed { index, filter ->
-            if (filter.stateKey == null) {
-                equalTo(TimelineEventEntityFields.ROOT.TYPE, filter.eventType)
+            if (filter.eventType == EventType.ENCRYPTED) {
+                val otherTypes = filters.allowedTypes.minus(filter).map { it.eventType }
+                if (filter.stateKey == null) {
+                    filterEncryptedTypes(otherTypes)
+                } else {
+                    beginGroup()
+                    filterEncryptedTypes(otherTypes)
+                    and()
+                    equalTo(TimelineEventEntityFields.ROOT.STATE_KEY, filter.stateKey)
+                    endGroup()
+                }
             } else {
-                beginGroup()
-                equalTo(TimelineEventEntityFields.ROOT.TYPE, filter.eventType)
-                and()
-                equalTo(TimelineEventEntityFields.ROOT.STATE_KEY, filter.stateKey)
-                endGroup()
+                if (filter.stateKey == null) {
+                    equalTo(TimelineEventEntityFields.ROOT.TYPE, filter.eventType)
+                } else {
+                    beginGroup()
+                    equalTo(TimelineEventEntityFields.ROOT.TYPE, filter.eventType)
+                    and()
+                    equalTo(TimelineEventEntityFields.ROOT.STATE_KEY, filter.stateKey)
+                    endGroup()
+                }
             }
             if (index != filters.allowedTypes.size - 1) {
                 or()
@@ -110,13 +124,11 @@ internal fun RealmQuery<TimelineEventEntity>.filterEvents(filters: TimelineEvent
         endGroup()
     }
     if (filters.filterUseless) {
-        not()
-                .equalTo(TimelineEventEntityFields.ROOT.IS_USELESS, true)
+        not().equalTo(TimelineEventEntityFields.ROOT.IS_USELESS, true)
     }
     if (filters.filterEdits) {
         not().like(TimelineEventEntityFields.ROOT.CONTENT, TimelineEventFilter.Content.EDIT)
         not().like(TimelineEventEntityFields.ROOT.CONTENT, TimelineEventFilter.Content.RESPONSE)
-        not().like(TimelineEventEntityFields.ROOT.CONTENT, TimelineEventFilter.Content.REFERENCE)
     }
     if (filters.filterRedacted) {
         not().like(TimelineEventEntityFields.ROOT.UNSIGNED_DATA, TimelineEventFilter.Unsigned.REDACTED)
@@ -125,6 +137,21 @@ internal fun RealmQuery<TimelineEventEntity>.filterEvents(filters: TimelineEvent
     return this
 }
 
+internal fun RealmQuery<TimelineEventEntity>.filterEncryptedTypes(allowedTypes: List<String>): RealmQuery<TimelineEventEntity> {
+    beginGroup()
+    equalTo(TimelineEventEntityFields.ROOT.TYPE, EventType.ENCRYPTED)
+    and()
+    beginGroup()
+    isNull(TimelineEventEntityFields.ROOT.DECRYPTION_RESULT_JSON)
+    allowedTypes.forEach { eventType ->
+        or()
+        like(TimelineEventEntityFields.ROOT.DECRYPTION_RESULT_JSON, TimelineEventFilter.DecryptedContent.type(eventType))
+    }
+    endGroup()
+    endGroup()
+    return this
+}
+
 internal fun RealmQuery<TimelineEventEntity>.filterTypes(filterTypes: List<String>): RealmQuery<TimelineEventEntity> {
     return if (filterTypes.isEmpty()) {
         this
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt
index 7a65623b76..b8baeb0b33 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt
@@ -34,6 +34,7 @@ internal object TimelineEventFilter {
      */
     internal object DecryptedContent {
         internal const val URL = """{*"file":*"url":*}"""
+        fun type(type: String) = """{*"type":*"$type"*}"""
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserAccountDataEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserAccountDataEntityQueries.kt
new file mode 100644
index 0000000000..b28965aeca
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserAccountDataEntityQueries.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.query
+
+import io.realm.Realm
+import io.realm.kotlin.where
+import org.matrix.android.sdk.internal.database.model.UserAccountDataEntity
+import org.matrix.android.sdk.internal.database.model.UserAccountDataEntityFields
+
+/**
+ * Delete an account_data event.
+ */
+internal fun UserAccountDataEntity.Companion.delete(realm: Realm, type: String) {
+    realm
+            .where<UserAccountDataEntity>()
+            .equalTo(UserAccountDataEntityFields.TYPE, type)
+            .findFirst()
+            ?.deleteFromRealm()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/tools/RealmDebugTools.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/tools/RealmDebugTools.kt
index dc20549eb3..2e9c3303d4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/tools/RealmDebugTools.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/tools/RealmDebugTools.kt
@@ -19,16 +19,15 @@ package org.matrix.android.sdk.internal.database.tools
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import org.matrix.android.sdk.BuildConfig
-import timber.log.Timber
 
 internal class RealmDebugTools(
         private val realmConfiguration: RealmConfiguration
 ) {
     /**
-     * Log info about the DB.
+     * Get info about the DB.
      */
-    fun logInfo(baseName: String) {
-        buildString {
+    fun getInfo(baseName: String): String {
+        return buildString {
             append("\n$baseName Realm located at : ${realmConfiguration.realmDirectory}/${realmConfiguration.realmFileName}")
 
             if (BuildConfig.LOG_PRIVATE_DATA) {
@@ -54,7 +53,6 @@ internal class RealmDebugTools(
                 separator()
             }
         }
-                .let { Timber.i(it) }
     }
 
     private fun StringBuilder.separator() = append("\n==============================================")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/debug/DefaultDebugService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/debug/DefaultDebugService.kt
index 3f2e6fafc8..46479c3db6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/debug/DefaultDebugService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/debug/DefaultDebugService.kt
@@ -36,9 +36,9 @@ internal class DefaultDebugService @Inject constructor(
                 realmConfigurationGlobal
     }
 
-    override fun logDbUsageInfo() {
-        RealmDebugTools(realmConfigurationAuth).logInfo("Auth")
-        RealmDebugTools(realmConfigurationGlobal).logInfo("Global")
-        sessionManager.getLastSession()?.logDbUsageInfo()
+    override fun getDbUsageInfo() = buildString {
+        append(RealmDebugTools(realmConfigurationAuth).getInfo("Auth"))
+        append(RealmDebugTools(realmConfigurationGlobal).getInfo("Global"))
+        append(sessionManager.getLastSession()?.getDbUsageInfo())
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
index 49713a1d7f..f2f8a5dc04 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
@@ -40,7 +40,7 @@ internal object MatrixModule {
                 io = Dispatchers.IO,
                 computation = Dispatchers.Default,
                 main = Dispatchers.Main,
-                crypto = createBackgroundHandler("Crypto_Thread").asCoroutineDispatcher(),
+                crypto = createBackgroundHandler("Matrix-Crypto_Thread").asCoroutineDispatcher(),
                 dmVerif = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
index 8f007f227c..0a737d5e64 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
@@ -17,6 +17,8 @@
 package org.matrix.android.sdk.internal.di
 
 import com.squareup.moshi.Moshi
+import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
+import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageDefaultContent
@@ -60,6 +62,12 @@ internal object MoshiProvider {
                             .registerSubtype(MessagePollResponseContent::class.java, MessageType.MSGTYPE_POLL_RESPONSE)
             )
             .add(SerializeNulls.JSON_ADAPTER_FACTORY)
+            .add(
+                    PolymorphicJsonAdapterFactory.of(ThreePid::class.java, "type")
+                            .withSubtype(ThreePid.Email::class.java, "email")
+                            .withSubtype(ThreePid.Msisdn::class.java, "msisdn")
+                            .withDefaultValue(null)
+            )
             .build()
 
     fun providesMoshi(): Moshi {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
index 113e780e5c..cb2088a145 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
@@ -42,7 +42,7 @@ internal object NetworkModule {
     @Provides
     @JvmStatic
     fun providesHttpLoggingInterceptor(): HttpLoggingInterceptor {
-        val logger = FormattedJsonHttpLogger()
+        val logger = FormattedJsonHttpLogger(BuildConfig.OKHTTP_LOGGING_LEVEL)
         val interceptor = HttpLoggingInterceptor(logger)
         interceptor.level = BuildConfig.OKHTTP_LOGGING_LEVEL
         return interceptor
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ComputeUserAgentUseCase.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ComputeUserAgentUseCase.kt
new file mode 100644
index 0000000000..04e8cf8a29
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ComputeUserAgentUseCase.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.network
+
+import android.content.Context
+import android.os.Build
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.util.getApplicationInfoCompat
+import org.matrix.android.sdk.api.util.getPackageInfoCompat
+import javax.inject.Inject
+
+class ComputeUserAgentUseCase @Inject constructor(
+        private val context: Context,
+) {
+
+    /**
+     * Create an user agent with the application version.
+     * Ex: Element/1.5.0 (Xiaomi Mi 9T; Android 11; RKQ1.200826.002; Flavour GooglePlay; MatrixAndroidSdk2 1.5.0)
+     *
+     * @param flavorDescription the flavor description
+     */
+    fun execute(flavorDescription: String): String {
+        val appPackageName = context.applicationContext.packageName
+        val pm = context.packageManager
+
+        val appName = tryOrNull { pm.getApplicationLabel(pm.getApplicationInfoCompat(appPackageName, 0)).toString() }
+                ?.takeIf {
+                    it.matches("\\A\\p{ASCII}*\\z".toRegex())
+                }
+                ?: run {
+                    // Use appPackageName instead of appName if appName is null or contains any non-ASCII character
+                    appPackageName
+                }
+        val appVersion = tryOrNull { pm.getPackageInfoCompat(context.applicationContext.packageName, 0).versionName } ?: FALLBACK_APP_VERSION
+
+        val deviceManufacturer = Build.MANUFACTURER
+        val deviceModel = Build.MODEL
+        val androidVersion = Build.VERSION.RELEASE
+        val deviceBuildId = Build.DISPLAY
+        val matrixSdkVersion = BuildConfig.SDK_VERSION
+
+        return buildString {
+            append(appName)
+            append("/")
+            append(appVersion)
+            append(" (")
+            append(deviceManufacturer)
+            append(" ")
+            append(deviceModel)
+            append("; ")
+            append("Android ")
+            append(androidVersion)
+            append("; ")
+            append(deviceBuildId)
+            append("; ")
+            append("Flavour ")
+            append(flavorDescription)
+            append("; ")
+            append("MatrixAndroidSdk2 ")
+            append(matrixSdkVersion)
+            append(")")
+        }
+    }
+
+    companion object {
+        const val FALLBACK_APP_VERSION = "0.0.0"
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
index 5aec7db66c..4bfda0bf3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
@@ -22,6 +22,7 @@ internal object NetworkConstants {
     const val URI_API_PREFIX_PATH_ = "$URI_API_PREFIX_PATH/"
     const val URI_API_PREFIX_PATH_R0 = "$URI_API_PREFIX_PATH/r0/"
     const val URI_API_PREFIX_PATH_V1 = "$URI_API_PREFIX_PATH/v1/"
+    const val URI_API_PREFIX_PATH_V3 = "$URI_API_PREFIX_PATH/v3/"
     const val URI_API_PREFIX_PATH_UNSTABLE = "$URI_API_PREFIX_PATH/unstable/"
 
     // Media
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
index 28d96dfce7..4e83261277 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
@@ -16,73 +16,20 @@
 
 package org.matrix.android.sdk.internal.network
 
-import android.content.Context
-import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.internal.di.MatrixScope
-import timber.log.Timber
 import javax.inject.Inject
 
 @MatrixScope
 internal class UserAgentHolder @Inject constructor(
-        private val context: Context,
-        matrixConfiguration: MatrixConfiguration
+        matrixConfiguration: MatrixConfiguration,
+        computeUserAgentUseCase: ComputeUserAgentUseCase,
 ) {
 
     var userAgent: String = ""
         private set
 
     init {
-        setApplicationFlavor(matrixConfiguration.applicationFlavor)
-    }
-
-    /**
-     * Create an user agent with the application version.
-     * Ex: Element/1.0.0 (Linux; U; Android 6.0.1; SM-A510F Build/MMB29; Flavour GPlay; MatrixAndroidSdk2 1.0)
-     *
-     * @param flavorDescription the flavor description
-     */
-    private fun setApplicationFlavor(flavorDescription: String) {
-        var appName = ""
-        var appVersion = ""
-
-        try {
-            val appPackageName = context.applicationContext.packageName
-            val pm = context.packageManager
-            val appInfo = pm.getApplicationInfo(appPackageName, 0)
-            appName = pm.getApplicationLabel(appInfo).toString()
-
-            val pkgInfo = pm.getPackageInfo(context.applicationContext.packageName, 0)
-            appVersion = pkgInfo.versionName ?: ""
-
-            // Use appPackageName instead of appName if appName contains any non-ASCII character
-            if (!appName.matches("\\A\\p{ASCII}*\\z".toRegex())) {
-                appName = appPackageName
-            }
-        } catch (e: Exception) {
-            Timber.e(e, "## initUserAgent() : failed")
-        }
-
-        val systemUserAgent = System.getProperty("http.agent")
-
-        // cannot retrieve the application version
-        if (appName.isEmpty() || appVersion.isEmpty()) {
-            if (null == systemUserAgent) {
-                userAgent = "Java" + System.getProperty("java.version")
-            }
-            return
-        }
-
-        // if there is no user agent or cannot parse it
-        if (null == systemUserAgent || systemUserAgent.lastIndexOf(")") == -1 || !systemUserAgent.contains("(")) {
-            userAgent = (appName + "/" + appVersion + " ( Flavour " + flavorDescription +
-                    "; MatrixAndroidSdk2 " + BuildConfig.SDK_VERSION + ")")
-        } else {
-            // update
-            userAgent = appName + "/" + appVersion + " " +
-                    systemUserAgent.substring(systemUserAgent.indexOf("("), systemUserAgent.lastIndexOf(")") - 1) +
-                    "; Flavour " + flavorDescription +
-                    "; MatrixAndroidSdk2 " + BuildConfig.SDK_VERSION + ")"
-        }
+        userAgent = computeUserAgentUseCase.execute(matrixConfiguration.applicationFlavor)
     }
 }
diff --git a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
similarity index 84%
rename from matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
index 2661bd1f70..4e0525536c 100644
--- a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
@@ -23,15 +23,17 @@ import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
 
-internal class FormattedJsonHttpLogger : HttpLoggingInterceptor.Logger {
+internal class FormattedJsonHttpLogger(
+        private val level: HttpLoggingInterceptor.Level
+) : HttpLoggingInterceptor.Logger {
 
     companion object {
         private const val INDENT_SPACE = 2
     }
 
     /**
-     * Log the message and try to log it again as a JSON formatted string
-     * Note: it can consume a lot of memory but it is only in DEBUG mode
+     * Log the message and try to log it again as a JSON formatted string.
+     * Note: it can consume a lot of memory but it is only in DEBUG mode.
      *
      * @param message
      */
@@ -39,6 +41,10 @@ internal class FormattedJsonHttpLogger : HttpLoggingInterceptor.Logger {
     override fun log(@NonNull message: String) {
         Timber.v(message)
 
+        // Try to log formatted Json only if there is a chance that [message] contains Json.
+        // It can be only the case if we log the bodies of Http requests.
+        if (level != HttpLoggingInterceptor.Level.BODY) return
+
         if (message.startsWith("{")) {
             // JSON Detected
             try {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
index b2ab9879df..a93ff42c9e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
@@ -38,6 +38,7 @@ internal class QueryStringValueProcessor @Inject constructor(
             is ContentQueryStringValue -> when (queryStringValue) {
                 is QueryStringValue.Equals -> equalTo(field, queryStringValue.toRealmValue(), queryStringValue.case.toRealmCase())
                 is QueryStringValue.Contains -> contains(field, queryStringValue.toRealmValue(), queryStringValue.case.toRealmCase())
+                is QueryStringValue.NotContains -> not().process(field, QueryStringValue.Contains(queryStringValue.string, queryStringValue.case))
             }
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 57db187bdc..1af904bbc7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -57,7 +57,6 @@ import org.matrix.android.sdk.api.session.search.SearchService
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.session.signout.SignOutService
 import org.matrix.android.sdk.api.session.space.SpaceService
-import org.matrix.android.sdk.api.session.sync.FilterService
 import org.matrix.android.sdk.api.session.sync.SyncService
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.api.session.thirdparty.ThirdPartyService
@@ -97,7 +96,6 @@ internal class DefaultSession @Inject constructor(
         private val roomService: Lazy<RoomService>,
         private val roomDirectoryService: Lazy<RoomDirectoryService>,
         private val userService: Lazy<UserService>,
-        private val filterService: Lazy<FilterService>,
         private val federationService: Lazy<FederationService>,
         private val cacheService: Lazy<CacheService>,
         private val signOutService: Lazy<SignOutService>,
@@ -209,7 +207,6 @@ internal class DefaultSession @Inject constructor(
     override fun roomDirectoryService(): RoomDirectoryService = roomDirectoryService.get()
     override fun userService(): UserService = userService.get()
     override fun signOutService(): SignOutService = signOutService.get()
-    override fun filterService(): FilterService = filterService.get()
     override fun pushRuleService(): PushRuleService = pushRuleService.get()
     override fun pushersService(): PushersService = pushersService.get()
     override fun eventService(): EventService = eventService.get()
@@ -263,11 +260,11 @@ internal class DefaultSession @Inject constructor(
         }
     }
 
-    override fun logDbUsageInfo() {
-        RealmDebugTools(realmConfiguration).logInfo("Session")
-        RealmDebugTools(realmConfigurationCrypto).logInfo("Crypto")
-        RealmDebugTools(realmConfigurationIdentity).logInfo("Identity")
-        RealmDebugTools(realmConfigurationContentScanner).logInfo("ContentScanner")
+    override fun getDbUsageInfo() = buildString {
+        append(RealmDebugTools(realmConfiguration).getInfo("Session"))
+        append(RealmDebugTools(realmConfigurationCrypto).getInfo("Crypto"))
+        append(RealmDebugTools(realmConfigurationIdentity).getInfo("Identity"))
+        append(RealmDebugTools(realmConfigurationContentScanner).getInfo("ContentScanner"))
     }
 
     override fun getRealmConfigurations(): List<RealmConfiguration> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt
index a650fa2d64..9741a7bd15 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt
@@ -24,7 +24,7 @@ internal interface EventInsertLiveProcessor {
 
     fun shouldProcess(eventId: String, eventType: String, insertType: EventInsertType): Boolean
 
-    suspend fun process(realm: Realm, event: Event)
+    fun process(realm: Realm, event: Event)
 
     /**
      * Called after transaction.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
index a79f35bcb6..a7572035df 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -55,6 +55,7 @@ import org.matrix.android.sdk.internal.session.space.SpaceModule
 import org.matrix.android.sdk.internal.session.sync.SyncModule
 import org.matrix.android.sdk.internal.session.sync.SyncTask
 import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
+import org.matrix.android.sdk.internal.session.sync.handler.UpdateUserWorker
 import org.matrix.android.sdk.internal.session.sync.job.SyncWorker
 import org.matrix.android.sdk.internal.session.terms.TermsModule
 import org.matrix.android.sdk.internal.session.thirdparty.ThirdPartyModule
@@ -128,6 +129,8 @@ internal interface SessionComponent {
 
     fun inject(worker: UpdateTrustWorker)
 
+    fun inject(worker: UpdateUserWorker)
+
     fun inject(worker: DeactivateLiveLocationShareWorker)
 
     @Component.Factory
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
index b15a647421..b6ad7581fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
@@ -41,9 +41,8 @@ internal class CallEventProcessor @Inject constructor(private val callSignalingH
             EventType.CALL_INVITE,
             EventType.CALL_HANGUP,
             EventType.ENCRYPTED,
-            EventType.CALL_ASSERTED_IDENTITY,
-            EventType.CALL_ASSERTED_IDENTITY_PREFIX
-    )
+    ) +
+            EventType.CALL_ASSERTED_IDENTITY.values
 
     private val eventsToPostProcess = mutableListOf<Event>()
 
@@ -54,7 +53,7 @@ internal class CallEventProcessor @Inject constructor(private val callSignalingH
         return allowedTypes.contains(eventType)
     }
 
-    override suspend fun process(realm: Realm, event: Event) {
+    override fun process(realm: Realm, event: Event) {
         eventsToPostProcess.add(event)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
index 48a9dfd3da..d824aaa51a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
@@ -84,8 +84,7 @@ internal class CallSignalingHandler @Inject constructor(
             EventType.CALL_NEGOTIATE -> {
                 handleCallNegotiateEvent(event)
             }
-            EventType.CALL_ASSERTED_IDENTITY,
-            EventType.CALL_ASSERTED_IDENTITY_PREFIX -> {
+            in EventType.CALL_ASSERTED_IDENTITY.values -> {
                 handleCallAssertedIdentityEvent(event)
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index c023646c7f..eee55735e0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -130,6 +130,7 @@ internal class FileUploader @Inject constructor(
             workingFile.outputStream().use {
                 inputStream.copyTo(it)
             }
+            inputStream.close()
             workingFile
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
index 3fa9ffb0e1..1531d70083 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
@@ -17,11 +17,11 @@
 package org.matrix.android.sdk.internal.session.content
 
 import kotlinx.coroutines.withContext
-import org.apache.sanselan.Sanselan
-import org.apache.sanselan.formats.jpeg.JpegImageMetadata
-import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter
-import org.apache.sanselan.formats.tiff.constants.ExifTagConstants
-import org.apache.sanselan.formats.tiff.constants.GPSTagConstants
+import org.apache.commons.imaging.Imaging
+import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata
+import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter
+import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants
+import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.internal.util.TemporaryFileCreator
@@ -46,24 +46,13 @@ internal class ImageExifTagRemover @Inject constructor(
      */
     suspend fun removeSensitiveJpegExifTags(jpegImageFile: File): File = withContext(coroutineDispatchers.io) {
         val outputSet = tryOrNull("Unable to read JpegImageMetadata") {
-            (Sanselan.getMetadata(jpegImageFile) as? JpegImageMetadata)?.exif?.outputSet
+            (Imaging.getMetadata(jpegImageFile) as? JpegImageMetadata)?.exif?.outputSet
         } ?: return@withContext jpegImageFile
 
         tryOrNull("Unable to remove ExifData") {
-            outputSet.removeField(ExifTagConstants.EXIF_TAG_GPSINFO)
-            outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION_1)
-            outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION_2)
-            outputSet.removeField(ExifTagConstants.EXIF_TAG_USER_COMMENT)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_ALTITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_ALTITUDE_REF)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LONGITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LONGITUDE_REF)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LONGITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LONGITUDE_REF)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LATITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LATITUDE_REF)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LATITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LATITUDE_REF)
+            tagsToRemove.forEach { tagInfo ->
+                outputSet.removeField(tagInfo)
+            }
         } ?: return@withContext jpegImageFile
 
         val scrubbedFile = temporaryFileCreator.create()
@@ -82,4 +71,12 @@ internal class ImageExifTagRemover @Inject constructor(
                 }
         )
     }
+
+    private val tagsToRemove
+        get() = GpsTagConstants.ALL_GPS_TAGS +
+                listOf(
+                        ExifTagConstants.EXIF_TAG_GPSINFO,
+                        ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION,
+                        ExifTagConstants.EXIF_TAG_USER_COMMENT,
+                )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 1e62b5d7f5..3dd440737a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.crypto.model.EncryptedFileInfo
+import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
@@ -407,7 +408,10 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
             newAttachmentAttributes: NewAttachmentAttributes
     ) {
         localEchoRepository.updateEcho(eventId) { _, event ->
-            val messageContent: MessageContent? = event.asDomain().content.toModel()
+            val content: Content? = event.asDomain(castJsonNumbers = true).content
+            val messageContent: MessageContent? = content.toModel()
+            // Retrieve potential additional content from the original event
+            val additionalContent = content.orEmpty() - messageContent?.toContent().orEmpty().keys
             val updatedContent = when (messageContent) {
                 is MessageImageContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes)
                 is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo, newAttachmentAttributes)
@@ -415,7 +419,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                 is MessageAudioContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 else -> messageContent
             }
-            event.content = ContentMapper.map(updatedContent.toContent())
+            event.content = ContentMapper.map(updatedContent.toContent().plus(additionalContent))
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt
index 1d1bb0e715..f70b4d1799 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt
@@ -17,72 +17,49 @@
 package org.matrix.android.sdk.internal.session.filter
 
 import com.zhuinden.monarchy.Monarchy
-import io.realm.Realm
-import io.realm.kotlin.where
 import org.matrix.android.sdk.internal.database.model.FilterEntity
-import org.matrix.android.sdk.internal.database.model.FilterEntityFields
 import org.matrix.android.sdk.internal.database.query.get
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.util.awaitTransaction
 import javax.inject.Inject
 
-internal class DefaultFilterRepository @Inject constructor(@SessionDatabase private val monarchy: Monarchy) : FilterRepository {
+internal class DefaultFilterRepository @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+) : FilterRepository {
 
-    override suspend fun storeFilter(filter: Filter, roomEventFilter: RoomEventFilter): Boolean {
-        return Realm.getInstance(monarchy.realmConfiguration).use { realm ->
-            val filterEntity = FilterEntity.get(realm)
-            // Filter has changed, or no filter Id yet
-            filterEntity == null ||
-                    filterEntity.filterBodyJson != filter.toJSONString() ||
-                    filterEntity.filterId.isBlank()
-        }.also { hasChanged ->
-            if (hasChanged) {
-                // Filter is new or has changed, store it and reset the filter Id.
-                // This has to be done outside of the Realm.use(), because awaitTransaction change the current thread
-                monarchy.awaitTransaction { realm ->
-                    // We manage only one filter for now
-                    val filterJson = filter.toJSONString()
-                    val roomEventFilterJson = roomEventFilter.toJSONString()
-
-                    val filterEntity = FilterEntity.getOrCreate(realm)
-
-                    filterEntity.filterBodyJson = filterJson
-                    filterEntity.roomEventFilterJson = roomEventFilterJson
-                    // Reset filterId
-                    filterEntity.filterId = ""
-                }
-            }
-        }
-    }
-
-    override suspend fun storeFilterId(filter: Filter, filterId: String) {
-        monarchy.awaitTransaction {
+    override suspend fun storeSyncFilter(filter: Filter, filterId: String, roomEventFilter: RoomEventFilter) {
+        monarchy.awaitTransaction { realm ->
             // We manage only one filter for now
             val filterJson = filter.toJSONString()
+            val roomEventFilterJson = roomEventFilter.toJSONString()
 
-            // Update the filter id, only if the filter body matches
-            it.where<FilterEntity>()
-                    .equalTo(FilterEntityFields.FILTER_BODY_JSON, filterJson)
-                    ?.findFirst()
-                    ?.filterId = filterId
+            val filterEntity = FilterEntity.getOrCreate(realm)
+
+            filterEntity.filterBodyJson = filterJson
+            filterEntity.roomEventFilterJson = roomEventFilterJson
+            filterEntity.filterId = filterId
         }
     }
 
-    override suspend fun getFilter(): String {
+    override suspend fun getStoredSyncFilterBody(): String {
         return monarchy.awaitTransaction {
-            val filter = FilterEntity.getOrCreate(it)
-            if (filter.filterId.isBlank()) {
-                // Use the Json format
-                filter.filterBodyJson
+            FilterEntity.getOrCreate(it).filterBodyJson
+        }
+    }
+
+    override suspend fun getStoredSyncFilterId(): String? {
+        return monarchy.awaitTransaction {
+            val id = FilterEntity.get(it)?.filterId
+            if (id.isNullOrBlank()) {
+                null
             } else {
-                // Use FilterId
-                filter.filterId
+                id
             }
         }
     }
 
-    override suspend fun getRoomFilter(): String {
+    override suspend fun getRoomFilterBody(): String {
         return monarchy.awaitTransaction {
             FilterEntity.getOrCreate(it).roomEventFilterJson
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
deleted file mode 100644
index 2e68d02d8c..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-
-package org.matrix.android.sdk.internal.session.filter
-
-import org.matrix.android.sdk.api.session.sync.FilterService
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
-import javax.inject.Inject
-
-internal class DefaultFilterService @Inject constructor(
-        private val saveFilterTask: SaveFilterTask,
-        private val taskExecutor: TaskExecutor
-) : FilterService {
-
-    // TODO Pass a list of support events instead
-    override fun setFilter(filterPreset: FilterService.FilterPreset) {
-        saveFilterTask
-                .configureWith(SaveFilterTask.Params(filterPreset))
-                .executeBy(taskExecutor)
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
index 676a4f6a38..1bd2e59e59 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
@@ -28,7 +28,7 @@ internal object FilterFactory {
                 limit = numberOfEvents,
 //                senders = listOf(userId),
 //                relationSenders = userId?.let { listOf(it) },
-                relationTypes = listOf(RelationType.THREAD)
+                relationTypes = listOf(RelationType.THREAD),
         )
     }
 
@@ -37,7 +37,7 @@ internal object FilterFactory {
                 limit = numberOfEvents,
                 containsUrl = true,
                 types = listOf(EventType.MESSAGE),
-                lazyLoadMembers = true
+                lazyLoadMembers = true,
         )
     }
 
@@ -45,51 +45,7 @@ internal object FilterFactory {
         return FilterUtil.enableLazyLoading(Filter(), true)
     }
 
-    fun createElementFilter(): Filter {
-        return Filter(
-                room = RoomFilter(
-                        timeline = createElementTimelineFilter(),
-                        state = createElementStateFilter()
-                )
-        )
-    }
-
     fun createDefaultRoomFilter(): RoomEventFilter {
-        return RoomEventFilter(
-                lazyLoadMembers = true
-        )
+        return RoomEventFilter(lazyLoadMembers = true)
     }
-
-    fun createElementRoomFilter(): RoomEventFilter {
-        return RoomEventFilter(
-                lazyLoadMembers = true
-                // TODO Enable this for optimization
-                // types = (listOfSupportedEventTypes + listOfSupportedStateEventTypes).toMutableList()
-        )
-    }
-
-    private fun createElementTimelineFilter(): RoomEventFilter? {
-        return null // RoomEventFilter().apply {
-        // TODO Enable this for optimization
-        // types = listOfSupportedEventTypes.toMutableList()
-        // }
-    }
-
-    private fun createElementStateFilter(): RoomEventFilter {
-        return RoomEventFilter(
-                lazyLoadMembers = true
-        )
-    }
-
-    // Get only managed types by Element
-    private val listOfSupportedEventTypes = listOf(
-            // TODO Complete the list
-            EventType.MESSAGE
-    )
-
-    // Get only managed types by Element
-    private val listOfSupportedStateEventTypes = listOf(
-            // TODO Complete the list
-            EventType.STATE_ROOM_MEMBER
-    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt
index 8531bed1ff..5ae2c2a47d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.filter
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import org.matrix.android.sdk.api.session.sync.FilterService
 import org.matrix.android.sdk.internal.session.SessionScope
 import retrofit2.Retrofit
 
@@ -40,8 +39,8 @@ internal abstract class FilterModule {
     abstract fun bindFilterRepository(repository: DefaultFilterRepository): FilterRepository
 
     @Binds
-    abstract fun bindFilterService(service: DefaultFilterService): FilterService
+    abstract fun bindSaveFilterTask(task: DefaultSaveFilterTask): SaveFilterTask
 
     @Binds
-    abstract fun bindSaveFilterTask(task: DefaultSaveFilterTask): SaveFilterTask
+    abstract fun bindGetCurrentFilterTask(task: DefaultGetCurrentFilterTask): GetCurrentFilterTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt
index f40231c8cf..d0ec4b98bb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt
@@ -16,25 +16,30 @@
 
 package org.matrix.android.sdk.internal.session.filter
 
+/**
+ * Repository for request filters.
+ */
 internal interface FilterRepository {
 
     /**
-     * Return true if the filterBody has changed, or need to be sent to the server.
+     * Stores sync filter and room filter.
+     * Note: It looks like we could use [Filter.room.timeline] instead of a separate [RoomEventFilter], but it's not clear if it's safe, so research is needed
+     * @return true if the filterBody has changed, or need to be sent to the server.
      */
-    suspend fun storeFilter(filter: Filter, roomEventFilter: RoomEventFilter): Boolean
+    suspend fun storeSyncFilter(filter: Filter, filterId: String, roomEventFilter: RoomEventFilter)
 
     /**
-     * Set the filterId of this filter.
+     * Returns stored sync filter's JSON body if it exists.
      */
-    suspend fun storeFilterId(filter: Filter, filterId: String)
+    suspend fun getStoredSyncFilterBody(): String?
 
     /**
-     * Return filter json or filter id.
+     * Returns stored sync filter's ID if it exists.
      */
-    suspend fun getFilter(): String
+    suspend fun getStoredSyncFilterId(): String?
 
     /**
      * Return the room filter.
      */
-    suspend fun getRoomFilter(): String
+    suspend fun getRoomFilterBody(): String
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/GetCurrentFilterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/GetCurrentFilterTask.kt
new file mode 100644
index 0000000000..5c7027f8b3
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/GetCurrentFilterTask.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.filter
+
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.internal.session.homeserver.HomeServerCapabilitiesDataSource
+import org.matrix.android.sdk.internal.sync.filter.SyncFilterBuilder
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface GetCurrentFilterTask : Task<Unit, String>
+
+internal class DefaultGetCurrentFilterTask @Inject constructor(
+        private val filterRepository: FilterRepository,
+        private val homeServerCapabilitiesDataSource: HomeServerCapabilitiesDataSource,
+        private val saveFilterTask: SaveFilterTask,
+        private val matrixConfiguration: MatrixConfiguration
+) : GetCurrentFilterTask {
+
+    override suspend fun execute(params: Unit): String {
+        val storedFilterId = filterRepository.getStoredSyncFilterId()
+        val storedFilterBody = filterRepository.getStoredSyncFilterBody()
+        val homeServerCapabilities = homeServerCapabilitiesDataSource.getHomeServerCapabilities() ?: HomeServerCapabilities()
+        val currentFilter = SyncFilterBuilder()
+                .with(matrixConfiguration.syncConfig.syncFilterParams)
+                .build(homeServerCapabilities)
+
+        val currentFilterBody = currentFilter.toJSONString()
+
+        return when (storedFilterBody) {
+            currentFilterBody -> storedFilterId ?: storedFilterBody
+            else -> saveFilter(currentFilter) ?: currentFilterBody
+        }
+    }
+
+    private suspend fun saveFilter(filter: Filter) = saveFilterTask
+            .execute(
+                    SaveFilterTask.Params(
+                            filter = filter
+                    )
+            )
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
index 220c401137..4bb66a6159 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
@@ -17,6 +17,7 @@ package org.matrix.android.sdk.internal.session.filter
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.sync.model.RoomSync
 import org.matrix.android.sdk.internal.di.MoshiProvider
 
 /**
@@ -74,9 +75,15 @@ internal data class RoomEventFilter(
          */
         @Json(name = "contains_url") val containsUrl: Boolean? = null,
         /**
-         * If true, enables lazy-loading of membership events. See Lazy-loading room members for more information. Defaults to false.
+         * If true, enables lazy-loading of membership events.
+         * See Lazy-loading room members for more information.
+         * Defaults to false.
          */
-        @Json(name = "lazy_load_members") val lazyLoadMembers: Boolean? = null
+        @Json(name = "lazy_load_members") val lazyLoadMembers: Boolean? = null,
+        /**
+         * If true, this will opt-in for the server to return unread threads notifications in [RoomSync].
+         */
+        @Json(name = "unread_thread_notifications") val enableUnreadThreadNotifications: Boolean? = null,
 ) {
 
     fun toJSONString(): String {
@@ -92,6 +99,7 @@ internal data class RoomEventFilter(
                 rooms != null ||
                 notRooms != null ||
                 containsUrl != null ||
-                lazyLoadMembers != null)
+                lazyLoadMembers != null ||
+                enableUnreadThreadNotifications != null)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
index 63afa1bbbc..0223cd3ee7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
@@ -16,7 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.filter
 
-import org.matrix.android.sdk.api.session.sync.FilterService
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
@@ -25,11 +25,12 @@ import javax.inject.Inject
 
 /**
  * Save a filter, in db and if any changes, upload to the server.
+ * Return the filterId if uploading to the server is successful, else return null.
  */
-internal interface SaveFilterTask : Task<SaveFilterTask.Params, Unit> {
+internal interface SaveFilterTask : Task<SaveFilterTask.Params, String?> {
 
     data class Params(
-            val filterPreset: FilterService.FilterPreset
+            val filter: Filter
     )
 }
 
@@ -37,33 +38,23 @@ internal class DefaultSaveFilterTask @Inject constructor(
         @UserId private val userId: String,
         private val filterAPI: FilterApi,
         private val filterRepository: FilterRepository,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
 ) : SaveFilterTask {
 
-    override suspend fun execute(params: SaveFilterTask.Params) {
-        val filterBody = when (params.filterPreset) {
-            FilterService.FilterPreset.ElementFilter -> {
-                FilterFactory.createElementFilter()
-            }
-            FilterService.FilterPreset.NoFilter -> {
-                FilterFactory.createDefaultFilter()
+    override suspend fun execute(params: SaveFilterTask.Params): String? {
+        val filter = params.filter
+        val filterResponse = tryOrNull {
+            executeRequest(globalErrorReceiver) {
+                filterAPI.uploadFilter(userId, filter)
             }
         }
-        val roomFilter = when (params.filterPreset) {
-            FilterService.FilterPreset.ElementFilter -> {
-                FilterFactory.createElementRoomFilter()
-            }
-            FilterService.FilterPreset.NoFilter -> {
-                FilterFactory.createDefaultRoomFilter()
-            }
-        }
-        val updated = filterRepository.storeFilter(filterBody, roomFilter)
-        if (updated) {
-            val filterResponse = executeRequest(globalErrorReceiver) {
-                // TODO auto retry
-                filterAPI.uploadFilter(userId, filterBody)
-            }
-            filterRepository.storeFilterId(filterBody, filterResponse.filterId)
-        }
+
+        val filterId = filterResponse?.filterId
+        filterRepository.storeSyncFilter(
+                filter = filter,
+                filterId = filterId.orEmpty(),
+                roomEventFilter = FilterFactory.createDefaultRoomFilter()
+        )
+        return filterId
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
index 4c755b54b5..eb9e862de2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
@@ -16,8 +16,10 @@
 
 package org.matrix.android.sdk.internal.session.homeserver
 
+import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.api.util.Optional
 import javax.inject.Inject
 
 internal class DefaultHomeServerCapabilitiesService @Inject constructor(
@@ -33,4 +35,8 @@ internal class DefaultHomeServerCapabilitiesService @Inject constructor(
         return homeServerCapabilitiesDataSource.getHomeServerCapabilities()
                 ?: HomeServerCapabilities()
     }
+
+    override fun getHomeServerCapabilitiesLive(): LiveData<Optional<HomeServerCapabilities>> {
+        return homeServerCapabilitiesDataSource.getHomeServerCapabilitiesLive()
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index add69dd8c7..11e86a5c51 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -20,11 +20,13 @@ import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.MatrixPatterns.getServerName
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
-import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportLogoutDevices
+import org.matrix.android.sdk.internal.auth.version.doesServerSupportQrCodeLogin
+import org.matrix.android.sdk.internal.auth.version.doesServerSupportRemoteToggleOfPushNotifications
+import org.matrix.android.sdk.internal.auth.version.doesServerSupportThreadUnreadNotifications
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportThreads
 import org.matrix.android.sdk.internal.auth.version.isLoginAndRegistrationSupportedBySdk
 import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
@@ -132,8 +134,6 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
                 homeServerCapabilitiesEntity.roomVersionsJson = capabilities?.roomVersions?.let {
                     MoshiProvider.providesMoshi().adapter(RoomVersions::class.java).toJson(it)
                 }
-                homeServerCapabilitiesEntity.canUseThreading = /* capabilities?.threads?.enabled.orFalse() || */
-                        getVersionResult?.doesServerSupportThreads().orFalse()
             }
 
             if (getMediaConfigResult != null) {
@@ -142,8 +142,18 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
             }
 
             if (getVersionResult != null) {
-                homeServerCapabilitiesEntity.lastVersionIdentityServerSupported = getVersionResult.isLoginAndRegistrationSupportedBySdk()
-                homeServerCapabilitiesEntity.canControlLogoutDevices = getVersionResult.doesServerSupportLogoutDevices()
+                homeServerCapabilitiesEntity.lastVersionIdentityServerSupported =
+                        getVersionResult.isLoginAndRegistrationSupportedBySdk()
+                homeServerCapabilitiesEntity.canControlLogoutDevices =
+                        getVersionResult.doesServerSupportLogoutDevices()
+                homeServerCapabilitiesEntity.canUseThreading = /* capabilities?.threads?.enabled.orFalse() || */
+                        getVersionResult.doesServerSupportThreads()
+                homeServerCapabilitiesEntity.canUseThreadReadReceiptsAndNotifications =
+                        getVersionResult.doesServerSupportThreadUnreadNotifications()
+                homeServerCapabilitiesEntity.canLoginWithQrCode =
+                        getVersionResult.doesServerSupportQrCodeLogin()
+                homeServerCapabilitiesEntity.canRemotelyTogglePushNotificationsOfDevices =
+                        getVersionResult.doesServerSupportRemoteToggleOfPushNotifications()
             }
 
             if (getWellknownResult != null && getWellknownResult is WellknownResult.Prompt) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesDataSource.kt
index 6c913fa41e..beb1e67e40 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesDataSource.kt
@@ -16,9 +16,14 @@
 
 package org.matrix.android.sdk.internal.session.homeserver
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
+import io.realm.kotlin.where
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.mapper.HomeServerCapabilitiesMapper
 import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
 import org.matrix.android.sdk.internal.database.query.get
@@ -26,7 +31,7 @@ import org.matrix.android.sdk.internal.di.SessionDatabase
 import javax.inject.Inject
 
 internal class HomeServerCapabilitiesDataSource @Inject constructor(
-        @SessionDatabase private val monarchy: Monarchy
+        @SessionDatabase private val monarchy: Monarchy,
 ) {
     fun getHomeServerCapabilities(): HomeServerCapabilities? {
         return Realm.getInstance(monarchy.realmConfiguration).use { realm ->
@@ -35,4 +40,14 @@ internal class HomeServerCapabilitiesDataSource @Inject constructor(
             }
         }
     }
+
+    fun getHomeServerCapabilitiesLive(): LiveData<Optional<HomeServerCapabilities>> {
+        val liveData = monarchy.findAllMappedWithChanges(
+                { realm: Realm -> realm.where<HomeServerCapabilitiesEntity>() },
+                { HomeServerCapabilitiesMapper.map(it) }
+        )
+        return Transformations.map(liveData) {
+            it.firstOrNull().toOptional()
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
index 40444edcab..22bb3d37b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
@@ -17,26 +17,40 @@
 
 package org.matrix.android.sdk.internal.session.profile
 
+import com.zhuinden.monarchy.Monarchy
+import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.user.UserEntityFactory
 import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import javax.inject.Inject
 
 internal abstract class GetProfileInfoTask : Task<GetProfileInfoTask.Params, JsonDict> {
     data class Params(
-            val userId: String
+            val userId: String,
+            val storeInDatabase: Boolean = true,
     )
 }
 
 internal class DefaultGetProfileInfoTask @Inject constructor(
         private val profileAPI: ProfileAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        @SessionDatabase private val monarchy: Monarchy,
 ) : GetProfileInfoTask() {
 
     override suspend fun execute(params: Params): JsonDict {
         return executeRequest(globalErrorReceiver) {
             profileAPI.getProfile(params.userId)
+        }.also { user ->
+            if (params.storeInDatabase) {
+                // Insert into DB
+                monarchy.awaitTransaction {
+                    it.insertOrUpdate(UserEntityFactory.create(User.fromJson(params.userId, user)))
+                }
+            }
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherTask.kt
index 7d81e19265..3e145dc668 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherTask.kt
@@ -38,6 +38,7 @@ internal class DefaultAddPusherTask @Inject constructor(
         private val requestExecutor: RequestExecutor,
         private val globalErrorReceiver: GlobalErrorReceiver
 ) : AddPusherTask {
+
     override suspend fun execute(params: AddPusherTask.Params) {
         val pusher = params.pusher
         try {
@@ -71,6 +72,8 @@ internal class DefaultAddPusherTask @Inject constructor(
                 echo.profileTag = pusher.profileTag
                 echo.data?.format = pusher.data?.format
                 echo.data?.url = pusher.data?.url
+                echo.enabled = pusher.enabled
+                echo.deviceId = pusher.deviceId
                 echo.state = PusherState.REGISTERED
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index e912d9ccf8..e89cfa508c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -42,6 +42,7 @@ internal class DefaultPushersService @Inject constructor(
         private val getPusherTask: GetPushersTask,
         private val pushGatewayNotifyTask: PushGatewayNotifyTask,
         private val addPusherTask: AddPusherTask,
+        private val togglePusherTask: TogglePusherTask,
         private val removePusherTask: RemovePusherTask,
         private val taskExecutor: TaskExecutor
 ) : PushersService {
@@ -78,7 +79,9 @@ internal class DefaultPushersService @Inject constructor(
             appDisplayName = appDisplayName,
             deviceDisplayName = deviceDisplayName,
             data = JsonPusherData(url, EVENT_ID_ONLY.takeIf { withEventIdOnly }),
-            append = append
+            append = append,
+            enabled = enabled,
+            deviceId = deviceId,
     )
 
     override suspend fun addEmailPusher(
@@ -106,6 +109,24 @@ internal class DefaultPushersService @Inject constructor(
         )
     }
 
+    override suspend fun togglePusher(pusher: Pusher, enable: Boolean) {
+        togglePusherTask.execute(TogglePusherTask.Params(pusher.toJsonPusher(), enable))
+    }
+
+    private fun Pusher.toJsonPusher() = JsonPusher(
+            pushKey = pushKey,
+            kind = kind,
+            appId = appId,
+            appDisplayName = appDisplayName,
+            deviceDisplayName = deviceDisplayName,
+            profileTag = profileTag,
+            lang = lang,
+            data = JsonPusherData(data.url, data.format),
+            append = false,
+            enabled = enabled,
+            deviceId = deviceId,
+    )
+
     private fun enqueueAddPusher(pusher: JsonPusher): UUID {
         val params = AddPusherWorker.Params(sessionId, pusher)
         val request = workManagerProvider.matrixOneTimeWorkRequestBuilder<AddPusherWorker>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt
index 71a1ea8c66..c1cf3eb276 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt
@@ -33,6 +33,8 @@ import java.security.InvalidParameterException
  *              "device_display_name": "Alice's Phone",
  *              "profile_tag": "xyz",
  *              "lang": "en-US",
+ *              "enabled": true,
+ *              "device_id": "abc123",
  *              "data": {
  *              "url": "https://example.com/_matrix/push/v1/notify"
  *          }
@@ -112,7 +114,19 @@ internal data class JsonPusher(
          * The default is false.
          */
         @Json(name = "append")
-        val append: Boolean? = false
+        val append: Boolean? = false,
+
+        /**
+         * Whether the pusher should actively create push notifications.
+         */
+        @Json(name = "org.matrix.msc3881.enabled")
+        val enabled: Boolean = true,
+
+        /**
+         * The device_id of the session that registered the pusher.
+         */
+        @Json(name = "org.matrix.msc3881.device_id")
+        val deviceId: String? = null,
 ) {
     init {
         // Do some parameter checks. It's ok to throw Exception, to inform developer of the problem
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
index 4528c95e69..37c1c0c3ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
@@ -68,6 +68,9 @@ internal abstract class PushersModule {
     @Binds
     abstract fun bindAddPusherTask(task: DefaultAddPusherTask): AddPusherTask
 
+    @Binds
+    abstract fun bindTogglePusherTask(task: DefaultTogglePusherTask): TogglePusherTask
+
     @Binds
     abstract fun bindRemovePusherTask(task: DefaultRemovePusherTask): RemovePusherTask
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/TogglePusherTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/TogglePusherTask.kt
new file mode 100644
index 0000000000..87836e1c76
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/TogglePusherTask.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package org.matrix.android.sdk.internal.session.pushers
+
+import com.zhuinden.monarchy.Monarchy
+import org.matrix.android.sdk.internal.database.model.PusherEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
+import org.matrix.android.sdk.internal.network.RequestExecutor
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import javax.inject.Inject
+
+internal interface TogglePusherTask : Task<TogglePusherTask.Params, Unit> {
+    data class Params(val pusher: JsonPusher, val enable: Boolean)
+}
+
+internal class DefaultTogglePusherTask @Inject constructor(
+        private val pushersAPI: PushersAPI,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val requestExecutor: RequestExecutor,
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : TogglePusherTask {
+
+    override suspend fun execute(params: TogglePusherTask.Params) {
+        val pusher = params.pusher.copy(enabled = params.enable)
+
+        requestExecutor.executeRequest(globalErrorReceiver) {
+            pushersAPI.setPusher(pusher)
+        }
+
+        monarchy.awaitTransaction { realm ->
+            val entity = PusherEntity.where(realm, params.pusher.pushKey).findFirst()
+            entity?.apply { enabled = params.enable }?.let { realm.insertOrUpdate(it) }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt
index 09d7d50ecb..9fe93d8262 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt
@@ -56,8 +56,8 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
 
         val allEvents = (newJoinEvents + inviteEvents).filter { event ->
             when (event.type) {
-                in EventType.POLL_START,
-                in EventType.STATE_ROOM_BEACON_INFO,
+                in EventType.POLL_START.values,
+                in EventType.STATE_ROOM_BEACON_INFO.values,
                 EventType.MESSAGE,
                 EventType.REDACTION,
                 EventType.ENCRYPTED,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index abea2d34cd..262c111b73 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.session.room.call.RoomCallService
 import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
 import org.matrix.android.sdk.api.session.room.location.LocationSharingService
 import org.matrix.android.sdk.api.session.room.members.MembershipService
+import org.matrix.android.sdk.api.session.room.model.LocalRoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.relation.RelationService
@@ -82,6 +83,14 @@ internal class DefaultRoom(
         return roomSummaryDataSource.getRoomSummary(roomId)
     }
 
+    override fun getLocalRoomSummaryLive(): LiveData<Optional<LocalRoomSummary>> {
+        return roomSummaryDataSource.getLocalRoomSummaryLive(roomId)
+    }
+
+    override fun localRoomSummary(): LocalRoomSummary? {
+        return roomSummaryDataSource.getLocalRoomSummary(roomId)
+    }
+
     override fun asSpace(): Space? {
         if (roomSummary()?.roomType != RoomType.SPACE) return null
         return DefaultSpace(this, roomSummaryDataSource, viaParameterFinder)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 989bcaee44..6d72b8ef20 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -29,10 +29,12 @@ import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.alias.RoomAliasDescription
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.LocalRoomSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
@@ -106,6 +108,10 @@ internal class DefaultRoomService @Inject constructor(
         return roomSummaryDataSource.getRoomSummaryLive(roomId)
     }
 
+    override fun getLocalRoomSummaryLive(roomId: String): LiveData<Optional<LocalRoomSummary>> {
+        return roomSummaryDataSource.getLocalRoomSummaryLive(roomId)
+    }
+
     override fun getRoomSummaries(
             queryParams: RoomSummaryQueryParams,
             sortOrder: RoomSortOrder
@@ -173,7 +179,10 @@ internal class DefaultRoomService @Inject constructor(
     }
 
     override suspend fun onRoomDisplayed(roomId: String) {
-        updateBreadcrumbsTask.execute(UpdateBreadcrumbsTask.Params(roomId))
+        // Do not add local rooms to the recent rooms list as they should not be known by the server
+        if (!RoomLocalEcho.isLocalEchoId(roomId)) {
+            updateBreadcrumbsTask.execute(UpdateBreadcrumbsTask.Params(roomId))
+        }
     }
 
     override suspend fun joinRoom(roomIdOrAlias: String, reason: String?, viaServers: List<String>) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventEditValidator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventEditValidator.kt
new file mode 100644
index 0000000000..41d0c3f6ab
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventEditValidator.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room
+
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.getRelationContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.events.model.toValidDecryptedEvent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import timber.log.Timber
+import javax.inject.Inject
+
+internal class EventEditValidator @Inject constructor(val cryptoStore: IMXCryptoStore) {
+
+    sealed class EditValidity {
+        object Valid : EditValidity()
+        data class Invalid(val reason: String) : EditValidity()
+        object Unknown : EditValidity()
+    }
+
+    /**
+     * There are a number of requirements on replacement events, which must be satisfied for the replacement
+     * to be considered valid:
+     * As with all event relationships, the original event and replacement event must have the same room_id
+     * (i.e. you cannot send an event in one room and then an edited version in a different room).
+     * The original event and replacement event must have the same sender (i.e. you cannot edit someone else’s messages).
+     * The replacement and original events must have the same type (i.e. you cannot change the original event’s type).
+     * The replacement and original events must not have a state_key property (i.e. you cannot edit state events at all).
+     * The original event must not, itself, have a rel_type of m.replace
+     * (i.e. you cannot edit an edit — though you can send multiple edits for a single original event).
+     * The replacement event (once decrypted, if appropriate) must have an m.new_content property.
+     *
+     * If the original event was encrypted, the replacement should be too.
+     */
+    fun validateEdit(originalEvent: Event?, replaceEvent: Event): EditValidity {
+        Timber.v("###REPLACE valide event $originalEvent replaced $replaceEvent")
+        // we might not know the original event at that time. In this case we can't perform the validation
+        // Edits should be revalidated when the original event is received
+        if (originalEvent == null) {
+            return EditValidity.Unknown
+        }
+
+        if (LocalEcho.isLocalEchoId(replaceEvent.eventId.orEmpty())) {
+            // Don't validate local echo
+            return EditValidity.Unknown
+        }
+
+        if (originalEvent.roomId != replaceEvent.roomId) {
+            return EditValidity.Invalid("original event and replacement event must have the same room_id")
+        }
+        if (originalEvent.isStateEvent() || replaceEvent.isStateEvent()) {
+            return EditValidity.Invalid("replacement and original events must not have a state_key property")
+        }
+        // check it's from same sender
+
+        if (originalEvent.isEncrypted()) {
+            if (!replaceEvent.isEncrypted()) return EditValidity.Invalid("If the original event was encrypted, the replacement should be too")
+            val originalDecrypted = originalEvent.toValidDecryptedEvent()
+                    ?: return EditValidity.Unknown // UTD can't decide
+            val replaceDecrypted = replaceEvent.toValidDecryptedEvent()
+                    ?: return EditValidity.Unknown // UTD can't decide
+
+            val originalCryptoSenderId = cryptoStore.deviceWithIdentityKey(originalDecrypted.cryptoSenderKey)?.userId
+            val editCryptoSenderId = cryptoStore.deviceWithIdentityKey(replaceDecrypted.cryptoSenderKey)?.userId
+
+            if (originalDecrypted.getRelationContent()?.type == RelationType.REPLACE) {
+                return EditValidity.Invalid("The original event must not, itself, have a rel_type of m.replace ")
+            }
+
+            if (originalCryptoSenderId == null || editCryptoSenderId == null) {
+                // mm what can we do? we don't know if it's cryptographically from same user?
+                // let valid and UI should display send by deleted device warning?
+                val bestEffortOriginal = originalCryptoSenderId ?: originalEvent.senderId
+                val bestEffortEdit = editCryptoSenderId ?: replaceEvent.senderId
+                if (bestEffortOriginal != bestEffortEdit) {
+                    return EditValidity.Invalid("original event and replacement event must have the same sender")
+                }
+            } else {
+                if (originalCryptoSenderId != editCryptoSenderId) {
+                    return EditValidity.Invalid("Crypto: original event and replacement event must have the same sender")
+                }
+            }
+
+            if (originalDecrypted.type != replaceDecrypted.type) {
+                return EditValidity.Invalid("replacement and original events must have the same type")
+            }
+            if (replaceDecrypted.clearContent.toModel<MessageContent>()?.newContent == null) {
+                return EditValidity.Invalid("replacement event must have an m.new_content property")
+            }
+        } else {
+            if (originalEvent.getRelationContent()?.type == RelationType.REPLACE) {
+                return EditValidity.Invalid("The original event must not, itself, have a rel_type of m.replace ")
+            }
+
+            // check the sender
+            if (originalEvent.senderId != replaceEvent.senderId) {
+                return EditValidity.Invalid("original event and replacement event must have the same sender")
+            }
+            if (originalEvent.type != replaceEvent.type) {
+                return EditValidity.Invalid("replacement and original events must have the same type")
+            }
+            if (replaceEvent.content.toModel<MessageContent>()?.newContent == null) {
+                return EditValidity.Invalid("replacement event must have an m.new_content property")
+            }
+        }
+
+        return EditValidity.Valid
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 24d4975eb9..be73309837 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -42,6 +42,7 @@ import org.matrix.android.sdk.internal.crypto.verification.toState
 import org.matrix.android.sdk.internal.database.helper.findRootThreadEvent
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.mapper.EventMapper
+import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntity
 import org.matrix.android.sdk.internal.database.model.EditionOfEvent
 import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
@@ -72,6 +73,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
         private val sessionManager: SessionManager,
         private val liveLocationAggregationProcessor: LiveLocationAggregationProcessor,
         private val pollAggregationProcessor: PollAggregationProcessor,
+        private val editValidator: EventEditValidator,
         private val clock: Clock,
 ) : EventInsertLiveProcessor {
 
@@ -79,22 +81,28 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
             EventType.MESSAGE,
             EventType.REDACTION,
             EventType.REACTION,
+            // The aggregator handles verification events but just to render tiles in the timeline
+            // It's not participating in verification itself, just timeline display
             EventType.KEY_VERIFICATION_DONE,
             EventType.KEY_VERIFICATION_CANCEL,
             EventType.KEY_VERIFICATION_ACCEPT,
             EventType.KEY_VERIFICATION_START,
             EventType.KEY_VERIFICATION_MAC,
-            // TODO Add ?
-            // EventType.KEY_VERIFICATION_READY,
+            EventType.KEY_VERIFICATION_READY,
             EventType.KEY_VERIFICATION_KEY,
             EventType.ENCRYPTED
-    ) + EventType.POLL_START + EventType.POLL_RESPONSE + EventType.POLL_END + EventType.STATE_ROOM_BEACON_INFO + EventType.BEACON_LOCATION_DATA
+    ) +
+            EventType.POLL_START.values +
+            EventType.POLL_RESPONSE.values +
+            EventType.POLL_END.values +
+            EventType.STATE_ROOM_BEACON_INFO.values +
+            EventType.BEACON_LOCATION_DATA.values
 
     override fun shouldProcess(eventId: String, eventType: String, insertType: EventInsertType): Boolean {
         return allowedTypes.contains(eventType)
     }
 
-    override suspend fun process(realm: Realm, event: Event) {
+    override fun process(realm: Realm, event: Event) {
         try { // Temporary catch, should be removed
             val roomId = event.roomId
             if (roomId == null) {
@@ -102,7 +110,31 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                 return
             }
             val isLocalEcho = LocalEcho.isLocalEchoId(event.eventId ?: "")
-            when (event.type) {
+
+            // It might be a late decryption of the original event or a event received when back paginating?
+            // let's check if there is already a summary for it and do some cleaning
+            if (!isLocalEcho) {
+                EventAnnotationsSummaryEntity.where(realm, roomId, event.eventId.orEmpty())
+                        .findFirst()
+                        ?.editSummary
+                        ?.editions
+                        ?.forEach { editionOfEvent ->
+                            EventEntity.where(realm, editionOfEvent.eventId).findFirst()?.asDomain()?.let { editEvent ->
+                                when (editValidator.validateEdit(event, editEvent)) {
+                                    is EventEditValidator.EditValidity.Invalid -> {
+                                        // delete it, it was invalid
+                                        Timber.v("## Replace: Removing a previously accepted edit for event ${event.eventId}")
+                                        editionOfEvent.deleteFromRealm()
+                                    }
+                                    else -> {
+                                        // nop
+                                    }
+                                }
+                            }
+                        }
+            }
+
+            when (event.getClearType()) {
                 EventType.REACTION -> {
                     // we got a reaction!!
                     Timber.v("###REACTION in room $roomId , reaction eventID ${event.eventId}")
@@ -113,21 +145,17 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                         Timber.v("###REACTION Aggregation in room $roomId for event ${event.eventId}")
                         handleInitialAggregatedRelations(realm, event, roomId, event.unsignedData.relations.annotations)
 
-                        EventAnnotationsSummaryEntity.where(realm, roomId, event.eventId ?: "").findFirst()
-                                ?.let {
-                                    TimelineEventEntity.where(realm, roomId = roomId, eventId = event.eventId ?: "").findAll()
-                                            ?.forEach { tet -> tet.annotations = it }
-                                }
+                        // XXX do something for aggregated edits?
+                        // it's a bit strange as it would require to do a server query to get the edition?
                     }
 
-                    val content: MessageContent? = event.content.toModel()
-                    if (content?.relatesTo?.type == RelationType.REPLACE) {
+                    val relationContent = event.getRelationContent()
+                    if (relationContent?.type == RelationType.REPLACE) {
                         Timber.v("###REPLACE in room $roomId for event ${event.eventId}")
                         // A replace!
-                        handleReplace(realm, event, content, roomId, isLocalEcho)
+                        handleReplace(realm, event, roomId, isLocalEcho, relationContent.eventId)
                     }
                 }
-
                 EventType.KEY_VERIFICATION_DONE,
                 EventType.KEY_VERIFICATION_CANCEL,
                 EventType.KEY_VERIFICATION_ACCEPT,
@@ -142,74 +170,31 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                         }
                     }
                 }
-
+                // As for now Live event processors are not receiving UTD events.
+                // They will get an update if the event is decrypted later
                 EventType.ENCRYPTED -> {
-                    // Relation type is in clear
+                    // Relation type is in clear, it might be possible to do some things?
+                    // Notice that if the event is decrypted later, process be called again
                     val encryptedEventContent = event.content.toModel<EncryptedEventContent>()
-                    if (encryptedEventContent?.relatesTo?.type == RelationType.REPLACE ||
-                            encryptedEventContent?.relatesTo?.type == RelationType.RESPONSE
-                    ) {
-                        event.getClearContent().toModel<MessageContent>()?.let {
-                            if (encryptedEventContent.relatesTo.type == RelationType.REPLACE) {
-                                Timber.v("###REPLACE in room $roomId for event ${event.eventId}")
-                                // A replace!
-                                handleReplace(realm, event, it, roomId, isLocalEcho, encryptedEventContent.relatesTo.eventId)
-                            } else if (event.getClearType() in EventType.POLL_RESPONSE) {
-                                sessionManager.getSessionComponent(sessionId)?.session()?.let { session ->
-                                    pollAggregationProcessor.handlePollResponseEvent(session, realm, event)
-                                }
-                            }
+                    when (encryptedEventContent?.relatesTo?.type) {
+                        RelationType.REPLACE -> {
+                            Timber.v("###REPLACE in room $roomId for event ${event.eventId}")
+                            // A replace!
+                            handleReplace(realm, event, roomId, isLocalEcho, encryptedEventContent.relatesTo.eventId)
                         }
-                    } else if (encryptedEventContent?.relatesTo?.type == RelationType.REFERENCE) {
-                        when (event.getClearType()) {
-                            EventType.KEY_VERIFICATION_DONE,
-                            EventType.KEY_VERIFICATION_CANCEL,
-                            EventType.KEY_VERIFICATION_ACCEPT,
-                            EventType.KEY_VERIFICATION_START,
-                            EventType.KEY_VERIFICATION_MAC,
-                            EventType.KEY_VERIFICATION_READY,
-                            EventType.KEY_VERIFICATION_KEY -> {
-                                Timber.v("## SAS REF in room $roomId for event ${event.eventId}")
-                                encryptedEventContent.relatesTo.eventId?.let {
-                                    handleVerification(realm, event, roomId, isLocalEcho, it)
-                                }
-                            }
-                            in EventType.POLL_RESPONSE -> {
-                                event.getClearContent().toModel<MessagePollResponseContent>(catchError = true)?.let {
-                                    sessionManager.getSessionComponent(sessionId)?.session()?.let { session ->
-                                        pollAggregationProcessor.handlePollResponseEvent(session, realm, event)
-                                    }
-                                }
-                            }
-                            in EventType.POLL_END -> {
-                                sessionManager.getSessionComponent(sessionId)?.session()?.let { session ->
-                                    getPowerLevelsHelper(event.roomId)?.let {
-                                        pollAggregationProcessor.handlePollEndEvent(session, it, realm, event)
-                                    }
-                                }
-                            }
-                            in EventType.BEACON_LOCATION_DATA -> {
-                                handleBeaconLocationData(event, realm, roomId, isLocalEcho)
-                            }
+                        RelationType.RESPONSE -> {
+                            // can we / should we do we something for UTD response??
+                            Timber.w("## UTD response in room $roomId related to ${encryptedEventContent.relatesTo.eventId}")
                         }
-                    } else if (encryptedEventContent?.relatesTo?.type == RelationType.ANNOTATION) {
-                        // Reaction
-                        if (event.getClearType() == EventType.REACTION) {
-                            // we got a reaction!!
-                            Timber.v("###REACTION e2e in room $roomId , reaction eventID ${event.eventId}")
-                            handleReaction(realm, event, roomId, isLocalEcho)
+                        RelationType.REFERENCE -> {
+                            // can we / should we do we something for UTD reference??
+                            Timber.w("## UTD reference in room $roomId related to ${encryptedEventContent.relatesTo.eventId}")
+                        }
+                        RelationType.ANNOTATION -> {
+                            // can we / should we do we something for UTD annotation??
+                            Timber.w("## UTD annotation in room $roomId related to ${encryptedEventContent.relatesTo.eventId}")
                         }
                     }
-                    // HandleInitialAggregatedRelations should also be applied in encrypted messages with annotations
-//                    else if (event.unsignedData?.relations?.annotations != null) {
-//                        Timber.v("###REACTION e2e Aggregation in room $roomId for event ${event.eventId}")
-//                        handleInitialAggregatedRelations(realm, event, roomId, event.unsignedData.relations.annotations)
-//                         EventAnnotationsSummaryEntity.where(realm, roomId, event.eventId ?: "").findFirst()
-//                                 ?.let {
-//                                     TimelineEventEntity.where(realm, roomId = roomId, eventId = event.eventId ?: "").findAll()
-//                                             ?.forEach { tet -> tet.annotations = it }
-//                                 }
-//                    }
                 }
                 EventType.REDACTION -> {
                     val eventToPrune = event.redacts?.let { EventEntity.where(realm, eventId = it).findFirst() }
@@ -217,9 +202,6 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                     when (eventToPrune.type) {
                         EventType.MESSAGE -> {
                             Timber.d("REDACTION for message ${eventToPrune.eventId}")
-//                                val unsignedData = EventMapper.map(eventToPrune).unsignedData
-//                                        ?: UnsignedData(null, null)
-
                             // was this event a m.replace
                             val contentModel = ContentMapper.map(eventToPrune.content)?.toModel<MessageContent>()
                             if (RelationType.REPLACE == contentModel?.relatesTo?.type && contentModel.relatesTo?.eventId != null) {
@@ -231,34 +213,34 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                         }
                     }
                 }
-                in EventType.POLL_START -> {
+                in EventType.POLL_START.values -> {
                     val content: MessagePollContent? = event.content.toModel()
                     if (content?.relatesTo?.type == RelationType.REPLACE) {
                         Timber.v("###REPLACE in room $roomId for event ${event.eventId}")
                         // A replace!
-                        handleReplace(realm, event, content, roomId, isLocalEcho)
+                        handleReplace(realm, event, roomId, isLocalEcho, content.relatesTo.eventId)
                     }
                 }
-                in EventType.POLL_RESPONSE -> {
+                in EventType.POLL_RESPONSE.values -> {
                     event.content.toModel<MessagePollResponseContent>(catchError = true)?.let {
                         sessionManager.getSessionComponent(sessionId)?.session()?.let { session ->
                             pollAggregationProcessor.handlePollResponseEvent(session, realm, event)
                         }
                     }
                 }
-                in EventType.POLL_END -> {
+                in EventType.POLL_END.values -> {
                     sessionManager.getSessionComponent(sessionId)?.session()?.let { session ->
                         getPowerLevelsHelper(event.roomId)?.let {
                             pollAggregationProcessor.handlePollEndEvent(session, it, realm, event)
                         }
                     }
                 }
-                in EventType.STATE_ROOM_BEACON_INFO -> {
+                in EventType.STATE_ROOM_BEACON_INFO.values -> {
                     event.content.toModel<MessageBeaconInfoContent>(catchError = true)?.let {
                         liveLocationAggregationProcessor.handleBeaconInfo(realm, event, it, roomId, isLocalEcho)
                     }
                 }
-                in EventType.BEACON_LOCATION_DATA -> {
+                in EventType.BEACON_LOCATION_DATA.values -> {
                     handleBeaconLocationData(event, realm, roomId, isLocalEcho)
                 }
                 else -> Timber.v("UnHandled event ${event.eventId}")
@@ -274,23 +256,22 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
     private fun handleReplace(
             realm: Realm,
             event: Event,
-            content: MessageContent,
             roomId: String,
             isLocalEcho: Boolean,
-            relatedEventId: String? = null
+            relatedEventId: String?
     ) {
         val eventId = event.eventId ?: return
-        val targetEventId = relatedEventId ?: content.relatesTo?.eventId ?: return
-        val newContent = content.newContent ?: return
-
-        // Check that the sender is the same
+        val targetEventId = relatedEventId ?: return
         val editedEvent = EventEntity.where(realm, targetEventId).findFirst()
-        if (editedEvent == null) {
-            // We do not know yet about the edited event
-        } else if (editedEvent.sender != event.senderId) {
-            // Edited by someone else, ignore
-            Timber.w("Ignore edition by someone else")
-            return
+
+        when (val validity = editValidator.validateEdit(editedEvent?.asDomain(), event)) {
+            is EventEditValidator.EditValidity.Invalid -> return Unit.also {
+                Timber.w("Dropping invalid edit ${event.eventId}, reason:${validity.reason}")
+            }
+            EventEditValidator.EditValidity.Unknown, // we can't drop the source event might be unknown, will be validated later
+            EventEditValidator.EditValidity.Valid -> {
+                // continue
+            }
         }
 
         // ok, this is a replace
@@ -305,11 +286,10 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                     .also { editSummary ->
                         editSummary.editions.add(
                                 EditionOfEvent(
-                                        senderId = event.senderId ?: "",
                                         eventId = event.eventId,
-                                        content = ContentMapper.map(newContent),
-                                        timestamp = if (isLocalEcho) 0 else event.originServerTs ?: 0,
-                                        isLocalEcho = isLocalEcho
+                                        event = EventEntity.where(realm, eventId).findFirst(),
+                                        timestamp = if (isLocalEcho) clock.epochMillis() else event.originServerTs ?: clock.epochMillis(),
+                                        isLocalEcho = isLocalEcho,
                                 )
                         )
                     }
@@ -326,17 +306,17 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                 // ok it has already been managed
                 Timber.v("###REPLACE Receiving remote echo of edit (edit already done)")
                 existingSummary.editions.firstOrNull { it.eventId == txId }?.let {
-                    it.eventId = event.eventId
+                    it.eventId = eventId
                     it.timestamp = event.originServerTs ?: clock.epochMillis()
                     it.isLocalEcho = false
+                    it.event = EventEntity.where(realm, eventId).findFirst()
                 }
             } else {
                 Timber.v("###REPLACE Computing aggregated edit summary (isLocalEcho:$isLocalEcho)")
                 existingSummary.editions.add(
                         EditionOfEvent(
-                                senderId = event.senderId ?: "",
-                                eventId = event.eventId,
-                                content = ContentMapper.map(newContent),
+                                eventId = eventId,
+                                event = EventEntity.where(realm, eventId).findFirst(),
                                 timestamp = if (isLocalEcho) {
                                     clock.epochMillis()
                                 } else {
@@ -349,7 +329,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
             }
         }
 
-        if (event.getClearType() in EventType.POLL_START) {
+        if (event.getClearType() in EventType.POLL_START.values) {
             pollAggregationProcessor.handlePollStartEvent(realm, event)
         }
 
@@ -501,7 +481,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
         }
         val sourceToDiscard = eventSummary.editSummary?.editions?.firstOrNull { it.eventId == redacted.eventId }
         if (sourceToDiscard == null) {
-            Timber.w("Redaction of a replace that was not known in aggregation $sourceToDiscard")
+            Timber.w("Redaction of a replace that was not known in aggregation")
             return
         }
         // Need to remove this event from the edition list
@@ -599,12 +579,12 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
     private fun handleBeaconLocationData(event: Event, realm: Realm, roomId: String, isLocalEcho: Boolean) {
         event.getClearContent().toModel<MessageBeaconLocationDataContent>(catchError = true)?.let {
             liveLocationAggregationProcessor.handleBeaconLocationData(
-                    realm,
-                    event,
-                    it,
-                    roomId,
-                    event.getRelationContent()?.eventId,
-                    isLocalEcho
+                    realm = realm,
+                    event = event,
+                    content = it,
+                    roomId = roomId,
+                    relatedEventId = event.getRelationContent()?.eventId,
+                    isLocalEcho = isLocalEcho
             )
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 9bcb7b8e4c..34b6ee525d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.session.room
 
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomStrippedState
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
@@ -33,7 +32,9 @@ import org.matrix.android.sdk.internal.session.room.membership.RoomMembersRespon
 import org.matrix.android.sdk.internal.session.room.membership.admin.UserIdAndReason
 import org.matrix.android.sdk.internal.session.room.membership.joining.InviteBody
 import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
+import org.matrix.android.sdk.internal.session.room.read.ReadBody
 import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
+import org.matrix.android.sdk.internal.session.room.relation.threads.ThreadSummariesResponse
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentBody
 import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.session.room.tags.TagBody
@@ -173,7 +174,7 @@ internal interface RoomAPI {
             @Path("roomId") roomId: String,
             @Path("receiptType") receiptType: String,
             @Path("eventId") eventId: String,
-            @Body body: JsonDict = emptyMap()
+            @Body body: ReadBody
     )
 
     /**
@@ -249,7 +250,7 @@ internal interface RoomAPI {
      * @param limit max number of Event to retrieve
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "rooms/{roomId}/relations/{eventId}/{relationType}/{eventType}")
-    suspend fun getRelations(
+    suspend fun getRelationsWithEventType(
             @Path("roomId") roomId: String,
             @Path("eventId") eventId: String,
             @Path("relationType") relationType: String,
@@ -260,7 +261,7 @@ internal interface RoomAPI {
     ): RelationsResponse
 
     /**
-     * Paginate relations for thread events based in normal topological order.
+     * Paginate relations for events based in normal topological order.
      *
      * @param roomId the room Id
      * @param eventId the event Id
@@ -270,10 +271,10 @@ internal interface RoomAPI {
      * @param limit max number of Event to retrieve
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "rooms/{roomId}/relations/{eventId}/{relationType}")
-    suspend fun getThreadsRelations(
+    suspend fun getRelations(
             @Path("roomId") roomId: String,
             @Path("eventId") eventId: String,
-            @Path("relationType") relationType: String = RelationType.THREAD,
+            @Path("relationType") relationType: String,
             @Query("from") from: String? = null,
             @Query("to") to: String? = null,
             @Query("limit") limit: Int? = null
@@ -426,6 +427,19 @@ internal interface RoomAPI {
             @Body content: JsonDict
     )
 
+    /**
+     * Remove an account_data event from the room.
+     * @param userId the user id
+     * @param roomId the room id
+     * @param type the type
+     */
+    @DELETE(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc3391/user/{userId}/rooms/{roomId}/account_data/{type}")
+    suspend fun deleteRoomAccountData(
+            @Path("userId") userId: String,
+            @Path("roomId") roomId: String,
+            @Path("type") type: String
+    )
+
     /**
      * Upgrades the given room to a particular room version.
      * Errors:
@@ -450,4 +464,12 @@ internal interface RoomAPI {
             @Path("roomIdOrAlias") roomidOrAlias: String,
             @Query("via") viaServers: List<String>?
     ): RoomStrippedState
+
+    @GET(NetworkConstants.URI_API_PREFIX_PATH_V1 + "rooms/{roomId}/threads")
+    suspend fun getThreadsList(
+            @Path("roomId") roomId: String,
+            @Query("include") include: String? = "all",
+            @Query("from") from: String? = null,
+            @Query("limit") limit: Int? = null
+    ): ThreadSummariesResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index d01324a35f..c28d24995f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -43,9 +43,13 @@ import org.matrix.android.sdk.internal.session.room.alias.DefaultGetRoomLocalAli
 import org.matrix.android.sdk.internal.session.room.alias.DeleteRoomAliasTask
 import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
 import org.matrix.android.sdk.internal.session.room.alias.GetRoomLocalAliasesTask
+import org.matrix.android.sdk.internal.session.room.create.CreateLocalRoomStateEventsTask
 import org.matrix.android.sdk.internal.session.room.create.CreateLocalRoomTask
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomFromLocalRoomTask
 import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
+import org.matrix.android.sdk.internal.session.room.create.DefaultCreateLocalRoomStateEventsTask
 import org.matrix.android.sdk.internal.session.room.create.DefaultCreateLocalRoomTask
+import org.matrix.android.sdk.internal.session.room.create.DefaultCreateRoomFromLocalRoomTask
 import org.matrix.android.sdk.internal.session.room.create.DefaultCreateRoomTask
 import org.matrix.android.sdk.internal.session.room.delete.DefaultDeleteLocalRoomTask
 import org.matrix.android.sdk.internal.session.room.delete.DeleteLocalRoomTask
@@ -95,6 +99,8 @@ import org.matrix.android.sdk.internal.session.room.relation.DefaultUpdateQuickR
 import org.matrix.android.sdk.internal.session.room.relation.FetchEditHistoryTask
 import org.matrix.android.sdk.internal.session.room.relation.FindReactionEventForUndoTask
 import org.matrix.android.sdk.internal.session.room.relation.UpdateQuickReactionTask
+import org.matrix.android.sdk.internal.session.room.relation.poll.DefaultFetchPollResponseEventsTask
+import org.matrix.android.sdk.internal.session.room.relation.poll.FetchPollResponseEventsTask
 import org.matrix.android.sdk.internal.session.room.relation.threads.DefaultFetchThreadSummariesTask
 import org.matrix.android.sdk.internal.session.room.relation.threads.DefaultFetchThreadTimelineTask
 import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadSummariesTask
@@ -213,6 +219,12 @@ internal abstract class RoomModule {
     @Binds
     abstract fun bindCreateLocalRoomTask(task: DefaultCreateLocalRoomTask): CreateLocalRoomTask
 
+    @Binds
+    abstract fun bindCreateLocalRoomStateEventsTask(task: DefaultCreateLocalRoomStateEventsTask): CreateLocalRoomStateEventsTask
+
+    @Binds
+    abstract fun bindCreateRoomFromLocalRoomTask(task: DefaultCreateRoomFromLocalRoomTask): CreateRoomFromLocalRoomTask
+
     @Binds
     abstract fun bindDeleteLocalRoomTask(task: DefaultDeleteLocalRoomTask): DeleteLocalRoomTask
 
@@ -344,4 +356,7 @@ internal abstract class RoomModule {
 
     @Binds
     abstract fun bindRedactLiveLocationShareTask(task: DefaultRedactLiveLocationShareTask): RedactLiveLocationShareTask
+
+    @Binds
+    abstract fun bindFetchPollResponseEventsTask(task: DefaultFetchPollResponseEventsTask): FetchPollResponseEventsTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessor.kt
index 90d8e02c39..a424becbd6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessor.kt
@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.internal.session.room.aggregation.poll
 
 import io.realm.Realm
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -29,7 +30,6 @@ import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.PollSummaryContent
 import org.matrix.android.sdk.api.session.room.model.VoteInfo
 import org.matrix.android.sdk.api.session.room.model.VoteSummary
-import org.matrix.android.sdk.api.session.room.model.message.MessageEndPollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollResponseContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
@@ -41,9 +41,14 @@ import org.matrix.android.sdk.internal.database.model.PollResponseAggregatedSumm
 import org.matrix.android.sdk.internal.database.query.create
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.session.room.relation.poll.FetchPollResponseEventsTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
 
-class DefaultPollAggregationProcessor @Inject constructor() : PollAggregationProcessor {
+internal class DefaultPollAggregationProcessor @Inject constructor(
+        private val taskExecutor: TaskExecutor,
+        private val fetchPollResponseEventsTask: FetchPollResponseEventsTask,
+) : PollAggregationProcessor {
 
     override fun handlePollStartEvent(realm: Realm, event: Event): Boolean {
         val content = event.getClearContent()?.toModel<MessagePollContent>()
@@ -78,7 +83,7 @@ class DefaultPollAggregationProcessor @Inject constructor() : PollAggregationPro
         val content = event.getClearContent()?.toModel<MessagePollResponseContent>() ?: return false
         val roomId = event.roomId ?: return false
         val senderId = event.senderId ?: return false
-        val targetEventId = (event.getRelationContent() ?: content.relatesTo)?.eventId ?: return false
+        val targetEventId = event.getRelationContent()?.eventId ?: return false
         val targetPollContent = getPollContent(session, roomId, targetEventId) ?: return false
 
         val annotationsSummaryEntity = getAnnotationsSummaryEntity(realm, roomId, targetEventId)
@@ -154,9 +159,8 @@ class DefaultPollAggregationProcessor @Inject constructor() : PollAggregationPro
     }
 
     override fun handlePollEndEvent(session: Session, powerLevelsHelper: PowerLevelsHelper, realm: Realm, event: Event): Boolean {
-        val content = event.getClearContent()?.toModel<MessageEndPollContent>() ?: return false
         val roomId = event.roomId ?: return false
-        val pollEventId = content.relatesTo?.eventId ?: return false
+        val pollEventId = event.getRelationContent()?.eventId ?: return false
         val pollOwnerId = getPollEvent(session, roomId, pollEventId)?.root?.senderId
         val isPollOwner = pollOwnerId == event.senderId
 
@@ -176,6 +180,10 @@ class DefaultPollAggregationProcessor @Inject constructor() : PollAggregationPro
             aggregatedPollSummaryEntity.sourceEvents.add(event.eventId)
         }
 
+        if (!isLocalEcho) {
+            ensurePollIsFullyAggregated(roomId, pollEventId)
+        }
+
         return true
     }
 
@@ -202,4 +210,20 @@ class DefaultPollAggregationProcessor @Inject constructor() : PollAggregationPro
                     eventAnnotationsSummaryEntity.pollResponseSummary = it
                 }
     }
+
+    /**
+     * Check that all related votes to a given poll are all retrieved and aggregated.
+     */
+    private fun ensurePollIsFullyAggregated(
+            roomId: String,
+            pollEventId: String
+    ) {
+        taskExecutor.executorScope.launch {
+            val params = FetchPollResponseEventsTask.Params(
+                    roomId = roomId,
+                    startPollEventId = pollEventId,
+            )
+            fetchPollResponseEventsTask.execute(params)
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomStateEventsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomStateEventsTask.kt
new file mode 100644
index 0000000000..a9ff4970fe
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomStateEventsTask.kt
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.create
+
+import org.matrix.android.sdk.api.MatrixPatterns.getServerName
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
+import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.model.RoomNameContent
+import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
+import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
+import org.matrix.android.sdk.api.session.room.model.banOrDefault
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
+import org.matrix.android.sdk.api.session.room.model.eventsDefaultOrDefault
+import org.matrix.android.sdk.api.session.room.model.inviteOrDefault
+import org.matrix.android.sdk.api.session.room.model.kickOrDefault
+import org.matrix.android.sdk.api.session.room.model.redactOrDefault
+import org.matrix.android.sdk.api.session.room.model.stateDefaultOrDefault
+import org.matrix.android.sdk.api.session.room.model.usersDefaultOrDefault
+import org.matrix.android.sdk.api.session.user.UserService
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.create.CreateLocalRoomStateEventsTask.Params
+import org.matrix.android.sdk.internal.session.room.membership.threepid.toThreePid
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.time.Clock
+import javax.inject.Inject
+
+/**
+ * Generate a list of local state events from the given [CreateRoomBody].
+ * The states events are generated according to the given configuration and following the matrix specification.
+ * This list reflects as much as possible a list of state events related to a real room configured and got from the server.
+ *
+ * Ref: https://spec.matrix.org/latest/client-server-api/#post_matrixclientv3createroom
+ */
+internal interface CreateLocalRoomStateEventsTask : Task<Params, List<Event>> {
+    data class Params(val createRoomBody: CreateRoomBody)
+}
+
+internal class DefaultCreateLocalRoomStateEventsTask @Inject constructor(
+        @UserId private val myUserId: String,
+        private val userService: UserService,
+        private val clock: Clock,
+) : CreateLocalRoomStateEventsTask {
+
+    private lateinit var createRoomBody: CreateRoomBody
+
+    override suspend fun execute(params: Params): List<Event> {
+        createRoomBody = params.createRoomBody
+
+        // Build the list of the state events following the priorities from the matrix specification
+        // Changing the order of the events might break the correct display of the room on the client side
+        return buildList {
+            createRoomCreateEvent()
+            createRoomMemberEvents(listOf(myUserId))
+            createRoomPowerLevelsEvent()
+            createRoomAliasEvent()
+            createRoomPresetEvents()
+            createRoomInitialStateEvents()
+            createRoomNameAndTopicStateEvents()
+            createRoomMemberEvents(createRoomBody.invitedUserIds.orEmpty())
+            createRoomThreePidEvents()
+            createRoomDefaultEvents()
+        }
+    }
+
+    /**
+     * Generate the create state event related to this room.
+     */
+    private fun MutableList<Event>.createRoomCreateEvent() {
+        val roomCreateEvent = createLocalStateEvent(
+                type = EventType.STATE_ROOM_CREATE,
+                content = RoomCreateContent(
+                        creator = myUserId,
+                        roomVersion = createRoomBody.roomVersion,
+                        type = (createRoomBody.creationContent as? Map<*, *>)?.get(CreateRoomParams.CREATION_CONTENT_KEY_ROOM_TYPE) as? String
+
+                ).toContent(),
+        )
+        add(roomCreateEvent)
+    }
+
+    /**
+     * Generate the create state event related to the power levels using the given overridden values or the default values according to the specification.
+     * Ref: https://spec.matrix.org/latest/client-server-api/#mroompower_levels
+     */
+    private fun MutableList<Event>.createRoomPowerLevelsEvent() {
+        val powerLevelsContent = createLocalStateEvent(
+                type = EventType.STATE_ROOM_POWER_LEVELS,
+                content = (createRoomBody.powerLevelContentOverride ?: PowerLevelsContent()).let {
+                    it.copy(
+                            ban = it.banOrDefault(),
+                            eventsDefault = it.eventsDefaultOrDefault(),
+                            invite = it.inviteOrDefault(),
+                            kick = it.kickOrDefault(),
+                            redact = it.redactOrDefault(),
+                            stateDefault = it.stateDefaultOrDefault(),
+                            usersDefault = it.usersDefaultOrDefault(),
+                    )
+                }.toContent(),
+        )
+        add(powerLevelsContent)
+    }
+
+    /**
+     * Generate the local room member state events related to the given user ids, if any.
+     */
+    private suspend fun MutableList<Event>.createRoomMemberEvents(userIds: List<String>) {
+        val memberEvents = userIds
+                .mapNotNull { tryOrNull { userService.resolveUser(it) } }
+                .map { user ->
+                    createLocalStateEvent(
+                            type = EventType.STATE_ROOM_MEMBER,
+                            content = RoomMemberContent(
+                                    isDirect = createRoomBody.isDirect.takeUnless { user.userId == myUserId }.orFalse(),
+                                    membership = if (user.userId == myUserId) Membership.JOIN else Membership.INVITE,
+                                    displayName = user.displayName,
+                                    avatarUrl = user.avatarUrl
+                            ).toContent(),
+                            stateKey = user.userId
+                    )
+                }
+        addAll(memberEvents)
+    }
+
+    /**
+     * Generate the local state events related to the given third party invites, if any.
+     */
+    private fun MutableList<Event>.createRoomThreePidEvents() {
+        createRoomBody.invite3pids.orEmpty().forEach { body ->
+            val localThirdPartyInviteEvent = createLocalStateEvent(
+                    type = EventType.LOCAL_STATE_ROOM_THIRD_PARTY_INVITE,
+                    content = LocalRoomThirdPartyInviteContent(
+                            isDirect = createRoomBody.isDirect.orFalse(),
+                            membership = Membership.INVITE,
+                            displayName = body.address,
+                            thirdPartyInvite = body.toThreePid()
+                    ).toContent(),
+            )
+            val thirdPartyInviteEvent = createLocalStateEvent(
+                    type = EventType.STATE_ROOM_THIRD_PARTY_INVITE,
+                    content = RoomThirdPartyInviteContent(
+                            displayName = body.address,
+                            keyValidityUrl = null,
+                            publicKey = null,
+                            publicKeys = null
+                    ).toContent(),
+            )
+            add(localThirdPartyInviteEvent)
+            add(thirdPartyInviteEvent)
+        }
+    }
+
+    /**
+     * Generate the local state event related to the given alias, if any.
+     */
+    fun MutableList<Event>.createRoomAliasEvent() {
+        if (createRoomBody.roomAliasName != null) {
+            val canonicalAliasContent = createLocalStateEvent(
+                    type = EventType.STATE_ROOM_CANONICAL_ALIAS,
+                    content = RoomCanonicalAliasContent(
+                            canonicalAlias = "${createRoomBody.roomAliasName}:${myUserId.getServerName()}"
+                    ).toContent(),
+            )
+            add(canonicalAliasContent)
+        }
+    }
+
+    /**
+     * Generate the local state events related to the given [CreateRoomPreset].
+     * Ref: https://spec.matrix.org/latest/client-server-api/#post_matrixclientv3createroom
+     */
+    private fun MutableList<Event>.createRoomPresetEvents() {
+        val preset = createRoomBody.preset ?: return
+
+        var joinRules: RoomJoinRules? = null
+        var historyVisibility: RoomHistoryVisibility? = null
+        var guestAccess: GuestAccess? = null
+        when (preset) {
+            CreateRoomPreset.PRESET_PRIVATE_CHAT,
+            CreateRoomPreset.PRESET_TRUSTED_PRIVATE_CHAT -> {
+                joinRules = RoomJoinRules.INVITE
+                historyVisibility = RoomHistoryVisibility.SHARED
+                guestAccess = GuestAccess.CanJoin
+            }
+            CreateRoomPreset.PRESET_PUBLIC_CHAT -> {
+                joinRules = RoomJoinRules.PUBLIC
+                historyVisibility = RoomHistoryVisibility.SHARED
+                guestAccess = GuestAccess.Forbidden
+            }
+        }
+
+        add(createLocalStateEvent(EventType.STATE_ROOM_JOIN_RULES, RoomJoinRulesContent(joinRules.value).toContent()))
+        add(createLocalStateEvent(EventType.STATE_ROOM_HISTORY_VISIBILITY, RoomHistoryVisibilityContent(historyVisibility.value).toContent()))
+        add(createLocalStateEvent(EventType.STATE_ROOM_GUEST_ACCESS, RoomGuestAccessContent(guestAccess.value).toContent()))
+    }
+
+    /**
+     * Generate the local state events related to the given initial states, if any.
+     * The given initial state events override the potential existing ones of the same type.
+     */
+    private fun MutableList<Event>.createRoomInitialStateEvents() {
+        val initialStates = createRoomBody.initialStates ?: return
+
+        val initialStateEvents = initialStates.map { createLocalStateEvent(it.type, it.content, it.stateKey) }
+        // Erase existing events of the same type
+        removeAll { event -> event.type in initialStateEvents.map { it.type } }
+        // Add the initial state events to the list
+        addAll(initialStateEvents)
+    }
+
+    /**
+     * Generate the local events related to the given room name and topic, if any.
+     */
+    private fun MutableList<Event>.createRoomNameAndTopicStateEvents() {
+        if (createRoomBody.name != null) {
+            add(createLocalStateEvent(EventType.STATE_ROOM_NAME, RoomNameContent(createRoomBody.name).toContent()))
+        }
+        if (createRoomBody.topic != null) {
+            add(createLocalStateEvent(EventType.STATE_ROOM_TOPIC, RoomTopicContent(createRoomBody.topic).toContent()))
+        }
+    }
+
+    /**
+     * Generate the local events which have not been set and are in that case provided by the server with default values.
+     * Default events:
+     * - m.room.history_visibility (https://spec.matrix.org/latest/client-server-api/#server-behaviour-5)
+     * - m.room.guest_access (https://spec.matrix.org/latest/client-server-api/#mroomguest_access)
+     */
+    private fun MutableList<Event>.createRoomDefaultEvents() {
+        // HistoryVisibility
+        if (none { it.type == EventType.STATE_ROOM_HISTORY_VISIBILITY }) {
+            add(
+                    createLocalStateEvent(
+                            type = EventType.STATE_ROOM_HISTORY_VISIBILITY,
+                            content = RoomHistoryVisibilityContent(RoomHistoryVisibility.SHARED.value).toContent(),
+                    )
+            )
+        }
+        // GuestAccess
+        if (none { it.type == EventType.STATE_ROOM_GUEST_ACCESS }) {
+            add(
+                    createLocalStateEvent(
+                            type = EventType.STATE_ROOM_GUEST_ACCESS,
+                            content = RoomGuestAccessContent(GuestAccess.Forbidden.value).toContent(),
+                    )
+            )
+        }
+    }
+
+    /**
+     * Generate a local state event from the given parameters.
+     *
+     * @param type the event type, see [EventType]
+     * @param content the content of the event
+     * @param stateKey the stateKey, if any
+     *
+     * @return a local state event
+     */
+    private fun createLocalStateEvent(type: String?, content: Content?, stateKey: String? = ""): Event {
+        return Event(
+                type = type,
+                senderId = myUserId,
+                stateKey = stateKey,
+                content = content,
+                originServerTs = clock.epochMillis(),
+                eventId = LocalEcho.createLocalEchoId()
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomTask.kt
index d57491a4c8..793c2573be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomTask.kt
@@ -21,26 +21,16 @@ import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.kotlin.createObject
 import kotlinx.coroutines.TimeoutCancellationException
-import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.LocalEcho
-import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
-import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
-import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
-import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.sync.model.RoomSyncSummary
-import org.matrix.android.sdk.api.session.user.UserService
-import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
 import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
 import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
 import org.matrix.android.sdk.internal.database.mapper.asDomain
@@ -48,6 +38,7 @@ import org.matrix.android.sdk.internal.database.mapper.toEntity
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
 import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomEntity
 import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
@@ -56,7 +47,6 @@ import org.matrix.android.sdk.internal.database.query.copyToRealmOrIgnore
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.getOrNull
 import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.events.getFixedRoomMemberContent
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberEventHandler
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
@@ -70,22 +60,23 @@ import javax.inject.Inject
 internal interface CreateLocalRoomTask : Task<CreateRoomParams, String>
 
 internal class DefaultCreateLocalRoomTask @Inject constructor(
-        @UserId private val userId: String,
         @SessionDatabase private val monarchy: Monarchy,
         private val roomMemberEventHandler: RoomMemberEventHandler,
         private val roomSummaryUpdater: RoomSummaryUpdater,
         @SessionDatabase private val realmConfiguration: RealmConfiguration,
         private val createRoomBodyBuilder: CreateRoomBodyBuilder,
-        private val userService: UserService,
+        private val cryptoService: DefaultCryptoService,
         private val clock: Clock,
+        private val createLocalRoomStateEventsTask: CreateLocalRoomStateEventsTask,
 ) : CreateLocalRoomTask {
 
     override suspend fun execute(params: CreateRoomParams): String {
-        val createRoomBody = createRoomBodyBuilder.build(params.withDefault())
+        val createRoomBody = createRoomBodyBuilder.build(params)
         val roomId = RoomLocalEcho.createLocalEchoId()
+        val eventList = createLocalRoomStateEventsTask.execute(CreateLocalRoomStateEventsTask.Params(createRoomBody))
         monarchy.awaitTransaction { realm ->
-            createLocalRoomEntity(realm, roomId, createRoomBody)
-            createLocalRoomSummaryEntity(realm, roomId, createRoomBody)
+            createLocalRoomEntity(realm, roomId, eventList)
+            createLocalRoomSummaryEntity(realm, roomId, params, createRoomBody)
         }
 
         // Wait for room to be created in DB
@@ -106,22 +97,37 @@ internal class DefaultCreateLocalRoomTask @Inject constructor(
      * Create a local room entity from the given room creation params.
      * This will also generate and store in database the chunk and the events related to the room params in order to retrieve and display the local room.
      */
-    private suspend fun createLocalRoomEntity(realm: Realm, roomId: String, createRoomBody: CreateRoomBody) {
+    private fun createLocalRoomEntity(realm: Realm, roomId: String, localStateEventList: List<Event>) {
         RoomEntity.getOrCreate(realm, roomId).apply {
             membership = Membership.JOIN
-            chunks.add(createLocalRoomChunk(realm, roomId, createRoomBody))
+            chunks.add(createLocalRoomChunk(realm, roomId, localStateEventList))
             membersLoadStatus = RoomMembersLoadStatusType.LOADED
         }
     }
 
-    private fun createLocalRoomSummaryEntity(realm: Realm, roomId: String, createRoomBody: CreateRoomBody) {
-        val otherUserId = createRoomBody.getDirectUserId()
-        if (otherUserId != null) {
-            RoomSummaryEntity.getOrCreate(realm, roomId).apply {
+    private fun createLocalRoomSummaryEntity(realm: Realm, roomId: String, createRoomParams: CreateRoomParams, createRoomBody: CreateRoomBody) {
+        // Create the room summary entity
+        val roomSummaryEntity = realm.createObject<RoomSummaryEntity>(roomId).apply {
+            val otherUserId = createRoomBody.getDirectUserId()
+            if (otherUserId != null) {
                 isDirect = true
                 directUserId = otherUserId
             }
         }
+
+        // Update the createRoomParams from the potential feature preset before saving
+        createRoomParams.featurePreset?.let { featurePreset ->
+            featurePreset.updateRoomParams(createRoomParams)
+            createRoomParams.initialStates.addAll(featurePreset.setupInitialStates().orEmpty())
+        }
+
+        // Create a LocalRoomSummaryEntity decorated by the related RoomSummaryEntity and the updated CreateRoomParams
+        realm.createObject<LocalRoomSummaryEntity>(roomId).also {
+            it.roomSummaryEntity = roomSummaryEntity
+            it.createRoomParams = createRoomParams
+        }
+
+        // Update the RoomSummaryEntity by simulating a fake sync response
         roomSummaryUpdater.update(
                 realm = realm,
                 roomId = roomId,
@@ -140,20 +146,19 @@ internal class DefaultCreateLocalRoomTask @Inject constructor(
      *
      * @param realm the current instance of realm
      * @param roomId the id of the local room
-     * @param createRoomBody the room creation params
+     * @param localStateEventList list of local state events for that room
      *
      * @return a chunk entity
      */
-    private suspend fun createLocalRoomChunk(realm: Realm, roomId: String, createRoomBody: CreateRoomBody): ChunkEntity {
+    private fun createLocalRoomChunk(realm: Realm, roomId: String, localStateEventList: List<Event>): ChunkEntity {
         val chunkEntity = realm.createObject<ChunkEntity>().apply {
             isLastBackward = true
             isLastForward = true
         }
 
-        val eventList = createLocalRoomEvents(createRoomBody)
         val roomMemberContentsByUser = HashMap<String, RoomMemberContent?>()
 
-        for (event in eventList) {
+        for (event in localStateEventList) {
             if (event.eventId == null || event.senderId == null || event.type == null) {
                 continue
             }
@@ -169,6 +174,9 @@ internal class DefaultCreateLocalRoomTask @Inject constructor(
                     roomMemberContentsByUser[event.stateKey] = event.getFixedRoomMemberContent()
                     roomMemberEventHandler.handle(realm, roomId, event, false)
                 }
+
+                // Give info to crypto module
+                cryptoService.onStateEvent(roomId, event)
             }
 
             roomMemberContentsByUser.getOrPut(event.senderId) {
@@ -187,81 +195,4 @@ internal class DefaultCreateLocalRoomTask @Inject constructor(
 
         return chunkEntity
     }
-
-    /**
-     * Build the list of the events related to the room creation params.
-     *
-     * @param createRoomBody the room creation params
-     *
-     * @return the list of events
-     */
-    private suspend fun createLocalRoomEvents(createRoomBody: CreateRoomBody): List<Event> {
-        val myUser = userService.getUser(userId) ?: User(userId)
-        val invitedUsers = createRoomBody.invitedUserIds.orEmpty()
-                .mapNotNull { tryOrNull { userService.resolveUser(it) } }
-
-        val createRoomEvent = createLocalEvent(
-                type = EventType.STATE_ROOM_CREATE,
-                content = RoomCreateContent(
-                        creator = userId
-                ).toContent()
-        )
-        val myRoomMemberEvent = createLocalEvent(
-                type = EventType.STATE_ROOM_MEMBER,
-                content = RoomMemberContent(
-                        membership = Membership.JOIN,
-                        displayName = myUser.displayName,
-                        avatarUrl = myUser.avatarUrl
-                ).toContent(),
-                stateKey = userId
-        )
-        val roomMemberEvents = invitedUsers.map {
-            createLocalEvent(
-                    type = EventType.STATE_ROOM_MEMBER,
-                    content = RoomMemberContent(
-                            isDirect = createRoomBody.isDirect.orFalse(),
-                            membership = Membership.INVITE,
-                            displayName = it.displayName,
-                            avatarUrl = it.avatarUrl
-                    ).toContent(),
-                    stateKey = it.userId
-            )
-        }
-
-        return buildList {
-            add(createRoomEvent)
-            add(myRoomMemberEvent)
-            addAll(createRoomBody.initialStates.orEmpty().map { createLocalEvent(it.type, it.content, it.stateKey) })
-            addAll(roomMemberEvents)
-        }
-    }
-
-    /**
-     * Generate a local event from the given parameters.
-     *
-     * @param type the event type, see [EventType]
-     * @param content the content of the Event
-     * @param stateKey the stateKey, if any
-     *
-     * @return a fake event
-     */
-    private fun createLocalEvent(type: String?, content: Content?, stateKey: String? = ""): Event {
-        return Event(
-                type = type,
-                senderId = userId,
-                stateKey = stateKey,
-                content = content,
-                originServerTs = clock.epochMillis(),
-                eventId = LocalEcho.createLocalEchoId()
-        )
-    }
-
-    /**
-     * Setup default values to the CreateRoomParams as the room is created locally (the default values will not be defined by the server).
-     */
-    private fun CreateRoomParams.withDefault() = this.apply {
-        if (visibility == null) visibility = RoomDirectoryVisibility.PRIVATE
-        if (historyVisibility == null) historyVisibility = RoomHistoryVisibility.SHARED
-        if (guestAccess == null) guestAccess = GuestAccess.Forbidden
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
index b326c3618c..17e1aba6f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
 
 /**
@@ -119,7 +120,13 @@ internal data class CreateRoomBody(
          */
         @Json(name = "room_version")
         val roomVersion: String?
-)
+) {
+    companion object {
+        fun fromJson(json: String?): CreateRoomBody? {
+            return json?.let { MoshiProvider.providesMoshi().adapter(CreateRoomBody::class.java).fromJson(it) }
+        }
+    }
+}
 
 /**
  * Tells if the created room can be a direct chat one.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomFromLocalRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomFromLocalRoomTask.kt
new file mode 100644
index 0000000000..2245eb8513
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomFromLocalRoomTask.kt
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.create
+
+import com.zhuinden.monarchy.Monarchy
+import kotlinx.coroutines.TimeoutCancellationException
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
+import org.matrix.android.sdk.api.session.room.model.LocalRoomCreationState
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.database.query.whereRoomId
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
+import org.matrix.android.sdk.internal.task.Task
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+/**
+ * Create a room on the server from a local room.
+ * The configuration of the local room will be use to configure the new room.
+ * The potential local room members will also be invited to this new room.
+ */
+internal interface CreateRoomFromLocalRoomTask : Task<CreateRoomFromLocalRoomTask.Params, String> {
+    data class Params(val localRoomId: String)
+}
+
+internal class DefaultCreateRoomFromLocalRoomTask @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val createRoomTask: CreateRoomTask,
+        private val roomSummaryDataSource: RoomSummaryDataSource,
+) : CreateRoomFromLocalRoomTask {
+
+    private val realmConfiguration
+        get() = monarchy.realmConfiguration
+
+    override suspend fun execute(params: CreateRoomFromLocalRoomTask.Params): String {
+        val localRoomSummary = roomSummaryDataSource.getLocalRoomSummary(params.localRoomId)
+                ?: error("## CreateRoomFromLocalRoomTask - Cannot retrieve LocalRoomSummary with roomId ${params.localRoomId}")
+
+        // If a room has already been created for the given local room, return the existing roomId
+        if (localRoomSummary.replacementRoomId != null) {
+            return localRoomSummary.replacementRoomId
+        }
+
+        if (localRoomSummary.createRoomParams != null && localRoomSummary.roomSummary != null) {
+            return createRoom(params.localRoomId, localRoomSummary.roomSummary, localRoomSummary.createRoomParams)
+        } else {
+            error("## CreateRoomFromLocalRoomTask - Invalid LocalRoomSummary: $localRoomSummary")
+        }
+    }
+
+    /**
+     * Create a room on the server for the given local room.
+     *
+     * @param localRoomId the local room identifier.
+     * @param localRoomSummary the RoomSummary of the local room.
+     * @param createRoomParams the CreateRoomParams object which was used to configure the local room.
+     *
+     * @return the identifier of the created room.
+     */
+    private suspend fun createRoom(localRoomId: String, localRoomSummary: RoomSummary, createRoomParams: CreateRoomParams): String {
+        updateCreationState(localRoomId, LocalRoomCreationState.CREATING)
+        val replacementRoomId = runCatching {
+            createRoomTask.execute(createRoomParams)
+        }.fold(
+                { it },
+                {
+                    updateCreationState(localRoomId, LocalRoomCreationState.FAILURE)
+                    throw it
+                }
+        )
+        updateReplacementRoomId(localRoomId, replacementRoomId)
+        waitForRoomEvents(replacementRoomId, localRoomSummary)
+        updateCreationState(localRoomId, LocalRoomCreationState.CREATED)
+        return replacementRoomId
+    }
+
+    /**
+     * Wait for all the room events before triggering the created state.
+     *
+     * @param replacementRoomId the identifier of the created room
+     * @param localRoomSummary the RoomSummary of the local room.
+     */
+    private suspend fun waitForRoomEvents(replacementRoomId: String, localRoomSummary: RoomSummary) {
+        try {
+            awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(1L)) { realm ->
+                realm.where(RoomSummaryEntity::class.java)
+                        .equalTo(RoomSummaryEntityFields.ROOM_ID, replacementRoomId)
+                        .equalTo(RoomSummaryEntityFields.INVITED_MEMBERS_COUNT, localRoomSummary.invitedMembersCount)
+            }
+            awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(1L)) { realm ->
+                EventEntity.whereRoomId(realm, replacementRoomId)
+                        .equalTo(EventEntityFields.TYPE, EventType.STATE_ROOM_HISTORY_VISIBILITY)
+            }
+            if (localRoomSummary.isEncrypted) {
+                awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(1L)) { realm ->
+                    EventEntity.whereRoomId(realm, replacementRoomId)
+                            .equalTo(EventEntityFields.TYPE, EventType.STATE_ROOM_ENCRYPTION)
+                }
+            }
+        } catch (exception: TimeoutCancellationException) {
+            updateCreationState(localRoomSummary.roomId, LocalRoomCreationState.FAILURE)
+            throw CreateRoomFailure.CreatedWithTimeout(replacementRoomId)
+        }
+    }
+
+    private fun updateCreationState(roomId: String, creationState: LocalRoomCreationState) {
+        monarchy.runTransactionSync { realm ->
+            LocalRoomSummaryEntity.where(realm, roomId).findFirst()?.creationState = creationState
+        }
+    }
+
+    private fun updateReplacementRoomId(localRoomId: String, replacementRoomId: String) {
+        monarchy.runTransactionSync { realm ->
+            LocalRoomSummaryEntity.where(realm, localRoomId).findFirst()?.replacementRoomId = replacementRoomId
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
index d76640573f..e558d34ff9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
@@ -54,8 +54,7 @@ internal class DefaultCreateRoomTask @Inject constructor(
         private val directChatsHelper: DirectChatsHelper,
         private val updateUserAccountDataTask: UpdateUserAccountDataTask,
         private val readMarkersTask: SetReadMarkersTask,
-        @SessionDatabase
-        private val realmConfiguration: RealmConfiguration,
+        @SessionDatabase private val realmConfiguration: RealmConfiguration,
         private val createRoomBodyBuilder: CreateRoomBodyBuilder,
         private val globalErrorReceiver: GlobalErrorReceiver,
         private val clock: Clock,
@@ -71,7 +70,6 @@ internal class DefaultCreateRoomTask @Inject constructor(
         }
 
         val createRoomBody = createRoomBodyBuilder.build(params)
-
         val createRoomResponse = try {
             executeRequest(globalErrorReceiver) {
                 roomAPI.createRoom(createRoomBody)
@@ -90,6 +88,7 @@ internal class DefaultCreateRoomTask @Inject constructor(
             }
             throw throwable
         }
+
         val roomId = createRoomResponse.roomId
         // Wait for room to come back from the sync (but it can maybe be in the DB if the sync response is received before)
         try {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/LocalRoomThirdPartyInviteContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/LocalRoomThirdPartyInviteContent.kt
new file mode 100644
index 0000000000..617ed35326
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/LocalRoomThirdPartyInviteContent.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.create
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.room.model.Membership
+
+/**
+ * Class representing the EventType.LOCAL_STATE_ROOM_THIRD_PARTY_INVITE state event content
+ * This class is only used to store the third party invite data of a local room.
+ */
+@JsonClass(generateAdapter = true)
+internal data class LocalRoomThirdPartyInviteContent(
+        @Json(name = "membership") val membership: Membership,
+        @Json(name = "displayname") val displayName: String? = null,
+        @Json(name = "is_direct") val isDirect: Boolean = false,
+        @Json(name = "third_party_invite") val thirdPartyInvite: ThreePid? = null,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt
index eb966b684c..8b5fde6ab7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt
@@ -30,7 +30,7 @@ import javax.inject.Inject
 
 internal class RoomCreateEventProcessor @Inject constructor() : EventInsertLiveProcessor {
 
-    override suspend fun process(realm: Realm, event: Event) {
+    override fun process(realm: Realm, event: Event) {
         val createRoomContent = event.getClearContent().toModel<RoomCreateContent>()
         val predecessorRoomId = createRoomContent?.predecessor?.roomId ?: return
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/delete/DeleteLocalRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/delete/DeleteLocalRoomTask.kt
index 936c94e520..a60c7e6a27 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/delete/DeleteLocalRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/delete/DeleteLocalRoomTask.kt
@@ -21,12 +21,16 @@ import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
 import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomEntity
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.deleteOnCascade
 import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.database.query.whereInRoom
 import org.matrix.android.sdk.internal.database.query.whereRoomId
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.room.delete.DeleteLocalRoomTask.Params
@@ -49,6 +53,12 @@ internal class DefaultDeleteLocalRoomTask @Inject constructor(
         if (RoomLocalEcho.isLocalEchoId(roomId)) {
             monarchy.awaitTransaction { realm ->
                 Timber.i("## DeleteLocalRoomTask - delete local room id $roomId")
+                ReadReceiptsSummaryEntity.whereInRoom(realm, roomId = roomId).findAll()
+                        ?.also { Timber.i("## DeleteLocalRoomTask - ReadReceiptsSummaryEntity - delete ${it.size} entries") }
+                        ?.deleteAllFromRealm()
+                ReadReceiptEntity.whereRoomId(realm, roomId = roomId).findAll()
+                        ?.also { Timber.i("## DeleteLocalRoomTask - ReadReceiptEntity - delete ${it.size} entries") }
+                        ?.deleteAllFromRealm()
                 RoomMemberSummaryEntity.where(realm, roomId = roomId).findAll()
                         ?.also { Timber.i("## DeleteLocalRoomTask - RoomMemberSummaryEntity - delete ${it.size} entries") }
                         ?.deleteAllFromRealm()
@@ -70,6 +80,9 @@ internal class DefaultDeleteLocalRoomTask @Inject constructor(
                 RoomEntity.where(realm, roomId = roomId).findAll()
                         ?.also { Timber.i("## DeleteLocalRoomTask - RoomEntity - delete ${it.size} entries") }
                         ?.deleteAllFromRealm()
+                LocalRoomSummaryEntity.where(realm, roomId = roomId).findAll()
+                        ?.also { Timber.i("## DeleteLocalRoomTask - LocalRoomSummaryEntity - delete ${it.size} entries") }
+                        ?.deleteAllFromRealm()
             }
         } else {
             Timber.i("## DeleteLocalRoomTask - Failed to remove room with id $roomId: not a local room")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingService.kt
index 60312071d7..c36efa064f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingService.kt
@@ -73,7 +73,7 @@ internal class DefaultLocationSharingService @AssistedInject constructor(
         return sendLiveLocationTask.execute(params)
     }
 
-    override suspend fun startLiveLocationShare(timeoutMillis: Long, description: String): UpdateLiveLocationShareResult {
+    override suspend fun startLiveLocationShare(timeoutMillis: Long): UpdateLiveLocationShareResult {
         // Ensure to stop any active live before starting a new one
         if (checkIfExistingActiveLive()) {
             val result = stopLiveLocationShare()
@@ -84,7 +84,6 @@ internal class DefaultLocationSharingService @AssistedInject constructor(
         val params = StartLiveLocationShareTask.Params(
                 roomId = roomId,
                 timeoutMillis = timeoutMillis,
-                description = description
         )
         return startLiveLocationShareTask.execute(params)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/GetActiveBeaconInfoForUserTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/GetActiveBeaconInfoForUserTask.kt
index a8d955af1d..ae7022a204 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/GetActiveBeaconInfoForUserTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/GetActiveBeaconInfoForUserTask.kt
@@ -39,7 +39,7 @@ internal class DefaultGetActiveBeaconInfoForUserTask @Inject constructor(
 ) : GetActiveBeaconInfoForUserTask {
 
     override suspend fun execute(params: GetActiveBeaconInfoForUserTask.Params): Event? {
-        return EventType.STATE_ROOM_BEACON_INFO
+        return EventType.STATE_ROOM_BEACON_INFO.values
                 .mapNotNull {
                     stateEventDataSource.getStateEvent(
                             roomId = params.roomId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessor.kt
index fa3479ed3c..dbdc5dc228 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessor.kt
@@ -40,7 +40,7 @@ internal class LiveLocationShareRedactionEventProcessor @Inject constructor() :
         return eventType == EventType.REDACTION && insertType != EventInsertType.LOCAL_ECHO
     }
 
-    override suspend fun process(realm: Realm, event: Event) {
+    override fun process(realm: Realm, event: Event) {
         if (event.redacts.isNullOrBlank() || LocalEcho.isLocalEchoId(event.eventId.orEmpty())) {
             return
         }
@@ -48,7 +48,7 @@ internal class LiveLocationShareRedactionEventProcessor @Inject constructor() :
         val redactedEvent = EventEntity.where(realm, eventId = event.redacts).findFirst()
                 ?: return
 
-        if (redactedEvent.type in EventType.STATE_ROOM_BEACON_INFO) {
+        if (redactedEvent.type in EventType.STATE_ROOM_BEACON_INFO.values) {
             val liveSummary = LiveLocationShareAggregatedSummaryEntity.get(realm, eventId = redactedEvent.eventId)
 
             if (liveSummary != null) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StartLiveLocationShareTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StartLiveLocationShareTask.kt
index 79019e4765..dd409fe3a7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StartLiveLocationShareTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StartLiveLocationShareTask.kt
@@ -30,7 +30,6 @@ internal interface StartLiveLocationShareTask : Task<StartLiveLocationShareTask.
     data class Params(
             val roomId: String,
             val timeoutMillis: Long,
-            val description: String,
     )
 }
 
@@ -42,12 +41,12 @@ internal class DefaultStartLiveLocationShareTask @Inject constructor(
 
     override suspend fun execute(params: StartLiveLocationShareTask.Params): UpdateLiveLocationShareResult {
         val beaconContent = MessageBeaconInfoContent(
-                body = params.description,
+                body = "Live location",
                 timeout = params.timeoutMillis,
                 isLive = true,
                 unstableTimestampMillis = clock.epochMillis()
         ).toContent()
-        val eventType = EventType.STATE_ROOM_BEACON_INFO.first()
+        val eventType = EventType.STATE_ROOM_BEACON_INFO.unstable
         val sendStateTaskParams = SendStateTask.Params(
                 roomId = params.roomId,
                 stateKey = userId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StopLiveLocationShareTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StopLiveLocationShareTask.kt
index da5fd76940..e1e6fa9d40 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StopLiveLocationShareTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StopLiveLocationShareTask.kt
@@ -45,7 +45,7 @@ internal class DefaultStopLiveLocationShareTask @Inject constructor(
         val sendStateTaskParams = SendStateTask.Params(
                 roomId = params.roomId,
                 stateKey = stateKey,
-                eventType = EventType.STATE_ROOM_BEACON_INFO.first(),
+                eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,
                 body = updatedContent
         )
         return try {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
index fd6552525e..cb7bbf07fc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
@@ -140,7 +140,8 @@ internal class RoomMemberEventHandler @Inject constructor(
             val previousDisplayName = prevContent?.get("displayname") as? String
             val previousAvatar = prevContent?.get("avatar_url") as? String
 
-            if (previousDisplayName != roomMember.displayName || previousAvatar != roomMember.avatarUrl) {
+            if ((previousDisplayName != null && previousDisplayName != roomMember.displayName) ||
+                    (previousAvatar != null && previousAvatar != roomMember.avatarUrl)) {
                 aggregator.userIdsToFetch.add(eventUserId)
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
index 3141c052c3..d7b78faea8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
@@ -18,6 +18,8 @@ package org.matrix.android.sdk.internal.session.room.membership.threepid
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.auth.data.ThreePidMedium
 
 @JsonClass(generateAdapter = true)
 internal data class ThreePidInviteBody(
@@ -43,3 +45,9 @@ internal data class ThreePidInviteBody(
         @Json(name = "address")
         val address: String
 )
+
+internal fun ThreePidInviteBody.toThreePid() = when (medium) {
+    ThreePidMedium.EMAIL -> ThreePid.Email(address)
+    ThreePidMedium.MSISDN -> ThreePid.Msisdn(address)
+    else -> null
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
index cc86679cbc..0cff2c5a7c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
@@ -46,7 +46,7 @@ internal class RedactionEventProcessor @Inject constructor() : EventInsertLivePr
         return eventType == EventType.REDACTION
     }
 
-    override suspend fun process(realm: Realm, event: Event) {
+    override fun process(realm: Realm, event: Event) {
         pruneEvent(realm, event)
     }
 
@@ -61,45 +61,36 @@ internal class RedactionEventProcessor @Inject constructor() : EventInsertLivePr
         val isLocalEcho = LocalEcho.isLocalEchoId(redactionEvent.eventId ?: "")
         Timber.v("Redact event for ${redactionEvent.redacts} localEcho=$isLocalEcho")
 
-        val eventToPrune = EventEntity.where(realm, eventId = redactionEvent.redacts).findFirst()
-                ?: return
+        val eventToPrune = EventEntity.where(realm, eventId = redactionEvent.redacts).findFirst() ?: return
 
         val typeToPrune = eventToPrune.type
         val stateKey = eventToPrune.stateKey
         val allowedKeys = computeAllowedKeys(typeToPrune)
-        if (allowedKeys.isNotEmpty()) {
-            val prunedContent = ContentMapper.map(eventToPrune.content)?.filterKeys { key -> allowedKeys.contains(key) }
-            eventToPrune.content = ContentMapper.map(prunedContent)
-        } else {
-            when (typeToPrune) {
-                EventType.ENCRYPTED,
-                EventType.MESSAGE,
-                in EventType.STATE_ROOM_BEACON_INFO,
-                in EventType.BEACON_LOCATION_DATA,
-                in EventType.POLL_START -> {
-                    Timber.d("REDACTION for message ${eventToPrune.eventId}")
-                    val unsignedData = EventMapper.map(eventToPrune).unsignedData
-                            ?: UnsignedData(null, null)
+        when {
+            allowedKeys.isNotEmpty() -> {
+                val prunedContent = ContentMapper.map(eventToPrune.content)?.filterKeys { key -> allowedKeys.contains(key) }
+                eventToPrune.content = ContentMapper.map(prunedContent)
+            }
+            canPruneEventType(typeToPrune) -> {
+                Timber.d("REDACTION for message ${eventToPrune.eventId}")
+                val unsignedData = EventMapper.map(eventToPrune).unsignedData ?: UnsignedData(null, null)
 
-                    // was this event a m.replace
+                // was this event a m.replace
 //                    val contentModel = ContentMapper.map(eventToPrune.content)?.toModel<MessageContent>()
 //                    if (RelationType.REPLACE == contentModel?.relatesTo?.type && contentModel.relatesTo?.eventId != null) {
 //                        eventRelationsAggregationUpdater.handleRedactionOfReplace(eventToPrune, contentModel.relatesTo!!.eventId!!, realm)
 //                    }
 
-                    val modified = unsignedData.copy(redactedEvent = redactionEvent)
-                    // Deleting the content of a thread message will result to delete the thread relation, however threads are now dynamic
-                    // so there is not much of a problem
-                    eventToPrune.content = ContentMapper.map(emptyMap())
-                    eventToPrune.unsignedData = MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).toJson(modified)
-                    eventToPrune.decryptionResultJson = null
-                    eventToPrune.decryptionErrorCode = null
+                val modified = unsignedData.copy(redactedEvent = redactionEvent)
+                eventToPrune.content = ContentMapper.map(emptyMap())
+                eventToPrune.unsignedData = MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).toJson(modified)
+                eventToPrune.decryptionResultJson = null
+                eventToPrune.decryptionErrorCode = null
 
-                    handleTimelineThreadSummaryIfNeeded(realm, eventToPrune, isLocalEcho)
-                }
-//                EventType.REACTION -> {
-//                    eventRelationsAggregationUpdater.handleReactionRedact(eventToPrune, realm, userId)
-//                }
+                handleTimelineThreadSummaryIfNeeded(realm, eventToPrune, isLocalEcho)
+            }
+            else -> {
+                Timber.w("Not pruning event (type $typeToPrune)")
             }
         }
         if (typeToPrune == EventType.STATE_ROOM_MEMBER && stateKey != null) {
@@ -167,4 +158,28 @@ internal class RedactionEventProcessor @Inject constructor() : EventInsertLivePr
             else -> emptyList()
         }
     }
+
+    private fun canPruneEventType(eventType: String): Boolean {
+        return when {
+            EventType.isCallEvent(eventType) -> false
+            EventType.isVerificationEvent(eventType) -> false
+            eventType == EventType.STATE_ROOM_WIDGET_LEGACY ||
+                    eventType == EventType.STATE_ROOM_WIDGET ||
+                    eventType == EventType.STATE_ROOM_NAME ||
+                    eventType == EventType.STATE_ROOM_TOPIC ||
+                    eventType == EventType.STATE_ROOM_AVATAR ||
+                    eventType == EventType.STATE_ROOM_THIRD_PARTY_INVITE ||
+                    eventType == EventType.STATE_ROOM_GUEST_ACCESS ||
+                    eventType == EventType.STATE_SPACE_CHILD ||
+                    eventType == EventType.STATE_SPACE_PARENT ||
+                    eventType == EventType.STATE_ROOM_TOMBSTONE ||
+                    eventType == EventType.STATE_ROOM_HISTORY_VISIBILITY ||
+                    eventType == EventType.STATE_ROOM_RELATED_GROUPS ||
+                    eventType == EventType.STATE_ROOM_PINNED_EVENT ||
+                    eventType == EventType.STATE_ROOM_ENCRYPTION ||
+                    eventType == EventType.STATE_ROOM_SERVER_ACL ||
+                    eventType == EventType.REACTION -> false
+            else -> true
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
index b30c66c82e..36ec5e8dac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
@@ -30,17 +30,20 @@ import org.matrix.android.sdk.internal.database.mapper.ReadReceiptsSummaryMapper
 import org.matrix.android.sdk.internal.database.model.ReadMarkerEntity
 import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
 import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
+import org.matrix.android.sdk.internal.database.query.forMainTimelineWhere
 import org.matrix.android.sdk.internal.database.query.isEventRead
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.homeserver.HomeServerCapabilitiesDataSource
 
 internal class DefaultReadService @AssistedInject constructor(
         @Assisted private val roomId: String,
         @SessionDatabase private val monarchy: Monarchy,
         private val setReadMarkersTask: SetReadMarkersTask,
         private val readReceiptsSummaryMapper: ReadReceiptsSummaryMapper,
-        @UserId private val userId: String
+        @UserId private val userId: String,
+        private val homeServerCapabilitiesDataSource: HomeServerCapabilitiesDataSource
 ) : ReadService {
 
     @AssistedFactory
@@ -48,17 +51,28 @@ internal class DefaultReadService @AssistedInject constructor(
         fun create(roomId: String): DefaultReadService
     }
 
-    override suspend fun markAsRead(params: ReadService.MarkAsReadParams) {
+    override suspend fun markAsRead(params: ReadService.MarkAsReadParams, mainTimeLineOnly: Boolean) {
+        val readReceiptThreadId = if (homeServerCapabilitiesDataSource.getHomeServerCapabilities()?.canUseThreadReadReceiptsAndNotifications == true) {
+            if (mainTimeLineOnly) ReadService.THREAD_ID_MAIN else null
+        } else {
+            null
+        }
         val taskParams = SetReadMarkersTask.Params(
                 roomId = roomId,
                 forceReadMarker = params.forceReadMarker(),
-                forceReadReceipt = params.forceReadReceipt()
+                forceReadReceipt = params.forceReadReceipt(),
+                readReceiptThreadId = readReceiptThreadId
         )
         setReadMarkersTask.execute(taskParams)
     }
 
-    override suspend fun setReadReceipt(eventId: String) {
-        val params = SetReadMarkersTask.Params(roomId, fullyReadEventId = null, readReceiptEventId = eventId)
+    override suspend fun setReadReceipt(eventId: String, threadId: String) {
+        val readReceiptThreadId = if (homeServerCapabilitiesDataSource.getHomeServerCapabilities()?.canUseThreadReadReceiptsAndNotifications == true) {
+            threadId
+        } else {
+            null
+        }
+        val params = SetReadMarkersTask.Params(roomId, fullyReadEventId = null, readReceiptEventId = eventId, readReceiptThreadId = readReceiptThreadId)
         setReadMarkersTask.execute(params)
     }
 
@@ -68,7 +82,8 @@ internal class DefaultReadService @AssistedInject constructor(
     }
 
     override fun isEventRead(eventId: String): Boolean {
-        return isEventRead(monarchy.realmConfiguration, userId, roomId, eventId)
+        val shouldCheckIfReadInEventsThread = homeServerCapabilitiesDataSource.getHomeServerCapabilities()?.canUseThreadReadReceiptsAndNotifications == true
+        return isEventRead(monarchy.realmConfiguration, userId, roomId, eventId, shouldCheckIfReadInEventsThread)
     }
 
     override fun getReadMarkerLive(): LiveData<Optional<String>> {
@@ -81,9 +96,9 @@ internal class DefaultReadService @AssistedInject constructor(
         }
     }
 
-    override fun getMyReadReceiptLive(): LiveData<Optional<String>> {
+    override fun getMyReadReceiptLive(threadId: String?): LiveData<Optional<String>> {
         val liveRealmData = monarchy.findAllMappedWithChanges(
-                { ReadReceiptEntity.where(it, roomId = roomId, userId = userId) },
+                { ReadReceiptEntity.where(it, roomId = roomId, userId = userId, threadId = threadId) },
                 { it.eventId }
         )
         return Transformations.map(liveRealmData) {
@@ -94,10 +109,11 @@ internal class DefaultReadService @AssistedInject constructor(
     override fun getUserReadReceipt(userId: String): String? {
         var eventId: String? = null
         monarchy.doWithRealm {
-            eventId = ReadReceiptEntity.where(it, roomId = roomId, userId = userId)
+            eventId = ReadReceiptEntity.forMainTimelineWhere(it, roomId = roomId, userId = userId)
                     .findFirst()
                     ?.eventId
         }
+
         return eventId
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/ReadBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/ReadBody.kt
new file mode 100644
index 0000000000..9374de5d5f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/ReadBody.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.read
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class ReadBody(
+        @Json(name = "thread_id") val threadId: String?,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
index a124a8a4c2..8e7592a8b4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.session.room.read
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.query.isEventRead
@@ -45,8 +46,9 @@ internal interface SetReadMarkersTask : Task<SetReadMarkersTask.Params, Unit> {
             val roomId: String,
             val fullyReadEventId: String? = null,
             val readReceiptEventId: String? = null,
+            val readReceiptThreadId: String? = null,
             val forceReadReceipt: Boolean = false,
-            val forceReadMarker: Boolean = false
+            val forceReadMarker: Boolean = false,
     )
 }
 
@@ -61,12 +63,14 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
         @UserId private val userId: String,
         private val globalErrorReceiver: GlobalErrorReceiver,
         private val clock: Clock,
+        private val homeServerCapabilitiesService: HomeServerCapabilitiesService,
 ) : SetReadMarkersTask {
 
     override suspend fun execute(params: SetReadMarkersTask.Params) {
         val markers = mutableMapOf<String, String>()
         Timber.v("Execute set read marker with params: $params")
         val latestSyncedEventId = latestSyncedEventId(params.roomId)
+        val readReceiptThreadId = params.readReceiptThreadId
         val fullyReadEventId = if (params.forceReadMarker) {
             latestSyncedEventId
         } else {
@@ -77,6 +81,7 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
         } else {
             params.readReceiptEventId
         }
+
         if (fullyReadEventId != null && !isReadMarkerMoreRecent(monarchy.realmConfiguration, params.roomId, fullyReadEventId)) {
             if (LocalEcho.isLocalEchoId(fullyReadEventId)) {
                 Timber.w("Can't set read marker for local event $fullyReadEventId")
@@ -84,8 +89,12 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
                 markers[READ_MARKER] = fullyReadEventId
             }
         }
+
+        val shouldCheckIfReadInEventsThread = readReceiptThreadId != null &&
+                homeServerCapabilitiesService.getHomeServerCapabilities().canUseThreadReadReceiptsAndNotifications
+
         if (readReceiptEventId != null &&
-                !isEventRead(monarchy.realmConfiguration, userId, params.roomId, readReceiptEventId)) {
+                !isEventRead(monarchy.realmConfiguration, userId, params.roomId, readReceiptEventId, shouldCheckIfReadInEventsThread)) {
             if (LocalEcho.isLocalEchoId(readReceiptEventId)) {
                 Timber.w("Can't set read receipt for local event $readReceiptEventId")
             } else {
@@ -95,7 +104,7 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
 
         val shouldUpdateRoomSummary = readReceiptEventId != null && readReceiptEventId == latestSyncedEventId
         if (markers.isNotEmpty() || shouldUpdateRoomSummary) {
-            updateDatabase(params.roomId, markers, shouldUpdateRoomSummary)
+            updateDatabase(params.roomId, readReceiptThreadId, markers, shouldUpdateRoomSummary)
         }
         if (markers.isNotEmpty()) {
             executeRequest(
@@ -104,7 +113,8 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
             ) {
                 if (markers[READ_MARKER] == null) {
                     if (readReceiptEventId != null) {
-                        roomAPI.sendReceipt(params.roomId, READ_RECEIPT, readReceiptEventId)
+                        val readBody = ReadBody(threadId = params.readReceiptThreadId)
+                        roomAPI.sendReceipt(params.roomId, READ_RECEIPT, readReceiptEventId, readBody)
                     }
                 } else {
                     // "m.fully_read" value is mandatory to make this call
@@ -119,7 +129,7 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
                 TimelineEventEntity.latestEvent(realm, roomId = roomId, includesSending = false)?.eventId
             }
 
-    private suspend fun updateDatabase(roomId: String, markers: Map<String, String>, shouldUpdateRoomSummary: Boolean) {
+    private suspend fun updateDatabase(roomId: String, readReceiptThreadId: String?, markers: Map<String, String>, shouldUpdateRoomSummary: Boolean) {
         monarchy.awaitTransaction { realm ->
             val readMarkerId = markers[READ_MARKER]
             val readReceiptId = markers[READ_RECEIPT]
@@ -127,7 +137,7 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
                 roomFullyReadHandler.handle(realm, roomId, FullyReadContent(readMarkerId))
             }
             if (readReceiptId != null) {
-                val readReceiptContent = ReadReceiptHandler.createContent(userId, readReceiptId, clock.epochMillis())
+                val readReceiptContent = ReadReceiptHandler.createContent(userId, readReceiptId, readReceiptThreadId, clock.epochMillis())
                 readReceiptHandler.handle(realm, roomId, readReceiptContent, false, null)
             }
             if (shouldUpdateRoomSummary) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index 9839a44427..ddf3e41dff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -105,19 +105,21 @@ internal class DefaultRelationService @AssistedInject constructor(
             targetEvent: TimelineEvent,
             msgType: String,
             newBodyText: CharSequence,
+            newFormattedBodyText: CharSequence?,
             newBodyAutoMarkdown: Boolean,
             compatibilityBodyText: String
     ): Cancelable {
-        return eventEditor.editTextMessage(targetEvent, msgType, newBodyText, newBodyAutoMarkdown, compatibilityBodyText)
+        return eventEditor.editTextMessage(targetEvent, msgType, newBodyText, newFormattedBodyText, newBodyAutoMarkdown, compatibilityBodyText)
     }
 
     override fun editReply(
             replyToEdit: TimelineEvent,
             originalTimelineEvent: TimelineEvent,
             newBodyText: String,
+            newFormattedBodyText: String?,
             compatibilityBodyText: String
     ): Cancelable {
-        return eventEditor.editReply(replyToEdit, originalTimelineEvent, newBodyText, compatibilityBodyText)
+        return eventEditor.editReply(replyToEdit, originalTimelineEvent, newBodyText, newFormattedBodyText, compatibilityBodyText)
     }
 
     override suspend fun fetchEditHistory(eventId: String): List<Event> {
@@ -127,6 +129,7 @@ internal class DefaultRelationService @AssistedInject constructor(
     override fun replyToMessage(
             eventReplied: TimelineEvent,
             replyText: CharSequence,
+            replyFormattedText: CharSequence?,
             autoMarkdown: Boolean,
             showInThread: Boolean,
             rootThreadEventId: String?
@@ -135,6 +138,7 @@ internal class DefaultRelationService @AssistedInject constructor(
                 roomId = roomId,
                 eventReplied = eventReplied,
                 replyText = replyText,
+                replyTextFormatted = replyFormattedText,
                 autoMarkdown = autoMarkdown,
                 rootThreadEventId = rootThreadEventId,
                 showInThread = showInThread
@@ -178,6 +182,7 @@ internal class DefaultRelationService @AssistedInject constructor(
                     roomId = roomId,
                     eventReplied = eventReplied,
                     replyText = replyInThreadText,
+                    replyTextFormatted = formattedText,
                     autoMarkdown = autoMarkdown,
                     rootThreadEventId = rootThreadEventId,
                     showInThread = false
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
index 795e9003ce..c83539c8fd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.api.util.TextContent
 import org.matrix.android.sdk.internal.database.mapper.toEntity
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
@@ -42,19 +43,25 @@ internal class EventEditor @Inject constructor(
             targetEvent: TimelineEvent,
             msgType: String,
             newBodyText: CharSequence,
+            newBodyFormattedText: CharSequence?,
             newBodyAutoMarkdown: Boolean,
             compatibilityBodyText: String
     ): Cancelable {
         val roomId = targetEvent.roomId
         if (targetEvent.root.sendState.hasFailed()) {
             // We create a new in memory event for the EventSenderProcessor but we keep the eventId of the failed event.
-            val editedEvent = eventFactory.createTextEvent(roomId, msgType, newBodyText, newBodyAutoMarkdown).copy(
+            val editedEvent = if (newBodyFormattedText != null) {
+                val content = TextContent(newBodyText.toString(), newBodyFormattedText.toString())
+                eventFactory.createFormattedTextEvent(roomId, content, msgType)
+            } else {
+                eventFactory.createTextEvent(roomId, msgType, newBodyText, newBodyAutoMarkdown)
+            }.copy(
                     eventId = targetEvent.eventId
             )
             return sendFailedEvent(targetEvent, editedEvent)
         } else if (targetEvent.root.sendState.isSent()) {
             val event = eventFactory
-                    .createReplaceTextEvent(roomId, targetEvent.eventId, newBodyText, newBodyAutoMarkdown, msgType, compatibilityBodyText)
+                    .createReplaceTextEvent(roomId, targetEvent.eventId, newBodyText, newBodyFormattedText, newBodyAutoMarkdown, msgType, compatibilityBodyText)
             return sendReplaceEvent(event)
         } else {
             // Should we throw?
@@ -100,6 +107,7 @@ internal class EventEditor @Inject constructor(
             replyToEdit: TimelineEvent,
             originalTimelineEvent: TimelineEvent,
             newBodyText: String,
+            newBodyFormattedText: String?,
             compatibilityBodyText: String
     ): Cancelable {
         val roomId = replyToEdit.roomId
@@ -109,6 +117,7 @@ internal class EventEditor @Inject constructor(
                     roomId = roomId,
                     eventReplied = originalTimelineEvent,
                     replyText = newBodyText,
+                    replyTextFormatted = newBodyFormattedText,
                     autoMarkdown = false,
                     showInThread = false
             )?.copy(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
index 5f5c000171..50439f51eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.internal.crypto.CryptoSessionInfoProvider
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.timeline.TimelineEventDataSource
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
@@ -35,13 +36,14 @@ internal interface FetchEditHistoryTask : Task<FetchEditHistoryTask.Params, List
 internal class DefaultFetchEditHistoryTask @Inject constructor(
         private val roomAPI: RoomAPI,
         private val globalErrorReceiver: GlobalErrorReceiver,
-        private val cryptoSessionInfoProvider: CryptoSessionInfoProvider
+        private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
+        private val eventDataSource: TimelineEventDataSource,
 ) : FetchEditHistoryTask {
 
     override suspend fun execute(params: FetchEditHistoryTask.Params): List<Event> {
         val isRoomEncrypted = cryptoSessionInfoProvider.isRoomEncrypted(params.roomId)
         val response = executeRequest(globalErrorReceiver) {
-            roomAPI.getRelations(
+            roomAPI.getRelationsWithEventType(
                     roomId = params.roomId,
                     eventId = params.eventId,
                     relationType = RelationType.REPLACE,
@@ -50,10 +52,14 @@ internal class DefaultFetchEditHistoryTask @Inject constructor(
         }
 
         // Filter out edition form other users, and redacted editions
-        val originalSenderId = response.originalEvent?.senderId
+        val originalEvent = eventDataSource.getTimelineEvent(
+                roomId = params.roomId,
+                eventId = params.eventId,
+        )
+        val originalSenderId = originalEvent?.senderInfo?.userId
         val events = response.chunks
                 .filter { it.senderId == originalSenderId }
                 .filter { !it.isRedacted() }
-        return events + listOfNotNull(response.originalEvent)
+        return events + listOfNotNull(originalEvent?.root)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt
index a65165d457..f2b0651e01 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.api.session.events.model.Event
 @JsonClass(generateAdapter = true)
 internal data class RelationsResponse(
         @Json(name = "chunk") val chunks: List<Event>,
-        @Json(name = "original_event") val originalEvent: Event?,
         @Json(name = "next_batch") val nextBatch: String?,
         @Json(name = "prev_batch") val prevBatch: String?
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/poll/FetchPollResponseEventsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/poll/FetchPollResponseEventsTask.kt
new file mode 100644
index 0000000000..e7dd8c57eb
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/poll/FetchPollResponseEventsTask.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.relation.poll
+
+import androidx.annotation.VisibleForTesting
+import com.zhuinden.monarchy.Monarchy
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.isPollResponse
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.crypto.EventDecryptor
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.query.copyToRealmOrIgnore
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.time.Clock
+import javax.inject.Inject
+
+@VisibleForTesting
+const val FETCH_RELATED_EVENTS_LIMIT = 50
+
+/**
+ * Task to fetch all the vote events to ensure full aggregation for a given poll.
+ */
+internal interface FetchPollResponseEventsTask : Task<FetchPollResponseEventsTask.Params, Result<Unit>> {
+    data class Params(
+            val roomId: String,
+            val startPollEventId: String,
+    )
+}
+
+internal class DefaultFetchPollResponseEventsTask @Inject constructor(
+        private val roomAPI: RoomAPI,
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val clock: Clock,
+        private val eventDecryptor: EventDecryptor,
+) : FetchPollResponseEventsTask {
+
+    override suspend fun execute(params: FetchPollResponseEventsTask.Params): Result<Unit> = runCatching {
+        var nextBatch: String? = fetchAndProcessRelatedEventsFrom(params)
+
+        while (nextBatch?.isNotEmpty() == true) {
+            nextBatch = fetchAndProcessRelatedEventsFrom(params, from = nextBatch)
+        }
+    }
+
+    private suspend fun fetchAndProcessRelatedEventsFrom(params: FetchPollResponseEventsTask.Params, from: String? = null): String? {
+        val response = getRelatedEvents(params, from)
+
+        val filteredEvents = response.chunks
+                .map { decryptEventIfNeeded(it) }
+                .filter { it.isPollResponse() }
+
+        addMissingEventsInDB(params.roomId, filteredEvents)
+
+        return response.nextBatch
+    }
+
+    private suspend fun getRelatedEvents(params: FetchPollResponseEventsTask.Params, from: String? = null): RelationsResponse {
+        return executeRequest(globalErrorReceiver, canRetry = true) {
+            roomAPI.getRelations(
+                    roomId = params.roomId,
+                    eventId = params.startPollEventId,
+                    relationType = RelationType.REFERENCE,
+                    from = from,
+                    limit = FETCH_RELATED_EVENTS_LIMIT,
+            )
+        }
+    }
+
+    private suspend fun addMissingEventsInDB(roomId: String, events: List<Event>) {
+        monarchy.awaitTransaction { realm ->
+            val eventIdsToCheck = events.mapNotNull { it.eventId }.filter { it.isNotEmpty() }
+            if (eventIdsToCheck.isNotEmpty()) {
+                val existingIds = EventEntity.where(realm, eventIdsToCheck).findAll().toList().map { it.eventId }
+
+                events.filterNot { it.eventId in existingIds }
+                        .map { it.toEntity(roomId = roomId, sendState = SendState.SYNCED, ageLocalTs = computeLocalTs(it)) }
+                        .forEach { it.copyToRealmOrIgnore(realm, EventInsertType.PAGINATION) }
+            }
+        }
+    }
+
+    private suspend fun decryptEventIfNeeded(event: Event): Event {
+        if (event.isEncrypted()) {
+            eventDecryptor.decryptEventAndSaveResult(event, timeline = "")
+        }
+
+        event.ageLocalTs = computeLocalTs(event)
+
+        return event
+    }
+
+    private fun computeLocalTs(event: Event) = clock.epochMillis() - (event.unsignedData?.age ?: 0)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt
index 254dee4295..848b9698ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt
@@ -16,37 +16,38 @@
 package org.matrix.android.sdk.internal.session.room.relation.threads
 
 import com.zhuinden.monarchy.Monarchy
+import io.realm.RealmList
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.threads.FetchThreadsResult
+import org.matrix.android.sdk.api.session.room.threads.ThreadFilter
 import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummaryUpdateType
 import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
 import org.matrix.android.sdk.internal.database.helper.createOrUpdate
 import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.threads.ThreadListPageEntity
 import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntity
+import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
-import org.matrix.android.sdk.internal.session.filter.FilterFactory
 import org.matrix.android.sdk.internal.session.room.RoomAPI
-import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
-import org.matrix.android.sdk.internal.session.room.timeline.PaginationResponse
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.awaitTransaction
 import org.matrix.android.sdk.internal.util.time.Clock
-import timber.log.Timber
 import javax.inject.Inject
 
 /***
  * This class is responsible to Fetch all the thread in the current room,
  * To fetch all threads in a room, the /messages API is used with newly added filtering options.
  */
-internal interface FetchThreadSummariesTask : Task<FetchThreadSummariesTask.Params, DefaultFetchThreadSummariesTask.Result> {
+internal interface FetchThreadSummariesTask : Task<FetchThreadSummariesTask.Params, FetchThreadsResult> {
     data class Params(
             val roomId: String,
-            val from: String = "",
-            val limit: Int = 500,
-            val isUserParticipating: Boolean = true
+            val from: String? = null,
+            val limit: Int = 5,
+            val filter: ThreadFilter? = null,
     )
 }
 
@@ -59,39 +60,43 @@ internal class DefaultFetchThreadSummariesTask @Inject constructor(
         private val clock: Clock,
 ) : FetchThreadSummariesTask {
 
-    override suspend fun execute(params: FetchThreadSummariesTask.Params): Result {
-        val filter = FilterFactory.createThreadsFilter(
-                numberOfEvents = params.limit,
-                userId = if (params.isUserParticipating) userId else null
-        ).toJSONString()
-
-        val response = executeRequest(
-                globalErrorReceiver,
-                canRetry = true
-        ) {
-            roomAPI.getRoomMessagesFrom(params.roomId, params.from, PaginationDirection.BACKWARDS.value, params.limit, filter)
+    override suspend fun execute(params: FetchThreadSummariesTask.Params): FetchThreadsResult {
+        val response = executeRequest(globalErrorReceiver) {
+            roomAPI.getThreadsList(
+                    roomId = params.roomId,
+                    include = params.filter?.toString()?.lowercase(),
+                    from = params.from,
+                    limit = params.limit
+            )
         }
 
-        Timber.i("###THREADS DefaultFetchThreadSummariesTask Fetched size:${response.events.size} nextBatch:${response.end} ")
+        handleResponse(response, params)
 
-        return handleResponse(response, params)
+        return when {
+            response.nextBatch != null -> FetchThreadsResult.ShouldFetchMore(response.nextBatch)
+            else -> FetchThreadsResult.ReachedEnd
+        }
     }
 
     private suspend fun handleResponse(
-            response: PaginationResponse,
+            response: ThreadSummariesResponse,
             params: FetchThreadSummariesTask.Params
-    ): Result {
-        val rootThreadList = response.events
+    ) {
+        val rootThreadList = response.chunk
+
+        val threadSummaries = RealmList<ThreadSummaryEntity>()
+
         monarchy.awaitTransaction { realm ->
             val roomEntity = RoomEntity.where(realm, roomId = params.roomId).findFirst() ?: return@awaitTransaction
 
             val roomMemberContentsByUser = HashMap<String, RoomMemberContent?>()
+
             for (rootThreadEvent in rootThreadList) {
                 if (rootThreadEvent.eventId == null || rootThreadEvent.senderId == null || rootThreadEvent.type == null) {
                     continue
                 }
 
-                ThreadSummaryEntity.createOrUpdate(
+                val threadSummary = ThreadSummaryEntity.createOrUpdate(
                         threadSummaryType = ThreadSummaryUpdateType.REPLACE,
                         realm = realm,
                         roomId = params.roomId,
@@ -102,14 +107,16 @@ internal class DefaultFetchThreadSummariesTask @Inject constructor(
                         cryptoService = cryptoService,
                         currentTimeMillis = clock.epochMillis(),
                 )
+
+                threadSummaries.add(threadSummary)
+            }
+
+            val page = ThreadListPageEntity.getOrCreate(realm, params.roomId)
+            threadSummaries.forEach {
+                if (!page.threadSummaries.contains(it)) {
+                    page.threadSummaries.add(it)
+                }
             }
         }
-        return Result.SUCCESS
-    }
-
-    enum class Result {
-        SHOULD_FETCH_MORE,
-        REACHED_END,
-        SUCCESS
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
index bac810f424..1e9a785c80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
@@ -17,13 +17,16 @@ package org.matrix.android.sdk.internal.session.room.relation.threads
 
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
+import org.matrix.android.sdk.internal.database.RealmSessionProvider
 import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
 import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.mapper.toEntity
@@ -46,6 +49,7 @@ import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.events.getFixedRoomMemberContent
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
+import org.matrix.android.sdk.internal.session.room.timeline.GetEventTask
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.awaitTransaction
@@ -87,6 +91,8 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         private val cryptoService: DefaultCryptoService,
         private val clock: Clock,
+        private val realmSessionProvider: RealmSessionProvider,
+        private val getEventTask: GetEventTask,
 ) : FetchThreadTimelineTask {
 
     enum class Result {
@@ -97,11 +103,12 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
 
     override suspend fun execute(params: FetchThreadTimelineTask.Params): Result {
         val response = executeRequest(globalErrorReceiver) {
-            roomAPI.getThreadsRelations(
+            roomAPI.getRelations(
                     roomId = params.roomId,
                     eventId = params.rootThreadEventId,
+                    relationType = RelationType.THREAD,
                     from = params.from,
-                    limit = params.limit
+                    limit = params.limit,
             )
         }
 
@@ -114,11 +121,26 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
             params: FetchThreadTimelineTask.Params
     ): Result {
         val threadList = response.chunks
-        val threadRootEvent = response.originalEvent
         val hasReachEnd = response.nextBatch == null
 
-        monarchy.awaitTransaction { realm ->
+        val isRootThreadTimelineEventEntityKnown: Boolean
+        var threadRootEvent: Event? = null
 
+        if (hasReachEnd) {
+            isRootThreadTimelineEventEntityKnown = realmSessionProvider.withRealm { realm ->
+                TimelineEventEntity
+                        .where(realm, roomId = params.roomId, eventId = params.rootThreadEventId)
+                        .findFirst()
+            } != null
+            if (!isRootThreadTimelineEventEntityKnown) {
+                // Fetch the root event from the server
+                threadRootEvent = tryOrNull {
+                    getEventTask.execute(GetEventTask.Params(roomId = params.roomId, eventId = params.rootThreadEventId))
+                }
+            }
+        }
+
+        monarchy.awaitTransaction { realm ->
             val threadChunk = ChunkEntity.findLastForwardChunkOfThread(realm, params.roomId, params.rootThreadEventId)
                     ?: run {
                         return@awaitTransaction
@@ -173,7 +195,7 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
                     // Case when thread event is not in the device
                     Timber.i("###THREADS FetchThreadTimelineTask root thread event: ${params.rootThreadEventId} NOT FOUND! Lets create a temp one")
                     val eventEntity = createEventEntity(params.roomId, threadRootEvent, realm)
-                    roomMemberContentsByUser.addSenderState(realm, params.roomId, threadRootEvent.senderId)
+                    roomMemberContentsByUser.addSenderState(realm, params.roomId, threadRootEvent.senderId!!)
                     threadChunk.addTimelineEvent(
                             roomId = params.roomId,
                             eventEntity = eventEntity,
@@ -225,7 +247,8 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
                     payload = result.clearEvent,
                     senderKey = result.senderCurve25519Key,
                     keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
-                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
+                    isSafe = result.isSafe
             )
         } catch (e: MXCryptoError) {
             if (e is MXCryptoError.Base) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/ThreadSummariesResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/ThreadSummariesResponse.kt
new file mode 100644
index 0000000000..d37a058ef6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/ThreadSummariesResponse.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 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.
+ */
+package org.matrix.android.sdk.internal.session.room.relation.threads
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.events.model.Event
+
+@JsonClass(generateAdapter = true)
+internal data class ThreadSummariesResponse(
+        @Json(name = "chunk") val chunk: List<Event>,
+        @Json(name = "next_batch") val nextBatch: String?,
+        @Json(name = "prev_batch") val prevBatch: String?
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index 418000abed..9cdbc7ff46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -27,6 +27,7 @@ import dagger.assisted.AssistedInject
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
@@ -39,6 +40,7 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
 import org.matrix.android.sdk.api.session.room.model.message.PollType
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 import org.matrix.android.sdk.api.session.room.send.SendService
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -87,51 +89,60 @@ internal class DefaultSendService @AssistedInject constructor(
                 .let { sendEvent(it) }
     }
 
-    override fun sendTextMessage(text: CharSequence, msgType: String, autoMarkdown: Boolean): Cancelable {
-        return localEchoEventFactory.createTextEvent(roomId, msgType, text, autoMarkdown)
+    override fun sendTextMessage(text: CharSequence, msgType: String, autoMarkdown: Boolean, additionalContent: Content?): Cancelable {
+        return localEchoEventFactory.createTextEvent(roomId, msgType, text, autoMarkdown, additionalContent)
                 .also { createLocalEcho(it) }
                 .let { sendEvent(it) }
     }
 
-    override fun sendFormattedTextMessage(text: String, formattedText: String, msgType: String): Cancelable {
-        return localEchoEventFactory.createFormattedTextEvent(roomId, TextContent(text, formattedText), msgType)
+    override fun sendFormattedTextMessage(text: String, formattedText: String, msgType: String, additionalContent: Content?): Cancelable {
+        return localEchoEventFactory.createFormattedTextEvent(roomId, TextContent(text, formattedText), msgType, additionalContent)
                 .also { createLocalEcho(it) }
                 .let { sendEvent(it) }
     }
 
-    override fun sendQuotedTextMessage(quotedEvent: TimelineEvent, text: String, autoMarkdown: Boolean, rootThreadEventId: String?): Cancelable {
+    override fun sendQuotedTextMessage(
+            quotedEvent: TimelineEvent,
+            text: String,
+            formattedText: String?,
+            autoMarkdown: Boolean,
+            rootThreadEventId: String?,
+            additionalContent: Content?,
+    ): Cancelable {
         return localEchoEventFactory.createQuotedTextEvent(
                 roomId = roomId,
                 quotedEvent = quotedEvent,
                 text = text,
+                formattedText = formattedText,
                 autoMarkdown = autoMarkdown,
-                rootThreadEventId = rootThreadEventId
+                rootThreadEventId = rootThreadEventId,
+                additionalContent = additionalContent,
         )
                 .also { createLocalEcho(it) }
                 .let { sendEvent(it) }
     }
 
-    override fun sendPoll(pollType: PollType, question: String, options: List<String>): Cancelable {
-        return localEchoEventFactory.createPollEvent(roomId, pollType, question, options)
+    override fun sendPoll(pollType: PollType, question: String, options: List<String>, additionalContent: Content?): Cancelable {
+        return localEchoEventFactory.createPollEvent(roomId, pollType, question, options, additionalContent)
                 .also { createLocalEcho(it) }
                 .let { sendEvent(it) }
     }
 
-    override fun voteToPoll(pollEventId: String, answerId: String): Cancelable {
-        return localEchoEventFactory.createPollReplyEvent(roomId, pollEventId, answerId)
+    override fun voteToPoll(pollEventId: String, answerId: String, additionalContent: Content?): Cancelable {
+        return localEchoEventFactory.createPollReplyEvent(roomId, pollEventId, answerId, additionalContent)
                 .also { createLocalEcho(it) }
                 .let { sendEvent(it) }
     }
 
-    override fun endPoll(pollEventId: String): Cancelable {
-        return localEchoEventFactory.createEndPollEvent(roomId, pollEventId)
+    override fun endPoll(pollEventId: String, additionalContent: Content?): Cancelable {
+        return localEchoEventFactory.createEndPollEvent(roomId, pollEventId, additionalContent)
                 .also { createLocalEcho(it) }
                 .let { sendEvent(it) }
     }
 
-    override fun redactEvent(event: Event, reason: String?): Cancelable {
+    override fun redactEvent(event: Event, reason: String?, additionalContent: Content?): Cancelable {
         // TODO manage media/attachements?
-        val redactionEcho = localEchoEventFactory.createRedactEvent(roomId, event.eventId!!, reason)
+        val redactionEcho = localEchoEventFactory.createRedactEvent(roomId, event.eventId!!, reason, additionalContent)
                 .also { createLocalEcho(it) }
         return eventSenderProcessor.postRedaction(redactionEcho, reason)
     }
@@ -257,7 +268,8 @@ internal class DefaultSendService @AssistedInject constructor(
             attachments: List<ContentAttachmentData>,
             compressBeforeSending: Boolean,
             roomIds: Set<String>,
-            rootThreadEventId: String?
+            rootThreadEventId: String?,
+            additionalContent: Content?,
     ): Cancelable {
         return attachments.mapTo(CancelableBag()) {
             sendMedia(
@@ -273,7 +285,9 @@ internal class DefaultSendService @AssistedInject constructor(
             attachment: ContentAttachmentData,
             compressBeforeSending: Boolean,
             roomIds: Set<String>,
-            rootThreadEventId: String?
+            rootThreadEventId: String?,
+            relatesTo: RelationDefaultContent?,
+            additionalContent: Content?,
     ): Cancelable {
         // Ensure that the event will not be send in a thread if we are a different flow.
         // Like sending files to multiple rooms
@@ -288,7 +302,9 @@ internal class DefaultSendService @AssistedInject constructor(
             localEchoEventFactory.createMediaEvent(
                     roomId = it,
                     attachment = attachment,
-                    rootThreadEventId = rootThreadId
+                    rootThreadEventId = rootThreadId,
+                    relatesTo,
+                    additionalContent,
             ).also { event ->
                 createLocalEcho(event)
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index 4fbc91e9ec..d974c597ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -95,12 +95,12 @@ internal class LocalEchoEventFactory @Inject constructor(
         private val permalinkFactory: PermalinkFactory,
         private val clock: Clock,
 ) {
-    fun createTextEvent(roomId: String, msgType: String, text: CharSequence, autoMarkdown: Boolean): Event {
+    fun createTextEvent(roomId: String, msgType: String, text: CharSequence, autoMarkdown: Boolean, additionalContent: Content? = null): Event {
         if (msgType == MessageType.MSGTYPE_TEXT || msgType == MessageType.MSGTYPE_EMOTE) {
-            return createFormattedTextEvent(roomId, createTextContent(text, autoMarkdown), msgType)
+            return createFormattedTextEvent(roomId, createTextContent(text, autoMarkdown), msgType, additionalContent)
         }
         val content = MessageTextContent(msgType = msgType, body = text.toString())
-        return createMessageEvent(roomId, content)
+        return createMessageEvent(roomId, content, additionalContent)
     }
 
     private fun createTextContent(text: CharSequence, autoMarkdown: Boolean): TextContent {
@@ -116,35 +116,41 @@ internal class LocalEchoEventFactory @Inject constructor(
         return TextContent(text.toString())
     }
 
-    fun createFormattedTextEvent(roomId: String, textContent: TextContent, msgType: String): Event {
-        return createMessageEvent(roomId, textContent.toMessageTextContent(msgType))
+    fun createFormattedTextEvent(roomId: String, textContent: TextContent, msgType: String, additionalContent: Content? = null): Event {
+        return createMessageEvent(roomId, textContent.toMessageTextContent(msgType), additionalContent)
     }
 
     fun createReplaceTextEvent(
             roomId: String,
             targetEventId: String,
             newBodyText: CharSequence,
+            newBodyFormattedText: CharSequence?,
             newBodyAutoMarkdown: Boolean,
             msgType: String,
-            compatibilityText: String
+            compatibilityText: String,
+            additionalContent: Content? = null,
     ): Event {
+        val content = if (newBodyFormattedText != null) {
+            TextContent(newBodyText.toString(), newBodyFormattedText.toString()).toMessageTextContent(msgType)
+        } else {
+            createTextContent(newBodyText, newBodyAutoMarkdown).toMessageTextContent(msgType)
+        }.toContent()
         return createMessageEvent(
                 roomId,
                 MessageTextContent(
                         msgType = msgType,
                         body = compatibilityText,
                         relatesTo = RelationDefaultContent(RelationType.REPLACE, targetEventId),
-                        newContent = createTextContent(newBodyText, newBodyAutoMarkdown)
-                                .toMessageTextContent(msgType)
-                                .toContent()
-                )
+                        newContent = content,
+                ),
+                additionalContent,
         )
     }
 
     private fun createPollContent(
             question: String,
             options: List<String>,
-            pollType: PollType
+            pollType: PollType,
     ): MessagePollContent {
         return MessagePollContent(
                 unstablePollCreationInfo = PollCreationInfo(
@@ -162,7 +168,8 @@ internal class LocalEchoEventFactory @Inject constructor(
             pollType: PollType,
             targetEventId: String,
             question: String,
-            options: List<String>
+            options: List<String>,
+            additionalContent: Content? = null,
     ): Event {
         val newContent = MessagePollContent(
                 relatesTo = RelationDefaultContent(RelationType.REPLACE, targetEventId),
@@ -174,15 +181,16 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.POLL_START.first(),
-                content = newContent.toContent()
+                type = EventType.POLL_START.unstable,
+                content = newContent.toContent().plus(additionalContent.orEmpty())
         )
     }
 
     fun createPollReplyEvent(
             roomId: String,
             pollEventId: String,
-            answerId: String
+            answerId: String,
+            additionalContent: Content? = null,
     ): Event {
         val content = MessagePollResponseContent(
                 body = answerId,
@@ -198,8 +206,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.POLL_RESPONSE.first(),
-                content = content.toContent(),
+                type = EventType.POLL_RESPONSE.unstable,
+                content = content.toContent().plus(additionalContent.orEmpty()),
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
     }
@@ -208,7 +216,8 @@ internal class LocalEchoEventFactory @Inject constructor(
             roomId: String,
             pollType: PollType,
             question: String,
-            options: List<String>
+            options: List<String>,
+            additionalContent: Content? = null,
     ): Event {
         val content = createPollContent(question, options, pollType)
         val localId = LocalEcho.createLocalEchoId()
@@ -217,15 +226,16 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.POLL_START.first(),
-                content = content.toContent(),
+                type = EventType.POLL_START.unstable,
+                content = content.toContent().plus(additionalContent.orEmpty()),
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
     }
 
     fun createEndPollEvent(
             roomId: String,
-            eventId: String
+            eventId: String,
+            additionalContent: Content? = null,
     ): Event {
         val content = MessageEndPollContent(
                 relatesTo = RelationDefaultContent(
@@ -239,8 +249,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.POLL_END.first(),
-                content = content.toContent(),
+                type = EventType.POLL_END.unstable,
+                content = content.toContent().plus(additionalContent.orEmpty()),
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
     }
@@ -250,7 +260,8 @@ internal class LocalEchoEventFactory @Inject constructor(
             latitude: Double,
             longitude: Double,
             uncertainty: Double?,
-            isUserLocation: Boolean
+            isUserLocation: Boolean,
+            additionalContent: Content? = null,
     ): Event {
         val geoUri = buildGeoUri(latitude, longitude, uncertainty)
         val assetType = if (isUserLocation) LocationAssetType.SELF else LocationAssetType.PIN
@@ -262,7 +273,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 unstableTimestampMillis = clock.epochMillis(),
                 unstableText = geoUri
         )
-        return createMessageEvent(roomId, content)
+        return createMessageEvent(roomId, content, additionalContent)
     }
 
     fun createLiveLocationEvent(
@@ -270,7 +281,8 @@ internal class LocalEchoEventFactory @Inject constructor(
             roomId: String,
             latitude: Double,
             longitude: Double,
-            uncertainty: Double?
+            uncertainty: Double?,
+            additionalContent: Content? = null,
     ): Event {
         val geoUri = buildGeoUri(latitude, longitude, uncertainty)
         val content = MessageBeaconLocationDataContent(
@@ -288,8 +300,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.BEACON_LOCATION_DATA.first(),
-                content = content.toContent(),
+                type = EventType.BEACON_LOCATION_DATA.unstable,
+                content = content.toContent().plus(additionalContent.orEmpty()),
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
     }
@@ -301,7 +313,8 @@ internal class LocalEchoEventFactory @Inject constructor(
             newBodyText: String,
             autoMarkdown: Boolean,
             msgType: String,
-            compatibilityText: String
+            compatibilityText: String,
+            additionalContent: Content? = null,
     ): Event {
         val permalink = permalinkFactory.createPermalink(roomId, originalEvent.root.eventId ?: "", false)
         val userLink = originalEvent.root.senderId?.let { permalinkFactory.createPermalink(it, false) } ?: ""
@@ -336,25 +349,42 @@ internal class LocalEchoEventFactory @Inject constructor(
                                 formattedBody = replyFormatted
                         )
                                 .toContent()
-                )
+                ),
+                additionalContent,
         )
     }
 
     fun createMediaEvent(
             roomId: String,
             attachment: ContentAttachmentData,
-            rootThreadEventId: String?
+            rootThreadEventId: String?,
+            relatesTo: RelationDefaultContent?,
+            additionalContent: Content? = null,
     ): Event {
         return when (attachment.type) {
-            ContentAttachmentData.Type.IMAGE -> createImageEvent(roomId, attachment, rootThreadEventId)
-            ContentAttachmentData.Type.VIDEO -> createVideoEvent(roomId, attachment, rootThreadEventId)
-            ContentAttachmentData.Type.AUDIO -> createAudioEvent(roomId, attachment, isVoiceMessage = false, rootThreadEventId = rootThreadEventId)
-            ContentAttachmentData.Type.VOICE_MESSAGE -> createAudioEvent(roomId, attachment, isVoiceMessage = true, rootThreadEventId = rootThreadEventId)
-            ContentAttachmentData.Type.FILE -> createFileEvent(roomId, attachment, rootThreadEventId)
+            ContentAttachmentData.Type.IMAGE -> createImageEvent(roomId, attachment, rootThreadEventId, relatesTo, additionalContent)
+            ContentAttachmentData.Type.VIDEO -> createVideoEvent(roomId, attachment, rootThreadEventId, relatesTo, additionalContent)
+            ContentAttachmentData.Type.AUDIO -> createAudioEvent(
+                    roomId,
+                    attachment,
+                    isVoiceMessage = false,
+                    rootThreadEventId = rootThreadEventId,
+                    relatesTo,
+                    additionalContent
+            )
+            ContentAttachmentData.Type.VOICE_MESSAGE -> createAudioEvent(
+                    roomId,
+                    attachment,
+                    isVoiceMessage = true,
+                    rootThreadEventId = rootThreadEventId,
+                    relatesTo,
+                    additionalContent,
+            )
+            ContentAttachmentData.Type.FILE -> createFileEvent(roomId, attachment, rootThreadEventId, relatesTo, additionalContent)
         }
     }
 
-    fun createReactionEvent(roomId: String, targetEventId: String, reaction: String): Event {
+    fun createReactionEvent(roomId: String, targetEventId: String, reaction: String, additionalContent: Content? = null): Event {
         val content = ReactionContent(
                 ReactionInfo(
                         RelationType.ANNOTATION,
@@ -369,12 +399,18 @@ internal class LocalEchoEventFactory @Inject constructor(
                 senderId = userId,
                 eventId = localId,
                 type = EventType.REACTION,
-                content = content.toContent(),
+                content = content.toContent().plus(additionalContent.orEmpty()),
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
     }
 
-    private fun createImageEvent(roomId: String, attachment: ContentAttachmentData, rootThreadEventId: String?): Event {
+    private fun createImageEvent(
+            roomId: String,
+            attachment: ContentAttachmentData,
+            rootThreadEventId: String?,
+            relatesTo: RelationDefaultContent?,
+            additionalContent: Content?,
+    ): Event {
         var width = attachment.width
         var height = attachment.height
 
@@ -399,19 +435,18 @@ internal class LocalEchoEventFactory @Inject constructor(
                         size = attachment.size
                 ),
                 url = attachment.queryUri.toString(),
-                relatesTo = rootThreadEventId?.let {
-                    RelationDefaultContent(
-                            type = RelationType.THREAD,
-                            eventId = it,
-                            isFallingBack = true,
-                            inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(it))
-                    )
-                }
+                relatesTo = relatesTo ?: rootThreadEventId?.let { generateThreadRelationContent(it) }
         )
-        return createMessageEvent(roomId, content)
+        return createMessageEvent(roomId, content, additionalContent)
     }
 
-    private fun createVideoEvent(roomId: String, attachment: ContentAttachmentData, rootThreadEventId: String?): Event {
+    private fun createVideoEvent(
+            roomId: String,
+            attachment: ContentAttachmentData,
+            rootThreadEventId: String?,
+            relatesTo: RelationDefaultContent?,
+            additionalContent: Content?,
+    ): Event {
         val mediaDataRetriever = MediaMetadataRetriever()
         mediaDataRetriever.setDataSource(context, attachment.queryUri)
 
@@ -443,23 +478,18 @@ internal class LocalEchoEventFactory @Inject constructor(
                         thumbnailInfo = thumbnailInfo
                 ),
                 url = attachment.queryUri.toString(),
-                relatesTo = rootThreadEventId?.let {
-                    RelationDefaultContent(
-                            type = RelationType.THREAD,
-                            eventId = it,
-                            isFallingBack = true,
-                            inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(it))
-                    )
-                }
+                relatesTo = relatesTo ?: rootThreadEventId?.let { generateThreadRelationContent(it) }
         )
-        return createMessageEvent(roomId, content)
+        return createMessageEvent(roomId, content, additionalContent)
     }
 
     private fun createAudioEvent(
             roomId: String,
             attachment: ContentAttachmentData,
             isVoiceMessage: Boolean,
-            rootThreadEventId: String?
+            rootThreadEventId: String?,
+            relatesTo: RelationDefaultContent?,
+            additionalContent: Content?
     ): Event {
         val content = MessageAudioContent(
                 msgType = MessageType.MSGTYPE_AUDIO,
@@ -475,19 +505,18 @@ internal class LocalEchoEventFactory @Inject constructor(
                         waveform = waveformSanitizer.sanitize(attachment.waveform)
                 ),
                 voiceMessageIndicator = if (!isVoiceMessage) null else emptyMap(),
-                relatesTo = rootThreadEventId?.let {
-                    RelationDefaultContent(
-                            type = RelationType.THREAD,
-                            eventId = it,
-                            isFallingBack = true,
-                            inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(it))
-                    )
-                }
+                relatesTo = relatesTo ?: rootThreadEventId?.let { generateThreadRelationContent(it) }
         )
-        return createMessageEvent(roomId, content)
+        return createMessageEvent(roomId, content, additionalContent)
     }
 
-    private fun createFileEvent(roomId: String, attachment: ContentAttachmentData, rootThreadEventId: String?): Event {
+    private fun createFileEvent(
+            roomId: String,
+            attachment: ContentAttachmentData,
+            rootThreadEventId: String?,
+            relatesTo: RelationDefaultContent?,
+            additionalContent: Content?
+    ): Event {
         val content = MessageFileContent(
                 msgType = MessageType.MSGTYPE_FILE,
                 body = attachment.name ?: "file",
@@ -496,24 +525,18 @@ internal class LocalEchoEventFactory @Inject constructor(
                         size = attachment.size
                 ),
                 url = attachment.queryUri.toString(),
-                relatesTo = rootThreadEventId?.let {
-                    RelationDefaultContent(
-                            type = RelationType.THREAD,
-                            eventId = it,
-                            isFallingBack = true,
-                            inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(it))
-                    )
-                }
+                relatesTo = relatesTo ?: rootThreadEventId?.let { generateThreadRelationContent(it) }
         )
-        return createMessageEvent(roomId, content)
+        return createMessageEvent(roomId, content, additionalContent)
     }
 
-    private fun createMessageEvent(roomId: String, content: MessageContent? = null): Event {
-        return createEvent(roomId, EventType.MESSAGE, content.toContent())
+    private fun createMessageEvent(roomId: String, content: MessageContent, additionalContent: Content?): Event {
+        return createEvent(roomId, EventType.MESSAGE, content.toContent(), additionalContent)
     }
 
-    fun createEvent(roomId: String, type: String, content: Content?): Event {
+    fun createEvent(roomId: String, type: String, content: Content?, additionalContent: Content? = null): Event {
         val newContent = enhanceStickerIfNeeded(type, content) ?: content
+        val updatedNewContent = newContent?.plus(additionalContent.orEmpty()) ?: additionalContent
         val localId = LocalEcho.createLocalEchoId()
         return Event(
                 roomId = roomId,
@@ -521,7 +544,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 senderId = userId,
                 eventId = localId,
                 type = type,
-                content = newContent,
+                content = updatedNewContent,
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
     }
@@ -555,7 +578,8 @@ internal class LocalEchoEventFactory @Inject constructor(
             text: CharSequence,
             msgType: String,
             autoMarkdown: Boolean,
-            formattedText: String?
+            formattedText: String?,
+            additionalContent: Content? = null,
     ): Event {
         val content = formattedText?.let { TextContent(text.toString(), it) } ?: createTextContent(text, autoMarkdown)
         return createEvent(
@@ -565,8 +589,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                         rootThreadEventId = rootThreadEventId,
                         latestThreadEventId = localEchoRepository.getLatestThreadEvent(rootThreadEventId),
                         msgType = msgType
-                )
-                        .toContent()
+                ).toContent().plus(additionalContent.orEmpty())
         )
     }
 
@@ -574,27 +597,25 @@ internal class LocalEchoEventFactory @Inject constructor(
         return clock.epochMillis()
     }
 
-    /**
-     * Creates a reply to a regular timeline Event or a thread Event if needed.
-     */
-    fun createReplyTextEvent(
-            roomId: String,
+    fun createReplyTextContent(
             eventReplied: TimelineEvent,
             replyText: CharSequence,
+            replyTextFormatted: CharSequence?,
             autoMarkdown: Boolean,
             rootThreadEventId: String? = null,
-            showInThread: Boolean
-    ): Event? {
+            showInThread: Boolean,
+            isRedactedEvent: Boolean = false
+    ): MessageContent? {
         // Fallbacks and event representation
         // TODO Add error/warning logs when any of this is null
         val permalink = permalinkFactory.createPermalink(eventReplied.root, false) ?: return null
         val userId = eventReplied.root.senderId ?: return null
         val userLink = permalinkFactory.createPermalink(userId, false) ?: return null
 
-        val body = bodyForReply(eventReplied.getLastMessageContent(), eventReplied.isReply())
+        val body = bodyForReply(eventReplied.getLastMessageContent(), eventReplied.isReply(), isRedactedEvent)
 
         // As we always supply formatted body for replies we should force the MarkdownParser to produce html.
-        val replyTextFormatted = markdownParser.parse(replyText, force = true, advanced = autoMarkdown).takeFormatted()
+        val finalReplyTextFormatted = replyTextFormatted?.toString() ?: markdownParser.parse(replyText, force = true, advanced = autoMarkdown).takeFormatted()
         // Body of the original message may not have formatted version, so may also have to convert to html.
         val bodyFormatted = body.formattedText ?: markdownParser.parse(body.text, force = true, advanced = autoMarkdown).takeFormatted()
         val replyFormatted = buildFormattedReply(
@@ -602,7 +623,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 userLink,
                 userId,
                 bodyFormatted,
-                replyTextFormatted
+                finalReplyTextFormatted
         )
         //
         // > <@alice:example.org> This is the original body
@@ -610,7 +631,7 @@ internal class LocalEchoEventFactory @Inject constructor(
         val replyFallback = buildReplyFallback(body, userId, replyText.toString())
 
         val eventId = eventReplied.root.eventId ?: return null
-        val content = MessageTextContent(
+        return MessageTextContent(
                 msgType = MessageType.MSGTYPE_TEXT,
                 format = MessageFormat.FORMAT_MATRIX_HTML,
                 body = replyFallback,
@@ -621,9 +642,35 @@ internal class LocalEchoEventFactory @Inject constructor(
                         showInThread = showInThread
                 )
         )
-        return createMessageEvent(roomId, content)
     }
 
+    /**
+     * Creates a reply to a regular timeline Event or a thread Event if needed.
+     */
+    fun createReplyTextEvent(
+            roomId: String,
+            eventReplied: TimelineEvent,
+            replyText: CharSequence,
+            replyTextFormatted: CharSequence?,
+            autoMarkdown: Boolean,
+            rootThreadEventId: String? = null,
+            showInThread: Boolean,
+            additionalContent: Content? = null,
+    ): Event? {
+        val content = createReplyTextContent(eventReplied, replyText, replyTextFormatted, autoMarkdown, rootThreadEventId, showInThread)
+        return content?.let {
+            createMessageEvent(roomId, it, additionalContent)
+        }
+    }
+
+    private fun generateThreadRelationContent(rootThreadEventId: String) =
+            RelationDefaultContent(
+                    type = RelationType.THREAD,
+                    eventId = rootThreadEventId,
+                    isFallingBack = true,
+                    inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(rootThreadEventId)),
+            )
+
     /**
      * Generates the appropriate relatesTo object for a reply event.
      * It can either be a regular reply or a reply within a thread
@@ -682,7 +729,7 @@ internal class LocalEchoEventFactory @Inject constructor(
      * In case of an edit of a reply the last content is not
      * himself a reply, but it will contain the fallbacks, so we have to trim them.
      */
-    private fun bodyForReply(content: MessageContent?, isReply: Boolean): TextContent {
+    fun bodyForReply(content: MessageContent?, isReply: Boolean, isRedactedEvent: Boolean = false): TextContent {
         when (content?.msgType) {
             MessageType.MSGTYPE_EMOTE,
             MessageType.MSGTYPE_TEXT,
@@ -691,7 +738,9 @@ internal class LocalEchoEventFactory @Inject constructor(
                 if (content is MessageContentWithFormattedBody) {
                     formattedText = content.matrixFormattedBody
                 }
-                return if (isReply) {
+                return if (isRedactedEvent) {
+                    TextContent("message removed.")
+                } else if (isReply) {
                     TextContent(content.body, formattedText).removeInReplyFallbacks()
                 } else {
                     TextContent(content.body, formattedText)
@@ -705,7 +754,11 @@ internal class LocalEchoEventFactory @Inject constructor(
             MessageType.MSGTYPE_POLL_START -> {
                 return TextContent((content as? MessagePollContent)?.getBestPollCreationInfo()?.question?.getBestQuestion() ?: "")
             }
-            else -> return TextContent(content?.body ?: "")
+            else -> {
+                return if (isRedactedEvent) {
+                    TextContent("message removed.")
+                } else TextContent(content?.body ?: "")
+            }
         }
     }
 
@@ -742,7 +795,7 @@ internal class LocalEchoEventFactory @Inject constructor(
         }
     }
      */
-    fun createRedactEvent(roomId: String, eventId: String, reason: String?): Event {
+    fun createRedactEvent(roomId: String, eventId: String, reason: String?, additionalContent: Content? = null): Event {
         val localId = LocalEcho.createLocalEchoId()
         return Event(
                 roomId = roomId,
@@ -751,7 +804,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 eventId = localId,
                 type = EventType.REDACTION,
                 redacts = eventId,
-                content = reason?.let { mapOf("reason" to it).toContent() },
+                content = reason?.let { mapOf("reason" to it).toContent().plus(additionalContent.orEmpty()) } ?: additionalContent,
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
     }
@@ -765,51 +818,75 @@ internal class LocalEchoEventFactory @Inject constructor(
             roomId: String,
             quotedEvent: TimelineEvent,
             text: String,
+            formattedText: String?,
             autoMarkdown: Boolean,
-            rootThreadEventId: String?
+            rootThreadEventId: String?,
+            additionalContent: Content? = null,
     ): Event {
         val messageContent = quotedEvent.getLastMessageContent()
-        val textMsg = messageContent?.body
-        val quoteText = legacyRiotQuoteText(textMsg, text)
-
+        val formattedQuotedText = (messageContent as? MessageContentWithFormattedBody)?.formattedBody
+        val textContent = createQuoteTextContent(messageContent?.body, formattedQuotedText, text, formattedText, autoMarkdown)
         return if (rootThreadEventId != null) {
             createMessageEvent(
                     roomId,
-                    markdownParser
-                            .parse(quoteText, force = true, advanced = autoMarkdown)
-                            .toThreadTextContent(
+                    textContent.toThreadTextContent(
                                     rootThreadEventId = rootThreadEventId,
                                     latestThreadEventId = localEchoRepository.getLatestThreadEvent(rootThreadEventId),
                                     msgType = MessageType.MSGTYPE_TEXT
-                            )
+                            ),
+                    additionalContent,
             )
         } else {
             createFormattedTextEvent(
                     roomId,
-                    markdownParser.parse(quoteText, force = true, advanced = autoMarkdown),
-                    MessageType.MSGTYPE_TEXT
+                    textContent,
+                    MessageType.MSGTYPE_TEXT,
+                    additionalContent,
             )
         }
     }
 
-    private fun legacyRiotQuoteText(quotedText: String?, myText: String): String {
-        val messageParagraphs = quotedText?.split("\n\n".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
-        return buildString {
-            if (messageParagraphs != null) {
-                for (i in messageParagraphs.indices) {
-                    if (messageParagraphs[i].isNotBlank()) {
-                        append("> ")
-                        append(messageParagraphs[i])
-                    }
+    private fun createQuoteTextContent(
+            quotedText: String?,
+            formattedQuotedText: String?,
+            text: String,
+            formattedText: String?,
+            autoMarkdown: Boolean
+    ): TextContent {
+        val currentFormattedText = formattedText ?: if (autoMarkdown) {
+            val parsed = markdownParser.parse(text, force = true, advanced = true)
+            // If formattedText == text, formattedText is returned as null
+            parsed.formattedText ?: parsed.text
+        } else {
+            text
+        }
+        val processedFormattedQuotedText = formattedQuotedText ?: quotedText
 
-                    if (i != messageParagraphs.lastIndex) {
-                        append("\n\n")
-                    }
+        val plainTextBody = buildString {
+            val plainMessageParagraphs = quotedText?.split("\n\n".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray().orEmpty()
+            plainMessageParagraphs.forEachIndexed { index, paragraph ->
+                if (paragraph.isNotBlank()) {
+                    append("> ")
+                    append(paragraph)
+                }
+
+                if (index != plainMessageParagraphs.lastIndex) {
+                    append("\n\n")
                 }
             }
             append("\n\n")
-            append(myText)
+            append(text)
         }
+        val formattedTextBody = buildString {
+            if (!processedFormattedQuotedText.isNullOrBlank()) {
+                append("<blockquote>")
+                append(processedFormattedQuotedText)
+                append("</blockquote>")
+            }
+            append("<br/>")
+            append(currentFormattedText)
+        }
+        return TextContent(plainTextBody, formattedTextBody)
     }
 
     companion object {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
index 2afca6e554..801ff0ec79 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
@@ -53,7 +53,7 @@ internal class MultipleEventSendingDispatcherWorker(context: Context, params: Wo
     @Inject lateinit var timelineSendEventWorkCommon: TimelineSendEventWorkCommon
     @Inject lateinit var localEchoRepository: LocalEchoRepository
 
-    override fun doOnError(params: Params): Result {
+    override fun doOnError(params: Params, failureMessage: String): Result {
         params.localEchoIds.forEach { localEchoIds ->
             localEchoRepository.updateSendState(
                     eventId = localEchoIds.eventId,
@@ -63,7 +63,7 @@ internal class MultipleEventSendingDispatcherWorker(context: Context, params: Wo
             )
         }
 
-        return super.doOnError(params)
+        return super.doOnError(params, failureMessage)
     }
 
     override fun injectWith(injector: SessionComponent) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
deleted file mode 100644
index 51107c9655..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * 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.
- */
-
-package org.matrix.android.sdk.internal.session.room.send.queue
-
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import org.matrix.android.sdk.api.auth.data.SessionParams
-import org.matrix.android.sdk.api.auth.data.sessionId
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.api.failure.isLimitExceededError
-import org.matrix.android.sdk.api.failure.isTokenError
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.crypto.CryptoService
-import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.sync.SyncState
-import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.session.SessionScope
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import timber.log.Timber
-import java.io.IOException
-import java.util.Timer
-import java.util.TimerTask
-import java.util.concurrent.LinkedBlockingQueue
-import javax.inject.Inject
-import kotlin.concurrent.schedule
-
-/**
- * A simple ever running thread unique for that session responsible of sending events in order.
- * Each send is retried 3 times, if there is no network (e.g if cannot ping homeserver) it will wait and
- * periodically test reachability before resume (does not count as a retry)
- *
- * If the app is killed before all event were sent, on next wakeup the scheduled events will be re posted
- */
-@Deprecated("You should know use EventSenderProcessorCoroutine instead")
-@SessionScope
-internal class EventSenderProcessorThread @Inject constructor(
-        private val cryptoService: CryptoService,
-        private val sessionParams: SessionParams,
-        private val queuedTaskFactory: QueuedTaskFactory,
-        private val taskExecutor: TaskExecutor,
-        private val memento: QueueMemento
-) : Thread("SENDER_THREAD_SID_${sessionParams.credentials.sessionId()}"), EventSenderProcessor {
-
-    private fun markAsManaged(task: QueuedTask) {
-        memento.track(task)
-    }
-
-    private fun markAsFinished(task: QueuedTask) {
-        memento.unTrack(task)
-    }
-
-    override fun onSessionStarted(session: Session) {
-        start()
-    }
-
-    override fun onSessionStopped(session: Session) {
-        interrupt()
-    }
-
-    override fun start() {
-        super.start()
-        // We should check for sending events not handled because app was killed
-        // But we should be careful of only took those that was submitted to us, because if it's
-        // for example it's a media event it is handled by some worker and he will handle it
-        // This is a bit fragile :/
-        // also some events cannot be retried manually by users, e.g reactions
-        // they were previously relying on workers to do the work :/ and was expected to always finally succeed
-        // Also some echos are not to be resent like redaction echos (fake event created for aggregation)
-
-        tryOrNull {
-            taskExecutor.executorScope.launch {
-                Timber.d("## Send relaunched pending events on restart")
-                memento.restoreTasks(this@EventSenderProcessorThread)
-            }
-        }
-    }
-
-    // API
-    override fun postEvent(event: Event): Cancelable {
-        return postEvent(event, event.roomId?.let { cryptoService.isRoomEncrypted(it) } ?: false)
-    }
-
-    override fun postEvent(event: Event, encrypt: Boolean): Cancelable {
-        val task = queuedTaskFactory.createSendTask(event, encrypt)
-        return postTask(task)
-    }
-
-    override fun postRedaction(redactionLocalEcho: Event, reason: String?): Cancelable {
-        return postRedaction(redactionLocalEcho.eventId!!, redactionLocalEcho.redacts!!, redactionLocalEcho.roomId!!, reason)
-    }
-
-    override fun postRedaction(redactionLocalEchoId: String, eventToRedactId: String, roomId: String, reason: String?): Cancelable {
-        val task = queuedTaskFactory.createRedactTask(redactionLocalEchoId, eventToRedactId, roomId, reason)
-        return postTask(task)
-    }
-
-    override fun postTask(task: QueuedTask): Cancelable {
-        // non blocking add to queue
-        sendingQueue.add(task)
-        markAsManaged(task)
-        return task
-    }
-
-    override fun cancel(eventId: String, roomId: String) {
-        (currentTask as? SendEventQueuedTask)
-                ?.takeIf { it.event.eventId == eventId && it.event.roomId == roomId }
-                ?.cancel()
-    }
-
-    companion object {
-        private const val RETRY_WAIT_TIME_MS = 10_000L
-    }
-
-    private var currentTask: QueuedTask? = null
-
-    private var sendingQueue = LinkedBlockingQueue<QueuedTask>()
-
-    private var networkAvailableLock = Object()
-    private var canReachServer = true
-    private var retryNoNetworkTask: TimerTask? = null
-
-    override fun run() {
-        Timber.v("## SendThread started")
-        try {
-            while (!isInterrupted) {
-                Timber.v("## SendThread wait for task to process")
-                val task = sendingQueue.take()
-                        .also { currentTask = it }
-                Timber.v("## SendThread Found task to process $task")
-
-                if (task.isCancelled()) {
-                    Timber.v("## SendThread send cancelled for $task")
-                    // we do not execute this one
-                    continue
-                }
-                // we check for network connectivity
-                while (!canReachServer) {
-                    Timber.v("## SendThread cannot reach server")
-                    // schedule to retry
-                    waitForNetwork()
-                    // if thread as been killed meanwhile
-//                    if (state == State.KILLING) break
-                }
-                Timber.v("## Server is Reachable")
-                // so network is available
-
-                runBlocking {
-                    retryLoop@ while (task.retryCount.get() < 3) {
-                        try {
-                            // SendPerformanceProfiler.startStage(task.event.eventId!!, SendPerformanceProfiler.Stages.SEND_WORKER)
-                            Timber.v("## SendThread retryLoop for $task retryCount ${task.retryCount}")
-                            task.execute()
-                            // sendEventTask.execute(SendEventTask.Params(task.event, task.encrypt, cryptoService))
-                            // SendPerformanceProfiler.stopStage(task.event.eventId, SendPerformanceProfiler.Stages.SEND_WORKER)
-                            break@retryLoop
-                        } catch (exception: Throwable) {
-                            when {
-                                exception is IOException || exception is Failure.NetworkConnection -> {
-                                    canReachServer = false
-                                    if (task.retryCount.getAndIncrement() >= 3) task.onTaskFailed()
-                                    while (!canReachServer) {
-                                        Timber.v("## SendThread retryLoop cannot reach server")
-                                        // schedule to retry
-                                        waitForNetwork()
-                                    }
-                                }
-                                (exception.isLimitExceededError()) -> {
-                                    if (task.retryCount.getAndIncrement() >= 3) task.onTaskFailed()
-                                    Timber.v("## SendThread retryLoop retryable error for $task reason: ${exception.localizedMessage}")
-                                    // wait a bit
-                                    // Todo if its a quota exception can we get timout?
-                                    sleep(3_000)
-                                    continue@retryLoop
-                                }
-                                exception.isTokenError() -> {
-                                    Timber.v("## SendThread retryLoop retryable TOKEN error, interrupt")
-                                    // we can exit the loop
-                                    task.onTaskFailed()
-                                    throw InterruptedException()
-                                }
-                                exception is CancellationException -> {
-                                    Timber.v("## SendThread task has been cancelled")
-                                    break@retryLoop
-                                }
-                                else -> {
-                                    Timber.v("## SendThread retryLoop Un-Retryable error, try next task")
-                                    // this task is in error, check next one?
-                                    task.onTaskFailed()
-                                    break@retryLoop
-                                }
-                            }
-                        }
-                    }
-                }
-                markAsFinished(task)
-            }
-        } catch (interruptionException: InterruptedException) {
-            // will be thrown is thread is interrupted while seeping
-            interrupt()
-            Timber.v("## InterruptedException!! ${interruptionException.localizedMessage}")
-        }
-//        state = State.KILLED
-        // is this needed?
-        retryNoNetworkTask?.cancel()
-        Timber.w("## SendThread finished")
-    }
-
-    private fun waitForNetwork() {
-        retryNoNetworkTask = Timer(SyncState.NoNetwork.toString(), false).schedule(RETRY_WAIT_TIME_MS) {
-            synchronized(networkAvailableLock) {
-                canReachServer = HomeServerAvailabilityChecker(sessionParams).check().also {
-                    Timber.v("## SendThread checkHostAvailable $it")
-                }
-                networkAvailableLock.notify()
-            }
-        }
-        synchronized(networkAvailableLock) { networkAvailableLock.wait() }
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
index 59c9de2932..ecc452edb3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
@@ -16,10 +16,12 @@
 
 package org.matrix.android.sdk.internal.session.room.state
 
+import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomFromLocalRoomTask
 import org.matrix.android.sdk.internal.task.Task
 import timber.log.Timber
 import javax.inject.Inject
@@ -35,28 +37,40 @@ internal interface SendStateTask : Task<SendStateTask.Params, String> {
 
 internal class DefaultSendStateTask @Inject constructor(
         private val roomAPI: RoomAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        private val createRoomFromLocalRoomTask: CreateRoomFromLocalRoomTask,
 ) : SendStateTask {
 
     override suspend fun execute(params: SendStateTask.Params): String {
         return executeRequest(globalErrorReceiver) {
-            val response = if (params.stateKey.isEmpty()) {
-                roomAPI.sendStateEvent(
-                        roomId = params.roomId,
-                        stateEventType = params.eventType,
-                        params = params.body
-                )
+            if (RoomLocalEcho.isLocalEchoId(params.roomId)) {
+                // Room is local, so create a real one and send the event to this new room
+                createRoomAndSendEvent(params)
             } else {
-                roomAPI.sendStateEvent(
-                        roomId = params.roomId,
-                        stateEventType = params.eventType,
-                        stateKey = params.stateKey,
-                        params = params.body
-                )
-            }
-            response.eventId.also {
-                Timber.d("State event: $it just sent in room ${params.roomId}")
+                val response = if (params.stateKey.isEmpty()) {
+                    roomAPI.sendStateEvent(
+                            roomId = params.roomId,
+                            stateEventType = params.eventType,
+                            params = params.body
+                    )
+                } else {
+                    roomAPI.sendStateEvent(
+                            roomId = params.roomId,
+                            stateEventType = params.eventType,
+                            stateKey = params.stateKey,
+                            params = params.body
+                    )
+                }
+                response.eventId.also {
+                    Timber.d("State event: $it just sent in room ${params.roomId}")
+                }
             }
         }
     }
+
+    private suspend fun createRoomAndSendEvent(params: SendStateTask.Params): String {
+        val roomId = createRoomFromLocalRoomTask.execute(CreateRoomFromLocalRoomTask.Params(params.roomId))
+        Timber.d("State event: convert local room (${params.roomId}) to existing room ($roomId) before sending the event.")
+        return execute(params.copy(roomId = roomId))
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 82fc94df7c..5c4ed8012b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -34,6 +34,7 @@ import org.matrix.android.sdk.api.session.room.ResultBoundaries
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
+import org.matrix.android.sdk.api.session.room.model.LocalRoomSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
@@ -43,7 +44,9 @@ import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotification
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.LocalRoomSummaryMapper
 import org.matrix.android.sdk.internal.database.mapper.RoomSummaryMapper
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.database.query.findByAlias
@@ -57,6 +60,7 @@ import javax.inject.Inject
 internal class RoomSummaryDataSource @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         private val roomSummaryMapper: RoomSummaryMapper,
+        private val localRoomSummaryMapper: LocalRoomSummaryMapper,
         private val queryStringValueProcessor: QueryStringValueProcessor,
 ) {
 
@@ -95,6 +99,25 @@ internal class RoomSummaryDataSource @Inject constructor(
         )
     }
 
+    fun getLocalRoomSummary(roomId: String): LocalRoomSummary? {
+        return monarchy
+                .fetchCopyMap({
+                    LocalRoomSummaryEntity.where(it, roomId).findFirst()
+                }, { entity, _ ->
+                    localRoomSummaryMapper.map(entity)
+                })
+    }
+
+    fun getLocalRoomSummaryLive(roomId: String): LiveData<Optional<LocalRoomSummary>> {
+        val liveData = monarchy.findAllMappedWithChanges(
+                { realm -> LocalRoomSummaryEntity.where(realm, roomId) },
+                { localRoomSummaryMapper.map(it) }
+        )
+        return Transformations.map(liveData) { results ->
+            results.firstOrNull().toOptional()
+        }
+    }
+
     fun getRoomSummariesLive(
             queryParams: RoomSummaryQueryParams,
             sortOrder: RoomSortOrder = RoomSortOrder.NONE
@@ -272,6 +295,7 @@ internal class RoomSummaryDataSource @Inject constructor(
         val query = with(queryStringValueProcessor) {
             RoomSummaryEntity.where(realm)
                     .process(RoomSummaryEntityFields.ROOM_ID, QueryStringValue.IsNotEmpty)
+                    .process(RoomSummaryEntityFields.ROOM_ID, queryParams.roomId)
                     .process(queryParams.displayName.toDisplayNameField(), queryParams.displayName)
                     .process(RoomSummaryEntityFields.CANONICAL_ALIAS, queryParams.canonicalAlias)
                     .process(RoomSummaryEntityFields.MEMBERSHIP_STR, queryParams.memberships)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt
index 7437a686da..a68ae620dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt
@@ -17,17 +17,23 @@
 package org.matrix.android.sdk.internal.session.room.summary
 
 import io.realm.Realm
+import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.session.room.summary.RoomSummaryConstants
 import org.matrix.android.sdk.api.session.room.timeline.EventTypeFilter
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEventFilters
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.query.latestEvent
+import javax.inject.Inject
 
-internal object RoomSummaryEventsHelper {
+internal class RoomSummaryEventsHelper @Inject constructor(
+        matrixConfiguration: MatrixConfiguration,
+) {
 
     private val previewFilters = TimelineEventFilters(
             filterTypes = true,
-            allowedTypes = RoomSummaryConstants.PREVIEWABLE_TYPES.map { EventTypeFilter(eventType = it, stateKey = null) },
+            allowedTypes = RoomSummaryConstants.PREVIEWABLE_TYPES
+                    .plus(matrixConfiguration.customEventTypesProvider?.customPreviewableEventTypes.orEmpty())
+                    .map { EventTypeFilter(eventType = it, stateKey = null) },
             filterUseless = true,
             filterRedacted = false,
             filterEdits = true
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 7e064a84ec..8adfdc5dbb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -24,6 +24,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptionEventContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataTypes
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
@@ -39,6 +40,7 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.sync.model.RoomSyncSummary
 import org.matrix.android.sdk.api.session.sync.model.RoomSyncUnreadNotifications
+import org.matrix.android.sdk.api.session.sync.model.RoomSyncUnreadThreadNotifications
 import org.matrix.android.sdk.internal.crypto.EventDecryptor
 import org.matrix.android.sdk.internal.crypto.crosssigning.DefaultCrossSigningService
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
@@ -63,6 +65,7 @@ import org.matrix.android.sdk.internal.session.room.accountdata.RoomAccountDataD
 import org.matrix.android.sdk.internal.session.room.membership.RoomDisplayNameResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import org.matrix.android.sdk.internal.session.room.relationship.RoomChildRelationInfo
+import org.matrix.android.sdk.internal.session.sync.SyncResponsePostTreatmentAggregator
 import timber.log.Timber
 import javax.inject.Inject
 import kotlin.system.measureTimeMillis
@@ -73,13 +76,15 @@ internal class RoomSummaryUpdater @Inject constructor(
         private val roomAvatarResolver: RoomAvatarResolver,
         private val eventDecryptor: EventDecryptor,
         private val crossSigningService: DefaultCrossSigningService,
-        private val roomAccountDataDataSource: RoomAccountDataDataSource
+        private val roomAccountDataDataSource: RoomAccountDataDataSource,
+        private val homeServerCapabilitiesService: HomeServerCapabilitiesService,
+        private val roomSummaryEventsHelper: RoomSummaryEventsHelper,
 ) {
 
     fun refreshLatestPreviewContent(realm: Realm, roomId: String) {
         val roomSummaryEntity = RoomSummaryEntity.getOrNull(realm, roomId)
         if (roomSummaryEntity != null) {
-            val latestPreviewableEvent = RoomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId)
+            val latestPreviewableEvent = roomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId)
             latestPreviewableEvent?.attemptToDecrypt()
         }
     }
@@ -90,8 +95,10 @@ internal class RoomSummaryUpdater @Inject constructor(
             membership: Membership? = null,
             roomSummary: RoomSyncSummary? = null,
             unreadNotifications: RoomSyncUnreadNotifications? = null,
+            unreadThreadNotifications: Map<String, RoomSyncUnreadThreadNotifications>? = null,
             updateMembers: Boolean = false,
-            inviterId: String? = null
+            inviterId: String? = null,
+            aggregator: SyncResponsePostTreatmentAggregator? = null
     ) {
         val roomSummaryEntity = RoomSummaryEntity.getOrCreate(realm, roomId)
         if (roomSummary != null) {
@@ -109,6 +116,14 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.highlightCount = unreadNotifications?.highlightCount ?: 0
         roomSummaryEntity.notificationCount = unreadNotifications?.notificationCount ?: 0
 
+        roomSummaryEntity.threadHighlightCount = unreadThreadNotifications
+                ?.count { (it.value.highlightCount ?: 0) > 0 }
+                ?: 0
+
+        roomSummaryEntity.threadNotificationCount = unreadThreadNotifications
+                ?.count { (it.value.notificationCount ?: 0) > 0 }
+                ?: 0
+
         if (membership != null) {
             roomSummaryEntity.membership = membership
         }
@@ -131,7 +146,7 @@ internal class RoomSummaryUpdater @Inject constructor(
         val encryptionEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_ENCRYPTION, stateKey = "")?.root
         Timber.d("## CRYPTO: currentEncryptionEvent is $encryptionEvent")
 
-        val latestPreviewableEvent = RoomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId)
+        val latestPreviewableEvent = roomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId)
 
         val lastActivityFromEvent = latestPreviewableEvent?.root?.originServerTs
         if (lastActivityFromEvent != null) {
@@ -139,9 +154,11 @@ internal class RoomSummaryUpdater @Inject constructor(
             latestPreviewableEvent.attemptToDecrypt()
         }
 
+        val shouldCheckIfReadInEventsThread = homeServerCapabilitiesService.getHomeServerCapabilities().canUseThreadReadReceiptsAndNotifications
+
         roomSummaryEntity.hasUnreadMessages = roomSummaryEntity.notificationCount > 0 ||
                 // avoid this call if we are sure there are unread events
-                latestPreviewableEvent?.let { !isEventRead(realm.configuration, userId, roomId, it.eventId) } ?: false
+                latestPreviewableEvent?.let { !isEventRead(realm.configuration, userId, roomId, it.eventId, shouldCheckIfReadInEventsThread) } ?: false
 
         roomSummaryEntity.setDisplayName(roomDisplayNameResolver.resolve(realm, roomId))
         roomSummaryEntity.avatarUrl = roomAvatarResolver.resolve(realm, roomId)
@@ -179,9 +196,20 @@ internal class RoomSummaryUpdater @Inject constructor(
 
             roomSummaryEntity.otherMemberIds.clear()
             roomSummaryEntity.otherMemberIds.addAll(otherRoomMembers)
+            if (roomSummary?.joinedMembersCount == null) {
+                // in case m.joined_member_count from sync summary was null?
+                // better to use what we know
+                roomSummaryEntity.joinedMembersCount = otherRoomMembers.size + 1
+            }
             if (roomSummaryEntity.isEncrypted && otherRoomMembers.isNotEmpty()) {
-                // mmm maybe we could only refresh shield instead of checking trust also?
-                crossSigningService.onUsersDeviceUpdate(otherRoomMembers)
+                if (aggregator == null) {
+                    // Do it now
+                    // mmm maybe we could only refresh shield instead of checking trust also?
+                    crossSigningService.checkTrustAndAffectedRoomShields(otherRoomMembers)
+                } else {
+                    // Schedule it
+                    aggregator.userIdsForCheckingTrustAndAffectedRoomShields.addAll(otherRoomMembers)
+                }
             }
         }
     }
@@ -209,7 +237,7 @@ internal class RoomSummaryUpdater @Inject constructor(
     fun updateSendingInformation(realm: Realm, roomId: String) {
         val roomSummaryEntity = RoomSummaryEntity.getOrCreate(realm, roomId)
         roomSummaryEntity.updateHasFailedSending()
-        roomSummaryEntity.latestPreviewableEvent = RoomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId)
+        roomSummaryEntity.latestPreviewableEvent = roomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId)
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
index 6c6d6368d1..63756811f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
@@ -16,32 +16,39 @@
 
 package org.matrix.android.sdk.internal.session.room.threads
 
-import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
 import com.zhuinden.monarchy.Monarchy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import io.realm.Realm
+import io.realm.Sort
+import io.realm.kotlin.where
+import org.matrix.android.sdk.api.session.room.ResultBoundaries
+import org.matrix.android.sdk.api.session.room.threads.FetchThreadsResult
+import org.matrix.android.sdk.api.session.room.threads.ThreadFilter
+import org.matrix.android.sdk.api.session.room.threads.ThreadLivePageResult
 import org.matrix.android.sdk.api.session.room.threads.ThreadsService
 import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummary
 import org.matrix.android.sdk.internal.database.helper.enhanceWithEditions
 import org.matrix.android.sdk.internal.database.helper.findAllThreadsForRoomId
 import org.matrix.android.sdk.internal.database.mapper.ThreadSummaryMapper
-import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
+import org.matrix.android.sdk.internal.database.model.threads.ThreadListPageEntity
 import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntity
+import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntityFields
 import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadSummariesTask
 import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadTimelineTask
+import org.matrix.android.sdk.internal.util.awaitTransaction
 
 internal class DefaultThreadsService @AssistedInject constructor(
         @Assisted private val roomId: String,
-        @UserId private val userId: String,
         private val fetchThreadTimelineTask: FetchThreadTimelineTask,
-        private val fetchThreadSummariesTask: FetchThreadSummariesTask,
         @SessionDatabase private val monarchy: Monarchy,
-        private val timelineEventMapper: TimelineEventMapper,
-        private val threadSummaryMapper: ThreadSummaryMapper
+        private val threadSummaryMapper: ThreadSummaryMapper,
+        private val fetchThreadSummariesTask: FetchThreadSummariesTask,
 ) : ThreadsService {
 
     @AssistedFactory
@@ -49,16 +56,58 @@ internal class DefaultThreadsService @AssistedInject constructor(
         fun create(roomId: String): DefaultThreadsService
     }
 
-    override fun getAllThreadSummariesLive(): LiveData<List<ThreadSummary>> {
-        return monarchy.findAllMappedWithChanges(
-                { ThreadSummaryEntity.findAllThreadsForRoomId(it, roomId = roomId) },
-                {
-                    threadSummaryMapper.map(it)
+    override suspend fun getPagedThreadsList(userParticipating: Boolean, pagedListConfig: PagedList.Config): ThreadLivePageResult {
+        monarchy.awaitTransaction { realm ->
+            realm.where<ThreadListPageEntity>().findAll().deleteAllFromRealm()
+        }
+
+        val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
+            realm
+                    .where<ThreadSummaryEntity>().equalTo(ThreadSummaryEntityFields.PAGE.ROOM_ID, roomId)
+                    .sort(ThreadSummaryEntityFields.LATEST_THREAD_EVENT_ENTITY.ORIGIN_SERVER_TS, Sort.DESCENDING)
+        }
+
+        val dataSourceFactory = realmDataSourceFactory.map {
+            threadSummaryMapper.map(it)
+        }
+
+        val boundaries = MutableLiveData(ResultBoundaries())
+
+        val builder = LivePagedListBuilder(dataSourceFactory, pagedListConfig).also {
+            it.setBoundaryCallback(object : PagedList.BoundaryCallback<ThreadSummary>() {
+                override fun onItemAtEndLoaded(itemAtEnd: ThreadSummary) {
+                    boundaries.postValue(boundaries.value?.copy(endLoaded = true))
                 }
+
+                override fun onItemAtFrontLoaded(itemAtFront: ThreadSummary) {
+                    boundaries.postValue(boundaries.value?.copy(frontLoaded = true))
+                }
+
+                override fun onZeroItemsLoaded() {
+                    boundaries.postValue(boundaries.value?.copy(zeroItemLoaded = true))
+                }
+            })
+        }
+
+        val livePagedList = monarchy.findAllPagedWithChanges(
+                realmDataSourceFactory,
+                builder
+        )
+        return ThreadLivePageResult(livePagedList, boundaries)
+    }
+
+    override suspend fun fetchThreadList(nextBatchId: String?, limit: Int, filter: ThreadFilter): FetchThreadsResult {
+        return fetchThreadSummariesTask.execute(
+                FetchThreadSummariesTask.Params(
+                        roomId = roomId,
+                        from = nextBatchId,
+                        limit = limit,
+                        filter = filter
+                )
         )
     }
 
-    override fun getAllThreadSummaries(): List<ThreadSummary> {
+    override suspend fun getAllThreadSummaries(): List<ThreadSummary> {
         return monarchy.fetchAllMappedSync(
                 { ThreadSummaryEntity.findAllThreadsForRoomId(it, roomId = roomId) },
                 { threadSummaryMapper.map(it) }
@@ -81,12 +130,4 @@ internal class DefaultThreadsService @AssistedInject constructor(
                 )
         )
     }
-
-    override suspend fun fetchThreadSummaries() {
-        fetchThreadSummariesTask.execute(
-                FetchThreadSummariesTask.Params(
-                        roomId = roomId
-                )
-        )
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 4eaac67e5a..3ce8ea658d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -42,6 +42,7 @@ import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadTimelineTask
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
 import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
 import org.matrix.android.sdk.internal.session.sync.handler.room.ReadReceiptHandler
 import org.matrix.android.sdk.internal.session.sync.handler.room.ThreadsAwarenessHandler
@@ -63,6 +64,7 @@ internal class DefaultTimeline(
         private val settings: TimelineSettings,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
         private val clock: Clock,
+        localEchoEventFactory: LocalEchoEventFactory,
         stateEventDataSource: StateEventDataSource,
         paginationTask: PaginationTask,
         getEventTask: GetContextOfEventTask,
@@ -76,7 +78,7 @@ internal class DefaultTimeline(
 ) : Timeline {
 
     companion object {
-        val BACKGROUND_HANDLER = createBackgroundHandler("DefaultTimeline_Thread")
+        val BACKGROUND_HANDLER = createBackgroundHandler("Matrix-DefaultTimeline_Thread")
     }
 
     override val timelineID = UUID.randomUUID().toString()
@@ -114,6 +116,7 @@ internal class DefaultTimeline(
             onNewTimelineEvents = this::onNewTimelineEvents,
             stateEventDataSource = stateEventDataSource,
             matrixCoroutineDispatchers = coroutineDispatchers,
+            localEchoEventFactory = localEchoEventFactory
     )
 
     private var strategy: LoadTimelineStrategy = buildStrategy(LoadTimelineStrategy.Mode.Live)
@@ -411,7 +414,7 @@ internal class DefaultTimeline(
     private fun ensureReadReceiptAreLoaded(realm: Realm) {
         readReceiptHandler.getContentFromInitSync(roomId)
                 ?.also {
-                    Timber.w("INIT_SYNC Insert when opening timeline RR for room $roomId")
+                    Timber.d("INIT_SYNC Insert when opening timeline RR for room $roomId")
                 }
                 ?.let { readReceiptContent ->
                     realm.executeTransactionAsync {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index 53c0253876..13852a2bce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -32,6 +32,7 @@ import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadTimelineTask
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
 import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
 import org.matrix.android.sdk.internal.session.sync.handler.room.ReadReceiptHandler
 import org.matrix.android.sdk.internal.session.sync.handler.room.ThreadsAwarenessHandler
@@ -55,6 +56,7 @@ internal class DefaultTimelineService @AssistedInject constructor(
         private val timelineEventDataSource: TimelineEventDataSource,
         private val clock: Clock,
         private val stateEventDataSource: StateEventDataSource,
+        private val localEchoEventFactory: LocalEchoEventFactory
 ) : TimelineService {
 
     @AssistedFactory
@@ -82,6 +84,7 @@ internal class DefaultTimelineService @AssistedInject constructor(
                 lightweightSettingsStorage = lightweightSettingsStorage,
                 clock = clock,
                 stateEventDataSource = stateEventDataSource,
+                localEchoEventFactory = localEchoEventFactory
         )
     }
 
@@ -96,4 +99,8 @@ internal class DefaultTimelineService @AssistedInject constructor(
     override fun getAttachmentMessages(): List<TimelineEvent> {
         return timelineEventDataSource.getAttachmentMessages(roomId)
     }
+
+    override fun getTimelineEventsRelatedTo(relationType: String, eventId: String): List<TimelineEvent> {
+        return timelineEventDataSource.getTimelineEventsRelatedTo(roomId, relationType, eventId)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
index 96646b42ed..9d8d8ecbf1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
@@ -47,7 +47,7 @@ internal class DefaultFetchTokenAndPaginateTask @Inject constructor(
 ) : FetchTokenAndPaginateTask {
 
     override suspend fun execute(params: FetchTokenAndPaginateTask.Params): TokenChunkEventPersistor.Result {
-        val filter = filterRepository.getRoomFilter()
+        val filter = filterRepository.getRoomFilterBody()
         val response = executeRequest(globalErrorReceiver) {
             roomAPI.getContextOfEvent(params.roomId, params.lastKnownEventId, 0, filter)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetContextOfEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetContextOfEventTask.kt
index 015e55f070..c3911dfa2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetContextOfEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetContextOfEventTask.kt
@@ -39,7 +39,7 @@ internal class DefaultGetContextOfEventTask @Inject constructor(
 ) : GetContextOfEventTask {
 
     override suspend fun execute(params: GetContextOfEventTask.Params): TokenChunkEventPersistor.Result {
-        val filter = filterRepository.getRoomFilter()
+        val filter = filterRepository.getRoomFilterBody()
         val response = executeRequest(globalErrorReceiver) {
             // We are limiting the response to the event with eventId to be sure we don't have any issue with potential merging process.
             roomAPI.getContextOfEvent(params.roomId, params.eventId, 0, filter)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
index 7c662444e4..3707205aef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
@@ -16,8 +16,6 @@
 
 package org.matrix.android.sdk.internal.session.room.timeline
 
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.internal.crypto.EventDecryptor
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
@@ -48,17 +46,7 @@ internal class DefaultGetEventTask @Inject constructor(
 
         // Try to decrypt the Event
         if (event.isEncrypted()) {
-            tryOrNull(message = "Unable to decrypt the event") {
-                eventDecryptor.decryptEvent(event, "")
-            }
-                    ?.let { result ->
-                        event.mxDecryptionResult = OlmDecryptionResult(
-                                payload = result.clearEvent,
-                                senderKey = result.senderCurve25519Key,
-                                keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
-                                forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
-                        )
-                    }
+            eventDecryptor.decryptEventAndSaveResult(event, timeline = "")
         }
 
         event.ageLocalTs = clock.epochMillis() - (event.unsignedData?.age ?: 0)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
index d81a115676..9faf301fe0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
@@ -43,7 +43,12 @@ import org.matrix.android.sdk.internal.database.query.findAllIncludingEvents
 import org.matrix.android.sdk.internal.database.query.findLastForwardChunkOfThread
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadTimelineTask
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
 import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
+import org.matrix.android.sdk.internal.session.room.timeline.decorator.TimelineEventDecorator
+import org.matrix.android.sdk.internal.session.room.timeline.decorator.TimelineEventDecoratorChain
+import org.matrix.android.sdk.internal.session.room.timeline.decorator.UiEchoDecorator
+import org.matrix.android.sdk.internal.session.room.timeline.decorator.UpdatedReplyDecorator
 import org.matrix.android.sdk.internal.session.sync.handler.room.ThreadsAwarenessHandler
 import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
@@ -106,6 +111,7 @@ internal class LoadTimelineStrategy constructor(
             val onNewTimelineEvents: (List<String>) -> Unit,
             val stateEventDataSource: StateEventDataSource,
             val matrixCoroutineDispatchers: MatrixCoroutineDispatchers,
+            val localEchoEventFactory: LocalEchoEventFactory
     )
 
     private var getContextLatch: CompletableDeferred<Unit>? = null
@@ -323,6 +329,19 @@ internal class LoadTimelineStrategy constructor(
     }
 
     private fun RealmResults<ChunkEntity>.createTimelineChunk(): TimelineChunk? {
+        fun createTimelineEventDecorator(): TimelineEventDecorator {
+            val decorators = listOf(
+                    UiEchoDecorator(uiEchoManager),
+                    UpdatedReplyDecorator(
+                            realm = dependencies.realm,
+                            roomId = roomId,
+                            localEchoEventFactory = dependencies.localEchoEventFactory,
+                            timelineEventMapper = dependencies.timelineEventMapper
+                    )
+            )
+            return TimelineEventDecoratorChain(decorators)
+        }
+
         return firstOrNull()?.let {
             return TimelineChunk(
                     chunkEntity = it,
@@ -341,6 +360,9 @@ internal class LoadTimelineStrategy constructor(
                     initialEventId = mode.originEventId(),
                     onBuiltEvents = dependencies.onEventsUpdated,
                     onEventsDeleted = dependencies.onEventsDeleted,
+                    realm = dependencies.realm,
+                    localEchoEventFactory = dependencies.localEchoEventFactory,
+                    decorator = createTimelineEventDecorator()
             )
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
index 8aeccb66c8..1a7b1cdac4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
@@ -41,7 +41,7 @@ internal class DefaultPaginationTask @Inject constructor(
 ) : PaginationTask {
 
     override suspend fun execute(params: PaginationTask.Params): TokenChunkEventPersistor.Result {
-        val filter = filterRepository.getRoomFilter()
+        val filter = filterRepository.getRoomFilterBody()
         val chunk = executeRequest(
                 globalErrorReceiver,
                 canRetry = true
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
index 7fa36969b1..c9785e7ea1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.session.room.timeline
 
 import io.realm.OrderedCollectionChangeSet
 import io.realm.OrderedRealmCollectionChangeListener
+import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.RealmObjectChangeListener
 import io.realm.RealmQuery
@@ -27,9 +28,11 @@ import kotlinx.coroutines.CompletableDeferred
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.isReply
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.api.session.room.timeline.getRelationContent
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import org.matrix.android.sdk.internal.database.mapper.EventMapper
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
@@ -39,10 +42,13 @@ import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.session.room.relation.threads.DefaultFetchThreadTimelineTask
 import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadTimelineTask
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import org.matrix.android.sdk.internal.session.room.timeline.decorator.TimelineEventDecorator
 import org.matrix.android.sdk.internal.session.sync.handler.room.ThreadsAwarenessHandler
 import timber.log.Timber
 import java.util.Collections
 import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicReference
 
 /**
  * This is a wrapper around a ChunkEntity in the database.
@@ -66,6 +72,9 @@ internal class TimelineChunk(
         private val initialEventId: String?,
         private val onBuiltEvents: (Boolean) -> Unit,
         private val onEventsDeleted: () -> Unit,
+        private val realm: AtomicReference<Realm>,
+        private val decorator: TimelineEventDecorator,
+        val localEchoEventFactory: LocalEchoEventFactory,
 ) {
 
     private val isLastForward = AtomicBoolean(chunkEntity.isLastForward)
@@ -74,6 +83,13 @@ internal class TimelineChunk(
     private var prevChunkLatch: CompletableDeferred<Unit>? = null
     private var nextChunkLatch: CompletableDeferred<Unit>? = null
 
+    /**
+    Map of eventId -> eventId
+    The key holds the eventId of the repliedTo event.
+    The value holds a set of eventIds of all events replying to this event.
+     */
+    private val repliedEventsMap = HashMap<String, MutableSet<String>>()
+
     private val chunkObjectListener = RealmObjectChangeListener<ChunkEntity> { _, changeSet ->
         if (changeSet == null) return@RealmObjectChangeListener
         if (changeSet.isDeleted.orFalse()) {
@@ -353,9 +369,6 @@ internal class TimelineChunk(
         timelineEvents
                 .mapIndexed { index, timelineEventEntity ->
                     val timelineEvent = timelineEventEntity.buildAndDecryptIfNeeded()
-                    if (timelineEvent.root.type == EventType.STATE_ROOM_CREATE) {
-                        isLastBackward.set(true)
-                    }
                     if (direction == Timeline.Direction.FORWARDS) {
                         builtEventsIndexes[timelineEvent.eventId] = index
                         builtEvents.add(index, timelineEvent)
@@ -394,26 +407,45 @@ internal class TimelineChunk(
     }
 
     private fun TimelineEventEntity.buildAndDecryptIfNeeded(): TimelineEvent {
-        val timelineEvent = buildTimelineEvent(this)
-        val transactionId = timelineEvent.root.unsignedData?.transactionId
-        uiEchoManager?.onSyncedEvent(transactionId)
-        if (timelineEvent.isEncrypted() &&
-                timelineEvent.root.mxDecryptionResult == null) {
-            timelineEvent.root.eventId?.also { eventDecryptor.requestDecryption(TimelineEventDecryptor.DecryptionRequest(timelineEvent.root, timelineId)) }
+        /**
+         * Makes sure to update some internal state after a TimelineEvent is built.
+         */
+        fun processTimelineEvent(timelineEvent: TimelineEvent) {
+            if (timelineEvent.root.type == EventType.STATE_ROOM_CREATE) {
+                isLastBackward.set(true)
+            } else if (timelineEvent.root.isReply()) {
+                val relatesEventId = timelineEvent.getRelationContent()?.inReplyTo?.eventId
+                if (relatesEventId != null) {
+                    val relatedEvents = repliedEventsMap.getOrPut(relatesEventId) { mutableSetOf() }
+                    relatedEvents.add(timelineEvent.eventId)
+                }
+            }
+            val transactionId = timelineEvent.root.unsignedData?.transactionId
+            uiEchoManager?.onSyncedEvent(transactionId)
         }
-        if (!timelineEvent.isEncrypted() && !lightweightSettingsStorage.areThreadMessagesEnabled()) {
-            // Thread aware for not encrypted events
-            timelineEvent.root.eventId?.also { eventDecryptor.requestDecryption(TimelineEventDecryptor.DecryptionRequest(timelineEvent.root, timelineId)) }
+
+        fun decryptIfNeeded(timelineEvent: TimelineEvent) {
+            if (timelineEvent.isEncrypted() &&
+                    timelineEvent.root.mxDecryptionResult == null) {
+                timelineEvent.root.eventId?.also { eventDecryptor.requestDecryption(TimelineEventDecryptor.DecryptionRequest(timelineEvent.root, timelineId)) }
+            }
+            if (!timelineEvent.isEncrypted() && !lightweightSettingsStorage.areThreadMessagesEnabled()) {
+                // Thread aware for not encrypted events
+                timelineEvent.root.eventId?.also { eventDecryptor.requestDecryption(TimelineEventDecryptor.DecryptionRequest(timelineEvent.root, timelineId)) }
+            }
+        }
+
+        return buildTimelineEvent(this).also { timelineEvent ->
+            decryptIfNeeded(timelineEvent)
+            processTimelineEvent(timelineEvent)
         }
-        return timelineEvent
     }
 
     private fun buildTimelineEvent(eventEntity: TimelineEventEntity) = timelineEventMapper.map(
             timelineEventEntity = eventEntity,
             buildReadReceipts = timelineSettings.buildReadReceipts
-    ).let {
-        // eventually enhance with ui echo?
-        (uiEchoManager?.decorateEventWithReactionUiEcho(it) ?: it)
+    ).let { timelineEvent ->
+        decorator.decorate(timelineEvent)
     }
 
     /**
@@ -493,13 +525,9 @@ internal class TimelineChunk(
             if (!validateInsertion(range, results)) continue
             val newItems = results
                     .subList(range.startIndex, range.startIndex + range.length)
-                    .map { it.buildAndDecryptIfNeeded() }
-
             builtEventsIndexes.entries.filter { it.value >= range.startIndex }.forEach { it.setValue(it.value + range.length) }
-            newItems.mapIndexed { index, timelineEvent ->
-                if (timelineEvent.root.type == EventType.STATE_ROOM_CREATE) {
-                    isLastBackward.set(true)
-                }
+            newItems.mapIndexed { index, timelineEventEntity ->
+                val timelineEvent = timelineEventEntity.buildAndDecryptIfNeeded()
                 val correctedIndex = range.startIndex + index
                 builtEvents.add(correctedIndex, timelineEvent)
                 builtEventsIndexes[timelineEvent.eventId] = correctedIndex
@@ -509,11 +537,17 @@ internal class TimelineChunk(
         for (range in modifications) {
             for (modificationIndex in (range.startIndex until range.startIndex + range.length)) {
                 val updatedEntity = results[modificationIndex] ?: continue
-                val builtEventIndex = builtEventsIndexes[updatedEntity.eventId] ?: continue
-                try {
-                    builtEvents[builtEventIndex] = updatedEntity.buildAndDecryptIfNeeded()
-                } catch (failure: Throwable) {
-                    Timber.v("Fail to update items at index: $modificationIndex")
+                val updatedEventId = updatedEntity.eventId
+                val repliesOfUpdatedEvent = repliedEventsMap.getOrElse(updatedEventId) { emptySet() }.mapNotNull { eventId ->
+                    results.where().equalTo(TimelineEventEntityFields.EVENT_ID, eventId).findFirst()
+                }
+                repliesOfUpdatedEvent.plus(updatedEntity).forEach { entityToRebuild ->
+                    val builtEventIndex = builtEventsIndexes[entityToRebuild.eventId] ?: return@forEach
+                    try {
+                        builtEvents[builtEventIndex] = entityToRebuild.buildAndDecryptIfNeeded()
+                    } catch (failure: Throwable) {
+                        Timber.v("Fail to update items at index: $modificationIndex")
+                    }
                 }
             }
         }
@@ -580,7 +614,10 @@ internal class TimelineChunk(
                 lightweightSettingsStorage = lightweightSettingsStorage,
                 initialEventId = null,
                 onBuiltEvents = this.onBuiltEvents,
-                onEventsDeleted = this.onEventsDeleted
+                onEventsDeleted = this.onEventsDeleted,
+                decorator = this.decorator,
+                realm = realm,
+                localEchoEventFactory = localEchoEventFactory
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
index b1b9e4bb22..2d6082f9b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
@@ -19,8 +19,11 @@ package org.matrix.android.sdk.internal.session.room.timeline
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Sort
+import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.events.model.isImageMessage
 import org.matrix.android.sdk.api.session.events.model.isVideoMessage
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.database.RealmSessionProvider
@@ -63,4 +66,24 @@ internal class TimelineEventDataSource @Inject constructor(
                     .orEmpty()
         }
     }
+
+    fun getTimelineEventsRelatedTo(roomId: String, eventType: String, eventId: String): List<TimelineEvent> {
+        // TODO Remove this trick and call relations API
+        // see https://spec.matrix.org/latest/client-server-api/#get_matrixclientv1roomsroomidrelationseventidreltypeeventtype
+        return realmSessionProvider.withRealm { realm ->
+            TimelineEventEntity.whereRoomId(realm, roomId)
+                    .sort(TimelineEventEntityFields.ROOT.ORIGIN_SERVER_TS, Sort.ASCENDING)
+                    .distinct(TimelineEventEntityFields.EVENT_ID)
+                    .findAll()
+                    .mapNotNull {
+                        timelineEventMapper.map(it)
+                                .takeIf {
+                                    val isEventRelatedTo = it.root.getRelationContent()?.takeIf { it.type == eventType && it.eventId == eventId } != null
+                                    val isContentRelatedTo = it.root.getClearContent()?.toModel<MessageContent>()
+                                            ?.relatesTo?.takeIf { it.type == eventType && it.eventId == eventId } != null
+                                    isEventRelatedTo || isContentRelatedTo
+                                }
+                    }
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/TimelineEventDecorator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/TimelineEventDecorator.kt
new file mode 100644
index 0000000000..261407ba5f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/TimelineEventDecorator.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.timeline.decorator
+
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+
+/**
+ * This interface can be used to make a copy of a TimelineEvent with new data, before the event is posted to the timeline.
+ */
+internal fun interface TimelineEventDecorator {
+    fun decorate(timelineEvent: TimelineEvent): TimelineEvent
+}
+
+/**
+ * This is an implementation of [TimelineEventDecorator] which chains calls to decorators.
+ */
+internal class TimelineEventDecoratorChain(private val decorators: List<TimelineEventDecorator>) : TimelineEventDecorator {
+
+    override fun decorate(timelineEvent: TimelineEvent): TimelineEvent {
+        var decorated = timelineEvent
+        val iterator = decorators.iterator()
+        while (iterator.hasNext()) {
+            val decorator = iterator.next()
+            decorated = decorator.decorate(decorated)
+        }
+        return decorated
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/UiEchoDecorator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/UiEchoDecorator.kt
new file mode 100644
index 0000000000..778a9d27d9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/UiEchoDecorator.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.timeline.decorator
+
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.session.room.timeline.UIEchoManager
+
+internal class UiEchoDecorator(private val uiEchoManager: UIEchoManager?) : TimelineEventDecorator {
+
+    override fun decorate(timelineEvent: TimelineEvent): TimelineEvent {
+        return uiEchoManager?.decorateEventWithReactionUiEcho(timelineEvent) ?: timelineEvent
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/UpdatedReplyDecorator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/UpdatedReplyDecorator.kt
new file mode 100644
index 0000000000..2b12fe814c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/UpdatedReplyDecorator.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.timeline.decorator
+
+import io.realm.Realm
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.isThread
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.api.session.room.timeline.getRelationContent
+import org.matrix.android.sdk.api.session.room.timeline.isReply
+import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import java.util.concurrent.atomic.AtomicReference
+
+internal class UpdatedReplyDecorator(
+        private val realm: AtomicReference<Realm>,
+        private val roomId: String,
+        private val localEchoEventFactory: LocalEchoEventFactory,
+        private val timelineEventMapper: TimelineEventMapper,
+) : TimelineEventDecorator {
+
+    override fun decorate(timelineEvent: TimelineEvent): TimelineEvent {
+        return if (timelineEvent.isReply() && !timelineEvent.root.isThread()) {
+            val newRepliedEvent = createNewRepliedEvent(timelineEvent) ?: return timelineEvent
+            timelineEvent.copy(root = newRepliedEvent)
+        } else {
+            timelineEvent
+        }
+    }
+
+    private fun createNewRepliedEvent(currentTimelineEvent: TimelineEvent): Event? {
+        val relatesEventId = currentTimelineEvent.getRelationContent()?.inReplyTo?.eventId ?: return null
+        val timelineEventEntity = TimelineEventEntity.where(
+                realm.get(),
+                roomId,
+                relatesEventId
+        ).findFirst() ?: return null
+
+        val isRedactedEvent = timelineEventEntity.root?.asDomain()?.isRedacted() ?: false
+
+        val replyText = localEchoEventFactory
+                .bodyForReply(currentTimelineEvent.getLastMessageContent(), true).formattedText ?: ""
+
+        val newContent = localEchoEventFactory.createReplyTextContent(
+                timelineEventMapper.map(timelineEventEntity),
+                replyText,
+                null,
+                false,
+                showInThread = false,
+                isRedactedEvent = isRedactedEvent
+        ).toContent()
+
+        val decryptionResultToSet = currentTimelineEvent.root.mxDecryptionResult?.copy(
+                payload = mapOf(
+                        "content" to newContent,
+                        "type" to EventType.MESSAGE
+                )
+        )
+
+        val contentToSet = if (currentTimelineEvent.isEncrypted()) {
+            // Keep encrypted content as is
+            currentTimelineEvent.root.content
+        } else {
+            // Use new content
+            newContent
+        }
+
+        return currentTimelineEvent.root.copyAll(
+                content = contentToSet,
+                mxDecryptionResult = decryptionResultToSet,
+                mCryptoError = null,
+                mCryptoErrorReason = null
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
index 2b404775f0..3684bec167 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
@@ -30,7 +30,7 @@ import javax.inject.Inject
 
 internal class RoomTombstoneEventProcessor @Inject constructor() : EventInsertLiveProcessor {
 
-    override suspend fun process(realm: Realm, event: Event) {
+    override fun process(realm: Realm, event: Event) {
         if (event.roomId == null) return
         val createRoomContent = event.getClearContent().toModel<RoomTombstoneContent>()
         if (createRoomContent?.replacementRoomId == null) return
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index d2f1b3202b..cd13b03017 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -21,7 +21,6 @@ import androidx.lifecycle.LiveData
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.query.QueryStringValue
-import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -45,6 +44,7 @@ import org.matrix.android.sdk.api.session.space.SpaceHierarchyData
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import org.matrix.android.sdk.api.session.space.model.SpaceChildSummaryEvent
 import org.matrix.android.sdk.api.session.space.model.SpaceParentContent
 import org.matrix.android.sdk.api.session.space.peeking.SpacePeekResult
 import org.matrix.android.sdk.internal.di.UserId
@@ -128,7 +128,7 @@ internal class DefaultSpaceService @Inject constructor(
             suggestedOnly: Boolean?,
             limit: Int?,
             from: String?,
-            knownStateList: List<Event>?
+            knownStateList: List<SpaceChildSummaryEvent>?
     ): SpaceHierarchyData {
         val spacesResponse = getSpacesResponse(spaceId, suggestedOnly, limit, from)
         val spaceRootResponse = spacesResponse.getRoot(spaceId)
@@ -180,7 +180,7 @@ internal class DefaultSpaceService @Inject constructor(
     private fun List<SpaceChildSummaryResponse>?.mapSpaceChildren(
             spaceId: String,
             spaceRootResponse: SpaceChildSummaryResponse?,
-            knownStateList: List<Event>?,
+            knownStateList: List<SpaceChildSummaryEvent>?,
     ) = this?.filterIdIsNot(spaceId)
             ?.toSpaceChildInfoList(spaceId, spaceRootResponse, knownStateList)
             .orEmpty()
@@ -190,7 +190,7 @@ internal class DefaultSpaceService @Inject constructor(
     private fun List<SpaceChildSummaryResponse>.toSpaceChildInfoList(
             spaceId: String,
             rootRoomResponse: SpaceChildSummaryResponse?,
-            knownStateList: List<Event>?,
+            knownStateList: List<SpaceChildSummaryEvent>?,
     ) = flatMap { spaceChildSummary ->
         (rootRoomResponse?.childrenState ?: knownStateList)
                 ?.filter { it.isChildOf(spaceChildSummary) }
@@ -198,10 +198,14 @@ internal class DefaultSpaceService @Inject constructor(
                 .orEmpty()
     }
 
-    private fun Event.isChildOf(space: SpaceChildSummaryResponse) = stateKey == space.roomId && type == EventType.STATE_SPACE_CHILD
+    private fun SpaceChildSummaryEvent.isChildOf(space: SpaceChildSummaryResponse): Boolean {
+        return stateKey == space.roomId && type == EventType.STATE_SPACE_CHILD
+    }
 
-    private fun Event.toSpaceChildInfo(spaceId: String, summary: SpaceChildSummaryResponse) = content.toModel<SpaceChildContent>()?.let { content ->
-        createSpaceChildInfo(spaceId, summary, content)
+    private fun SpaceChildSummaryEvent.toSpaceChildInfo(spaceId: String, summary: SpaceChildSummaryResponse): SpaceChildInfo? {
+        return content.toModel<SpaceChildContent>()?.let { content ->
+            createSpaceChildInfo(spaceId, summary, content)
+        }
     }
 
     private fun createSpaceChildInfo(
@@ -255,7 +259,7 @@ internal class DefaultSpaceService @Inject constructor(
                     stateKey = QueryStringValue.IsEmpty
             )
             val powerLevelsContent = powerLevelsEvent?.content?.toModel<PowerLevelsContent>()
-                    ?: throw UnsupportedOperationException("Cannot add canonical child, missing powerlevel")
+                    ?: throw UnsupportedOperationException("Cannot add canonical child, missing power level")
             val powerLevelsHelper = PowerLevelsHelper(powerLevelsContent)
             if (!powerLevelsHelper.isUserAllowedToSend(userId, true, EventType.STATE_SPACE_CHILD)) {
                 throw UnsupportedOperationException("Cannot add canonical child, not enough power level")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt
index e3f8977ac5..0419c5acf1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt
@@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.session.space
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.space.model.SpaceChildSummaryEvent
 
 /**
  * The fields are the same as those returned by /publicRooms (see spec), with the addition of:
@@ -36,10 +36,11 @@ internal data class SpaceChildSummaryResponse(
          */
         @Json(name = "room_type") val roomType: String? = null,
 
-        /**  The m.space.child events of the room. For each event, only the following fields are included:
-         *  type, state_key, content, room_id, sender, with the addition of origin_server_ts.
+        /**
+         * The m.space.child events of the room. For each event, only the following fields are included:
+         * type, state_key, content, sender, and of origin_server_ts.
          */
-        @Json(name = "children_state") val childrenState: List<Event>? = null,
+        @Json(name = "children_state") val childrenState: List<SpaceChildSummaryEvent>? = null,
 
         /**
          * Aliases of the room. May be empty.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/DefaultSyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/DefaultSyncService.kt
index 691dd7b20d..76c3c38abf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/DefaultSyncService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/DefaultSyncService.kt
@@ -73,6 +73,8 @@ internal class DefaultSyncService @Inject constructor(
 
     override fun getSyncState() = getSyncThread().currentState()
 
+    override fun isSyncThreadAlive() = getSyncThread().isAlive
+
     override fun getSyncRequestStateFlow() = syncRequestStateTracker.syncRequestState
 
     override fun hasAlreadySynced(): Boolean {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index 392c73bd83..05d50d9595 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -17,6 +17,11 @@
 package org.matrix.android.sdk.internal.session.sync
 
 import com.zhuinden.monarchy.Monarchy
+import io.realm.Realm
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.extensions.measureMetric
+import org.matrix.android.sdk.api.extensions.measureSpan
+import org.matrix.android.sdk.api.metrics.SyncDurationMetricPlugin
 import org.matrix.android.sdk.api.session.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.pushrules.RuleScope
 import org.matrix.android.sdk.api.session.sync.InitialSyncStep
@@ -52,9 +57,12 @@ internal class SyncResponseHandler @Inject constructor(
         private val tokenStore: SyncTokenStore,
         private val processEventForPushTask: ProcessEventForPushTask,
         private val pushRuleService: PushRuleService,
-        private val presenceSyncHandler: PresenceSyncHandler
+        private val presenceSyncHandler: PresenceSyncHandler,
+        matrixConfiguration: MatrixConfiguration,
 ) {
 
+    private val relevantPlugins = matrixConfiguration.metricPlugins.filterIsInstance<SyncDurationMetricPlugin>()
+
     suspend fun handleResponse(
             syncResponse: SyncResponse,
             fromToken: String?,
@@ -63,39 +71,91 @@ internal class SyncResponseHandler @Inject constructor(
         val isInitialSync = fromToken == null
         Timber.v("Start handling sync, is InitialSync: $isInitialSync")
 
-        measureTimeMillis {
-            if (!cryptoService.isStarted()) {
-                Timber.v("Should start cryptoService")
-                cryptoService.start()
-            }
-            cryptoService.onSyncWillProcess(isInitialSync)
-        }.also {
-            Timber.v("Finish handling start cryptoService in $it ms")
-        }
+        relevantPlugins.measureMetric {
+            startCryptoService(isInitialSync)
 
-        // Handle the to device events before the room ones
-        // to ensure to decrypt them properly
-        measureTimeMillis {
-            Timber.v("Handle toDevice")
-            reportSubtask(reporter, InitialSyncStep.ImportingAccountCrypto, 100, 0.1f) {
-                if (syncResponse.toDevice != null) {
-                    cryptoSyncHandler.handleToDevice(syncResponse.toDevice, reporter)
+            // Handle the to device events before the room ones
+            // to ensure to decrypt them properly
+            handleToDevice(syncResponse, reporter)
+
+            val aggregator = SyncResponsePostTreatmentAggregator()
+
+            // Prerequisite for thread events handling in RoomSyncHandler
+            // Disabled due to the new fallback
+            //        if (!lightweightSettingsStorage.areThreadMessagesEnabled()) {
+            //            threadsAwarenessHandler.fetchRootThreadEventsIfNeeded(syncResponse)
+            //        }
+
+            startMonarchyTransaction(syncResponse, isInitialSync, reporter, aggregator)
+
+            aggregateSyncResponse(aggregator)
+
+            postTreatmentSyncResponse(syncResponse, isInitialSync)
+
+            markCryptoSyncCompleted(syncResponse)
+
+            handlePostSync()
+
+            Timber.v("On sync completed")
+        }
+    }
+
+    private fun startCryptoService(isInitialSync: Boolean) {
+        relevantPlugins.measureSpan("task", "start_crypto_service") {
+            measureTimeMillis {
+                if (!cryptoService.isStarted()) {
+                    Timber.v("Should start cryptoService")
+                    cryptoService.start()
                 }
+                cryptoService.onSyncWillProcess(isInitialSync)
+            }.also {
+                Timber.v("Finish handling start cryptoService in $it ms")
             }
-        }.also {
-            Timber.v("Finish handling toDevice in $it ms")
         }
-        val aggregator = SyncResponsePostTreatmentAggregator()
+    }
 
-        // Prerequisite for thread events handling in RoomSyncHandler
-// Disabled due to the new fallback
-//        if (!lightweightSettingsStorage.areThreadMessagesEnabled()) {
-//            threadsAwarenessHandler.fetchRootThreadEventsIfNeeded(syncResponse)
-//        }
+    private suspend fun handleToDevice(syncResponse: SyncResponse, reporter: ProgressReporter?) {
+        relevantPlugins.measureSpan("task", "handle_to_device") {
+            measureTimeMillis {
+                Timber.v("Handle toDevice")
+                reportSubtask(reporter, InitialSyncStep.ImportingAccountCrypto, 100, 0.1f) {
+                    if (syncResponse.toDevice != null) {
+                        cryptoSyncHandler.handleToDevice(syncResponse.toDevice, reporter)
+                    }
+                }
+            }.also {
+                Timber.v("Finish handling toDevice in $it ms")
+            }
+        }
+    }
 
+    private suspend fun startMonarchyTransaction(
+            syncResponse: SyncResponse,
+            isInitialSync: Boolean,
+            reporter: ProgressReporter?,
+            aggregator: SyncResponsePostTreatmentAggregator
+    ) {
         // Start one big transaction
-        monarchy.awaitTransaction { realm ->
-            // IMPORTANT nothing should be suspend here as we are accessing the realm instance (thread local)
+        relevantPlugins.measureSpan("task", "monarchy_transaction") {
+            monarchy.awaitTransaction { realm ->
+                // IMPORTANT nothing should be suspend here as we are accessing the realm instance (thread local)
+                handleRooms(reporter, syncResponse, realm, isInitialSync, aggregator)
+                handleAccountData(reporter, realm, syncResponse)
+                handlePresence(realm, syncResponse)
+
+                tokenStore.saveToken(realm, syncResponse.nextBatch)
+            }
+        }
+    }
+
+    private fun handleRooms(
+            reporter: ProgressReporter?,
+            syncResponse: SyncResponse,
+            realm: Realm,
+            isInitialSync: Boolean,
+            aggregator: SyncResponsePostTreatmentAggregator
+    ) {
+        relevantPlugins.measureSpan("task", "handle_rooms") {
             measureTimeMillis {
                 Timber.v("Handle rooms")
                 reportSubtask(reporter, InitialSyncStep.ImportingAccountRoom, 1, 0.8f) {
@@ -106,7 +166,11 @@ internal class SyncResponseHandler @Inject constructor(
             }.also {
                 Timber.v("Finish handling rooms in $it ms")
             }
+        }
+    }
 
+    private fun handleAccountData(reporter: ProgressReporter?, realm: Realm, syncResponse: SyncResponse) {
+        relevantPlugins.measureSpan("task", "handle_account_data") {
             measureTimeMillis {
                 reportSubtask(reporter, InitialSyncStep.ImportingAccountData, 1, 0.1f) {
                     Timber.v("Handle accountData")
@@ -115,29 +179,56 @@ internal class SyncResponseHandler @Inject constructor(
             }.also {
                 Timber.v("Finish handling accountData in $it ms")
             }
+        }
+    }
 
+    private fun handlePresence(realm: Realm, syncResponse: SyncResponse) {
+        relevantPlugins.measureSpan("task", "handle_presence") {
             measureTimeMillis {
                 Timber.v("Handle Presence")
                 presenceSyncHandler.handle(realm, syncResponse.presence)
             }.also {
                 Timber.v("Finish handling Presence in $it ms")
             }
-            tokenStore.saveToken(realm, syncResponse.nextBatch)
         }
+    }
 
-        // Everything else we need to do outside the transaction
-        aggregatorHandler.handle(aggregator)
-
-        syncResponse.rooms?.let {
-            checkPushRules(it, isInitialSync)
-            userAccountDataSyncHandler.synchronizeWithServerIfNeeded(it.invite)
-            dispatchInvitedRoom(it)
+    private suspend fun aggregateSyncResponse(aggregator: SyncResponsePostTreatmentAggregator) {
+        relevantPlugins.measureSpan("task", "aggregator_management") {
+            // Everything else we need to do outside the transaction
+            measureTimeMillis {
+                aggregatorHandler.handle(aggregator)
+            }.also {
+                Timber.v("Aggregator management took $it ms")
+            }
         }
+    }
 
-        Timber.v("On sync completed")
-        cryptoSyncHandler.onSyncCompleted(syncResponse)
+    private suspend fun postTreatmentSyncResponse(syncResponse: SyncResponse, isInitialSync: Boolean) {
+        relevantPlugins.measureSpan("task", "sync_response_post_treatment") {
+            measureTimeMillis {
+                syncResponse.rooms?.let {
+                    checkPushRules(it, isInitialSync)
+                    userAccountDataSyncHandler.synchronizeWithServerIfNeeded(it.invite)
+                    dispatchInvitedRoom(it)
+                }
+            }.also {
+                Timber.v("SyncResponse.rooms post treatment took $it ms")
+            }
+        }
+    }
 
-        // post sync stuffs
+    private fun markCryptoSyncCompleted(syncResponse: SyncResponse) {
+        relevantPlugins.measureSpan("task", "crypto_sync_handler_onSyncCompleted") {
+            measureTimeMillis {
+                cryptoSyncHandler.onSyncCompleted(syncResponse)
+            }.also {
+                Timber.v("cryptoSyncHandler.onSyncCompleted took $it ms")
+            }
+        }
+    }
+
+    private fun handlePostSync() {
         monarchy.writeAsync {
             roomSyncHandler.postSyncSpaceHierarchyHandle(it)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt
index e9452c59fc..2b7f936fa8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt
@@ -23,6 +23,9 @@ internal class SyncResponsePostTreatmentAggregator {
     // Map of roomId to directUserId
     val directChatsToCheck = mutableMapOf<String, String>()
 
-    // List of userIds to fetch and update at the end of incremental syncs
-    val userIdsToFetch = mutableListOf<String>()
+    // Set of userIds to fetch and update at the end of incremental syncs
+    val userIdsToFetch = mutableSetOf<String>()
+
+    // Set of users to call `crossSigningService.checkTrustAndAffectedRoomShields` once per sync
+    val userIdsForCheckingTrustAndAffectedRoomShields = mutableSetOf<String>()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index ea296d379d..8a287fb0b4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -36,7 +36,7 @@ import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.network.toFailure
 import org.matrix.android.sdk.internal.session.SessionListeners
 import org.matrix.android.sdk.internal.session.dispatchTo
-import org.matrix.android.sdk.internal.session.filter.FilterRepository
+import org.matrix.android.sdk.internal.session.filter.GetCurrentFilterTask
 import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilitiesTask
 import org.matrix.android.sdk.internal.session.sync.parsing.InitialSyncResponseParser
 import org.matrix.android.sdk.internal.session.user.UserStore
@@ -64,11 +64,9 @@ internal interface SyncTask : Task<SyncTask.Params, SyncResponse> {
 internal class DefaultSyncTask @Inject constructor(
         private val syncAPI: SyncAPI,
         @UserId private val userId: String,
-        private val filterRepository: FilterRepository,
         private val syncResponseHandler: SyncResponseHandler,
         private val syncRequestStateTracker: SyncRequestStateTracker,
         private val syncTokenStore: SyncTokenStore,
-        private val getHomeServerCapabilitiesTask: GetHomeServerCapabilitiesTask,
         private val userStore: UserStore,
         private val session: Session,
         private val sessionListeners: SessionListeners,
@@ -79,6 +77,8 @@ internal class DefaultSyncTask @Inject constructor(
         private val syncResponseParser: InitialSyncResponseParser,
         private val roomSyncEphemeralTemporaryStore: RoomSyncEphemeralTemporaryStore,
         private val clock: Clock,
+        private val getHomeServerCapabilitiesTask: GetHomeServerCapabilitiesTask,
+        private val getCurrentFilterTask: GetCurrentFilterTask
 ) : SyncTask {
 
     private val workingDir = File(fileDirectory, "is")
@@ -100,8 +100,13 @@ internal class DefaultSyncTask @Inject constructor(
             requestParams["since"] = token
             timeout = params.timeout
         }
+
+        // Maybe refresh the homeserver capabilities data we know
+        getHomeServerCapabilitiesTask.execute(GetHomeServerCapabilitiesTask.Params(forceRefresh = false))
+        val filter = getCurrentFilterTask.execute(Unit)
+
         requestParams["timeout"] = timeout.toString()
-        requestParams["filter"] = filterRepository.getFilter()
+        requestParams["filter"] = filter
         params.presence?.let { requestParams["set_presence"] = it.value }
 
         val isInitialSync = token == null
@@ -115,8 +120,6 @@ internal class DefaultSyncTask @Inject constructor(
             )
             syncRequestStateTracker.startRoot(InitialSyncStep.ImportingAccount, 100)
         }
-        // Maybe refresh the homeserver capabilities data we know
-        getHomeServerCapabilitiesTask.execute(GetHomeServerCapabilitiesTask.Params(forceRefresh = false))
 
         val readTimeOut = (params.timeout + TIMEOUT_MARGIN).coerceAtLeast(TimeOutInterceptor.DEFAULT_LONG_TIMEOUT)
 
@@ -140,7 +143,7 @@ internal class DefaultSyncTask @Inject constructor(
                         executeRequest(globalErrorReceiver) {
                             syncAPI.sync(
                                     params = requestParams,
-                                    readTimeOut = readTimeOut
+                                    readTimeOut = readTimeOut,
                             )
                         }
                     }
@@ -178,7 +181,7 @@ internal class DefaultSyncTask @Inject constructor(
             syncRequestStateTracker.setSyncRequestState(
                     SyncRequestState.IncrementalSyncParsing(
                             rooms = nbRooms,
-                            toDevice = nbToDevice
+                            toDevice = nbToDevice,
                     )
             )
             syncResponseHandler.handleResponse(syncResponse, token, null)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/CryptoSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/CryptoSyncHandler.kt
index b6142b3a7a..551db52dbd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/CryptoSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/CryptoSyncHandler.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.sync.handler
 
+import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_OLM
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.model.MXEventDecryptionResult
@@ -28,6 +29,7 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.sync.model.SyncResponse
 import org.matrix.android.sdk.api.session.sync.model.ToDeviceSyncResponse
 import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
+import org.matrix.android.sdk.internal.crypto.tasks.toDeviceTracingId
 import org.matrix.android.sdk.internal.crypto.verification.DefaultVerificationService
 import org.matrix.android.sdk.internal.session.sync.ProgressReporter
 import timber.log.Timber
@@ -42,17 +44,43 @@ internal class CryptoSyncHandler @Inject constructor(
 
     suspend fun handleToDevice(toDevice: ToDeviceSyncResponse, progressReporter: ProgressReporter? = null) {
         val total = toDevice.events?.size ?: 0
-        toDevice.events?.forEachIndexed { index, event ->
-            progressReporter?.reportProgress(index * 100F / total)
-            // Decrypt event if necessary
-            Timber.tag(loggerTag.value).i("To device event from ${event.senderId} of type:${event.type}")
-            decryptToDeviceEvent(event, null)
-            if (event.getClearType() == EventType.MESSAGE &&
-                    event.getClearContent()?.toModel<MessageContent>()?.msgType == "m.bad.encrypted") {
-                Timber.tag(loggerTag.value).e("handleToDeviceEvent() : Warning: Unable to decrypt to-device event : ${event.content}")
-            } else {
-                verificationService.onToDeviceEvent(event)
-                cryptoService.onToDeviceEvent(event)
+        toDevice.events
+                ?.filter { isSupportedToDevice(it) }
+                ?.forEachIndexed { index, event ->
+                    progressReporter?.reportProgress(index * 100F / total)
+                    // Decrypt event if necessary
+                    Timber.tag(loggerTag.value).d("To device event msgid:${event.toDeviceTracingId()}")
+                    decryptToDeviceEvent(event, null)
+
+                    if (event.getClearType() == EventType.MESSAGE &&
+                            event.getClearContent()?.toModel<MessageContent>()?.msgType == "m.bad.encrypted") {
+                        Timber.tag(loggerTag.value).e("handleToDeviceEvent() : Warning: Unable to decrypt to-device event : ${event.content}")
+                    } else {
+                        Timber.tag(loggerTag.value).d("received to-device ${event.getClearType()} from:${event.senderId} msgid:${event.toDeviceTracingId()}")
+                        verificationService.onToDeviceEvent(event)
+                        cryptoService.onToDeviceEvent(event)
+                    }
+                }
+    }
+
+    private val unsupportedPlainToDeviceEventTypes = listOf(
+            EventType.ROOM_KEY,
+            EventType.FORWARDED_ROOM_KEY,
+            EventType.SEND_SECRET
+    )
+
+    private fun isSupportedToDevice(event: Event): Boolean {
+        val algorithm = event.content?.get("algorithm") as? String
+        val type = event.type.orEmpty()
+        return if (event.isEncrypted()) {
+            algorithm == MXCRYPTO_ALGORITHM_OLM
+        } else {
+            // some clear events are not allowed
+            type !in unsupportedPlainToDeviceEventTypes
+        }.also {
+            if (!it) {
+                Timber.tag(loggerTag.value)
+                        .w("Ignoring unsupported to device event ${event.type} alg:${algorithm}")
             }
         }
     }
@@ -91,7 +119,8 @@ internal class CryptoSyncHandler @Inject constructor(
                         payload = result.clearEvent,
                         senderKey = result.senderCurve25519Key,
                         keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
-                        forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                        forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
+                        isSafe = result.isSafe
                 )
                 return true
             } else {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/SyncResponsePostTreatmentAggregatorHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/SyncResponsePostTreatmentAggregatorHandler.kt
index c638ed4f80..c749f77fff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/SyncResponsePostTreatmentAggregatorHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/SyncResponsePostTreatmentAggregatorHandler.kt
@@ -16,32 +16,39 @@
 
 package org.matrix.android.sdk.internal.session.sync.handler
 
-import com.zhuinden.monarchy.Monarchy
+import androidx.work.BackoffPolicy
+import androidx.work.ExistingWorkPolicy
 import org.matrix.android.sdk.api.MatrixPatterns
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.session.user.model.User
-import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.session.profile.GetProfileInfoTask
+import org.matrix.android.sdk.internal.crypto.crosssigning.DefaultCrossSigningService
+import org.matrix.android.sdk.internal.crypto.crosssigning.UpdateTrustWorker
+import org.matrix.android.sdk.internal.crypto.crosssigning.UpdateTrustWorkerDataRepository
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.sync.RoomSyncEphemeralTemporaryStore
 import org.matrix.android.sdk.internal.session.sync.SyncResponsePostTreatmentAggregator
 import org.matrix.android.sdk.internal.session.sync.model.accountdata.toMutable
-import org.matrix.android.sdk.internal.session.user.UserEntityFactory
 import org.matrix.android.sdk.internal.session.user.accountdata.DirectChatsHelper
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
-import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.logLimit
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 internal class SyncResponsePostTreatmentAggregatorHandler @Inject constructor(
         private val directChatsHelper: DirectChatsHelper,
         private val ephemeralTemporaryStore: RoomSyncEphemeralTemporaryStore,
         private val updateUserAccountDataTask: UpdateUserAccountDataTask,
-        private val getProfileInfoTask: GetProfileInfoTask,
-        @SessionDatabase private val monarchy: Monarchy,
+        private val crossSigningService: DefaultCrossSigningService,
+        private val updateTrustWorkerDataRepository: UpdateTrustWorkerDataRepository,
+        private val workManagerProvider: WorkManagerProvider,
+        @SessionId private val sessionId: String,
 ) {
     suspend fun handle(aggregator: SyncResponsePostTreatmentAggregator) {
         cleanupEphemeralFiles(aggregator.ephemeralFilesToDelete)
         updateDirectUserIds(aggregator.directChatsToCheck)
         fetchAndUpdateUsers(aggregator.userIdsToFetch)
+        handleUserIdsForCheckingTrustAndAffectedRoomShields(aggregator.userIdsForCheckingTrustAndAffectedRoomShields)
     }
 
     private fun cleanupEphemeralFiles(ephemeralFilesToDelete: List<String>) {
@@ -79,23 +86,26 @@ internal class SyncResponsePostTreatmentAggregatorHandler @Inject constructor(
         }
     }
 
-    private suspend fun fetchAndUpdateUsers(userIdsToFetch: List<String>) {
-        fetchUsers(userIdsToFetch)
-                .takeIf { it.isNotEmpty() }
-                ?.saveLocally()
+    private fun fetchAndUpdateUsers(userIdsToFetch: Collection<String>) {
+        if (userIdsToFetch.isEmpty()) return
+        Timber.d("## Configure Worker to update users: ${userIdsToFetch.logLimit()}")
+        val workerParams = UpdateTrustWorker.Params(
+                sessionId = sessionId,
+                filename = updateTrustWorkerDataRepository.createParam(userIdsToFetch.toList())
+        )
+        val workerData = WorkerParamsFactory.toData(workerParams)
+
+        val workRequest = workManagerProvider.matrixOneTimeWorkRequestBuilder<UpdateUserWorker>()
+                .setInputData(workerData)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
+                .build()
+
+        workManagerProvider.workManager
+                .beginUniqueWork("USER_UPDATE_QUEUE", ExistingWorkPolicy.APPEND_OR_REPLACE, workRequest)
+                .enqueue()
     }
 
-    private suspend fun fetchUsers(userIdsToFetch: List<String>) = userIdsToFetch.mapNotNull {
-        tryOrNull {
-            val profileJson = getProfileInfoTask.execute(GetProfileInfoTask.Params(it))
-            User.fromJson(it, profileJson)
-        }
-    }
-
-    private suspend fun List<User>.saveLocally() {
-        val userEntities = map { user -> UserEntityFactory.create(user) }
-        monarchy.awaitTransaction {
-            it.insertOrUpdate(userEntities)
-        }
+    private fun handleUserIdsForCheckingTrustAndAffectedRoomShields(userIdsWithDeviceUpdate: Iterable<String>) {
+        crossSigningService.checkTrustAndAffectedRoomShields(userIdsWithDeviceUpdate.toList())
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UpdateUserWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UpdateUserWorker.kt
new file mode 100644
index 0000000000..1ee2fc4802
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UpdateUserWorker.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.sync.handler
+
+import android.content.Context
+import androidx.work.WorkerParameters
+import com.zhuinden.monarchy.Monarchy
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.internal.SessionManager
+import org.matrix.android.sdk.internal.crypto.crosssigning.UpdateTrustWorker
+import org.matrix.android.sdk.internal.crypto.crosssigning.UpdateTrustWorkerDataRepository
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.SessionComponent
+import org.matrix.android.sdk.internal.session.profile.GetProfileInfoTask
+import org.matrix.android.sdk.internal.session.user.UserEntityFactory
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.logLimit
+import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * Note: We reuse the same type [UpdateTrustWorker.Params], since the input data are the same.
+ */
+internal class UpdateUserWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
+        SessionSafeCoroutineWorker<UpdateTrustWorker.Params>(context, params, sessionManager, UpdateTrustWorker.Params::class.java) {
+
+    @SessionDatabase
+    @Inject lateinit var monarchy: Monarchy
+    @Inject lateinit var updateTrustWorkerDataRepository: UpdateTrustWorkerDataRepository
+    @Inject lateinit var getProfileInfoTask: GetProfileInfoTask
+
+    override fun injectWith(injector: SessionComponent) {
+        injector.inject(this)
+    }
+
+    override suspend fun doSafeWork(params: UpdateTrustWorker.Params): Result {
+        val userList = params.filename
+                ?.let { updateTrustWorkerDataRepository.getParam(it) }
+                ?.userIds
+                ?: params.updatedUserIds.orEmpty()
+
+        // List should not be empty, but let's avoid go further in case of empty list
+        if (userList.isNotEmpty()) {
+            Timber.v("## UpdateUserWorker - updating users: ${userList.logLimit()}")
+            fetchAndUpdateUsers(userList)
+        }
+
+        cleanup(params)
+        return Result.success()
+    }
+
+    private suspend fun fetchAndUpdateUsers(userIdsToFetch: Collection<String>) {
+        fetchUsers(userIdsToFetch)
+                .takeIf { it.isNotEmpty() }
+                ?.saveLocally()
+    }
+
+    private suspend fun fetchUsers(userIdsToFetch: Collection<String>): List<User> {
+        return userIdsToFetch.mapNotNull { userId ->
+            tryOrNull {
+                val profileJson = getProfileInfoTask.execute(GetProfileInfoTask.Params(
+                        userId = userId,
+                        // Bulk insert later, so tell the task not to store the User.
+                        storeInDatabase = false,
+                ))
+                User.fromJson(userId, profileJson)
+            }
+        }
+    }
+
+    private suspend fun List<User>.saveLocally() {
+        val userEntities = map { user -> UserEntityFactory.create(user) }
+        Timber.d("## saveLocally()")
+        monarchy.awaitTransaction {
+            Timber.d("## saveLocally() - in transaction")
+            it.insertOrUpdate(userEntities)
+        }
+        Timber.d("## saveLocally() - END")
+    }
+
+    private fun cleanup(params: UpdateTrustWorker.Params) {
+        params.filename
+                ?.let { updateTrustWorkerDataRepository.delete(it) }
+    }
+
+    override fun buildErrorParams(params: UpdateTrustWorker.Params, message: String): UpdateTrustWorker.Params {
+        return params.copy(lastFailureMessage = params.lastFailureMessage ?: message)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt
index 0f296ded5d..92ebb41ad9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt
@@ -45,6 +45,7 @@ import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.UserAccountDataEntity
 import org.matrix.android.sdk.internal.database.model.UserAccountDataEntityFields
 import org.matrix.android.sdk.internal.database.model.deleteOnCascade
+import org.matrix.android.sdk.internal.database.query.delete
 import org.matrix.android.sdk.internal.database.query.findAllFrom
 import org.matrix.android.sdk.internal.database.query.getDirectRooms
 import org.matrix.android.sdk.internal.database.query.getOrCreate
@@ -94,7 +95,7 @@ internal class UserAccountDataSyncHandler @Inject constructor(
 
     // If we get some direct chat invites, we synchronize the user account data including those.
     suspend fun synchronizeWithServerIfNeeded(invites: Map<String, InvitedRoomSync>) {
-        if (invites.isNullOrEmpty()) return
+        if (invites.isEmpty()) return
         val directChats = directChatsHelper.getLocalDirectMessages().toMutable()
         var hasUpdate = false
         monarchy.doWithRealm { realm ->
@@ -252,9 +253,17 @@ internal class UserAccountDataSyncHandler @Inject constructor(
     }
 
     fun handleGenericAccountData(realm: Realm, type: String, content: Content?) {
+        if (content.isNullOrEmpty()) {
+            // This is a response for a deleted account data according to
+            // https://github.com/ShadowJonathan/matrix-doc/blob/account-data-delete/proposals/3391-account-data-delete.md#sync
+            UserAccountDataEntity.delete(realm, type)
+            return
+        }
+
         val existing = realm.where<UserAccountDataEntity>()
                 .equalTo(UserAccountDataEntityFields.TYPE, type)
                 .findFirst()
+
         if (existing != null) {
             // Update current value
             existing.contentStr = ContentMapper.map(content)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt
index 7329611a01..7f12ce653c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt
@@ -33,10 +33,11 @@ import javax.inject.Inject
 // value : dict key $UserId
 //              value dict key ts
 //                    dict value ts value
-internal typealias ReadReceiptContent = Map<String, Map<String, Map<String, Map<String, Double>>>>
+internal typealias ReadReceiptContent = Map<String, Map<String, Map<String, Map<String, Any>>>>
 
 private const val READ_KEY = "m.read"
 private const val TIMESTAMP_KEY = "ts"
+private const val THREAD_ID_KEY = "thread_id"
 
 internal class ReadReceiptHandler @Inject constructor(
         private val roomSyncEphemeralTemporaryStore: RoomSyncEphemeralTemporaryStore
@@ -47,14 +48,19 @@ internal class ReadReceiptHandler @Inject constructor(
         fun createContent(
                 userId: String,
                 eventId: String,
+                threadId: String?,
                 currentTimeMillis: Long
         ): ReadReceiptContent {
+            val userReadReceipt = mutableMapOf<String, Any>(
+                    TIMESTAMP_KEY to currentTimeMillis.toDouble(),
+            )
+            threadId?.let {
+                userReadReceipt.put(THREAD_ID_KEY, threadId)
+            }
             return mapOf(
                     eventId to mapOf(
                             READ_KEY to mapOf(
-                                    userId to mapOf(
-                                            TIMESTAMP_KEY to currentTimeMillis.toDouble()
-                                    )
+                                    userId to userReadReceipt
                             )
                     )
             )
@@ -98,8 +104,9 @@ internal class ReadReceiptHandler @Inject constructor(
             val readReceiptsSummary = ReadReceiptsSummaryEntity(eventId = eventId, roomId = roomId)
 
             for ((userId, paramsDict) in userIdsDict) {
-                val ts = paramsDict[TIMESTAMP_KEY] ?: 0.0
-                val receiptEntity = ReadReceiptEntity.createUnmanaged(roomId, eventId, userId, ts)
+                val ts = paramsDict[TIMESTAMP_KEY] as? Double ?: 0.0
+                val threadId = paramsDict[THREAD_ID_KEY] as String?
+                val receiptEntity = ReadReceiptEntity.createUnmanaged(roomId, eventId, userId, threadId, ts)
                 readReceiptsSummary.readReceipts.add(receiptEntity)
             }
             readReceiptSummaries.add(readReceiptsSummary)
@@ -115,7 +122,7 @@ internal class ReadReceiptHandler @Inject constructor(
     ) {
         // First check if we have data from init sync to handle
         getContentFromInitSync(roomId)?.let {
-            Timber.w("INIT_SYNC Insert during incremental sync RR for room $roomId")
+            Timber.d("INIT_SYNC Insert during incremental sync RR for room $roomId")
             doIncrementalSyncStrategy(realm, roomId, it)
             aggregator?.ephemeralFilesToDelete?.add(roomId)
         }
@@ -132,8 +139,9 @@ internal class ReadReceiptHandler @Inject constructor(
                     }
 
             for ((userId, paramsDict) in userIdsDict) {
-                val ts = paramsDict[TIMESTAMP_KEY] ?: 0.0
-                val receiptEntity = ReadReceiptEntity.getOrCreate(realm, roomId, userId)
+                val ts = paramsDict[TIMESTAMP_KEY] as? Double ?: 0.0
+                val threadId = paramsDict[THREAD_ID_KEY] as String?
+                val receiptEntity = ReadReceiptEntity.getOrCreate(realm, roomId, userId, threadId)
                 // ensure new ts is superior to the previous one
                 if (ts > receiptEntity.originServerTs) {
                     ReadReceiptsSummaryEntity.where(realm, receiptEntity.eventId).findFirst()?.also {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
index 30e1ec6679..4001ae2ccf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
@@ -25,6 +25,8 @@ import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -40,6 +42,7 @@ import org.matrix.android.sdk.api.session.sync.model.RoomSync
 import org.matrix.android.sdk.api.session.sync.model.RoomsSyncResponse
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
+import org.matrix.android.sdk.internal.crypto.algorithms.megolm.UnRequestedForwardManager
 import org.matrix.android.sdk.internal.database.helper.addIfNecessary
 import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
 import org.matrix.android.sdk.internal.database.helper.createOrUpdate
@@ -48,6 +51,7 @@ import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.mapper.toEntity
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
 import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.EventInsertType
 import org.matrix.android.sdk.internal.database.model.RoomEntity
@@ -99,6 +103,7 @@ internal class RoomSyncHandler @Inject constructor(
         private val timelineInput: TimelineInput,
         private val liveEventService: Lazy<StreamEventsManager>,
         private val clock: Clock,
+        private val unRequestedForwardManager: UnRequestedForwardManager,
 ) {
 
     sealed class HandlingStrategy {
@@ -154,12 +159,12 @@ internal class RoomSyncHandler @Inject constructor(
             }
             is HandlingStrategy.INVITED ->
                 handlingStrategy.data.mapWithProgress(reporter, InitialSyncStep.ImportingAccountInvitedRooms, 0.1f) {
-                    handleInvitedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis)
+                    handleInvitedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis, aggregator)
                 }
 
             is HandlingStrategy.LEFT -> {
                 handlingStrategy.data.mapWithProgress(reporter, InitialSyncStep.ImportingAccountLeftRooms, 0.3f) {
-                    handleLeftRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis)
+                    handleLeftRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis, aggregator)
                 }
             }
         }
@@ -285,7 +290,9 @@ internal class RoomSyncHandler @Inject constructor(
                 Membership.JOIN,
                 roomSync.summary,
                 roomSync.unreadNotifications,
-                updateMembers = hasRoomMember
+                roomSync.unreadThreadNotifications,
+                updateMembers = hasRoomMember,
+                aggregator = aggregator
         )
         return roomEntity
     }
@@ -295,7 +302,8 @@ internal class RoomSyncHandler @Inject constructor(
             roomId: String,
             roomSync: InvitedRoomSync,
             insertType: EventInsertType,
-            syncLocalTimestampMillis: Long
+            syncLocalTimestampMillis: Long,
+            aggregator: SyncResponsePostTreatmentAggregator
     ): RoomEntity {
         Timber.v("Handle invited sync for room $roomId")
         val isInitialSync = insertType == EventInsertType.INITIAL_SYNC
@@ -319,7 +327,8 @@ internal class RoomSyncHandler @Inject constructor(
             it.type == EventType.STATE_ROOM_MEMBER
         }
         roomChangeMembershipStateDataSource.setMembershipFromSync(roomId, Membership.INVITE)
-        roomSummaryUpdater.update(realm, roomId, Membership.INVITE, updateMembers = true, inviterId = inviterEvent?.senderId)
+        roomSummaryUpdater.update(realm, roomId, Membership.INVITE, updateMembers = true, inviterId = inviterEvent?.senderId, aggregator = aggregator)
+        unRequestedForwardManager.onInviteReceived(roomId, inviterEvent?.senderId.orEmpty(), clock.epochMillis())
         return roomEntity
     }
 
@@ -328,7 +337,8 @@ internal class RoomSyncHandler @Inject constructor(
             roomId: String,
             roomSync: RoomSync,
             insertType: EventInsertType,
-            syncLocalTimestampMillis: Long
+            syncLocalTimestampMillis: Long,
+            aggregator: SyncResponsePostTreatmentAggregator
     ): RoomEntity {
         val isInitialSync = insertType == EventInsertType.INITIAL_SYNC
         val roomEntity = RoomEntity.getOrCreate(realm, roomId)
@@ -366,7 +376,8 @@ internal class RoomSyncHandler @Inject constructor(
         roomEntity.chunks.clearWith { it.deleteOnCascade(deleteStateEvents = true, canDeleteRoot = true) }
         roomTypingUsersHandler.handle(realm, roomId, null)
         roomChangeMembershipStateDataSource.setMembershipFromSync(roomId, Membership.LEAVE)
-        roomSummaryUpdater.update(realm, roomId, membership, roomSync.summary, roomSync.unreadNotifications)
+        roomSummaryUpdater.update(realm, roomId, membership, roomSync.summary,
+                roomSync.unreadNotifications, roomSync.unreadThreadNotifications, aggregator = aggregator)
         return roomEntity
     }
 
@@ -478,23 +489,41 @@ internal class RoomSyncHandler @Inject constructor(
             cryptoService.onLiveEvent(roomEntity.roomId, event, isInitialSync)
 
             // Try to remove local echo
-            event.unsignedData?.transactionId?.also {
-                val sendingEventEntity = roomEntity.sendingTimelineEvents.find(it)
+            event.unsignedData?.transactionId?.also { txId ->
+                val sendingEventEntity = roomEntity.sendingTimelineEvents.find(txId)
                 if (sendingEventEntity != null) {
-                    Timber.v("Remove local echo for tx:$it")
+                    Timber.v("Remove local echo for tx:$txId")
                     roomEntity.sendingTimelineEvents.remove(sendingEventEntity)
                     if (event.isEncrypted() && event.content?.get("algorithm") as? String == MXCRYPTO_ALGORITHM_MEGOLM) {
-                        // updated with echo decryption, to avoid seeing it decrypt again
+                        // updated with echo decryption, to avoid seeing txId decrypt again
                         val adapter = MoshiProvider.providesMoshi().adapter<OlmDecryptionResult>(OlmDecryptionResult::class.java)
                         sendingEventEntity.root?.decryptionResultJson?.let { json ->
                             eventEntity.decryptionResultJson = json
                             event.mxDecryptionResult = adapter.fromJson(json)
                         }
                     }
+                    // also update potential edit that could refer to that event?
+                    // If not display will flicker :/
+                    val relationContent = event.getRelationContent()
+                    if (relationContent?.type == RelationType.REPLACE) {
+                        relationContent.eventId?.let { targetId ->
+                            EventAnnotationsSummaryEntity.where(realm, roomId, targetId)
+                                    .findFirst()
+                                    ?.editSummary
+                                    ?.editions
+                                    ?.forEach {
+                                        if (it.eventId == txId) {
+                                            // just do that, the aggregation processor will to the rest
+                                            it.event = eventEntity
+                                        }
+                                    }
+                        }
+                    }
+
                     // Finally delete the local echo
                     sendingEventEntity.deleteOnCascade(true)
                 } else {
-                    Timber.v("Can't find corresponding local echo for tx:$it")
+                    Timber.v("Can't find corresponding local echo for tx:$txId")
                 }
             }
         }
@@ -548,7 +577,8 @@ internal class RoomSyncHandler @Inject constructor(
                     payload = result.clearEvent,
                     senderKey = result.senderCurve25519Key,
                     keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
-                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
+                    isSafe = result.isSafe
             )
         } catch (e: MXCryptoError) {
             if (e is MXCryptoError.Base) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt
index 54bb63753c..519112b1b7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.session.sync.handler.room
 
 import io.realm.Realm
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.internal.database.model.IgnoredUserEntity
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
@@ -30,8 +31,15 @@ internal class RoomTypingUsersHandler @Inject constructor(
 
     // TODO This could be handled outside of the Realm transaction. Use the new aggregator?
     fun handle(realm: Realm, roomId: String, ephemeralResult: RoomSyncHandler.EphemeralResult?) {
+        val typingUserIds = ephemeralResult?.typingUserIds
+        if (typingUserIds.isNullOrEmpty()) {
+            typingUsersTracker.setTypingUsersFromRoom(roomId, emptyList())
+            return
+        }
+        // Filter ignored users and current user
+        val filteredUserIds = realm.where(IgnoredUserEntity::class.java).findAll().map { it.userId } + userId
         val roomMemberHelper = RoomMemberHelper(realm, roomId)
-        val typingIds = ephemeralResult?.typingUserIds?.filter { it != userId }.orEmpty()
+        val typingIds = typingUserIds.filter { it !in filteredUserIds }
         val senderInfo = typingIds.map { userId ->
             val roomMemberSummaryEntity = roomMemberHelper.getLastRoomMember(userId)
             SenderInfo(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
index 24a60a80da..d3f2a3f044 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
@@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.isTokenError
@@ -52,7 +53,6 @@ import javax.inject.Inject
 import kotlin.concurrent.schedule
 
 private const val RETRY_WAIT_TIME_MS = 10_000L
-private const val DEFAULT_LONG_POOL_TIMEOUT = 30_000L
 
 private val loggerTag = LoggerTag("SyncThread", LoggerTag.SYNC)
 
@@ -61,8 +61,9 @@ internal class SyncThread @Inject constructor(
         private val networkConnectivityChecker: NetworkConnectivityChecker,
         private val backgroundDetectionObserver: BackgroundDetectionObserver,
         private val activeCallHandler: ActiveCallHandler,
-        private val lightweightSettingsStorage: DefaultLightweightSettingsStorage
-) : Thread("SyncThread"), NetworkConnectivityChecker.Listener, BackgroundDetectionObserver.Listener {
+        private val lightweightSettingsStorage: DefaultLightweightSettingsStorage,
+        private val matrixConfiguration: MatrixConfiguration,
+) : Thread("Matrix-SyncThread"), NetworkConnectivityChecker.Listener, BackgroundDetectionObserver.Listener {
 
     private var state: SyncState = SyncState.Idle
     private var liveState = MutableLiveData(state)
@@ -181,7 +182,7 @@ internal class SyncThread @Inject constructor(
                 val timeout = when {
                     previousSyncResponseHasToDevice -> 0L /* Force timeout to 0 */
                     afterPause -> 0L /* No timeout after a pause */
-                    else -> DEFAULT_LONG_POOL_TIMEOUT
+                    else -> matrixConfiguration.syncConfig.longPollTimeout
                 }
                 Timber.tag(loggerTag.value).d("Execute sync request with timeout $timeout")
                 val presence = lightweightSettingsStorage.getSyncPresenceStatus()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
index 0cc7944d58..a04bc74628 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.internal.session.sync.SyncTask
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.startChain
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -136,6 +137,7 @@ internal class SyncWorker(context: Context, workerParameters: WorkerParameters,
                     .setConstraints(WorkManagerProvider.workConstraints)
                     .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                     .setInputData(data)
+                    .startChain(true)
                     .build()
             workManagerProvider.workManager
                     .enqueueUniqueWork(BG_SYNC_WORK_NAME, ExistingWorkPolicy.APPEND_OR_REPLACE, workRequest)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
index b1b2bfef33..9da12a2c4a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
@@ -27,6 +27,7 @@ import org.matrix.android.sdk.internal.database.model.RoomAccountDataEntity
 import org.matrix.android.sdk.internal.database.model.RoomAccountDataEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomEntity
 import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.removeAccountData
 import org.matrix.android.sdk.internal.session.room.read.FullyReadContent
 import org.matrix.android.sdk.internal.session.sync.handler.room.RoomFullyReadHandler
 import org.matrix.android.sdk.internal.session.sync.handler.room.RoomTagHandler
@@ -56,6 +57,13 @@ internal class RoomSyncAccountDataHandler @Inject constructor(
     }
 
     private fun handleGeneric(roomEntity: RoomEntity, content: JsonDict?, eventType: String) {
+        if (content.isNullOrEmpty()) {
+            // This is a response for a deleted account data according to
+            // https://github.com/ShadowJonathan/matrix-doc/blob/account-data-delete/proposals/3391-account-data-delete.md#sync
+            roomEntity.removeAccountData(eventType)
+            return
+        }
+
         val existing = roomEntity.accountData.where().equalTo(RoomAccountDataEntityFields.TYPE, eventType).findFirst()
         if (existing != null) {
             existing.contentStr = ContentMapper.map(content)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
index f9feb04e97..98108008fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
@@ -66,6 +66,8 @@ internal class UserDataSource @Inject constructor(
         }
     }
 
+    fun getUserOrDefault(userId: String): User = getUser(userId) ?: User(userId)
+
     fun getUserLive(userId: String): LiveData<Optional<User>> {
         val liveData = monarchy.findAllMappedWithChanges(
                 { UserEntity.where(it, userId) },
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
index b283d51845..1b3d59ac66 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
@@ -18,13 +18,14 @@ package org.matrix.android.sdk.internal.session.user.accountdata
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.PUT
 import retrofit2.http.Path
 
 internal interface AccountDataAPI {
 
     /**
-     * Set some account_data for the client.
+     * Set some account_data for the user.
      *
      * @param userId the user id
      * @param type the type
@@ -36,4 +37,16 @@ internal interface AccountDataAPI {
             @Path("type") type: String,
             @Body params: Any
     )
+
+    /**
+     * Remove an account_data for the user.
+     *
+     * @param userId the user id
+     * @param type the type
+     */
+    @DELETE(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc3391/user/{userId}/account_data/{type}")
+    suspend fun deleteAccountData(
+            @Path("userId") userId: String,
+            @Path("type") type: String
+    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt
index 3173686a27..463292b9c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt
@@ -42,4 +42,7 @@ internal abstract class AccountDataModule {
 
     @Binds
     abstract fun bindUpdateBreadcrumbsTask(task: DefaultUpdateBreadcrumbsTask): UpdateBreadcrumbsTask
+
+    @Binds
+    abstract fun bindDeleteUserAccountDataTask(task: DefaultDeleteUserAccountDataTask): DeleteUserAccountDataTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultSessionAccountDataService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultSessionAccountDataService.kt
index df9dcfb903..304a586a79 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultSessionAccountDataService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultSessionAccountDataService.kt
@@ -34,10 +34,11 @@ import javax.inject.Inject
 internal class DefaultSessionAccountDataService @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         private val updateUserAccountDataTask: UpdateUserAccountDataTask,
+        private val deleteUserAccountDataTask: DeleteUserAccountDataTask,
         private val userAccountDataSyncHandler: UserAccountDataSyncHandler,
         private val userAccountDataDataSource: UserAccountDataDataSource,
         private val roomAccountDataDataSource: RoomAccountDataDataSource,
-        private val taskExecutor: TaskExecutor
+        private val taskExecutor: TaskExecutor,
 ) : SessionAccountDataService {
 
     override fun getUserAccountDataEvent(type: String): UserAccountDataEvent? {
@@ -66,7 +67,7 @@ internal class DefaultSessionAccountDataService @Inject constructor(
 
     override suspend fun updateUserAccountData(type: String, content: Content) {
         val params = UpdateUserAccountDataTask.AnyParams(type = type, any = content)
-        awaitCallback<Unit> { callback ->
+        awaitCallback { callback ->
             updateUserAccountDataTask.configureWith(params) {
                 this.retryCount = 5 // TODO Need to refactor retrying out into a helper method.
                 this.callback = callback
@@ -78,4 +79,12 @@ internal class DefaultSessionAccountDataService @Inject constructor(
             userAccountDataSyncHandler.handleGenericAccountData(realm, type, content)
         }
     }
+
+    override fun getUserAccountDataEventsStartWith(type: String): List<UserAccountDataEvent> {
+        return userAccountDataDataSource.getAccountDataEventsStartWith(type)
+    }
+
+    override suspend fun deleteUserAccountData(type: String) {
+        deleteUserAccountDataTask.execute(DeleteUserAccountDataTask.Params(type))
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DeleteUserAccountDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DeleteUserAccountDataTask.kt
new file mode 100644
index 0000000000..8d155e32cb
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DeleteUserAccountDataTask.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.user.accountdata
+
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface DeleteUserAccountDataTask : Task<DeleteUserAccountDataTask.Params, Unit> {
+
+    data class Params(
+            val type: String,
+    )
+}
+
+internal class DefaultDeleteUserAccountDataTask @Inject constructor(
+        private val accountDataApi: AccountDataAPI,
+        @UserId private val userId: String,
+        private val globalErrorReceiver: GlobalErrorReceiver,
+) : DeleteUserAccountDataTask {
+
+    override suspend fun execute(params: DeleteUserAccountDataTask.Params) {
+        return executeRequest(globalErrorReceiver) {
+            accountDataApi.deleteAccountData(userId, params.type)
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt
index 39f155096a..01f5d9f708 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt
@@ -60,6 +60,16 @@ internal class UserAccountDataDataSource @Inject constructor(
         )
     }
 
+    fun getAccountDataEventsStartWith(type: String): List<UserAccountDataEvent> {
+        return realmSessionProvider.withRealm { realm ->
+            realm
+                    .where(UserAccountDataEntity::class.java)
+                    .beginsWith(UserAccountDataEntityFields.TYPE, type)
+                    .findAll()
+                    .map(accountDataMapper::map)
+        }
+    }
+
     private fun accountDataEventsQuery(realm: Realm, types: Set<String>): RealmQuery<UserAccountDataEntity> {
         val query = realm.where(UserAccountDataEntity::class.java)
         if (types.isNotEmpty()) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
index 8bd61a7bdf..a43c59a83b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
@@ -20,7 +20,6 @@ import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
-import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
@@ -74,7 +73,7 @@ internal class WidgetFactory @Inject constructor(
     // Ref: https://github.com/matrix-org/matrix-widget-api/blob/master/src/templating/url-template.ts#L29-L33
     fun computeURL(widget: Widget, isLightTheme: Boolean): String? {
         var computedUrl = widget.widgetContent.url ?: return null
-        val myUser = userDataSource.getUser(userId) ?: User(userId)
+        val myUser = userDataSource.getUserOrDefault(userId)
 
         val keyValue = widget.widgetContent.data.mapKeys { "\$${it.key}" }.toMutableMap()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/sync/filter/SyncFilterBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/sync/filter/SyncFilterBuilder.kt
new file mode 100644
index 0000000000..d58b9d3765
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/sync/filter/SyncFilterBuilder.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.sync.filter
+
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.api.session.sync.filter.SyncFilterParams
+import org.matrix.android.sdk.internal.session.filter.Filter
+import org.matrix.android.sdk.internal.session.filter.RoomEventFilter
+import org.matrix.android.sdk.internal.session.filter.RoomFilter
+
+internal class SyncFilterBuilder {
+    private var lazyLoadMembersForStateEvents: Boolean? = null
+    private var lazyLoadMembersForMessageEvents: Boolean? = null
+    private var useThreadNotifications: Boolean? = null
+    private var listOfSupportedEventTypes: List<String>? = null
+    private var listOfSupportedStateEventTypes: List<String>? = null
+
+    fun lazyLoadMembersForStateEvents(lazyLoadMembersForStateEvents: Boolean) = apply { this.lazyLoadMembersForStateEvents = lazyLoadMembersForStateEvents }
+
+    fun lazyLoadMembersForMessageEvents(lazyLoadMembersForMessageEvents: Boolean) =
+            apply { this.lazyLoadMembersForMessageEvents = lazyLoadMembersForMessageEvents }
+
+    fun useThreadNotifications(useThreadNotifications: Boolean) =
+            apply { this.useThreadNotifications = useThreadNotifications }
+
+    fun listOfSupportedStateEventTypes(listOfSupportedStateEventTypes: List<String>) =
+            apply { this.listOfSupportedStateEventTypes = listOfSupportedStateEventTypes }
+
+    fun listOfSupportedTimelineEventTypes(listOfSupportedEventTypes: List<String>) =
+            apply { this.listOfSupportedEventTypes = listOfSupportedEventTypes }
+
+    internal fun with(currentFilterParams: SyncFilterParams?) =
+            apply {
+                currentFilterParams?.let {
+                    useThreadNotifications = currentFilterParams.useThreadNotifications
+                    lazyLoadMembersForMessageEvents = currentFilterParams.lazyLoadMembersForMessageEvents
+                    lazyLoadMembersForStateEvents = currentFilterParams.lazyLoadMembersForStateEvents
+                    listOfSupportedEventTypes = currentFilterParams.listOfSupportedEventTypes?.toList()
+                    listOfSupportedStateEventTypes = currentFilterParams.listOfSupportedStateEventTypes?.toList()
+                }
+            }
+
+    internal fun build(homeServerCapabilities: HomeServerCapabilities): Filter {
+        return Filter(
+                room = buildRoomFilter(homeServerCapabilities)
+        )
+    }
+
+    private fun buildRoomFilter(homeServerCapabilities: HomeServerCapabilities): RoomFilter {
+        return RoomFilter(
+                timeline = buildTimelineFilter(homeServerCapabilities),
+                state = buildStateFilter()
+        )
+    }
+
+    private fun buildTimelineFilter(homeServerCapabilities: HomeServerCapabilities): RoomEventFilter? {
+        val resolvedUseThreadNotifications = if (homeServerCapabilities.canUseThreadReadReceiptsAndNotifications) {
+            useThreadNotifications
+        } else {
+            null
+        }
+        return RoomEventFilter(
+                enableUnreadThreadNotifications = resolvedUseThreadNotifications,
+                lazyLoadMembers = lazyLoadMembersForMessageEvents
+        ).orNullIfEmpty()
+    }
+
+    private fun buildStateFilter(): RoomEventFilter? =
+            RoomEventFilter(
+                    lazyLoadMembers = lazyLoadMembersForStateEvents,
+                    types = listOfSupportedStateEventTypes
+            ).orNullIfEmpty()
+
+    private fun RoomEventFilter.orNullIfEmpty(): RoomEventFilter? {
+        return if (hasData()) {
+            this
+        } else {
+            null
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as SyncFilterBuilder
+
+        if (lazyLoadMembersForStateEvents != other.lazyLoadMembersForStateEvents) return false
+        if (lazyLoadMembersForMessageEvents != other.lazyLoadMembersForMessageEvents) return false
+        if (useThreadNotifications != other.useThreadNotifications) return false
+        if (listOfSupportedEventTypes != other.listOfSupportedEventTypes) return false
+        if (listOfSupportedStateEventTypes != other.listOfSupportedStateEventTypes) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = lazyLoadMembersForStateEvents?.hashCode() ?: 0
+        result = 31 * result + (lazyLoadMembersForMessageEvents?.hashCode() ?: 0)
+        result = 31 * result + (useThreadNotifications?.hashCode() ?: 0)
+        result = 31 * result + (listOfSupportedEventTypes?.hashCode() ?: 0)
+        result = 31 * result + (listOfSupportedStateEventTypes?.hashCode() ?: 0)
+        return result
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
index 901d0eca8f..dea5f131b9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
@@ -49,13 +49,13 @@ internal class DefaultBackgroundDetectionObserver : BackgroundDetectionObserver
     }
 
     override fun onStart(owner: LifecycleOwner) {
-        Timber.v("App returning to foreground…")
+        Timber.d("App returning to foreground…")
         isInBackground = false
         listeners.forEach { it.onMoveToForeground() }
     }
 
     override fun onStop(owner: LifecycleOwner) {
-        Timber.v("App going to background…")
+        Timber.d("App going to background…")
         isInBackground = true
         listeners.forEach { it.onMoveToBackground() }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt
index 6152eacae5..af3ba80fe4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt
@@ -22,7 +22,7 @@ import io.realm.RealmModel
 import org.matrix.android.sdk.internal.database.awaitTransaction
 import java.util.concurrent.atomic.AtomicReference
 
-internal suspend fun <T> Monarchy.awaitTransaction(transaction: suspend (realm: Realm) -> T): T {
+internal suspend fun <T> Monarchy.awaitTransaction(transaction: (realm: Realm) -> T): T {
     return awaitTransaction(realmConfiguration, transaction)
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
index 83f9532870..80bbbb7938 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.internal.session.room.aggregation.livelocation.Dea
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
 import org.matrix.android.sdk.internal.session.room.send.RedactEventWorker
 import org.matrix.android.sdk.internal.session.room.send.SendEventWorker
+import org.matrix.android.sdk.internal.session.sync.handler.UpdateUserWorker
 import org.matrix.android.sdk.internal.session.sync.job.SyncWorker
 import timber.log.Timber
 import javax.inject.Inject
@@ -62,6 +63,8 @@ internal class MatrixWorkerFactory @Inject constructor(private val sessionManage
                 SyncWorker(appContext, workerParameters, sessionManager)
             UpdateTrustWorker::class.java.name ->
                 UpdateTrustWorker(appContext, workerParameters, sessionManager)
+            UpdateUserWorker::class.java.name ->
+                UpdateUserWorker(appContext, workerParameters, sessionManager)
             UploadContentWorker::class.java.name ->
                 UploadContentWorker(appContext, workerParameters, sessionManager)
             DeactivateLiveLocationShareWorker::class.java.name ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionSafeCoroutineWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionSafeCoroutineWorker.kt
index 030f51428b..b98b61c9f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionSafeCoroutineWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionSafeCoroutineWorker.kt
@@ -55,14 +55,16 @@ internal abstract class SessionSafeCoroutineWorker<PARAM : SessionWorkerParams>(
 
             // Make sure to inject before handling error as you may need some dependencies to process them.
             injectWith(sessionComponent)
-            if (params.lastFailureMessage != null) {
-                // Forward error to the next workers
-                doOnError(params)
-            } else {
-                doSafeWork(params)
+
+            when (val lastFailureMessage = params.lastFailureMessage) {
+                null -> doSafeWork(params)
+                else -> {
+                    // Forward error to the next workers
+                    doOnError(params, lastFailureMessage)
+                }
             }
         } catch (throwable: Throwable) {
-            buildErrorResult(params, throwable.localizedMessage ?: "error")
+            buildErrorResult(params, "${throwable::class.java.name}: ${throwable.localizedMessage ?: "N/A error message"}")
         }
     }
 
@@ -89,10 +91,10 @@ internal abstract class SessionSafeCoroutineWorker<PARAM : SessionWorkerParams>(
      * This is called when the input parameters are correct, but contain an error from the previous worker.
      */
     @CallSuper
-    open fun doOnError(params: PARAM): Result {
+    open fun doOnError(params: PARAM, failureMessage: String): Result {
         // Forward the error
         return Result.success(inputData)
-                .also { Timber.e("Work cancelled due to input error from parent") }
+                .also { Timber.e("Work cancelled due to input error from parent: $failureMessage") }
     }
 
     companion object {
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/DefaultSendToDeviceTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/DefaultSendToDeviceTaskTest.kt
new file mode 100644
index 0000000000..df6fc5f165
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/DefaultSendToDeviceTaskTest.kt
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.crypto
+
+import io.mockk.mockk
+import kotlinx.coroutines.runBlocking
+import org.amshove.kluent.internal.assertEquals
+import org.junit.Assert
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.DevicesListResponse
+import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDeviceParams
+import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDevicesParams
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyChangesResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimBody
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryBody
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysUploadBody
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysUploadResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.SendToDeviceBody
+import org.matrix.android.sdk.internal.crypto.model.rest.SignatureUploadResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.UpdateDeviceInfoBody
+import org.matrix.android.sdk.internal.crypto.model.rest.UploadSigningKeysBody
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultSendToDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+
+class DefaultSendToDeviceTaskTest {
+
+    private val users = listOf(
+            "@alice:example.com" to listOf("D0", "D1"),
+            "bob@example.com" to listOf("D2", "D3")
+    )
+
+    private val fakeEncryptedContent = mapOf(
+            "algorithm" to "m.olm.v1.curve25519-aes-sha2",
+            "sender_key" to "gMObR+/4dqL5T4DisRRRYBJpn+OjzFnkyCFOktP6Eyw",
+            "ciphertext" to mapOf(
+                    "tdwXf7006FDgzmufMCVI4rDdVPO51ecRTTT6HkRxUwE" to mapOf(
+                            "type" to 0,
+                            "body" to "AwogCA1ULEc0abGIFxMDIC9iv7ul3jqJSnapTHQ+8JJx"
+                    )
+            )
+    )
+
+    private val fakeStartVerificationContent = mapOf(
+            "method" to "m.sas.v1",
+            "from_device" to "MNQHVEISFQ",
+            "key_agreement_protocols" to listOf(
+                    "curve25519-hkdf-sha256",
+                    "curve25519"
+            ),
+            "hashes" to listOf("sha256"),
+            "message_authentication_codes" to listOf(
+                    "org.matrix.msc3783.hkdf-hmac-sha256",
+                    "hkdf-hmac-sha256",
+                    "hmac-sha256"
+            ),
+            "short_authentication_string" to listOf(
+                    "decimal",
+                    "emoji"
+            ),
+            "transaction_id" to "4wNOpkHGwGZPXjkZToooCDWfb8hsf7vW"
+    )
+
+    @Test
+    fun `tracing id should be added to to_device contents`() {
+        val fakeCryptoAPi = FakeCryptoApi()
+
+        val sendToDeviceTask = DefaultSendToDeviceTask(
+                cryptoApi = fakeCryptoAPi,
+                globalErrorReceiver = mockk(relaxed = true)
+        )
+
+        val contentMap = MXUsersDevicesMap<Any>()
+
+        users.forEach { pairOfUserDevices ->
+            val userId = pairOfUserDevices.first
+            pairOfUserDevices.second.forEach {
+                contentMap.setObject(userId, it, fakeEncryptedContent)
+            }
+        }
+
+        val params = SendToDeviceTask.Params(
+                eventType = EventType.ENCRYPTED,
+                contentMap = contentMap
+        )
+
+        runBlocking {
+            sendToDeviceTask.execute(params)
+        }
+
+        val generatedIds = mutableListOf<String>()
+        users.forEach { pairOfUserDevices ->
+            val userId = pairOfUserDevices.first
+            pairOfUserDevices.second.forEach {
+                val modifiedContent = fakeCryptoAPi.body!!.messages!![userId]!![it] as Map<*, *>
+                Assert.assertNotNull("Tracing id should have been added", modifiedContent["org.matrix.msgid"])
+                generatedIds.add(modifiedContent["org.matrix.msgid"] as String)
+
+                assertEquals(
+                        "The rest of the content should be the same",
+                        fakeEncryptedContent.keys,
+                        modifiedContent.toMutableMap().apply { remove("org.matrix.msgid") }.keys
+                )
+            }
+        }
+
+        assertEquals("Id should be unique per content", generatedIds.size, generatedIds.toSet().size)
+        println("modified content ${fakeCryptoAPi.body}")
+    }
+
+    @Test
+    fun `tracing id should not be added to verification start to_device contents`() {
+        val fakeCryptoAPi = FakeCryptoApi()
+
+        val sendToDeviceTask = DefaultSendToDeviceTask(
+                cryptoApi = fakeCryptoAPi,
+                globalErrorReceiver = mockk(relaxed = true)
+        )
+        val contentMap = MXUsersDevicesMap<Any>()
+        contentMap.setObject("@alice:example.com", "MNQHVEISFQ", fakeStartVerificationContent)
+
+        val params = SendToDeviceTask.Params(
+                eventType = EventType.KEY_VERIFICATION_START,
+                contentMap = contentMap
+        )
+
+        runBlocking {
+            sendToDeviceTask.execute(params)
+        }
+
+        val modifiedContent = fakeCryptoAPi.body!!.messages!!["@alice:example.com"]!!["MNQHVEISFQ"] as Map<*, *>
+        Assert.assertNull("Tracing id should not have been added", modifiedContent["org.matrix.msgid"])
+
+        // try to force
+        runBlocking {
+            sendToDeviceTask.execute(
+                    SendToDeviceTask.Params(
+                            eventType = EventType.KEY_VERIFICATION_START,
+                            contentMap = contentMap,
+                            addTracingIds = true
+                    )
+            )
+        }
+
+        val modifiedContentForced = fakeCryptoAPi.body!!.messages!!["@alice:example.com"]!!["MNQHVEISFQ"] as Map<*, *>
+        Assert.assertNotNull("Tracing id should have been added", modifiedContentForced["org.matrix.msgid"])
+    }
+
+    @Test
+    fun `tracing id should not be added to all verification to_device contents`() {
+        val fakeCryptoAPi = FakeCryptoApi()
+
+        val sendToDeviceTask = DefaultSendToDeviceTask(
+                cryptoApi = fakeCryptoAPi,
+                globalErrorReceiver = mockk(relaxed = true)
+        )
+        val contentMap = MXUsersDevicesMap<Any>()
+        contentMap.setObject("@alice:example.com", "MNQHVEISFQ", emptyMap<String, Any>())
+
+        val verificationEvents = listOf(
+                MessageType.MSGTYPE_VERIFICATION_REQUEST,
+                EventType.KEY_VERIFICATION_START,
+                EventType.KEY_VERIFICATION_ACCEPT,
+                EventType.KEY_VERIFICATION_KEY,
+                EventType.KEY_VERIFICATION_MAC,
+                EventType.KEY_VERIFICATION_CANCEL,
+                EventType.KEY_VERIFICATION_DONE,
+                EventType.KEY_VERIFICATION_READY
+        )
+
+        for (type in verificationEvents) {
+            val params = SendToDeviceTask.Params(
+                    eventType = type,
+                    contentMap = contentMap
+            )
+            runBlocking {
+                sendToDeviceTask.execute(params)
+            }
+
+            val modifiedContent = fakeCryptoAPi.body!!.messages!!["@alice:example.com"]!!["MNQHVEISFQ"] as Map<*, *>
+            Assert.assertNull("Tracing id should not have been added", modifiedContent["org.matrix.msgid"])
+        }
+    }
+
+    internal class FakeCryptoApi : CryptoApi {
+        override suspend fun getDevices(): DevicesListResponse {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        override suspend fun getDeviceInfo(deviceId: String): DeviceInfo {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        override suspend fun uploadKeys(body: KeysUploadBody): KeysUploadResponse {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        override suspend fun downloadKeysForUsers(params: KeysQueryBody): KeysQueryResponse {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        override suspend fun uploadSigningKeys(params: UploadSigningKeysBody): KeysQueryResponse {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        override suspend fun uploadSignatures(params: Map<String, Any>?): SignatureUploadResponse {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        override suspend fun claimOneTimeKeysForUsersDevices(body: KeysClaimBody): KeysClaimResponse {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        var body: SendToDeviceBody? = null
+        override suspend fun sendToDevice(eventType: String, transactionId: String, body: SendToDeviceBody) {
+            this.body = body
+        }
+
+        override suspend fun deleteDevice(deviceId: String, params: DeleteDeviceParams) {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        override suspend fun deleteDevices(params: DeleteDevicesParams) {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        override suspend fun updateDeviceInfo(deviceId: String, params: UpdateDeviceInfoBody) {
+            throw java.lang.AssertionError("Should not be called")
+        }
+
+        override suspend fun getKeyChanges(oldToken: String, newToken: String): KeyChangesResponse {
+            throw java.lang.AssertionError("Should not be called")
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/UnRequestedKeysManagerTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/UnRequestedKeysManagerTest.kt
new file mode 100644
index 0000000000..5b41ff6da0
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/UnRequestedKeysManagerTest.kt
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.crypto
+
+import io.mockk.coEvery
+import io.mockk.mockk
+import kotlinx.coroutines.runBlocking
+import org.amshove.kluent.fail
+import org.amshove.kluent.shouldBe
+import org.junit.Test
+import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.ForwardedRoomKeyContent
+import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
+import org.matrix.android.sdk.api.session.crypto.model.UnsignedDeviceInfo
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.content.OlmEventContent
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.internal.crypto.algorithms.megolm.UnRequestedForwardManager
+
+class UnRequestedKeysManagerTest {
+
+    private val aliceMxId = "alice@example.com"
+    private val bobMxId = "bob@example.com"
+    private val bobDeviceId = "MKRJDSLYGA"
+
+    private val device1Id = "MGDAADVDMG"
+
+    private val aliceFirstDevice = CryptoDeviceInfo(
+            deviceId = device1Id,
+            userId = aliceMxId,
+            algorithms = MXCryptoAlgorithms.supportedAlgorithms(),
+            keys = mapOf(
+                    "curve25519:$device1Id" to "yDa6cWOZ/WGBqm/JMUfTUCdEbAIzKHhuIcdDbnPEhDU",
+                    "ed25519:$device1Id" to "XTge+TDwfm+WW10IGnaqEyLTSukPPzg3R1J1YvO1SBI",
+            ),
+            signatures = mapOf(
+                    aliceMxId to mapOf(
+                            "ed25519:$device1Id"
+                                    to "bPOAqM40+QSMgeEzUbYbPSZZccDDMUG00lCNdSXCoaS1gKKBGkSEaHO1OcibISIabjLYzmhp9mgtivz32fbABQ",
+                            "ed25519:Ru4ni66dbQ6FZgUoHyyBtmjKecOHMvMSsSBZ2SABtt0"
+                                    to "owzUsQ4Pvn35uEIc5FdVnXVRPzsVYBV8uJRUSqr4y8r5tp0DvrMArtJukKETgYEAivcZMT1lwNihHIN9xh06DA"
+                    )
+            ),
+            unsigned = UnsignedDeviceInfo(deviceDisplayName = "Element Web"),
+            trustLevel = DeviceTrustLevel(crossSigningVerified = true, locallyVerified = true)
+    )
+
+    private val aBobDevice = CryptoDeviceInfo(
+            deviceId = bobDeviceId,
+            userId = bobMxId,
+            algorithms = MXCryptoAlgorithms.supportedAlgorithms(),
+            keys = mapOf(
+                    "curve25519:$bobDeviceId" to "tWwg63Yfn//61Ylhir6z4QGejvo193E6MVHmURtYVn0",
+                    "ed25519:$bobDeviceId" to "pS5NJ1LiVksQFX+p58NlphqMxE705laRVtUtZpYIAfs",
+            ),
+            signatures = mapOf(
+                    bobMxId to mapOf(
+                            "ed25519:$bobDeviceId" to "zAJqsmOSzkx8EWXcrynCsWtbgWZifN7A6DLyEBs+ZPPLnNuPN5Jwzc1Rg+oZWZaRPvOPcSL0cgcxRegSBU0NBA",
+                    )
+            ),
+            unsigned = UnsignedDeviceInfo(deviceDisplayName = "Element Ios")
+    )
+
+    @Test
+    fun `test process key request if invite received`() {
+        val fakeDeviceListManager = mockk<DeviceListManager> {
+            coEvery { downloadKeys(any(), any()) } returns MXUsersDevicesMap<CryptoDeviceInfo>().apply {
+                setObject(bobMxId, bobDeviceId, aBobDevice)
+            }
+        }
+        val unrequestedForwardManager = UnRequestedForwardManager(fakeDeviceListManager)
+
+        val roomId = "someRoomId"
+
+        unrequestedForwardManager.onUnRequestedKeyForward(
+                roomId,
+                createFakeSuccessfullyDecryptedForwardToDevice(
+                        aBobDevice,
+                        aliceFirstDevice,
+                        aBobDevice,
+                        megolmSessionId = "megolmId1"
+                ),
+                1_000
+        )
+
+        unrequestedForwardManager.onUnRequestedKeyForward(
+                roomId,
+                createFakeSuccessfullyDecryptedForwardToDevice(
+                        aBobDevice,
+                        aliceFirstDevice,
+                        aBobDevice,
+                        megolmSessionId = "megolmId2"
+                ),
+                1_000
+        )
+        // for now no reason to accept
+        runBlocking {
+            unrequestedForwardManager.postSyncProcessParkedKeysIfNeeded(1000) {
+                fail("There should be no key to process")
+            }
+        }
+
+        // ACT
+        // suppose an invite is received but from another user
+        val inviteTime = 1_000L
+        unrequestedForwardManager.onInviteReceived(roomId, "@jhon:example.com", inviteTime)
+
+        // we shouldn't process the requests!
+//        runBlocking {
+            unrequestedForwardManager.postSyncProcessParkedKeysIfNeeded(inviteTime) {
+                fail("There should be no key to process")
+            }
+//        }
+
+        // ACT
+        // suppose an invite is received from correct user
+
+        unrequestedForwardManager.onInviteReceived(roomId, aBobDevice.userId, inviteTime)
+        runBlocking {
+            unrequestedForwardManager.postSyncProcessParkedKeysIfNeeded(inviteTime) {
+                it.size shouldBe 2
+            }
+        }
+    }
+
+    @Test
+    fun `test invite before keys`() {
+        val fakeDeviceListManager = mockk<DeviceListManager> {
+            coEvery { downloadKeys(any(), any()) } returns MXUsersDevicesMap<CryptoDeviceInfo>().apply {
+                setObject(bobMxId, bobDeviceId, aBobDevice)
+            }
+        }
+        val unrequestedForwardManager = UnRequestedForwardManager(fakeDeviceListManager)
+
+        val roomId = "someRoomId"
+
+        unrequestedForwardManager.onInviteReceived(roomId, aBobDevice.userId, 1_000)
+
+        unrequestedForwardManager.onUnRequestedKeyForward(
+                roomId,
+                createFakeSuccessfullyDecryptedForwardToDevice(
+                        aBobDevice,
+                        aliceFirstDevice,
+                        aBobDevice,
+                        megolmSessionId = "megolmId1"
+                ),
+                1_000
+        )
+
+        runBlocking {
+            unrequestedForwardManager.postSyncProcessParkedKeysIfNeeded(1000) {
+                it.size shouldBe 1
+            }
+        }
+    }
+
+    @Test
+    fun `test validity window`() {
+        val fakeDeviceListManager = mockk<DeviceListManager> {
+            coEvery { downloadKeys(any(), any()) } returns MXUsersDevicesMap<CryptoDeviceInfo>().apply {
+                setObject(bobMxId, bobDeviceId, aBobDevice)
+            }
+        }
+        val unrequestedForwardManager = UnRequestedForwardManager(fakeDeviceListManager)
+
+        val roomId = "someRoomId"
+
+        val timeOfKeyReception = 1_000L
+
+        unrequestedForwardManager.onUnRequestedKeyForward(
+                roomId,
+                createFakeSuccessfullyDecryptedForwardToDevice(
+                        aBobDevice,
+                        aliceFirstDevice,
+                        aBobDevice,
+                        megolmSessionId = "megolmId1"
+                ),
+                timeOfKeyReception
+        )
+
+        val currentTimeWindow = 10 * 60_000
+
+        // simulate very late invite
+        val inviteTime = timeOfKeyReception + currentTimeWindow + 1_000
+        unrequestedForwardManager.onInviteReceived(roomId, aBobDevice.userId, inviteTime)
+
+        runBlocking {
+            unrequestedForwardManager.postSyncProcessParkedKeysIfNeeded(inviteTime) {
+                fail("There should be no key to process")
+            }
+        }
+    }
+
+    private fun createFakeSuccessfullyDecryptedForwardToDevice(
+            sentBy: CryptoDeviceInfo,
+            dest: CryptoDeviceInfo,
+            sessionInitiator: CryptoDeviceInfo,
+            algorithm: String = MXCRYPTO_ALGORITHM_MEGOLM,
+            roomId: String = "!zzgDlIhbWOevcdFBXr:example.com",
+            megolmSessionId: String = "Z/FSE8wDYheouGjGP9pezC4S1i39RtAXM3q9VXrBVZw"
+    ): Event {
+        return Event(
+                type = EventType.ENCRYPTED,
+                eventId = "!fake",
+                senderId = sentBy.userId,
+                content = OlmEventContent(
+                        ciphertext = mapOf(
+                                dest.identityKey()!! to mapOf(
+                                        "type" to 0,
+                                        "body" to "AwogcziNF/tv60X0elsBmnKPN3+LTXr4K3vXw+1ZJ6jpTxESIJCmMMDvOA+"
+                                )
+                        ),
+                        senderKey = sentBy.identityKey()
+                ).toContent(),
+
+                ).apply {
+            mxDecryptionResult = OlmDecryptionResult(
+                    payload = mapOf(
+                            "type" to EventType.FORWARDED_ROOM_KEY,
+                            "content" to ForwardedRoomKeyContent(
+                                    algorithm = algorithm,
+                                    roomId = roomId,
+                                    senderKey = sessionInitiator.identityKey(),
+                                    sessionId = megolmSessionId,
+                                    sessionKey = "AQAAAAAc4dK+lXxXyaFbckSxwjIEoIGDLKYovONJ7viWpwevhfvoBh+Q..."
+                            ).toContent()
+                    ),
+                    senderKey = sentBy.identityKey()
+            )
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/MyDeviceLastSeenInfoEntityMapperTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/MyDeviceLastSeenInfoEntityMapperTest.kt
new file mode 100644
index 0000000000..8515427e8e
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/MyDeviceLastSeenInfoEntityMapperTest.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.crypto.store.db.mapper
+
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
+
+private const val A_DEVICE_ID = "device-id"
+private const val AN_IP_ADDRESS = "ip-address"
+private const val A_TIMESTAMP = 123L
+private const val A_DISPLAY_NAME = "display-name"
+private const val A_USER_AGENT = "user-agent"
+
+class MyDeviceLastSeenInfoEntityMapperTest {
+
+    private val myDeviceLastSeenInfoEntityMapper = MyDeviceLastSeenInfoEntityMapper()
+
+    @Test
+    fun `given an entity when mapping to model then all fields are correctly mapped`() {
+        // Given
+        val entity = MyDeviceLastSeenInfoEntity(
+                deviceId = A_DEVICE_ID,
+                lastSeenIp = AN_IP_ADDRESS,
+                lastSeenTs = A_TIMESTAMP,
+                displayName = A_DISPLAY_NAME,
+                lastSeenUserAgent = A_USER_AGENT,
+        )
+        val expectedDeviceInfo = DeviceInfo(
+                deviceId = A_DEVICE_ID,
+                lastSeenIp = AN_IP_ADDRESS,
+                lastSeenTs = A_TIMESTAMP,
+                displayName = A_DISPLAY_NAME,
+                unstableLastSeenUserAgent = A_USER_AGENT,
+        )
+
+        // When
+        val deviceInfo = myDeviceLastSeenInfoEntityMapper.map(entity)
+
+        // Then
+        deviceInfo shouldBeEqualTo expectedDeviceInfo
+    }
+
+    @Test
+    fun `given a device info when mapping to entity then all fields are correctly mapped`() {
+        // Given
+        val deviceInfo = DeviceInfo(
+                deviceId = A_DEVICE_ID,
+                lastSeenIp = AN_IP_ADDRESS,
+                lastSeenTs = A_TIMESTAMP,
+                displayName = A_DISPLAY_NAME,
+                unstableLastSeenUserAgent = A_USER_AGENT,
+        )
+        val expectedEntity = MyDeviceLastSeenInfoEntity(
+                deviceId = A_DEVICE_ID,
+                lastSeenIp = AN_IP_ADDRESS,
+                lastSeenTs = A_TIMESTAMP,
+                displayName = A_DISPLAY_NAME,
+                lastSeenUserAgent = A_USER_AGENT
+        )
+
+        // When
+        val entity = myDeviceLastSeenInfoEntityMapper.map(deviceInfo)
+
+        // Then
+        entity.deviceId shouldBeEqualTo expectedEntity.deviceId
+        entity.lastSeenIp shouldBeEqualTo expectedEntity.lastSeenIp
+        entity.lastSeenTs shouldBeEqualTo expectedEntity.lastSeenTs
+        entity.displayName shouldBeEqualTo expectedEntity.displayName
+        entity.lastSeenUserAgent shouldBeEqualTo expectedEntity.lastSeenUserAgent
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/database/mapper/EditAggregatedSummaryEntityMapperTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/database/mapper/EditAggregatedSummaryEntityMapperTest.kt
new file mode 100644
index 0000000000..7ad5bb40e3
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/database/mapper/EditAggregatedSummaryEntityMapperTest.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.mapper
+
+import io.mockk.every
+import io.mockk.mockk
+import io.realm.RealmList
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldNotBe
+import org.junit.Test
+import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EditionOfEvent
+import org.matrix.android.sdk.internal.database.model.EventEntity
+
+class EditAggregatedSummaryEntityMapperTest {
+
+    @Test
+    fun `test mapping summary entity to model`() {
+        val edits = RealmList<EditionOfEvent>(
+                EditionOfEvent(
+                        timestamp = 0L,
+                        eventId = "e0",
+                        isLocalEcho = false,
+                        event = mockEvent("e0")
+                ),
+                EditionOfEvent(
+                        timestamp = 1L,
+                        eventId = "e1",
+                        isLocalEcho = false,
+                        event = mockEvent("e1")
+                ),
+                EditionOfEvent(
+                        timestamp = 30L,
+                        eventId = "e2",
+                        isLocalEcho = true,
+                        event = mockEvent("e2")
+                )
+        )
+        val fakeSummaryEntity = mockk<EditAggregatedSummaryEntity> {
+            every { editions } returns edits
+        }
+
+        val mapped = EditAggregatedSummaryEntityMapper.map(fakeSummaryEntity)
+        mapped shouldNotBe null
+        mapped!!.sourceEvents.size shouldBeEqualTo 2
+        mapped.localEchos.size shouldBeEqualTo 1
+        mapped.localEchos.first() shouldBeEqualTo "e2"
+
+        mapped.lastEditTs shouldBeEqualTo 30L
+        mapped.latestEdit?.eventId shouldBeEqualTo "e2"
+    }
+
+    @Test
+    fun `event with lexicographically largest event_id is treated as more recent`() {
+        val lowerId = "\$Albatross"
+        val higherId = "\$Zebra"
+
+        (higherId > lowerId) shouldBeEqualTo true
+        val timestamp = 1669288766745L
+        val edits = RealmList<EditionOfEvent>(
+                EditionOfEvent(
+                        timestamp = timestamp,
+                        eventId = lowerId,
+                        isLocalEcho = false,
+                        event = mockEvent(lowerId)
+                ),
+                EditionOfEvent(
+                        timestamp = timestamp,
+                        eventId = higherId,
+                        isLocalEcho = false,
+                        event = mockEvent(higherId)
+                ),
+                EditionOfEvent(
+                        timestamp = 1L,
+                        eventId = "e2",
+                        isLocalEcho = true,
+                        event = mockEvent("e2")
+                )
+        )
+
+        val fakeSummaryEntity = mockk<EditAggregatedSummaryEntity> {
+            every { editions } returns edits
+        }
+        val mapped = EditAggregatedSummaryEntityMapper.map(fakeSummaryEntity)
+        mapped!!.lastEditTs shouldBeEqualTo timestamp
+        mapped.latestEdit?.eventId shouldBeEqualTo higherId
+    }
+
+    private fun mockEvent(eventId: String): EventEntity {
+        return EventEntity().apply {
+            this.eventId = eventId
+            this.content = """
+                {
+                    "body" : "Hello",
+                    "msgtype": "text"
+                }
+            """.trimIndent()
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/database/mapper/PushersMapperTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/database/mapper/PushersMapperTest.kt
new file mode 100644
index 0000000000..08ed20a766
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/database/mapper/PushersMapperTest.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.database.mapper
+
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.test.fixtures.JsonPusherFixture.aJsonPusher
+import org.matrix.android.sdk.test.fixtures.PusherEntityFixture.aPusherEntity
+
+class PushersMapperTest {
+
+    @Test
+    fun `when mapping PusherEntity, then it is mapped into Pusher successfully`() {
+        val pusherEntity = aPusherEntity()
+
+        val mappedPusher = PushersMapper.map(pusherEntity)
+
+        mappedPusher.pushKey shouldBeEqualTo pusherEntity.pushKey
+        mappedPusher.kind shouldBeEqualTo pusherEntity.kind.orEmpty()
+        mappedPusher.appId shouldBeEqualTo pusherEntity.appId
+        mappedPusher.appDisplayName shouldBeEqualTo pusherEntity.appDisplayName
+        mappedPusher.deviceDisplayName shouldBeEqualTo pusherEntity.deviceDisplayName
+        mappedPusher.profileTag shouldBeEqualTo pusherEntity.profileTag
+        mappedPusher.lang shouldBeEqualTo pusherEntity.lang
+        mappedPusher.data.url shouldBeEqualTo pusherEntity.data?.url
+        mappedPusher.data.format shouldBeEqualTo pusherEntity.data?.format
+        mappedPusher.enabled shouldBeEqualTo pusherEntity.enabled
+        mappedPusher.deviceId shouldBeEqualTo pusherEntity.deviceId
+        mappedPusher.state shouldBeEqualTo pusherEntity.state
+    }
+
+    @Test
+    fun `when mapping JsonPusher, then it is mapped into Pusher successfully`() {
+        val jsonPusher = aJsonPusher()
+
+        val mappedPusherEntity = PushersMapper.map(jsonPusher)
+
+        mappedPusherEntity.pushKey shouldBeEqualTo jsonPusher.pushKey
+        mappedPusherEntity.kind shouldBeEqualTo jsonPusher.kind
+        mappedPusherEntity.appId shouldBeEqualTo jsonPusher.appId
+        mappedPusherEntity.appDisplayName shouldBeEqualTo jsonPusher.appDisplayName
+        mappedPusherEntity.deviceDisplayName shouldBeEqualTo jsonPusher.deviceDisplayName
+        mappedPusherEntity.profileTag shouldBeEqualTo jsonPusher.profileTag
+        mappedPusherEntity.lang shouldBeEqualTo jsonPusher.lang
+        mappedPusherEntity.data?.url shouldBeEqualTo jsonPusher.data?.url
+        mappedPusherEntity.data?.format shouldBeEqualTo jsonPusher.data?.format
+        mappedPusherEntity.enabled shouldBeEqualTo jsonPusher.enabled
+        mappedPusherEntity.deviceId shouldBeEqualTo jsonPusher.deviceId
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/network/ComputeUserAgentUseCaseTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/network/ComputeUserAgentUseCaseTest.kt
new file mode 100644
index 0000000000..2170371cde
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/network/ComputeUserAgentUseCaseTest.kt
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.network
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.os.Build
+import io.mockk.every
+import io.mockk.mockk
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.util.getApplicationInfoCompat
+import org.matrix.android.sdk.api.util.getPackageInfoCompat
+import java.lang.Exception
+
+private const val A_PACKAGE_NAME = "org.matrix.sdk"
+private const val AN_APP_NAME = "Element"
+private const val A_NON_ASCII_APP_NAME = "Élement"
+private const val AN_APP_VERSION = "1.5.1"
+private const val A_FLAVOUR = "GooglePlay"
+
+class ComputeUserAgentUseCaseTest {
+
+    private val context = mockk<Context>()
+    private val packageManager = mockk<PackageManager>()
+    private val applicationInfo = mockk<ApplicationInfo>()
+    private val packageInfo = mockk<PackageInfo>()
+
+    private val computeUserAgentUseCase = ComputeUserAgentUseCase(context)
+
+    @Before
+    fun setUp() {
+        every { context.applicationContext } returns context
+        every { context.packageName } returns A_PACKAGE_NAME
+        every { context.packageManager } returns packageManager
+        every { packageManager.getApplicationInfoCompat(any(), any()) } returns applicationInfo
+        every { packageManager.getPackageInfoCompat(any(), any()) } returns packageInfo
+    }
+
+    @Test
+    fun `given a non-null app name and app version when computing user agent then returns expected user agent`() {
+        // Given
+        givenAppName(AN_APP_NAME)
+        givenAppVersion(AN_APP_VERSION)
+
+        // When
+        val result = computeUserAgentUseCase.execute(A_FLAVOUR)
+
+        // Then
+        val expectedUserAgent = constructExpectedUserAgent(AN_APP_NAME, AN_APP_VERSION)
+        result shouldBeEqualTo expectedUserAgent
+    }
+
+    @Test
+    fun `given a null app name when computing user agent then returns user agent with package name instead of app name`() {
+        // Given
+        givenAppName(null)
+        givenAppVersion(AN_APP_VERSION)
+
+        // When
+        val result = computeUserAgentUseCase.execute(A_FLAVOUR)
+
+        // Then
+        val expectedUserAgent = constructExpectedUserAgent(A_PACKAGE_NAME, AN_APP_VERSION)
+        result shouldBeEqualTo expectedUserAgent
+    }
+
+    @Test
+    fun `given a non-ascii app name when computing user agent then returns user agent with package name instead of app name`() {
+        // Given
+        givenAppName(A_NON_ASCII_APP_NAME)
+        givenAppVersion(AN_APP_VERSION)
+
+        // When
+        val result = computeUserAgentUseCase.execute(A_FLAVOUR)
+
+        // Then
+        val expectedUserAgent = constructExpectedUserAgent(A_PACKAGE_NAME, AN_APP_VERSION)
+        result shouldBeEqualTo expectedUserAgent
+    }
+
+    @Test
+    fun `given a null app version when computing user agent then returns user agent with a fallback app version`() {
+        // Given
+        givenAppName(AN_APP_NAME)
+        givenAppVersion(null)
+
+        // When
+        val result = computeUserAgentUseCase.execute(A_FLAVOUR)
+
+        // Then
+        val expectedUserAgent = constructExpectedUserAgent(AN_APP_NAME, ComputeUserAgentUseCase.FALLBACK_APP_VERSION)
+        result shouldBeEqualTo expectedUserAgent
+    }
+
+    private fun constructExpectedUserAgent(appName: String, appVersion: String): String {
+        return buildString {
+            append(appName)
+            append("/")
+            append(appVersion)
+            append(" (")
+            append(Build.MANUFACTURER)
+            append(" ")
+            append(Build.MODEL)
+            append("; ")
+            append("Android ")
+            append(Build.VERSION.RELEASE)
+            append("; ")
+            append(Build.DISPLAY)
+            append("; ")
+            append("Flavour ")
+            append(A_FLAVOUR)
+            append("; ")
+            append("MatrixAndroidSdk2 ")
+            append(BuildConfig.SDK_VERSION)
+            append(")")
+        }
+    }
+
+    private fun givenAppName(deviceName: String?) {
+        if (deviceName == null) {
+            every { packageManager.getApplicationLabel(any()) } throws Exception("Cannot retrieve application name")
+        } else if (!deviceName.matches("\\A\\p{ASCII}*\\z".toRegex())) {
+            every { packageManager.getApplicationLabel(any()) } returns A_PACKAGE_NAME
+        } else {
+            every { packageManager.getApplicationLabel(any()) } returns deviceName
+        }
+    }
+
+    private fun givenAppVersion(appVersion: String?) {
+        packageInfo.versionName = appVersion
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/event/ValidDecryptedEventTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/event/ValidDecryptedEventTest.kt
new file mode 100644
index 0000000000..5fda242b90
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/event/ValidDecryptedEventTest.kt
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.event
+
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldNotBe
+import org.junit.Test
+import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.events.model.toValidDecryptedEvent
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+
+class ValidDecryptedEventTest {
+
+    private val fakeEvent = Event(
+            type = EventType.ENCRYPTED,
+            eventId = "\$eventId",
+            roomId = "!fakeRoom",
+            content = EncryptedEventContent(
+                    algorithm = MXCRYPTO_ALGORITHM_MEGOLM,
+                    ciphertext = "AwgBEpACQEKOkd4Gp0+gSXG4M+btcrnPgsF23xs/lUmS2I4YjmqF...",
+                    sessionId = "TO2G4u2HlnhtbIJk",
+                    senderKey = "5e3EIqg3JfooZnLQ2qHIcBarbassQ4qXblai0",
+                    deviceId = "FAKEE"
+            ).toContent()
+    )
+
+    @Test
+    fun `A failed to decrypt message should give a null validated decrypted event`() {
+        fakeEvent.toValidDecryptedEvent() shouldBe null
+    }
+
+    @Test
+    fun `Mismatch sender key detection`() {
+        val decryptedEvent = fakeEvent
+                .apply {
+                    mxDecryptionResult = OlmDecryptionResult(
+                            payload = mapOf(
+                                    "type" to EventType.MESSAGE,
+                                    "content" to mapOf(
+                                            "body" to "some message",
+                                            "msgtype" to "m.text"
+                                    ),
+                            ),
+                            senderKey = "the_real_sender_key",
+                    )
+                }
+
+        val validDecryptedEvent = decryptedEvent.toValidDecryptedEvent()
+        validDecryptedEvent shouldNotBe null
+
+        fakeEvent.content!!["senderKey"] shouldNotBe "the_real_sender_key"
+        validDecryptedEvent!!.cryptoSenderKey shouldBe "the_real_sender_key"
+    }
+
+    @Test
+    fun `Mixed content event should be detected`() {
+        val mixedEvent = Event(
+                type = EventType.ENCRYPTED,
+                eventId = "\$eventd ",
+                roomId = "!fakeRoo",
+                content = mapOf(
+                        "algorithm" to "m.megolm.v1.aes-sha2",
+                        "ciphertext" to "AwgBEpACQEKOkd4Gp0+gSXG4M+btcrnPgsF23xs/lUmS2I4YjmqF...",
+                        "sessionId" to "TO2G4u2HlnhtbIJk",
+                        "senderKey" to "5e3EIqg3JfooZnLQ2qHIcBarbassQ4qXblai0",
+                        "deviceId" to "FAKEE",
+                        "body" to "some message",
+                        "msgtype" to "m.text"
+                ).toContent()
+        )
+
+        val unValidatedContent = mixedEvent.getClearContent().toModel<MessageTextContent>()
+        unValidatedContent?.body shouldBe "some message"
+
+        mixedEvent.toValidDecryptedEvent()?.clearContent?.toModel<MessageTextContent>() shouldBe null
+    }
+
+    @Test
+    fun `Basic field validation`() {
+        val decryptedEvent = fakeEvent
+                .apply {
+                    mxDecryptionResult = OlmDecryptionResult(
+                            payload = mapOf(
+                                    "type" to EventType.MESSAGE,
+                                    "content" to mapOf(
+                                            "body" to "some message",
+                                            "msgtype" to "m.text"
+                                    ),
+                            ),
+                            senderKey = "the_real_sender_key",
+                    )
+                }
+
+        decryptedEvent.toValidDecryptedEvent() shouldNotBe null
+        decryptedEvent.copy(roomId = null).toValidDecryptedEvent() shouldBe null
+        decryptedEvent.copy(eventId = null).toValidDecryptedEvent() shouldBe null
+    }
+
+    @Test
+    fun `A clear event is not a valid decrypted event`() {
+        val mockTextEvent = Event(
+                type = EventType.MESSAGE,
+                eventId = "eventId",
+                roomId = "!fooe:example.com",
+                content = mapOf(
+                        "body" to "some message",
+                        "msgtype" to "m.text"
+                ),
+                originServerTs = 1000,
+                senderId = "@anne:example.com",
+        )
+        mockTextEvent.toValidDecryptedEvent() shouldBe null
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultAddPusherTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultAddPusherTaskTest.kt
index dac33069f3..a971973f56 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultAddPusherTaskTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultAddPusherTaskTest.kt
@@ -71,7 +71,7 @@ class DefaultAddPusherTaskTest {
     }
 
     @Test
-    fun `given a persisted pusher when adding Pusher then updates api and mutates persisted result with Registered state`() {
+    fun `given a persisted pusher, when adding Pusher, then updates api and mutates persisted result with Registered state`() {
         val realmResult = PusherEntity(appDisplayName = null)
         monarchy.givenWhereReturns(result = realmResult)
                 .givenEqualTo(PusherEntityFields.PUSH_KEY, A_JSON_PUSHER.pushKey)
@@ -85,7 +85,7 @@ class DefaultAddPusherTaskTest {
     }
 
     @Test
-    fun `given a persisted push entity and SetPush API fails when adding Pusher then mutates persisted result with Failed registration state and rethrows`() {
+    fun `given a persisted push entity and SetPush API fails, when adding Pusher, then mutates persisted result with Failed registration state and rethrows`() {
         val realmResult = PusherEntity()
         monarchy.givenWhereReturns(result = realmResult)
                 .givenEqualTo(PusherEntityFields.PUSH_KEY, A_JSON_PUSHER.pushKey)
@@ -99,7 +99,7 @@ class DefaultAddPusherTaskTest {
     }
 
     @Test
-    fun `given no persisted push entity and SetPush API fails when adding Pusher then rethrows error`() {
+    fun `given no persisted push entity and SetPush API fails, when adding Pusher, then rethrows error`() {
         monarchy.givenWhereReturns<PusherEntity>(result = null)
                 .givenEqualTo(PusherEntityFields.PUSH_KEY, A_JSON_PUSHER.pushKey)
         pushersAPI.givenSetPusherErrors(SocketException())
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersServiceTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersServiceTest.kt
new file mode 100644
index 0000000000..a00ac3a17d
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersServiceTest.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.pushers
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.android.sdk.test.fakes.FakeAddPusherTask
+import org.matrix.android.sdk.test.fakes.FakeGetPushersTask
+import org.matrix.android.sdk.test.fakes.FakeMonarchy
+import org.matrix.android.sdk.test.fakes.FakeRemovePusherTask
+import org.matrix.android.sdk.test.fakes.FakeTaskExecutor
+import org.matrix.android.sdk.test.fakes.FakeTogglePusherTask
+import org.matrix.android.sdk.test.fakes.FakeWorkManagerProvider
+import org.matrix.android.sdk.test.fakes.internal.FakePushGatewayNotifyTask
+import org.matrix.android.sdk.test.fixtures.PusherFixture
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultPushersServiceTest {
+
+    private val workManagerProvider = FakeWorkManagerProvider()
+    private val monarchy = FakeMonarchy()
+    private val sessionId = ""
+    private val getPushersTask = FakeGetPushersTask()
+    private val pushGatewayNotifyTask = FakePushGatewayNotifyTask()
+    private val addPusherTask = FakeAddPusherTask()
+    private val togglePusherTask = FakeTogglePusherTask()
+    private val removePusherTask = FakeRemovePusherTask()
+    private val taskExecutor = FakeTaskExecutor()
+
+    private val pushersService = DefaultPushersService(
+            workManagerProvider.instance,
+            monarchy.instance,
+            sessionId,
+            getPushersTask,
+            pushGatewayNotifyTask,
+            addPusherTask,
+            togglePusherTask,
+            removePusherTask,
+            taskExecutor.instance,
+    )
+
+    @Test
+    fun `when togglePusher, then execute task`() = runTest {
+        val pusher = PusherFixture.aPusher()
+        val enable = true
+
+        pushersService.togglePusher(pusher, enable)
+
+        togglePusherTask.verifyExecution(pusher, enable)
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultTogglePusherTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultTogglePusherTaskTest.kt
new file mode 100644
index 0000000000..3c54f6f1e1
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultTogglePusherTaskTest.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.pushers
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.internal.database.model.PusherEntity
+import org.matrix.android.sdk.internal.database.model.PusherEntityFields
+import org.matrix.android.sdk.test.fakes.FakeGlobalErrorReceiver
+import org.matrix.android.sdk.test.fakes.FakeMonarchy
+import org.matrix.android.sdk.test.fakes.FakePushersAPI
+import org.matrix.android.sdk.test.fakes.FakeRequestExecutor
+import org.matrix.android.sdk.test.fakes.givenEqualTo
+import org.matrix.android.sdk.test.fakes.givenFindFirst
+import org.matrix.android.sdk.test.fixtures.JsonPusherFixture.aJsonPusher
+import org.matrix.android.sdk.test.fixtures.PusherEntityFixture.aPusherEntity
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultTogglePusherTaskTest {
+
+    private val pushersAPI = FakePushersAPI()
+    private val monarchy = FakeMonarchy()
+    private val requestExecutor = FakeRequestExecutor()
+    private val globalErrorReceiver = FakeGlobalErrorReceiver()
+
+    private val togglePusherTask = DefaultTogglePusherTask(pushersAPI, monarchy.instance, requestExecutor, globalErrorReceiver)
+
+    @Test
+    fun `execution toggles enable on both local and remote`() = runTest {
+        val jsonPusher = aJsonPusher(enabled = false)
+        val params = TogglePusherTask.Params(aJsonPusher(), true)
+
+        val pusherEntity = aPusherEntity(enabled = false)
+        monarchy.givenWhere<PusherEntity>()
+                .givenEqualTo(PusherEntityFields.PUSH_KEY, jsonPusher.pushKey)
+                .givenFindFirst(pusherEntity)
+
+        togglePusherTask.execute(params)
+
+        val expectedPayload = jsonPusher.copy(enabled = true)
+        pushersAPI.verifySetPusher(expectedPayload)
+        monarchy.verifyInsertOrUpdate<PusherEntity> {
+            withArg { actual ->
+                actual.enabled shouldBeEqualTo true
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/EventEditValidatorTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/EventEditValidatorTest.kt
new file mode 100644
index 0000000000..0ae712bff1
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/EventEditValidatorTest.kt
@@ -0,0 +1,372 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room
+
+import io.mockk.every
+import io.mockk.mockk
+import org.amshove.kluent.shouldBeInstanceOf
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+
+class EventEditValidatorTest {
+
+    private val mockTextEvent = Event(
+            type = EventType.MESSAGE,
+            eventId = "\$WX8WlNC2reiXrwHIA_CQHmU_pSR-jhOA2xKPRcJN9wQ",
+            roomId = "!GXKhWsRwiWWvbQDBpe:example.com",
+            content = mapOf(
+                    "body" to "some message",
+                    "msgtype" to "m.text"
+            ),
+            originServerTs = 1000,
+            senderId = "@alice:example.com",
+    )
+
+    private val mockEdit = Event(
+            type = EventType.MESSAGE,
+            eventId = "\$-SF7RWLPzRzCbHqK3ZAhIrX5Auh3B2lS5AqJiypt1p0",
+            roomId = "!GXKhWsRwiWWvbQDBpe:example.com",
+            content = mapOf(
+                    "body" to "* some message edited",
+                    "msgtype" to "m.text",
+                    "m.new_content" to mapOf(
+                            "body" to "some message edited",
+                            "msgtype" to "m.text"
+                    ),
+                    "m.relates_to" to mapOf(
+                            "rel_type" to "m.replace",
+                            "event_id" to mockTextEvent.eventId
+                    )
+            ),
+            originServerTs = 2000,
+            senderId = "@alice:example.com",
+    )
+
+    @Test
+    fun `edit should be valid`() {
+        val mockCryptoStore = mockk<IMXCryptoStore>()
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(mockTextEvent, mockEdit) shouldBeInstanceOf EventEditValidator.EditValidity.Valid::class
+    }
+
+    @Test
+    fun `original event and replacement event must have the same sender`() {
+        val mockCryptoStore = mockk<IMXCryptoStore>()
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(
+                        mockTextEvent,
+                        mockEdit.copy(senderId = "@bob:example.com")
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+    }
+
+    @Test
+    fun `original event and replacement event must have the same room_id`() {
+        val mockCryptoStore = mockk<IMXCryptoStore>()
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(
+                        mockTextEvent,
+                        mockEdit.copy(roomId = "!someotherroom")
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+
+        validator
+                .validateEdit(
+                        encryptedEvent,
+                        encryptedEditEvent.copy(roomId = "!someotherroom")
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+    }
+
+    @Test
+    fun `replacement and original events must not have a state_key property`() {
+        val mockCryptoStore = mockk<IMXCryptoStore>()
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(
+                        mockTextEvent,
+                        mockEdit.copy(stateKey = "")
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+
+        validator
+                .validateEdit(
+                        mockTextEvent.copy(stateKey = ""),
+                        mockEdit
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+    }
+
+    @Test
+    fun `replacement event must have an new_content property`() {
+        val mockCryptoStore = mockk<IMXCryptoStore> {
+            every { deviceWithIdentityKey("R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo") } returns
+                    mockk<CryptoDeviceInfo> {
+                        every { userId } returns "@alice:example.com"
+                    }
+        }
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(mockTextEvent, mockEdit.copy(
+                        content = mockEdit.content!!.toMutableMap().apply {
+                            this.remove("m.new_content")
+                        }
+                )) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+
+        validator
+                .validateEdit(
+                        encryptedEvent,
+                        encryptedEditEvent.copy().apply {
+                            mxDecryptionResult = encryptedEditEvent.mxDecryptionResult!!.copy(
+                                    payload = mapOf(
+                                            "type" to EventType.MESSAGE,
+                                            "content" to mapOf(
+                                                    "body" to "* some message edited",
+                                                    "msgtype" to "m.text",
+                                                    "m.relates_to" to mapOf(
+                                                            "rel_type" to "m.replace",
+                                                            "event_id" to mockTextEvent.eventId
+                                                    )
+                                            )
+                                    )
+                            )
+                        }
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+    }
+
+    @Test
+    fun `The original event must not itself have a rel_type of m_replace`() {
+        val mockCryptoStore = mockk<IMXCryptoStore> {
+            every { deviceWithIdentityKey("R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo") } returns
+                    mockk<CryptoDeviceInfo> {
+                        every { userId } returns "@alice:example.com"
+                    }
+        }
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(
+                        mockTextEvent.copy(
+                                content = mockTextEvent.content!!.toMutableMap().apply {
+                                    this["m.relates_to"] = mapOf(
+                                            "rel_type" to "m.replace",
+                                            "event_id" to mockTextEvent.eventId
+                                    )
+                                }
+                        ),
+                        mockEdit
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+
+        validator
+                .validateEdit(
+                        encryptedEvent.copy(
+                                content = encryptedEvent.content!!.toMutableMap().apply {
+                                    put(
+                                            "m.relates_to",
+                                            mapOf(
+                                                    "rel_type" to "m.replace",
+                                                    "event_id" to mockTextEvent.eventId
+                                            )
+                                    )
+                                }
+                        ).apply {
+                            mxDecryptionResult = encryptedEditEvent.mxDecryptionResult!!.copy(
+                                    payload = mapOf(
+                                            "type" to EventType.MESSAGE,
+                                            "content" to mapOf(
+                                                    "body" to "some message",
+                                                    "msgtype" to "m.text",
+                                            ),
+                                    )
+                            )
+                        },
+                        encryptedEditEvent
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+    }
+
+    @Test
+    fun `valid e2ee edit`() {
+        val mockCryptoStore = mockk<IMXCryptoStore> {
+            every { deviceWithIdentityKey("R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo") } returns
+                    mockk<CryptoDeviceInfo> {
+                        every { userId } returns "@alice:example.com"
+                    }
+        }
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(
+                        encryptedEvent,
+                        encryptedEditEvent
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Valid::class
+    }
+
+    @Test
+    fun `If the original event was encrypted, the replacement should be too`() {
+        val mockCryptoStore = mockk<IMXCryptoStore> {
+            every { deviceWithIdentityKey("R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo") } returns
+                    mockk<CryptoDeviceInfo> {
+                        every { userId } returns "@alice:example.com"
+                    }
+        }
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(
+                        encryptedEvent,
+                        mockEdit
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+    }
+
+    @Test
+    fun `encrypted, original event and replacement event must have the same sender`() {
+        val mockCryptoStore = mockk<IMXCryptoStore> {
+            every { deviceWithIdentityKey("R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo") } returns
+                    mockk {
+                        every { userId } returns "@alice:example.com"
+                    }
+            every { deviceWithIdentityKey("7V5e/2O93mf4GeW7Mtq4YWcRNpYS9NhQbdJMgdnIPUI") } returns
+                    mockk {
+                        every { userId } returns "@bob:example.com"
+                    }
+        }
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(
+                        encryptedEvent,
+                        encryptedEditEvent.copy().apply {
+                            mxDecryptionResult = encryptedEditEvent.mxDecryptionResult!!.copy(
+                                    senderKey = "7V5e/2O93mf4GeW7Mtq4YWcRNpYS9NhQbdJMgdnIPUI"
+                            )
+                        }
+
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+
+        // if sent fom a deleted device it should use the event claimed sender id
+    }
+
+    @Test
+    fun `encrypted, sent fom a deleted device, original event and replacement event must have the same sender`() {
+        val mockCryptoStore = mockk<IMXCryptoStore> {
+            every { deviceWithIdentityKey("R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo") } returns
+                    mockk {
+                        every { userId } returns "@alice:example.com"
+                    }
+            every { deviceWithIdentityKey("7V5e/2O93mf4GeW7Mtq4YWcRNpYS9NhQbdJMgdnIPUI") } returns
+                    null
+        }
+        val validator = EventEditValidator(mockCryptoStore)
+
+        validator
+                .validateEdit(
+                        encryptedEvent,
+                        encryptedEditEvent.copy().apply {
+                            mxDecryptionResult = encryptedEditEvent.mxDecryptionResult!!.copy(
+                                    senderKey = "7V5e/2O93mf4GeW7Mtq4YWcRNpYS9NhQbdJMgdnIPUI"
+                            )
+                        }
+
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Valid::class
+
+        validator
+                .validateEdit(
+                        encryptedEvent,
+                        encryptedEditEvent.copy(
+                                senderId = "bob@example.com"
+                        ).apply {
+                            mxDecryptionResult = encryptedEditEvent.mxDecryptionResult!!.copy(
+                                    senderKey = "7V5e/2O93mf4GeW7Mtq4YWcRNpYS9NhQbdJMgdnIPUI"
+                            )
+                        }
+
+                ) shouldBeInstanceOf EventEditValidator.EditValidity.Invalid::class
+    }
+
+    private val encryptedEditEvent = Event(
+            type = EventType.ENCRYPTED,
+            eventId = "\$-SF7RWLPzRzCbHqK3ZAhIrX5Auh3B2lS5AqJiypt1p0",
+            roomId = "!GXKhWsRwiWWvbQDBpe:example.com",
+            content = mapOf(
+                    "algorithm" to "m.megolm.v1.aes-sha2",
+                    "sender_key" to "R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo",
+                    "session_id" to "7tOd6xon/R2zJpy2LlSKcKWIek2jvkim0sNdnZZCWMQ",
+                    "device_id" to "QDHBLWOTSN",
+                    "ciphertext" to "AwgXErAC6TgQ4bV6NFldlffTWuUV1gsBYH6JLQMqG...deLfCQOSPunSSNDFdWuDkB8Cg",
+                    "m.relates_to" to mapOf(
+                            "rel_type" to "m.replace",
+                            "event_id" to mockTextEvent.eventId
+                    )
+            ),
+            originServerTs = 2000,
+            senderId = "@alice:example.com",
+    ).apply {
+        mxDecryptionResult = OlmDecryptionResult(
+                payload = mapOf(
+                        "type" to EventType.MESSAGE,
+                        "content" to mapOf(
+                                "body" to "* some message edited",
+                                "msgtype" to "m.text",
+                                "m.new_content" to mapOf(
+                                        "body" to "some message edited",
+                                        "msgtype" to "m.text"
+                                ),
+                                "m.relates_to" to mapOf(
+                                        "rel_type" to "m.replace",
+                                        "event_id" to mockTextEvent.eventId
+                                )
+                        )
+                ),
+                senderKey = "R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo",
+                isSafe = true
+        )
+    }
+
+    private val encryptedEvent = Event(
+            type = EventType.ENCRYPTED,
+            eventId = "\$WX8WlNC2reiXrwHIA_CQHmU_pSR-jhOA2xKPRcJN9wQ",
+            roomId = "!GXKhWsRwiWWvbQDBpe:example.com",
+            content = mapOf(
+                    "algorithm" to "m.megolm.v1.aes-sha2",
+                    "sender_key" to "R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo",
+                    "session_id" to "7tOd6xon/R2zJpy2LlSKcKWIek2jvkim0sNdnZZCWMQ",
+                    "device_id" to "QDHBLWOTSN",
+                    "ciphertext" to "AwgXErAC6TgQ4bV6NFldlffTWuUV1gsBYH6JLQMqG+4Vr...Yf0gYyhVWZY4SedF3fTMwkjmTuel4fwrmq",
+            ),
+            originServerTs = 2000,
+            senderId = "@alice:example.com",
+    ).apply {
+        mxDecryptionResult = OlmDecryptionResult(
+                payload = mapOf(
+                        "type" to EventType.MESSAGE,
+                        "content" to mapOf(
+                                "body" to "some message",
+                                "msgtype" to "m.text"
+                        ),
+                ),
+                senderKey = "R0s/7Aindgg/RNWqUGJyJOXtCz5H7Gx7fInFuroq1xo",
+                isSafe = true
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/PollAggregationProcessorTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessorTest.kt
similarity index 79%
rename from matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/PollAggregationProcessorTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessorTest.kt
index 3044ca5d43..0888d82907 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/PollAggregationProcessorTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessorTest.kt
@@ -16,9 +16,13 @@
 
 package org.matrix.android.sdk.internal.session.room.aggregation.poll
 
+import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.mockk
 import io.realm.RealmList
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
 import org.amshove.kluent.shouldBeFalse
 import org.amshove.kluent.shouldBeTrue
 import org.junit.Before
@@ -34,6 +38,7 @@ import org.matrix.android.sdk.internal.database.model.PollResponseAggregatedSumm
 import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.AN_EVENT_ID
 import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.AN_INVALID_POLL_RESPONSE_EVENT
 import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.A_BROKEN_POLL_REPLACE_EVENT
+import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.A_POLL_END_CONTENT
 import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.A_POLL_END_EVENT
 import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.A_POLL_REFERENCE_EVENT
 import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.A_POLL_REPLACE_EVENT
@@ -43,13 +48,22 @@ import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsT
 import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.A_ROOM_ID
 import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.A_TIMELINE_EVENT
 import org.matrix.android.sdk.internal.session.room.aggregation.poll.PollEventsTestData.A_USER_ID_1
+import org.matrix.android.sdk.internal.session.room.relation.poll.FetchPollResponseEventsTask
+import org.matrix.android.sdk.test.fakes.FakeFetchPollResponseEventsTask
 import org.matrix.android.sdk.test.fakes.FakeRealm
+import org.matrix.android.sdk.test.fakes.FakeTaskExecutor
 import org.matrix.android.sdk.test.fakes.givenEqualTo
 import org.matrix.android.sdk.test.fakes.givenFindFirst
 
-class PollAggregationProcessorTest {
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultPollAggregationProcessorTest {
 
-    private val pollAggregationProcessor: PollAggregationProcessor = DefaultPollAggregationProcessor()
+    private val fakeTaskExecutor = FakeTaskExecutor()
+    private val fakeFetchPollResponseEventsTask = FakeFetchPollResponseEventsTask()
+    private val pollAggregationProcessor: PollAggregationProcessor = DefaultPollAggregationProcessor(
+            taskExecutor = fakeTaskExecutor.instance,
+            fetchPollResponseEventsTask = fakeFetchPollResponseEventsTask
+    )
     private val realm = FakeRealm()
     private val session = mockk<Session>()
 
@@ -114,16 +128,28 @@ class PollAggregationProcessorTest {
     }
 
     @Test
-    fun `given a poll end event, when processing, then is processed and return true`() {
+    fun `given a poll end event, when processing, then is processed and return true`() = runTest {
+        // Given
         every { realm.instance.createObject(PollResponseAggregatedSummaryEntity::class.java) } returns PollResponseAggregatedSummaryEntity()
+        every { fakeTaskExecutor.instance.executorScope } returns this
+
+        // When
         val powerLevelsHelper = mockRedactionPowerLevels(A_USER_ID_1, true)
+
+        // Then
         pollAggregationProcessor.handlePollEndEvent(session, powerLevelsHelper, realm.instance, A_POLL_END_EVENT).shouldBeTrue()
     }
 
     @Test
-    fun `given a poll end event for my own poll without enough redaction power level, when processing, then is processed and returns true`() {
+    fun `given a poll end event for my own poll without enough redaction power level, when processing, then is processed and returns true`() = runTest {
+        // Given
         every { realm.instance.createObject(PollResponseAggregatedSummaryEntity::class.java) } returns PollResponseAggregatedSummaryEntity()
+        every { fakeTaskExecutor.instance.executorScope } returns this
+
+        // When
         val powerLevelsHelper = mockRedactionPowerLevels(A_USER_ID_1, false)
+
+        // Then
         pollAggregationProcessor.handlePollEndEvent(session, powerLevelsHelper, realm.instance, A_POLL_END_EVENT).shouldBeTrue()
     }
 
@@ -135,6 +161,28 @@ class PollAggregationProcessorTest {
         pollAggregationProcessor.handlePollEndEvent(session, powerLevelsHelper, realm.instance, event).shouldBeFalse()
     }
 
+    @Test
+    fun `given a non local echo poll end event, when is processed, then ensure to aggregate all poll responses`() = runTest {
+        // Given
+        every { realm.instance.createObject(PollResponseAggregatedSummaryEntity::class.java) } returns PollResponseAggregatedSummaryEntity()
+        val powerLevelsHelper = mockRedactionPowerLevels("another-sender-id", true)
+        val event = A_POLL_END_EVENT.copy(senderId = "another-sender-id")
+        every { fakeTaskExecutor.instance.executorScope } returns this
+        val expectedParams = FetchPollResponseEventsTask.Params(
+                roomId = A_POLL_END_EVENT.roomId.orEmpty(),
+                startPollEventId = A_POLL_END_CONTENT.relatesTo?.eventId.orEmpty(),
+        )
+
+        // When
+        pollAggregationProcessor.handlePollEndEvent(session, powerLevelsHelper, realm.instance, event)
+        advanceUntilIdle()
+
+        // Then
+        coVerify {
+            fakeFetchPollResponseEventsTask.execute(expectedParams)
+        }
+    }
+
     private fun mockEventAnnotationsSummaryEntity() {
         realm.givenWhere<EventAnnotationsSummaryEntity>()
                 .givenFindFirst(EventAnnotationsSummaryEntity())
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/PollEventsTestData.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/PollEventsTestData.kt
index 129d49633e..e38b51132d 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/PollEventsTestData.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/PollEventsTestData.kt
@@ -87,7 +87,7 @@ object PollEventsTestData {
     )
 
     internal val A_POLL_START_EVENT = Event(
-            type = EventType.POLL_START.first(),
+            type = EventType.POLL_START.unstable,
             eventId = AN_EVENT_ID,
             originServerTs = 1652435922563,
             senderId = A_USER_ID_1,
@@ -96,7 +96,7 @@ object PollEventsTestData {
     )
 
     internal val A_POLL_RESPONSE_EVENT = Event(
-            type = EventType.POLL_RESPONSE.first(),
+            type = EventType.POLL_RESPONSE.unstable,
             eventId = AN_EVENT_ID,
             originServerTs = 1652435922563,
             senderId = A_USER_ID_1,
@@ -105,7 +105,7 @@ object PollEventsTestData {
     )
 
     internal val A_POLL_END_EVENT = Event(
-            type = EventType.POLL_END.first(),
+            type = EventType.POLL_END.unstable,
             eventId = AN_EVENT_ID,
             originServerTs = 1652435922563,
             senderId = A_USER_ID_1,
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/create/DefaultCreateLocalRoomStateEventsTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/create/DefaultCreateLocalRoomStateEventsTaskTest.kt
new file mode 100644
index 0000000000..1c2cf293b6
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/create/DefaultCreateLocalRoomStateEventsTaskTest.kt
@@ -0,0 +1,462 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.create
+
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.unmockkAll
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldNotBeNull
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.MatrixPatterns.getServerName
+import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.content.EncryptionEventContent
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
+import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.model.RoomNameContent
+import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
+import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
+import org.matrix.android.sdk.api.session.user.UserService
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.internal.session.profile.ThirdPartyIdentifier.Companion.MEDIUM_EMAIL
+import org.matrix.android.sdk.internal.session.profile.ThirdPartyIdentifier.Companion.MEDIUM_MSISDN
+import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
+import org.matrix.android.sdk.internal.session.room.membership.threepid.toThreePid
+import org.matrix.android.sdk.internal.util.time.DefaultClock
+
+private const val MY_USER_ID = "my-user-id"
+private const val MY_USER_DISPLAY_NAME = "my-user-display-name"
+private const val MY_USER_AVATAR = "my-user-avatar"
+
+@ExperimentalCoroutinesApi
+internal class DefaultCreateLocalRoomStateEventsTaskTest {
+
+    private val clock = DefaultClock()
+    private val userService = mockk<UserService>()
+
+    private val defaultCreateLocalRoomStateEventsTask = DefaultCreateLocalRoomStateEventsTask(
+            myUserId = MY_USER_ID,
+            userService = userService,
+            clock = clock
+    )
+
+    lateinit var createRoomBody: CreateRoomBody
+
+    @Before
+    fun setup() {
+        createRoomBody = mockk {
+            every { roomVersion } returns null
+            every { creationContent } returns null
+            every { roomAliasName } returns null
+            every { topic } returns null
+            every { name } returns null
+            every { powerLevelContentOverride } returns null
+            every { initialStates } returns null
+            every { invite3pids } returns null
+            every { preset } returns null
+            every { isDirect } returns null
+            every { invitedUserIds } returns null
+        }
+        coEvery { userService.resolveUser(any()) } answers { User(firstArg()) }
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a CreateRoomBody when execute then the resulting list of events contains the correct room create state event`() = runTest {
+        // Given
+        val aRoomVersion = "a_room_version"
+
+        every { createRoomBody.roomVersion } returns aRoomVersion
+
+        // When
+        val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+        val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+        // Then
+        val roomCreateEvent = result.find { it.type == EventType.STATE_ROOM_CREATE }
+        val roomCreateContent = roomCreateEvent?.content.toModel<RoomCreateContent>()
+
+        roomCreateContent?.creator shouldBeEqualTo MY_USER_ID
+        roomCreateContent?.roomVersion shouldBeEqualTo aRoomVersion
+    }
+
+    @Test
+    fun `given a CreateRoomBody when execute then the resulting list of events contains the correct name and topic state events`() = runTest {
+        // Given
+        val aRoomName = "a_room_name"
+        val aRoomTopic = "a_room_topic"
+
+        every { createRoomBody.name } returns aRoomName
+        every { createRoomBody.topic } returns aRoomTopic
+
+        // When
+        val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+        val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+        // Then
+        val roomNameEvent = result.find { it.type == EventType.STATE_ROOM_NAME }
+        val roomTopicEvent = result.find { it.type == EventType.STATE_ROOM_TOPIC }
+
+        roomNameEvent?.content.toModel<RoomNameContent>()?.name shouldBeEqualTo aRoomName
+        roomTopicEvent?.content.toModel<RoomTopicContent>()?.topic shouldBeEqualTo aRoomTopic
+    }
+
+    @Test
+    fun `given a CreateRoomBody when execute then the resulting list of events contains the correct room member events`() = runTest {
+        // Given
+        data class RoomMember(val user: User, val membership: Membership)
+
+        val aRoomMemberList: List<RoomMember> = listOf(
+                RoomMember(User(MY_USER_ID, MY_USER_DISPLAY_NAME, MY_USER_AVATAR), Membership.JOIN),
+                RoomMember(User("userA_id", "userA_display_name", "userA_avatar"), Membership.INVITE),
+                RoomMember(User("userB_id", "userB_display_name", "userB_avatar"), Membership.INVITE)
+        )
+
+        every { createRoomBody.invitedUserIds } returns aRoomMemberList.filter { it.membership == Membership.INVITE }.map { it.user.userId }
+        coEvery { userService.resolveUser(any()) } answers {
+            aRoomMemberList.map { it.user }.find { it.userId == firstArg() } ?: User(firstArg())
+        }
+
+        // When
+        val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+        val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+        // Then
+        val roomMemberEvents = result.filter { it.type == EventType.STATE_ROOM_MEMBER }
+
+        roomMemberEvents.map { it.stateKey } shouldBeEqualTo aRoomMemberList.map { it.user.userId }
+        roomMemberEvents.forEach { event ->
+            val roomMemberContent = event.content.toModel<RoomMemberContent>()
+            val roomMember = aRoomMemberList.find { it.user.userId == event.stateKey }
+
+            roomMember.shouldNotBeNull()
+            roomMemberContent?.avatarUrl shouldBeEqualTo roomMember.user.avatarUrl
+            roomMemberContent?.displayName shouldBeEqualTo roomMember.user.displayName
+            roomMemberContent?.membership shouldBeEqualTo roomMember.membership
+        }
+    }
+
+    @Test
+    fun `given a CreateRoomBody when execute then the resulting list of events contains the correct power levels event`() = runTest {
+        // Given
+        val aPowerLevelsContent = PowerLevelsContent(
+                ban = 1,
+                kick = 2,
+                invite = 3,
+                redact = 4,
+                eventsDefault = 5,
+                events = null,
+                usersDefault = 6,
+                users = null,
+                stateDefault = 7,
+                notifications = null
+        )
+
+        every { createRoomBody.powerLevelContentOverride } returns aPowerLevelsContent
+
+        // When
+        val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+        val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+        // Then
+        val roomPowerLevelsEvent = result.find { it.type == EventType.STATE_ROOM_POWER_LEVELS }
+        roomPowerLevelsEvent?.content.toModel<PowerLevelsContent>() shouldBeEqualTo aPowerLevelsContent
+    }
+
+    @Test
+    fun `given a CreateRoomBody when execute then the resulting list of events contains the correct canonical alias event`() = runTest {
+        // Given
+        val aRoomAlias = "a_room_alias"
+        val expectedCanonicalAlias = "$aRoomAlias:${MY_USER_ID.getServerName()}"
+
+        every { createRoomBody.roomAliasName } returns aRoomAlias
+
+        // When
+        val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+        val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+        // Then
+        val roomPowerLevelsEvent = result.find { it.type == EventType.STATE_ROOM_CANONICAL_ALIAS }
+        roomPowerLevelsEvent?.content.toModel<RoomCanonicalAliasContent>()?.canonicalAlias shouldBeEqualTo expectedCanonicalAlias
+    }
+
+    @Test
+    fun `given a CreateRoomBody when execute then the resulting list of events contains the correct preset related events`() = runTest {
+        data class ExpectedResult(val joinRules: RoomJoinRules, val historyVisibility: RoomHistoryVisibility, val guestAccess: GuestAccess)
+        data class Case(val preset: CreateRoomPreset, val expectedResult: ExpectedResult)
+
+        CreateRoomPreset.values().forEach { aRoomPreset ->
+            // Given
+            val case = when (aRoomPreset) {
+                CreateRoomPreset.PRESET_PRIVATE_CHAT -> Case(
+                        CreateRoomPreset.PRESET_PRIVATE_CHAT,
+                        ExpectedResult(RoomJoinRules.INVITE, RoomHistoryVisibility.SHARED, GuestAccess.CanJoin)
+                )
+                CreateRoomPreset.PRESET_TRUSTED_PRIVATE_CHAT -> Case(
+                        CreateRoomPreset.PRESET_TRUSTED_PRIVATE_CHAT,
+                        ExpectedResult(RoomJoinRules.INVITE, RoomHistoryVisibility.SHARED, GuestAccess.CanJoin)
+                )
+                CreateRoomPreset.PRESET_PUBLIC_CHAT -> Case(
+                        CreateRoomPreset.PRESET_PUBLIC_CHAT,
+                        ExpectedResult(RoomJoinRules.PUBLIC, RoomHistoryVisibility.SHARED, GuestAccess.Forbidden)
+                )
+            }
+            every { createRoomBody.preset } returns case.preset
+
+            // When
+            val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+            val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+            // Then
+            result.find { it.type == EventType.STATE_ROOM_JOIN_RULES }
+                    ?.content.toModel<RoomJoinRulesContent>()
+                    ?.joinRules shouldBeEqualTo case.expectedResult.joinRules
+            result.find { it.type == EventType.STATE_ROOM_HISTORY_VISIBILITY }
+                    ?.content.toModel<RoomHistoryVisibilityContent>()
+                    ?.historyVisibility shouldBeEqualTo case.expectedResult.historyVisibility
+            result.find { it.type == EventType.STATE_ROOM_GUEST_ACCESS }
+                    ?.content.toModel<RoomGuestAccessContent>()
+                    ?.guestAccess shouldBeEqualTo case.expectedResult.guestAccess
+        }
+    }
+
+    @Test
+    fun `given a CreateRoomBody when execute then the resulting list of events contains the initial state events`() = runTest {
+        // Given
+        val aListOfInitialStateEvents = listOf(
+                Event(
+                        type = EventType.STATE_ROOM_ENCRYPTION,
+                        stateKey = "",
+                        content = EncryptionEventContent(MXCRYPTO_ALGORITHM_MEGOLM).toContent()
+                ),
+                Event(
+                        type = "a_custom_type",
+                        content = mapOf("a_custom_map_to_integer" to 42),
+                        stateKey = "a_state_key"
+                ),
+                Event(
+                        type = "another_custom_type",
+                        content = mapOf("a_custom_map_to_boolean" to false),
+                        stateKey = "another_state_key"
+                )
+        )
+
+        every { createRoomBody.initialStates } returns aListOfInitialStateEvents
+
+        // When
+        val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+        val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+        // Then
+        aListOfInitialStateEvents.forEach { expected ->
+            val found = result.find { it.type == expected.type }
+            found.shouldNotBeNull()
+            found.content shouldBeEqualTo expected.content
+            found.stateKey shouldBeEqualTo expected.stateKey
+        }
+    }
+
+    @Test
+    fun `given a CreateRoomBody when execute then the resulting list of events contains the correct third party invite events`() = runTest {
+        // Given
+        val aListOfThreePids = listOf(
+                ThreePid.Email("bob@matrix.org"),
+                ThreePid.Msisdn("+11111111111"),
+                ThreePid.Email("alice@matrix.org"),
+                ThreePid.Msisdn("+22222222222"),
+        )
+        val aListOf3pids = aListOfThreePids.mapIndexed { index, threePid ->
+            ThreePidInviteBody(
+                    idServer = "an_id_server_$index",
+                    idAccessToken = "an_id_access_token_$index",
+                    medium = when (threePid) {
+                        is ThreePid.Email -> MEDIUM_EMAIL
+                        is ThreePid.Msisdn -> MEDIUM_MSISDN
+                    },
+                    address = threePid.value
+            )
+        }
+        every { createRoomBody.invite3pids } returns aListOf3pids
+
+        // When
+        val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+        val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+        // Then
+        val thirdPartyInviteEvents = result.filter { it.type == EventType.STATE_ROOM_THIRD_PARTY_INVITE }
+        val thirdPartyInviteContents = thirdPartyInviteEvents.map { it.content.toModel<RoomThirdPartyInviteContent>() }
+        val localThirdPartyInviteEvents = result.filter { it.type == EventType.LOCAL_STATE_ROOM_THIRD_PARTY_INVITE }
+        val localThirdPartyInviteContents = localThirdPartyInviteEvents.map { it.content.toModel<LocalRoomThirdPartyInviteContent>() }
+
+        thirdPartyInviteEvents.size shouldBeEqualTo aListOf3pids.size
+        localThirdPartyInviteEvents.size shouldBeEqualTo aListOf3pids.size
+
+        aListOf3pids.forEach { expected ->
+            thirdPartyInviteContents.find { it?.displayName == expected.address }.shouldNotBeNull()
+
+            val localThirdPartyInviteContent = localThirdPartyInviteContents.find { it?.thirdPartyInvite == expected.toThreePid() }
+            localThirdPartyInviteContent.shouldNotBeNull()
+            localThirdPartyInviteContent.membership shouldBeEqualTo Membership.INVITE
+            localThirdPartyInviteContent.isDirect shouldBeEqualTo createRoomBody.isDirect.orFalse()
+            localThirdPartyInviteContent.displayName shouldBeEqualTo expected.address
+        }
+    }
+
+    @Test
+    fun `given a CreateRoomBody with default values when execute then the resulting list of events is correct`() = runTest {
+        // Given
+        // map of expected event types to occurrences
+        val expectedEventTypes = mapOf(
+                EventType.STATE_ROOM_CREATE to 1,
+                EventType.STATE_ROOM_POWER_LEVELS to 1,
+                EventType.STATE_ROOM_MEMBER to 1,
+                EventType.STATE_ROOM_GUEST_ACCESS to 1,
+                EventType.STATE_ROOM_HISTORY_VISIBILITY to 1,
+        )
+        coEvery { userService.resolveUser(any()) } answers {
+            if (firstArg<String>() == MY_USER_ID) User(MY_USER_ID, MY_USER_DISPLAY_NAME, MY_USER_AVATAR) else User(firstArg())
+        }
+
+        // When
+        val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+        val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+        // Then
+        result.size shouldBeEqualTo expectedEventTypes.values.sum()
+        result.map { it.type }.toSet() shouldBeEqualTo expectedEventTypes.keys
+
+        // Room create
+        result.find { it.type == EventType.STATE_ROOM_CREATE }.shouldNotBeNull()
+        // Room member
+        result.singleOrNull { it.type == EventType.STATE_ROOM_MEMBER }?.stateKey shouldBeEqualTo MY_USER_ID
+        // Power levels
+        val powerLevelsContent = result.find { it.type == EventType.STATE_ROOM_POWER_LEVELS }?.content.toModel<PowerLevelsContent>()
+        powerLevelsContent.shouldNotBeNull()
+        powerLevelsContent.ban shouldBeEqualTo Role.Moderator.value
+        powerLevelsContent.kick shouldBeEqualTo Role.Moderator.value
+        powerLevelsContent.invite shouldBeEqualTo Role.Moderator.value
+        powerLevelsContent.redact shouldBeEqualTo Role.Moderator.value
+        powerLevelsContent.eventsDefault shouldBeEqualTo Role.Default.value
+        powerLevelsContent.usersDefault shouldBeEqualTo Role.Default.value
+        powerLevelsContent.stateDefault shouldBeEqualTo Role.Moderator.value
+        // Guest access
+        result.find { it.type == EventType.STATE_ROOM_GUEST_ACCESS }
+                ?.content.toModel<RoomGuestAccessContent>()?.guestAccess shouldBeEqualTo GuestAccess.Forbidden
+        // History visibility
+        result.find { it.type == EventType.STATE_ROOM_HISTORY_VISIBILITY }
+                ?.content.toModel<RoomHistoryVisibilityContent>()?.historyVisibility shouldBeEqualTo RoomHistoryVisibility.SHARED
+    }
+
+    @Test
+    fun `given a CreateRoomBody when execute then the resulting list of events is correctly ordered with the right values`() = runTest {
+        // Given
+        val expectedIsDirect = true
+        val expectedHistoryVisibility = RoomHistoryVisibility.WORLD_READABLE
+
+        every { createRoomBody.roomVersion } returns "a_room_version"
+        every { createRoomBody.roomAliasName } returns "a_room_alias_name"
+        every { createRoomBody.name } returns "a_name"
+        every { createRoomBody.topic } returns "a_topic"
+        every { createRoomBody.powerLevelContentOverride } returns PowerLevelsContent(
+                ban = 1,
+                kick = 2,
+                invite = 3,
+                redact = 4,
+                eventsDefault = 5,
+                events = null,
+                usersDefault = 6,
+                users = null,
+                stateDefault = 7,
+                notifications = null
+        )
+        every { createRoomBody.invite3pids } returns listOf(
+                ThreePidInviteBody(
+                        idServer = "an_id_server",
+                        idAccessToken = "an_id_access_token",
+                        medium = MEDIUM_EMAIL,
+                        address = "an_email@example.org"
+                )
+        )
+        every { createRoomBody.preset } returns CreateRoomPreset.PRESET_TRUSTED_PRIVATE_CHAT
+        every { createRoomBody.initialStates } returns listOf(
+                Event(type = "a_custom_type", stateKey = ""),
+                // override the value from the preset
+                Event(
+                        type = EventType.STATE_ROOM_HISTORY_VISIBILITY,
+                        stateKey = "",
+                        content = RoomHistoryVisibilityContent(expectedHistoryVisibility.value).toContent()
+                )
+        )
+        every { createRoomBody.isDirect } returns expectedIsDirect
+        every { createRoomBody.invitedUserIds } returns listOf("a_user_id")
+
+        val orderedExpectedEventType = listOf(
+                EventType.STATE_ROOM_CREATE,
+                EventType.STATE_ROOM_MEMBER,
+                EventType.STATE_ROOM_POWER_LEVELS,
+                EventType.STATE_ROOM_CANONICAL_ALIAS,
+                EventType.STATE_ROOM_JOIN_RULES,
+                EventType.STATE_ROOM_GUEST_ACCESS,
+                "a_custom_type",
+                EventType.STATE_ROOM_HISTORY_VISIBILITY,
+                EventType.STATE_ROOM_NAME,
+                EventType.STATE_ROOM_TOPIC,
+                EventType.STATE_ROOM_MEMBER,
+                EventType.LOCAL_STATE_ROOM_THIRD_PARTY_INVITE,
+                EventType.STATE_ROOM_THIRD_PARTY_INVITE,
+        )
+
+        // When
+        val params = CreateLocalRoomStateEventsTask.Params(createRoomBody)
+        val result = defaultCreateLocalRoomStateEventsTask.execute(params)
+
+        // Then
+        result.map { it.type } shouldBeEqualTo orderedExpectedEventType
+        result.find { it.type == EventType.STATE_ROOM_HISTORY_VISIBILITY }
+                ?.content.toModel<RoomHistoryVisibilityContent>()?.historyVisibility shouldBeEqualTo expectedHistoryVisibility
+        result.lastOrNull { it.type == EventType.STATE_ROOM_MEMBER }
+                ?.content.toModel<RoomMemberContent>()?.isDirect shouldBeEqualTo expectedIsDirect
+        result.lastOrNull { it.type == EventType.LOCAL_STATE_ROOM_THIRD_PARTY_INVITE }
+                ?.content.toModel<LocalRoomThirdPartyInviteContent>()?.isDirect shouldBeEqualTo expectedIsDirect
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/create/DefaultCreateRoomFromLocalRoomTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/create/DefaultCreateRoomFromLocalRoomTaskTest.kt
new file mode 100644
index 0000000000..9e34280437
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/create/DefaultCreateRoomFromLocalRoomTaskTest.kt
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.create
+
+import io.mockk.coEvery
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.spyk
+import io.mockk.unmockkAll
+import io.mockk.verify
+import io.mockk.verifyOrder
+import io.realm.kotlin.where
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeNull
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.room.model.LocalRoomCreationState
+import org.matrix.android.sdk.api.session.room.model.LocalRoomSummary
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.copyToRealmOrIgnore
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.test.fakes.FakeMonarchy
+import org.matrix.android.sdk.test.fakes.FakeRoomSummaryDataSource
+
+private const val A_LOCAL_ROOM_ID = "local.a-local-room-id"
+private const val AN_EXISTING_ROOM_ID = "an-existing-room-id"
+private const val A_ROOM_ID = "a-room-id"
+
+@ExperimentalCoroutinesApi
+internal class DefaultCreateRoomFromLocalRoomTaskTest {
+
+    private val fakeMonarchy = FakeMonarchy()
+    private val createRoomTask = mockk<CreateRoomTask>()
+    private val fakeRoomSummaryDataSource = FakeRoomSummaryDataSource()
+
+    private val defaultCreateRoomFromLocalRoomTask = DefaultCreateRoomFromLocalRoomTask(
+            monarchy = fakeMonarchy.instance,
+            createRoomTask = createRoomTask,
+            roomSummaryDataSource = fakeRoomSummaryDataSource.instance,
+    )
+
+    @Before
+    fun setup() {
+        mockkStatic("org.matrix.android.sdk.internal.database.RealmQueryLatchKt")
+        coJustRun { awaitNotEmptyResult<Any>(realmConfiguration = any(), timeoutMillis = any(), builder = any()) }
+
+        mockkStatic("org.matrix.android.sdk.internal.database.query.EventEntityQueriesKt")
+        coEvery { any<EventEntity>().copyToRealmOrIgnore(fakeMonarchy.fakeRealm.instance, any()) } answers { firstArg() }
+
+        mockkStatic("org.matrix.android.sdk.internal.database.query.CurrentStateEventEntityQueriesKt")
+        every { CurrentStateEventEntity.getOrCreate(fakeMonarchy.fakeRealm.instance, any(), any(), any()) } answers {
+            CurrentStateEventEntity(roomId = arg(2), stateKey = arg(3), type = arg(4))
+        }
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a local room id when execute then the existing room id is kept`() = runTest {
+        // Given
+        val aCreateRoomParams = mockk<CreateRoomParams>(relaxed = true)
+        givenALocalRoomSummary(aCreateRoomParams = aCreateRoomParams, aCreationState = LocalRoomCreationState.CREATED, aReplacementRoomId = AN_EXISTING_ROOM_ID)
+        val aLocalRoomSummaryEntity = givenALocalRoomSummaryEntity(
+                aCreateRoomParams = aCreateRoomParams,
+                aCreationState = LocalRoomCreationState.CREATED,
+                aReplacementRoomId = AN_EXISTING_ROOM_ID
+        )
+
+        // When
+        val params = CreateRoomFromLocalRoomTask.Params(A_LOCAL_ROOM_ID)
+        val result = defaultCreateRoomFromLocalRoomTask.execute(params)
+
+        // Then
+        fakeRoomSummaryDataSource.verifyGetLocalRoomSummary(A_LOCAL_ROOM_ID)
+        result shouldBeEqualTo AN_EXISTING_ROOM_ID
+        aLocalRoomSummaryEntity.replacementRoomId shouldBeEqualTo AN_EXISTING_ROOM_ID
+        aLocalRoomSummaryEntity.creationState shouldBeEqualTo LocalRoomCreationState.CREATED
+    }
+
+    @Test
+    fun `given a local room id when execute then it is correctly executed`() = runTest {
+        // Given
+        val aCreateRoomParams = mockk<CreateRoomParams>(relaxed = true)
+        givenALocalRoomSummary(aCreateRoomParams = aCreateRoomParams, aReplacementRoomId = null)
+        val aLocalRoomSummaryEntity = givenALocalRoomSummaryEntity(aCreateRoomParams = aCreateRoomParams, aReplacementRoomId = null)
+
+        coEvery { createRoomTask.execute(any()) } returns A_ROOM_ID
+
+        // When
+        val params = CreateRoomFromLocalRoomTask.Params(A_LOCAL_ROOM_ID)
+        val result = defaultCreateRoomFromLocalRoomTask.execute(params)
+
+        // Then
+        fakeRoomSummaryDataSource.verifyGetLocalRoomSummary(A_LOCAL_ROOM_ID)
+        // CreateRoomTask has been called with the initial CreateRoomParams
+        coVerify { createRoomTask.execute(aCreateRoomParams) }
+        // The resulting roomId matches the roomId returned by the createRoomTask
+        result shouldBeEqualTo A_ROOM_ID
+        // The room creation state has correctly been updated
+        verifyOrder {
+            aLocalRoomSummaryEntity.creationState = LocalRoomCreationState.CREATING
+            aLocalRoomSummaryEntity.creationState = LocalRoomCreationState.CREATED
+        }
+        // The local room summary has been updated with the created room id
+        verify { aLocalRoomSummaryEntity.replacementRoomId = A_ROOM_ID }
+        aLocalRoomSummaryEntity.replacementRoomId shouldBeEqualTo A_ROOM_ID
+        aLocalRoomSummaryEntity.creationState shouldBeEqualTo LocalRoomCreationState.CREATED
+    }
+
+    @Test
+    fun `given a local room id when execute with an exception then the creation state is correctly updated`() = runTest {
+        // Given
+        val aCreateRoomParams = mockk<CreateRoomParams>(relaxed = true)
+        givenALocalRoomSummary(aCreateRoomParams = aCreateRoomParams, aReplacementRoomId = null)
+        val aLocalRoomSummaryEntity = givenALocalRoomSummaryEntity(aCreateRoomParams = aCreateRoomParams, aReplacementRoomId = null)
+
+        coEvery { createRoomTask.execute(any()) }.throws(mockk())
+
+        // When
+        val params = CreateRoomFromLocalRoomTask.Params(A_LOCAL_ROOM_ID)
+        tryOrNull { defaultCreateRoomFromLocalRoomTask.execute(params) }
+
+        // Then
+        fakeRoomSummaryDataSource.verifyGetLocalRoomSummary(A_LOCAL_ROOM_ID)
+        // CreateRoomTask has been called with the initial CreateRoomParams
+        coVerify { createRoomTask.execute(aCreateRoomParams) }
+        // The room creation state has correctly been updated
+        verifyOrder {
+            aLocalRoomSummaryEntity.creationState = LocalRoomCreationState.CREATING
+            aLocalRoomSummaryEntity.creationState = LocalRoomCreationState.FAILURE
+        }
+        // The local room summary has been updated with the created room id
+        aLocalRoomSummaryEntity.replacementRoomId.shouldBeNull()
+        aLocalRoomSummaryEntity.creationState shouldBeEqualTo LocalRoomCreationState.FAILURE
+    }
+
+    private fun givenALocalRoomSummary(
+            aCreateRoomParams: CreateRoomParams,
+            aCreationState: LocalRoomCreationState = LocalRoomCreationState.NOT_CREATED,
+            aReplacementRoomId: String? = null
+    ): LocalRoomSummary {
+        val aLocalRoomSummary = LocalRoomSummary(
+                roomId = A_LOCAL_ROOM_ID,
+                roomSummary = mockk(relaxed = true),
+                createRoomParams = aCreateRoomParams,
+                creationState = aCreationState,
+                replacementRoomId = aReplacementRoomId,
+        )
+        fakeRoomSummaryDataSource.givenGetLocalRoomSummaryReturns(A_LOCAL_ROOM_ID, aLocalRoomSummary)
+        return aLocalRoomSummary
+    }
+
+    private fun givenALocalRoomSummaryEntity(
+            aCreateRoomParams: CreateRoomParams,
+            aCreationState: LocalRoomCreationState = LocalRoomCreationState.NOT_CREATED,
+            aReplacementRoomId: String? = null
+    ): LocalRoomSummaryEntity {
+        val aLocalRoomSummaryEntity = spyk(LocalRoomSummaryEntity(
+                roomId = A_LOCAL_ROOM_ID,
+                roomSummaryEntity = mockk(relaxed = true),
+                replacementRoomId = aReplacementRoomId,
+        ).apply {
+            createRoomParams = aCreateRoomParams
+            creationState = aCreationState
+        })
+        every {
+            fakeMonarchy.fakeRealm.instance
+                    .where<LocalRoomSummaryEntity>()
+                    .equalTo(LocalRoomSummaryEntityFields.ROOM_ID, A_LOCAL_ROOM_ID)
+                    .findFirst()
+        } returns aLocalRoomSummaryEntity
+        return aLocalRoomSummaryEntity
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultGetActiveBeaconInfoForUserTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultGetActiveBeaconInfoForUserTaskTest.kt
index 588bfaa979..6f416a6bc1 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultGetActiveBeaconInfoForUserTaskTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultGetActiveBeaconInfoForUserTaskTest.kt
@@ -22,6 +22,7 @@ import kotlinx.coroutines.test.runTest
 import org.amshove.kluent.shouldBeEqualTo
 import org.junit.After
 import org.junit.Test
+import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
@@ -68,8 +69,8 @@ class DefaultGetActiveBeaconInfoForUserTaskTest {
         result shouldBeEqualTo currentStateEvent
         fakeStateEventDataSource.verifyGetStateEvent(
                 roomId = params.roomId,
-                eventType = EventType.STATE_ROOM_BEACON_INFO.first(),
-                stateKey = A_USER_ID
+                eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,
+                stateKey = QueryStringValue.Equals(A_USER_ID)
         )
     }
 }
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingServiceTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingServiceTest.kt
index a01f51604c..1f15a9bee8 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingServiceTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingServiceTest.kt
@@ -53,7 +53,6 @@ private const val A_LATITUDE = 1.4
 private const val A_LONGITUDE = 40.0
 private const val AN_UNCERTAINTY = 5.0
 private const val A_TIMEOUT = 15_000L
-private const val A_DESCRIPTION = "description"
 private const val A_REASON = "reason"
 
 @ExperimentalCoroutinesApi
@@ -143,7 +142,7 @@ internal class DefaultLocationSharingServiceTest {
         coEvery { stopLiveLocationShareTask.execute(any()) } returns UpdateLiveLocationShareResult.Success("stopped-event-id")
         coEvery { startLiveLocationShareTask.execute(any()) } returns UpdateLiveLocationShareResult.Success(AN_EVENT_ID)
 
-        val result = defaultLocationSharingService.startLiveLocationShare(A_TIMEOUT, A_DESCRIPTION)
+        val result = defaultLocationSharingService.startLiveLocationShare(A_TIMEOUT)
 
         result shouldBeEqualTo UpdateLiveLocationShareResult.Success(AN_EVENT_ID)
         val expectedCheckExistingParams = CheckIfExistingActiveLiveTask.Params(
@@ -157,7 +156,6 @@ internal class DefaultLocationSharingServiceTest {
         val expectedStartParams = StartLiveLocationShareTask.Params(
                 roomId = A_ROOM_ID,
                 timeoutMillis = A_TIMEOUT,
-                description = A_DESCRIPTION
         )
         coVerify { startLiveLocationShareTask.execute(expectedStartParams) }
     }
@@ -168,7 +166,7 @@ internal class DefaultLocationSharingServiceTest {
         val error = Throwable()
         coEvery { stopLiveLocationShareTask.execute(any()) } returns UpdateLiveLocationShareResult.Failure(error)
 
-        val result = defaultLocationSharingService.startLiveLocationShare(A_TIMEOUT, A_DESCRIPTION)
+        val result = defaultLocationSharingService.startLiveLocationShare(A_TIMEOUT)
 
         result shouldBeEqualTo UpdateLiveLocationShareResult.Failure(error)
         val expectedCheckExistingParams = CheckIfExistingActiveLiveTask.Params(
@@ -186,7 +184,7 @@ internal class DefaultLocationSharingServiceTest {
         coEvery { checkIfExistingActiveLiveTask.execute(any()) } returns false
         coEvery { startLiveLocationShareTask.execute(any()) } returns UpdateLiveLocationShareResult.Success(AN_EVENT_ID)
 
-        val result = defaultLocationSharingService.startLiveLocationShare(A_TIMEOUT, A_DESCRIPTION)
+        val result = defaultLocationSharingService.startLiveLocationShare(A_TIMEOUT)
 
         result shouldBeEqualTo UpdateLiveLocationShareResult.Success(AN_EVENT_ID)
         val expectedCheckExistingParams = CheckIfExistingActiveLiveTask.Params(
@@ -196,7 +194,6 @@ internal class DefaultLocationSharingServiceTest {
         val expectedStartParams = StartLiveLocationShareTask.Params(
                 roomId = A_ROOM_ID,
                 timeoutMillis = A_TIMEOUT,
-                description = A_DESCRIPTION
         )
         coVerify { startLiveLocationShareTask.execute(expectedStartParams) }
     }
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStartLiveLocationShareTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStartLiveLocationShareTaskTest.kt
index aa8826243f..3156287774 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStartLiveLocationShareTaskTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStartLiveLocationShareTaskTest.kt
@@ -34,7 +34,6 @@ import org.matrix.android.sdk.test.fakes.FakeSendStateTask
 private const val A_USER_ID = "user-id"
 private const val A_ROOM_ID = "room-id"
 private const val AN_EVENT_ID = "event-id"
-private const val A_DESCRIPTION = "description"
 private const val A_TIMEOUT = 15_000L
 private const val AN_EPOCH = 1655210176L
 
@@ -60,7 +59,6 @@ internal class DefaultStartLiveLocationShareTaskTest {
         val params = StartLiveLocationShareTask.Params(
                 roomId = A_ROOM_ID,
                 timeoutMillis = A_TIMEOUT,
-                description = A_DESCRIPTION
         )
         fakeClock.givenEpoch(AN_EPOCH)
         fakeSendStateTask.givenExecuteRetryReturns(AN_EVENT_ID)
@@ -69,7 +67,7 @@ internal class DefaultStartLiveLocationShareTaskTest {
 
         result shouldBeEqualTo UpdateLiveLocationShareResult.Success(AN_EVENT_ID)
         val expectedBeaconContent = MessageBeaconInfoContent(
-                body = A_DESCRIPTION,
+                body = "Live location",
                 timeout = params.timeoutMillis,
                 isLive = true,
                 unstableTimestampMillis = AN_EPOCH
@@ -77,7 +75,7 @@ internal class DefaultStartLiveLocationShareTaskTest {
         val expectedParams = SendStateTask.Params(
                 roomId = params.roomId,
                 stateKey = A_USER_ID,
-                eventType = EventType.STATE_ROOM_BEACON_INFO.first(),
+                eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,
                 body = expectedBeaconContent
         )
         fakeSendStateTask.verifyExecuteRetry(
@@ -91,7 +89,6 @@ internal class DefaultStartLiveLocationShareTaskTest {
         val params = StartLiveLocationShareTask.Params(
                 roomId = A_ROOM_ID,
                 timeoutMillis = A_TIMEOUT,
-                description = A_DESCRIPTION
         )
         fakeClock.givenEpoch(AN_EPOCH)
         fakeSendStateTask.givenExecuteRetryReturns("")
@@ -106,7 +103,6 @@ internal class DefaultStartLiveLocationShareTaskTest {
         val params = StartLiveLocationShareTask.Params(
                 roomId = A_ROOM_ID,
                 timeoutMillis = A_TIMEOUT,
-                description = A_DESCRIPTION
         )
         fakeClock.givenEpoch(AN_EPOCH)
         val error = Throwable()
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStopLiveLocationShareTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStopLiveLocationShareTaskTest.kt
index 1abf179ccf..03c6f525e0 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStopLiveLocationShareTaskTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStopLiveLocationShareTaskTest.kt
@@ -79,7 +79,7 @@ class DefaultStopLiveLocationShareTaskTest {
         val expectedSendParams = SendStateTask.Params(
                 roomId = params.roomId,
                 stateKey = A_USER_ID,
-                eventType = EventType.STATE_ROOM_BEACON_INFO.first(),
+                eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,
                 body = expectedBeaconContent
         )
         fakeSendStateTask.verifyExecuteRetry(
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessorTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessorTest.kt
index 24d9c30039..8dc7a5c9bc 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessorTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessorTest.kt
@@ -79,7 +79,7 @@ class LiveLocationShareRedactionEventProcessorTest {
     @Test
     fun `given a redacted live location share event when processing it then related summaries are deleted from database`() = runTest {
         val event = Event(eventId = AN_EVENT_ID, redacts = A_REDACTED_EVENT_ID)
-        val redactedEventEntity = EventEntity(eventId = A_REDACTED_EVENT_ID, type = EventType.STATE_ROOM_BEACON_INFO.first())
+        val redactedEventEntity = EventEntity(eventId = A_REDACTED_EVENT_ID, type = EventType.STATE_ROOM_BEACON_INFO.unstable)
         fakeRealm.givenWhere<EventEntity>()
                 .givenEqualTo(EventEntityFields.EVENT_ID, A_REDACTED_EVENT_ID)
                 .givenFindFirst(redactedEventEntity)
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/relation/poll/DefaultFetchPollResponseEventsTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/relation/poll/DefaultFetchPollResponseEventsTaskTest.kt
new file mode 100644
index 0000000000..8d50bac38f
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/relation/poll/DefaultFetchPollResponseEventsTaskTest.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.relation.poll
+
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.isPollResponse
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.query.copyToRealmOrIgnore
+import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
+import org.matrix.android.sdk.test.fakes.FakeClock
+import org.matrix.android.sdk.test.fakes.FakeEventDecryptor
+import org.matrix.android.sdk.test.fakes.FakeGlobalErrorReceiver
+import org.matrix.android.sdk.test.fakes.FakeMonarchy
+import org.matrix.android.sdk.test.fakes.FakeRoomApi
+import org.matrix.android.sdk.test.fakes.givenFindAll
+import org.matrix.android.sdk.test.fakes.givenIn
+
+@OptIn(ExperimentalCoroutinesApi::class)
+internal class DefaultFetchPollResponseEventsTaskTest {
+
+    private val fakeRoomAPI = FakeRoomApi()
+    private val fakeGlobalErrorReceiver = FakeGlobalErrorReceiver()
+    private val fakeMonarchy = FakeMonarchy()
+    private val fakeClock = FakeClock()
+    private val fakeEventDecryptor = FakeEventDecryptor()
+
+    private val defaultFetchPollResponseEventsTask = DefaultFetchPollResponseEventsTask(
+            roomAPI = fakeRoomAPI.instance,
+            globalErrorReceiver = fakeGlobalErrorReceiver,
+            monarchy = fakeMonarchy.instance,
+            clock = fakeClock,
+            eventDecryptor = fakeEventDecryptor.instance,
+    )
+
+    @Before
+    fun setup() {
+        mockkStatic("org.matrix.android.sdk.api.session.events.model.EventKt")
+        mockkStatic("org.matrix.android.sdk.internal.database.mapper.EventMapperKt")
+        mockkStatic("org.matrix.android.sdk.internal.database.query.EventEntityQueriesKt")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a room and a poll when execute then fetch related events and store them in local if needed`() = runTest {
+        // Given
+        val aRoomId = "roomId"
+        val aPollEventId = "eventId"
+        val params = givenTaskParams(roomId = aRoomId, eventId = aPollEventId)
+        val aNextBatchToken = "nextBatch"
+        val anEventId1 = "eventId1"
+        val anEventId2 = "eventId2"
+        val anEventId3 = "eventId3"
+        val anEventId4 = "eventId4"
+        val event1 = givenAnEvent(eventId = anEventId1, isPollResponse = true, isEncrypted = true)
+        val event2 = givenAnEvent(eventId = anEventId2, isPollResponse = true, isEncrypted = true)
+        val event3 = givenAnEvent(eventId = anEventId3, isPollResponse = false, isEncrypted = false)
+        val event4 = givenAnEvent(eventId = anEventId4, isPollResponse = false, isEncrypted = false)
+        val firstEvents = listOf(event1, event2)
+        val secondEvents = listOf(event3, event4)
+        val firstResponse = givenARelationsResponse(events = firstEvents, nextBatch = aNextBatchToken)
+        fakeRoomAPI.givenGetRelationsReturns(from = null, relationsResponse = firstResponse)
+        val secondResponse = givenARelationsResponse(events = secondEvents, nextBatch = null)
+        fakeRoomAPI.givenGetRelationsReturns(from = aNextBatchToken, relationsResponse = secondResponse)
+        fakeEventDecryptor.givenDecryptEventAndSaveResultSuccess(event1)
+        fakeEventDecryptor.givenDecryptEventAndSaveResultSuccess(event2)
+        fakeClock.givenEpoch(123)
+        givenExistingEventEntities(eventIdsToCheck = listOf(anEventId1, anEventId2), existingIds = listOf(anEventId1))
+        val eventEntityToSave = EventEntity(eventId = anEventId2)
+        every { event2.toEntity(any(), any(), any()) } returns eventEntityToSave
+        every { eventEntityToSave.copyToRealmOrIgnore(any(), any()) } returns eventEntityToSave
+
+        // When
+        defaultFetchPollResponseEventsTask.execute(params)
+
+        // Then
+        fakeRoomAPI.verifyGetRelations(
+                roomId = params.roomId,
+                eventId = params.startPollEventId,
+                relationType = RelationType.REFERENCE,
+                from = null,
+                limit = FETCH_RELATED_EVENTS_LIMIT
+        )
+        fakeRoomAPI.verifyGetRelations(
+                roomId = params.roomId,
+                eventId = params.startPollEventId,
+                relationType = RelationType.REFERENCE,
+                from = aNextBatchToken,
+                limit = FETCH_RELATED_EVENTS_LIMIT
+        )
+        fakeEventDecryptor.verifyDecryptEventAndSaveResult(event1, timeline = "")
+        fakeEventDecryptor.verifyDecryptEventAndSaveResult(event2, timeline = "")
+        // Check we save in DB the event2 which is a non stored poll response
+        verify {
+            event2.toEntity(aRoomId, SendState.SYNCED, any())
+            eventEntityToSave.copyToRealmOrIgnore(fakeMonarchy.fakeRealm.instance, EventInsertType.PAGINATION)
+        }
+    }
+
+    private fun givenTaskParams(roomId: String, eventId: String) = FetchPollResponseEventsTask.Params(
+            roomId = roomId,
+            startPollEventId = eventId,
+    )
+
+    private fun givenARelationsResponse(events: List<Event>, nextBatch: String?): RelationsResponse {
+        return RelationsResponse(
+                chunks = events,
+                nextBatch = nextBatch,
+                prevBatch = null,
+        )
+    }
+
+    private fun givenAnEvent(
+            eventId: String,
+            isPollResponse: Boolean,
+            isEncrypted: Boolean,
+    ): Event {
+        val event = mockk<Event>(relaxed = true)
+        every { event.eventId } returns eventId
+        every { event.isPollResponse() } returns isPollResponse
+        every { event.isEncrypted() } returns isEncrypted
+        return event
+    }
+
+    private fun givenExistingEventEntities(eventIdsToCheck: List<String>, existingIds: List<String>) {
+        val eventEntities = existingIds.map { EventEntity(eventId = it) }
+        fakeMonarchy.givenWhere<EventEntity>()
+                .givenIn(EventEntityFields.EVENT_ID, eventIdsToCheck)
+                .givenFindAll(eventEntities)
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactoryTests.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactoryTests.kt
new file mode 100644
index 0000000000..19f58d690f
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactoryTests.kt
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.room.send
+
+import org.amshove.kluent.internal.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContentWithFormattedBody
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.util.TextContent
+import org.matrix.android.sdk.test.fakes.FakeClock
+import org.matrix.android.sdk.test.fakes.FakeContext
+import org.matrix.android.sdk.test.fakes.internal.session.content.FakeThumbnailExtractor
+import org.matrix.android.sdk.test.fakes.internal.session.permalinks.FakePermalinkFactory
+import org.matrix.android.sdk.test.fakes.internal.session.room.send.FakeLocalEchoRepository
+import org.matrix.android.sdk.test.fakes.internal.session.room.send.FakeMarkdownParser
+import org.matrix.android.sdk.test.fakes.internal.session.room.send.FakeWaveFormSanitizer
+import org.matrix.android.sdk.test.fakes.internal.session.room.send.pills.FakeTextPillsUtils
+
+@Suppress("MaxLineLength")
+class LocalEchoEventFactoryTests {
+
+    companion object {
+        internal const val A_USER_ID_1 = "@user_1:matrix.org"
+        internal const val A_ROOM_ID = "!sUeOGZKsBValPTUMax:matrix.org"
+        internal const val AN_EVENT_ID = "\$vApgexcL8Vfh-WxYKsFKCDooo67ttbjm3TiVKXaWijU"
+        internal const val AN_EPOCH = 1655210176L
+
+        val A_START_EVENT = Event(
+                type = EventType.STATE_ROOM_CREATE,
+                eventId = AN_EVENT_ID,
+                originServerTs = 1652435922563,
+                senderId = A_USER_ID_1,
+                roomId = A_ROOM_ID
+        )
+    }
+
+    private val fakeContext = FakeContext()
+    private val fakeMarkdownParser = FakeMarkdownParser()
+    private val fakeTextPillsUtils = FakeTextPillsUtils()
+    private val fakeThumbnailExtractor = FakeThumbnailExtractor()
+    private val fakeWaveFormSanitizer = FakeWaveFormSanitizer()
+    private val fakeLocalEchoRepository = FakeLocalEchoRepository()
+    private val fakePermalinkFactory = FakePermalinkFactory()
+    private val fakeClock = FakeClock()
+
+    private val localEchoEventFactory = LocalEchoEventFactory(
+            context = fakeContext.instance,
+            userId = A_USER_ID_1,
+            markdownParser = fakeMarkdownParser.instance,
+            textPillsUtils = fakeTextPillsUtils.instance,
+            thumbnailExtractor = fakeThumbnailExtractor.instance,
+            waveformSanitizer = fakeWaveFormSanitizer.instance,
+            localEchoRepository = fakeLocalEchoRepository.instance,
+            permalinkFactory = fakePermalinkFactory.instance,
+            clock = fakeClock
+    )
+
+    @Before
+    fun setup() {
+        fakeClock.givenEpoch(AN_EPOCH)
+        fakeMarkdownParser.givenBoldMarkdown()
+    }
+
+    @Test
+    fun `given a null quotedText, when a quote event is created, then the result message should only contain the new text after new lines`() {
+        val event = createTimelineEvent(null, null)
+        val quotedContent = localEchoEventFactory.createQuotedTextEvent(
+                roomId = A_ROOM_ID,
+                quotedEvent = event,
+                text = "Text",
+                formattedText = null,
+                autoMarkdown = false,
+                rootThreadEventId = null,
+                additionalContent = null,
+        ).content.toModel<MessageContent>()
+        assertEquals("\n\nText", quotedContent?.body)
+        assertEquals("<br/>Text", (quotedContent as? MessageContentWithFormattedBody)?.formattedBody)
+    }
+
+    @Test
+    fun `given a plain text quoted message, when a quote event is created, then the result message should contain both the quoted and new text`() {
+        val event = createTimelineEvent("Quoted", null)
+        val quotedContent = localEchoEventFactory.createQuotedTextEvent(
+                roomId = A_ROOM_ID,
+                quotedEvent = event,
+                text = "Text",
+                formattedText = null,
+                autoMarkdown = false,
+                rootThreadEventId = null,
+                additionalContent = null,
+        ).content.toModel<MessageContent>()
+        assertEquals("> Quoted\n\nText", quotedContent?.body)
+        assertEquals("<blockquote>Quoted</blockquote><br/>Text", (quotedContent as? MessageContentWithFormattedBody)?.formattedBody)
+    }
+
+    @Test
+    fun `given a formatted text quoted message, when a quote event is created, then the result message should contain both the formatted quote and new text`() {
+        val event = createTimelineEvent("Quoted", "<b>Quoted</b>")
+        val quotedContent = localEchoEventFactory.createQuotedTextEvent(
+                roomId = A_ROOM_ID,
+                quotedEvent = event,
+                text = "Text",
+                formattedText = null,
+                autoMarkdown = false,
+                rootThreadEventId = null,
+                additionalContent = null,
+        ).content.toModel<MessageContent>()
+        // This still uses the plain text version
+        assertEquals("> Quoted\n\nText", quotedContent?.body)
+        // This one has the formatted one
+        assertEquals("<blockquote><b>Quoted</b></blockquote><br/>Text", (quotedContent as? MessageContentWithFormattedBody)?.formattedBody)
+    }
+
+    @Test
+    fun `given formatted text quoted message and new message, when a quote event is created, then the result message should contain both the formatted quote and new formatted text`() {
+        val event = createTimelineEvent("Quoted", "<b>Quoted</b>")
+        val quotedContent = localEchoEventFactory.createQuotedTextEvent(
+                roomId = A_ROOM_ID,
+                quotedEvent = event,
+                text = "Text",
+                formattedText = "<b>Formatted text</b>",
+                autoMarkdown = false,
+                rootThreadEventId = null,
+                additionalContent = null,
+        ).content.toModel<MessageContent>()
+        // This still uses the plain text version
+        assertEquals("> Quoted\n\nText", quotedContent?.body)
+        // This one has the formatted one
+        assertEquals(
+                "<blockquote><b>Quoted</b></blockquote><br/><b>Formatted text</b>",
+                (quotedContent as? MessageContentWithFormattedBody)?.formattedBody
+        )
+    }
+
+    @Test
+    fun `given formatted text quoted message and new message with autoMarkdown, when a quote event is created, then the result message should contain both the formatted quote and new formatted text, not the markdown processed text`() {
+        val event = createTimelineEvent("Quoted", "<b>Quoted</b>")
+        val quotedContent = localEchoEventFactory.createQuotedTextEvent(
+                roomId = A_ROOM_ID,
+                quotedEvent = event,
+                text = "Text",
+                formattedText = "<b>Formatted text</b>",
+                autoMarkdown = true,
+                rootThreadEventId = null,
+                additionalContent = null,
+        ).content.toModel<MessageContent>()
+        // This still uses the plain text version
+        assertEquals("> Quoted\n\nText", quotedContent?.body)
+        // This one has the formatted one
+        assertEquals(
+                "<blockquote><b>Quoted</b></blockquote><br/><b>Formatted text</b>",
+                (quotedContent as? MessageContentWithFormattedBody)?.formattedBody
+        )
+    }
+
+    @Test
+    fun `given a formatted text quoted message and a new message with autoMarkdown, when a quote event is created, then the result message should contain both the formatted quote and new processed formatted text`() {
+        val event = createTimelineEvent("Quoted", "<b>Quoted</b>")
+        val quotedContent = localEchoEventFactory.createQuotedTextEvent(
+                roomId = A_ROOM_ID,
+                quotedEvent = event,
+                text = "**Text**",
+                formattedText = null,
+                autoMarkdown = true,
+                rootThreadEventId = null,
+                additionalContent = null,
+        ).content.toModel<MessageContent>()
+        // This still uses the markdown text version
+        assertEquals("> Quoted\n\n**Text**", quotedContent?.body)
+        // This one has the formatted one
+        assertEquals(
+                "<blockquote><b>Quoted</b></blockquote><br/><b>Text</b>",
+                (quotedContent as? MessageContentWithFormattedBody)?.formattedBody
+        )
+    }
+
+    @Test
+    fun `given a plain text quoted message and a new message with autoMarkdown, when a quote event is created, then the result message should the plain text quote and new processed formatted text`() {
+        val event = createTimelineEvent("Quoted", null)
+        val quotedContent = localEchoEventFactory.createQuotedTextEvent(
+                roomId = A_ROOM_ID,
+                quotedEvent = event,
+                text = "**Text**",
+                formattedText = null,
+                autoMarkdown = true,
+                rootThreadEventId = null,
+                additionalContent = null,
+        ).content.toModel<MessageContent>()
+        // This still uses the markdown text version
+        assertEquals("> Quoted\n\n**Text**", quotedContent?.body)
+        // This one has the formatted one
+        assertEquals(
+                "<blockquote>Quoted</blockquote><br/><b>Text</b>",
+                (quotedContent as? MessageContentWithFormattedBody)?.formattedBody
+        )
+    }
+
+    private fun createTimelineEvent(quotedText: String?, formattedQuotedText: String?): TimelineEvent {
+        val textContent = quotedText?.let {
+            TextContent(
+                    quotedText,
+                    formattedQuotedText
+            ).toMessageTextContent().toContent()
+        }
+        return TimelineEvent(
+                root = A_START_EVENT.copy(
+                        type = EventType.MESSAGE,
+                        content = textContent
+                ),
+                localId = 1234,
+                eventId = AN_EVENT_ID,
+                displayIndex = 0,
+                senderInfo = SenderInfo(A_USER_ID_1, A_USER_ID_1, true, null),
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultDeleteUserAccountDataTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultDeleteUserAccountDataTaskTest.kt
new file mode 100644
index 0000000000..86580127dc
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultDeleteUserAccountDataTaskTest.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.session.user.accountdata
+
+import io.mockk.coVerify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.android.sdk.test.fakes.FakeAccountDataApi
+import org.matrix.android.sdk.test.fakes.FakeGlobalErrorReceiver
+
+private const val A_TYPE = "a-type"
+private const val A_USER_ID = "a-user-id"
+
+@ExperimentalCoroutinesApi
+class DefaultDeleteUserAccountDataTaskTest {
+
+    private val fakeGlobalErrorReceiver = FakeGlobalErrorReceiver()
+    private val fakeAccountDataApi = FakeAccountDataApi()
+
+    private val deleteUserAccountDataTask = DefaultDeleteUserAccountDataTask(
+            accountDataApi = fakeAccountDataApi.instance,
+            userId = A_USER_ID,
+            globalErrorReceiver = fakeGlobalErrorReceiver
+    )
+
+    @Test
+    fun `given parameters when executing the task then api is called`() = runTest {
+        // Given
+        val params = DeleteUserAccountDataTask.Params(type = A_TYPE)
+        fakeAccountDataApi.givenParamsToDeleteAccountData(A_USER_ID, A_TYPE)
+
+        // When
+        deleteUserAccountDataTask.execute(params)
+
+        // Then
+        coVerify { fakeAccountDataApi.instance.deleteAccountData(A_USER_ID, A_TYPE) }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/sync/DefaultGetCurrentFilterTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/sync/DefaultGetCurrentFilterTaskTest.kt
new file mode 100644
index 0000000000..f3ab65f6c4
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/sync/DefaultGetCurrentFilterTaskTest.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.internal.sync
+
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.SyncConfig
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.api.session.sync.filter.SyncFilterParams
+import org.matrix.android.sdk.internal.session.filter.DefaultGetCurrentFilterTask
+import org.matrix.android.sdk.internal.sync.filter.SyncFilterBuilder
+import org.matrix.android.sdk.test.fakes.FakeFilterRepository
+import org.matrix.android.sdk.test.fakes.FakeHomeServerCapabilitiesDataSource
+import org.matrix.android.sdk.test.fakes.FakeSaveFilterTask
+
+private const val A_FILTER_ID = "filter-id"
+private val A_HOMESERVER_CAPABILITIES = HomeServerCapabilities()
+private val A_SYNC_FILTER_PARAMS = SyncFilterParams(
+        lazyLoadMembersForStateEvents = true,
+        useThreadNotifications = true
+)
+
+@ExperimentalCoroutinesApi
+class DefaultGetCurrentFilterTaskTest {
+
+    private val filterRepository = FakeFilterRepository()
+    private val homeServerCapabilitiesDataSource = FakeHomeServerCapabilitiesDataSource()
+    private val saveFilterTask = FakeSaveFilterTask()
+
+    private val getCurrentFilterTask = DefaultGetCurrentFilterTask(
+            filterRepository = filterRepository,
+            homeServerCapabilitiesDataSource = homeServerCapabilitiesDataSource.instance,
+            saveFilterTask = saveFilterTask,
+            matrixConfiguration = MatrixConfiguration(
+                    applicationFlavor = "TestFlavor",
+                    roomDisplayNameFallbackProvider = mockk(),
+                    syncConfig = SyncConfig(syncFilterParams = SyncFilterParams(lazyLoadMembersForStateEvents = true, useThreadNotifications = true)),
+            )
+    )
+
+    @Test
+    fun `given no filter is stored, when execute, then executes task to save new filter`() = runTest {
+        homeServerCapabilitiesDataSource.givenHomeServerCapabilities(A_HOMESERVER_CAPABILITIES)
+
+        filterRepository.givenFilterStored(null, null)
+
+        getCurrentFilterTask.execute(Unit)
+
+        val filter = SyncFilterBuilder()
+                .with(A_SYNC_FILTER_PARAMS)
+                .build(A_HOMESERVER_CAPABILITIES)
+
+        saveFilterTask.verifyExecution(filter)
+    }
+
+    @Test
+    fun `given filter is stored and didn't change, when execute, then returns stored filter id`() = runTest {
+        homeServerCapabilitiesDataSource.givenHomeServerCapabilities(A_HOMESERVER_CAPABILITIES)
+
+        val filter = SyncFilterBuilder().with(A_SYNC_FILTER_PARAMS).build(A_HOMESERVER_CAPABILITIES)
+        filterRepository.givenFilterStored(A_FILTER_ID, filter.toJSONString())
+
+        val result = getCurrentFilterTask.execute(Unit)
+
+        result shouldBeEqualTo A_FILTER_ID
+    }
+
+    @Test
+    fun `given filter is set and home server capabilities has changed, when execute, then executes task to save new filter`() = runTest {
+        homeServerCapabilitiesDataSource.givenHomeServerCapabilities(A_HOMESERVER_CAPABILITIES)
+
+        val filter = SyncFilterBuilder().with(A_SYNC_FILTER_PARAMS).build(A_HOMESERVER_CAPABILITIES)
+        filterRepository.givenFilterStored(A_FILTER_ID, filter.toJSONString())
+
+        val newHomeServerCapabilities = HomeServerCapabilities(canUseThreadReadReceiptsAndNotifications = true)
+        homeServerCapabilitiesDataSource.givenHomeServerCapabilities(newHomeServerCapabilities)
+        val newFilter = SyncFilterBuilder().with(A_SYNC_FILTER_PARAMS).build(newHomeServerCapabilities)
+
+        getCurrentFilterTask.execute(Unit)
+
+        saveFilterTask.verifyExecution(newFilter)
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeAccountDataApi.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeAccountDataApi.kt
new file mode 100644
index 0000000000..f3acc02458
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeAccountDataApi.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.coEvery
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataAPI
+
+internal class FakeAccountDataApi {
+
+    val instance: AccountDataAPI = mockk()
+
+    fun givenParamsToDeleteAccountData(userId: String, type: String) {
+        coEvery { instance.deleteAccountData(userId, type) } just runs
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeAddPusherTask.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeAddPusherTask.kt
new file mode 100644
index 0000000000..16cdd7a626
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeAddPusherTask.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.pushers.AddPusherTask
+
+class FakeAddPusherTask : AddPusherTask by mockk()
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeClipboardManager.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeClipboardManager.kt
new file mode 100644
index 0000000000..bce8b41aa9
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeClipboardManager.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import io.mockk.verify
+
+class FakeClipboardManager {
+    val instance = mockk<ClipboardManager>()
+
+    fun givenSetPrimaryClip() {
+        every { instance.setPrimaryClip(any()) } just runs
+    }
+
+    fun verifySetPrimaryClip(clipData: ClipData) {
+        verify { instance.setPrimaryClip(clipData) }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeConnectivityManager.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeConnectivityManager.kt
new file mode 100644
index 0000000000..5c3a245c51
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeConnectivityManager.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import io.mockk.every
+import io.mockk.mockk
+
+class FakeConnectivityManager {
+    val instance = mockk<ConnectivityManager>()
+
+    fun givenNoActiveConnection() {
+        every { instance.activeNetwork } returns null
+    }
+
+    fun givenHasActiveConnection() {
+        val network = mockk<Network>()
+        every { instance.activeNetwork } returns network
+
+        val networkCapabilities = FakeNetworkCapabilities()
+        networkCapabilities.givenTransports(
+                NetworkCapabilities.TRANSPORT_CELLULAR,
+                NetworkCapabilities.TRANSPORT_WIFI,
+                NetworkCapabilities.TRANSPORT_VPN
+        )
+        every { instance.getNetworkCapabilities(network) } returns networkCapabilities.instance
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeContext.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeContext.kt
new file mode 100644
index 0000000000..966c6a1bb2
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeContext.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import android.content.ClipboardManager
+import android.content.ContentResolver
+import android.content.Context
+import android.content.Intent
+import android.net.ConnectivityManager
+import android.net.Uri
+import android.os.ParcelFileDescriptor
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import java.io.OutputStream
+
+class FakeContext(
+        private val contentResolver: ContentResolver = mockk()
+) {
+
+    val instance = mockk<Context>()
+
+    init {
+        every { instance.contentResolver } returns contentResolver
+        every { instance.applicationContext } returns instance
+    }
+
+    fun givenFileDescriptor(uri: Uri, mode: String, factory: () -> ParcelFileDescriptor?) {
+        val fileDescriptor = factory()
+        every { contentResolver.openFileDescriptor(uri, mode, null) } returns fileDescriptor
+    }
+
+    fun givenSafeOutputStreamFor(uri: Uri): OutputStream {
+        val outputStream = mockk<OutputStream>(relaxed = true)
+        every { contentResolver.openOutputStream(uri, "wt") } returns outputStream
+        return outputStream
+    }
+
+    fun givenMissingSafeOutputStreamFor(uri: Uri) {
+        every { contentResolver.openOutputStream(uri, "wt") } returns null
+    }
+
+    fun givenNoConnection() {
+        val connectivityManager = FakeConnectivityManager()
+        connectivityManager.givenNoActiveConnection()
+        givenService(Context.CONNECTIVITY_SERVICE, ConnectivityManager::class.java, connectivityManager.instance)
+    }
+
+    fun <T> givenService(name: String, klass: Class<T>, service: T) {
+        every { instance.getSystemService(name) } returns service
+        every { instance.getSystemService(klass) } returns service
+    }
+
+    fun givenHasConnection() {
+        val connectivityManager = FakeConnectivityManager()
+        connectivityManager.givenHasActiveConnection()
+        givenService(Context.CONNECTIVITY_SERVICE, ConnectivityManager::class.java, connectivityManager.instance)
+    }
+
+    fun givenStartActivity(intent: Intent) {
+        every { instance.startActivity(intent) } just runs
+    }
+
+    fun givenClipboardManager(): FakeClipboardManager {
+        val fakeClipboardManager = FakeClipboardManager()
+        givenService(Context.CLIPBOARD_SERVICE, ClipboardManager::class.java, fakeClipboardManager.instance)
+        return fakeClipboardManager
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeEventDecryptor.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeEventDecryptor.kt
new file mode 100644
index 0000000000..f2b62ad3ba
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeEventDecryptor.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.mockk
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.crypto.EventDecryptor
+
+internal class FakeEventDecryptor {
+    val instance: EventDecryptor = mockk()
+
+    fun givenDecryptEventAndSaveResultSuccess(event: Event) {
+        coJustRun { instance.decryptEventAndSaveResult(event, any()) }
+    }
+
+    fun verifyDecryptEventAndSaveResult(event: Event, timeline: String) {
+        coVerify { instance.decryptEventAndSaveResult(event, timeline) }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFetchPollResponseEventsTask.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFetchPollResponseEventsTask.kt
new file mode 100644
index 0000000000..cb75d8b708
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFetchPollResponseEventsTask.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.room.relation.poll.FetchPollResponseEventsTask
+
+class FakeFetchPollResponseEventsTask : FetchPollResponseEventsTask by mockk(relaxed = true)
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFilterRepository.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFilterRepository.kt
new file mode 100644
index 0000000000..27a39120f8
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFilterRepository.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.coEvery
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.filter.FilterRepository
+
+internal class FakeFilterRepository : FilterRepository by mockk() {
+
+    fun givenFilterStored(filterId: String?, filterBody: String?) {
+        coEvery { getStoredSyncFilterId() } returns filterId
+        coEvery { getStoredSyncFilterBody() } returns filterBody
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeGetPushersTask.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeGetPushersTask.kt
new file mode 100644
index 0000000000..d5a41bb0e0
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeGetPushersTask.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.pushers.GetPushersTask
+
+class FakeGetPushersTask : GetPushersTask by mockk()
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeHomeServerCapabilitiesDataSource.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeHomeServerCapabilitiesDataSource.kt
new file mode 100644
index 0000000000..9a56a599d1
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeHomeServerCapabilitiesDataSource.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.internal.session.homeserver.HomeServerCapabilitiesDataSource
+
+internal class FakeHomeServerCapabilitiesDataSource {
+    val instance = mockk<HomeServerCapabilitiesDataSource>()
+
+    fun givenHomeServerCapabilities(homeServerCapabilities: HomeServerCapabilities) {
+        every { instance.getHomeServerCapabilities() } returns homeServerCapabilities
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeMonarchy.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeMonarchy.kt
index d77084fe3b..76ede75910 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeMonarchy.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeMonarchy.kt
@@ -33,15 +33,26 @@ import org.matrix.android.sdk.internal.util.awaitTransaction
 internal class FakeMonarchy {
 
     val instance = mockk<Monarchy>()
-    private val fakeRealm = FakeRealm()
+    val fakeRealm = FakeRealm()
 
     init {
         mockkStatic("org.matrix.android.sdk.internal.util.MonarchyKt")
         coEvery {
-            instance.awaitTransaction(any<suspend (Realm) -> Any>())
-        } coAnswers {
-            secondArg<suspend (Realm) -> Any>().invoke(fakeRealm.instance)
+            instance.awaitTransaction(any<(Realm) -> Any>())
+        } answers {
+            secondArg<(Realm) -> Any>().invoke(fakeRealm.instance)
         }
+        coEvery {
+            instance.doWithRealm(any())
+        } coAnswers {
+            firstArg<Monarchy.RealmBlock>().doWithRealm(fakeRealm.instance)
+        }
+        coEvery {
+            instance.runTransactionSync(any())
+        } coAnswers {
+            firstArg<Realm.Transaction>().execute(fakeRealm.instance)
+        }
+        every { instance.realmConfiguration } returns mockk()
     }
 
     inline fun <reified T : RealmModel> givenWhere(): RealmQuery<T> {
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeNetworkCapabilities.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeNetworkCapabilities.kt
new file mode 100644
index 0000000000..c630b94d47
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeNetworkCapabilities.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import android.net.NetworkCapabilities
+import io.mockk.every
+import io.mockk.mockk
+
+class FakeNetworkCapabilities {
+    val instance = mockk<NetworkCapabilities>()
+
+    fun givenTransports(vararg type: Int) {
+        every { instance.hasTransport(any()) } answers {
+            val input = it.invocation.args.first() as Int
+            type.contains(input)
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealm.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealm.kt
index afdcf111f8..ba124a86aa 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealm.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealm.kt
@@ -109,6 +109,14 @@ inline fun <reified T : RealmModel> RealmQuery<T>.givenLessThan(
     return this
 }
 
+inline fun <reified T : RealmModel> RealmQuery<T>.givenIn(
+        fieldName: String,
+        values: List<String>,
+): RealmQuery<T> {
+    every { `in`(fieldName, values.toTypedArray()) } returns this
+    return this
+}
+
 /**
  * Should be called on a mocked RealmObject and not on a real RealmObject so that the underlying final method is mocked.
  */
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealmConfiguration.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealmConfiguration.kt
index 15a9823c79..9ad7032262 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealmConfiguration.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealmConfiguration.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.test.fakes
 import io.mockk.coEvery
 import io.mockk.mockk
 import io.mockk.mockkStatic
-import io.mockk.slot
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import org.matrix.android.sdk.internal.database.awaitTransaction
@@ -33,9 +32,8 @@ internal class FakeRealmConfiguration {
     val instance = mockk<RealmConfiguration>()
 
     fun <T> givenAwaitTransaction(realm: Realm) {
-        val transaction = slot<suspend (Realm) -> T>()
-        coEvery { awaitTransaction(instance, capture(transaction)) } coAnswers {
-            secondArg<suspend (Realm) -> T>().invoke(realm)
+        coEvery { awaitTransaction(instance, any<(Realm) -> T>()) } answers {
+            secondArg<(Realm) -> T>().invoke(realm)
         }
     }
 }
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRemovePusherTask.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRemovePusherTask.kt
new file mode 100644
index 0000000000..55a7607a03
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRemovePusherTask.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.pushers.RemovePusherTask
+
+class FakeRemovePusherTask : RemovePusherTask by mockk()
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRoomApi.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRoomApi.kt
new file mode 100644
index 0000000000..68dbbe7ea6
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRoomApi.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
+
+internal class FakeRoomApi {
+
+    val instance: RoomAPI = mockk()
+
+    fun givenGetRelationsReturns(
+            from: String?,
+            relationsResponse: RelationsResponse,
+    ) {
+        coEvery {
+            instance.getRelations(
+                    roomId = any(),
+                    eventId = any(),
+                    relationType = any(),
+                    from = from,
+                    limit = any()
+            )
+        } returns relationsResponse
+    }
+
+    fun verifyGetRelations(
+            roomId: String,
+            eventId: String,
+            relationType: String,
+            from: String?,
+            limit: Int,
+    ) {
+        coVerify {
+            instance.getRelations(
+                    roomId = roomId,
+                    eventId = eventId,
+                    relationType = relationType,
+                    from = from,
+                    limit = limit
+            )
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRoomSummaryDataSource.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRoomSummaryDataSource.kt
new file mode 100644
index 0000000000..c7b70a3ad5
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRoomSummaryDataSource.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import org.matrix.android.sdk.api.session.room.model.LocalRoomSummary
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
+
+internal class FakeRoomSummaryDataSource {
+
+    val instance: RoomSummaryDataSource = mockk()
+
+    fun givenGetLocalRoomSummaryReturns(roomId: String?, localRoomSummary: LocalRoomSummary?) {
+        every { instance.getLocalRoomSummary(roomId = roomId ?: any()) } returns localRoomSummary
+    }
+
+    fun verifyGetLocalRoomSummary(roomId: String) {
+        verify { instance.getLocalRoomSummary(roomId) }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeSaveFilterTask.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeSaveFilterTask.kt
new file mode 100644
index 0000000000..40bee227e0
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeSaveFilterTask.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import io.mockk.slot
+import org.amshove.kluent.shouldBeEqualTo
+import org.matrix.android.sdk.internal.session.filter.Filter
+import org.matrix.android.sdk.internal.session.filter.SaveFilterTask
+import java.util.UUID
+
+internal class FakeSaveFilterTask : SaveFilterTask by mockk() {
+
+    init {
+        coEvery { execute(any()) } returns UUID.randomUUID().toString()
+    }
+
+    fun verifyExecution(filter: Filter) {
+        val slot = slot<SaveFilterTask.Params>()
+        coVerify { execute(capture(slot)) }
+        val params = slot.captured
+        params.filter shouldBeEqualTo filter
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeStateEventDataSource.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeStateEventDataSource.kt
index ca03316fa7..ebb2a1d7a0 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeStateEventDataSource.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeStateEventDataSource.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.test.fakes
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
-import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.QueryStateEventValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
 
@@ -37,12 +37,12 @@ internal class FakeStateEventDataSource {
         } returns event
     }
 
-    fun verifyGetStateEvent(roomId: String, eventType: String, stateKey: String) {
+    fun verifyGetStateEvent(roomId: String, eventType: String, stateKey: QueryStateEventValue) {
         verify {
             instance.getStateEvent(
                     roomId = roomId,
                     eventType = eventType,
-                    stateKey = QueryStringValue.Equals(stateKey)
+                    stateKey = stateKey
             )
         }
     }
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeTaskExecutor.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeTaskExecutor.kt
new file mode 100644
index 0000000000..543dda8a4f
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeTaskExecutor.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.task.TaskExecutor
+
+internal class FakeTaskExecutor {
+
+    val instance: TaskExecutor = mockk()
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeTogglePusherTask.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeTogglePusherTask.kt
new file mode 100644
index 0000000000..b1e059a40e
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeTogglePusherTask.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes
+
+import io.mockk.coVerify
+import io.mockk.mockk
+import io.mockk.slot
+import org.amshove.kluent.shouldBeEqualTo
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.internal.session.pushers.TogglePusherTask
+
+class FakeTogglePusherTask : TogglePusherTask by mockk(relaxed = true) {
+
+    fun verifyExecution(pusher: Pusher, enable: Boolean) {
+        val slot = slot<TogglePusherTask.Params>()
+        coVerify { execute(capture(slot)) }
+        val params = slot.captured
+        params.pusher.pushKey shouldBeEqualTo pusher.pushKey
+        params.enable shouldBeEqualTo enable
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/FakePushGatewayNotifyTask.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/FakePushGatewayNotifyTask.kt
new file mode 100644
index 0000000000..46a106dcb2
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/FakePushGatewayNotifyTask.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes.internal
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.pushers.gateway.PushGatewayNotifyTask
+
+class FakePushGatewayNotifyTask : PushGatewayNotifyTask by mockk()
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/content/FakeThumbnailExtractor.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/content/FakeThumbnailExtractor.kt
new file mode 100644
index 0000000000..b541d24161
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/content/FakeThumbnailExtractor.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes.internal.session.content
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.content.ThumbnailExtractor
+
+class FakeThumbnailExtractor {
+    internal val instance = mockk<ThumbnailExtractor>()
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/permalinks/FakePermalinkFactory.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/permalinks/FakePermalinkFactory.kt
new file mode 100644
index 0000000000..3d7e85424e
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/permalinks/FakePermalinkFactory.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes.internal.session.permalinks
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory
+
+class FakePermalinkFactory {
+    internal val instance = mockk<PermalinkFactory>()
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/FakeLocalEchoRepository.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/FakeLocalEchoRepository.kt
new file mode 100644
index 0000000000..b10d13824b
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/FakeLocalEchoRepository.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes.internal.session.room.send
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
+
+class FakeLocalEchoRepository {
+    internal val instance = mockk<LocalEchoRepository>()
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/FakeMarkdownParser.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/FakeMarkdownParser.kt
new file mode 100644
index 0000000000..a27c9284e7
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/FakeMarkdownParser.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes.internal.session.room.send
+
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.util.TextContent
+import org.matrix.android.sdk.internal.session.room.send.MarkdownParser
+
+class FakeMarkdownParser {
+    internal val instance = mockk<MarkdownParser>()
+    fun givenBoldMarkdown() {
+        every { instance.parse(any(), any(), any()) } answers {
+            val text = arg<String>(0)
+            TextContent(text, "<b>${text.replace("*", "")}</b>")
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/FakeWaveFormSanitizer.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/FakeWaveFormSanitizer.kt
new file mode 100644
index 0000000000..052ddf7831
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/FakeWaveFormSanitizer.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes.internal.session.room.send
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.room.send.WaveFormSanitizer
+
+class FakeWaveFormSanitizer {
+    internal val instance = mockk<WaveFormSanitizer>()
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/pills/FakeTextPillsUtils.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/pills/FakeTextPillsUtils.kt
new file mode 100644
index 0000000000..0d783d6628
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/internal/session/room/send/pills/FakeTextPillsUtils.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fakes.internal.session.room.send.pills
+
+import io.mockk.mockk
+import org.matrix.android.sdk.internal.session.room.send.pills.TextPillsUtils
+
+class FakeTextPillsUtils {
+    internal val instance = mockk<TextPillsUtils>()
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fixtures/JsonPusherFixture.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fixtures/JsonPusherFixture.kt
new file mode 100644
index 0000000000..8e679ff91c
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fixtures/JsonPusherFixture.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fixtures
+
+import org.matrix.android.sdk.internal.session.pushers.JsonPusher
+import org.matrix.android.sdk.internal.session.pushers.JsonPusherData
+
+internal object JsonPusherFixture {
+
+    fun aJsonPusher(
+            pushKey: String = "",
+            kind: String? = null,
+            appId: String = "",
+            appDisplayName: String? = null,
+            deviceDisplayName: String? = null,
+            profileTag: String? = null,
+            lang: String? = null,
+            data: JsonPusherData? = null,
+            append: Boolean? = false,
+            enabled: Boolean = true,
+            deviceId: String? = null,
+    ) = JsonPusher(
+            pushKey,
+            kind,
+            appId,
+            appDisplayName,
+            deviceDisplayName,
+            profileTag,
+            lang,
+            data,
+            append,
+            enabled,
+            deviceId,
+    )
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fixtures/PusherEntityFixture.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fixtures/PusherEntityFixture.kt
new file mode 100644
index 0000000000..8d048d4c9a
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fixtures/PusherEntityFixture.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fixtures
+
+import org.matrix.android.sdk.internal.database.model.PusherDataEntity
+import org.matrix.android.sdk.internal.database.model.PusherEntity
+
+internal object PusherEntityFixture {
+
+    fun aPusherEntity(
+            pushKey: String = "",
+            kind: String? = null,
+            appId: String = "",
+            appDisplayName: String? = null,
+            deviceDisplayName: String? = null,
+            profileTag: String? = null,
+            lang: String? = null,
+            data: PusherDataEntity? = null,
+            enabled: Boolean = true,
+            deviceId: String? = null,
+    ) = PusherEntity(
+            pushKey,
+            kind,
+            appId,
+            appDisplayName,
+            deviceDisplayName,
+            profileTag,
+            lang,
+            data,
+            enabled,
+            deviceId,
+    )
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fixtures/PusherFixture.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fixtures/PusherFixture.kt
new file mode 100644
index 0000000000..0ac7885062
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fixtures/PusherFixture.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package org.matrix.android.sdk.test.fixtures
+
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.api.session.pushers.PusherData
+import org.matrix.android.sdk.api.session.pushers.PusherState
+
+object PusherFixture {
+
+    fun aPusher(
+            pushKey: String = "",
+            kind: String = "",
+            appId: String = "",
+            appDisplayName: String? = "",
+            deviceDisplayName: String? = "",
+            profileTag: String? = null,
+            lang: String? = "",
+            data: PusherData = PusherData("f.o/_matrix/push/v1/notify", ""),
+            enabled: Boolean = true,
+            deviceId: String? = "",
+            state: PusherState = PusherState.REGISTERED,
+    ) = Pusher(
+            pushKey,
+            kind,
+            appId,
+            appDisplayName,
+            deviceDisplayName,
+            profileTag,
+            lang,
+            data,
+            enabled,
+            deviceId,
+            state,
+    )
+}
diff --git a/settings.gradle b/settings.gradle
index 782d2caf4a..d35476f769 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,16 @@
+include ':vector-app'
 include ':vector'
 include ':vector-config'
-include ':matrix-sdk-android'
+
 include ':library:core-utils'
+include ':library:ui-strings'
 include ':library:ui-styles'
-include ':library:jsonviewer'
 include ':library:attachment-viewer'
-include ':library:diff-match-patch'
 include ':library:multipicker'
+
+include ':library:external:jsonviewer'
+include ':library:external:diff-match-patch'
+include ':library:external:dialpad'
+
+include ':matrix-sdk-android'
 include ':matrix-sdk-android-flow'
diff --git a/tools/adb/notification.sh b/tools/adb/notification.sh
new file mode 100755
index 0000000000..3c3c76c787
--- /dev/null
+++ b/tools/adb/notification.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+## From https://developer.android.com/develop/ui/views/notifications/notification-permission#test
+
+PACKAGE_NAME=im.vector.app.debug
+
+# App is newly installed on a device that runs Android 13 or higher:
+
+adb shell pm revoke                 ${PACKAGE_NAME} android.permission.POST_NOTIFICATIONS
+adb shell pm clear-permission-flags ${PACKAGE_NAME} android.permission.POST_NOTIFICATIONS user-set
+adb shell pm clear-permission-flags ${PACKAGE_NAME} android.permission.POST_NOTIFICATIONS user-fixed
+
+# The user keeps notifications enabled when the app is installed on a device that runs 12L or lower,
+# then the device upgrades to Android 13 or higher:
+
+# adb shell pm grant                  ${PACKAGE_NAME} android.permission.POST_NOTIFICATIONS
+# adb shell pm set-permission-flags   ${PACKAGE_NAME} android.permission.POST_NOTIFICATIONS user-set
+# adb shell pm clear-permission-flags ${PACKAGE_NAME} android.permission.POST_NOTIFICATIONS user-fixed
+
+# The user manually disables notifications when the app is installed on a device that runs 12L or lower,
+# then the device upgrades to Android 13 or higher:
+
+# adb shell pm revoke                 ${PACKAGE_NAME} android.permission.POST_NOTIFICATIONS
+# adb shell pm set-permission-flags   ${PACKAGE_NAME} android.permission.POST_NOTIFICATIONS user-set
+# adb shell pm clear-permission-flags ${PACKAGE_NAME} android.permission.POST_NOTIFICATIONS user-fixed
diff --git a/tools/check/check_code_quality.sh b/tools/check/check_code_quality.sh
index 79a42083d3..b9cbfa4cac 100755
--- a/tools/check/check_code_quality.sh
+++ b/tools/check/check_code_quality.sh
@@ -16,21 +16,6 @@
 # limitations under the License.
 #
 
-#######################################################################################################################
-# Check frozen class modification
-#######################################################################################################################
-
-echo "Check if frozen class modified"
-git diff "HEAD@{1}" --name-only | grep -e OlmInboundGroupSessionWrapper.kt -e OlmInboundGroupSessionWrapper2.kt
-FROZEN_CHANGED=$?
-if [ ${FROZEN_CHANGED} -eq 0 ]; then
-  echo "❌ FROZEN CLASS CHANGED ERROR"
-  exit 1
-else
-  echo "Frozen check OK"
-fi
-
-
 #######################################################################################################################
 # Check drawable quantity
 #######################################################################################################################
@@ -83,13 +68,14 @@ ${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_code.txt \
     ./matrix-sdk-android/src/main/java \
     ./matrix-sdk-android-flow/src/main/java \
     ./library/core-utils/src/main/java \
-    ./library/jsonviewer/src/main/java \
+    ./library/external/jsonviewer/src/main/java \
     ./library/ui-styles/src/main/java \
     ./vector/src/main/java \
-    ./vector/src/debug/java \
-    ./vector/src/release/java \
-    ./vector/src/fdroid/java \
-    ./vector/src/gplay/java
+    ./vector-app/src/debug/java \
+    ./vector-app/src/fdroid/java \
+    ./vector-app/src/gplay/java \
+    ./vector-app/src/main/java \
+    ./vector-app/src/release/java
 
 resultForbiddenStringInCode=$?
 
@@ -106,11 +92,15 @@ echo
 echo "Search for forbidden patterns specific for App code..."
 
 ${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_code_app.txt \
+    ./library/core-utils/src/main/java \
+    ./library/external/jsonviewer/src/main/java \
+    ./library/ui-styles/src/main/java \
     ./vector/src/main/java \
-    ./vector/src/debug/java \
-    ./vector/src/release/java \
-    ./vector/src/fdroid/java \
-    ./vector/src/gplay/java
+    ./vector-app/src/debug/java \
+    ./vector-app/src/fdroid/java \
+    ./vector-app/src/gplay/java \
+    ./vector-app/src/main/java \
+    ./vector-app/src/release/java
 
 resultForbiddenStringInCodeApp=$?
 
@@ -122,7 +112,8 @@ ${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_resources.txt
     ./vector/src/main/res/color \
     ./vector/src/main/res/layout \
     ./vector/src/main/res/values \
-    ./vector/src/main/res/xml
+    ./vector/src/main/res/xml \
+    ./vector-app/src/main/res/values
 
 resultForbiddenStringInResource=$?
 
@@ -163,14 +154,20 @@ echo "Search for kotlin files with more than ${maxLines} lines..."
 ${checkLongFilesScript} ${maxLines} \
     ./matrix-sdk-android/src/main/java \
     ./matrix-sdk-android-flow/src/main/java \
+    ./library/core-utils/src/main/java \
+    ./library/external/jsonviewer/src/main/java \
+    ./library/ui-styles/src/main/java \
     ./vector/src/androidTest/java \
-    ./vector/src/debug/java \
-    ./vector/src/fdroid/java \
-    ./vector/src/gplay/java \
     ./vector/src/main/java \
-    ./vector/src/release/java \
     ./vector/src/sharedTest/java \
-    ./vector/src/test/java
+    ./vector/src/test/java \
+    ./vector-app/src/androidTest/java \
+    ./vector-app/src/debug/java \
+    ./vector-app/src/fdroid/java \
+    ./vector-app/src/gplay/java \
+    ./vector-app/src/main/java \
+    ./vector-app/src/release/java
+
 
 resultLongFiles=$?
 
@@ -184,8 +181,11 @@ echo "Search for png files in /drawable..."
 ls -1U ./vector/src/main/res/drawable/*.png
 resultTmp=$?
 
+ls -1U ./vector-app/src/main/res/drawable/*.png
+resultTmp2=$?
+
 # Inverse the result, cause no file found is an error for ls but this is what we want!
-if [[ ${resultTmp} -eq 0 ]]; then
+if [[ ${resultTmp} -eq 0 ]] || [[ ${resultTmp2} -eq 0 ]]; then
    echo "ERROR, png files detected in /drawable"
    resultPngInDrawable=1
 else
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index b12f15fa5d..b4d7ebae1f 100755
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -185,3 +185,6 @@ System\.currentTimeMillis\(\)===2
 onCreateOptionsMenu
 onOptionsItemSelected
 onPrepareOptionsMenu
+
+### Suspicious String template. Please check that the string template will behave as expected, i.e. the class field and not the whole object will be used. For instance `Timber.d("$event.type")` is not correct, you should write `Timber.d("${event.type}")`. In the former the whole event content will be logged, since it's a data class. If this is expected (i.e. to fix false positive), please add explicit curly braces (`{` and `}`) around the variable, for instance `"elementLogs.${i}.txt"`
+\$[a-zA-Z_]\w*\??\.[a-zA-Z_]
diff --git a/tools/danger/dangerfile.js b/tools/danger/dangerfile.js
index 4efd236419..d0b4e6d300 100644
--- a/tools/danger/dangerfile.js
+++ b/tools/danger/dangerfile.js
@@ -52,11 +52,25 @@ if (requiresChangelog) {
     }
 }
 
+// check that frozen classes have not been modified
+const frozenClasses = [
+    "OlmInboundGroupSessionWrapper.kt",
+    "OlmInboundGroupSessionWrapper2.kt",
+]
+
+frozenClasses.forEach(frozen => {
+    if (editedFiles.some(file => file.endsWith(frozen))) {
+        fail("Frozen class `" + frozen + "` has been modified. Please do not modify frozen class.")
+    }
+  }
+)
+
 // Check for a sign-off
 const signOff = "Signed-off-by:"
 
 // Please add new names following the alphabetical order.
 const allowList = [
+    "amitkma",
     "aringenbach",
     "BillCarsonFr",
     "bmarty",
@@ -67,6 +81,8 @@ const allowList = [
     "Florian14",
     "ganfra",
     "jmartinesp",
+    "jonnyandrew",
+    "kittykat",
     "langleyd",
     "MadLittleMods",
     "manuroe",
@@ -105,3 +121,10 @@ if (hasPngs) {
 if (github.requested_reviewers.users.length == 0 && !pr.draft) {
     warn("Please add a reviewer to your PR.")
 }
+
+// Check that translations have not been modified by developers
+if (user != "RiotTranslateBot") {
+   if (editedFiles.some(file => file.endsWith("strings.xml") && !file.endsWith("values/strings.xml"))) {
+       fail("Some translation files have been edited. Only user `RiotTranslateBot` (i.e. translations coming from Weblate) is allowed to do that.\nPlease read more about translations management [in the doc](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#internationalisation).")
+   }
+}
diff --git a/tools/detekt/detekt.yml b/tools/detekt/detekt.yml
index 96adb3d117..62a4fc408f 100644
--- a/tools/detekt/detekt.yml
+++ b/tools/detekt/detekt.yml
@@ -55,7 +55,7 @@ complexity:
     active: false
   LongParameterList:
     active: false
-  ComplexMethod:
+  CyclomaticComplexMethod:
     active: false
   NestedBlockDepth:
     active: false
diff --git a/tools/emojis/emoji_picker_datasource_formatted.json b/tools/emojis/emoji_picker_datasource_formatted.json
index a1b944a7eb..316b6e01d0 100644
--- a/tools/emojis/emoji_picker_datasource_formatted.json
+++ b/tools/emojis/emoji_picker_datasource_formatted.json
@@ -54,6 +54,7 @@
                 "grimacing-face",
                 "face-exhaling",
                 "lying-face",
+                "shaking-face",
                 "relieved-face",
                 "pensive-face",
                 "sleepy-face",
@@ -104,7 +105,7 @@
                 "tired-face",
                 "yawning-face",
                 "face-with-steam-from-nose",
-                "pouting-face",
+                "enraged-face",
                 "angry-face",
                 "face-with-symbols-on-mouth",
                 "smiling-face-with-horns",
@@ -131,7 +132,6 @@
                 "seenoevil-monkey",
                 "hearnoevil-monkey",
                 "speaknoevil-monkey",
-                "kiss-mark",
                 "love-letter",
                 "heart-with-arrow",
                 "heart-with-ribbon",
@@ -146,14 +146,18 @@
                 "heart-on-fire",
                 "mending-heart",
                 "red-heart",
+                "pink-heart",
                 "orange-heart",
                 "yellow-heart",
                 "green-heart",
                 "blue-heart",
+                "light-blue-heart",
                 "purple-heart",
                 "brown-heart",
                 "black-heart",
+                "grey-heart",
                 "white-heart",
+                "kiss-mark",
                 "hundred-points",
                 "anger-symbol",
                 "collision",
@@ -161,7 +165,6 @@
                 "sweat-droplets",
                 "dashing-away",
                 "hole",
-                "bomb",
                 "speech-balloon",
                 "eye-in-speech-bubble",
                 "left-speech-bubble",
@@ -183,6 +186,8 @@
                 "leftwards-hand",
                 "palm-down-hand",
                 "palm-up-hand",
+                "leftwards-pushing-hand",
+                "rightwards-pushing-hand",
                 "ok-hand",
                 "pinched-fingers",
                 "pinching-hand",
@@ -561,6 +566,8 @@
                 "tiger",
                 "leopard",
                 "horse-face",
+                "moose",
+                "donkey",
                 "horse",
                 "unicorn",
                 "zebra",
@@ -623,6 +630,9 @@
                 "flamingo",
                 "peacock",
                 "parrot",
+                "wing",
+                "black-bird",
+                "goose",
                 "frog",
                 "crocodile",
                 "turtle",
@@ -643,6 +653,7 @@
                 "octopus",
                 "spiral-shell",
                 "coral",
+                "jellyfish",
                 "snail",
                 "butterfly",
                 "bug",
@@ -670,6 +681,7 @@
                 "sunflower",
                 "blossom",
                 "tulip",
+                "hyacinth",
                 "seedling",
                 "potted-plant",
                 "evergreen-tree",
@@ -684,7 +696,8 @@
                 "fallen-leaf",
                 "leaf-fluttering-in-wind",
                 "empty-nest",
-                "nest-with-eggs"
+                "nest-with-eggs",
+                "mushroom"
             ]
         },
         {
@@ -722,10 +735,11 @@
                 "broccoli",
                 "garlic",
                 "onion",
-                "mushroom",
                 "peanuts",
                 "beans",
                 "chestnut",
+                "ginger-root",
+                "pea-pod",
                 "bread",
                 "croissant",
                 "baguette-bread",
@@ -1110,11 +1124,10 @@
                 "bullseye",
                 "yoyo",
                 "kite",
+                "water-pistol",
                 "pool-8-ball",
                 "crystal-ball",
                 "magic-wand",
-                "nazar-amulet",
-                "hamsa",
                 "video-game",
                 "joystick",
                 "slot-machine",
@@ -1165,6 +1178,7 @@
                 "shorts",
                 "bikini",
                 "womans-clothes",
+                "folding-hand-fan",
                 "purse",
                 "handbag",
                 "clutch-bag",
@@ -1179,6 +1193,7 @@
                 "womans-sandal",
                 "ballet-shoes",
                 "womans-boot",
+                "hair-pick",
                 "crown",
                 "womans-hat",
                 "top-hat",
@@ -1217,6 +1232,8 @@
                 "banjo",
                 "drum",
                 "long-drum",
+                "maracas",
+                "flute",
                 "mobile-phone",
                 "mobile-phone-with-arrow",
                 "telephone",
@@ -1336,7 +1353,7 @@
                 "hammer-and-wrench",
                 "dagger",
                 "crossed-swords",
-                "water-pistol",
+                "bomb",
                 "boomerang",
                 "bow-and-arrow",
                 "shield",
@@ -1397,6 +1414,8 @@
                 "coffin",
                 "headstone",
                 "funeral-urn",
+                "nazar-amulet",
+                "hamsa",
                 "moai",
                 "placard",
                 "identification-card"
@@ -1465,6 +1484,7 @@
                 "peace-symbol",
                 "menorah",
                 "dotted-sixpointed-star",
+                "khanda",
                 "aries",
                 "taurus",
                 "gemini",
@@ -1500,6 +1520,7 @@
                 "dim-button",
                 "bright-button",
                 "antenna-bars",
+                "wireless",
                 "vibration-mode",
                 "mobile-phone-off",
                 "female-sign",
@@ -2050,7 +2071,7 @@
             ]
         },
         "melting-face": {
-            "a": "⊛ Melting Face",
+            "a": "Melting Face",
             "b": "1FAE0",
             "j": [
                 "disappear",
@@ -2345,7 +2366,7 @@
             ]
         },
         "face-with-open-eyes-and-hand-over-mouth": {
-            "a": "⊛ Face with Open Eyes and Hand over Mouth",
+            "a": "Face with Open Eyes and Hand over Mouth",
             "b": "1FAE2",
             "j": [
                 "amazement",
@@ -2360,7 +2381,7 @@
             ]
         },
         "face-with-peeking-eye": {
-            "a": "⊛ Face with Peeking Eye",
+            "a": "Face with Peeking Eye",
             "b": "1FAE3",
             "j": [
                 "captivated",
@@ -2368,7 +2389,8 @@
                 "stare",
                 "scared",
                 "frightening",
-                "embarrassing"
+                "embarrassing",
+                "shy"
             ]
         },
         "shushing-face": {
@@ -2393,10 +2415,10 @@
             ]
         },
         "saluting-face": {
-            "a": "⊛ Saluting Face",
+            "a": "Saluting Face",
             "b": "1FAE1",
             "j": [
-                "ok",
+                "OK",
                 "salute",
                 "sunny",
                 "troops",
@@ -2469,7 +2491,7 @@
             ]
         },
         "dotted-line-face": {
-            "a": "⊛ Dotted Line Face",
+            "a": "Dotted Line Face",
             "b": "1FAE5",
             "j": [
                 "depressed",
@@ -2569,6 +2591,17 @@
                 "pinocchio"
             ]
         },
+        "shaking-face": {
+            "a": "⊛ Shaking Face",
+            "b": "1FAE8",
+            "j": [
+                "earthquake",
+                "face",
+                "shaking",
+                "shock",
+                "vibrate"
+            ]
+        },
         "relieved-face": {
             "a": "Relieved Face",
             "b": "1F60C",
@@ -2598,6 +2631,7 @@
             "b": "1F62A",
             "j": [
                 "face",
+                "good night",
                 "sleep",
                 "tired",
                 "rest",
@@ -2617,11 +2651,13 @@
             "b": "1F634",
             "j": [
                 "face",
+                "good night",
                 "sleep",
-                "zzz",
+                "ZZZ",
                 "tired",
                 "sleepy",
-                "night"
+                "night",
+                "zzz"
             ]
         },
         "face-with-medical-mask": {
@@ -2634,7 +2670,8 @@
                 "mask",
                 "sick",
                 "ill",
-                "disease"
+                "disease",
+                "covid"
             ]
         },
         "face-with-thermometer": {
@@ -2647,7 +2684,8 @@
                 "thermometer",
                 "temperature",
                 "cold",
-                "fever"
+                "fever",
+                "covid"
             ]
         },
         "face-with-headbandage": {
@@ -2849,9 +2887,10 @@
             "a": "Face with Monocle",
             "b": "1F9D0",
             "j": [
+                "face",
+                "monocle",
                 "stuffy",
-                "wealthy",
-                "face"
+                "wealthy"
             ]
         },
         "confused-face": {
@@ -2869,7 +2908,7 @@
             ]
         },
         "face-with-diagonal-mouth": {
-            "a": "⊛ Face with Diagonal Mouth",
+            "a": "Face with Diagonal Mouth",
             "b": "1FAE4",
             "j": [
                 "disappointed",
@@ -2974,11 +3013,15 @@
                 "begging",
                 "mercy",
                 "puppy eyes",
-                "face"
+                "face",
+                "cry",
+                "tears",
+                "sad",
+                "grievance"
             ]
         },
         "face-holding-back-tears": {
-            "a": "⊛ Face Holding Back Tears",
+            "a": "Face Holding Back Tears",
             "b": "1F979",
             "j": [
                 "angry",
@@ -3021,9 +3064,7 @@
                 "fearful",
                 "scared",
                 "terrified",
-                "nervous",
-                "oops",
-                "huh"
+                "nervous"
             ]
         },
         "anxious-face-with-sweat": {
@@ -3189,16 +3230,18 @@
                 "pride"
             ]
         },
-        "pouting-face": {
-            "a": "Pouting Face",
+        "enraged-face": {
+            "a": "Enraged Face",
             "b": "1F621",
             "j": [
                 "angry",
+                "enraged",
                 "face",
                 "mad",
                 "pouting",
                 "rage",
                 "red",
+                "pouting_face",
                 "hate",
                 "despise"
             ]
@@ -3576,19 +3619,6 @@
                 "omg"
             ]
         },
-        "kiss-mark": {
-            "a": "Kiss Mark",
-            "b": "1F48B",
-            "j": [
-                "kiss",
-                "lips",
-                "face",
-                "love",
-                "like",
-                "affection",
-                "valentines"
-            ]
-        },
         "love-letter": {
             "a": "Love Letter",
             "b": "1F48C",
@@ -3762,6 +3792,17 @@
                 "valentines"
             ]
         },
+        "pink-heart": {
+            "a": "⊛ Pink Heart",
+            "b": "1FA77",
+            "j": [
+                "cute",
+                "heart",
+                "like",
+                "love",
+                "pink"
+            ]
+        },
         "orange-heart": {
             "a": "Orange Heart",
             "b": "1F9E1",
@@ -3806,6 +3847,17 @@
                 "valentines"
             ]
         },
+        "light-blue-heart": {
+            "a": "⊛ Light Blue Heart",
+            "b": "1FA75",
+            "j": [
+                "cyan",
+                "heart",
+                "light blue",
+                "light blue heart",
+                "teal"
+            ]
+        },
         "purple-heart": {
             "a": "Purple Heart",
             "b": "1F49C",
@@ -3835,6 +3887,17 @@
                 "wicked"
             ]
         },
+        "grey-heart": {
+            "a": "⊛ Grey Heart",
+            "b": "1FA76",
+            "j": [
+                "gray",
+                "grey heart",
+                "heart",
+                "silver",
+                "slate"
+            ]
+        },
         "white-heart": {
             "a": "White Heart",
             "b": "1F90D",
@@ -3844,6 +3907,19 @@
                 "pure"
             ]
         },
+        "kiss-mark": {
+            "a": "Kiss Mark",
+            "b": "1F48B",
+            "j": [
+                "kiss",
+                "lips",
+                "face",
+                "love",
+                "like",
+                "affection",
+                "valentines"
+            ]
+        },
         "hundred-points": {
             "a": "Hundred Points",
             "b": "1F4AF",
@@ -3928,17 +4004,6 @@
                 "embarrassing"
             ]
         },
-        "bomb": {
-            "a": "Bomb",
-            "b": "1F4A3",
-            "j": [
-                "comic",
-                "boom",
-                "explode",
-                "explosion",
-                "terrorism"
-            ]
-        },
         "speech-balloon": {
             "a": "Speech Balloon",
             "b": "1F4AC",
@@ -3958,8 +4023,10 @@
             "a": "Eye in Speech Bubble",
             "b": "1F441-FE0F-200D-1F5E8-FE0F",
             "j": [
+                "balloon",
+                "bubble",
                 "eye",
-                "speech bubble",
+                "speech",
                 "witness",
                 "info"
             ]
@@ -3968,6 +4035,8 @@
             "a": "Left Speech Bubble",
             "b": "1F5E8",
             "j": [
+                "balloon",
+                "bubble",
                 "dialog",
                 "speech",
                 "words",
@@ -4008,7 +4077,9 @@
             "b": "1F4A4",
             "j": [
                 "comic",
+                "good night",
                 "sleep",
+                "ZZZ",
                 "sleepy",
                 "tired",
                 "dream"
@@ -4078,7 +4149,7 @@
             ]
         },
         "rightwards-hand": {
-            "a": "⊛ Rightwards Hand",
+            "a": "Rightwards Hand",
             "b": "1FAF1",
             "j": [
                 "hand",
@@ -4089,7 +4160,7 @@
             ]
         },
         "leftwards-hand": {
-            "a": "⊛ Leftwards Hand",
+            "a": "Leftwards Hand",
             "b": "1FAF2",
             "j": [
                 "hand",
@@ -4100,7 +4171,7 @@
             ]
         },
         "palm-down-hand": {
-            "a": "⊛ Palm Down Hand",
+            "a": "Palm Down Hand",
             "b": "1FAF3",
             "j": [
                 "dismiss",
@@ -4110,7 +4181,7 @@
             ]
         },
         "palm-up-hand": {
-            "a": "⊛ Palm Up Hand",
+            "a": "Palm Up Hand",
             "b": "1FAF4",
             "j": [
                 "beckon",
@@ -4121,6 +4192,32 @@
                 "demand"
             ]
         },
+        "leftwards-pushing-hand": {
+            "a": "⊛ Leftwards Pushing Hand",
+            "b": "1FAF7",
+            "j": [
+                "high five",
+                "leftward",
+                "leftwards pushing hand",
+                "push",
+                "refuse",
+                "stop",
+                "wait"
+            ]
+        },
+        "rightwards-pushing-hand": {
+            "a": "⊛ Rightwards Pushing Hand",
+            "b": "1FAF8",
+            "j": [
+                "high five",
+                "push",
+                "refuse",
+                "rightward",
+                "rightwards pushing hand",
+                "stop",
+                "wait"
+            ]
+        },
         "ok-hand": {
             "a": "Ok Hand",
             "b": "1F44C",
@@ -4184,7 +4281,7 @@
             ]
         },
         "hand-with-index-finger-and-thumb-crossed": {
-            "a": "⊛ Hand with Index Finger and Thumb Crossed",
+            "a": "Hand with Index Finger and Thumb Crossed",
             "b": "1FAF0",
             "j": [
                 "expensive",
@@ -4226,6 +4323,8 @@
             "j": [
                 "call",
                 "hand",
+                "hang loose",
+                "Shaka",
                 "hands",
                 "gesture",
                 "shaka"
@@ -4311,7 +4410,7 @@
             ]
         },
         "index-pointing-at-the-viewer": {
-            "a": "⊛ Index Pointing at the Viewer",
+            "a": "Index Pointing at the Viewer",
             "b": "1FAF5",
             "j": [
                 "point",
@@ -4427,7 +4526,7 @@
             ]
         },
         "heart-hands": {
-            "a": "⊛ Heart Hands",
+            "a": "Heart Hands",
             "b": "1FAF6",
             "j": [
                 "love",
@@ -4481,7 +4580,9 @@
                 "hope",
                 "wish",
                 "namaste",
-                "highfive"
+                "highfive",
+                "thank you",
+                "appreciate"
             ]
         },
         "writing-hand": {
@@ -4682,7 +4783,7 @@
             ]
         },
         "biting-lip": {
-            "a": "⊛ Biting Lip",
+            "a": "Biting Lip",
             "b": "1FAE6",
             "j": [
                 "anxious",
@@ -6084,7 +6185,7 @@
             ]
         },
         "person-with-crown": {
-            "a": "⊛ Person with Crown",
+            "a": "Person with Crown",
             "b": "1FAC5",
             "j": [
                 "monarch",
@@ -6258,7 +6359,7 @@
             ]
         },
         "pregnant-man": {
-            "a": "⊛ Pregnant Man",
+            "a": "Pregnant Man",
             "b": "1FAC3",
             "j": [
                 "belly",
@@ -6269,7 +6370,7 @@
             ]
         },
         "pregnant-person": {
-            "a": "⊛ Pregnant Person",
+            "a": "Pregnant Person",
             "b": "1FAC4",
             "j": [
                 "belly",
@@ -6665,7 +6766,7 @@
             ]
         },
         "troll": {
-            "a": "⊛ Troll",
+            "a": "Troll",
             "b": "1F9CC",
             "j": [
                 "fairy tale",
@@ -7629,6 +7730,7 @@
             "a": "Person in Bed",
             "b": "1F6CC",
             "j": [
+                "good night",
                 "hotel",
                 "sleep",
                 "bed",
@@ -8510,6 +8612,30 @@
                 "nature"
             ]
         },
+        "moose": {
+            "a": "⊛ Moose",
+            "b": "1FACE",
+            "j": [
+                "animal",
+                "antlers",
+                "elk",
+                "mammal",
+                "moose"
+            ]
+        },
+        "donkey": {
+            "a": "⊛ Donkey",
+            "b": "1FACF",
+            "j": [
+                "animal",
+                "ass",
+                "burro",
+                "donkey",
+                "mammal",
+                "mule",
+                "stubborn"
+            ]
+        },
         "horse": {
             "a": "Horse",
             "b": "1F40E",
@@ -9176,6 +9302,40 @@
                 "nature"
             ]
         },
+        "wing": {
+            "a": "⊛ Wing",
+            "b": "1FABD",
+            "j": [
+                "angelic",
+                "aviation",
+                "bird",
+                "flying",
+                "mythology",
+                "wing"
+            ]
+        },
+        "black-bird": {
+            "a": "⊛ Black Bird",
+            "b": "1F426-200D-2B1B",
+            "j": [
+                "bird",
+                "black",
+                "crow",
+                "raven",
+                "rook"
+            ]
+        },
+        "goose": {
+            "a": "⊛ Goose",
+            "b": "1FABF",
+            "j": [
+                "bird",
+                "fowl",
+                "goose",
+                "honk",
+                "silly"
+            ]
+        },
         "frog": {
             "a": "Frog",
             "b": "1F438",
@@ -9406,7 +9566,7 @@
             ]
         },
         "coral": {
-            "a": "⊛ Coral",
+            "a": "Coral",
             "b": "1FAB8",
             "j": [
                 "ocean",
@@ -9414,6 +9574,19 @@
                 "sea"
             ]
         },
+        "jellyfish": {
+            "a": "⊛ Jellyfish",
+            "b": "1FABC",
+            "j": [
+                "burn",
+                "invertebrate",
+                "jelly",
+                "jellyfish",
+                "marine",
+                "ouch",
+                "stinger"
+            ]
+        },
         "snail": {
             "a": "Snail",
             "b": "1F40C",
@@ -9581,7 +9754,8 @@
                 "amoeba",
                 "bacteria",
                 "virus",
-                "germs"
+                "germs",
+                "covid"
             ]
         },
         "bouquet": {
@@ -9616,7 +9790,7 @@
             ]
         },
         "lotus": {
-            "a": "⊛ Lotus",
+            "a": "Lotus",
             "b": "1FAB7",
             "j": [
                 "Buddhism",
@@ -9657,7 +9831,8 @@
                 "flower",
                 "wilted",
                 "plant",
-                "nature"
+                "nature",
+                "rose"
             ]
         },
         "hibiscus": {
@@ -9704,6 +9879,18 @@
                 "spring"
             ]
         },
+        "hyacinth": {
+            "a": "⊛ Hyacinth",
+            "b": "1FABB",
+            "j": [
+                "bluebonnet",
+                "flower",
+                "hyacinth",
+                "lavender",
+                "lupine",
+                "snapdragon"
+            ]
+        },
         "seedling": {
             "a": "Seedling",
             "b": "1F331",
@@ -9868,7 +10055,7 @@
             ]
         },
         "empty-nest": {
-            "a": "⊛ Empty Nest",
+            "a": "Empty Nest",
             "b": "1FAB9",
             "j": [
                 "nesting",
@@ -9876,13 +10063,22 @@
             ]
         },
         "nest-with-eggs": {
-            "a": "⊛ Nest with Eggs",
+            "a": "Nest with Eggs",
             "b": "1FABA",
             "j": [
                 "nesting",
                 "bird"
             ]
         },
+        "mushroom": {
+            "a": "Mushroom",
+            "b": "1F344",
+            "j": [
+                "toadstool",
+                "plant",
+                "vegetable"
+            ]
+        },
         "grapes": {
             "a": "Grapes",
             "b": "1F347",
@@ -10194,15 +10390,6 @@
                 "spice"
             ]
         },
-        "mushroom": {
-            "a": "Mushroom",
-            "b": "1F344",
-            "j": [
-                "toadstool",
-                "plant",
-                "vegetable"
-            ]
-        },
         "peanuts": {
             "a": "Peanuts",
             "b": "1F95C",
@@ -10214,7 +10401,7 @@
             ]
         },
         "beans": {
-            "a": "⊛ Beans",
+            "a": "Beans",
             "b": "1FAD8",
             "j": [
                 "food",
@@ -10231,6 +10418,28 @@
                 "squirrel"
             ]
         },
+        "ginger-root": {
+            "a": "⊛ Ginger Root",
+            "b": "1FADA",
+            "j": [
+                "beer",
+                "ginger root",
+                "root",
+                "spice"
+            ]
+        },
+        "pea-pod": {
+            "a": "⊛ Pea Pod",
+            "b": "1FADB",
+            "j": [
+                "beans",
+                "edamame",
+                "legume",
+                "pea",
+                "pod",
+                "vegetable"
+            ]
+        },
         "bread": {
             "a": "Bread",
             "b": "1F35E",
@@ -10260,7 +10469,9 @@
                 "baguette",
                 "bread",
                 "food",
-                "french"
+                "french",
+                "france",
+                "bakery"
             ]
         },
         "flatbread": {
@@ -10272,7 +10483,8 @@
                 "naan",
                 "pita",
                 "flour",
-                "food"
+                "food",
+                "bakery"
             ]
         },
         "pretzel": {
@@ -10282,7 +10494,9 @@
                 "twisted",
                 "convoluted",
                 "food",
-                "bread"
+                "bread",
+                "germany",
+                "bakery"
             ]
         },
         "bagel": {
@@ -10293,7 +10507,8 @@
                 "breakfast",
                 "schmear",
                 "food",
-                "bread"
+                "bread",
+                "jewish"
             ]
         },
         "pancakes": {
@@ -10306,7 +10521,8 @@
                 "hotcake",
                 "pancake",
                 "flapjacks",
-                "hotcakes"
+                "hotcakes",
+                "brunch"
             ]
         },
         "waffle": {
@@ -10316,7 +10532,8 @@
                 "breakfast",
                 "indecisive",
                 "iron",
-                "food"
+                "food",
+                "brunch"
             ]
         },
         "cheese-wedge": {
@@ -10325,7 +10542,8 @@
             "j": [
                 "cheese",
                 "food",
-                "chadder"
+                "chadder",
+                "swiss"
             ]
         },
         "meat-on-bone": {
@@ -10376,7 +10594,8 @@
                 "food",
                 "meat",
                 "pork",
-                "pig"
+                "pig",
+                "brunch"
             ]
         },
         "hamburger": {
@@ -10400,7 +10619,8 @@
                 "fries",
                 "chips",
                 "snack",
-                "fast food"
+                "fast food",
+                "potato"
             ]
         },
         "pizza": {
@@ -10410,7 +10630,8 @@
                 "cheese",
                 "slice",
                 "food",
-                "party"
+                "party",
+                "italy"
             ]
         },
         "hot-dog": {
@@ -10420,7 +10641,8 @@
                 "frankfurter",
                 "hotdog",
                 "sausage",
-                "food"
+                "food",
+                "america"
             ]
         },
         "sandwich": {
@@ -10429,7 +10651,9 @@
             "j": [
                 "bread",
                 "food",
-                "lunch"
+                "lunch",
+                "toast",
+                "bakery"
             ]
         },
         "taco": {
@@ -10468,7 +10692,8 @@
                 "food",
                 "gyro",
                 "kebab",
-                "stuffed"
+                "stuffed",
+                "mediterranean"
             ]
         },
         "falafel": {
@@ -10477,7 +10702,8 @@
             "j": [
                 "chickpea",
                 "meatball",
-                "food"
+                "food",
+                "mediterranean"
             ]
         },
         "egg": {
@@ -10498,7 +10724,8 @@
                 "frying",
                 "pan",
                 "food",
-                "kitchen"
+                "kitchen",
+                "skillet"
             ]
         },
         "shallow-pan-of-food": {
@@ -10510,7 +10737,8 @@
                 "paella",
                 "pan",
                 "shallow",
-                "cooking"
+                "cooking",
+                "skillet"
             ]
         },
         "pot-of-food": {
@@ -10521,7 +10749,8 @@
                 "stew",
                 "food",
                 "meat",
-                "soup"
+                "soup",
+                "hot pot"
             ]
         },
         "fondue": {
@@ -10556,7 +10785,8 @@
                 "green",
                 "salad",
                 "healthy",
-                "lettuce"
+                "lettuce",
+                "vegetable"
             ]
         },
         "popcorn": {
@@ -10566,7 +10796,8 @@
                 "food",
                 "movie theater",
                 "films",
-                "snack"
+                "snack",
+                "drama"
             ]
         },
         "butter": {
@@ -10592,7 +10823,8 @@
             "j": [
                 "can",
                 "food",
-                "soup"
+                "soup",
+                "tomatoes"
             ]
         },
         "bento-box": {
@@ -10602,7 +10834,8 @@
                 "bento",
                 "box",
                 "food",
-                "japanese"
+                "japanese",
+                "lunch"
             ]
         },
         "rice-cracker": {
@@ -10612,7 +10845,8 @@
                 "cracker",
                 "rice",
                 "food",
-                "japanese"
+                "japanese",
+                "snack"
             ]
         },
         "rice-ball": {
@@ -10633,7 +10867,6 @@
                 "cooked",
                 "rice",
                 "food",
-                "china",
                 "asian"
             ]
         },
@@ -10680,7 +10913,8 @@
                 "roasted",
                 "sweet",
                 "food",
-                "nature"
+                "nature",
+                "plant"
             ]
         },
         "oden": {
@@ -10745,7 +10979,8 @@
                 "autumn",
                 "festival",
                 "yuèbǐng",
-                "food"
+                "food",
+                "dessert"
             ]
         },
         "dango": {
@@ -10772,7 +11007,8 @@
                 "jiaozi",
                 "pierogi",
                 "potsticker",
-                "food"
+                "food",
+                "gyoza"
             ]
         },
         "fortune-cookie": {
@@ -10780,7 +11016,8 @@
             "b": "1F960",
             "j": [
                 "prophecy",
-                "food"
+                "food",
+                "dessert"
             ]
         },
         "takeout-box": {
@@ -11047,7 +11284,8 @@
                 "tea",
                 "caffeine",
                 "latte",
-                "espresso"
+                "espresso",
+                "mug"
             ]
         },
         "teapot": {
@@ -11222,7 +11460,7 @@
             ]
         },
         "pouring-liquid": {
-            "a": "⊛ Pouring Liquid",
+            "a": "Pouring Liquid",
             "b": "1FAD7",
             "j": [
                 "drink",
@@ -11351,7 +11589,7 @@
             ]
         },
         "jar": {
-            "a": "⊛ Jar",
+            "a": "Jar",
             "b": "1FAD9",
             "j": [
                 "condiment",
@@ -12042,7 +12280,7 @@
             ]
         },
         "playground-slide": {
-            "a": "⊛ Playground Slide",
+            "a": "Playground Slide",
             "b": "1F6DD",
             "j": [
                 "amusement park",
@@ -12573,7 +12811,7 @@
             ]
         },
         "wheel": {
-            "a": "⊛ Wheel",
+            "a": "Wheel",
             "b": "1F6DE",
             "j": [
                 "circle",
@@ -12655,7 +12893,7 @@
             ]
         },
         "ring-buoy": {
-            "a": "⊛ Ring Buoy",
+            "a": "Ring Buoy",
             "b": "1F6DF",
             "j": [
                 "float",
@@ -14124,7 +14362,11 @@
                 "plant",
                 "nature",
                 "branch",
-                "summer"
+                "summer",
+                "bamboo",
+                "wish",
+                "star_festival",
+                "tanzaku"
             ]
         },
         "pine-decoration": {
@@ -14135,10 +14377,12 @@
                 "celebration",
                 "Japanese",
                 "pine",
+                "japanese",
                 "plant",
                 "nature",
                 "vegetable",
-                "panda"
+                "panda",
+                "new_years"
             ]
         },
         "japanese-dolls": {
@@ -14650,6 +14894,20 @@
                 "wind"
             ]
         },
+        "water-pistol": {
+            "a": "Water Pistol",
+            "b": "1F52B",
+            "j": [
+                "gun",
+                "handgun",
+                "pistol",
+                "revolver",
+                "tool",
+                "water",
+                "weapon",
+                "violence"
+            ]
+        },
         "pool-8-ball": {
             "a": "Pool 8 Ball",
             "b": "1F3B1",
@@ -14693,30 +14951,6 @@
                 "power"
             ]
         },
-        "nazar-amulet": {
-            "a": "Nazar Amulet",
-            "b": "1F9FF",
-            "j": [
-                "bead",
-                "charm",
-                "evil-eye",
-                "nazar",
-                "talisman"
-            ]
-        },
-        "hamsa": {
-            "a": "⊛ Hamsa",
-            "b": "1FAAC",
-            "j": [
-                "amulet",
-                "Fatima",
-                "hand",
-                "Mary",
-                "Miriam",
-                "protection",
-                "religion"
-            ]
-        },
         "video-game": {
             "a": "Video Game",
             "b": "1F3AE",
@@ -14798,7 +15032,7 @@
             ]
         },
         "mirror-ball": {
-            "a": "⊛ Mirror Ball",
+            "a": "Mirror Ball",
             "b": "1FAA9",
             "j": [
                 "dance",
@@ -15219,6 +15453,19 @@
                 "female"
             ]
         },
+        "folding-hand-fan": {
+            "a": "⊛ Folding Hand Fan",
+            "b": "1FAAD",
+            "j": [
+                "cooling",
+                "dance",
+                "fan",
+                "flutter",
+                "folding hand fan",
+                "hot",
+                "shy"
+            ]
+        },
         "purse": {
             "a": "Purse",
             "b": "1F45B",
@@ -15393,6 +15640,16 @@
                 "fashion"
             ]
         },
+        "hair-pick": {
+            "a": "⊛ Hair Pick",
+            "b": "1FAAE",
+            "j": [
+                "Afro",
+                "comb",
+                "hair",
+                "pick"
+            ]
+        },
         "crown": {
             "a": "Crown",
             "b": "1F451",
@@ -15831,6 +16088,30 @@
                 "music"
             ]
         },
+        "maracas": {
+            "a": "⊛ Maracas",
+            "b": "1FA87",
+            "j": [
+                "instrument",
+                "maracas",
+                "music",
+                "percussion",
+                "rattle",
+                "shake"
+            ]
+        },
+        "flute": {
+            "a": "⊛ Flute",
+            "b": "1FA88",
+            "j": [
+                "fife",
+                "flute",
+                "music",
+                "pipe",
+                "recorder",
+                "woodwind"
+            ]
+        },
         "mobile-phone": {
             "a": "Mobile Phone",
             "b": "1F4F1",
@@ -15908,7 +16189,7 @@
             ]
         },
         "low-battery": {
-            "a": "⊛ Low Battery",
+            "a": "Low Battery",
             "b": "1FAAB",
             "j": [
                 "electronic",
@@ -16021,7 +16302,7 @@
             "a": "Optical Disk",
             "b": "1F4BF",
             "j": [
-                "cd",
+                "CD",
                 "computer",
                 "disk",
                 "optical",
@@ -16035,9 +16316,10 @@
             "a": "Dvd",
             "b": "1F4C0",
             "j": [
-                "blu-ray",
+                "Blu-ray",
                 "computer",
                 "disk",
+                "DVD",
                 "optical",
                 "cd",
                 "disc"
@@ -17225,18 +17507,15 @@
                 "weapon"
             ]
         },
-        "water-pistol": {
-            "a": "Water Pistol",
-            "b": "1F52B",
+        "bomb": {
+            "a": "Bomb",
+            "b": "1F4A3",
             "j": [
-                "gun",
-                "handgun",
-                "pistol",
-                "revolver",
-                "tool",
-                "water",
-                "weapon",
-                "violence"
+                "comic",
+                "boom",
+                "explode",
+                "explosion",
+                "terrorism"
             ]
         },
         "boomerang": {
@@ -17551,7 +17830,7 @@
             ]
         },
         "crutch": {
-            "a": "⊛ Crutch",
+            "a": "Crutch",
             "b": "1FA7C",
             "j": [
                 "cane",
@@ -17574,7 +17853,7 @@
             ]
         },
         "xray": {
-            "a": "⊛ X-Ray",
+            "a": "X-Ray",
             "b": "1FA7B",
             "j": [
                 "bones",
@@ -17781,7 +18060,7 @@
             ]
         },
         "bubbles": {
-            "a": "⊛ Bubbles",
+            "a": "Bubbles",
             "b": "1FAE7",
             "j": [
                 "burp",
@@ -17884,6 +18163,30 @@
                 "rip"
             ]
         },
+        "nazar-amulet": {
+            "a": "Nazar Amulet",
+            "b": "1F9FF",
+            "j": [
+                "bead",
+                "charm",
+                "evil-eye",
+                "nazar",
+                "talisman"
+            ]
+        },
+        "hamsa": {
+            "a": "Hamsa",
+            "b": "1FAAC",
+            "j": [
+                "amulet",
+                "Fatima",
+                "hand",
+                "Mary",
+                "Miriam",
+                "protection",
+                "religion"
+            ]
+        },
         "moai": {
             "a": "Moai",
             "b": "1F5FF",
@@ -17907,7 +18210,7 @@
             ]
         },
         "identification-card": {
-            "a": "⊛ Identification Card",
+            "a": "Identification Card",
             "b": "1FAAA",
             "j": [
                 "credentials",
@@ -17921,7 +18224,7 @@
             "a": "Atm Sign",
             "b": "1F3E7",
             "j": [
-                "atm",
+                "ATM",
                 "ATM sign",
                 "automated",
                 "bank",
@@ -17973,13 +18276,15 @@
             "a": "Men’S Room",
             "b": "1F6B9",
             "j": [
+                "bathroom",
                 "lavatory",
                 "man",
                 "men’s room",
                 "restroom",
-                "wc",
-                "men_s_room",
                 "toilet",
+                "WC",
+                "men_s_room",
+                "wc",
                 "blue-square",
                 "gender",
                 "male"
@@ -17989,15 +18294,16 @@
             "a": "Women’S Room",
             "b": "1F6BA",
             "j": [
+                "bathroom",
                 "lavatory",
                 "restroom",
-                "wc",
+                "toilet",
+                "WC",
                 "woman",
                 "women’s room",
                 "women_s_room",
                 "purple-square",
                 "female",
-                "toilet",
                 "loo",
                 "gender"
             ]
@@ -18006,10 +18312,11 @@
             "a": "Restroom",
             "b": "1F6BB",
             "j": [
+                "bathroom",
                 "lavatory",
+                "toilet",
                 "WC",
                 "blue-square",
-                "toilet",
                 "refresh",
                 "wc",
                 "gender"
@@ -18029,12 +18336,13 @@
             "a": "Water Closet",
             "b": "1F6BE",
             "j": [
+                "bathroom",
                 "closet",
                 "lavatory",
                 "restroom",
-                "water",
-                "wc",
                 "toilet",
+                "water",
+                "WC",
                 "blue-square"
             ]
         },
@@ -18471,8 +18779,7 @@
             "b": "1F519",
             "j": [
                 "arrow",
-                "back",
-                "BACK arrow",
+                "BACK",
                 "words",
                 "return"
             ]
@@ -18482,8 +18789,7 @@
             "b": "1F51A",
             "j": [
                 "arrow",
-                "end",
-                "END arrow",
+                "END",
                 "words"
             ]
         },
@@ -18493,8 +18799,8 @@
             "j": [
                 "arrow",
                 "mark",
-                "on",
-                "ON! arrow",
+                "ON",
+                "ON!",
                 "words"
             ]
         },
@@ -18503,8 +18809,7 @@
             "b": "1F51C",
             "j": [
                 "arrow",
-                "soon",
-                "SOON arrow",
+                "SOON",
                 "words"
             ]
         },
@@ -18513,8 +18818,7 @@
             "b": "1F51D",
             "j": [
                 "arrow",
-                "top",
-                "TOP arrow",
+                "TOP",
                 "up",
                 "words",
                 "blue-square"
@@ -18656,6 +18960,15 @@
                 "hexagram"
             ]
         },
+        "khanda": {
+            "a": "⊛ Khanda",
+            "b": "1FAAF",
+            "j": [
+                "khanda",
+                "religion",
+                "Sikh"
+            ]
+        },
         "aries": {
             "a": "Aries",
             "b": "2648",
@@ -18933,7 +19246,6 @@
             "j": [
                 "arrow",
                 "button",
-                "red",
                 "blue-square",
                 "triangle",
                 "direction",
@@ -18960,7 +19272,6 @@
                 "arrow",
                 "button",
                 "down",
-                "red",
                 "blue-square",
                 "direction",
                 "bottom"
@@ -19070,6 +19381,16 @@
                 "bars"
             ]
         },
+        "wireless": {
+            "a": "⊛ Wireless",
+            "b": "1F6DC",
+            "j": [
+                "computer",
+                "internet",
+                "network",
+                "wireless"
+            ]
+        },
         "vibration-mode": {
             "a": "Vibration Mode",
             "b": "1F4F3",
@@ -19180,7 +19501,7 @@
             ]
         },
         "heavy-equals-sign": {
-            "a": "⊛ Heavy Equals Sign",
+            "a": "Heavy Equals Sign",
             "b": "1F7F0",
             "j": [
                 "equality",
@@ -19559,7 +19880,7 @@
             "a": "Copyright",
             "b": "00A9",
             "j": [
-                "c",
+                "C",
                 "ip",
                 "license",
                 "circle",
@@ -19571,7 +19892,7 @@
             "a": "Registered",
             "b": "00AE",
             "j": [
-                "r",
+                "R",
                 "alphabet",
                 "circle"
             ]
@@ -19581,7 +19902,7 @@
             "b": "2122",
             "j": [
                 "mark",
-                "tm",
+                "TM",
                 "trademark",
                 "brand",
                 "law",
@@ -19779,7 +20100,7 @@
             "a": "A Button (Blood Type)",
             "b": "1F170",
             "j": [
-                "a",
+                "A",
                 "A button (blood type)",
                 "blood type",
                 "a_button",
@@ -19792,7 +20113,7 @@
             "a": "Ab Button (Blood Type)",
             "b": "1F18E",
             "j": [
-                "ab",
+                "AB",
                 "AB button (blood type)",
                 "blood type",
                 "ab_button",
@@ -19804,7 +20125,7 @@
             "a": "B Button (Blood Type)",
             "b": "1F171",
             "j": [
-                "b",
+                "B",
                 "B button (blood type)",
                 "blood type",
                 "b_button",
@@ -19817,7 +20138,7 @@
             "a": "Cl Button",
             "b": "1F191",
             "j": [
-                "cl",
+                "CL",
                 "CL button",
                 "alphabet",
                 "words",
@@ -19828,7 +20149,7 @@
             "a": "Cool Button",
             "b": "1F192",
             "j": [
-                "cool",
+                "COOL",
                 "COOL button",
                 "words",
                 "blue-square"
@@ -19838,7 +20159,7 @@
             "a": "Free Button",
             "b": "1F193",
             "j": [
-                "free",
+                "FREE",
                 "FREE button",
                 "blue-square",
                 "words"
@@ -19858,7 +20179,7 @@
             "a": "Id Button",
             "b": "1F194",
             "j": [
-                "id",
+                "ID",
                 "ID button",
                 "identity",
                 "purple-square",
@@ -19871,7 +20192,7 @@
             "j": [
                 "circle",
                 "circled M",
-                "m",
+                "M",
                 "alphabet",
                 "blue-circle",
                 "letter"
@@ -19881,7 +20202,7 @@
             "a": "New Button",
             "b": "1F195",
             "j": [
-                "new",
+                "NEW",
                 "NEW button",
                 "blue-square",
                 "words",
@@ -19892,7 +20213,7 @@
             "a": "Ng Button",
             "b": "1F196",
             "j": [
-                "ng",
+                "NG",
                 "NG button",
                 "blue-square",
                 "words",
@@ -19905,7 +20226,7 @@
             "b": "1F17E",
             "j": [
                 "blood type",
-                "o",
+                "O",
                 "O button (blood type)",
                 "o_button",
                 "alphabet",
@@ -19929,6 +20250,7 @@
             "a": "P Button",
             "b": "1F17F",
             "j": [
+                "P",
                 "P button",
                 "parking",
                 "cars",
@@ -19942,7 +20264,7 @@
             "b": "1F198",
             "j": [
                 "help",
-                "sos",
+                "SOS",
                 "SOS button",
                 "red-square",
                 "words",
@@ -19955,7 +20277,8 @@
             "b": "1F199",
             "j": [
                 "mark",
-                "up",
+                "UP",
+                "UP!",
                 "UP! button",
                 "blue-square",
                 "above",
@@ -19967,7 +20290,7 @@
             "b": "1F19A",
             "j": [
                 "versus",
-                "vs",
+                "VS",
                 "VS button",
                 "words",
                 "orange-square"
@@ -22169,7 +22492,9 @@
                 "nation",
                 "country",
                 "banner",
-                "japan"
+                "japan",
+                "jp",
+                "ja"
             ]
         },
         "flag-kenya": {
diff --git a/tools/gradle/doctor.gradle b/tools/gradle/doctor.gradle
new file mode 100644
index 0000000000..edd3069402
--- /dev/null
+++ b/tools/gradle/doctor.gradle
@@ -0,0 +1,93 @@
+// Default configuration copied from https://runningcode.github.io/gradle-doctor/configuration/
+
+def isCiBuild = System.env.GITHUB_ACTIONS == "true"
+println "Is CI build: $isCiBuild"
+
+doctor {
+    /**
+     * Throw an exception when multiple Gradle Daemons are running.
+     *
+     * Windows is not supported yet, see https://github.com/runningcode/gradle-doctor/issues/84
+     */
+    disallowMultipleDaemons = false
+    /**
+     * Show a message if the download speed is less than this many megabytes / sec.
+     */
+    downloadSpeedWarningThreshold = 0.5f
+    /**
+     * The level at which to warn when a build spends more than this percent garbage collecting.
+     */
+    GCWarningThreshold = 0.10f
+    /**
+     * The level at which to fail when a build spends more than this percent garbage collecting.
+     */
+    GCFailThreshold = 0.9f
+    /**
+     * Print a warning to the console if we spend more than this amount of time with Dagger annotation processors.
+     */
+    daggerThreshold = 5000
+    /**
+     * By default, Gradle caches test results. This can be dangerous if tests rely on timestamps, dates, or other files
+     * which are not declared as inputs.
+     */
+    enableTestCaching = true
+    /**
+     * By default, Gradle treats empty directories as inputs to compilation tasks. This can cause cache misses.
+     */
+    failOnEmptyDirectories = true
+    /**
+     * Do not allow building all apps simultaneously. This is likely not what the user intended.
+     */
+    allowBuildingAllAndroidAppsSimultaneously = false
+    /**
+     * Warn if using Android Jetifier. It slows down builds.
+     */
+    warnWhenJetifierEnabled = true
+    /**
+     * Negative Avoidance Savings Threshold
+     * By default the Gradle Doctor will print out a warning when a task is slower to pull from the cache than to
+     * re-execute. There is some variance in the amount of time a task can take when several tasks are running
+     * concurrently. In order to account for this there is a threshold you can set. When the difference is above the
+     * threshold, a warning is displayed.
+     */
+    negativeAvoidanceThreshold = 500
+    /**
+     * Warn when not using parallel GC. Parallel GC is faster for build type tasks and is no longer the default in Java 9+.
+     */
+    // Note: Actually, if set to true, it fails the build. See https://lightrun.com/answers/runningcode-gradle-doctor-warnwhennotusingparallelgc-fails-the-build-warn-is-a-confusing-keyword-here
+    warnWhenNotUsingParallelGC = false
+    /**
+     * Throws an error when the `Delete` or `clean` task has dependencies.
+     * If a clean task depends on other tasks, clean can be reordered and made to run after the tasks that would produce
+     * output. This can lead to build failures or just strangeness with seemingly straightforward builds
+     * (e.g., gradle clean build).
+     * http://github.com/gradle/gradle/issues/2488
+     */
+    disallowCleanTaskDependencies = true
+    /**
+     * Warn if using the Kotlin Compiler Daemon Fallback. The fallback is incredibly slow and should be avoided.
+     * https://youtrack.jetbrains.com/issue/KT-48843
+     */
+    warnIfKotlinCompileDaemonFallback = true
+
+    /** Configuration properties relating to JAVA_HOME */
+    javaHome {
+        /**
+         * Ensure that we are using JAVA_HOME to build with this Gradle.
+         */
+        ensureJavaHomeMatches = true
+        /**
+         * Ensure we have JAVA_HOME set.
+         */
+        ensureJavaHomeIsSet = true
+        /**
+         * Fail on any `JAVA_HOME` issues.
+         */
+        failOnError.set(false)
+        /**
+         * Extra message text, if any, to show with the Gradle Doctor message. This is useful if you have a wiki page or
+         * other instructions that you want to link for developers on your team if they encounter an issue.
+         */
+        extraMessage.set("Here's an extra message to show.")
+    }
+}
diff --git a/tools/install/installFromGitHub.sh b/tools/install/installFromGitHub.sh
new file mode 100755
index 0000000000..6928003773
--- /dev/null
+++ b/tools/install/installFromGitHub.sh
@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+
+# Exit on any error
+set -e
+
+if [[ "$#" -ne 1 ]]; then
+  echo "Usage: $0 GitHub_Token" >&2
+  echo "Read more about this script in the doc ./docs/installing_from_ci.md"
+  exit 1
+fi
+
+gitHubToken=$1
+
+# Path where the app is cloned (it's where this project has been cloned)
+appPath=$(dirname $(dirname $(dirname $0)))
+# Path where the APK will be downloaded from CI (it's a dir)
+baseImportPath="${appPath}/tmp/DebugApks"
+
+# Select device
+serialNumber=$(${appPath}/tools/install/androidSelectDevice.sh)
+
+# Detect device architecture
+arch=$(adb -s ${serialNumber} shell getprop ro.product.cpu.abi)
+
+echo
+echo "Will install the application on device ${serialNumber} with arch ${arch}"
+
+# Artifact URL
+echo
+read -p "Artifact url (ex: https://github.com/vector-im/element-android/suites/9293388174/artifacts/435942121)? " artifactUrl
+
+## Example of default value for Gplay
+#artifactUrl=${artifactUrl:-https://github.com/vector-im/element-android/suites/9293388174/artifacts/435942121}
+## Example of default value for FDroid
+# artifactUrl=${artifactUrl:-https://github.com/vector-im/element-android/suites/9293388174/artifacts/435942119}
+
+artifactId=$(echo ${artifactUrl} | rev | cut -d'/' -f1 | rev)
+
+# Download files
+targetPath=${baseImportPath}/${artifactId}
+
+filename="artifact.zip"
+
+fullFilePath="${targetPath}/${filename}"
+
+# Check if file already exists
+if test -f "$fullFilePath"; then
+    read -p "$fullFilePath already exists. Override (yes/no) default to no ? " download
+    download=${download:-no}
+else
+    download="yes"
+fi
+
+# Ignore error from now
+set +e
+
+if [ ${download} == "yes" ]; then
+    echo "Downloading ${filename} to ${targetPath}..."
+    python3 ${appPath}/tools/release/download_github_artifacts.py \
+        --token ${gitHubToken} \
+        --artifactUrl ${artifactUrl} \
+        --directory ${targetPath} \
+        --filename ${filename} \
+        --ignoreErrors
+fi
+
+echo "Unzipping ${filename}..."
+unzip $fullFilePath -d ${targetPath}
+
+## gplay or fdroid
+if test -d "${targetPath}/gplay"; then
+  variant="gplay"
+elif test -d "${targetPath}/fdroid"; then
+  variant="fdroid"
+else
+  echo "No variant found"
+  exit 1
+fi
+
+fullApkPath="${targetPath}/${variant}/debug/vector-${variant}-${arch}-debug.apk"
+
+echo "Installing ${fullApkPath} to device ${serialNumber}..."
+adb -s ${serialNumber} install -r ${fullApkPath}
+
+# Check error and propose to uninstall and retry installing
+if [[ "$?" -ne 0 ]]; then
+    read -p "Error, do you want to uninstall the application then retry (yes/no) default to no ? " retry
+    retry=${retry:-no}
+    if [ ${retry} == "yes" ]; then
+        echo "Uninstalling..."
+        adb -s ${serialNumber} uninstall im.vector.app.debug
+        echo "Installing again..."
+        adb -s ${serialNumber} install -r ${fullApkPath}
+    fi
+fi
diff --git a/tools/jitsi/build_jisti_libs.sh b/tools/jitsi/build_jisti_libs.sh
index 445dc5e0fe..91c32fc597 100755
--- a/tools/jitsi/build_jisti_libs.sh
+++ b/tools/jitsi/build_jisti_libs.sh
@@ -25,12 +25,8 @@ export LIBRE_BUILD=true
 
 cd jitsi-meet
 
-# This is commit after version 2.2.2, which does not compile
-# git checkout 5a934c071a5cbe64de275a25d0ed62d8193cdd03
-
-# Changelog: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md
-
-git checkout android-sdk-5.0.2
+# Get the latest version from the changelog: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md
+git checkout android-sdk-6.2.2
 
 echo
 echo "##################################################"
diff --git a/vector/lint.xml b/tools/lint/lint.xml
similarity index 92%
rename from vector/lint.xml
rename to tools/lint/lint.xml
index b4b6ebc12f..3d3b073749 100644
--- a/vector/lint.xml
+++ b/tools/lint/lint.xml
@@ -19,6 +19,9 @@
     <issue id="IconExpectedSize" severity="error" />
     <issue id="LocaleFolder" severity="error" />
 
+    <!-- AlwaysShowAction is considered as an error to force ignoring the issue when detected -->
+    <issue id="AlwaysShowAction" severity="error" />
+
     <issue id="TooManyViews" severity="warning">
         <!-- Ignore TooManyViews in debug build type -->
         <ignore path="**/src/debug/**" />
@@ -77,6 +80,7 @@
     <issue id="KotlinPropertyAccess" severity="error" />
     <issue id="DefaultLocale" severity="error" />
     <issue id="CheckResult" severity="error" />
+    <issue id="StaticFieldLeak" severity="error" />
 
     <issue id="InvalidPackage">
         <!-- Ignore error from HtmlCompressor lib -->
@@ -87,6 +91,7 @@
 
     <!-- Manifest -->
     <issue id="PermissionImpliesUnsupportedChromeOsHardware" severity="error" />
+    <issue id="DataExtractionRules" severity="error" />
 
     <!-- Performance -->
     <issue id="UselessParent" severity="error" />
@@ -104,6 +109,9 @@
     <issue id="TypographyDashes" severity="error" />
     <issue id="PluralsCandidate" severity="error" />
 
+    <!-- Notification -->
+    <issue id="LaunchActivityFromNotification" severity="error" />
+
     <!-- DI -->
     <issue id="JvmStaticProvidesInObjectDetector" severity="error" />
 </lint>
diff --git a/tools/release/download_github_artifacts.py b/tools/release/download_github_artifacts.py
new file mode 100755
index 0000000000..892a4affa6
--- /dev/null
+++ b/tools/release/download_github_artifacts.py
@@ -0,0 +1,154 @@
+#!/usr/bin/env python3
+#
+# Copyright 2022 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 argparse
+import hashlib
+import json
+import os
+# Run `pip3 install requests` if not installed yet
+import requests
+
+# This script downloads artifacts from GitHub.
+# Ref: https://docs.github.com/en/rest/actions/artifacts#get-an-artifact
+
+error = False
+
+### Arguments
+
+parser = argparse.ArgumentParser(description='Download artifacts from GitHub.')
+parser.add_argument('-t',
+                    '--token',
+                    required=True,
+                    help='The GitHub token with read access.')
+parser.add_argument('-a',
+                    '--artifactUrl',
+                    required=True,
+                    help='the artifact_url from GitHub.')
+parser.add_argument('-f',
+                    '--filename',
+                    help='the filename, if not provided, will use the artifact name.')
+parser.add_argument('-i',
+                    '--ignoreErrors',
+                    help='Ignore errors that can be ignored. Build state and number of artifacts.',
+                    action="store_true")
+parser.add_argument('-d',
+                    '--directory',
+                    default="",
+                    help='the target directory, where files will be downloaded. If not provided the build number will be used to create a directory.')
+parser.add_argument('-v',
+                    '--verbose',
+                    help="increase output verbosity.",
+                    action="store_true")
+parser.add_argument('-s',
+                    '--simulate',
+                    help="simulate action, do not create folder or download any file.",
+                    action="store_true")
+
+args = parser.parse_args()
+
+if args.verbose:
+    print("Argument:")
+    print(args)
+
+# Split the artifact URL to get information
+# Ex: https://github.com/vector-im/element-android/suites/9293388174/artifacts/435942121
+artifactUrl = args.artifactUrl
+if not artifactUrl.startswith('https://github.com/'):
+    print("❌ Invalid parameter --artifactUrl %s. Must start with 'https://github.com/'" % artifactUrl)
+    exit(1)
+if "/artifacts/" not in artifactUrl:
+    print("❌ Invalid parameter --artifactUrl %s. Must contain '/artifacts/'" % artifactUrl)
+    exit(1)
+artifactItems = artifactUrl.split("/")
+if len(artifactItems) != 9:
+    print("❌ Invalid parameter --artifactUrl %s. Please check the format." % (artifactUrl))
+    exit(1)
+
+gitHubRepoOwner = artifactItems[3]
+gitHubRepo = artifactItems[4]
+artifactId = artifactItems[8]
+
+if args.verbose:
+    print("gitHubRepoOwner: %s, gitHubRepo: %s, artifactId: %s" % (gitHubRepoOwner, gitHubRepo, artifactId))
+
+headers = {
+   'Authorization': "Bearer %s" % args.token,
+   'Accept': 'application/vnd.github+json'
+}
+base_url = "https://api.github.com/repos/%s/%s/actions/artifacts/%s" % (gitHubRepoOwner, gitHubRepo, artifactId)
+
+### Fetch build state
+
+print("Getting artifacts data of project '%s/%s' artifactId '%s'..." % (gitHubRepoOwner, gitHubRepo, artifactId))
+
+if args.verbose:
+    print("Url: %s" % base_url)
+
+r = requests.get(base_url, headers=headers)
+data = json.loads(r.content.decode())
+
+if args.verbose:
+    print("Json data:")
+    print(data)
+
+if args.verbose:
+    print("Create subfolder %s to download artifacts..." % artifactId)
+
+if args.directory == "":
+    targetDir = artifactId
+else:
+    targetDir = args.directory
+
+if not args.simulate:
+    os.makedirs(targetDir, exist_ok=True)
+
+url = data.get("archive_download_url")
+if args.filename is not None:
+    filename = args.filename
+else:
+    filename = data.get("name") + ".zip"
+
+## Print some info about the artifact origin
+commitLink = "https://github.com/%s/%s/commit/%s" % (gitHubRepoOwner, gitHubRepo, data.get("workflow_run").get("head_sha"))
+print("Preparing to download artifact `%s`, built from branch: `%s` (commit %s)" % (data.get("name"), data.get("workflow_run").get("head_branch"), commitLink))
+
+if args.verbose:
+    print()
+    print("Artifact url: %s" % url)
+
+target = targetDir + "/" + filename
+sizeInBytes = data.get("size_in_bytes")
+print("Downloading %s to '%s' (file size is %s bytes, this may take a while)..." % (filename, targetDir, sizeInBytes))
+if not args.simulate:
+    # open file to write in binary mode
+    with open(target, "wb") as file:
+        # get request
+        response = requests.get(url, headers=headers)
+        # write to file
+        file.write(response.content)
+    print("Verifying file size...")
+    # get the file size
+    size = os.path.getsize(target)
+    if sizeInBytes != size:
+        # error = True
+        print("Warning, file size mismatch: expecting %s and get %s. This is just a warning for now..." % (sizeInBytes, size))
+
+if error:
+    print("❌ Error(s) occurred, please check the log")
+    exit(1)
+else:
+    print("Done!")
diff --git a/tools/release/pushPlayStoreMetaData.sh b/tools/release/pushPlayStoreMetaData.sh
index 5c2f69cb7b..2d8fd9b36a 100755
--- a/tools/release/pushPlayStoreMetaData.sh
+++ b/tools/release/pushPlayStoreMetaData.sh
@@ -28,7 +28,6 @@ mv ./fastlane/metadata/android/fy  ./fastlane_tmp
 mv ./fastlane/metadata/android/ga  ./fastlane_tmp
 mv ./fastlane/metadata/android/kab ./fastlane_tmp
 mv ./fastlane/metadata/android/nb  ./fastlane_tmp
-mv ./fastlane/metadata/android/gl  ./fastlane_tmp
 
 # Fastlane / PlayStore require longDescription and shortDescription file to be set, so copy the default
 # one for languages where they are missing
diff --git a/tools/release/releaseScript.sh b/tools/release/releaseScript.sh
new file mode 100755
index 0000000000..f91e11584c
--- /dev/null
+++ b/tools/release/releaseScript.sh
@@ -0,0 +1,385 @@
+#!/usr/bin/env bash
+
+#
+# Copyright (c) 2022 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.
+#
+
+# Ignore any error to not stop the script
+set +e
+
+printf "\n================================================================================\n"
+printf "|                    Welcome to the release script!                            |\n"
+printf "================================================================================\n"
+
+printf "Checking environment...\n"
+envError=0
+
+# Path of the key store (it's a file)
+keyStorePath="${ELEMENT_KEYSTORE_PATH}"
+if [[ -z "${keyStorePath}" ]]; then
+    printf "Fatal: ELEMENT_KEYSTORE_PATH is not defined in the environment.\n"
+    envError=1
+fi
+# Keystore password
+keyStorePassword="${ELEMENT_KEYSTORE_PASSWORD}"
+if [[ -z "${keyStorePassword}" ]]; then
+    printf "Fatal: ELEMENT_KEYSTORE_PASSWORD is not defined in the environment.\n"
+    envError=1
+fi
+# Key password
+keyPassword="${ELEMENT_KEY_PASSWORD}"
+if [[ -z "${keyPassword}" ]]; then
+    printf "Fatal: ELEMENT_KEY_PASSWORD is not defined in the environment.\n"
+    envError=1
+fi
+# GitHub token
+gitHubToken="${ELEMENT_GITHUB_TOKEN}"
+if [[ -z "${gitHubToken}" ]]; then
+    printf "Fatal: ELEMENT_GITHUB_TOKEN is not defined in the environment.\n"
+    envError=1
+fi
+# Android home
+androidHome="${ANDROID_HOME}"
+if [[ -z "${androidHome}" ]]; then
+    printf "Fatal: ANDROID_HOME is not defined in the environment.\n"
+    envError=1
+fi
+# @elementbot:matrix.org matrix token / Not mandatory
+elementBotToken="${ELEMENT_BOT_MATRIX_TOKEN}"
+if [[ -z "${elementBotToken}" ]]; then
+    printf "Warning: ELEMENT_BOT_MATRIX_TOKEN is not defined in the environment.\n"
+fi
+
+if [ ${envError} == 1 ]; then
+  exit 1
+fi
+
+buildToolsVersion="30.0.2"
+buildToolsPath="${androidHome}/build-tools/${buildToolsVersion}"
+
+if [[ ! -d ${buildToolsPath} ]]; then
+    printf "Fatal: ${buildToolsPath} folder not found, ensure that you have installed the SDK version ${buildToolsVersion}.\n"
+    exit 1
+fi
+
+# Check if git flow is enabled
+git flow config >/dev/null 2>&1
+if [[ $? == 0 ]]
+then
+    printf "Git flow is initialized\n"
+else
+    printf "Git flow is not initialized. Initializing...\n"
+    # All default value, just set 'v' for tag prefix
+    git flow init -d -t 'v'
+fi
+
+printf "OK\n"
+
+printf "\n================================================================================\n"
+# Guessing version to propose a default version
+versionMajorCandidate=`grep "ext.versionMajor" ./vector-app/build.gradle | cut  -d " " -f3`
+versionMinorCandidate=`grep "ext.versionMinor" ./vector-app/build.gradle | cut  -d " " -f3`
+versionPatchCandidate=`grep "ext.versionPatch" ./vector-app/build.gradle | cut  -d " " -f3`
+versionCandidate="${versionMajorCandidate}.${versionMinorCandidate}.${versionPatchCandidate}"
+
+read -p "Please enter the release version (example: ${versionCandidate}). Just press enter if ${versionCandidate} is correct. " version
+version=${version:-${versionCandidate}}
+
+# extract major, minor and patch for future use
+versionMajor=`echo ${version} | cut  -d "." -f1`
+versionMinor=`echo ${version} | cut  -d "." -f2`
+versionPatch=`echo ${version} | cut  -d "." -f3`
+nextPatchVersion=$((versionPatch + 2))
+
+printf "\n================================================================================\n"
+printf "Ensuring main and develop branches are up to date...\n"
+
+git checkout main
+git pull
+git checkout develop
+git pull
+
+printf "\n================================================================================\n"
+printf "Starting the release ${version}\n"
+git flow release start ${version}
+
+# Note: in case the release is already started and the script is started again, checkout the release branch again.
+ret=$?
+if [[ $ret -ne 0 ]]; then
+  printf "Mmh, it seems that the release is already started. Checking out the release branch...\n"
+  git checkout "release/${version}"
+fi
+
+# Ensure version is OK
+cp ./vector-app/build.gradle ./vector-app/build.gradle.bak
+sed "s/ext.versionMajor = .*/ext.versionMajor = ${versionMajor}/" ./vector-app/build.gradle.bak > ./vector-app/build.gradle
+sed "s/ext.versionMinor = .*/ext.versionMinor = ${versionMinor}/" ./vector-app/build.gradle     > ./vector-app/build.gradle.bak
+sed "s/ext.versionPatch = .*/ext.versionPatch = ${versionPatch}/" ./vector-app/build.gradle.bak > ./vector-app/build.gradle
+rm ./vector-app/build.gradle.bak
+cp ./matrix-sdk-android/build.gradle ./matrix-sdk-android/build.gradle.bak
+sed "s/\"SDK_VERSION\", .*$/\"SDK_VERSION\", \"\\\\\"${version}\\\\\"\"/" ./matrix-sdk-android/build.gradle.bak > ./matrix-sdk-android/build.gradle
+rm ./matrix-sdk-android/build.gradle.bak
+
+# This commit may have no effect because generally we do not change the version during the release.
+git commit -a -m "Setting version for the release ${version}"
+
+printf "\n================================================================================\n"
+read -p "Please check the crashes from the PlayStore. You can commit fixes if any on the release branch. Press enter when it's done."
+
+printf "\n================================================================================\n"
+read -p "Please check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/${version}-dev. You can commit fixes if any on the release branch. Press enter when it's done."
+
+printf "\n================================================================================\n"
+read -p "Please make sure an emulator is running and press enter when it is ready."
+
+printf "\n================================================================================\n"
+printf "Checking if Synapse is running...\n"
+httpCode=`curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:8080/_matrix/static`
+
+if [[ ${httpCode} -ne "302" ]]; then
+  read -p "Please make sure Synapse is running (open http://127.0.0.1:8080) and press enter when it is ready."
+else
+  printf "Synapse is running!\n"
+fi
+
+printf "\n================================================================================\n"
+printf "Uninstalling previous test app if any...\n"
+adb -e uninstall im.vector.app.debug.test
+
+printf "\n================================================================================\n"
+printf "Running the integration test UiAllScreensSanityTest.allScreensTest()...\n"
+./gradlew connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest
+
+printf "\n================================================================================\n"
+printf "Building the app...\n"
+./gradlew assembleGplayDebug
+
+printf "\n================================================================================\n"
+printf "Uninstalling previous test app if any...\n"
+adb -e uninstall im.vector.app.debug
+
+printf "\n================================================================================\n"
+printf "Installing the app...\n"
+adb -e install ./vector-app/build/outputs/apk/gplay/debug/vector-gplay-arm64-v8a-debug.apk
+
+printf "\n================================================================================\n"
+printf "Running the app...\n"
+# TODO This does not work, need to be fixed
+adb -e shell am start -n im.vector.app.debug/im.vector.app.features.Alias -a android.intent.action.MAIN -c android.intent.category.LAUNCHER
+
+printf "\n================================================================================\n"
+# TODO could build and deploy the APK to any emulator
+read -p "Create an account on matrix.org and do some smoke tests that the sanity test does not cover like: 1-1 call, 1-1 video call, Jitsi call for instance. Press enter when it's done."
+
+printf "\n================================================================================\n"
+printf "Running towncrier...\n"
+yes | towncrier build --version "v${version}"
+
+printf "\n================================================================================\n"
+read -p "Check the file CHANGES.md consistency. It's possible to reorder items (most important changes first) or change their section if relevant. Also an opportunity to fix some typo, or rewrite things. Do not commit your change. Press enter when it's done."
+
+printf "\n================================================================================\n"
+printf "Committing...\n"
+git commit -a -m "Changelog for version ${version}"
+
+printf "\n================================================================================\n"
+printf "Creating fastlane file...\n"
+printf -v versionMajor2Digits "%02d" ${versionMajor}
+printf -v versionMinor2Digits "%02d" ${versionMinor}
+printf -v versionPatch2Digits "%02d" ${versionPatch}
+fastlaneFile="4${versionMajor2Digits}${versionMinor2Digits}${versionPatch2Digits}0.txt"
+fastlanePathFile="./fastlane/metadata/android/en-US/changelogs/${fastlaneFile}"
+printf "Main changes in this version: TODO.\nFull changelog: https://github.com/vector-im/element-android/releases" > ${fastlanePathFile}
+
+read -p "I have created the file ${fastlanePathFile}, please edit it and press enter when it's done."
+git add ${fastlanePathFile}
+git commit -a -m "Adding fastlane file for version ${version}"
+
+printf "\n================================================================================\n"
+# We could propose to push the branch and create a PR
+read -p "(optional) Push the branch and start a draft PR (will not be merged), to check that the CI is happy with all the changes. Press enter when it's done."
+
+printf "\n================================================================================\n"
+printf "OK, finishing the release...\n"
+git flow release finish "${version}"
+
+printf "\n================================================================================\n"
+read -p "Done, push the branch 'main' and the new tag (yes/no) default to yes? " doPush
+doPush=${doPush:-yes}
+
+if [ ${doPush} == "yes" ]; then
+  printf "Pushing branch 'main' and tag 'v${version}'...\n"
+  git push origin main
+  git push origin "v${version}"
+else
+    printf "Not pushing, do not forget to push manually!\n"
+fi
+
+printf "\n================================================================================\n"
+printf "Checking out develop...\n"
+git checkout develop
+
+# Set next version
+printf "\n================================================================================\n"
+printf "Setting next version on file './vector-app/build.gradle'...\n"
+cp ./vector-app/build.gradle ./vector-app/build.gradle.bak
+sed "s/ext.versionPatch = .*/ext.versionPatch = ${nextPatchVersion}/" ./vector-app/build.gradle.bak > ./vector-app/build.gradle
+rm ./vector-app/build.gradle.bak
+
+printf "\n================================================================================\n"
+printf "Setting next version on file './matrix-sdk-android/build.gradle'...\n"
+nextVersion="${versionMajor}.${versionMinor}.${nextPatchVersion}"
+cp ./matrix-sdk-android/build.gradle ./matrix-sdk-android/build.gradle.bak
+sed "s/\"SDK_VERSION\", .*$/\"SDK_VERSION\", \"\\\\\"${nextVersion}\\\\\"\"/" ./matrix-sdk-android/build.gradle.bak > ./matrix-sdk-android/build.gradle
+rm ./matrix-sdk-android/build.gradle.bak
+
+printf "\n================================================================================\n"
+read -p "I have updated the versions to prepare the next release, please check that the change are correct and press enter so I can commit."
+
+printf "Committing...\n"
+git commit -a -m 'version++'
+
+printf "\n================================================================================\n"
+read -p "Done, push the branch 'develop' (yes/no) default to yes? (A rebase may be necessary in case develop got new commits)" doPush
+doPush=${doPush:-yes}
+
+if [ ${doPush} == "yes" ]; then
+  printf "Pushing branch 'develop'...\n"
+  git push origin develop
+else
+    printf "Not pushing, do not forget to push manually!\n"
+fi
+
+printf "\n================================================================================\n"
+printf "Wait for the GitHub action https://github.com/vector-im/element-android/actions/workflows/build.yml?query=branch%3Amain to build the 'main' branch.\n"
+read -p "After GHA is finished, please enter the artifact URL (for 'vector-gplay-release-unsigned'): " artifactUrl
+
+printf "\n================================================================================\n"
+printf "Downloading the artifact...\n"
+
+# Download files
+targetPath="./tmp/Element/${version}"
+
+# Ignore error
+set +e
+
+python3 ./tools/release/download_github_artifacts.py \
+    --token ${gitHubToken} \
+    --artifactUrl ${artifactUrl} \
+    --directory ${targetPath} \
+    --ignoreErrors
+
+# Do not ignore error
+set -e
+
+printf "\n================================================================================\n"
+printf "Unzipping the artifact...\n"
+
+unzip ${targetPath}/vector-gplay-release-unsigned.zip -d ${targetPath}
+
+# Flatten folder hierarchy
+mv ${targetPath}/gplay/release/* ${targetPath}
+rm -rf ${targetPath}/gplay
+
+printf "\n================================================================================\n"
+printf "Signing the APKs...\n"
+
+cp ${targetPath}/vector-gplay-arm64-v8a-release-unsigned.apk \
+   ${targetPath}/vector-gplay-arm64-v8a-release-signed.apk
+./tools/release/sign_apk_unsafe.sh \
+    ${keyStorePath} \
+    ${targetPath}/vector-gplay-arm64-v8a-release-signed.apk \
+    ${keyStorePassword} \
+    ${keyPassword}
+
+cp ${targetPath}/vector-gplay-armeabi-v7a-release-unsigned.apk \
+   ${targetPath}/vector-gplay-armeabi-v7a-release-signed.apk
+./tools/release/sign_apk_unsafe.sh \
+    ${keyStorePath} \
+    ${targetPath}/vector-gplay-armeabi-v7a-release-signed.apk \
+    ${keyStorePassword} \
+    ${keyPassword}
+
+cp ${targetPath}/vector-gplay-x86-release-unsigned.apk \
+   ${targetPath}/vector-gplay-x86-release-signed.apk
+./tools/release/sign_apk_unsafe.sh \
+    ${keyStorePath} \
+    ${targetPath}/vector-gplay-x86-release-signed.apk \
+    ${keyStorePassword} \
+    ${keyPassword}
+
+cp ${targetPath}/vector-gplay-x86_64-release-unsigned.apk \
+   ${targetPath}/vector-gplay-x86_64-release-signed.apk
+./tools/release/sign_apk_unsafe.sh \
+    ${keyStorePath} \
+    ${targetPath}/vector-gplay-x86_64-release-signed.apk \
+    ${keyStorePassword} \
+    ${keyPassword}
+
+# Ref: https://docs.fastlane.tools/getting-started/android/beta-deployment/#uploading-your-app
+# set SUPPLY_APK_PATHS="${targetPath}/vector-gplay-arm64-v8a-release-unsigned.apk,${targetPath}/vector-gplay-armeabi-v7a-release-unsigned.apk,${targetPath}/vector-gplay-x86-release-unsigned.apk,${targetPath}/vector-gplay-x86_64-release-unsigned.apk"
+#
+# ./fastlane beta
+
+printf "\n================================================================================\n"
+printf "Please check the information below:\n"
+
+printf "File vector-gplay-arm64-v8a-release-signed.apk:\n"
+${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-arm64-v8a-release-signed.apk | grep package
+printf "File vector-gplay-armeabi-v7a-release-signed.apk:\n"
+${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-armeabi-v7a-release-signed.apk | grep package
+printf "File vector-gplay-x86-release-signed.apk:\n"
+${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-x86-release-signed.apk | grep package
+printf "File vector-gplay-x86_64-release-signed.apk:\n"
+${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-x86_64-release-signed.apk | grep package
+
+printf "\n"
+read -p "Does it look correct? Press enter when it's done."
+
+printf "\n================================================================================\n"
+read -p "Installing apk on a real device, press enter when a real device is connected. "
+apkPath="${targetPath}/vector-gplay-arm64-v8a-release-signed.apk"
+adb -d install ${apkPath}
+
+read -p "Please run the APK on your phone to check that the upgrade went well (no init sync, etc.). Press enter when it's done."
+# TODO Get the block to copy from towncrier earlier (be may be edited by the release manager)?
+read -p "Create the release on gitHub from the tag https://github.com/vector-im/element-android/tags, copy paste the block from the file CHANGES.md. Press enter when it's done."
+
+read -p "Add the 4 signed APKs to the GitHub release. They are located at ${targetPath}. Press enter when it's done."
+
+printf "\n================================================================================\n"
+printf "Message for the Android internal room:\n\n"
+message="@room Element Android ${version} is ready to be tested. You can get if from https://github.com/vector-im/element-android/releases/tag/v${version}. Please report any feedback here. Thanks!"
+printf "${message}\n\n"
+
+if [[ -z "${elementBotToken}" ]]; then
+  read -p "ELEMENT_BOT_MATRIX_TOKEN is not defined in the environment. Cannot send the message for you. Please send it manually, and press enter when it's done "
+else
+  read -p "Send this message to the room (yes/no) default to yes? " doSend
+  doSend=${doSend:-yes}
+  if [ ${doSend} == "yes" ]; then
+    printf "Sending message...\n"
+    transactionId=`openssl rand -hex 16`
+    # Element Android internal
+    matrixRoomId="!LiSLXinTDCsepePiYW:matrix.org"
+    curl -X PUT --data $"{\"msgtype\":\"m.text\",\"body\":\"${message}\"}" -H "Authorization: Bearer ${elementBotToken}" https://matrix-client.matrix.org/_matrix/client/r0/rooms/${matrixRoomId}/send/m.room.message/\$local.${transactionId}
+  else
+    printf "Message not sent, please send it manually!\n"
+  fi
+fi
+
+printf "\n================================================================================\n"
+printf "Congratulation! Kudos for using this script! Have a nice day!\n"
+printf "================================================================================\n"
diff --git a/tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl
index 0f01b347c0..133faa6821 100644
--- a/tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl
+++ b/tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl
@@ -18,10 +18,10 @@ import javax.inject.Inject
 data class ${fragmentArgsClass}() : Parcelable
 </#if>
 
-//TODO add this fragment into FragmentModule
-class ${fragmentClass} @Inject constructor(
-        private val viewModelFactory: ${viewModelClass}.Factory
-) : VectorBaseFragment(), ${viewModelClass}.Factory by viewModelFactory {
+@AndroidEntryPoint
+class ${fragmentClass}() :
+    VectorBaseFragment(),
+    ${viewModelClass}.Factory by viewModelFactory {
 
 	<#if createFragmentArgs>
 		private val fragmentArgs: ${fragmentArgsClass} by args()
diff --git a/tools/validate_lfs.sh b/tools/validate_lfs.sh
new file mode 100755
index 0000000000..ce121057b6
--- /dev/null
+++ b/tools/validate_lfs.sh
@@ -0,0 +1,29 @@
+#! /bin/bash
+
+#
+# Copyright (c) 2022 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.
+#
+# Based on https://cashapp.github.io/paparazzi/#git-lfs
+
+# Compare the output of `git ls-files ':(attr:filter=lfs)'` against `git lfs ls-files`
+# If there's no diff we assume the files have been committed using git lfs
+diff <(git ls-files ':(attr:filter=lfs)' | sort) <(git lfs ls-files -n | sort) >/dev/null
+
+ret=$?
+if [[ $ret -ne 0 ]]; then
+  echo >&2 "Detected files committed without using Git LFS."
+  echo >&2 "Install git lfs (eg brew install git-lfs) and run 'git lfs install --local' within the root repository directory and re-commit your files."
+  exit 1
+fi
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
new file mode 100644
index 0000000000..e157f0704a
--- /dev/null
+++ b/vector-app/build.gradle
@@ -0,0 +1,410 @@
+import com.android.build.OutputFile
+
+apply plugin: 'com.android.application'
+apply plugin: 'com.google.firebase.appdistribution'
+apply plugin: 'com.google.android.gms.oss-licenses-plugin'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.devtools.ksp'
+apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'kotlinx-knit'
+apply plugin: 'com.likethesalad.stem'
+
+if (project.hasProperty("coverage")) {
+    apply plugin: 'jacoco'
+}
+
+kapt {
+    correctErrorTypes = true
+}
+
+knit {
+    files = fileTree(project.rootDir) {
+        include '**/*.md'
+        include '**/*.kt'
+        include '**/*.kts'
+        exclude '**/build/**'
+        exclude '**/.gradle/**'
+        exclude '**/towncrier/template.md'
+        exclude '**/CHANGES.md'
+    }
+}
+
+// Note: 2 digits max for each value
+ext.versionMajor = 1
+ext.versionMinor = 5
+// Note: even values are reserved for regular release, odd values for hotfix release.
+// When creating a hotfix, you should decrease the value, since the current value
+// is the value for the next regular release.
+ext.versionPatch = 20
+
+static def getGitTimestamp() {
+    def cmd = 'git show -s --format=%ct'
+    return cmd.execute().text.trim() as Long
+}
+
+static def generateVersionCodeFromTimestamp() {
+    // It's unix timestamp, minus timestamp of October 3rd 2018 (first commit date) divided by 100: It's incremented by one every 100 seconds.
+    // plus 20_000_000 for compatibility reason with the previous way the Version Code was computed
+    // Note that the result will be multiplied by 10 when adding the digit for the arch
+    return ((getGitTimestamp() - 1_538_524_800) / 100).toInteger() + 20_000_000
+}
+
+def generateVersionCodeFromVersionName() {
+    // plus 4_000_000 for compatibility reason with the previous way the Version Code was computed
+    // Note that the result will be multiplied by 10 when adding the digit for the arch
+    return (versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch) + 4_000_000
+}
+
+def getVersionCode() {
+    if (gitBranchName() == "develop") {
+        return generateVersionCodeFromTimestamp()
+    } else {
+        return generateVersionCodeFromVersionName()
+    }
+}
+
+static def gitRevision() {
+    def cmd = "git rev-parse --short=8 HEAD"
+    return cmd.execute().text.trim()
+}
+
+static def gitRevisionDate() {
+    def cmd = "git show -s --format=%ci HEAD^{commit}"
+    return cmd.execute().text.trim()
+}
+
+static def gitBranchName() {
+    def cmd = "git rev-parse --abbrev-ref HEAD"
+    return cmd.execute().text.trim()
+}
+
+// For Google Play build, build on any other branch than main will have a "-dev" suffix
+static def getGplayVersionSuffix() {
+    if (gitBranchName() == "main") {
+        return ""
+    } else {
+        return "-dev"
+    }
+}
+
+static def gitTag() {
+    def cmd = "git describe --exact-match --tags"
+    return cmd.execute().text.trim()
+}
+
+// For F-Droid build, build on a not tagged commit will have a "-dev" suffix
+static def getFdroidVersionSuffix() {
+    if (gitTag() == "") {
+        return "-dev"
+    } else {
+        return ""
+    }
+}
+
+project.android.buildTypes.all { buildType ->
+    buildType.javaCompileOptions.annotationProcessorOptions.arguments =
+            [
+                    validateEpoxyModelUsage: String.valueOf(buildType.name == 'debug')
+            ]
+}
+
+// map for the version codes last digit
+// x86 must have greater values than arm
+// 64 bits have greater value than 32 bits
+ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].withDefault { 0 }
+
+android {
+    namespace "im.vector.application"
+    // Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use
+    // Ref: https://issuetracker.google.com/issues/144111441
+    ndkVersion "21.3.6528147"
+
+    compileSdk versions.compileSdk
+
+    defaultConfig {
+        applicationId "im.vector.app"
+        // Set to API 21: see #405
+        minSdk versions.minSdk
+        targetSdk versions.targetSdk
+        multiDexEnabled true
+
+        renderscriptTargetApi 24
+        renderscriptSupportModeEnabled true
+
+        // `develop` branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode.
+        // Other branches (main, features, etc.) will have version code based on application version.
+        versionCode project.getVersionCode()
+
+        // Required for sonar analysis
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar"
+
+        // Generate a random app task affinity
+        manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"]
+
+        buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
+        buildConfigField "String", "GIT_REVISION_DATE", "\"${gitRevisionDate()}\""
+        buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\""
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        // Keep abiFilter for the universalApk
+        ndk {
+            abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64'
+        }
+
+        // Ref: https://developer.android.com/studio/build/configure-apk-splits.html
+        splits {
+            // Configures multiple APKs based on ABI.
+            abi {
+                // Enables building multiple APKs per ABI.
+                enable true
+
+                // By default all ABIs are included, so use reset() and include to specify that we only
+                // want APKs for armeabi-v7a, x86, arm64-v8a and x86_64.
+
+                // Resets the list of ABIs that Gradle should create APKs for to none.
+                reset()
+
+                // Specifies a list of ABIs that Gradle should create APKs for.
+                include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+
+                // Generate a universal APK that includes all ABIs, so user who install from CI tool can use this one by default.
+                universalApk true
+            }
+        }
+
+        applicationVariants.all { variant ->
+            // assign different version code for each output
+            def baseVariantVersion = variant.versionCode * 10
+            variant.outputs.each { output ->
+                def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI))
+                // Known limitation: it does not modify the value in the BuildConfig.java generated file
+                // See https://issuetracker.google.com/issues/171133218
+                output.versionCodeOverride = baseVariantVersion + baseAbiVersionCode
+                print "ABI " + output.getFilter(OutputFile.ABI) + " \t-> VersionCode = " + output.versionCode + "\n"
+                output.outputFileName = output.outputFileName.replace("vector-app", "vector")
+            }
+        }
+
+        // The following argument makes the Android Test Orchestrator run its
+        // "pm clear" command after each test invocation. This command ensures
+        // that the app's state is completely cleared between tests.
+        testInstrumentationRunnerArguments clearPackageData: 'true'
+    }
+
+    testOptions {
+        // Disables animations during instrumented tests you run from the command line…
+        // This property does not affect tests that you run using Android Studio.”
+        animationsDisabled = true
+
+        // Comment to run on Android 12
+//        execution 'ANDROIDX_TEST_ORCHESTRATOR'
+    }
+
+    signingConfigs {
+        debug {
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+            storeFile file('./signature/debug.keystore')
+            storePassword 'android'
+        }
+        nightly {
+            keyAlias System.env.ELEMENT_ANDROID_NIGHTLY_KEYID ?: project.property("signing.element.nightly.keyId")
+            keyPassword System.env.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD ?: project.property("signing.element.nightly.keyPassword")
+            storeFile file('./signature/nightly.keystore')
+            storePassword System.env.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD ?: project.property("signing.element.nightly.storePassword")
+        }
+        release {
+            keyAlias project.property("signing.element.keyId")
+            keyPassword project.property("signing.element.keyPassword")
+            storeFile file(project.property("signing.element.storePath"))
+            storePassword project.property("signing.element.storePassword")
+        }
+    }
+
+    buildTypes {
+        debug {
+            applicationIdSuffix ".debug"
+            signingConfig signingConfigs.debug
+            resValue "string", "app_name", "Element dbg"
+            resValue "color", "launcher_background", "#0DBD8B"
+
+            if (project.hasProperty("coverage")) {
+                testCoverageEnabled = coverage.enableTestCoverage
+            }
+        }
+
+        release {
+            resValue "string", "app_name", "Element"
+            resValue "color", "launcher_background", "#0DBD8B"
+            postprocessing {
+                removeUnusedCode true
+                removeUnusedResources true
+                // We do not activate obfuscation as it makes it hard then to read crash reports, and it's a bit useless on an open source project :)
+                obfuscate false
+                optimizeCode true
+                proguardFiles 'proguard-rules.pro'
+            }
+            // signingConfig signingConfigs.release
+        }
+
+        nightly {
+            initWith release
+            applicationIdSuffix ".nightly"
+            versionNameSuffix "-nightly"
+            // Just override the background color of the launcher icon for the nightly build.
+            resValue "color", "launcher_background", "#07007E"
+            // We need to copy paste this block, this is not done automatically by `initWith release`
+            postprocessing {
+                removeUnusedCode true
+                removeUnusedResources true
+                // We do not activate obfuscation as it makes it hard then to read crash reports, and it's a bit useless on an open source project :)
+                obfuscate false
+                optimizeCode true
+                proguardFiles 'proguard-rules.pro'
+            }
+            matchingFallbacks = ['release']
+            signingConfig signingConfigs.nightly
+            firebaseAppDistribution {
+                artifactType = "APK"
+                // We upload the universal APK to fix this error:
+                // "App Distribution found more than 1 output file for this variant.
+                // Please contact firebase-support@google.com for help using APK splits with App Distribution."
+                artifactPath = "$rootDir/vector-app/build/outputs/apk/gplay/nightly/vector-gplay-universal-nightly.apk"
+                // This file will be generated by the GitHub action
+                releaseNotesFile = "CHANGES_NIGHTLY.md"
+                groups = "external-testers"
+                // This should not be required, but if I do not add the appId, I get this error:
+                // "App Distribution halted because it had a problem uploading the APK: [404] Requested entity was not found."
+                appId = "1:912726360885:android:efd8545af52a9f9300427c"
+            }
+        }
+    }
+
+    sourceSets {
+        nightly {
+            java.srcDirs += "src/release/java"
+        }
+    }
+
+    flavorDimensions "store"
+
+    productFlavors {
+        gplay {
+            apply plugin: 'com.google.gms.google-services'
+            afterEvaluate {
+                tasks.matching { it.name.contains("GoogleServices") && !it.name.contains("Gplay") }*.enabled = false
+            }
+
+            dimension "store"
+            isDefault = true
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}"
+            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
+            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
+        }
+
+        fdroid {
+            dimension "store"
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
+            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
+            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
+        }
+    }
+
+    lintOptions {
+        lintConfig file("../tools/lint/lint.xml")
+
+        checkDependencies true
+        abortOnError true
+    }
+
+    compileOptions {
+        sourceCompatibility versions.sourceCompat
+        targetCompatibility versions.targetCompat
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs += [
+                "-opt-in=kotlin.RequiresOptIn",
+                // Fixes false positive "This is an internal Mavericks API. It is not intended for external use."
+                // of MvRx `by viewModel()` calls. Maybe due to the inlining of code... This is a temporary fix...
+                "-opt-in=com.airbnb.mvrx.InternalMavericksApi",
+                // Opt in for kotlinx.coroutines.FlowPreview too
+                "-opt-in=kotlinx.coroutines.FlowPreview",
+                // Opt in for kotlinx.coroutines.ExperimentalCoroutinesApi too
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+        ]
+    }
+
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+    implementation project(':vector')
+    implementation project(':vector-config')
+    debugImplementation project(':library:ui-styles')
+    implementation libs.dagger.hilt
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation "androidx.sharetarget:sharetarget:1.2.0"
+
+    // Flipper, debug builds only
+    debugImplementation(libs.flipper.flipper) {
+        exclude group: 'com.facebook.fbjni', module: 'fbjni'
+    }
+    debugImplementation(libs.flipper.flipperNetworkPlugin) {
+        exclude group: 'com.facebook.fbjni', module: 'fbjni'
+    }
+    debugImplementation 'com.facebook.soloader:soloader:0.10.5'
+    debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0"
+
+    gplayImplementation "com.google.android.gms:play-services-location:21.0.1"
+    // UnifiedPush gplay flavor only
+    gplayImplementation platform(libs.google.firebaseBom)
+    gplayImplementation(libs.google.messaging) {
+        exclude group: 'com.google.firebase', module: 'firebase-core'
+        exclude group: 'com.google.firebase', module: 'firebase-analytics'
+        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
+    }
+
+    // Nightly
+    // API-only library
+    gplayImplementation libs.google.appdistributionApi
+    // Full SDK implementation
+    nightlyImplementation libs.google.appdistribution
+
+    // OSS License, gplay flavor only
+    gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
+    kapt libs.dagger.hiltCompiler
+    ksp libs.airbnb.epoxyProcessor
+
+    androidTestImplementation libs.androidx.testCore
+    androidTestImplementation libs.androidx.testRunner
+    androidTestImplementation libs.androidx.testRules
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espressoCore
+    androidTestImplementation libs.androidx.espressoContrib
+    androidTestImplementation libs.androidx.espressoIntents
+    androidTestImplementation libs.tests.kluent
+    androidTestImplementation libs.androidx.coreTesting
+    androidTestImplementation(libs.jetbrains.coroutinesTest) {
+        exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug"
+    }
+    // Plant Timber tree for test
+    androidTestImplementation libs.tests.timberJunitRule
+    // "The one who serves a great Espresso"
+    androidTestImplementation('com.adevinta.android:barista:4.3.0') {
+        exclude group: 'org.jetbrains.kotlin'
+    }
+    androidTestImplementation libs.mockk.mockkAndroid
+    androidTestUtil libs.androidx.orchestrator
+    androidTestImplementation libs.androidx.fragmentTesting
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.22"
+    debugImplementation libs.androidx.fragmentTesting
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
+}
+
diff --git a/vector/proguard-rules.pro b/vector-app/proguard-rules.pro
similarity index 95%
rename from vector/proguard-rules.pro
rename to vector-app/proguard-rules.pro
index 7fd72ba895..57559bf7b4 100644
--- a/vector/proguard-rules.pro
+++ b/vector-app/proguard-rules.pro
@@ -75,4 +75,8 @@
 
 -keep class org.bouncycastle.** { *; }
 -keepnames class org.bouncycastle.** { *; }
--dontwarn org.bouncycastle.**
\ No newline at end of file
+-dontwarn org.bouncycastle.**
+
+# JNA
+-keep class com.sun.jna.** { *; }
+-keep class * implements com.sun.jna.** { *; }
diff --git a/vector/signature/README.md b/vector-app/signature/README.md
similarity index 54%
rename from vector/signature/README.md
rename to vector-app/signature/README.md
index 7d9005f1f4..34d40b45bd 100644
--- a/vector/signature/README.md
+++ b/vector-app/signature/README.md
@@ -1,10 +1,6 @@
 
 ## Debug signature
 
-Buildkite CI tool uses docker images to build the Android application, and it looks like the debug signature is changed at each build.
-
-So it's not possible for user to upgrade the application with the last build from buildkite without uninstalling the application.
-
 This folder contains a debug signature, and the debug build will uses this signature to build the APK.
 
 The validity of the signature is 30 years. So it has to be replaced before June 2049 :).
diff --git a/vector/signature/debug.keystore b/vector-app/signature/debug.keystore
similarity index 100%
rename from vector/signature/debug.keystore
rename to vector-app/signature/debug.keystore
diff --git a/vector/signature/nightly.keystore b/vector-app/signature/nightly.keystore
similarity index 100%
rename from vector/signature/nightly.keystore
rename to vector-app/signature/nightly.keystore
diff --git a/vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt b/vector-app/src/androidTest/java/im/vector/app/CantVerifyTest.kt
similarity index 96%
rename from vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt
rename to vector-app/src/androidTest/java/im/vector/app/CantVerifyTest.kt
index e6b17c1e9e..6f9d6cdde9 100644
--- a/vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/CantVerifyTest.kt
@@ -23,6 +23,7 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
+import com.adevinta.android.barista.internal.viewaction.SleepViewAction
 import im.vector.app.features.MainActivity
 import im.vector.app.ui.robot.ElementRobot
 import org.junit.Rule
@@ -33,7 +34,7 @@ import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
-class CantVerifyTest : VerificationTestBase() {
+class CantVerifyTest {
 
     @get:Rule
     val testRule = RuleChain
diff --git a/vector/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt b/vector-app/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt
similarity index 83%
rename from vector/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt
rename to vector-app/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt
index 735e96c1e0..f09e522932 100644
--- a/vector/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt
@@ -21,6 +21,8 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.EntryPoints
+import im.vector.app.core.di.SingletonEntryPoint
 import im.vector.app.features.analytics.store.AnalyticsStore
 import kotlinx.coroutines.runBlocking
 import org.junit.rules.TestWatcher
@@ -39,10 +41,11 @@ class ClearCurrentSessionRule : TestWatcher() {
         runBlocking {
             reflectAnalyticDatastore(context).edit { it.clear() }
             runCatching {
-                val holder = (context.applicationContext as VectorApplication).activeSessionHolder
-                holder.getSafeActiveSession()?.signOutService()?.signOut(true)
-                (context.applicationContext as VectorApplication).vectorPreferences.clearPreferences()
-                holder.clearActiveSession()
+                val entryPoint = EntryPoints.get(context.applicationContext, SingletonEntryPoint::class.java)
+                val sessionHolder = entryPoint.activeSessionHolder()
+                sessionHolder.getSafeActiveSession()?.signOutService()?.signOut(true)
+                entryPoint.vectorPreferences().clearPreferences()
+                sessionHolder.clearActiveSession()
             }
         }
         return super.apply(base, description)
diff --git a/vector/src/androidTest/java/im/vector/app/EspressoExt.kt b/vector-app/src/androidTest/java/im/vector/app/EspressoExt.kt
similarity index 99%
rename from vector/src/androidTest/java/im/vector/app/EspressoExt.kt
rename to vector-app/src/androidTest/java/im/vector/app/EspressoExt.kt
index 72137ed8e8..68a54e9901 100644
--- a/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/EspressoExt.kt
@@ -89,7 +89,7 @@ fun getString(@StringRes id: Int): String {
     return EspressoHelper.getCurrentActivity()!!.resources.getString(id)
 }
 
-fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 10_000, waitForDisplayed: Boolean = true): ViewAction {
+fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 20_000, waitForDisplayed: Boolean = true): ViewAction {
     return object : ViewAction {
         private val clock = DefaultClock()
 
diff --git a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt b/vector-app/src/androidTest/java/im/vector/app/RegistrationTest.kt
similarity index 99%
rename from vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
rename to vector-app/src/androidTest/java/im/vector/app/RegistrationTest.kt
index 7920e8e0d8..68a4d27deb 100644
--- a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/RegistrationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright (c) 2022 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.
diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector-app/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
similarity index 99%
rename from vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
rename to vector-app/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
index 7dc20178f2..1243758b2f 100644
--- a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright (c) 2022 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.
diff --git a/vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt b/vector-app/src/androidTest/java/im/vector/app/TestMatrixCallback.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt
rename to vector-app/src/androidTest/java/im/vector/app/TestMatrixCallback.kt
diff --git a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector-app/src/androidTest/java/im/vector/app/VerificationTestBase.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
rename to vector-app/src/androidTest/java/im/vector/app/VerificationTestBase.kt
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt b/vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
similarity index 98%
rename from vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
rename to vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
index 8c9faee336..901ef8e4c1 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright (c) 2022 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.
@@ -33,6 +33,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
+import com.adevinta.android.barista.internal.viewaction.SleepViewAction
 import im.vector.app.core.utils.getMatrixInstance
 import im.vector.app.features.MainActivity
 import im.vector.app.features.home.HomeActivity
@@ -224,8 +225,8 @@ class VerifySessionInteractiveTest : VerificationTestBase() {
 
         // Wait until local secrets are known (gossip)
         withIdlingResource(allSecretsKnownIdling(uiSession)) {
-            onView(withId(R.id.groupToolbarAvatarImageView))
-                    .perform(click())
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
         }
     }
 
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt b/vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
similarity index 98%
rename from vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
rename to vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
index 23a662dcc8..53e088118b 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright (c) 2022 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.
@@ -33,6 +33,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
+import com.adevinta.android.barista.internal.viewaction.SleepViewAction
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.getMatrixInstance
 import im.vector.app.features.MainActivity
diff --git a/vector/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt b/vector-app/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt
similarity index 89%
rename from vector/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt
rename to vector-app/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt
index 48fc1343b1..d8873a71a4 100644
--- a/vector/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt
@@ -20,11 +20,13 @@ import androidx.test.platform.app.InstrumentationRegistry
 import im.vector.app.features.room.VectorRoomDisplayNameFallbackProvider
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.SyncConfig
 
 fun getMatrixInstance(): Matrix {
     val context = InstrumentationRegistry.getInstrumentation().targetContext
     val configuration = MatrixConfiguration(
-            roomDisplayNameFallbackProvider = VectorRoomDisplayNameFallbackProvider(context)
+            roomDisplayNameFallbackProvider = VectorRoomDisplayNameFallbackProvider(context),
+            syncConfig = SyncConfig(longPollTimeout = 5_000L),
     )
     return Matrix(context, configuration)
 }
diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
rename to vector-app/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
similarity index 96%
rename from vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
rename to vector-app/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
index b01c1a895f..5e131479bf 100644
--- a/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
@@ -83,7 +83,7 @@ private fun useMediaStoreScreenshotStorage(
         screenshotLocation: String,
         bitmap: Bitmap
 ) {
-    contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, "$screenshotName.jpeg")
+    contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, "${screenshotName}.jpeg")
     contentValues.put(MediaStore.Images.Media.RELATIVE_PATH, screenshotLocation)
     val uri: Uri? = contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
     if (uri != null) {
@@ -92,7 +92,6 @@ private fun useMediaStoreScreenshotStorage(
     }
 }
 
-@Suppress("DEPRECATION")
 private fun usePublicExternalScreenshotStorage(
         contentValues: ContentValues,
         contentResolver: ContentResolver,
@@ -104,7 +103,7 @@ private fun usePublicExternalScreenshotStorage(
     if (!directory.exists()) {
         directory.mkdirs()
     }
-    val file = File(directory, "$screenshotName.jpeg")
+    val file = File(directory, "${screenshotName}.jpeg")
     saveScreenshotToStream(bitmap, FileOutputStream(file))
     contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
 }
diff --git a/vector-app/src/androidTest/java/im/vector/app/espresso/tools/ViewActionsExt.kt b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/ViewActionsExt.kt
new file mode 100644
index 0000000000..c1e5c0164b
--- /dev/null
+++ b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/ViewActionsExt.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.espresso.tools
+
+import android.view.View
+import androidx.test.espresso.PerformException
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import com.google.android.material.tabs.TabLayout
+import org.hamcrest.Matchers.allOf
+
+fun selectTabAtPosition(tabIndex: Int): ViewAction {
+    return object : ViewAction {
+        override fun getDescription() = "with tab at index $tabIndex"
+
+        override fun getConstraints() = allOf(isDisplayed(), isAssignableFrom(TabLayout::class.java))
+
+        override fun perform(uiController: UiController, view: View) {
+            val tabLayout = view as TabLayout
+            val tabAtIndex: TabLayout.Tab = tabLayout.getTabAt(tabIndex)
+                    ?: throw PerformException.Builder()
+                            .withCause(Throwable("No tab at index $tabIndex"))
+                            .build()
+
+            tabAtIndex.select()
+        }
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt
rename to vector-app/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
similarity index 86%
rename from vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index 9434006060..3439bcfced 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -21,13 +21,14 @@ import androidx.test.espresso.IdlingPolicies
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import im.vector.app.R
 import im.vector.app.espresso.tools.ScreenshotFailureRule
 import im.vector.app.features.MainActivity
 import im.vector.app.getString
 import im.vector.app.ui.robot.ElementRobot
-import im.vector.app.ui.robot.settings.labs.LabFeature
+import im.vector.app.ui.robot.settings.labs.LabFeaturesPreferences
 import im.vector.app.ui.robot.withDeveloperMode
 import org.junit.Rule
 import org.junit.Test
@@ -49,7 +50,14 @@ class UiAllScreensSanityTest {
             .around(GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE))
             .around(ScreenshotFailureRule())
 
-    private val elementRobot = ElementRobot()
+    private val elementRobot = ElementRobot(
+            LabFeaturesPreferences(
+                    InstrumentationRegistry.getInstrumentation()
+                            .targetContext
+                            .resources
+                            .getBoolean(R.bool.settings_labs_new_app_layout_default)
+            )
+    )
 
     // Last passing:
     // 2020-11-09
@@ -101,11 +109,11 @@ class UiAllScreensSanityTest {
 
         val spaceName = UUID.randomUUID().toString()
         elementRobot.space {
-            createSpace {
+            createSpace(true) {
                 createAndCrawl(spaceName)
             }
             val publicSpaceName = UUID.randomUUID().toString()
-            createSpace {
+            createSpace(false) {
                 createPublicSpace(publicSpaceName)
             }
 
@@ -124,8 +132,20 @@ class UiAllScreensSanityTest {
             }
         }
 
+        // Some instability with the bottomsheet
+        // not sure what's the source, maybe the expanded state?
+        Thread.sleep(10_000)
+
         elementRobot.space { selectSpace(spaceName) }
 
+        elementRobot.layoutPreferences {
+            crawl()
+        }
+
+        elementRobot.roomList {
+            crawlTabs()
+        }
+
         elementRobot.withDeveloperMode {
             settings {
                 advancedSettings { crawlDeveloperOptions() }
@@ -158,7 +178,6 @@ class UiAllScreensSanityTest {
      * Testing multiple threads screens
      */
     private fun testThreadScreens() {
-        elementRobot.toggleLabFeature(LabFeature.THREAD_MESSAGES)
         elementRobot.newRoom {
             createNewRoom {
                 crawl()
@@ -172,6 +191,5 @@ class UiAllScreensSanityTest {
                 }
             }
         }
-        elementRobot.toggleLabFeature(LabFeature.THREAD_MESSAGES)
     }
 }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/AnalyticsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/AnalyticsRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/AnalyticsRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/AnalyticsRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
similarity index 74%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
index b6fbfc23ab..8f1df52863 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
@@ -17,8 +17,10 @@
 package im.vector.app.ui.robot
 
 import android.view.View
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
@@ -33,21 +35,25 @@ import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickD
 import com.adevinta.android.barista.interaction.BaristaDrawerInteractions.openDrawer
 import im.vector.app.EspressoHelper
 import im.vector.app.R
+import im.vector.app.espresso.tools.clickOnPreference
 import im.vector.app.espresso.tools.waitUntilActivityVisible
 import im.vector.app.espresso.tools.waitUntilDialogVisible
 import im.vector.app.espresso.tools.waitUntilViewVisible
 import im.vector.app.features.createdirect.CreateDirectRoomActivity
 import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.onboarding.OnboardingActivity
+import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.initialSyncIdlingResource
 import im.vector.app.ui.robot.settings.SettingsRobot
 import im.vector.app.ui.robot.settings.labs.LabFeature
+import im.vector.app.ui.robot.settings.labs.LabFeaturesPreferences
 import im.vector.app.ui.robot.space.SpaceRobot
 import im.vector.app.withIdlingResource
 import timber.log.Timber
 
-class ElementRobot {
-
+class ElementRobot(
+        private val labsPreferences: LabFeaturesPreferences = LabFeaturesPreferences(true)
+) {
     fun onboarding(block: OnboardingRobot.() -> Unit) {
         block(OnboardingRobot())
     }
@@ -73,40 +79,69 @@ class ElementRobot {
         val activity = EspressoHelper.getCurrentActivity()!!
         val uiSession = (activity as HomeActivity).activeSessionHolder.getActiveSession()
         withIdlingResource(initialSyncIdlingResource(uiSession)) {
-            waitUntilViewVisible(withId(R.id.bottomNavigationView))
+            waitUntilViewVisible(withId(R.id.roomListContainer))
         }
     }
 
     fun settings(shouldGoBack: Boolean = true, block: SettingsRobot.() -> Unit) {
-        openDrawer()
-        clickOn(R.id.homeDrawerHeaderSettingsView)
+        if (labsPreferences.isNewAppLayoutEnabled) {
+            onView(withId((R.id.avatar))).perform(click())
+        } else {
+            openDrawer()
+            clickOn(R.id.homeDrawerHeaderSettingsView)
+        }
+
         block(SettingsRobot())
         if (shouldGoBack) pressBack()
-        waitUntilViewVisible(withId(R.id.bottomNavigationView))
+        waitUntilViewVisible(withId(R.id.roomListContainer))
+    }
+
+    fun layoutPreferences(block: LayoutPreferencesRobot.() -> Unit) {
+        openActionBarOverflowOrOptionsMenu(
+                ApplicationProvider.getApplicationContext()
+        )
+        clickOn(R.string.home_layout_preferences)
+        waitUntilDialogVisible(withId(R.id.home_layout_settings_recents))
+
+        block(LayoutPreferencesRobot())
+
+        pressBack()
     }
 
     fun newDirectMessage(block: NewDirectMessageRobot.() -> Unit) {
-        clickOn(R.id.bottom_action_people)
-        clickOn(R.id.createChatRoomButton)
+        if (labsPreferences.isNewAppLayoutEnabled) {
+            clickOn(R.id.newLayoutCreateChatButton)
+            waitUntilDialogVisible(withId(R.id.start_chat))
+            clickOn(R.id.start_chat)
+        } else {
+            clickOn(R.id.bottom_action_people)
+            clickOn(R.id.createChatRoomButton)
+        }
+
         waitUntilActivityVisible<CreateDirectRoomActivity> {
             waitUntilViewVisible(withId(R.id.userListSearch))
         }
         closeSoftKeyboard()
         block(NewDirectMessageRobot())
         pressBack()
-        waitUntilViewVisible(withId(R.id.bottomNavigationView))
+        waitUntilViewVisible(withId(R.id.roomListContainer))
     }
 
     fun newRoom(block: NewRoomRobot.() -> Unit) {
-        clickOn(R.id.bottom_action_rooms)
-        RoomListRobot().newRoom { block() }
-        waitUntilViewVisible(withId(R.id.bottomNavigationView))
+        if (!labsPreferences.isNewAppLayoutEnabled) {
+            clickOn(R.id.bottom_action_rooms)
+        }
+        RoomListRobot(labsPreferences).newRoom { block() }
+        waitUntilViewVisible(withId(R.id.roomListContainer))
     }
 
     fun roomList(block: RoomListRobot.() -> Unit) {
-        clickOn(R.id.bottom_action_rooms)
-        block(RoomListRobot())
-        waitUntilViewVisible(withId(R.id.bottomNavigationView))
+        if (!labsPreferences.isNewAppLayoutEnabled) {
+            clickOn(R.id.bottom_action_rooms)
+        }
+
+        block(RoomListRobot(labsPreferences))
+        waitUntilViewVisible(withId(R.id.roomListContainer))
     }
 
     fun toggleLabFeature(labFeature: LabFeature) {
@@ -146,8 +181,17 @@ class ElementRobot {
     }
 
     fun signout(expectSignOutWarning: Boolean) {
-        clickOn(R.id.groupToolbarAvatarImageView)
-        clickOn(R.id.homeDrawerHeaderSignoutView)
+        if (labsPreferences.isNewAppLayoutEnabled) {
+            onView(withId((R.id.avatar)))
+                    .perform(click())
+            waitUntilActivityVisible<VectorSettingsActivity> {
+                clickOn(R.string.settings_general_title)
+            }
+            clickOnPreference(R.string.action_sign_out)
+        } else {
+            clickOn(R.id.groupToolbarAvatarImageView)
+            clickOn(R.id.homeDrawerHeaderSignoutView)
+        }
 
         val isShowingSignOutWarning = kotlin.runCatching {
             waitUntilViewVisible(withId(R.id.exitAnywayButton))
@@ -187,7 +231,7 @@ class ElementRobot {
     }
 
     fun space(block: SpaceRobot.() -> Unit) {
-        block(SpaceRobot())
+        block(SpaceRobot(labsPreferences))
     }
 }
 
diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/LayoutPreferencesRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/LayoutPreferencesRobot.kt
new file mode 100644
index 0000000000..429511e10f
--- /dev/null
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/LayoutPreferencesRobot.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.ui.robot
+
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import im.vector.app.R
+
+class LayoutPreferencesRobot {
+
+    fun crawl() {
+        toggleRecents()
+        toggleFilters()
+        useAZOrderd()
+        useActivityOrder()
+    }
+
+    fun toggleRecents() {
+        clickOn(R.id.home_layout_settings_recents)
+    }
+
+    fun toggleFilters() {
+        clickOn(R.id.home_layout_settings_filters)
+    }
+
+    fun useAZOrderd() {
+        clickOn(R.id.home_layout_settings_sort_name)
+    }
+
+    fun useActivityOrder() {
+        clickOn(R.id.home_layout_settings_sort_activity)
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt
similarity index 79%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt
index 09ff1162c0..0cea26d5cc 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt
@@ -21,10 +21,15 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import im.vector.app.R
 import im.vector.app.espresso.tools.waitUntilViewVisible
+import im.vector.app.features.DefaultVectorFeatures
+import im.vector.app.features.VectorFeatures
+import im.vector.app.ui.robot.settings.labs.LabFeaturesPreferences
 
 class NewRoomRobot(
-        var createdRoom: Boolean = false
+        var createdRoom: Boolean = false,
+        private val labsPreferences: LabFeaturesPreferences
 ) {
+    private val features: VectorFeatures = DefaultVectorFeatures()
 
     fun createNewRoom(block: CreateNewRoomRobot.() -> Unit) {
         clickOn(R.string.create_new_room)
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
similarity index 99%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
index e72535c116..1f1a799db3 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
@@ -33,7 +33,6 @@ import im.vector.app.features.DefaultVectorFeatures
 import im.vector.app.waitForView
 
 class OnboardingRobot {
-
     private val defaultVectorFeatures = DefaultVectorFeatures()
 
     fun crawl() {
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingServersRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingServersRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingServersRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingServersRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt
new file mode 100644
index 0000000000..cbc46f15e7
--- /dev/null
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.ui.robot
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import im.vector.app.R
+import im.vector.app.espresso.tools.selectTabAtPosition
+import im.vector.app.espresso.tools.waitUntilActivityVisible
+import im.vector.app.espresso.tools.waitUntilDialogVisible
+import im.vector.app.espresso.tools.waitUntilViewVisible
+import im.vector.app.features.home.HomeActivity
+import im.vector.app.features.home.room.list.home.header.HomeRoomFilter
+import im.vector.app.features.roomdirectory.RoomDirectoryActivity
+import im.vector.app.ui.robot.settings.labs.LabFeaturesPreferences
+import im.vector.app.waitForView
+
+class RoomListRobot(private val labsPreferences: LabFeaturesPreferences) {
+
+    fun openRoom(roomName: String, block: RoomDetailRobot.() -> Unit) {
+        onView(withId(R.id.roomListView))
+                .perform(
+                        RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                hasDescendant(withText(roomName)),
+                                ViewActions.click()
+                        )
+                )
+        block(RoomDetailRobot())
+        pressBack()
+    }
+
+    fun verifyCreatedRoom() {
+        onView(withId(R.id.roomListView))
+                .perform(
+                        RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                hasDescendant(withText(R.string.room_displayname_empty_room)),
+                                ViewActions.longClick()
+                        )
+                )
+        pressBack()
+    }
+
+    fun newRoom(block: NewRoomRobot.() -> Unit) {
+        if (labsPreferences.isNewAppLayoutEnabled) {
+            clickOn(R.id.newLayoutCreateChatButton)
+            waitUntilDialogVisible(withId(R.id.create_room))
+            clickOn(R.id.create_room)
+        } else {
+            clickOn(R.id.createGroupRoomButton)
+            waitUntilActivityVisible<RoomDirectoryActivity> {
+                BaristaVisibilityAssertions.assertDisplayed(R.id.publicRoomsList)
+            }
+        }
+        val newRoomRobot = NewRoomRobot(false, labsPreferences)
+        block(newRoomRobot)
+        if (!newRoomRobot.createdRoom) {
+            pressBack()
+        }
+    }
+
+    fun crawlTabs() {
+        waitUntilActivityVisible<HomeActivity> {
+            waitUntilViewVisible(withId(R.id.roomListContainer))
+        }
+
+        selectFilterTab(HomeRoomFilter.UNREADS)
+        waitForView(withId(R.id.emptyTitleView))
+        selectFilterTab(HomeRoomFilter.ALL)
+        waitForView(withId(R.id.roomNameView))
+    }
+
+    fun selectFilterTab(filter: HomeRoomFilter) {
+        onView(withId(R.id.home_filter_tabs_tabs)).perform(selectTabAtPosition(filter.ordinal))
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
similarity index 91%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
index 2c57dd058d..62c34e1b66 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
@@ -34,18 +34,18 @@ class RoomSettingsRobot {
 
     fun crawl() {
         // Room settings
-        clickListItem(R.id.matrixProfileRecyclerView, 3)
+        clickListItem(R.id.matrixProfileRecyclerView, 4)
         navigateToRoomParameters()
         pressBack()
 
         // Notifications
-        clickListItem(R.id.matrixProfileRecyclerView, 5)
+        clickListItem(R.id.matrixProfileRecyclerView, 6)
         pressBack()
 
         assertDisplayed(R.id.roomProfileAvatarView)
 
         // People
-        clickListItem(R.id.matrixProfileRecyclerView, 7)
+        clickListItem(R.id.matrixProfileRecyclerView, 8)
         assertDisplayed(R.id.inviteUsersButton)
         navigateToRoomPeople()
         // Fab
@@ -56,7 +56,7 @@ class RoomSettingsRobot {
         assertDisplayed(R.id.roomProfileAvatarView)
 
         // Uploads
-        clickListItem(R.id.matrixProfileRecyclerView, 9)
+        clickListItem(R.id.matrixProfileRecyclerView, 10)
         // File tab
         clickOn(R.string.uploads_files_title)
         waitUntilViewVisible(withText(R.string.uploads_media_title))
@@ -73,12 +73,12 @@ class RoomSettingsRobot {
         // Advanced
         // Room addresses
 
-        clickListItem(R.id.matrixProfileRecyclerView, 15)
+        clickListItem(R.id.matrixProfileRecyclerView, 16)
         waitUntilViewVisible(withText(R.string.room_alias_published_alias_title))
         pressBack()
 
         // Room permissions
-        clickListItem(R.id.matrixProfileRecyclerView, 17)
+        clickListItem(R.id.matrixProfileRecyclerView, 18)
         waitUntilViewVisible(withText(R.string.room_permissions_change_room_avatar))
         clickOn(R.string.room_permissions_change_room_avatar)
         waitUntilDialogVisible(withId(android.R.id.button2))
@@ -95,7 +95,7 @@ class RoomSettingsRobot {
     }
 
     private fun leaveRoom(block: DialogRobot.() -> Unit) {
-        clickListItem(R.id.matrixProfileRecyclerView, 13)
+        clickListItem(R.id.matrixProfileRecyclerView, 14)
         waitUntilDialogVisible(withId(android.R.id.button2))
         val dialogRobot = DialogRobot()
         block(dialogRobot)
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsLegalsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsLegalsRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsLegalsRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsLegalsRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeature.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeature.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeature.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeature.kt
diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeaturesPreferences.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeaturesPreferences.kt
new file mode 100644
index 0000000000..8f36e7ae23
--- /dev/null
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeaturesPreferences.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.ui.robot.settings.labs
+
+data class LabFeaturesPreferences(val isNewAppLayoutEnabled: Boolean)
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt
similarity index 88%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt
index 018f3097ba..ad6d5e5df3 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt
@@ -28,9 +28,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import im.vector.app.R
 import im.vector.app.espresso.tools.waitUntilActivityVisible
-import im.vector.app.espresso.tools.waitUntilDialogVisible
 import im.vector.app.espresso.tools.waitUntilViewVisible
 import im.vector.app.features.home.HomeActivity
+import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.spaces.manage.SpaceManageActivity
 
 class SpaceCreateRobot {
@@ -85,12 +85,17 @@ class SpaceCreateRobot {
         clickOn(R.id.nextButton)
         waitUntilViewVisible(withId(R.id.recyclerView))
         clickOn(R.id.nextButton)
-        waitUntilDialogVisible(withId(R.id.inviteByMxidButton))
-        // close invite dialog
-        pressBack()
-        waitUntilViewVisible(withId(R.id.timelineRecyclerView))
+//        waitUntilActivityVisible<RoomDetailActivity> {
+//            waitUntilDialogVisible(withId(R.id.inviteByMxidButton))
+//        }
+//        // close invite dialog
+//        pressBack()
+        waitUntilActivityVisible<RoomDetailActivity> {
+            pressBack()
+        }
+//        waitUntilViewVisible(withId(R.id.timelineRecyclerView))
         // close room
-        pressBack()
+//        pressBack()
         waitUntilViewVisible(withId(R.id.roomListContainer))
     }
 }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt
similarity index 95%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt
index d04746bcd6..73a063857a 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt
@@ -89,9 +89,8 @@ class SpaceMenuRobot {
         clickOnSheet(R.id.leaveSpace)
         waitUntilActivityVisible<SpaceLeaveAdvancedActivity> {
             waitUntilViewVisible(ViewMatchers.withId(R.id.roomList))
+            clickOn(R.id.spaceLeaveSelectAll)
+            clickOn(R.id.spaceLeaveButton)
         }
-        clickOn(R.id.spaceLeaveSelectAll)
-        clickOn(R.id.spaceLeaveButton)
-        waitUntilViewVisible(ViewMatchers.withId(R.id.groupListView))
     }
 }
diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt
new file mode 100644
index 0000000000..e8ff58ba6a
--- /dev/null
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.ui.robot.space
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.longClick
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaDrawerInteractions.openDrawer
+import com.adevinta.android.barista.internal.viewaction.ClickChildAction
+import im.vector.app.R
+import im.vector.app.espresso.tools.waitUntilDialogVisible
+import im.vector.app.espresso.tools.waitUntilViewVisible
+import im.vector.app.features.DefaultVectorFeatures
+import im.vector.app.features.VectorFeatures
+import im.vector.app.ui.robot.settings.labs.LabFeaturesPreferences
+import org.hamcrest.Matchers
+
+class SpaceRobot(private val labsPreferences: LabFeaturesPreferences) {
+    private val features: VectorFeatures = DefaultVectorFeatures()
+
+    fun createSpace(isFirstSpace: Boolean, block: SpaceCreateRobot.() -> Unit) {
+        if (labsPreferences.isNewAppLayoutEnabled) {
+            clickOn(R.id.newLayoutOpenSpacesButton)
+            if (isFirstSpace) {
+                waitUntilDialogVisible(ViewMatchers.withId(R.id.spaces_empty_group))
+                clickOn(R.id.spaces_empty_button)
+            } else {
+                waitUntilDialogVisible(ViewMatchers.withId(R.id.groupListView))
+                Espresso.onView(ViewMatchers.withId(R.id.groupListView))
+                        .perform(
+                                RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                        ViewMatchers.hasDescendant(ViewMatchers.withId(R.id.plus)),
+                                        click()
+                                ).atPosition(0)
+                        )
+            }
+        } else {
+            openDrawer()
+            clickOn(R.string.create_space)
+        }
+        block(SpaceCreateRobot())
+    }
+
+    fun spaceMenu(spaceName: String, block: SpaceMenuRobot.() -> Unit) {
+        if (labsPreferences.isNewAppLayoutEnabled) {
+            clickOn(R.id.newLayoutOpenSpacesButton)
+            waitUntilDialogVisible(ViewMatchers.withId(R.id.groupListView))
+        } else {
+            openDrawer()
+        }
+        with(SpaceMenuRobot()) {
+            openMenu(spaceName)
+            block()
+        }
+    }
+
+    fun openMenu(spaceName: String) {
+        waitUntilViewVisible(ViewMatchers.withId(R.id.groupListView))
+        if (labsPreferences.isNewAppLayoutEnabled) {
+            Espresso.onView(ViewMatchers.withId(R.id.groupListView))
+                    .perform(
+                            RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                    ViewMatchers.hasDescendant(Matchers.allOf(ViewMatchers.withId(R.id.name), ViewMatchers.withText(spaceName))),
+                                    longClick()
+                            ).atPosition(0)
+                    )
+        } else {
+            Espresso.onView(ViewMatchers.withId(R.id.groupListView))
+                    .perform(
+                            RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                    ViewMatchers.hasDescendant(Matchers.allOf(ViewMatchers.withId(R.id.groupNameView), ViewMatchers.withText(spaceName))),
+                                    ClickChildAction.clickChildWithId(R.id.groupTmpLeave)
+                            ).atPosition(0)
+                    )
+        }
+
+        waitUntilDialogVisible(ViewMatchers.withId(R.id.spaceNameView))
+    }
+
+    fun selectSpace(spaceName: String) {
+        if (!labsPreferences.isNewAppLayoutEnabled) {
+            openDrawer()
+            waitUntilViewVisible(ViewMatchers.withId(R.id.groupListView))
+        }
+        clickOn(spaceName)
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt
similarity index 100%
rename from vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt
rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt
diff --git a/vector-app/src/debug/AndroidManifest.xml b/vector-app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000000..be2aadbeaf
--- /dev/null
+++ b/vector-app/src/debug/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity android:name="im.vector.app.features.debug.TestLinkifyActivity" />
+        <activity android:name="im.vector.app.features.debug.DebugPermissionActivity" />
+        <activity android:name="im.vector.app.features.debug.jitsi.DebugJitsiActivity" />
+        <activity android:name="im.vector.app.features.debug.analytics.DebugAnalyticsActivity" />
+        <activity android:name="im.vector.app.features.debug.settings.DebugPrivateSettingsActivity" />
+        <activity android:name="im.vector.app.features.debug.sas.DebugSasEmojiActivity" />
+        <activity android:name="im.vector.app.features.debug.features.DebugFeaturesSettingsActivity" />
+        <activity android:name="im.vector.app.features.debug.DebugMenuActivity" />
+        <activity android:name="im.vector.app.features.debug.leak.DebugMemoryLeaksActivity" />
+
+        <activity
+            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
+            android:exported="true" />
+
+    </application>
+
+</manifest>
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
similarity index 95%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index eaaf021989..af63e6eae0 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -26,7 +26,6 @@ import androidx.core.app.Person
 import androidx.core.content.getSystemService
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.time.Clock
@@ -34,13 +33,14 @@ import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.toast
-import im.vector.app.databinding.ActivityDebugMenuBinding
 import im.vector.app.features.debug.analytics.DebugAnalyticsActivity
 import im.vector.app.features.debug.features.DebugFeaturesSettingsActivity
+import im.vector.app.features.debug.jitsi.DebugJitsiActivity
 import im.vector.app.features.debug.leak.DebugMemoryLeaksActivity
 import im.vector.app.features.debug.sas.DebugSasEmojiActivity
 import im.vector.app.features.debug.settings.DebugPrivateSettingsActivity
 import im.vector.app.features.qrcode.QrCodeScannerActivity
+import im.vector.application.databinding.ActivityDebugMenuBinding
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkDefaultActivity
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkTestActivity
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkVectorActivity
@@ -59,11 +59,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
 
     override fun getBinding() = ActivityDebugMenuBinding.inflate(layoutInflater)
 
-    @Inject
-    lateinit var activeSessionHolder: ActiveSessionHolder
-
-    @Inject
-    lateinit var clock: Clock
+    @Inject lateinit var clock: Clock
 
     private lateinit var buffer: ByteArray
 
@@ -126,6 +122,9 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
         views.debugPermission.setOnClickListener {
             startActivity(Intent(this, DebugPermissionActivity::class.java))
         }
+        views.debugJitsi.setOnClickListener {
+            startActivity(Intent(this, DebugJitsiActivity::class.java))
+        }
     }
 
     private fun openPrivateSettings() {
@@ -180,7 +179,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
                 .setContentText("Content")
                 // No effect because it's a group summary notif
                 .setNumber(33)
-                .setSmallIcon(R.drawable.ic_status_bar)
+                .setSmallIcon(R.drawable.ic_notification)
                 // This provocate the badge issue: no badge for group notification
                 .setGroup("GroupKey")
                 .setGroupSummary(true)
@@ -213,7 +212,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
                         // For shortcut on long press on launcher icon
                         .setBadgeIconType(NotificationCompat.BADGE_ICON_NONE)
                         .setStyle(messagingStyle1)
-                        .setSmallIcon(R.drawable.ic_status_bar)
+                        .setSmallIcon(R.drawable.ic_notification)
                         .setGroup("GroupKey")
                         .build()
         )
@@ -225,7 +224,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
                         .setContentTitle("Title 2")
                         .setContentText("Content 2")
                         .setStyle(messagingStyle2)
-                        .setSmallIcon(R.drawable.ic_status_bar)
+                        .setSmallIcon(R.drawable.ic_notification)
                         .setGroup("GroupKey")
                         .build()
         )
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
similarity index 86%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
index 0f00f2daa5..2b1b66e672 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
@@ -22,14 +22,15 @@ import android.os.Build
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.onPermissionDeniedDialog
 import im.vector.app.core.utils.onPermissionDeniedSnackbar
 import im.vector.app.core.utils.registerForPermissionsResult
-import im.vector.app.databinding.ActivityDebugPermissionBinding
+import im.vector.application.R
+import im.vector.application.databinding.ActivityDebugPermissionBinding
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -46,7 +47,15 @@ class DebugPermissionActivity : VectorBaseActivity<ActivityDebugPermissionBindin
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
             Manifest.permission.READ_EXTERNAL_STORAGE,
             Manifest.permission.READ_CONTACTS
-    )
+    ) + getAndroid13Permissions()
+
+    private fun getAndroid13Permissions(): List<String> {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            listOf(Manifest.permission.POST_NOTIFICATIONS)
+        } else {
+            emptyList()
+        }
+    }
 
     private var lastPermissions = emptyList<String>()
 
@@ -77,6 +86,14 @@ class DebugPermissionActivity : VectorBaseActivity<ActivityDebugPermissionBindin
             lastPermissions = listOf(Manifest.permission.READ_CONTACTS)
             checkPerm()
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            views.notification.setOnClickListener {
+                lastPermissions = listOf(Manifest.permission.POST_NOTIFICATIONS)
+                checkPerm()
+            }
+        } else {
+            views.notification.isVisible = false
+        }
     }
 
     private fun checkPerm() {
diff --git a/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
similarity index 97%
rename from vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
index 59c60e0e15..6e94bce00a 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
@@ -20,9 +20,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import im.vector.app.R
-import im.vector.app.databinding.ActivityTestLinkifyBinding
-import im.vector.app.databinding.ItemTestLinkifyBinding
+import im.vector.application.R
+import im.vector.application.databinding.ActivityTestLinkifyBinding
+import im.vector.application.databinding.ItemTestLinkifyBinding
 
 class TestLinkifyActivity : AppCompatActivity() {
 
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt
similarity index 97%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt
index eb23fe6383..0fa11d7220 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt
@@ -25,7 +25,7 @@ import com.airbnb.mvrx.withState
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.extensions.toOnOff
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.databinding.FragmentDebugAnalyticsBinding
+import im.vector.application.databinding.FragmentDebugAnalyticsBinding
 import me.gujun.android.span.span
 
 class DebugAnalyticsFragment : VectorBaseFragment<FragmentDebugAnalyticsBinding>() {
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt
similarity index 94%
rename from vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt
index 1e9b88c048..38765bfa9b 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt
@@ -23,9 +23,9 @@ import android.widget.Spinner
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.application.R
 
 @EpoxyModelClass
 abstract class BooleanFeatureItem : VectorEpoxyModel<BooleanFeatureItem.Holder>(R.layout.item_feature) {
@@ -70,8 +70,8 @@ abstract class BooleanFeatureItem : VectorEpoxyModel<BooleanFeatureItem.Holder>(
     }
 
     class Holder : VectorEpoxyHolder() {
-        val label by bind<TextView>(im.vector.app.R.id.feature_label)
-        val optionsSpinner by bind<Spinner>(im.vector.app.R.id.feature_options)
+        val label by bind<TextView>(R.id.feature_label)
+        val optionsSpinner by bind<Spinner>(R.id.feature_options)
     }
 
     interface Listener {
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
similarity index 83%
rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
index c127e3aed6..16e26ff3b5 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
@@ -80,20 +80,30 @@ class DebugFeaturesStateFactory @Inject constructor(
                                 key = DebugFeatureKeys.forceUsageOfOpusEncoder,
                                 factory = VectorFeatures::forceUsageOfOpusEncoder
                         ),
-                        createBooleanFeature(
-                                label = "Start DM on first message",
-                                key = DebugFeatureKeys.startDmOnFirstMsg,
-                                factory = VectorFeatures::shouldStartDmOnFirstMessage
-                        ),
                         createBooleanFeature(
                                 label = "Enable New App Layout",
                                 key = DebugFeatureKeys.newAppLayoutEnabled,
-                                factory = VectorFeatures::isNewAppLayoutEnabled
+                                factory = VectorFeatures::isNewAppLayoutFeatureEnabled
                         ),
                         createBooleanFeature(
-                                label = "Enable New Device Management",
-                                key = DebugFeatureKeys.newDeviceManagementEnabled,
-                                factory = VectorFeatures::isNewDeviceManagementEnabled
+                                label = "Enable QR Code Login",
+                                key = DebugFeatureKeys.qrCodeLoginEnabled,
+                                factory = VectorFeatures::isQrCodeLoginEnabled
+                        ),
+                        createBooleanFeature(
+                                label = "Allow QR Code Login for all servers",
+                                key = DebugFeatureKeys.qrCodeLoginForAllServers,
+                                factory = VectorFeatures::isQrCodeLoginForAllServers
+                        ),
+                        createBooleanFeature(
+                                label = "Show QR Code Login in Device Manager",
+                                key = DebugFeatureKeys.reciprocateQrCodeLogin,
+                                factory = VectorFeatures::isReciprocateQrCodeLogin
+                        ),
+                        createBooleanFeature(
+                                label = "Enable Voice Broadcast",
+                                key = DebugFeatureKeys.voiceBroadcastEnabled,
+                                factory = VectorFeatures::isVoiceBroadcastEnabled
                         ),
                 )
         )
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
similarity index 81%
rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
index 003b9b8084..2134c8cf2c 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
@@ -73,14 +73,23 @@ class DebugVectorFeatures(
     override fun forceUsageOfOpusEncoder(): Boolean = read(DebugFeatureKeys.forceUsageOfOpusEncoder)
             ?: vectorFeatures.forceUsageOfOpusEncoder()
 
-    override fun shouldStartDmOnFirstMessage(): Boolean = read(DebugFeatureKeys.startDmOnFirstMsg)
-            ?: vectorFeatures.shouldStartDmOnFirstMessage()
+    override fun isNewAppLayoutFeatureEnabled(): Boolean = read(DebugFeatureKeys.newAppLayoutEnabled)
+            ?: vectorFeatures.isNewAppLayoutFeatureEnabled()
 
-    override fun isNewAppLayoutEnabled(): Boolean = read(DebugFeatureKeys.newAppLayoutEnabled)
-            ?: vectorFeatures.isNewAppLayoutEnabled()
+    override fun isQrCodeLoginEnabled() = read(DebugFeatureKeys.qrCodeLoginEnabled)
+            ?: vectorFeatures.isQrCodeLoginEnabled()
 
-    override fun isNewDeviceManagementEnabled(): Boolean = read(DebugFeatureKeys.newDeviceManagementEnabled)
-            ?: vectorFeatures.isNewDeviceManagementEnabled()
+    override fun isQrCodeLoginForAllServers() = read(DebugFeatureKeys.qrCodeLoginForAllServers)
+            ?: vectorFeatures.isQrCodeLoginForAllServers()
+
+    override fun isReciprocateQrCodeLogin() = read(DebugFeatureKeys.reciprocateQrCodeLogin)
+            ?: vectorFeatures.isReciprocateQrCodeLogin()
+
+    override fun isVoiceBroadcastEnabled(): Boolean = read(DebugFeatureKeys.voiceBroadcastEnabled)
+            ?: vectorFeatures.isVoiceBroadcastEnabled()
+
+    override fun isUnverifiedSessionsAlertEnabled(): Boolean = read(DebugFeatureKeys.unverifiedSessionsAlertEnabled)
+            ?: vectorFeatures.isUnverifiedSessionsAlertEnabled()
 
     fun <T> override(value: T?, key: Preferences.Key<T>) = updatePreferences {
         if (value == null) {
@@ -140,7 +149,10 @@ object DebugFeatureKeys {
     val liveLocationSharing = booleanPreferencesKey("live-location-sharing")
     val screenSharing = booleanPreferencesKey("screen-sharing")
     val forceUsageOfOpusEncoder = booleanPreferencesKey("force-usage-of-opus-encoder")
-    val startDmOnFirstMsg = booleanPreferencesKey("start-dm-on-first-msg")
     val newAppLayoutEnabled = booleanPreferencesKey("new-app-layout-enabled")
-    val newDeviceManagementEnabled = booleanPreferencesKey("new-device-management-enabled")
+    val qrCodeLoginEnabled = booleanPreferencesKey("qr-code-login-enabled")
+    val qrCodeLoginForAllServers = booleanPreferencesKey("qr-code-login-for-all-servers")
+    val reciprocateQrCodeLogin = booleanPreferencesKey("reciprocate-qr-code-login")
+    val voiceBroadcastEnabled = booleanPreferencesKey("voice-broadcast-enabled")
+    val unverifiedSessionsAlertEnabled = booleanPreferencesKey("unverified-sessions-alert-enabled")
 }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt
similarity index 92%
rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt
index 5e16182f3c..57138b9a47 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt
@@ -66,13 +66,13 @@ class DebugVectorOverrides(private val context: Context) : VectorOverrides {
     suspend fun setHomeserverCapabilities(block: HomeserverCapabilitiesOverride.() -> HomeserverCapabilitiesOverride) {
         val capabilitiesOverride = block(forceHomeserverCapabilities.firstOrNull() ?: HomeserverCapabilitiesOverride(null, null))
         context.dataStore.edit { settings ->
-            when (capabilitiesOverride.canChangeDisplayName) {
+            when (val canChangeDisplayName = capabilitiesOverride.canChangeDisplayName) {
                 null -> settings.remove(forceCanChangeDisplayName)
-                else -> settings[forceCanChangeDisplayName] = capabilitiesOverride.canChangeDisplayName
+                else -> settings[forceCanChangeDisplayName] = canChangeDisplayName
             }
-            when (capabilitiesOverride.canChangeAvatar) {
+            when (val canChangeAvatar = capabilitiesOverride.canChangeAvatar) {
                 null -> settings.remove(forceCanChangeAvatar)
-                else -> settings[forceCanChangeAvatar] = capabilitiesOverride.canChangeAvatar
+                else -> settings[forceCanChangeAvatar] = canChangeAvatar
             }
         }
     }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt
similarity index 94%
rename from vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt
index 5231e591da..00f74515cc 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt
@@ -23,9 +23,9 @@ import android.widget.Spinner
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.application.R
 
 @EpoxyModelClass
 abstract class EnumFeatureItem : VectorEpoxyModel<EnumFeatureItem.Holder>(R.layout.item_feature) {
@@ -70,8 +70,8 @@ abstract class EnumFeatureItem : VectorEpoxyModel<EnumFeatureItem.Holder>(R.layo
     }
 
     class Holder : VectorEpoxyHolder() {
-        val label by bind<TextView>(im.vector.app.R.id.feature_label)
-        val optionsSpinner by bind<Spinner>(im.vector.app.R.id.feature_options)
+        val label by bind<TextView>(R.id.feature_label)
+        val optionsSpinner by bind<Spinner>(R.id.feature_options)
     }
 
     interface Listener {
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt
diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt
new file mode 100644
index 0000000000..5c6c5d1898
--- /dev/null
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.debug.jitsi
+
+import android.annotation.SuppressLint
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.application.databinding.ActivityDebugJitsiBinding
+import org.jitsi.meet.sdk.JitsiMeet
+
+@AndroidEntryPoint
+class DebugJitsiActivity : VectorBaseActivity<ActivityDebugJitsiBinding>() {
+
+    override fun getBinding() = ActivityDebugJitsiBinding.inflate(layoutInflater)
+
+    override fun getCoordinatorLayout() = views.coordinatorLayout
+
+    @SuppressLint("SetTextI18n")
+    override fun initUiAndData() {
+        val isCrashReportingDisabled = JitsiMeet.isCrashReportingDisabled(this)
+        views.status.text = "Jitsi crash reporting is disabled: $isCrashReportingDisabled"
+
+        views.splash.setOnClickListener {
+            JitsiMeet.showSplashScreen(this)
+        }
+
+        views.dev.setOnClickListener {
+            JitsiMeet.showDevOptions()
+        }
+    }
+}
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
similarity index 91%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
index d3e70e26e6..e9afa9aea9 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt
@@ -25,10 +25,11 @@ import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.databinding.FragmentDebugMemoryLeaksBinding
+import im.vector.application.databinding.FragmentDebugMemoryLeaksBinding
 
 @AndroidEntryPoint
-class DebugMemoryLeaksFragment : VectorBaseFragment<FragmentDebugMemoryLeaksBinding>() {
+class DebugMemoryLeaksFragment :
+        VectorBaseFragment<FragmentDebugMemoryLeaksBinding>() {
 
     private val viewModel: DebugMemoryLeaksViewModel by fragmentViewModel()
 
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
similarity index 98%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
index 5432cb0888..26eb1c1025 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2022 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.
diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
similarity index 98%
rename from vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
index 179ee35693..bbc438e4b2 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
@@ -21,9 +21,9 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.application.R
 import me.gujun.android.span.image
 import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
similarity index 76%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
index 38253fe7c2..020c228521 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
@@ -16,6 +16,8 @@
 
 package im.vector.app.features.debug.settings
 
+import android.annotation.SuppressLint
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -23,7 +25,8 @@ import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.databinding.FragmentDebugPrivateSettingsBinding
+import im.vector.app.features.home.room.list.home.release.ReleaseNotesActivity
+import im.vector.application.databinding.FragmentDebugPrivateSettingsBinding
 
 class DebugPrivateSettingsFragment : VectorBaseFragment<FragmentDebugPrivateSettingsBinding>() {
 
@@ -35,7 +38,6 @@ class DebugPrivateSettingsFragment : VectorBaseFragment<FragmentDebugPrivateSett
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
         setViewListeners()
     }
 
@@ -46,6 +48,12 @@ class DebugPrivateSettingsFragment : VectorBaseFragment<FragmentDebugPrivateSett
         views.forceLoginFallback.setOnCheckedChangeListener { _, isChecked ->
             viewModel.handle(DebugPrivateSettingsViewActions.SetForceLoginFallbackEnabled(isChecked))
         }
+        views.releaseNotesActivityHasBeenDisplayedReset.setOnClickListener {
+            viewModel.handle(DebugPrivateSettingsViewActions.ResetReleaseNotesActivityHasBeenDisplayed)
+        }
+        views.showReleaseNotesActivity.setOnClickListener {
+            startActivity(Intent(requireActivity(), ReleaseNotesActivity::class.java))
+        }
     }
 
     override fun invalidate() = withState(viewModel) {
@@ -57,5 +65,7 @@ class DebugPrivateSettingsFragment : VectorBaseFragment<FragmentDebugPrivateSett
             viewModel.handle(DebugPrivateSettingsViewActions.SetAvatarCapabilityOverride(option))
         }
         views.forceLoginFallback.isChecked = it.forceLoginFallback
+        @SuppressLint("SetTextI18n")
+        views.releaseNotesActivityHasBeenDisplayed.text = "ReleaseNotesActivity has been displayed: ${it.releaseNotesActivityHasBeenDisplayed}"
     }
 }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
similarity index 93%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
index 5dea3dce64..c4cd6d6f5a 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
@@ -23,4 +23,5 @@ sealed interface DebugPrivateSettingsViewActions : VectorViewModelAction {
     data class SetForceLoginFallbackEnabled(val force: Boolean) : DebugPrivateSettingsViewActions
     data class SetDisplayNameCapabilityOverride(val option: BooleanHomeserverCapabilitiesOverride?) : DebugPrivateSettingsViewActions
     data class SetAvatarCapabilityOverride(val option: BooleanHomeserverCapabilitiesOverride?) : DebugPrivateSettingsViewActions
+    object ResetReleaseNotesActivityHasBeenDisplayed : DebugPrivateSettingsViewActions
 }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
similarity index 84%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
index 59949c6c7b..231afeb8ce 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
@@ -27,11 +27,13 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.debug.features.DebugVectorOverrides
 import im.vector.app.features.debug.settings.DebugPrivateSettingsViewActions.SetAvatarCapabilityOverride
 import im.vector.app.features.debug.settings.DebugPrivateSettingsViewActions.SetDisplayNameCapabilityOverride
+import im.vector.app.features.home.room.list.home.release.ReleaseNotesPreferencesStore
 import kotlinx.coroutines.launch
 
 class DebugPrivateSettingsViewModel @AssistedInject constructor(
         @Assisted initialState: DebugPrivateSettingsViewState,
-        private val debugVectorOverrides: DebugVectorOverrides
+        private val debugVectorOverrides: DebugVectorOverrides,
+        private val releaseNotesPreferencesStore: ReleaseNotesPreferencesStore,
 ) : VectorViewModel<DebugPrivateSettingsViewState, DebugPrivateSettingsViewActions, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
@@ -43,6 +45,15 @@ class DebugPrivateSettingsViewModel @AssistedInject constructor(
 
     init {
         observeVectorOverrides()
+        observeReleaseNotesPreferencesStore()
+    }
+
+    private fun observeReleaseNotesPreferencesStore() {
+        releaseNotesPreferencesStore.appLayoutOnboardingShown.setOnEach {
+            copy(
+                    releaseNotesActivityHasBeenDisplayed = it
+            )
+        }
     }
 
     private fun observeVectorOverrides() {
@@ -72,6 +83,13 @@ class DebugPrivateSettingsViewModel @AssistedInject constructor(
             is DebugPrivateSettingsViewActions.SetForceLoginFallbackEnabled -> handleSetForceLoginFallbackEnabled(action)
             is SetDisplayNameCapabilityOverride -> handleSetDisplayNameCapabilityOverride(action)
             is SetAvatarCapabilityOverride -> handleSetAvatarCapabilityOverride(action)
+            DebugPrivateSettingsViewActions.ResetReleaseNotesActivityHasBeenDisplayed -> handleResetReleaseNotesActivityHasBeenDisplayed()
+        }
+    }
+
+    private fun handleResetReleaseNotesActivityHasBeenDisplayed() {
+        viewModelScope.launch {
+            releaseNotesPreferencesStore.setAppLayoutOnboardingShown(false)
         }
     }
 
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
similarity index 93%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
index 749b11a744..a390c94942 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
@@ -22,7 +22,8 @@ import im.vector.app.features.debug.settings.OverrideDropdownView.OverrideDropdo
 data class DebugPrivateSettingsViewState(
         val dialPadVisible: Boolean = false,
         val forceLoginFallback: Boolean = false,
-        val homeserverCapabilityOverrides: HomeserverCapabilityOverrides = HomeserverCapabilityOverrides()
+        val homeserverCapabilityOverrides: HomeserverCapabilityOverrides = HomeserverCapabilityOverrides(),
+        val releaseNotesActivityHasBeenDisplayed: Boolean = false,
 ) : MavericksState
 
 data class HomeserverCapabilityOverrides(
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt
similarity index 97%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt
index 7f510ee5e9..2800b7bd8d 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt
@@ -24,7 +24,7 @@ import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.LinearLayout
-import im.vector.app.databinding.ViewBooleanDropdownBinding
+import im.vector.application.databinding.ViewBooleanDropdownBinding
 
 class OverrideDropdownView @JvmOverloads constructor(
         context: Context,
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt
rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt
diff --git a/vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt b/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
similarity index 56%
rename from vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
rename to vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
index 2e4336c942..cbf9e4f11f 100644
--- a/vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
+++ b/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
@@ -17,6 +17,7 @@
 package im.vector.app.flipper
 
 import android.content.Context
+import android.os.Build
 import com.facebook.flipper.android.AndroidFlipperClient
 import com.facebook.flipper.android.utils.FlipperUtils
 import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin
@@ -31,6 +32,7 @@ import com.kgurgul.flipper.RealmDatabaseDriver
 import com.kgurgul.flipper.RealmDatabaseProvider
 import im.vector.app.core.debug.FlipperProxy
 import io.realm.RealmConfiguration
+import okhttp3.Interceptor
 import org.matrix.android.sdk.api.Matrix
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -41,29 +43,43 @@ class VectorFlipperProxy @Inject constructor(
 ) : FlipperProxy {
     private val networkFlipperPlugin = NetworkFlipperPlugin()
 
+    private val isEnabled: Boolean
+        get() {
+            // https://github.com/facebook/flipper/issues/3572
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                return false
+            }
+
+            return FlipperUtils.shouldEnableFlipper(context)
+        }
+
     override fun init(matrix: Matrix) {
+        if (!isEnabled) return
+
         SoLoader.init(context, false)
 
-        if (FlipperUtils.shouldEnableFlipper(context)) {
-            val client = AndroidFlipperClient.getInstance(context)
-            client.addPlugin(CrashReporterPlugin.getInstance())
-            client.addPlugin(SharedPreferencesFlipperPlugin(context))
-            client.addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
-            client.addPlugin(networkFlipperPlugin)
-            client.addPlugin(
-                    DatabasesFlipperPlugin(
-                            RealmDatabaseDriver(
-                                    context = context,
-                                    realmDatabaseProvider = object : RealmDatabaseProvider {
-                                        override fun getRealmConfigurations(): List<RealmConfiguration> {
-                                            return matrix.debugService().getAllRealmConfigurations()
-                                        }
-                                    })
-                    )
-            )
-            client.start()
-        }
+        val client = AndroidFlipperClient.getInstance(context)
+        client.addPlugin(CrashReporterPlugin.getInstance())
+        client.addPlugin(SharedPreferencesFlipperPlugin(context))
+        client.addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
+        client.addPlugin(networkFlipperPlugin)
+        client.addPlugin(
+                DatabasesFlipperPlugin(
+                        RealmDatabaseDriver(
+                                context = context,
+                                realmDatabaseProvider = object : RealmDatabaseProvider {
+                                    override fun getRealmConfigurations(): List<RealmConfiguration> {
+                                        return matrix.debugService().getAllRealmConfigurations()
+                                    }
+                                })
+                )
+        )
+        client.start()
     }
 
-    override fun networkInterceptor() = FlipperOkhttpInterceptor(networkFlipperPlugin)
+    override fun networkInterceptor(): Interceptor? {
+        if (!isEnabled) return null
+
+        return FlipperOkhttpInterceptor(networkFlipperPlugin)
+    }
 }
diff --git a/vector/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt b/vector-app/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt
similarity index 100%
rename from vector/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt
rename to vector-app/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt
diff --git a/vector/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt b/vector-app/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt
similarity index 85%
rename from vector/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt
rename to vector-app/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt
index 550dc055d9..4edbdd0591 100644
--- a/vector/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt
+++ b/vector-app/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt
@@ -23,7 +23,7 @@ import android.content.IntentFilter
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import im.vector.app.core.debug.DebugReceiver
-import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.di.DefaultPreferences
 import im.vector.app.core.utils.lsFiles
 import timber.log.Timber
 import javax.inject.Inject
@@ -31,7 +31,10 @@ import javax.inject.Inject
 /**
  * Receiver to handle some command from ADB
  */
-class VectorDebugReceiver @Inject constructor() : BroadcastReceiver(), DebugReceiver {
+class VectorDebugReceiver @Inject constructor(
+        @DefaultPreferences
+        private val sharedPreferences: SharedPreferences,
+) : BroadcastReceiver(), DebugReceiver {
 
     override fun register(context: Context) {
         context.registerReceiver(this, getIntentFilter(context))
@@ -47,14 +50,14 @@ class VectorDebugReceiver @Inject constructor() : BroadcastReceiver(), DebugRece
         intent.action?.let {
             when {
                 it.endsWith(DEBUG_ACTION_DUMP_FILESYSTEM) -> lsFiles(context)
-                it.endsWith(DEBUG_ACTION_DUMP_PREFERENCES) -> dumpPreferences(context)
-                it.endsWith(DEBUG_ACTION_ALTER_SCALAR_TOKEN) -> alterScalarToken(context)
+                it.endsWith(DEBUG_ACTION_DUMP_PREFERENCES) -> dumpPreferences()
+                it.endsWith(DEBUG_ACTION_ALTER_SCALAR_TOKEN) -> alterScalarToken()
             }
         }
     }
 
-    private fun dumpPreferences(context: Context) {
-        logPrefs("DefaultSharedPreferences", DefaultSharedPreferences.getInstance(context))
+    private fun dumpPreferences() {
+        logPrefs("DefaultSharedPreferences", sharedPreferences)
     }
 
     private fun logPrefs(name: String, sharedPreferences: SharedPreferences?) {
@@ -67,8 +70,8 @@ class VectorDebugReceiver @Inject constructor() : BroadcastReceiver(), DebugRece
         }
     }
 
-    private fun alterScalarToken(context: Context) {
-        DefaultSharedPreferences.getInstance(context).edit {
+    private fun alterScalarToken() {
+        sharedPreferences.edit {
             // putString("SCALAR_TOKEN_PREFERENCE_KEY" + Matrix.getInstance(context).defaultSession.myUserId, "bad_token")
         }
     }
diff --git a/vector-app/src/debug/res/layout/activity_debug_jitsi.xml b/vector-app/src/debug/res/layout/activity_debug_jitsi.xml
new file mode 100644
index 0000000000..0a13594854
--- /dev/null
+++ b/vector-app/src/debug/res/layout/activity_debug_jitsi.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="im.vector.app.features.debug.jitsi.DebugJitsiActivity"
+    tools:ignore="HardcodedText">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:divider="@drawable/linear_divider"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:padding="@dimen/layout_horizontal_margin"
+            android:showDividers="middle">
+
+            <TextView
+                android:id="@+id/status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="Status" />
+
+            <Button
+                android:id="@+id/splash"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Splash"
+                android:textAllCaps="false" />
+
+            <Button
+                android:id="@+id/dev"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Dev options"
+                android:textAllCaps="false" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector-app/src/debug/res/layout/activity_debug_menu.xml
similarity index 97%
rename from vector/src/debug/res/layout/activity_debug_menu.xml
rename to vector-app/src/debug/res/layout/activity_debug_menu.xml
index b5efe0302c..d8d1efb8d1 100644
--- a/vector/src/debug/res/layout/activity_debug_menu.xml
+++ b/vector-app/src/debug/res/layout/activity_debug_menu.xml
@@ -186,6 +186,12 @@
                 android:layout_height="wrap_content"
                 android:text="Permissions" />
 
+            <Button
+                android:id="@+id/debug_jitsi"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Jitsi" />
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/vector/src/debug/res/layout/activity_debug_permission.xml b/vector-app/src/debug/res/layout/activity_debug_permission.xml
similarity index 79%
rename from vector/src/debug/res/layout/activity_debug_permission.xml
rename to vector-app/src/debug/res/layout/activity_debug_permission.xml
index 6340d8faa7..0f1fef0b9b 100644
--- a/vector/src/debug/res/layout/activity_debug_permission.xml
+++ b/vector-app/src/debug/res/layout/activity_debug_permission.xml
@@ -30,43 +30,43 @@
                 android:id="@+id/camera"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="CAMERA"
-                android:textAllCaps="false" />
+                android:text="CAMERA" />
 
             <Button
                 android:id="@+id/audio"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="RECORD_AUDIO"
-                android:textAllCaps="false" />
+                android:text="RECORD_AUDIO" />
 
             <Button
                 android:id="@+id/camera_audio"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="CAMERA + RECORD_AUDIO"
-                android:textAllCaps="false" />
+                android:text="CAMERA + RECORD_AUDIO" />
 
             <Button
                 android:id="@+id/write"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="WRITE_EXTERNAL_STORAGE"
-                android:textAllCaps="false" />
+                android:text="WRITE_EXTERNAL_STORAGE" />
 
             <Button
                 android:id="@+id/read"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="READ_EXTERNAL_STORAGE"
-                android:textAllCaps="false" />
+                android:text="READ_EXTERNAL_STORAGE" />
 
             <Button
                 android:id="@+id/contact"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="READ_CONTACTS"
-                android:textAllCaps="false" />
+                android:text="READ_CONTACTS" />
+
+            <Button
+                android:id="@+id/notification"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="POST_NOTIFICATIONS" />
 
         </LinearLayout>
 
diff --git a/vector/src/debug/res/layout/activity_test_linkify.xml b/vector-app/src/debug/res/layout/activity_test_linkify.xml
similarity index 100%
rename from vector/src/debug/res/layout/activity_test_linkify.xml
rename to vector-app/src/debug/res/layout/activity_test_linkify.xml
diff --git a/vector/src/debug/res/layout/demo_theme_sample.xml b/vector-app/src/debug/res/layout/demo_theme_sample.xml
similarity index 100%
rename from vector/src/debug/res/layout/demo_theme_sample.xml
rename to vector-app/src/debug/res/layout/demo_theme_sample.xml
diff --git a/vector/src/debug/res/layout/demo_themes.xml b/vector-app/src/debug/res/layout/demo_themes.xml
similarity index 100%
rename from vector/src/debug/res/layout/demo_themes.xml
rename to vector-app/src/debug/res/layout/demo_themes.xml
diff --git a/vector/src/debug/res/layout/fragment_debug_analytics.xml b/vector-app/src/debug/res/layout/fragment_debug_analytics.xml
similarity index 100%
rename from vector/src/debug/res/layout/fragment_debug_analytics.xml
rename to vector-app/src/debug/res/layout/fragment_debug_analytics.xml
diff --git a/vector/src/debug/res/layout/fragment_debug_memory_leaks.xml b/vector-app/src/debug/res/layout/fragment_debug_memory_leaks.xml
similarity index 100%
rename from vector/src/debug/res/layout/fragment_debug_memory_leaks.xml
rename to vector-app/src/debug/res/layout/fragment_debug_memory_leaks.xml
diff --git a/vector/src/debug/res/layout/fragment_debug_private_settings.xml b/vector-app/src/debug/res/layout/fragment_debug_private_settings.xml
similarity index 72%
rename from vector/src/debug/res/layout/fragment_debug_private_settings.xml
rename to vector-app/src/debug/res/layout/fragment_debug_private_settings.xml
index c42ad68dce..55824930bc 100644
--- a/vector/src/debug/res/layout/fragment_debug_private_settings.xml
+++ b/vector-app/src/debug/res/layout/fragment_debug_private_settings.xml
@@ -49,6 +49,27 @@
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="4dp" />
 
+            <TextView
+                android:id="@+id/releaseNotesActivityHasBeenDisplayed"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                tools:text="ReleaseNotesActivity has been displayed: " />
+
+            <Button
+                android:id="@+id/releaseNotesActivityHasBeenDisplayedReset"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:text="Reset" />
+
+            <Button
+                android:id="@+id/showReleaseNotesActivity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="SHOW ReleaseNotesActivity"
+                android:textAllCaps="false" />
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/vector/src/debug/res/layout/item_feature.xml b/vector-app/src/debug/res/layout/item_feature.xml
similarity index 100%
rename from vector/src/debug/res/layout/item_feature.xml
rename to vector-app/src/debug/res/layout/item_feature.xml
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector-app/src/debug/res/layout/item_sas_emoji.xml
similarity index 100%
rename from vector/src/debug/res/layout/item_sas_emoji.xml
rename to vector-app/src/debug/res/layout/item_sas_emoji.xml
diff --git a/vector/src/debug/res/layout/item_test_linkify.xml b/vector-app/src/debug/res/layout/item_test_linkify.xml
similarity index 100%
rename from vector/src/debug/res/layout/item_test_linkify.xml
rename to vector-app/src/debug/res/layout/item_test_linkify.xml
diff --git a/vector/src/debug/res/layout/view_boolean_dropdown.xml b/vector-app/src/debug/res/layout/view_boolean_dropdown.xml
similarity index 100%
rename from vector/src/debug/res/layout/view_boolean_dropdown.xml
rename to vector-app/src/debug/res/layout/view_boolean_dropdown.xml
diff --git a/vector/src/debug/res/values/strings.xml b/vector-app/src/debug/res/values/strings.xml
similarity index 100%
rename from vector/src/debug/res/values/strings.xml
rename to vector-app/src/debug/res/values/strings.xml
diff --git a/vector/src/debug/res/xml/shortcuts.xml b/vector-app/src/debug/res/xml/shortcuts.xml
similarity index 100%
rename from vector/src/debug/res/xml/shortcuts.xml
rename to vector-app/src/debug/res/xml/shortcuts.xml
diff --git a/vector/src/fdroid/AndroidManifest.xml b/vector-app/src/fdroid/AndroidManifest.xml
similarity index 57%
rename from vector/src/fdroid/AndroidManifest.xml
rename to vector-app/src/fdroid/AndroidManifest.xml
index 29dac6533e..354d450958 100644
--- a/vector/src/fdroid/AndroidManifest.xml
+++ b/vector-app/src/fdroid/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="im.vector.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -15,7 +14,7 @@
     <application>
 
         <receiver
-            android:name=".fdroid.receiver.OnApplicationUpgradeOrRebootReceiver"
+            android:name="im.vector.app.fdroid.receiver.OnApplicationUpgradeOrRebootReceiver"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
@@ -24,26 +23,12 @@
         </receiver>
 
         <receiver
-            android:name=".fdroid.receiver.AlarmSyncBroadcastReceiver"
+            android:name="im.vector.app.fdroid.receiver.AlarmSyncBroadcastReceiver"
             android:enabled="true"
             android:exported="false" />
 
-        <receiver
-            android:name=".fdroid.receiver.KeepInternalDistributor"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter>
-                <!--
-                This action is checked to track installed and uninstalled distributors.
-                We declare it to keep the background sync as an internal
-                unifiedpush distributor.
-                -->
-                <action android:name="org.unifiedpush.android.distributor.REGISTER" />
-            </intent-filter>
-        </receiver>
-
         <service
-            android:name=".fdroid.service.GuardAndroidService"
+            android:name="im.vector.app.fdroid.service.GuardAndroidService"
             android:exported="false"
             tools:ignore="Instantiatable" />
 
diff --git a/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt b/vector-app/src/fdroid/java/im/vector/app/di/FlavorModule.kt
similarity index 76%
rename from vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
rename to vector-app/src/fdroid/java/im/vector/app/di/FlavorModule.kt
index 5355aa3cd9..e7d9598b65 100644
--- a/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
+++ b/vector-app/src/fdroid/java/im/vector/app/di/FlavorModule.kt
@@ -23,6 +23,10 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import im.vector.app.core.pushers.FcmHelper
+import im.vector.app.core.resources.AppNameProvider
+import im.vector.app.core.resources.DefaultAppNameProvider
+import im.vector.app.core.resources.DefaultLocaleProvider
+import im.vector.app.core.resources.LocaleProvider
 import im.vector.app.core.services.GuardServiceStarter
 import im.vector.app.fdroid.service.FDroidGuardServiceStarter
 import im.vector.app.features.home.NightlyProxy
@@ -42,9 +46,9 @@ abstract class FlavorModule {
 
         @Provides
         fun provideNightlyProxy() = object : NightlyProxy {
-            override fun onHomeResumed() {
-                // no op
-            }
+            override fun canDisplayPopup() = false
+            override fun isNightlyBuild() = false
+            override fun updateApplication() = Unit
         }
 
         @Provides
@@ -59,4 +63,10 @@ abstract class FlavorModule {
 
     @Binds
     abstract fun bindsFcmHelper(fcmHelper: FdroidFcmHelper): FcmHelper
+
+    @Binds
+    abstract fun bindsLocaleProvider(localeProvider: DefaultLocaleProvider): LocaleProvider
+
+    @Binds
+    abstract fun bindsAppNameProvider(appNameProvider: DefaultAppNameProvider): AppNameProvider
 }
diff --git a/vector/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt b/vector-app/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt
similarity index 100%
rename from vector/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt
rename to vector-app/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
similarity index 100%
rename from vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
rename to vector-app/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
similarity index 89%
rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
index e028ed0988..ce1263c67b 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
+++ b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
@@ -15,8 +15,6 @@
  */
 package im.vector.app.fdroid.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.VectorPreferences
@@ -32,7 +30,7 @@ class TestAutoStartBoot @Inject constructor(
 ) :
         TroubleshootTest(R.string.settings_troubleshoot_test_service_boot_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         if (vectorPreferences.autoStartOnBoot()) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_service_boot_success)
             status = TestStatus.SUCCESS
@@ -42,7 +40,7 @@ class TestAutoStartBoot @Inject constructor(
             quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_service_boot_quickfix) {
                 override fun doFix() {
                     vectorPreferences.setAutoStartOnBoot(true)
-                    manager?.retry(activityResultLauncher)
+                    manager?.retry(testParameters)
                 }
             }
             status = TestStatus.FAILED
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
similarity index 95%
rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
index ebd8d07540..a14d3b5c8a 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
+++ b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
@@ -15,9 +15,7 @@
  */
 package im.vector.app.fdroid.features.settings.troubleshoot
 
-import android.content.Intent
 import android.net.ConnectivityManager
-import androidx.activity.result.ActivityResultLauncher
 import androidx.core.content.getSystemService
 import androidx.core.net.ConnectivityManagerCompat
 import androidx.fragment.app.FragmentActivity
@@ -32,7 +30,7 @@ class TestBackgroundRestrictions @Inject constructor(
 ) :
         TroubleshootTest(R.string.settings_troubleshoot_test_bg_restricted_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         context.getSystemService<ConnectivityManager>()!!.apply {
             // Checks if the device is on a metered network
             if (isActiveNetworkMetered) {
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
similarity index 90%
rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
index 57bdf721a2..075432c9d2 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
+++ b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
@@ -15,8 +15,6 @@
  */
 package im.vector.app.fdroid.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.FragmentActivity
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
@@ -30,7 +28,7 @@ class TestBatteryOptimization @Inject constructor(
         private val stringProvider: StringProvider
 ) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         if (context.isIgnoringBatteryOptimizations()) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_battery_success)
             status = TestStatus.SUCCESS
@@ -39,7 +37,7 @@ class TestBatteryOptimization @Inject constructor(
             description = stringProvider.getString(R.string.settings_troubleshoot_test_battery_failed)
             quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_battery_quickfix) {
                 override fun doFix() {
-                    requestDisablingBatteryOptimization(context, activityResultLauncher)
+                    requestDisablingBatteryOptimization(context, testParameters.activityResultLauncher)
                 }
             }
             status = TestStatus.FAILED
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
similarity index 100%
rename from vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
rename to vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
similarity index 95%
rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
rename to vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
index bd1e0eb0ee..bccbf42e92 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
+++ b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.fdroid.receiver
 
+import android.annotation.SuppressLint
 import android.app.AlarmManager
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
@@ -65,6 +66,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
     companion object {
         private const val REQUEST_CODE = 0
 
+        @SuppressLint("WrongConstant") // PendingIntentCompat.FLAG_IMMUTABLE is a false positive
         fun scheduleAlarm(context: Context, sessionId: String, delayInSeconds: Int, clock: Clock) {
             // Reschedule
             Timber.v("## Sync: Scheduling alarm for background sync in $delayInSeconds seconds")
@@ -87,6 +89,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
             }
         }
 
+        @SuppressLint("WrongConstant") // PendingIntentCompat.FLAG_IMMUTABLE is a false positive
         fun cancelAlarm(context: Context) {
             Timber.v("## Sync: Cancel alarm for background sync")
             val intent = Intent(context, AlarmSyncBroadcastReceiver::class.java)
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
similarity index 100%
rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
rename to vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt
similarity index 100%
rename from vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt
rename to vector-app/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt
similarity index 100%
rename from vector/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt
rename to vector-app/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt
diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt
similarity index 92%
rename from vector/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt
rename to vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt
index 5b83769116..44fd92953e 100755
--- a/vector/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt
+++ b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt
@@ -17,7 +17,6 @@
 
 package im.vector.app.push.fcm
 
-import android.app.Activity
 import android.content.Context
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.pushers.FcmHelper
@@ -44,7 +43,7 @@ class FdroidFcmHelper @Inject constructor(
         // No op
     }
 
-    override fun ensureFcmTokenIsRetrieved(activity: Activity, pushersManager: PushersManager, registerPusher: Boolean) {
+    override fun ensureFcmTokenIsRetrieved(pushersManager: PushersManager, registerPusher: Boolean) {
         // No op
     }
 
diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt
similarity index 100%
rename from vector/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt
rename to vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt
diff --git a/vector-app/src/gplay/AndroidManifest.xml b/vector-app/src/gplay/AndroidManifest.xml
new file mode 100755
index 0000000000..0ac14f9cd3
--- /dev/null
+++ b/vector-app/src/gplay/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application>
+
+        <!-- Firebase components -->
+        <meta-data
+            android:name="firebase_analytics_collection_deactivated"
+            android:value="true" />
+
+        <!-- Add tools:ignore="Instantiatable" for the error reported only by the CI :/ -->
+        <service android:name="im.vector.app.push.fcm.VectorFirebaseMessagingService"
+            android:exported="false"
+            tools:ignore="Instantiatable">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+    </application>
+
+</manifest>
diff --git a/vector/src/gplay/debug/google-services.json b/vector-app/src/gplay/debug/google-services.json
similarity index 100%
rename from vector/src/gplay/debug/google-services.json
rename to vector-app/src/gplay/debug/google-services.json
diff --git a/vector/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt b/vector-app/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt
similarity index 100%
rename from vector/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt
rename to vector-app/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt
diff --git a/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt b/vector-app/src/gplay/java/im/vector/app/di/FlavorModule.kt
similarity index 79%
rename from vector/src/gplay/java/im/vector/app/di/FlavorModule.kt
rename to vector-app/src/gplay/java/im/vector/app/di/FlavorModule.kt
index 2fe72313ea..d70a55afb8 100644
--- a/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt
+++ b/vector-app/src/gplay/java/im/vector/app/di/FlavorModule.kt
@@ -23,6 +23,10 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import im.vector.app.GoogleFlavorLegals
 import im.vector.app.core.pushers.FcmHelper
+import im.vector.app.core.resources.AppNameProvider
+import im.vector.app.core.resources.DefaultAppNameProvider
+import im.vector.app.core.resources.DefaultLocaleProvider
+import im.vector.app.core.resources.LocaleProvider
 import im.vector.app.core.services.GuardServiceStarter
 import im.vector.app.features.home.NightlyProxy
 import im.vector.app.features.settings.legals.FlavorLegals
@@ -46,6 +50,12 @@ abstract class FlavorModule {
     @Binds
     abstract fun bindsFcmHelper(fcmHelper: GoogleFcmHelper): FcmHelper
 
+    @Binds
+    abstract fun bindsLocaleProvider(localeProvider: DefaultLocaleProvider): LocaleProvider
+
+    @Binds
+    abstract fun bindsAppNameProvider(appNameProvider: DefaultAppNameProvider): AppNameProvider
+
     @Binds
     abstract fun bindsFlavorLegals(legals: GoogleFlavorLegals): FlavorLegals
 }
diff --git a/vector/src/gplay/java/im/vector/app/di/NotificationTestModule.kt b/vector-app/src/gplay/java/im/vector/app/di/NotificationTestModule.kt
similarity index 100%
rename from vector/src/gplay/java/im/vector/app/di/NotificationTestModule.kt
rename to vector-app/src/gplay/java/im/vector/app/di/NotificationTestModule.kt
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
similarity index 95%
rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
index d6180a9fe8..8e7e4f43cc 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
+++ b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
@@ -15,8 +15,6 @@
  */
 package im.vector.app.gplay.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.FragmentActivity
 import com.google.firebase.messaging.FirebaseMessaging
 import im.vector.app.R
@@ -36,7 +34,7 @@ class TestFirebaseToken @Inject constructor(
         private val fcmHelper: FcmHelper,
 ) : TroubleshootTest(R.string.settings_troubleshoot_test_fcm_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         status = TestStatus.RUNNING
         try {
             FirebaseMessaging.getInstance().token
@@ -53,7 +51,7 @@ class TestFirebaseToken @Inject constructor(
                                 "ACCOUNT_MISSING" -> {
                                     quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_fcm_failed_account_missing_quick_fix) {
                                         override fun doFix() {
-                                            startAddGoogleAccountIntent(context, activityResultLauncher)
+                                            startAddGoogleAccountIntent(context, testParameters.activityResultLauncher)
                                         }
                                     }
                                     stringProvider.getString(R.string.settings_troubleshoot_test_fcm_failed_account_missing, errorMsg)
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
similarity index 93%
rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
index e78132908d..3ebcceb3fb 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
+++ b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
@@ -15,8 +15,6 @@
  */
 package im.vector.app.gplay.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.FragmentActivity
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
@@ -35,7 +33,7 @@ class TestPlayServices @Inject constructor(
 ) :
         TroubleshootTest(R.string.settings_troubleshoot_test_play_services_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         val apiAvailability = GoogleApiAvailability.getInstance()
         val resultCode = apiAvailability.isGooglePlayServicesAvailable(context)
         if (resultCode == ConnectionResult.SUCCESS) {
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
similarity index 91%
rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
index 840bde77b1..cafc2d65e6 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
+++ b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
@@ -15,8 +15,6 @@
  */
 package im.vector.app.gplay.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.work.WorkInfo
@@ -42,7 +40,7 @@ class TestTokenRegistration @Inject constructor(
 ) :
         TroubleshootTest(R.string.settings_troubleshoot_test_token_registration_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         // Check if we have a registered pusher for this token
         val fcmToken = fcmHelper.getFcmToken() ?: run {
             status = TestStatus.FAILED
@@ -66,9 +64,9 @@ class TestTokenRegistration @Inject constructor(
                     WorkManager.getInstance(context).getWorkInfoByIdLiveData(workId).observe(context, Observer { workInfo ->
                         if (workInfo != null) {
                             if (workInfo.state == WorkInfo.State.SUCCEEDED) {
-                                manager?.retry(activityResultLauncher)
+                                manager?.retry(testParameters)
                             } else if (workInfo.state == WorkInfo.State.FAILED) {
-                                manager?.retry(activityResultLauncher)
+                                manager?.retry(testParameters)
                             }
                         }
                     })
diff --git a/vector/src/gplay/java/im/vector/app/gplay/package-info.kt b/vector-app/src/gplay/java/im/vector/app/gplay/package-info.kt
similarity index 100%
rename from vector/src/gplay/java/im/vector/app/gplay/package-info.kt
rename to vector-app/src/gplay/java/im/vector/app/gplay/package-info.kt
diff --git a/vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt b/vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
similarity index 80%
rename from vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
rename to vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
index 59a1e3eb17..71ffda7c36 100644
--- a/vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
+++ b/vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
@@ -20,8 +20,8 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.google.firebase.appdistribution.FirebaseAppDistribution
 import com.google.firebase.appdistribution.FirebaseAppDistributionException
-import im.vector.app.BuildConfig
 import im.vector.app.core.di.DefaultPreferences
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.time.Clock
 import im.vector.app.features.home.NightlyProxy
 import timber.log.Timber
@@ -31,10 +31,14 @@ class FirebaseNightlyProxy @Inject constructor(
         private val clock: Clock,
         @DefaultPreferences
         private val sharedPreferences: SharedPreferences,
+        private val buildMeta: BuildMeta,
 ) : NightlyProxy {
 
-    override fun onHomeResumed() {
-        if (!canDisplayPopup()) return
+    override fun isNightlyBuild(): Boolean {
+        return buildMeta.applicationId in nightlyPackages
+    }
+
+    override fun updateApplication() {
         val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
         firebaseAppDistribution.updateIfNewReleaseAvailable()
                 .addOnProgressListener { up ->
@@ -45,6 +49,7 @@ class FirebaseNightlyProxy @Inject constructor(
                         when (e.errorCode) {
                             FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
                                 // SDK did nothing. This is expected when building for Play.
+                                Timber.d("FirebaseAppDistribution NOT_IMPLEMENTED error")
                             }
                             else -> {
                                 // Handle other errors.
@@ -55,10 +60,14 @@ class FirebaseNightlyProxy @Inject constructor(
                         Timber.e(e, "FirebaseAppDistribution - other error")
                     }
                 }
+                .addOnSuccessListener {
+                    Timber.d("FirebaseAppDistribution Success!")
+                }
     }
 
-    private fun canDisplayPopup(): Boolean {
-        if (BuildConfig.APPLICATION_ID != "im.vector.app.nightly") return false
+    override fun canDisplayPopup(): Boolean {
+        if (!POPUP_IS_ENABLED) return false
+        if (!isNightlyBuild()) return false
         val today = clock.epochMillis() / A_DAY_IN_MILLIS
         val lastDisplayPopupDay = sharedPreferences.getLong(SHARED_PREF_KEY, 0)
         return (today > lastDisplayPopupDay)
@@ -72,7 +81,12 @@ class FirebaseNightlyProxy @Inject constructor(
     }
 
     companion object {
+        private const val POPUP_IS_ENABLED = false
         private const val A_DAY_IN_MILLIS = 8_600_000L
         private const val SHARED_PREF_KEY = "LAST_NIGHTLY_POPUP_DAY"
+
+        private val nightlyPackages = listOf(
+                "im.vector.app.nightly"
+        )
     }
 }
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt
similarity index 86%
rename from vector/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt
rename to vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt
index d64847c124..53e65f88b4 100755
--- a/vector/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt
+++ b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt
@@ -15,16 +15,17 @@
  */
 package im.vector.app.push.fcm
 
-import android.app.Activity
 import android.content.Context
+import android.content.SharedPreferences
 import android.widget.Toast
 import androidx.core.content.edit
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.firebase.messaging.FirebaseMessaging
+import dagger.hilt.android.qualifiers.ApplicationContext
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.di.DefaultPreferences
 import im.vector.app.core.pushers.FcmHelper
 import im.vector.app.core.pushers.PushersManager
 import timber.log.Timber
@@ -35,14 +36,13 @@ import javax.inject.Inject
  * It has an alter ego in the fdroid variant.
  */
 class GoogleFcmHelper @Inject constructor(
-        context: Context,
+        @ApplicationContext private val context: Context,
+        @DefaultPreferences private val sharedPrefs: SharedPreferences,
 ) : FcmHelper {
     companion object {
         private const val PREFS_KEY_FCM_TOKEN = "FCM_TOKEN"
     }
 
-    private val sharedPrefs = DefaultSharedPreferences.getInstance(context)
-
     override fun isFirebaseAvailable(): Boolean = true
 
     override fun getFcmToken(): String? {
@@ -56,10 +56,9 @@ class GoogleFcmHelper @Inject constructor(
         }
     }
 
-    override fun ensureFcmTokenIsRetrieved(activity: Activity, pushersManager: PushersManager, registerPusher: Boolean) {
-        //        if (TextUtils.isEmpty(getFcmToken(activity))) {
+    override fun ensureFcmTokenIsRetrieved(pushersManager: PushersManager, registerPusher: Boolean) {
         // 'app should always check the device for a compatible Google Play services APK before accessing Google Play services features'
-        if (checkPlayServices(activity)) {
+        if (checkPlayServices(context)) {
             try {
                 FirebaseMessaging.getInstance().token
                         .addOnSuccessListener { token ->
@@ -75,7 +74,7 @@ class GoogleFcmHelper @Inject constructor(
                 Timber.e(e, "## ensureFcmTokenIsRetrieved() : failed")
             }
         } else {
-            Toast.makeText(activity, R.string.no_valid_google_play_services_apk, Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, R.string.no_valid_google_play_services_apk, Toast.LENGTH_SHORT).show()
             Timber.e("No valid Google Play Services found. Cannot use FCM.")
         }
     }
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt
similarity index 100%
rename from vector/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt
rename to vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt
diff --git a/vector-app/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt
new file mode 100644
index 0000000000..7fd55bd165
--- /dev/null
+++ b/vector-app/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.push.fcm
+
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.pushers.FcmHelper
+import im.vector.app.core.pushers.PushParser
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.pushers.UnifiedPushHelper
+import im.vector.app.core.pushers.VectorPushHandler
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.logger.LoggerTag
+import timber.log.Timber
+import javax.inject.Inject
+
+private val loggerTag = LoggerTag("Push", LoggerTag.SYNC)
+
+@AndroidEntryPoint
+class VectorFirebaseMessagingService : FirebaseMessagingService() {
+    @Inject lateinit var fcmHelper: FcmHelper
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
+    @Inject lateinit var pushersManager: PushersManager
+    @Inject lateinit var pushParser: PushParser
+    @Inject lateinit var vectorPushHandler: VectorPushHandler
+    @Inject lateinit var unifiedPushHelper: UnifiedPushHelper
+
+    override fun onNewToken(token: String) {
+        Timber.tag(loggerTag.value).d("New Firebase token")
+        fcmHelper.storeFcmToken(token)
+        if (
+                vectorPreferences.areNotificationEnabledForDevice() &&
+                activeSessionHolder.hasActiveSession() &&
+                unifiedPushHelper.isEmbeddedDistributor()
+        ) {
+            pushersManager.enqueueRegisterPusher(token, getString(R.string.pusher_http_url))
+        }
+    }
+
+    override fun onMessageReceived(message: RemoteMessage) {
+        Timber.tag(loggerTag.value).d("New Firebase message")
+        pushParser.parsePushDataFcm(message.data).let {
+            vectorPushHandler.handle(it)
+        }
+    }
+}
diff --git a/vector/src/gplay/nightly/google-services.json b/vector-app/src/gplay/nightly/google-services.json
similarity index 100%
rename from vector/src/gplay/nightly/google-services.json
rename to vector-app/src/gplay/nightly/google-services.json
diff --git a/vector/src/gplay/release/google-services.json b/vector-app/src/gplay/release/google-services.json
similarity index 100%
rename from vector/src/gplay/release/google-services.json
rename to vector-app/src/gplay/release/google-services.json
diff --git a/vector-app/src/main/AndroidManifest.xml b/vector-app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..68325ab512
--- /dev/null
+++ b/vector-app/src/main/AndroidManifest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:name="im.vector.app.VectorApplication"
+        android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:hasFragileUserData="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:resizeableActivity="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:taskAffinity="${applicationId}.${appTaskAffinitySuffix}"
+        android:theme="@style/Theme.Vector.Light"
+        tools:ignore="UnusedAttribute"
+        tools:replace="android:allowBackup">
+
+        <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
+        <!-- exported="true" is required to launch application -->
+        <activity-alias
+            android:name=".features.Alias"
+            android:exported="true"
+            android:targetActivity="im.vector.app.features.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity-alias>
+
+
+        <!-- Providers -->
+
+        <!-- Remove WorkManagerInitializer Provider because we are using on-demand initialization of WorkManager-->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+            <!-- We init the lib ourself in EmojiCompatWrapper -->
+            <meta-data
+                android:name="androidx.emoji2.text.EmojiCompatInitializer"
+                tools:node="remove" />
+        </provider>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/sdk_provider_paths" />
+        </provider>
+
+    </application>
+
+</manifest>
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector-app/src/main/java/im/vector/app/VectorApplication.kt
similarity index 96%
rename from vector/src/main/java/im/vector/app/VectorApplication.kt
rename to vector-app/src/main/java/im/vector/app/VectorApplication.kt
index 4655de7377..b89529715c 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector-app/src/main/java/im/vector/app/VectorApplication.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2022 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -53,7 +53,7 @@ import im.vector.app.core.resources.BuildMeta
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.configuration.VectorConfiguration
-import im.vector.app.features.disclaimer.doNotShowDisclaimerDialog
+import im.vector.app.features.disclaimer.DisclaimerDialog
 import im.vector.app.features.invite.InvitesAcceptor
 import im.vector.app.features.lifecycle.VectorActivityLifecycleCallbacks
 import im.vector.app.features.notifications.NotificationDrawerManager
@@ -66,6 +66,7 @@ import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.version.VersionProvider
+import im.vector.application.R
 import org.jitsi.meet.sdk.log.JitsiMeetDefaultLogHandler
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.auth.AuthenticationService
@@ -108,6 +109,8 @@ class VectorApplication :
     @Inject lateinit var fcmHelper: FcmHelper
     @Inject lateinit var buildMeta: BuildMeta
     @Inject lateinit var leakDetector: LeakDetector
+    @Inject lateinit var vectorLocale: VectorLocale
+    @Inject lateinit var disclaimerDialog: DisclaimerDialog
 
     // font thread handler
     private var fontThreadHandler: Handler? = null
@@ -158,7 +161,7 @@ class VectorApplication :
                 R.array.com_google_android_gms_fonts_certs
         )
         FontsContractCompat.requestFont(this, fontRequest, emojiCompatFontProvider, getFontThreadHandler())
-        VectorLocale.init(this, buildMeta)
+        vectorLocale.init()
         ThemeUtils.init(this)
         vectorConfiguration.applyToApplicationContext()
 
@@ -170,7 +173,7 @@ class VectorApplication :
         val sessionImported = legacySessionImporter.process()
         if (!sessionImported) {
             // Do not display the name change popup
-            doNotShowDisclaimerDialog(this)
+            disclaimerDialog.doNotShowDisclaimerDialog()
         }
 
         ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
@@ -236,7 +239,7 @@ class VectorApplication :
     }
 
     private fun logInfo() {
-        val appVersion = versionProvider.getVersion(longFormat = true, useBuildNumber = true)
+        val appVersion = versionProvider.getVersion(longFormat = true)
         val sdkVersion = Matrix.getSdkVersion()
         val date = SimpleDateFormat("MM-dd HH:mm:ss.SSSZ", Locale.US).format(Date())
 
@@ -266,7 +269,7 @@ class VectorApplication :
     }
 
     private fun createFontThreadHandler(): Handler {
-        val handlerThread = HandlerThread("fonts")
+        val handlerThread = HandlerThread("Vector-fonts")
         handlerThread.start()
         return Handler(handlerThread.looper)
     }
diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt b/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt
similarity index 85%
rename from vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
rename to vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt
index a060ebe731..a6d6fcd14b 100644
--- a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
+++ b/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2022 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -28,13 +28,14 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import im.vector.app.BuildConfig
 import im.vector.app.EmojiCompatWrapper
 import im.vector.app.EmojiSpanify
 import im.vector.app.SpaceStateHandler
 import im.vector.app.SpaceStateHandlerImpl
 import im.vector.app.config.Config
 import im.vector.app.core.debug.FlipperProxy
+import im.vector.app.core.device.DefaultGetDeviceInfoUseCase
+import im.vector.app.core.device.GetDeviceInfoUseCase
 import im.vector.app.core.dispatchers.CoroutineDispatchers
 import im.vector.app.core.error.DefaultErrorFormatter
 import im.vector.app.core.error.ErrorFormatter
@@ -45,7 +46,10 @@ import im.vector.app.core.utils.AndroidSystemSettingsProvider
 import im.vector.app.core.utils.SystemSettingsProvider
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.VectorAnalytics
+import im.vector.app.features.analytics.errors.ErrorTracker
 import im.vector.app.features.analytics.impl.DefaultVectorAnalytics
+import im.vector.app.features.analytics.metrics.VectorPlugins
+import im.vector.app.features.configuration.VectorCustomEventTypesProvider
 import im.vector.app.features.invite.AutoAcceptInvites
 import im.vector.app.features.invite.CompileTimeAutoAcceptInvites
 import im.vector.app.features.navigation.DefaultNavigator
@@ -58,6 +62,7 @@ import im.vector.app.features.settings.FontScalePreferencesImpl
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.ui.SharedPreferencesUiStateRepository
 import im.vector.app.features.ui.UiStateRepository
+import im.vector.application.BuildConfig
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
@@ -65,17 +70,17 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.SupervisorJob
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.SyncConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.sync.filter.SyncFilterParams
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import javax.inject.Singleton
 
-@InstallIn(SingletonComponent::class)
-@Module
-abstract class VectorBindModule {
+@InstallIn(SingletonComponent::class) @Module abstract class VectorBindModule {
 
     @Binds
     abstract fun bindNavigator(navigator: DefaultNavigator): Navigator
@@ -83,6 +88,9 @@ abstract class VectorBindModule {
     @Binds
     abstract fun bindVectorAnalytics(analytics: DefaultVectorAnalytics): VectorAnalytics
 
+    @Binds
+    abstract fun bindErrorTracker(analytics: DefaultVectorAnalytics): ErrorTracker
+
     @Binds
     abstract fun bindAnalyticsTracker(analytics: DefaultVectorAnalytics): AnalyticsTracker
 
@@ -112,11 +120,12 @@ abstract class VectorBindModule {
 
     @Binds
     abstract fun bindSpaceStateHandler(spaceStateHandlerImpl: SpaceStateHandlerImpl): SpaceStateHandler
+
+    @Binds
+    abstract fun bindGetDeviceInfoUseCase(getDeviceInfoUseCase: DefaultGetDeviceInfoUseCase): GetDeviceInfoUseCase
 }
 
-@InstallIn(SingletonComponent::class)
-@Module
-object VectorStaticModule {
+@InstallIn(SingletonComponent::class) @Module object VectorStaticModule {
 
     @Provides
     fun providesContext(application: Application): Context {
@@ -138,6 +147,8 @@ object VectorStaticModule {
             vectorPreferences: VectorPreferences,
             vectorRoomDisplayNameFallbackProvider: VectorRoomDisplayNameFallbackProvider,
             flipperProxy: FlipperProxy,
+            vectorPlugins: VectorPlugins,
+            vectorCustomEventTypesProvider: VectorCustomEventTypesProvider,
     ): MatrixConfiguration {
         return MatrixConfiguration(
                 applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION,
@@ -145,6 +156,11 @@ object VectorStaticModule {
                 threadMessagesEnabledDefault = vectorPreferences.areThreadMessagesEnabled(),
                 networkInterceptors = listOfNotNull(
                         flipperProxy.networkInterceptor(),
+                ),
+                metricPlugins = vectorPlugins.plugins(),
+                customEventTypesProvider = vectorCustomEventTypesProvider,
+                syncConfig = SyncConfig(
+                        syncFilterParams = SyncFilterParams(lazyLoadMembersForStateEvents = true, useThreadNotifications = true)
                 )
         )
     }
@@ -217,7 +233,6 @@ object VectorStaticModule {
             gitRevision = BuildConfig.GIT_REVISION,
             gitRevisionDate = BuildConfig.GIT_REVISION_DATE,
             gitBranchName = BuildConfig.GIT_BRANCH_NAME,
-            buildNumber = BuildConfig.BUILD_NUMBER,
             flavorDescription = BuildConfig.FLAVOR_DESCRIPTION,
             flavorShortDescription = BuildConfig.SHORT_FLAVOR_DESCRIPTION,
     )
diff --git a/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
similarity index 100%
rename from vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
rename to vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
diff --git a/vector/src/main/res/drawable/ic_launcher_background.xml b/vector-app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_launcher_background.xml
rename to vector-app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from vector/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-hdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-mdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/vector/src/main/res/values/font_certs.xml b/vector-app/src/main/res/values/font_certs.xml
similarity index 100%
rename from vector/src/main/res/values/font_certs.xml
rename to vector-app/src/main/res/values/font_certs.xml
diff --git a/vector-app/src/main/res/values/strings.xml b/vector-app/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..84dde58d40
--- /dev/null
+++ b/vector-app/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- The https://github.com/LikeTheSalad/android-stem requires a non empty strings.xml -->
+    <string name="ignored_placeholder" tools:ignore="UnusedResources">ignored</string>
+</resources>
diff --git a/vector-app/src/main/res/xml/backup_rules.xml b/vector-app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 0000000000..fe10b316ed
--- /dev/null
+++ b/vector-app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <exclude
+        domain="file"
+        path="." />
+    <exclude
+        domain="database"
+        path="." />
+    <exclude
+        domain="sharedpref"
+        path="." />
+    <exclude
+        domain="external"
+        path="." />
+    <exclude
+        domain="root"
+        path="." />
+</full-backup-content>
diff --git a/vector-app/src/main/res/xml/data_extraction_rules.xml b/vector-app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 0000000000..fe61eb717c
--- /dev/null
+++ b/vector-app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </device-transfer>
+</data-extraction-rules>
diff --git a/vector/src/nightly/res/xml/shortcuts.xml b/vector-app/src/nightly/res/xml/shortcuts.xml
similarity index 100%
rename from vector/src/nightly/res/xml/shortcuts.xml
rename to vector-app/src/nightly/res/xml/shortcuts.xml
diff --git a/vector/src/release/java/im/vector/app/core/di/DebugModule.kt b/vector-app/src/release/java/im/vector/app/core/di/DebugModule.kt
similarity index 100%
rename from vector/src/release/java/im/vector/app/core/di/DebugModule.kt
rename to vector-app/src/release/java/im/vector/app/core/di/DebugModule.kt
diff --git a/vector/src/release/java/im/vector/app/core/di/FeaturesModule.kt b/vector-app/src/release/java/im/vector/app/core/di/FeaturesModule.kt
similarity index 100%
rename from vector/src/release/java/im/vector/app/core/di/FeaturesModule.kt
rename to vector-app/src/release/java/im/vector/app/core/di/FeaturesModule.kt
diff --git a/vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt b/vector-app/src/release/java/im/vector/app/receivers/DebugReceiver.kt
similarity index 100%
rename from vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt
rename to vector-app/src/release/java/im/vector/app/receivers/DebugReceiver.kt
diff --git a/vector/src/release/res/xml/shortcuts.xml b/vector-app/src/release/res/xml/shortcuts.xml
similarity index 100%
rename from vector/src/release/res/xml/shortcuts.xml
rename to vector-app/src/release/res/xml/shortcuts.xml
diff --git a/vector-config/build.gradle b/vector-config/build.gradle
index 658452bbdd..771e51f357 100644
--- a/vector-config/build.gradle
+++ b/vector-config/build.gradle
@@ -4,6 +4,8 @@ plugins {
 }
 
 android {
+    namespace "im.vector.app.config"
+
     compileSdk versions.compileSdk
 
     defaultConfig {
diff --git a/vector-config/src/main/AndroidManifest.xml b/vector-config/src/main/AndroidManifest.xml
index 4d6cf1535f..8072ee00db 100644
--- a/vector-config/src/main/AndroidManifest.xml
+++ b/vector-config/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.app.config" />
+<manifest />
diff --git a/vector-config/src/main/java/im/vector/app/config/Analytics.kt b/vector-config/src/main/java/im/vector/app/config/Analytics.kt
index 7fdc78dc8a..d944a84f94 100644
--- a/vector-config/src/main/java/im/vector/app/config/Analytics.kt
+++ b/vector-config/src/main/java/im/vector/app/config/Analytics.kt
@@ -27,9 +27,9 @@ sealed interface Analytics {
     object Disabled : Analytics
 
     /**
-     * Analytics integration via PostHog.
+     * Analytics integration via PostHog and Sentry.
      */
-    data class PostHog(
+    data class Enabled(
             /**
              * The PostHog instance url.
              */
@@ -44,5 +44,15 @@ sealed interface Analytics {
              * A URL to more information about the analytics collection.
              */
             val policyLink: String,
+
+            /**
+             * The Sentry DSN url.
+             */
+            val sentryDSN: String,
+
+            /**
+             * Environment for Sentry.
+             */
+            val sentryEnvironment: String
     ) : Analytics
 }
diff --git a/vector-config/src/main/java/im/vector/app/config/Config.kt b/vector-config/src/main/java/im/vector/app/config/Config.kt
index f660799d06..fdc8e9f73b 100644
--- a/vector-config/src/main/java/im/vector/app/config/Config.kt
+++ b/vector-config/src/main/java/im/vector/app/config/Config.kt
@@ -16,6 +16,8 @@
 
 package im.vector.app.config
 
+import kotlin.time.Duration.Companion.days
+
 /**
  * Set of flags to configure the application.
  */
@@ -68,25 +70,31 @@ object Config {
      * The analytics configuration to use for the Debug build type.
      * Can be disabled by providing Analytics.Disabled
      */
-    val DEBUG_ANALYTICS_CONFIG = Analytics.PostHog(
+    val DEBUG_ANALYTICS_CONFIG = Analytics.Enabled(
             postHogHost = "https://posthog.element.dev",
             postHogApiKey = "phc_VtA1L35nw3aeAtHIx1ayrGdzGkss7k1xINeXcoIQzXN",
             policyLink = "https://element.io/cookie-policy",
+            sentryDSN = "https://f6acc9cfc2024641b28c87ad95e73e66@sentry.tools.element.io/49",
+            sentryEnvironment = "DEBUG"
     )
 
     /**
      * The analytics configuration to use for the Release build type.
      * Can be disabled by providing Analytics.Disabled
      */
-    val RELEASE_ANALYTICS_CONFIG = Analytics.PostHog(
+    val RELEASE_ANALYTICS_CONFIG = Analytics.Enabled(
             postHogHost = "https://posthog.hss.element.io",
             postHogApiKey = "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
             policyLink = "https://element.io/cookie-policy",
+            sentryDSN = "https://f6acc9cfc2024641b28c87ad95e73e66@sentry.tools.element.io/49",
+            sentryEnvironment = "RELEASE"
     )
 
     /**
      * The analytics configuration to use for the Nightly build type.
      * Can be disabled by providing Analytics.Disabled
      */
-    val NIGHTLY_ANALYTICS_CONFIG = RELEASE_ANALYTICS_CONFIG
+    val NIGHTLY_ANALYTICS_CONFIG = RELEASE_ANALYTICS_CONFIG.copy(sentryEnvironment = "NIGHTLY")
+
+    val SHOW_UNVERIFIED_SESSIONS_ALERT_AFTER_MILLIS = 7.days.inWholeMilliseconds // 1 Week
 }
diff --git a/vector-config/src/main/java/im/vector/app/config/OnboardingVariant.kt b/vector-config/src/main/java/im/vector/app/config/OnboardingVariant.kt
index ae8cfd1172..8821c8187e 100644
--- a/vector-config/src/main/java/im/vector/app/config/OnboardingVariant.kt
+++ b/vector-config/src/main/java/im/vector/app/config/OnboardingVariant.kt
@@ -18,6 +18,5 @@ package im.vector.app.config
 
 enum class OnboardingVariant {
     LEGACY,
-    LOGIN_2,
     FTUE_AUTH
 }
diff --git a/vector-config/src/main/res/values/config-settings.xml b/vector-config/src/main/res/values/config-settings.xml
index b2cd21c3de..a8695eed44 100755
--- a/vector-config/src/main/res/values/config-settings.xml
+++ b/vector-config/src/main/res/values/config-settings.xml
@@ -37,14 +37,27 @@
     <bool name="settings_ignored_users_visible">true</bool>
 
     <!-- Level 1: Labs -->
-    <bool name="settings_labs_thread_messages_default">false</bool>
+    <bool name="settings_labs_deferred_dm_visible">true</bool>
+    <bool name="settings_labs_deferred_dm_default">true</bool>
+    <bool name="settings_labs_thread_messages_default">true</bool>
+    <bool name="settings_labs_new_app_layout_default">true</bool>
+    <bool name="settings_labs_new_session_manager_default">false</bool>
+    <bool name="settings_labs_new_session_manager_visible">true</bool>
+    <bool name="settings_labs_client_info_recording_default">false</bool>
+    <bool name="settings_labs_client_info_recording_visible">true</bool>
     <bool name="settings_timeline_show_live_sender_info_visible">true</bool>
     <bool name="settings_timeline_show_live_sender_info_default">false</bool>
+    <bool name="settings_labs_rich_text_editor_visible">true</bool>
+    <bool name="settings_labs_rich_text_editor_default">false</bool>
+    <bool name="settings_labs_enable_voice_broadcast_visible">true</bool>
+    <bool name="settings_labs_enable_voice_broadcast_default">false</bool>
     <!-- Level 1: Advanced settings -->
 
     <!-- Level 1: Help and about -->
 
     <!-- Level 1: Legals -->
 
+    <!-- Level 3: Security & Privacy, Sessions -->
+    <bool name="settings_session_manager_show_ip_address">false</bool>
 
 </resources>
diff --git a/vector/build.gradle b/vector/build.gradle
index 629b7c4135..83af7ecc04 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -1,14 +1,9 @@
-import com.android.build.OutputFile
-
-apply plugin: 'com.android.application'
-apply plugin: 'com.google.firebase.appdistribution'
-apply plugin: 'com.google.android.gms.oss-licenses-plugin'
+apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.likethesalad.stem'
+apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'dagger.hilt.android.plugin'
-apply plugin: 'kotlinx-knit'
 
 if (project.hasProperty("coverage")) {
     apply plugin: 'jacoco'
@@ -18,98 +13,11 @@ kapt {
     correctErrorTypes = true
 }
 
-knit {
-    files = fileTree(project.rootDir) {
-        include '**/*.md'
-        include '**/*.kt'
-        include '**/*.kts'
-        exclude '**/build/**'
-        exclude '**/.gradle/**'
-        exclude '**/towncrier/template.md'
-        exclude '**/CHANGES.md'
-        exclude '/node_modules'
-    }
-}
-
-// Note: 2 digits max for each value
-ext.versionMajor = 1
-ext.versionMinor = 4
-// Note: even values are reserved for regular release, odd values for hotfix release.
-// When creating a hotfix, you should decrease the value, since the current value
-// is the value for the next regular release.
-ext.versionPatch = 34
-
-static def getGitTimestamp() {
-    def cmd = 'git show -s --format=%ct'
-    return cmd.execute().text.trim() as Long
-}
-
-static def generateVersionCodeFromTimestamp() {
-    // It's unix timestamp, minus timestamp of October 3rd 2018 (first commit date) divided by 100: It's incremented by one every 100 seconds.
-    // plus 20_000_000 for compatibility reason with the previous way the Version Code was computed
-    // Note that the result will be multiplied by 10 when adding the digit for the arch
-    return ((getGitTimestamp() - 1_538_524_800) / 100).toInteger() + 20_000_000
-}
-
-def generateVersionCodeFromVersionName() {
-    // plus 4_000_000 for compatibility reason with the previous way the Version Code was computed
-    // Note that the result will be multiplied by 10 when adding the digit for the arch
-    return (versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch) + 4_000_000
-}
-
-def getVersionCode() {
-    if (gitBranchName() == "develop") {
-        return generateVersionCodeFromTimestamp()
-    } else {
-        return generateVersionCodeFromVersionName()
-    }
-}
-
 static def gitRevision() {
     def cmd = "git rev-parse --short=8 HEAD"
     return cmd.execute().text.trim()
 }
 
-static def gitRevisionDate() {
-    def cmd = "git show -s --format=%ci HEAD^{commit}"
-    return cmd.execute().text.trim()
-}
-
-static def gitBranchName() {
-    def fromEnv = System.env.BUILDKITE_BRANCH as String ?: ""
-
-    if (!fromEnv.isEmpty()) {
-        return fromEnv
-    } else {
-        // Note: this command return "HEAD" on Buildkite, so use the system env 'BUILDKITE_BRANCH' content first
-        def cmd = "git rev-parse --abbrev-ref HEAD"
-        return cmd.execute().text.trim()
-    }
-}
-
-// For Google Play build, build on any other branch than main will have a "-dev" suffix
-static def getGplayVersionSuffix() {
-    if (gitBranchName() == "main") {
-        return ""
-    } else {
-        return "-dev"
-    }
-}
-
-static def gitTag() {
-    def cmd = "git describe --exact-match --tags"
-    return cmd.execute().text.trim()
-}
-
-// For F-Droid build, build on a not tagged commit will have a "-dev" suffix
-static def getFdroidVersionSuffix() {
-    if (gitTag() == "") {
-        return "-dev"
-    } else {
-        return ""
-    }
-}
-
 project.android.buildTypes.all { buildType ->
     buildType.javaCompileOptions.annotationProcessorOptions.arguments =
             [
@@ -117,14 +25,10 @@ project.android.buildTypes.all { buildType ->
             ]
 }
 
-// map for the version codes last digit
-// x86 must have greater values than arm
-// 64 bits have greater value than 32 bits
-ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].withDefault { 0 }
-
-def buildNumber = System.env.BUILDKITE_BUILD_NUMBER as Integer ?: 0
+initScreenshotTests(project)
 
 android {
+    namespace "im.vector.app"
     // Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use
     // Ref: https://issuetracker.google.com/issues/144111441
     ndkVersion "21.3.6528147"
@@ -132,29 +36,9 @@ android {
     compileSdk versions.compileSdk
 
     defaultConfig {
-        applicationId "im.vector.app"
         // Set to API 21: see #405
         minSdk versions.minSdk
         targetSdk versions.targetSdk
-        multiDexEnabled true
-
-        renderscriptTargetApi 24
-        renderscriptSupportModeEnabled true
-
-        // `develop` branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode.
-        // Other branches (main, features, etc.) will have version code based on application version.
-        versionCode project.getVersionCode()
-
-        // Required for sonar analysis
-        versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar"
-
-        // Generate a random app task affinity
-        manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"]
-
-        buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
-        buildConfigField "String", "GIT_REVISION_DATE", "\"${gitRevisionDate()}\""
-        buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\""
-        buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -163,43 +47,15 @@ android {
             abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64'
         }
 
-        // Ref: https://developer.android.com/studio/build/configure-apk-splits.html
-        splits {
-            // Configures multiple APKs based on ABI.
-            abi {
-                // Enables building multiple APKs per ABI.
-                enable true
-
-                // By default all ABIs are included, so use reset() and include to specify that we only
-                // want APKs for armeabi-v7a, x86, arm64-v8a and x86_64.
-
-                // Resets the list of ABIs that Gradle should create APKs for to none.
-                reset()
-
-                // Specifies a list of ABIs that Gradle should create APKs for.
-                include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
-
-                // Generate a universal APK that includes all ABIs, so user who install from CI tool can use this one by default.
-                universalApk true
-            }
-        }
-
-        applicationVariants.all { variant ->
-            // assign different version code for each output
-            def baseVariantVersion = variant.versionCode * 10
-            variant.outputs.each { output ->
-                def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI))
-                // Known limitation: it does not modify the value in the BuildConfig.java generated file
-                // See https://issuetracker.google.com/issues/171133218
-                output.versionCodeOverride = baseVariantVersion + baseAbiVersionCode
-                print "ABI " + output.getFilter(OutputFile.ABI) + " \t-> VersionCode = " + output.versionCodeOverride + "\n"
-            }
-        }
+        // Generate a random app task affinity
+        manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"]
 
         // The following argument makes the Android Test Orchestrator run its
         // "pm clear" command after each test invocation. This command ensures
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
+
+        vectorDrawables.useSupportLibrary = true
     }
 
     testOptions {
@@ -210,122 +66,12 @@ android {
         // Comment to run on Android 12
 //        execution 'ANDROIDX_TEST_ORCHESTRATOR'
     }
-    signingConfigs {
-        debug {
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-            storeFile file('./signature/debug.keystore')
-            storePassword 'android'
-        }
-        nightly {
-            keyAlias System.env.ELEMENT_ANDROID_NIGHTLY_KEYID ?: project.property("signing.element.nightly.keyId")
-            keyPassword System.env.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD ?: project.property("signing.element.nightly.keyPassword")
-            storeFile file('./signature/nightly.keystore')
-            storePassword System.env.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD ?: project.property("signing.element.nightly.storePassword")
-        }
-        release {
-            keyAlias project.property("signing.element.keyId")
-            keyPassword project.property("signing.element.keyPassword")
-            storeFile file(project.property("signing.element.storePath"))
-            storePassword project.property("signing.element.storePassword")
-        }
-    }
-
     buildTypes {
         debug {
-            applicationIdSuffix ".debug"
-            resValue "string", "app_name", "Element dbg"
-            resValue "color", "launcher_background", "#0DBD8B"
-
-            signingConfig signingConfigs.debug
-
             if (project.hasProperty("coverage")) {
                 testCoverageEnabled = coverage.enableTestCoverage
             }
         }
-
-        release {
-            resValue "string", "app_name", "Element"
-            resValue "color", "launcher_background", "#0DBD8B"
-
-            postprocessing {
-                removeUnusedCode true
-                removeUnusedResources true
-                // We do not activate obfuscation as it makes it hard then to read crash reports, and it's a bit useless on an open source project :)
-                obfuscate false
-                optimizeCode true
-                proguardFiles 'proguard-rules.pro'
-            }
-            // signingConfig signingConfigs.release
-        }
-
-        nightly {
-            initWith release
-            applicationIdSuffix ".nightly"
-            versionNameSuffix "-nightly"
-
-            // Just override the background color of the launcher icon for the nightly build.
-            resValue "color", "launcher_background", "#07007E"
-
-            // We need to copy paste this block, this is not done automatically by `initWith release`
-            postprocessing {
-                removeUnusedCode true
-                removeUnusedResources true
-                // We do not activate obfuscation as it makes it hard then to read crash reports, and it's a bit useless on an open source project :)
-                obfuscate false
-                optimizeCode true
-                proguardFiles 'proguard-rules.pro'
-            }
-            matchingFallbacks = ['release']
-            signingConfig signingConfigs.nightly
-            firebaseAppDistribution {
-                artifactType = "APK"
-                // We upload the universal APK to fix this error:
-                // "App Distribution found more than 1 output file for this variant.
-                // Please contact firebase-support@google.com for help using APK splits with App Distribution."
-                artifactPath = "$rootDir/vector/build/outputs/apk/gplay/nightly/vector-gplay-universal-nightly.apk"
-                // This file will be generated by the GitHub action
-                releaseNotesFile = "CHANGES_NIGHTLY.md"
-                groups = "external-testers"
-                // This should not be required, but if I do not add the appId, I get this error:
-                // "App Distribution halted because it had a problem uploading the APK: [404] Requested entity was not found."
-                appId = "1:912726360885:android:efd8545af52a9f9300427c"
-            }
-        }
-    }
-
-    flavorDimensions "store"
-
-    productFlavors {
-        gplay {
-            apply plugin: 'com.google.gms.google-services'
-            afterEvaluate {
-                tasks.matching { it.name.contains("GoogleServices") && !it.name.contains("Gplay") }*.enabled = false
-            }
-
-            dimension "store"
-            isDefault = true
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}"
-
-            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
-            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
-        }
-
-        fdroid {
-            dimension "store"
-
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
-
-            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
-            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
-        }
-    }
-
-    lintOptions {
-        lintConfig file("lint.xml")
-
-        checkDependencies true
-        abortOnError true
     }
 
     compileOptions {
@@ -354,28 +100,24 @@ android {
         test {
             java.srcDirs += "src/sharedTest/java"
         }
-        // Add sourceSets for `release` version when building `nightly`
-        nightly {
-            java.srcDirs += "src/release/java"
-        }
     }
 
     buildFeatures {
         viewBinding true
     }
 }
-
 dependencies {
+
     implementation project(":vector-config")
-    implementation project(":matrix-sdk-android")
+    api project(":matrix-sdk-android")
     implementation project(":matrix-sdk-android-flow")
-    implementation project(":library:jsonviewer")
+    implementation project(":library:external:jsonviewer")
+    implementation project(":library:external:diff-match-patch")
+    implementation project(":library:ui-strings")
     implementation project(":library:ui-styles")
     implementation project(":library:core-utils")
     implementation project(":library:attachment-viewer")
-    implementation project(":library:diff-match-patch")
     implementation project(":library:multipicker")
-    implementation 'androidx.multidex:multidex:2.0.1'
 
     implementation libs.jetbrains.coroutinesCore
     implementation libs.jetbrains.coroutinesAndroid
@@ -384,74 +126,69 @@ dependencies {
     implementation libs.androidx.appCompat
     implementation libs.androidx.fragmentKtx
     implementation libs.androidx.constraintLayout
-    implementation "androidx.sharetarget:sharetarget:1.1.0"
     implementation libs.androidx.core
     implementation "androidx.media:media:1.6.0"
     implementation "androidx.transition:transition:1.4.1"
     implementation libs.androidx.biometric
 
-    implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
-    implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.10.0"
+    api "org.threeten:threetenbp:1.4.0:no-tzdb"
+    api "com.gabrielittner.threetenbp:lazythreetenbp:0.12.0"
 
     implementation libs.squareup.moshi
     kapt libs.squareup.moshiKotlin
 
     // Lifecycle
     implementation libs.androidx.lifecycleLivedata
-    implementation libs.androidx.lifecycleProcess
+    api libs.androidx.lifecycleProcess
     implementation libs.androidx.lifecycleRuntimeKtx
 
-    implementation libs.androidx.datastorepreferences
+    api libs.androidx.datastorepreferences
 
     // Opus Encoder
     implementation libs.element.opusencoder
 
+    // WYSIWYG Editor
+    implementation libs.element.wysiwyg
+
     // Log
-    implementation libs.jakewharton.timber
+    api libs.jakewharton.timber
 
     // Debug
-    implementation 'com.facebook.stetho:stetho:1.6.0'
+    api 'com.facebook.stetho:stetho:1.6.0'
 
-    // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.53'
+    api libs.google.phonenumber
 
     // FlowBinding
     implementation libs.github.flowBinding
     implementation libs.github.flowBindingAppcompat
 
-    implementation libs.airbnb.epoxy
+    api libs.airbnb.epoxy
     implementation libs.airbnb.epoxyGlide
-    kapt libs.airbnb.epoxyProcessor
+    ksp libs.airbnb.epoxyProcessor
     implementation libs.airbnb.epoxyPaging
-    implementation libs.airbnb.mavericks
+    api libs.airbnb.mavericks
 
     // Snap Helper https://github.com/rubensousa/GravitySnapHelper
-    implementation 'com.github.rubensousa:gravitysnaphelper:2.2.2'
-
-    // Nightly
-    // API-only library
-    gplayImplementation libs.google.appdistributionApi
-    // Full SDK implementation
-    gplayImplementation libs.google.appdistribution
+    api 'com.github.rubensousa:gravitysnaphelper:2.2.2'
 
     // Work
-    implementation libs.androidx.work
+    api libs.androidx.work
 
     // Paging
     implementation libs.androidx.pagingRuntimeKtx
 
-    // Functional Programming
-    implementation libs.arrow.core
-
     // Pref
-    implementation libs.androidx.preferenceKtx
+    api libs.androidx.preferenceKtx
 
     // UI
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
     implementation libs.google.material
-    implementation 'me.gujun.android:span:1.7'
+    api('me.gujun.android:span:1.7') {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
     implementation libs.markwon.core
     implementation libs.markwon.extLatex
+    implementation libs.markwon.imageGlide
     implementation libs.markwon.inlineParser
     implementation libs.markwon.html
     implementation 'com.googlecode.htmlcompressor:htmlcompressor:1.5.2'
@@ -478,7 +215,6 @@ dependencies {
     // Image Loading
     implementation libs.github.bigImageViewer
     implementation libs.github.glideImageLoader
-    implementation libs.github.progressPieIndicator
     implementation libs.github.glideImageViewFactory
 
     // implementation 'com.github.MikeOrtiz:TouchImageView:3.0.2'
@@ -497,44 +233,48 @@ dependencies {
     kapt libs.dagger.hiltCompiler
 
     // Analytics
-    implementation 'com.posthog.android:posthog:1.1.2'
+    implementation('com.posthog.android:posthog:2.0.0') {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    implementation libs.sentry.sentryAndroid
 
     // UnifiedPush
-    implementation 'com.github.UnifiedPush:android-connector:2.0.1'
-    // UnifiedPush gplay flavor only
-    gplayImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.1') {
-        exclude group: 'com.google.firebase', module: 'firebase-core'
-        exclude group: 'com.google.firebase', module: 'firebase-analytics'
-        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
-    }
+    implementation 'com.github.UnifiedPush:android-connector:2.1.1'
 
-    // OSS License, gplay flavor only
-    gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
-
-    implementation "androidx.emoji2:emoji2:1.1.0"
+    implementation "androidx.emoji2:emoji2:1.2.0"
 
     // WebRTC
     // org.webrtc:google-webrtc is for development purposes only
     // implementation 'org.webrtc:google-webrtc:1.0.+'
-    implementation('com.facebook.react:react-native-webrtc:1.94.2-jitsi-10227332@aar')
-
+    implementation('com.facebook.react:react-native-webrtc:1.106.1-jitsi-12039821@aar')
     // Jitsi
-    implementation('org.jitsi.react:jitsi-meet-sdk:5.0.2') {
+    // Note: version is 6.2.0, but built from the tag `android-sdk-6.2.2`.
+    api('org.jitsi.react:jitsi-meet-sdk:6.2.0') {
         exclude group: 'com.google.firebase'
         exclude group: 'com.google.android.gms'
         exclude group: 'com.android.installreferrer'
+
+        // Exclude jitsi's android-scalablevideoview fork's support library
+        // The library exports a jetified artifact but doesn't remove the support library dependency
+        // https://github.com/MatrixFrog/Android-ScalableVideoView/blob/master/gradle.properties#L1
+        exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
     // QR-code
     // Stick to 3.3.3 because of https://github.com/zxing/zxing/issues/1170
     implementation 'com.google.zxing:core:3.3.3'
-    implementation 'me.dm7.barcodescanner:zxing:1.9.13'
+
+    // Excludes the legacy support library annotation usages
+    // https://github.com/dm77/barcodescanner/blob/d036996c8a6f36a68843ffe539c834c28944b2d5/core/src/main/java/me/dm7/barcodescanner/core/CameraWrapper.java#L4
+    implementation ('me.dm7.barcodescanner:zxing:1.9.13') {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
 
     // Emoji Keyboard
-    implementation libs.vanniktech.emojiMaterial
-    implementation libs.vanniktech.emojiGoogle
+    api libs.vanniktech.emojiMaterial
+    api libs.vanniktech.emojiGoogle
 
-    implementation 'im.dlg:android-dialer:1.2.5'
+    implementation project(":library:external:dialpad")
 
     // JWT
     api libs.jsonwebtoken.jjwtApi
@@ -545,38 +285,30 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.15'
 
     // MapTiler
-    fdroidImplementation(libs.maplibre.androidSdk) {
+    api(libs.maplibre.androidSdk) {
         exclude group: 'com.google.android.gms', module: 'play-services-location'
     }
-    fdroidImplementation(libs.maplibre.pluginAnnotation) {
+    api(libs.maplibre.pluginAnnotation) {
         exclude group: 'com.google.android.gms', module: 'play-services-location'
     }
-    gplayImplementation libs.maplibre.androidSdk
-    gplayImplementation libs.maplibre.pluginAnnotation
 
     // TESTS
     testImplementation libs.tests.junit
     testImplementation libs.tests.kluent
     testImplementation libs.mockk.mockk
+    testImplementation libs.androidx.coreTesting
     // Plant Timber tree for test
     testImplementation libs.tests.timberJunitRule
     testImplementation libs.airbnb.mavericksTesting
+    testImplementation libs.androidx.coreTesting
     testImplementation(libs.jetbrains.coroutinesTest) {
         exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug"
     }
 
-    // Flipper, debug builds only
-    debugImplementation(libs.flipper.flipper) {
-        exclude group: 'com.facebook.fbjni', module: 'fbjni'
-    }
-    debugImplementation(libs.flipper.flipperNetworkPlugin) {
-        exclude group: 'com.facebook.fbjni', module: 'fbjni'
-    }
-    debugImplementation 'com.facebook.soloader:soloader:0.10.4'
-    debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0"
-
-    // Activate when you want to check for leaks, from time to time.
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
+    // Fix issue with Jitsi. Inspired from https://github.com/android/android-test/issues/861#issuecomment-872067868
+    // Error was lots of `Duplicate class org.checkerframework.common.reflection.qual.MethodVal found in modules jetified-checker-3.1 (org.checkerframework:checker:3.1.1) and jetified-checker-qual-3.12.0 (org.checkerframework:checker-qual:3.12.0)
+    //noinspection GradleDependency Cannot use latest 3.15.0 since it required min API 26.
+    implementation "org.checkerframework:checker:3.27.0"
 
     androidTestImplementation libs.androidx.testCore
     androidTestImplementation libs.androidx.testRunner
@@ -593,11 +325,11 @@ dependencies {
     // Plant Timber tree for test
     androidTestImplementation libs.tests.timberJunitRule
     // "The one who serves a great Espresso"
-    androidTestImplementation('com.adevinta.android:barista:4.2.0') {
+    androidTestImplementation('com.adevinta.android:barista:4.3.0') {
         exclude group: 'org.jetbrains.kotlin'
     }
     androidTestImplementation libs.mockk.mockkAndroid
     androidTestUtil libs.androidx.orchestrator
     debugImplementation libs.androidx.fragmentTesting
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.22"
 }
diff --git a/vector/src/androidTest/AndroidManifest.xml b/vector/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000000..5c3b99d4d1
--- /dev/null
+++ b/vector/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity android:name="im.vector.app.features.pin.lockscreen.tests.LockScreenTestActivity" />
+    </application>
+
+</manifest>
diff --git a/vector/src/androidTest/java/im/vector/app/AndroidVersionTestOverrider.kt b/vector/src/androidTest/java/im/vector/app/AndroidVersionTestOverrider.kt
deleted file mode 100644
index 97333b7c98..0000000000
--- a/vector/src/androidTest/java/im/vector/app/AndroidVersionTestOverrider.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2022 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.
- */
-
-package im.vector.app
-
-import android.os.Build
-import java.lang.reflect.Field
-
-/**
- * Used to override [Build.VERSION.SDK_INT]. Ideally an interface should be used instead, but that approach forces us to either add suppress lint annotations
- * and potentially miss an API version issue or write a custom lint rule, which seems like an overkill.
- */
-object AndroidVersionTestOverrider {
-
-    private var initialValue: Int? = null
-
-    fun override(newVersion: Int) {
-        if (initialValue == null) {
-            initialValue = Build.VERSION.SDK_INT
-        }
-        val field = Build.VERSION::class.java.getField("SDK_INT")
-        setStaticField(field, newVersion)
-    }
-
-    fun restore() {
-        initialValue?.let { override(it) }
-    }
-
-    private fun setStaticField(field: Field, value: Any) {
-        field.isAccessible = true
-        field.set(null, value)
-    }
-}
diff --git a/vector/src/androidTest/java/im/vector/app/TestBuildVersionSdkIntProvider.kt b/vector/src/androidTest/java/im/vector/app/TestBuildVersionSdkIntProvider.kt
index ddf89b5e46..b3f9c65800 100644
--- a/vector/src/androidTest/java/im/vector/app/TestBuildVersionSdkIntProvider.kt
+++ b/vector/src/androidTest/java/im/vector/app/TestBuildVersionSdkIntProvider.kt
@@ -18,8 +18,6 @@ package im.vector.app
 
 import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 
-class TestBuildVersionSdkIntProvider : BuildVersionSdkIntProvider {
-    var value: Int = 0
-
+class TestBuildVersionSdkIntProvider(var value: Int = 0) : BuildVersionSdkIntProvider {
     override fun get() = value
 }
diff --git a/vector/src/androidTest/java/im/vector/app/core/utils/TestSpan.kt b/vector/src/androidTest/java/im/vector/app/core/utils/TestSpan.kt
index 9e23e76f0c..e31dc6942c 100644
--- a/vector/src/androidTest/java/im/vector/app/core/utils/TestSpan.kt
+++ b/vector/src/androidTest/java/im/vector/app/core/utils/TestSpan.kt
@@ -29,6 +29,7 @@ import io.mockk.verify
 import io.noties.markwon.core.spans.EmphasisSpan
 import io.noties.markwon.core.spans.OrderedListItemSpan
 import io.noties.markwon.core.spans.StrongEmphasisSpan
+import me.gujun.android.span.style.CustomTypefaceSpan
 
 fun Spannable.toTestSpan(): String {
     var output = toString()
@@ -54,7 +55,7 @@ private fun Any.readTags(): SpanTags {
         OrderedListItemSpan::class -> SpanTags("[list item]", "[/list item]")
         HtmlCodeSpan::class -> SpanTags("[code]", "[/code]")
         StrongEmphasisSpan::class -> SpanTags("[bold]", "[/bold]")
-        EmphasisSpan::class -> SpanTags("[italic]", "[/italic]")
+        EmphasisSpan::class, CustomTypefaceSpan::class -> SpanTags("[italic]", "[/italic]")
         else -> throw IllegalArgumentException("Unknown ${this::class}")
     }
 }
diff --git a/vector/src/androidTest/java/im/vector/app/features/RoomMemberListControllerTest.kt b/vector/src/androidTest/java/im/vector/app/features/RoomMemberListControllerTest.kt
new file mode 100644
index 0000000000..527751aae2
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/features/RoomMemberListControllerTest.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features
+
+import com.airbnb.mvrx.Success
+import im.vector.app.core.epoxy.profiles.ProfileMatrixItemWithPowerLevelWithPresence
+import im.vector.app.features.roomprofile.members.RoomMemberListCategories
+import im.vector.app.features.roomprofile.members.RoomMemberListController
+import im.vector.app.features.roomprofile.members.RoomMemberListViewState
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Ignore
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+class RoomMemberListControllerTest {
+
+    @Test
+    @Ignore("Too flaky")
+    fun testControllerUserVerificationLevel() = runTest {
+        val roomListController = RoomMemberListController(
+                avatarRenderer = mockk {
+                },
+                stringProvider = mockk {
+                    every { getString(any()) } answers {
+                        this.args[0].toString()
+                    }
+                },
+                colorProvider = mockk {
+                    every { getColorFromAttribute(any()) } returns 0x0
+                },
+                roomMemberSummaryFilter = mockk(relaxed = true) {
+                    every { test(any()) } returns true
+                }
+        )
+
+        val fakeRoomSummary = RoomSummary(
+                roomId = "!roomId",
+                displayName = "Fake Room",
+                topic = "A topic",
+                isEncrypted = true,
+                encryptionEventTs = 0,
+                typingUsers = emptyList(),
+        )
+
+        val state = RoomMemberListViewState(
+                roomId = "!roomId",
+                roomSummary = Success(fakeRoomSummary),
+                areAllMembersLoaded = true,
+                roomMemberSummaries = Success(
+                        listOf(
+                                RoomMemberListCategories.USER to listOf(
+                                        RoomMemberSummary(
+                                                membership = Membership.JOIN,
+                                                userId = "@alice:example.com"
+                                        ),
+                                        RoomMemberSummary(
+                                                membership = Membership.JOIN,
+                                                userId = "@bob:example.com"
+                                        ),
+                                        RoomMemberSummary(
+                                                membership = Membership.JOIN,
+                                                userId = "@carl:example.com"
+                                        ),
+                                        RoomMemberSummary(
+                                                membership = Membership.JOIN,
+                                                userId = "@massy:example.com"
+                                        )
+                                )
+                        )
+                ),
+                trustLevelMap = Success(
+                        mapOf(
+                                "@alice:example.com" to UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY,
+                                "@bob:example.com" to UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED,
+                                "@carl:example.com" to UserVerificationLevel.WAS_NEVER_VERIFIED,
+                                "@massy:example.com" to UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED,
+                        )
+                )
+        )
+
+        suspendCoroutine { continuation ->
+            roomListController.setData(state)
+            roomListController.addModelBuildListener {
+                continuation.resume(it)
+            }
+        }
+
+        val models = roomListController.adapter.copyOfModels
+
+        val profileItems = models.filterIsInstance<ProfileMatrixItemWithPowerLevelWithPresence>()
+
+        profileItems.firstOrNull {
+            it.matrixItem.id == "@alice:example.com"
+        }!!.userVerificationLevel shouldBeEqualTo UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY
+
+        profileItems.firstOrNull {
+            it.matrixItem.id == "@bob:example.com"
+        }!!.userVerificationLevel shouldBeEqualTo UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED
+
+        profileItems.firstOrNull {
+            it.matrixItem.id == "@carl:example.com"
+        }!!.userVerificationLevel shouldBeEqualTo UserVerificationLevel.WAS_NEVER_VERIFIED
+
+        profileItems.firstOrNull {
+            it.matrixItem.id == "@massy:example.com"
+        }!!.userVerificationLevel shouldBeEqualTo UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/features/html/EventHtmlRendererTest.kt b/vector/src/androidTest/java/im/vector/app/features/html/EventHtmlRendererTest.kt
index 41c0f51322..a2e489dd70 100644
--- a/vector/src/androidTest/java/im/vector/app/features/html/EventHtmlRendererTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/html/EventHtmlRendererTest.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.html
 
 import androidx.core.text.toSpannable
 import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.toTestSpan
 import im.vector.app.features.settings.VectorPreferences
@@ -36,11 +37,13 @@ class EventHtmlRendererTest {
     private val fakeVectorPreferences = mockk<VectorPreferences>().also {
         every { it.latexMathsIsEnabled() } returns false
     }
+    private val fakeSessionHolder = mockk<ActiveSessionHolder>()
 
     private val renderer = EventHtmlRenderer(
             MatrixHtmlPluginConfigure(ColorProvider(context), context.resources),
             context,
-            fakeVectorPreferences
+            fakeVectorPreferences,
+            fakeSessionHolder,
     )
 
     @Test
diff --git a/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LegacyPinCodeMigratorTests.kt b/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LegacyPinCodeMigratorTests.kt
index 44c5db89c8..8c50806fd9 100644
--- a/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LegacyPinCodeMigratorTests.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LegacyPinCodeMigratorTests.kt
@@ -25,6 +25,7 @@ import android.security.keystore.KeyProperties
 import android.util.Base64
 import androidx.preference.PreferenceManager
 import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.TestBuildVersionSdkIntProvider
 import im.vector.app.features.pin.PinCodeStore
 import im.vector.app.features.pin.SharedPrefPinCodeStore
 import im.vector.app.features.pin.lockscreen.crypto.LockScreenCryptoConstants.ANDROID_KEY_STORE
@@ -32,7 +33,6 @@ import im.vector.app.features.pin.lockscreen.crypto.LockScreenCryptoConstants.LE
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
-import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
 import kotlinx.coroutines.runBlocking
@@ -42,7 +42,6 @@ import org.amshove.kluent.shouldBeEqualTo
 import org.junit.After
 import org.junit.Test
 import org.matrix.android.sdk.api.securestorage.SecretStoringUtils
-import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 import java.math.BigInteger
 import java.security.KeyFactory
 import java.security.KeyPairGenerator
@@ -66,9 +65,7 @@ class LegacyPinCodeMigratorTests {
             SharedPrefPinCodeStore(PreferenceManager.getDefaultSharedPreferences(InstrumentationRegistry.getInstrumentation().context))
     )
     private val keyStore: KeyStore = spyk(KeyStore.getInstance(ANDROID_KEY_STORE)).also { it.load(null) }
-    private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider = mockk {
-        every { get() } returns Build.VERSION_CODES.M
-    }
+    private val buildVersionSdkIntProvider = TestBuildVersionSdkIntProvider(Build.VERSION_CODES.M)
     private val secretStoringUtils: SecretStoringUtils = spyk(
             SecretStoringUtils(context, keyStore, buildVersionSdkIntProvider)
     )
@@ -125,26 +122,18 @@ class LegacyPinCodeMigratorTests {
 
     @Test
     fun migratePinCodeM() = runTest {
-        val pinCode = "1234"
-        saveLegacyPinCode(pinCode)
-
-        legacyPinCodeMigrator.migrate()
-
-        coVerify { legacyPinCodeMigrator.getDecryptedPinCode() }
-        verify { secretStoringUtils.securelyStoreBytes(any(), any()) }
-        coVerify { pinCodeStore.savePinCode(any()) }
-        verify { keyStore.deleteEntry(LEGACY_PIN_CODE_KEY_ALIAS) }
-
-        val decodedPinCode = String(secretStoringUtils.loadSecureSecretBytes(Base64.decode(pinCodeStore.getPinCode().orEmpty(), Base64.NO_WRAP), alias))
-        decodedPinCode shouldBeEqualTo pinCode
-        keyStore.containsAlias(LEGACY_PIN_CODE_KEY_ALIAS) shouldBe false
-        keyStore.containsAlias(alias) shouldBe true
+        buildVersionSdkIntProvider.value = Build.VERSION_CODES.M
+        migratePinCode()
     }
 
     @Test
     fun migratePinCodeL() = runTest {
+        buildVersionSdkIntProvider.value = Build.VERSION_CODES.LOLLIPOP
+        migratePinCode()
+    }
+
+    private suspend fun migratePinCode() {
         val pinCode = "1234"
-        every { buildVersionSdkIntProvider.get() } returns Build.VERSION_CODES.LOLLIPOP
         saveLegacyPinCode(pinCode)
 
         legacyPinCodeMigrator.migrate()
@@ -163,7 +152,7 @@ class LegacyPinCodeMigratorTests {
     private fun generateLegacyKey() {
         if (keyStore.containsAlias(LEGACY_PIN_CODE_KEY_ALIAS)) return
 
-        if (buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M) {
+        if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.M)) {
             generateLegacyKeyM()
         } else {
             generateLegacyKeyL()
@@ -206,7 +195,7 @@ class LegacyPinCodeMigratorTests {
         generateLegacyKey()
         val publicKey = keyStore.getCertificate(LEGACY_PIN_CODE_KEY_ALIAS).publicKey
         val cipher = getLegacyCipher()
-        if (buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M) {
+        if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.M)) {
             val unrestrictedKey = KeyFactory.getInstance(publicKey.algorithm).generatePublic(X509EncodedKeySpec(publicKey.encoded))
             val spec = OAEPParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA1, PSource.PSpecified.DEFAULT)
             cipher.init(Cipher.ENCRYPT_MODE, unrestrictedKey, spec)
@@ -219,14 +208,15 @@ class LegacyPinCodeMigratorTests {
     }
 
     private fun getLegacyCipher(): Cipher {
-        return when (buildVersionSdkIntProvider.get()) {
-            Build.VERSION_CODES.LOLLIPOP, Build.VERSION_CODES.LOLLIPOP_MR1 -> getCipherL()
-            else -> getCipherM()
+        return if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.M)) {
+            getCipherM()
+        } else {
+            getCipherL()
         }
     }
 
     private fun getCipherL(): Cipher {
-        val provider = if (buildVersionSdkIntProvider.get() < Build.VERSION_CODES.M) "AndroidOpenSSL" else "AndroidKeyStoreBCWorkaround"
+        val provider = if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.M)) "AndroidKeyStoreBCWorkaround" else "AndroidOpenSSL"
         val transformation = "RSA/ECB/PKCS1Padding"
         return Cipher.getInstance(transformation, provider)
     }
diff --git a/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
index a880b17e0c..3517f806d6 100644
--- a/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
@@ -76,7 +76,7 @@ class EmojiDataSourceTest : InstrumentedTest {
     fun searchTestOneResult() {
         val emojiDataSource = createEmojiDataSource()
         val result = runBlocking {
-            emojiDataSource.filterWith("france")
+            emojiDataSource.filterWith("flag-france")
         }
         assertEquals("Should have 1 result", 1, result.size)
     }
diff --git a/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderLTests.kt b/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderLTests.kt
index 1687ee4388..374396f60b 100644
--- a/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderLTests.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderLTests.kt
@@ -19,24 +19,25 @@ package im.vector.app.features.voice
 import android.Manifest
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
-import io.mockk.spyk
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import org.amshove.kluent.shouldBeNull
 import org.amshove.kluent.shouldExist
 import org.amshove.kluent.shouldNotBeNull
 import org.amshove.kluent.shouldNotExist
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import java.io.File
 
+@Ignore("Disabled temporarily so that we can unblock other PRs.")
 class VoiceRecorderLTests {
 
     @get:Rule
     val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(Manifest.permission.RECORD_AUDIO)
 
     private val context = InstrumentationRegistry.getInstrumentation().targetContext
-    private val recorder = spyk(VoiceRecorderL(context, Dispatchers.IO))
+    private val recorder = VoiceRecorderL(context, Dispatchers.IO, createFakeOpusEncoder())
 
     @Test
     fun startRecordCreatesOggFile() = with(recorder) {
diff --git a/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderProviderTests.kt b/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderProviderTests.kt
index 61f745178c..0610496dfe 100644
--- a/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderProviderTests.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderProviderTests.kt
@@ -18,31 +18,36 @@ package im.vector.app.features.voice
 
 import android.os.Build
 import androidx.test.platform.app.InstrumentationRegistry
-import im.vector.app.AndroidVersionTestOverrider
+import im.vector.app.TestBuildVersionSdkIntProvider
 import im.vector.app.features.DefaultVectorFeatures
+import io.mockk.every
+import io.mockk.spyk
 import org.amshove.kluent.shouldBeInstanceOf
-import org.junit.After
 import org.junit.Test
 
 class VoiceRecorderProviderTests {
 
     private val context = InstrumentationRegistry.getInstrumentation().targetContext
-    private val provider = VoiceRecorderProvider(context, DefaultVectorFeatures())
-
-    @After
-    fun tearDown() {
-        AndroidVersionTestOverrider.restore()
-    }
+    private val buildVersionSdkIntProvider = TestBuildVersionSdkIntProvider()
+    private val provider = spyk(VoiceRecorderProvider(context, DefaultVectorFeatures(), buildVersionSdkIntProvider))
 
     @Test
-    fun provideVoiceRecorderOnAndroidQReturnsQRecorder() {
-        AndroidVersionTestOverrider.override(Build.VERSION_CODES.Q)
+    fun provideVoiceRecorderOnAndroidQAndCodecReturnsQRecorder() {
+        buildVersionSdkIntProvider.value = Build.VERSION_CODES.Q
+        every { provider.hasOpusEncoder() } returns true
         provider.provideVoiceRecorder().shouldBeInstanceOf(VoiceRecorderQ::class)
     }
 
+    @Test
+    fun provideVoiceRecorderOnAndroidQButNoCodecReturnsLRecorder() {
+        buildVersionSdkIntProvider.value = Build.VERSION_CODES.Q
+        every { provider.hasOpusEncoder() } returns false
+        provider.provideVoiceRecorder().shouldBeInstanceOf(VoiceRecorderL::class)
+    }
+
     @Test
     fun provideVoiceRecorderOnOlderAndroidVersionReturnsLRecorder() {
-        AndroidVersionTestOverrider.override(Build.VERSION_CODES.LOLLIPOP)
+        buildVersionSdkIntProvider.value = Build.VERSION_CODES.LOLLIPOP
         provider.provideVoiceRecorder().shouldBeInstanceOf(VoiceRecorderL::class)
     }
 }
diff --git a/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderTestExt.kt b/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderTestExt.kt
index 4275ae89b3..75303556b2 100644
--- a/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderTestExt.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderTestExt.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.voice
 
 import im.vector.app.core.utils.waitUntil
+import im.vector.app.test.fakes.FakeOggOpusEncoder
 import org.amshove.kluent.shouldExist
 import org.amshove.kluent.shouldNotBeNull
 import java.io.File
@@ -34,3 +35,5 @@ suspend fun VoiceRecorder.waitUntilRecordingFileExists(timeout: Duration = 1.sec
     }
     return getVoiceMessageFile()
 }
+
+internal fun createFakeOpusEncoder() = FakeOggOpusEncoder().apply { createEmptyFileOnInit() }
diff --git a/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderTests.kt b/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderTests.kt
index 7feeff83cb..72d959f3dd 100644
--- a/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderTests.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/voice/VoiceRecorderTests.kt
@@ -29,7 +29,7 @@ import java.io.File
 class VoiceRecorderTests {
 
     private val context = InstrumentationRegistry.getInstrumentation().targetContext
-    private val voiceRecorder = VoiceRecorderL(context, Dispatchers.IO)
+    private val voiceRecorder = VoiceRecorderL(context, Dispatchers.IO, createFakeOpusEncoder())
     private val audioDirectory = File(context.cacheDir, "voice_records")
 
     @After
diff --git a/vector/src/androidTest/java/im/vector/app/test/fakes/FakeOggOpusEncoder.kt b/vector/src/androidTest/java/im/vector/app/test/fakes/FakeOggOpusEncoder.kt
new file mode 100644
index 0000000000..a13c8dbb78
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/test/fakes/FakeOggOpusEncoder.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import io.element.android.opusencoder.OggOpusEncoder
+import io.mockk.every
+import io.mockk.mockk
+import java.io.File
+
+class FakeOggOpusEncoder : OggOpusEncoder by mockk() {
+
+    init {
+        every { init(any(), any()) } returns 0
+        every { setBitrate(any()) } returns 0
+        every { encode(any(), any()) } returns 0
+        every { release() } answers {}
+    }
+
+    fun createEmptyFileOnInit() {
+        every { init(any(), any()) } answers {
+            val filePath = arg<String>(0)
+            if (File(filePath).createNewFile()) 0 else 1
+        }
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt
deleted file mode 100644
index dc07f06202..0000000000
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package im.vector.app.ui.robot
-
-import androidx.recyclerview.widget.RecyclerView
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.Espresso.pressBack
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.contrib.RecyclerViewActions
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions
-import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
-import im.vector.app.R
-import im.vector.app.espresso.tools.waitUntilActivityVisible
-import im.vector.app.features.roomdirectory.RoomDirectoryActivity
-
-class RoomListRobot {
-
-    fun openRoom(roomName: String, block: RoomDetailRobot.() -> Unit) {
-        clickOn(roomName)
-        block(RoomDetailRobot())
-        pressBack()
-    }
-
-    fun verifyCreatedRoom() {
-        onView(ViewMatchers.withId(R.id.roomListView))
-                .perform(
-                        RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
-                                ViewMatchers.hasDescendant(withText(R.string.room_displayname_empty_room)),
-                                ViewActions.longClick()
-                        )
-                )
-        pressBack()
-    }
-
-    fun newRoom(block: NewRoomRobot.() -> Unit) {
-        clickOn(R.id.createGroupRoomButton)
-        waitUntilActivityVisible<RoomDirectoryActivity> {
-            BaristaVisibilityAssertions.assertDisplayed(R.id.publicRoomsList)
-        }
-        val newRoomRobot = NewRoomRobot()
-        block(newRoomRobot)
-        if (!newRoomRobot.createdRoom) {
-            pressBack()
-        }
-    }
-}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt
deleted file mode 100644
index b8a2f4313b..0000000000
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2022 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.
- */
-
-package im.vector.app.ui.robot.space
-
-import androidx.recyclerview.widget.RecyclerView
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.contrib.RecyclerViewActions
-import androidx.test.espresso.matcher.ViewMatchers
-import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
-import com.adevinta.android.barista.interaction.BaristaDrawerInteractions.openDrawer
-import com.adevinta.android.barista.internal.viewaction.ClickChildAction
-import im.vector.app.R
-import im.vector.app.espresso.tools.waitUntilDialogVisible
-import im.vector.app.espresso.tools.waitUntilViewVisible
-import org.hamcrest.Matchers
-
-class SpaceRobot {
-
-    fun createSpace(block: SpaceCreateRobot.() -> Unit) {
-        openDrawer()
-        clickOn(R.string.create_space)
-        block(SpaceCreateRobot())
-    }
-
-    fun spaceMenu(spaceName: String, block: SpaceMenuRobot.() -> Unit) {
-        openDrawer()
-        with(SpaceMenuRobot()) {
-            openMenu(spaceName)
-            block()
-        }
-    }
-
-    fun openMenu(spaceName: String) {
-        waitUntilViewVisible(ViewMatchers.withId(R.id.groupListView))
-        Espresso.onView(ViewMatchers.withId(R.id.groupListView))
-                .perform(
-                        RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
-                                ViewMatchers.hasDescendant(Matchers.allOf(ViewMatchers.withId(R.id.groupNameView), ViewMatchers.withText(spaceName))),
-                                ClickChildAction.clickChildWithId(R.id.groupTmpLeave)
-                        ).atPosition(0)
-                )
-        waitUntilDialogVisible(ViewMatchers.withId(R.id.spaceNameView))
-    }
-
-    fun selectSpace(spaceName: String) {
-        openDrawer()
-        waitUntilViewVisible(ViewMatchers.withId(R.id.groupListView))
-        clickOn(spaceName)
-    }
-}
diff --git a/vector/src/debug/AndroidManifest.xml b/vector/src/debug/AndroidManifest.xml
deleted file mode 100644
index 94fdb1b389..0000000000
--- a/vector/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.app">
-
-    <application>
-        <activity android:name=".features.debug.TestLinkifyActivity" />
-        <activity android:name=".features.debug.DebugPermissionActivity" />
-        <activity android:name=".features.debug.analytics.DebugAnalyticsActivity" />
-        <activity android:name=".features.debug.settings.DebugPrivateSettingsActivity" />
-        <activity android:name=".features.debug.sas.DebugSasEmojiActivity" />
-        <activity android:name=".features.debug.features.DebugFeaturesSettingsActivity" />
-        <activity android:name=".features.debug.DebugMenuActivity" />
-        <activity android:name=".features.debug.leak.DebugMemoryLeaksActivity" />
-
-        <activity
-            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
-            android:exported="true" />
-
-        <!-- Used for UI tests to display the BiometricPrompt. It's normal that it appears as an error. -->
-        <activity android:exported="false" android:name=".features.pin.lockscreen.tests.LockScreenTestActivity" />
-    </application>
-
-</manifest>
diff --git a/vector/src/gplay/AndroidManifest.xml b/vector/src/gplay/AndroidManifest.xml
deleted file mode 100755
index c0c0c4ef0f..0000000000
--- a/vector/src/gplay/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.app">
-
-    <application>
-
-        <!-- Firebase components -->
-        <meta-data
-            android:name="firebase_analytics_collection_deactivated"
-            android:value="true" />
-
-        <receiver
-            android:enabled="true"
-            android:name=".push.fcm.EmbeddedFCMDistributor"
-            android:exported="false">
-
-            <intent-filter>
-                <action android:name="org.unifiedpush.android.distributor.REGISTER" />
-                <action android:name="org.unifiedpush.android.distributor.UNREGISTER" />
-            </intent-filter>
-
-        </receiver>
-
-    </application>
-
-</manifest>
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index beee800b4a..9c8186b2d4 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="im.vector.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Needed for VOIP call to detect and switch to headset-->
     <uses-permission
@@ -15,6 +14,10 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <!-- https://developer.android.com/develop/ui/views/notifications/notification-permission#exemptions -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <!-- Call feature -->
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
@@ -34,20 +37,12 @@
     <!-- To be able to install APK from the application -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
-    <!-- Jitsi libs adds CALENDAR permissions, but we can remove them safely according to https://github.com/jitsi/jitsi-meet/issues/4068#issuecomment-480482481 -->
-    <uses-permission
-        android:name="android.permission.READ_CALENDAR"
-        tools:node="remove" />
-    <uses-permission
-        android:name="android.permission.WRITE_CALENDAR"
-        tools:node="remove" />
-
     <!-- Location Sharing -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <!-- Jitsi SDK is now API23+ -->
-    <uses-sdk tools:overrideLibrary="org.jitsi.meet.sdk,com.oney.WebRTCModule,com.learnium.RNDeviceInfo,com.reactnativecommunity.asyncstorage,com.ocetnik.timer,com.calendarevents,com.reactnativecommunity.netinfo,com.kevinresol.react_native_default_preference,com.rnimmersive,com.corbt.keepawake,com.BV.LinearGradient,com.horcrux.svg,com.oblador.performance,com.reactnativecommunity.slider,com.brentvatne.react,com.reactnativecommunity.clipboard,com.swmansion.gesturehandler.react,org.linusu,org.reactnative.maskedview,com.reactnativepagerview,com.swmansion.reanimated,com.th3rdwave.safeareacontext,com.swmansion.rnscreens,org.devio.rn.splashscreen,com.reactnativecommunity.webview" />
+    <uses-sdk tools:overrideLibrary="org.jitsi.meet.sdk,com.oney.WebRTCModule,com.learnium.RNDeviceInfo,com.reactnativecommunity.asyncstorage,com.ocetnik.timer,com.calendarevents,com.reactnativecommunity.netinfo,com.kevinresol.react_native_default_preference,com.rnimmersive,com.corbt.keepawake,com.BV.LinearGradient,com.horcrux.svg,com.oblador.performance,com.reactnativecommunity.slider,com.brentvatne.react,com.reactnativecommunity.clipboard,com.swmansion.gesturehandler.react,org.linusu,org.reactnative.maskedview,com.reactnativepagerview,com.swmansion.reanimated,com.th3rdwave.safeareacontext,com.swmansion.rnscreens,org.devio.rn.splashscreen,com.reactnativecommunity.webview,org.wonday.orientation" />
 
     <!-- Adding CAMERA permission prevents Chromebooks to see the application on the PlayStore -->
     <!-- Tell that the Camera is not mandatory to install the application -->
@@ -74,20 +69,12 @@
         </intent>
     </queries>
 
-    <application
-        android:name=".VectorApplication"
-        android:allowBackup="false"
-        android:hasFragileUserData="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:resizeableActivity="true"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:taskAffinity="${applicationId}.${appTaskAffinitySuffix}"
-        android:theme="@style/Theme.Vector.Light"
-        tools:ignore="UnusedAttribute"
-        tools:replace="android:allowBackup">
+    <application android:supportsRtl="true">
+
+        <!-- Sentry auto-initialization disable -->
+        <meta-data
+            android:name="io.sentry.auto-init"
+            android:value="false" />
 
         <!-- No limit for screen ratio: avoid black strips -->
         <meta-data
@@ -102,23 +89,6 @@
             android:name=".features.MainActivity"
             android:theme="@style/Theme.Vector.Launcher" />
 
-        <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
-        <!-- exported="true" is required to launch application -->
-        <activity-alias
-            android:name=".features.Alias"
-            android:exported="true"
-            android:targetActivity=".features.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
-        </activity-alias>
-
         <activity android:name=".features.home.HomeActivity" />
 
         <activity
@@ -149,7 +119,7 @@
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize" />
 
-        <!-- Add tools:ignore="Instantiatable" for the error reported only by Buildkite :/ -->
+        <!-- Add tools:ignore="Instantiatable" for the error reported only by CI :/ -->
         <activity
             android:name=".features.media.VectorAttachmentViewerActivity"
             android:theme="@style/Theme.Vector.Black.Transparent"
@@ -182,7 +152,8 @@
 
         <activity
             android:name=".features.home.room.detail.RoomDetailActivity"
-            android:parentActivityName=".features.home.HomeActivity">
+            android:parentActivityName=".features.home.HomeActivity"
+            android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".features.home.HomeActivity" />
@@ -347,12 +318,21 @@
         <activity android:name=".features.poll.create.CreatePollActivity" />
         <activity android:name=".features.location.LocationSharingActivity" />
         <activity android:name=".features.location.live.map.LiveLocationMapViewActivity" />
-        <activity android:name=".features.settings.font.FontScaleSettingActivity"/>
+        <activity android:name=".features.settings.font.FontScaleSettingActivity" />
+        <activity android:name=".features.call.dialpad.PstnDialActivity" />
+        <activity android:name=".features.home.room.list.home.invites.InvitesActivity" />
+        <activity android:name=".features.home.room.list.home.release.ReleaseNotesActivity" />
+        <activity android:name=".features.settings.devices.v2.overview.SessionOverviewActivity" />
+        <activity android:name=".features.settings.devices.v2.othersessions.OtherSessionsActivity" />
+        <activity android:name=".features.settings.devices.v2.details.SessionDetailsActivity" />
+        <activity android:name=".features.settings.devices.v2.rename.RenameSessionActivity" />
+        <activity android:name=".features.login.qr.QrCodeLoginActivity" />
 
         <!-- Services -->
 
         <service
             android:name=".core.services.CallAndroidService"
+            android:foregroundServiceType="phoneCall"
             android:exported="false">
             <!-- in order to get headset button events -->
             <intent-filter>
@@ -360,10 +340,11 @@
             </intent-filter>
         </service>
 
-        <!-- Add tools:ignore="Instantiatable" for the error reported only by Buildkite and for lintGplayRelease check :/ -->
+        <!-- Add tools:ignore="Instantiatable" for the error reported only by CI and for lintGplayRelease check :/ -->
         <service
             android:name=".core.services.VectorSyncAndroidService"
             android:exported="false"
+            android:foregroundServiceType="dataSync"
             tools:ignore="Instantiatable" />
 
         <service
@@ -421,7 +402,7 @@
 
         <!-- UnifiedPush -->
         <receiver
-            android:name=".core.pushers.VectorMessagingReceiver"
+            android:name=".core.pushers.VectorUnifiedPushMessagingReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
@@ -433,41 +414,19 @@
             </intent-filter>
         </receiver>
 
-        <!-- Providers -->
-
-        <!-- Remove WorkManagerInitializer Provider because we are using on-demand initialization of WorkManager-->
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
-            <!-- We init the lib ourself in EmojiCompatWrapper -->
-            <meta-data
-                android:name="androidx.emoji2.text.EmojiCompatInitializer"
-                tools:node="remove" />
-        </provider>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/sdk_provider_paths" />
-        </provider>
-
-        <!-- Temporary fix for Android 12. android:exported has to be explicitly set when targeting Android 12
-        Do it for services coming from dependencies - BEGIN -->
-        <service
-            android:name="androidx.sharetarget.ChooserTargetServiceCompat"
-            android:exported="false"
-            tools:node="merge" />
-        <!-- Temporary fix for Android 12 change - END -->
+        <receiver
+            android:name=".core.pushers.KeepInternalDistributor"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <!--
+                This action is checked to track installed and uninstalled distributors.
+                We declare it to keep the background sync as an internal
+                unifiedpush distributor.
+                -->
+                <action android:name="org.unifiedpush.android.distributor.REGISTER" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
diff --git a/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt b/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
index f58c685ab9..98d6ee7a0a 100644
--- a/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
+++ b/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
@@ -17,11 +17,11 @@
 
 package im.vector.app
 
-import arrow.core.Option
 import im.vector.app.core.utils.BehaviorDataSource
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.Optional
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ActiveSessionDataSource @Inject constructor() : BehaviorDataSource<Option<Session>>()
+class ActiveSessionDataSource @Inject constructor() : BehaviorDataSource<Optional<Session>>()
diff --git a/vector/src/main/java/im/vector/app/SpaceStateHandler.kt b/vector/src/main/java/im/vector/app/SpaceStateHandler.kt
index d9f002be37..efa72a0161 100644
--- a/vector/src/main/java/im/vector/app/SpaceStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/SpaceStateHandler.kt
@@ -17,10 +17,10 @@
 package im.vector.app
 
 import androidx.lifecycle.DefaultLifecycleObserver
-import arrow.core.Option
 import kotlinx.coroutines.flow.Flow
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.Optional
 
 /**
  * Gets info about the current space the user has navigated to, any space backstack they may have
@@ -51,16 +51,18 @@ interface SpaceStateHandler : DefaultLifecycleObserver {
     )
 
     /**
-     * Gets the current backstack of spaces (via their id).
+     * Gets the Space ID of the space on top of the backstack.
      *
-     * null may be an entry in the ArrayDeque to indicate the root space (All Chats)
+     * May return null to indicate the All Chats space.
      */
-    fun getSpaceBackstack(): ArrayDeque<String?>
+    fun popSpaceBackstack(): String?
+
+    fun getSpaceBackstack(): List<String?>
 
     /**
      * Gets a flow of the selected space for clients to react immediately to space changes.
      */
-    fun getSelectedSpaceFlow(): Flow<Option<RoomSummary>>
+    fun getSelectedSpaceFlow(): Flow<Optional<RoomSummary>>
 
     /**
      * Gets the id of the active space, or null if there is none.
diff --git a/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
index c6a4b2c5f0..2c00d03014 100644
--- a/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
+++ b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
@@ -17,12 +17,13 @@
 package im.vector.app
 
 import androidx.lifecycle.LifecycleOwner
-import arrow.core.Option
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.BehaviorDataSource
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.plan.UserProperties
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.session.coroutineScope
+import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.ui.UiStateRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -40,6 +41,8 @@ import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.sync.SyncRequestState
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOption
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -52,13 +55,13 @@ class SpaceStateHandlerImpl @Inject constructor(
         private val sessionDataSource: ActiveSessionDataSource,
         private val uiStateRepository: UiStateRepository,
         private val activeSessionHolder: ActiveSessionHolder,
-        private val analyticsTracker: AnalyticsTracker
+        private val analyticsTracker: AnalyticsTracker,
+        private val vectorPreferences: VectorPreferences,
 ) : SpaceStateHandler {
 
     private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
-    private val selectedSpaceDataSource = BehaviorDataSource<Option<RoomSummary>>(Option.empty())
+    private val selectedSpaceDataSource = BehaviorDataSource<Optional<RoomSummary>>(Optional.empty())
     private val selectedSpaceFlow = selectedSpaceDataSource.stream()
-    private val spaceBackstack = ArrayDeque<String?>()
 
     override fun getCurrentSpace(): RoomSummary? {
         return selectedSpaceDataSource.currentValue?.orNull()?.let { spaceSummary ->
@@ -73,27 +76,30 @@ class SpaceStateHandlerImpl @Inject constructor(
             isForwardNavigation: Boolean,
     ) {
         val activeSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
-        val currentSpace = selectedSpaceDataSource.currentValue?.orNull()
-        val spaceSummary = spaceId?.let { activeSession.getRoomSummary(spaceId) }
-        val sameSpaceSelected = currentSpace != null && spaceId == currentSpace.roomId
+        val spaceToLeave = selectedSpaceDataSource.currentValue?.orNull()
+        val spaceToSet = spaceId?.let { activeSession.getRoomSummary(spaceId) }
+        val sameSpaceSelected = spaceId == spaceToLeave?.roomId
 
         if (sameSpaceSelected) {
             return
         }
 
+        analyticsTracker.capture(
+                ViewRoom(
+                        isDM = false,
+                        isSpace = true,
+                )
+        )
+
         if (isForwardNavigation) {
-            spaceBackstack.addLast(currentSpace?.roomId)
+            addToBackstack(spaceToLeave, spaceToSet)
         }
 
         if (persistNow) {
-            uiStateRepository.storeSelectedSpace(spaceSummary?.roomId, activeSession.sessionId)
+            uiStateRepository.storeSelectedSpace(spaceToSet?.roomId, activeSession.sessionId)
         }
 
-        if (spaceSummary == null) {
-            selectedSpaceDataSource.post(Option.empty())
-        } else {
-            selectedSpaceDataSource.post(Option.just(spaceSummary))
-        }
+        selectedSpaceDataSource.post(spaceToSet.toOption())
 
         if (spaceId != null) {
             activeSession.coroutineScope.launch(Dispatchers.IO) {
@@ -104,6 +110,17 @@ class SpaceStateHandlerImpl @Inject constructor(
         }
     }
 
+    private fun addToBackstack(spaceToLeave: RoomSummary?, spaceToSet: RoomSummary?) {
+        // Only add to the backstack if the space to set is not All Chats, else clear the backstack
+        if (spaceToSet != null) {
+            val currentPersistedBackstack = vectorPreferences.getSpaceBackstack().toMutableList()
+            currentPersistedBackstack.add(spaceToLeave?.roomId)
+            vectorPreferences.setSpaceBackstack(currentPersistedBackstack)
+        } else {
+            vectorPreferences.setSpaceBackstack(emptyList())
+        }
+    }
+
     private fun observeActiveSession() {
         sessionDataSource.stream()
                 .distinctUntilChanged()
@@ -127,7 +144,15 @@ class SpaceStateHandlerImpl @Inject constructor(
                 }.launchIn(session.coroutineScope)
     }
 
-    override fun getSpaceBackstack() = spaceBackstack
+    override fun popSpaceBackstack(): String? {
+        vectorPreferences.getSpaceBackstack().toMutableList().apply {
+            val poppedSpaceId = removeLast()
+            vectorPreferences.setSpaceBackstack(this)
+            return poppedSpaceId
+        }
+    }
+
+    override fun getSpaceBackstack() = vectorPreferences.getSpaceBackstack()
 
     override fun getSelectedSpaceFlow() = selectedSpaceFlow
 
diff --git a/vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt b/vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt
index d8ffde20ef..ec20de5914 100644
--- a/vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt
+++ b/vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt
@@ -19,19 +19,19 @@ package im.vector.app.core.animations
 import android.animation.Animator
 
 open class SimpleAnimatorListener : Animator.AnimatorListener {
-    override fun onAnimationRepeat(animation: Animator?) {
+    override fun onAnimationRepeat(animation: Animator) {
         // No op
     }
 
-    override fun onAnimationEnd(animation: Animator?) {
+    override fun onAnimationEnd(animation: Animator) {
         // No op
     }
 
-    override fun onAnimationCancel(animation: Animator?) {
+    override fun onAnimationCancel(animation: Animator) {
         // No op
     }
 
-    override fun onAnimationStart(animation: Animator?) {
+    override fun onAnimationStart(animation: Animator) {
         // No op
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/date/DateFormatKind.kt b/vector/src/main/java/im/vector/app/core/date/DateFormatKind.kt
index b08a1dc725..a66066ac8b 100644
--- a/vector/src/main/java/im/vector/app/core/date/DateFormatKind.kt
+++ b/vector/src/main/java/im/vector/app/core/date/DateFormatKind.kt
@@ -27,7 +27,7 @@ enum class DateFormatKind {
     // Will show hour or date relative (9:30am or yesterday or Sep 7 or 09/07/2020)
     ROOM_LIST,
 
-    // Will show full date (Sep 7 2020)
+    // Will show full date (Sep 7, 2020)
     TIMELINE_DAY_DIVIDER,
 
     // Will show full date and time (Mon, Sep 7 2020, 9:30am)
diff --git a/vector/src/main/java/im/vector/app/core/device/GetDeviceInfoUseCase.kt b/vector/src/main/java/im/vector/app/core/device/GetDeviceInfoUseCase.kt
new file mode 100644
index 0000000000..344173aab7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/device/GetDeviceInfoUseCase.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.device
+
+import im.vector.app.core.di.ActiveSessionHolder
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import javax.inject.Inject
+
+interface GetDeviceInfoUseCase {
+
+    fun execute(): CryptoDeviceInfo
+}
+
+class DefaultGetDeviceInfoUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder
+) : GetDeviceInfoUseCase {
+
+    override fun execute(): CryptoDeviceInfo {
+        return activeSessionHolder.getActiveSession().cryptoService().getMyDevice()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
index 7a1d613ab9..e698f65bf4 100644
--- a/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
@@ -17,11 +17,10 @@
 package im.vector.app.core.di
 
 import android.content.Context
-import arrow.core.Option
 import im.vector.app.ActiveSessionDataSource
-import im.vector.app.core.extensions.configureAndStart
-import im.vector.app.core.pushers.UnifiedPushHelper
+import im.vector.app.core.pushers.UnregisterUnifiedPushUseCase
 import im.vector.app.core.services.GuardServiceStarter
+import im.vector.app.core.session.ConfigureAndStartSessionUseCase
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
 import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
@@ -30,6 +29,8 @@ import im.vector.app.features.session.SessionListener
 import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOption
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
@@ -44,11 +45,12 @@ class ActiveSessionHolder @Inject constructor(
         private val pushRuleTriggerListener: PushRuleTriggerListener,
         private val sessionListener: SessionListener,
         private val imageManager: ImageManager,
-        private val unifiedPushHelper: UnifiedPushHelper,
         private val guardServiceStarter: GuardServiceStarter,
         private val sessionInitializer: SessionInitializer,
         private val applicationContext: Context,
         private val authenticationService: AuthenticationService,
+        private val configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase,
+        private val unregisterUnifiedPushUseCase: UnregisterUnifiedPushUseCase,
 ) {
 
     private var activeSessionReference: AtomicReference<Session?> = AtomicReference()
@@ -56,7 +58,7 @@ class ActiveSessionHolder @Inject constructor(
     fun setActiveSession(session: Session) {
         Timber.w("setActiveSession of ${session.myUserId}")
         activeSessionReference.set(session)
-        activeSessionDataSource.post(Option.just(session))
+        activeSessionDataSource.post(session.toOption())
 
         keyRequestHandler.start(session)
         incomingVerificationRequestHandler.start(session)
@@ -76,13 +78,13 @@ class ActiveSessionHolder @Inject constructor(
         }
 
         activeSessionReference.set(null)
-        activeSessionDataSource.post(Option.empty())
+        activeSessionDataSource.post(Optional.empty())
 
         keyRequestHandler.stop()
         incomingVerificationRequestHandler.stop()
         pushRuleTriggerListener.stop()
         // No need to unregister the pusher, the sign out will (should?) do it server side.
-        unifiedPushHelper.unregister(pushersManager = null)
+        unregisterUnifiedPushUseCase.execute(pushersManager = null)
         guardServiceStarter.stop()
     }
 
@@ -91,7 +93,7 @@ class ActiveSessionHolder @Inject constructor(
     }
 
     fun getSafeActiveSession(): Session? {
-        return runBlocking { getOrInitializeSession(startSync = true) }
+        return runBlocking { getOrInitializeSession() }
     }
 
     fun getActiveSession(): Session {
@@ -99,11 +101,12 @@ class ActiveSessionHolder @Inject constructor(
                 ?: throw IllegalStateException("You should authenticate before using this")
     }
 
-    suspend fun getOrInitializeSession(startSync: Boolean): Session? {
-        return activeSessionReference.get() ?: sessionInitializer.tryInitialize(readCurrentSession = { activeSessionReference.get() }) { session ->
-            setActiveSession(session)
-            session.configureAndStart(applicationContext, startSyncing = startSync)
-        }
+    suspend fun getOrInitializeSession(): Session? {
+        return activeSessionReference.get()
+                ?: sessionInitializer.tryInitialize(readCurrentSession = { activeSessionReference.get() }) { session ->
+                    setActiveSession(session)
+                    configureAndStartSessionUseCase.execute(session, startSyncing = false)
+                }
     }
 
     fun isWaitingForSessionInitialization() = activeSessionReference.get() == null && authenticationService.hasAuthenticatedSessions()
diff --git a/vector/src/main/java/im/vector/app/core/di/ActivityEntryPoint.kt b/vector/src/main/java/im/vector/app/core/di/ActivityEntryPoint.kt
index c5f7317ebe..4b8b23489b 100644
--- a/vector/src/main/java/im/vector/app/core/di/ActivityEntryPoint.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ActivityEntryPoint.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.core.di
 
-import androidx.fragment.app.FragmentFactory
 import androidx.lifecycle.ViewModelProvider
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
@@ -25,6 +24,5 @@ import dagger.hilt.android.components.ActivityComponent
 @InstallIn(ActivityComponent::class)
 @EntryPoint
 interface ActivityEntryPoint {
-    fun fragmentFactory(): FragmentFactory
     fun viewModelFactory(): ViewModelProvider.Factory
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt b/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
index a75b3fa46b..caa38d20d9 100644
--- a/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
@@ -44,12 +44,14 @@ object ConfigurationModule {
             else -> throw IllegalStateException("Unhandled build type: ${BuildConfig.BUILD_TYPE}")
         }
         return when (config) {
-            Analytics.Disabled -> AnalyticsConfig(isEnabled = false, "", "", "")
-            is Analytics.PostHog -> AnalyticsConfig(
+            Analytics.Disabled -> AnalyticsConfig(isEnabled = false, "", "", "", "", "")
+            is Analytics.Enabled -> AnalyticsConfig(
                     isEnabled = true,
                     postHogHost = config.postHogHost,
                     postHogApiKey = config.postHogApiKey,
-                    policyLink = config.policyLink
+                    policyLink = config.policyLink,
+                    sentryDSN = config.sentryDSN,
+                    sentryEnvironment = config.sentryEnvironment
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
deleted file mode 100644
index e86b350534..0000000000
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ /dev/null
@@ -1,1056 +0,0 @@
-/*
- * 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.
- *
- */
-
-package im.vector.app.core.di
-
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentFactory
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ActivityComponent
-import dagger.multibindings.IntoMap
-import im.vector.app.features.analytics.ui.consent.AnalyticsOptInFragment
-import im.vector.app.features.attachments.preview.AttachmentsPreviewFragment
-import im.vector.app.features.contactsbook.ContactsBookFragment
-import im.vector.app.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
-import im.vector.app.features.crypto.quads.SharedSecuredStorageKeyFragment
-import im.vector.app.features.crypto.quads.SharedSecuredStoragePassphraseFragment
-import im.vector.app.features.crypto.quads.SharedSecuredStorageResetAllFragment
-import im.vector.app.features.crypto.recover.BootstrapConclusionFragment
-import im.vector.app.features.crypto.recover.BootstrapConfirmPassphraseFragment
-import im.vector.app.features.crypto.recover.BootstrapEnterPassphraseFragment
-import im.vector.app.features.crypto.recover.BootstrapMigrateBackupFragment
-import im.vector.app.features.crypto.recover.BootstrapReAuthFragment
-import im.vector.app.features.crypto.recover.BootstrapSaveRecoveryKeyFragment
-import im.vector.app.features.crypto.recover.BootstrapSetupRecoveryKeyFragment
-import im.vector.app.features.crypto.recover.BootstrapWaitingFragment
-import im.vector.app.features.crypto.verification.QuadSLoadingFragment
-import im.vector.app.features.crypto.verification.cancel.VerificationCancelFragment
-import im.vector.app.features.crypto.verification.cancel.VerificationNotMeFragment
-import im.vector.app.features.crypto.verification.choose.VerificationChooseMethodFragment
-import im.vector.app.features.crypto.verification.conclusion.VerificationConclusionFragment
-import im.vector.app.features.crypto.verification.emoji.VerificationEmojiCodeFragment
-import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment
-import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment
-import im.vector.app.features.crypto.verification.request.VerificationRequestFragment
-import im.vector.app.features.devtools.RoomDevToolEditFragment
-import im.vector.app.features.devtools.RoomDevToolFragment
-import im.vector.app.features.devtools.RoomDevToolSendFormFragment
-import im.vector.app.features.devtools.RoomDevToolStateEventListFragment
-import im.vector.app.features.discovery.DiscoverySettingsFragment
-import im.vector.app.features.discovery.change.SetIdentityServerFragment
-import im.vector.app.features.home.HomeDetailFragment
-import im.vector.app.features.home.HomeDrawerFragment
-import im.vector.app.features.home.LoadingFragment
-import im.vector.app.features.home.NewHomeDetailFragment
-import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment
-import im.vector.app.features.home.room.detail.TimelineFragment
-import im.vector.app.features.home.room.detail.search.SearchFragment
-import im.vector.app.features.home.room.list.RoomListFragment
-import im.vector.app.features.home.room.list.home.HomeRoomListFragment
-import im.vector.app.features.home.room.threads.list.views.ThreadListFragment
-import im.vector.app.features.location.LocationSharingFragment
-import im.vector.app.features.location.preview.LocationPreviewFragment
-import im.vector.app.features.login.LoginCaptchaFragment
-import im.vector.app.features.login.LoginFragment
-import im.vector.app.features.login.LoginGenericTextInputFormFragment
-import im.vector.app.features.login.LoginResetPasswordFragment
-import im.vector.app.features.login.LoginResetPasswordMailConfirmationFragment
-import im.vector.app.features.login.LoginResetPasswordSuccessFragment
-import im.vector.app.features.login.LoginServerSelectionFragment
-import im.vector.app.features.login.LoginServerUrlFormFragment
-import im.vector.app.features.login.LoginSignUpSignInSelectionFragment
-import im.vector.app.features.login.LoginSplashFragment
-import im.vector.app.features.login.LoginWaitForEmailFragment
-import im.vector.app.features.login.LoginWebFragment
-import im.vector.app.features.login.terms.LoginTermsFragment
-import im.vector.app.features.login2.LoginCaptchaFragment2
-import im.vector.app.features.login2.LoginFragmentSigninPassword2
-import im.vector.app.features.login2.LoginFragmentSigninUsername2
-import im.vector.app.features.login2.LoginFragmentSignupPassword2
-import im.vector.app.features.login2.LoginFragmentSignupUsername2
-import im.vector.app.features.login2.LoginFragmentToAny2
-import im.vector.app.features.login2.LoginGenericTextInputFormFragment2
-import im.vector.app.features.login2.LoginResetPasswordFragment2
-import im.vector.app.features.login2.LoginResetPasswordMailConfirmationFragment2
-import im.vector.app.features.login2.LoginResetPasswordSuccessFragment2
-import im.vector.app.features.login2.LoginServerSelectionFragment2
-import im.vector.app.features.login2.LoginServerUrlFormFragment2
-import im.vector.app.features.login2.LoginSplashSignUpSignInSelectionFragment2
-import im.vector.app.features.login2.LoginSsoOnlyFragment2
-import im.vector.app.features.login2.LoginWaitForEmailFragment2
-import im.vector.app.features.login2.LoginWebFragment2
-import im.vector.app.features.login2.created.AccountCreatedFragment
-import im.vector.app.features.login2.terms.LoginTermsFragment2
-import im.vector.app.features.matrixto.MatrixToRoomSpaceFragment
-import im.vector.app.features.matrixto.MatrixToUserFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthAccountCreatedFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthCaptchaFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthChooseDisplayNameFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthChooseProfilePictureFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthCombinedLoginFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthCombinedRegisterFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthCombinedServerSelectionFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthEmailEntryFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthGenericTextInputFormFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthLegacyStyleCaptchaFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthLegacyWaitForEmailFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthLoginFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthPersonalizationCompleteFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthPhoneConfirmationFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthPhoneEntryFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthResetPasswordFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthResetPasswordMailConfirmationFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthResetPasswordSuccessFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthServerSelectionFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthSignUpSignInSelectionFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthSplashCarouselFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthSplashFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthUseCaseFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthWaitForEmailFragment
-import im.vector.app.features.onboarding.ftueauth.FtueAuthWebFragment
-import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthLegacyStyleTermsFragment
-import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthTermsFragment
-import im.vector.app.features.pin.PinFragment
-import im.vector.app.features.poll.create.CreatePollFragment
-import im.vector.app.features.qrcode.QrCodeScannerFragment
-import im.vector.app.features.reactions.EmojiChooserFragment
-import im.vector.app.features.reactions.EmojiSearchResultFragment
-import im.vector.app.features.roomdirectory.PublicRoomsFragment
-import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
-import im.vector.app.features.roomdirectory.picker.RoomDirectoryPickerFragment
-import im.vector.app.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
-import im.vector.app.features.roommemberprofile.RoomMemberProfileFragment
-import im.vector.app.features.roommemberprofile.devices.DeviceListFragment
-import im.vector.app.features.roommemberprofile.devices.DeviceTrustInfoActionFragment
-import im.vector.app.features.roomprofile.RoomProfileFragment
-import im.vector.app.features.roomprofile.alias.RoomAliasFragment
-import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment
-import im.vector.app.features.roomprofile.members.RoomMemberListFragment
-import im.vector.app.features.roomprofile.notifications.RoomNotificationSettingsFragment
-import im.vector.app.features.roomprofile.permissions.RoomPermissionsFragment
-import im.vector.app.features.roomprofile.settings.RoomSettingsFragment
-import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleFragment
-import im.vector.app.features.roomprofile.settings.joinrule.advanced.RoomJoinRuleChooseRestrictedFragment
-import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment
-import im.vector.app.features.roomprofile.uploads.files.RoomUploadsFilesFragment
-import im.vector.app.features.roomprofile.uploads.media.RoomUploadsMediaFragment
-import im.vector.app.features.settings.VectorSettingsGeneralFragment
-import im.vector.app.features.settings.VectorSettingsHelpAboutFragment
-import im.vector.app.features.settings.VectorSettingsLabsFragment
-import im.vector.app.features.settings.VectorSettingsPinFragment
-import im.vector.app.features.settings.VectorSettingsPreferencesFragment
-import im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment
-import im.vector.app.features.settings.account.deactivation.DeactivateAccountFragment
-import im.vector.app.features.settings.crosssigning.CrossSigningSettingsFragment
-import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment
-import im.vector.app.features.settings.devtools.AccountDataFragment
-import im.vector.app.features.settings.devtools.GossipingEventsPaperTrailFragment
-import im.vector.app.features.settings.devtools.IncomingKeyRequestListFragment
-import im.vector.app.features.settings.devtools.KeyRequestsFragment
-import im.vector.app.features.settings.devtools.OutgoingKeyRequestListFragment
-import im.vector.app.features.settings.font.FontScaleSettingFragment
-import im.vector.app.features.settings.homeserver.HomeserverSettingsFragment
-import im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment
-import im.vector.app.features.settings.legals.LegalsFragment
-import im.vector.app.features.settings.locale.LocalePickerFragment
-import im.vector.app.features.settings.notifications.VectorSettingsAdvancedNotificationPreferenceFragment
-import im.vector.app.features.settings.notifications.VectorSettingsNotificationPreferenceFragment
-import im.vector.app.features.settings.notifications.VectorSettingsNotificationsTroubleshootFragment
-import im.vector.app.features.settings.push.PushGatewaysFragment
-import im.vector.app.features.settings.push.PushRulesFragment
-import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
-import im.vector.app.features.share.IncomingShareFragment
-import im.vector.app.features.signout.soft.SoftLogoutFragment
-import im.vector.app.features.spaces.SpaceListFragment
-import im.vector.app.features.spaces.create.ChoosePrivateSpaceTypeFragment
-import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
-import im.vector.app.features.spaces.create.CreateSpaceAdd3pidInvitesFragment
-import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
-import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
-import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
-import im.vector.app.features.spaces.leave.SpaceLeaveAdvancedFragment
-import im.vector.app.features.spaces.manage.SpaceAddRoomFragment
-import im.vector.app.features.spaces.manage.SpaceManageRoomsFragment
-import im.vector.app.features.spaces.manage.SpaceSettingsFragment
-import im.vector.app.features.spaces.people.SpacePeopleFragment
-import im.vector.app.features.spaces.preview.SpacePreviewFragment
-import im.vector.app.features.terms.ReviewTermsFragment
-import im.vector.app.features.usercode.ShowUserCodeFragment
-import im.vector.app.features.userdirectory.UserListFragment
-import im.vector.app.features.widgets.WidgetFragment
-
-@InstallIn(ActivityComponent::class)
-@Module
-interface FragmentModule {
-    /**
-     * Fragments with @IntoMap will be injected by this factory.
-     */
-    @Binds
-    fun bindFragmentFactory(factory: VectorFragmentFactory): FragmentFactory
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomListFragment::class)
-    fun bindRoomListFragment(fragment: RoomListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LocalePickerFragment::class)
-    fun bindLocalePickerFragment(fragment: LocalePickerFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SpaceListFragment::class)
-    fun bindSpaceListFragment(fragment: SpaceListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(TimelineFragment::class)
-    fun bindTimelineFragment(fragment: TimelineFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomDirectoryPickerFragment::class)
-    fun bindRoomDirectoryPickerFragment(fragment: RoomDirectoryPickerFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(CreateRoomFragment::class)
-    fun bindCreateRoomFragment(fragment: CreateRoomFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomPreviewNoPreviewFragment::class)
-    fun bindRoomPreviewNoPreviewFragment(fragment: RoomPreviewNoPreviewFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(KeysBackupSettingsFragment::class)
-    fun bindKeysBackupSettingsFragment(fragment: KeysBackupSettingsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoadingFragment::class)
-    fun bindLoadingFragment(fragment: LoadingFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(HomeDrawerFragment::class)
-    fun bindHomeDrawerFragment(fragment: HomeDrawerFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(HomeDetailFragment::class)
-    fun bindHomeDetailFragment(fragment: HomeDetailFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(NewHomeDetailFragment::class)
-    fun bindNewHomeDetailFragment(fragment: NewHomeDetailFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(EmojiSearchResultFragment::class)
-    fun bindEmojiSearchResultFragment(fragment: EmojiSearchResultFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginFragment::class)
-    fun bindLoginFragment(fragment: LoginFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginCaptchaFragment::class)
-    fun bindLoginCaptchaFragment(fragment: LoginCaptchaFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginTermsFragment::class)
-    fun bindLoginTermsFragment(fragment: LoginTermsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginServerUrlFormFragment::class)
-    fun bindLoginServerUrlFormFragment(fragment: LoginServerUrlFormFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginResetPasswordMailConfirmationFragment::class)
-    fun bindLoginResetPasswordMailConfirmationFragment(fragment: LoginResetPasswordMailConfirmationFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginResetPasswordFragment::class)
-    fun bindLoginResetPasswordFragment(fragment: LoginResetPasswordFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginResetPasswordSuccessFragment::class)
-    fun bindLoginResetPasswordSuccessFragment(fragment: LoginResetPasswordSuccessFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginServerSelectionFragment::class)
-    fun bindLoginServerSelectionFragment(fragment: LoginServerSelectionFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginSignUpSignInSelectionFragment::class)
-    fun bindLoginSignUpSignInSelectionFragment(fragment: LoginSignUpSignInSelectionFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginSplashFragment::class)
-    fun bindLoginSplashFragment(fragment: LoginSplashFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginWebFragment::class)
-    fun bindLoginWebFragment(fragment: LoginWebFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginGenericTextInputFormFragment::class)
-    fun bindLoginGenericTextInputFormFragment(fragment: LoginGenericTextInputFormFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginWaitForEmailFragment::class)
-    fun bindLoginWaitForEmailFragment(fragment: LoginWaitForEmailFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginFragmentSigninUsername2::class)
-    fun bindLoginFragmentSigninUsername2(fragment: LoginFragmentSigninUsername2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(AccountCreatedFragment::class)
-    fun bindAccountCreatedFragment(fragment: AccountCreatedFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginFragmentSignupUsername2::class)
-    fun bindLoginFragmentSignupUsername2(fragment: LoginFragmentSignupUsername2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginFragmentSigninPassword2::class)
-    fun bindLoginFragmentSigninPassword2(fragment: LoginFragmentSigninPassword2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginFragmentSignupPassword2::class)
-    fun bindLoginFragmentSignupPassword2(fragment: LoginFragmentSignupPassword2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginCaptchaFragment2::class)
-    fun bindLoginCaptchaFragment2(fragment: LoginCaptchaFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginFragmentToAny2::class)
-    fun bindLoginFragmentToAny2(fragment: LoginFragmentToAny2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginTermsFragment2::class)
-    fun bindLoginTermsFragment2(fragment: LoginTermsFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginServerUrlFormFragment2::class)
-    fun bindLoginServerUrlFormFragment2(fragment: LoginServerUrlFormFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginResetPasswordMailConfirmationFragment2::class)
-    fun bindLoginResetPasswordMailConfirmationFragment2(fragment: LoginResetPasswordMailConfirmationFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginResetPasswordFragment2::class)
-    fun bindLoginResetPasswordFragment2(fragment: LoginResetPasswordFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginResetPasswordSuccessFragment2::class)
-    fun bindLoginResetPasswordSuccessFragment2(fragment: LoginResetPasswordSuccessFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginServerSelectionFragment2::class)
-    fun bindLoginServerSelectionFragment2(fragment: LoginServerSelectionFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginSsoOnlyFragment2::class)
-    fun bindLoginSsoOnlyFragment2(fragment: LoginSsoOnlyFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginSplashSignUpSignInSelectionFragment2::class)
-    fun bindLoginSplashSignUpSignInSelectionFragment2(fragment: LoginSplashSignUpSignInSelectionFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginWebFragment2::class)
-    fun bindLoginWebFragment2(fragment: LoginWebFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginGenericTextInputFormFragment2::class)
-    fun bindLoginGenericTextInputFormFragment2(fragment: LoginGenericTextInputFormFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LoginWaitForEmailFragment2::class)
-    fun bindLoginWaitForEmailFragment2(fragment: LoginWaitForEmailFragment2): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthLegacyStyleCaptchaFragment::class)
-    fun bindFtueAuthLegacyStyleCaptchaFragment(fragment: FtueAuthLegacyStyleCaptchaFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthCaptchaFragment::class)
-    fun bindFtueAuthCaptchaFragment(fragment: FtueAuthCaptchaFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthGenericTextInputFormFragment::class)
-    fun bindFtueAuthGenericTextInputFormFragment(fragment: FtueAuthGenericTextInputFormFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthLoginFragment::class)
-    fun bindFtueAuthLoginFragment(fragment: FtueAuthLoginFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthResetPasswordFragment::class)
-    fun bindFtueAuthResetPasswordFragment(fragment: FtueAuthResetPasswordFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthResetPasswordMailConfirmationFragment::class)
-    fun bindFtueAuthResetPasswordMailConfirmationFragment(fragment: FtueAuthResetPasswordMailConfirmationFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthResetPasswordSuccessFragment::class)
-    fun bindFtueAuthResetPasswordSuccessFragment(fragment: FtueAuthResetPasswordSuccessFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthServerSelectionFragment::class)
-    fun bindFtueAuthServerSelectionFragment(fragment: FtueAuthServerSelectionFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthSignUpSignInSelectionFragment::class)
-    fun bindFtueAuthSignUpSignInSelectionFragment(fragment: FtueAuthSignUpSignInSelectionFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthSplashFragment::class)
-    fun bindFtueAuthSplashFragment(fragment: FtueAuthSplashFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthSplashCarouselFragment::class)
-    fun bindFtueAuthSplashCarouselFragment(fragment: FtueAuthSplashCarouselFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthUseCaseFragment::class)
-    fun bindFtueAuthUseCaseFragment(fragment: FtueAuthUseCaseFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthWaitForEmailFragment::class)
-    fun bindFtueAuthWaitForEmailFragment(fragment: FtueAuthWaitForEmailFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthLegacyWaitForEmailFragment::class)
-    fun bindFtueAuthLegacyWaitForEmailFragment(fragment: FtueAuthLegacyWaitForEmailFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthWebFragment::class)
-    fun bindFtueAuthWebFragment(fragment: FtueAuthWebFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthLegacyStyleTermsFragment::class)
-    fun bindFtueAuthLegacyStyleTermsFragment(fragment: FtueAuthLegacyStyleTermsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthTermsFragment::class)
-    fun bindFtueAuthTermsFragment(fragment: FtueAuthTermsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthAccountCreatedFragment::class)
-    fun bindFtueAuthAccountCreatedFragment(fragment: FtueAuthAccountCreatedFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthEmailEntryFragment::class)
-    fun bindFtueAuthEmailEntryFragment(fragment: FtueAuthEmailEntryFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthPhoneEntryFragment::class)
-    fun bindFtueAuthPhoneEntryFragment(fragment: FtueAuthPhoneEntryFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthPhoneConfirmationFragment::class)
-    fun bindFtueAuthPhoneConfirmationFragment(fragment: FtueAuthPhoneConfirmationFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthChooseDisplayNameFragment::class)
-    fun bindFtueAuthChooseDisplayNameFragment(fragment: FtueAuthChooseDisplayNameFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthChooseProfilePictureFragment::class)
-    fun bindFtueAuthChooseProfilePictureFragment(fragment: FtueAuthChooseProfilePictureFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthPersonalizationCompleteFragment::class)
-    fun bindFtueAuthPersonalizationCompleteFragment(fragment: FtueAuthPersonalizationCompleteFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthCombinedLoginFragment::class)
-    fun bindFtueAuthCombinedLoginFragment(fragment: FtueAuthCombinedLoginFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthCombinedRegisterFragment::class)
-    fun bindFtueAuthCombinedRegisterFragment(fragment: FtueAuthCombinedRegisterFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FtueAuthCombinedServerSelectionFragment::class)
-    fun bindFtueAuthCombinedServerSelectionFragment(fragment: FtueAuthCombinedServerSelectionFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(UserListFragment::class)
-    fun bindUserListFragment(fragment: UserListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(PushGatewaysFragment::class)
-    fun bindPushGatewaysFragment(fragment: PushGatewaysFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsNotificationsTroubleshootFragment::class)
-    fun bindVectorSettingsNotificationsTroubleshootFragment(fragment: VectorSettingsNotificationsTroubleshootFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsAdvancedNotificationPreferenceFragment::class)
-    fun bindVectorSettingsAdvancedNotificationPreferenceFragment(fragment: VectorSettingsAdvancedNotificationPreferenceFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsNotificationPreferenceFragment::class)
-    fun bindVectorSettingsNotificationPreferenceFragment(fragment: VectorSettingsNotificationPreferenceFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsLabsFragment::class)
-    fun bindVectorSettingsLabsFragment(fragment: VectorSettingsLabsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(HomeserverSettingsFragment::class)
-    fun bindHomeserverSettingsFragment(fragment: HomeserverSettingsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(FontScaleSettingFragment::class)
-    fun bindFontScaleSettingFragment(fragment: FontScaleSettingFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsPinFragment::class)
-    fun bindVectorSettingsPinFragment(fragment: VectorSettingsPinFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsGeneralFragment::class)
-    fun bindVectorSettingsGeneralFragment(fragment: VectorSettingsGeneralFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(PushRulesFragment::class)
-    fun bindPushRulesFragment(fragment: PushRulesFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsPreferencesFragment::class)
-    fun bindVectorSettingsPreferencesFragment(fragment: VectorSettingsPreferencesFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsSecurityPrivacyFragment::class)
-    fun bindVectorSettingsSecurityPrivacyFragment(fragment: VectorSettingsSecurityPrivacyFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsHelpAboutFragment::class)
-    fun bindVectorSettingsHelpAboutFragment(fragment: VectorSettingsHelpAboutFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsIgnoredUsersFragment::class)
-    fun bindVectorSettingsIgnoredUsersFragment(fragment: VectorSettingsIgnoredUsersFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VectorSettingsDevicesFragment::class)
-    fun bindVectorSettingsDevicesFragment(fragment: VectorSettingsDevicesFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(ThreePidsSettingsFragment::class)
-    fun bindThreePidsSettingsFragment(fragment: ThreePidsSettingsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(PublicRoomsFragment::class)
-    fun bindPublicRoomsFragment(fragment: PublicRoomsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomProfileFragment::class)
-    fun bindRoomProfileFragment(fragment: RoomProfileFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomMemberListFragment::class)
-    fun bindRoomMemberListFragment(fragment: RoomMemberListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomUploadsFragment::class)
-    fun bindRoomUploadsFragment(fragment: RoomUploadsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomUploadsMediaFragment::class)
-    fun bindRoomUploadsMediaFragment(fragment: RoomUploadsMediaFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomUploadsFilesFragment::class)
-    fun bindRoomUploadsFilesFragment(fragment: RoomUploadsFilesFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomSettingsFragment::class)
-    fun bindRoomSettingsFragment(fragment: RoomSettingsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomAliasFragment::class)
-    fun bindRoomAliasFragment(fragment: RoomAliasFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomPermissionsFragment::class)
-    fun bindRoomPermissionsFragment(fragment: RoomPermissionsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomMemberProfileFragment::class)
-    fun bindRoomMemberProfileFragment(fragment: RoomMemberProfileFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(BreadcrumbsFragment::class)
-    fun bindBreadcrumbsFragment(fragment: BreadcrumbsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(AnalyticsOptInFragment::class)
-    fun bindAnalyticsOptInFragment(fragment: AnalyticsOptInFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(EmojiChooserFragment::class)
-    fun bindEmojiChooserFragment(fragment: EmojiChooserFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SoftLogoutFragment::class)
-    fun bindSoftLogoutFragment(fragment: SoftLogoutFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VerificationRequestFragment::class)
-    fun bindVerificationRequestFragment(fragment: VerificationRequestFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VerificationChooseMethodFragment::class)
-    fun bindVerificationChooseMethodFragment(fragment: VerificationChooseMethodFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VerificationEmojiCodeFragment::class)
-    fun bindVerificationEmojiCodeFragment(fragment: VerificationEmojiCodeFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VerificationQrScannedByOtherFragment::class)
-    fun bindVerificationQrScannedByOtherFragment(fragment: VerificationQrScannedByOtherFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VerificationQRWaitingFragment::class)
-    fun bindVerificationQRWaitingFragment(fragment: VerificationQRWaitingFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VerificationConclusionFragment::class)
-    fun bindVerificationConclusionFragment(fragment: VerificationConclusionFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VerificationCancelFragment::class)
-    fun bindVerificationCancelFragment(fragment: VerificationCancelFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(QuadSLoadingFragment::class)
-    fun bindQuadSLoadingFragment(fragment: QuadSLoadingFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(VerificationNotMeFragment::class)
-    fun bindVerificationNotMeFragment(fragment: VerificationNotMeFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(QrCodeScannerFragment::class)
-    fun bindQrCodeScannerFragment(fragment: QrCodeScannerFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(DeviceListFragment::class)
-    fun bindDeviceListFragment(fragment: DeviceListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(DeviceTrustInfoActionFragment::class)
-    fun bindDeviceTrustInfoActionFragment(fragment: DeviceTrustInfoActionFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(CrossSigningSettingsFragment::class)
-    fun bindCrossSigningSettingsFragment(fragment: CrossSigningSettingsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(AttachmentsPreviewFragment::class)
-    fun bindAttachmentsPreviewFragment(fragment: AttachmentsPreviewFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(IncomingShareFragment::class)
-    fun bindIncomingShareFragment(fragment: IncomingShareFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(AccountDataFragment::class)
-    fun bindAccountDataFragment(fragment: AccountDataFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(OutgoingKeyRequestListFragment::class)
-    fun bindOutgoingKeyRequestListFragment(fragment: OutgoingKeyRequestListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(IncomingKeyRequestListFragment::class)
-    fun bindIncomingKeyRequestListFragment(fragment: IncomingKeyRequestListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(KeyRequestsFragment::class)
-    fun bindKeyRequestsFragment(fragment: KeyRequestsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(GossipingEventsPaperTrailFragment::class)
-    fun bindGossipingEventsPaperTrailFragment(fragment: GossipingEventsPaperTrailFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(BootstrapEnterPassphraseFragment::class)
-    fun bindBootstrapEnterPassphraseFragment(fragment: BootstrapEnterPassphraseFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(BootstrapConfirmPassphraseFragment::class)
-    fun bindBootstrapConfirmPassphraseFragment(fragment: BootstrapConfirmPassphraseFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(BootstrapWaitingFragment::class)
-    fun bindBootstrapWaitingFragment(fragment: BootstrapWaitingFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(BootstrapSetupRecoveryKeyFragment::class)
-    fun bindBootstrapSetupRecoveryKeyFragment(fragment: BootstrapSetupRecoveryKeyFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(BootstrapSaveRecoveryKeyFragment::class)
-    fun bindBootstrapSaveRecoveryKeyFragment(fragment: BootstrapSaveRecoveryKeyFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(BootstrapConclusionFragment::class)
-    fun bindBootstrapConclusionFragment(fragment: BootstrapConclusionFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(BootstrapReAuthFragment::class)
-    fun bindBootstrapReAuthFragment(fragment: BootstrapReAuthFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(BootstrapMigrateBackupFragment::class)
-    fun bindBootstrapMigrateBackupFragment(fragment: BootstrapMigrateBackupFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(DeactivateAccountFragment::class)
-    fun bindDeactivateAccountFragment(fragment: DeactivateAccountFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SharedSecuredStoragePassphraseFragment::class)
-    fun bindSharedSecuredStoragePassphraseFragment(fragment: SharedSecuredStoragePassphraseFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SharedSecuredStorageKeyFragment::class)
-    fun bindSharedSecuredStorageKeyFragment(fragment: SharedSecuredStorageKeyFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SharedSecuredStorageResetAllFragment::class)
-    fun bindSharedSecuredStorageResetAllFragment(fragment: SharedSecuredStorageResetAllFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SetIdentityServerFragment::class)
-    fun bindSetIdentityServerFragment(fragment: SetIdentityServerFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(DiscoverySettingsFragment::class)
-    fun bindDiscoverySettingsFragment(fragment: DiscoverySettingsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LegalsFragment::class)
-    fun bindLegalsFragment(fragment: LegalsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(ReviewTermsFragment::class)
-    fun bindReviewTermsFragment(fragment: ReviewTermsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(WidgetFragment::class)
-    fun bindWidgetFragment(fragment: WidgetFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(ContactsBookFragment::class)
-    fun bindPhoneBookFragment(fragment: ContactsBookFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(PinFragment::class)
-    fun bindPinFragment(fragment: PinFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomBannedMemberListFragment::class)
-    fun bindRoomBannedMemberListFragment(fragment: RoomBannedMemberListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomNotificationSettingsFragment::class)
-    fun bindRoomNotificationSettingsFragment(fragment: RoomNotificationSettingsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SearchFragment::class)
-    fun bindSearchFragment(fragment: SearchFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(ShowUserCodeFragment::class)
-    fun bindShowUserCodeFragment(fragment: ShowUserCodeFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomDevToolFragment::class)
-    fun bindRoomDevToolFragment(fragment: RoomDevToolFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomDevToolStateEventListFragment::class)
-    fun bindRoomDevToolStateEventListFragment(fragment: RoomDevToolStateEventListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomDevToolEditFragment::class)
-    fun bindRoomDevToolEditFragment(fragment: RoomDevToolEditFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomDevToolSendFormFragment::class)
-    fun bindRoomDevToolSendFormFragment(fragment: RoomDevToolSendFormFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SpacePreviewFragment::class)
-    fun bindSpacePreviewFragment(fragment: SpacePreviewFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(ChooseSpaceTypeFragment::class)
-    fun bindChooseSpaceTypeFragment(fragment: ChooseSpaceTypeFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(CreateSpaceDetailsFragment::class)
-    fun bindCreateSpaceDetailsFragment(fragment: CreateSpaceDetailsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(CreateSpaceDefaultRoomsFragment::class)
-    fun bindCreateSpaceDefaultRoomsFragment(fragment: CreateSpaceDefaultRoomsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(MatrixToUserFragment::class)
-    fun bindMatrixToUserFragment(fragment: MatrixToUserFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(MatrixToRoomSpaceFragment::class)
-    fun bindMatrixToRoomSpaceFragment(fragment: MatrixToRoomSpaceFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SpaceDirectoryFragment::class)
-    fun bindSpaceDirectoryFragment(fragment: SpaceDirectoryFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(ChoosePrivateSpaceTypeFragment::class)
-    fun bindChoosePrivateSpaceTypeFragment(fragment: ChoosePrivateSpaceTypeFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(CreateSpaceAdd3pidInvitesFragment::class)
-    fun bindCreateSpaceAdd3pidInvitesFragment(fragment: CreateSpaceAdd3pidInvitesFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SpaceAddRoomFragment::class)
-    fun bindSpaceAddRoomFragment(fragment: SpaceAddRoomFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SpacePeopleFragment::class)
-    fun bindSpacePeopleFragment(fragment: SpacePeopleFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SpaceSettingsFragment::class)
-    fun bindSpaceSettingsFragment(fragment: SpaceSettingsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SpaceManageRoomsFragment::class)
-    fun bindSpaceManageRoomsFragment(fragment: SpaceManageRoomsFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomJoinRuleFragment::class)
-    fun bindRoomJoinRuleFragment(fragment: RoomJoinRuleFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(RoomJoinRuleChooseRestrictedFragment::class)
-    fun bindRoomJoinRuleChooseRestrictedFragment(fragment: RoomJoinRuleChooseRestrictedFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(SpaceLeaveAdvancedFragment::class)
-    fun bindSpaceLeaveAdvancedFragment(fragment: SpaceLeaveAdvancedFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(ThreadListFragment::class)
-    fun bindThreadListFragment(fragment: ThreadListFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(CreatePollFragment::class)
-    fun bindCreatePollFragment(fragment: CreatePollFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LocationSharingFragment::class)
-    fun bindLocationSharingFragment(fragment: LocationSharingFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(LocationPreviewFragment::class)
-    fun bindLocationPreviewFragment(fragment: LocationPreviewFragment): Fragment
-
-    @Binds
-    @IntoMap
-    @FragmentKey(HomeRoomListFragment::class)
-    fun binHomeRoomListFragment(fragment: HomeRoomListFragment): Fragment
-}
diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
index 331b4afa18..d22ab51e7a 100644
--- a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
@@ -22,6 +22,7 @@ import dagger.hilt.InstallIn
 import dagger.multibindings.IntoMap
 import im.vector.app.features.analytics.accountdata.AnalyticsAccountDataViewModel
 import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewModel
+import im.vector.app.features.attachments.AttachmentTypeSelectorViewModel
 import im.vector.app.features.auth.ReAuthViewModel
 import im.vector.app.features.call.VectorCallViewModel
 import im.vector.app.features.call.conference.JitsiCallViewModel
@@ -45,6 +46,7 @@ import im.vector.app.features.home.UserColorAccountDataViewModel
 import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsViewModel
 import im.vector.app.features.home.room.detail.TimelineViewModel
 import im.vector.app.features.home.room.detail.composer.MessageComposerViewModel
+import im.vector.app.features.home.room.detail.composer.link.SetLinkViewModel
 import im.vector.app.features.home.room.detail.search.SearchViewModel
 import im.vector.app.features.home.room.detail.timeline.action.MessageActionsViewModel
 import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryViewModel
@@ -52,14 +54,15 @@ import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsV
 import im.vector.app.features.home.room.detail.upgrade.MigrateRoomViewModel
 import im.vector.app.features.home.room.list.RoomListViewModel
 import im.vector.app.features.home.room.list.home.HomeRoomListViewModel
+import im.vector.app.features.home.room.list.home.invites.InvitesViewModel
+import im.vector.app.features.home.room.list.home.release.ReleaseNotesViewModel
 import im.vector.app.features.homeserver.HomeServerCapabilitiesViewModel
 import im.vector.app.features.invite.InviteUsersToRoomViewModel
 import im.vector.app.features.location.LocationSharingViewModel
 import im.vector.app.features.location.live.map.LiveLocationMapViewModel
 import im.vector.app.features.location.preview.LocationPreviewViewModel
 import im.vector.app.features.login.LoginViewModel
-import im.vector.app.features.login2.LoginViewModel2
-import im.vector.app.features.login2.created.AccountCreatedViewModel
+import im.vector.app.features.login.qr.QrCodeLoginViewModel
 import im.vector.app.features.matrixto.MatrixToBottomSheetViewModel
 import im.vector.app.features.media.VectorAttachmentViewerViewModel
 import im.vector.app.features.onboarding.OnboardingViewModel
@@ -88,6 +91,11 @@ import im.vector.app.features.settings.account.deactivation.DeactivateAccountVie
 import im.vector.app.features.settings.crosssigning.CrossSigningSettingsViewModel
 import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheetViewModel
 import im.vector.app.features.settings.devices.DevicesViewModel
+import im.vector.app.features.settings.devices.v2.details.SessionDetailsViewModel
+import im.vector.app.features.settings.devices.v2.more.SessionLearnMoreViewModel
+import im.vector.app.features.settings.devices.v2.othersessions.OtherSessionsViewModel
+import im.vector.app.features.settings.devices.v2.overview.SessionOverviewViewModel
+import im.vector.app.features.settings.devices.v2.rename.RenameSessionViewModel
 import im.vector.app.features.settings.devtools.AccountDataViewModel
 import im.vector.app.features.settings.devtools.GossipingEventsPaperTrailViewModel
 import im.vector.app.features.settings.devtools.KeyRequestListViewModel
@@ -95,8 +103,10 @@ import im.vector.app.features.settings.devtools.KeyRequestViewModel
 import im.vector.app.features.settings.font.FontScaleSettingViewModel
 import im.vector.app.features.settings.homeserver.HomeserverSettingsViewModel
 import im.vector.app.features.settings.ignored.IgnoredUsersViewModel
+import im.vector.app.features.settings.labs.VectorSettingsLabsViewModel
 import im.vector.app.features.settings.legals.LegalsViewModel
 import im.vector.app.features.settings.locale.LocalePickerViewModel
+import im.vector.app.features.settings.notifications.VectorSettingsNotificationPreferenceViewModel
 import im.vector.app.features.settings.push.PushGatewaysViewModel
 import im.vector.app.features.settings.threepids.ThreePidsSettingsViewModel
 import im.vector.app.features.share.IncomingShareViewModel
@@ -351,6 +361,11 @@ interface MavericksViewModelModule {
     @MavericksViewModelKey(DevicesViewModel::class)
     fun devicesViewModelFactory(factory: DevicesViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(im.vector.app.features.settings.devices.v2.DevicesViewModel::class)
+    fun devicesViewModelV2Factory(factory: im.vector.app.features.settings.devices.v2.DevicesViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
     @Binds
     @IntoMap
     @MavericksViewModelKey(KeyRequestListViewModel::class)
@@ -456,21 +471,11 @@ interface MavericksViewModelModule {
     @MavericksViewModelKey(MatrixToBottomSheetViewModel::class)
     fun matrixToBottomSheetViewModelFactory(factory: MatrixToBottomSheetViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 
-    @Binds
-    @IntoMap
-    @MavericksViewModelKey(AccountCreatedViewModel::class)
-    fun accountCreatedViewModelFactory(factory: AccountCreatedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
-
     @Binds
     @IntoMap
     @MavericksViewModelKey(OnboardingViewModel::class)
     fun onboardingViewModelFactory(factory: OnboardingViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 
-    @Binds
-    @IntoMap
-    @MavericksViewModelKey(LoginViewModel2::class)
-    fun loginViewModel2Factory(factory: LoginViewModel2.Factory): MavericksAssistedViewModelFactory<*, *>
-
     @Binds
     @IntoMap
     @MavericksViewModelKey(LoginViewModel::class)
@@ -630,4 +635,66 @@ interface MavericksViewModelModule {
     @IntoMap
     @MavericksViewModelKey(HomeRoomListViewModel::class)
     fun homeRoomListViewModel(factory: HomeRoomListViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(InvitesViewModel::class)
+    fun invitesViewModel(factory: InvitesViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(ReleaseNotesViewModel::class)
+    fun releaseNotesViewModel(factory: ReleaseNotesViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(SessionOverviewViewModel::class)
+    fun sessionOverviewViewModelFactory(factory: SessionOverviewViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(OtherSessionsViewModel::class)
+    fun otherSessionsViewModelFactory(factory: OtherSessionsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(SessionDetailsViewModel::class)
+    fun sessionDetailsViewModelFactory(factory: SessionDetailsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(RenameSessionViewModel::class)
+    fun renameSessionViewModelFactory(factory: RenameSessionViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(QrCodeLoginViewModel::class)
+    fun qrCodeLoginViewModelFactory(factory: QrCodeLoginViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(SessionLearnMoreViewModel::class)
+    fun sessionLearnMoreViewModelFactory(factory: SessionLearnMoreViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(VectorSettingsLabsViewModel::class)
+    fun vectorSettingsLabsViewModelFactory(factory: VectorSettingsLabsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(AttachmentTypeSelectorViewModel::class)
+    fun attachmentTypeSelectorViewModelFactory(factory: AttachmentTypeSelectorViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(VectorSettingsNotificationPreferenceViewModel::class)
+    fun vectorSettingsNotificationPreferenceViewModelFactory(
+            factory: VectorSettingsNotificationPreferenceViewModel.Factory
+    ): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(SetLinkViewModel::class)
+    fun setLinkViewModelFactory(factory: SetLinkViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt b/vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt
deleted file mode 100644
index f761d99114..0000000000
--- a/vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- *
- */
-
-package im.vector.app.core.di
-
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentFactory
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-/**
- * FragmentFactory which uses Dagger to create the instances.
- */
-class VectorFragmentFactory @Inject constructor(
-        private val creators: @JvmSuppressWildcards Map<Class<out Fragment>, Provider<Fragment>>
-) : FragmentFactory() {
-
-    override fun instantiate(classLoader: ClassLoader, className: String): Fragment {
-        val fragmentClass = loadFragmentClass(classLoader, className)
-        val creator: Provider<out Fragment>? = creators[fragmentClass]
-        return if (creator == null) {
-            Timber.v("Unknown model class: $className, fallback to default instance")
-            super.instantiate(classLoader, className)
-        } else {
-            creator.get()
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt b/vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt
index ded2a562c5..a14b12e7a5 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt
@@ -37,9 +37,7 @@ class VectorViewModelFactory @Inject constructor(
                 }
             }
         }
-        if (creator == null) {
-            throw IllegalArgumentException("Unknown model class: $modelClass")
-        }
+        require(creator != null) { "Unknown model class: $modelClass" }
         try {
             @Suppress("UNCHECKED_CAST")
             return creator.get() as T
diff --git a/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
index d90e934d0a..c08f939524 100644
--- a/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
@@ -34,6 +34,7 @@ import im.vector.app.features.home.HomeSharedActionViewModel
 import im.vector.app.features.home.room.detail.RoomDetailSharedActionViewModel
 import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
+import im.vector.app.features.home.room.list.actions.RoomListSharedActionViewModel
 import im.vector.app.features.reactions.EmojiChooserViewModel
 import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
 import im.vector.app.features.roomprofile.RoomProfileSharedActionViewModel
@@ -157,4 +158,9 @@ interface ViewModelModule {
     @IntoMap
     @ViewModelKey(SpacePeopleSharedActionViewModel::class)
     fun bindSpacePeopleSharedActionViewModel(viewModel: SpacePeopleSharedActionViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(RoomListSharedActionViewModel::class)
+    fun bindRoomListSharedActionViewModel(viewModel: RoomListSharedActionViewModel): ViewModel
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/VoiceModule.kt b/vector/src/main/java/im/vector/app/core/di/VoiceModule.kt
new file mode 100644
index 0000000000..40fb4ecea7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/VoiceModule.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.di
+
+import android.content.Context
+import android.os.Build
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import im.vector.app.features.voicebroadcast.listening.VoiceBroadcastPlayer
+import im.vector.app.features.voicebroadcast.listening.VoiceBroadcastPlayerImpl
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorderQ
+import im.vector.app.features.voicebroadcast.usecase.GetVoiceBroadcastStateEventLiveUseCase
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+abstract class VoiceModule {
+
+    companion object {
+        @Provides
+        @Singleton
+        fun providesVoiceBroadcastRecorder(
+                context: Context,
+                sessionHolder: ActiveSessionHolder,
+                getVoiceBroadcastStateEventLiveUseCase: GetVoiceBroadcastStateEventLiveUseCase,
+        ): VoiceBroadcastRecorder? {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                VoiceBroadcastRecorderQ(
+                        context = context,
+                        sessionHolder = sessionHolder,
+                        getVoiceBroadcastEventUseCase = getVoiceBroadcastStateEventLiveUseCase
+                )
+            } else {
+                null
+            }
+        }
+    }
+
+    @Binds
+    abstract fun bindVoiceBroadcastPlayer(player: VoiceBroadcastPlayerImpl): VoiceBroadcastPlayer
+}
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelperFactory.kt b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelperFactory.kt
new file mode 100644
index 0000000000..0e8dc1d0d1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelperFactory.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.dialogs
+
+import androidx.fragment.app.Fragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
+import javax.inject.Inject
+
+/**
+ * Factory for [GalleryOrCameraDialogHelper].
+ */
+class GalleryOrCameraDialogHelperFactory @Inject constructor(
+        private val colorProvider: ColorProvider,
+        private val clock: Clock,
+) {
+    fun create(fragment: Fragment): GalleryOrCameraDialogHelper {
+        return GalleryOrCameraDialogHelper(fragment, colorProvider, clock)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt b/vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt
index dfbdfff2b8..b1d641826e 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt
@@ -21,6 +21,7 @@ import android.os.Parcelable
 import androidx.recyclerview.widget.RecyclerView
 import im.vector.app.core.platform.DefaultListUpdateCallback
 import im.vector.app.core.platform.Restorable
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import java.util.concurrent.atomic.AtomicReference
 
 private const val LAYOUT_MANAGER_STATE = "LAYOUT_MANAGER_STATE"
@@ -44,7 +45,7 @@ class LayoutManagerStateRestorer(layoutManager: RecyclerView.LayoutManager) : Re
     }
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
-        val parcelable = savedInstanceState?.getParcelable<Parcelable>(LAYOUT_MANAGER_STATE)
+        val parcelable = savedInstanceState?.getParcelableCompat<Parcelable>(LAYOUT_MANAGER_STATE)
         layoutManagerState.set(parcelable)
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
index 9c5ad49339..ef22aba624 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
@@ -26,7 +26,7 @@ import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.AvatarRenderer
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
 import org.matrix.android.sdk.api.util.MatrixItem
 
 abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder>(@LayoutRes layoutId: Int) : VectorEpoxyModel<T>(layoutId) {
@@ -35,7 +35,7 @@ abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder>(@LayoutRes la
     @EpoxyAttribute var editable: Boolean = true
 
     @EpoxyAttribute
-    var userEncryptionTrustLevel: RoomEncryptionTrustLevel? = null
+    var userVerificationLevel: UserVerificationLevel? = null
 
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var clickListener: ClickListener? = null
@@ -53,6 +53,6 @@ abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder>(@LayoutRes la
         holder.subtitleView.setTextOrHide(matrixId)
         holder.editableView.isVisible = editable
         avatarRenderer.render(matrixItem, holder.avatarImageView)
-        holder.avatarDecorationImageView.render(userEncryptionTrustLevel)
+        holder.avatarDecorationImageView.renderUser(userVerificationLevel)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index d9a08bd81a..380c80775b 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -16,10 +16,13 @@
 
 package im.vector.app.core.error
 
+import android.content.ActivityNotFoundException
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.call.dialpad.DialPadLookup
 import im.vector.app.features.voice.VoiceFailure
+import im.vector.app.features.voicebroadcast.VoiceBroadcastFailure
+import im.vector.app.features.voicebroadcast.VoiceBroadcastFailure.RecordingError
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.failure.MatrixIdFailure
@@ -134,6 +137,9 @@ class DefaultErrorFormatter @Inject constructor(
             is MatrixIdFailure.InvalidMatrixId ->
                 stringProvider.getString(R.string.login_signin_matrix_id_error_invalid_matrix_id)
             is VoiceFailure -> voiceMessageError(throwable)
+            is VoiceBroadcastFailure -> voiceBroadcastMessageError(throwable)
+            is ActivityNotFoundException ->
+                stringProvider.getString(R.string.error_no_external_application_found)
             else -> throwable.localizedMessage
         }
                 ?: stringProvider.getString(R.string.unknown_error)
@@ -146,6 +152,14 @@ class DefaultErrorFormatter @Inject constructor(
         }
     }
 
+    private fun voiceBroadcastMessageError(throwable: VoiceBroadcastFailure): String {
+        return when (throwable) {
+            RecordingError.BlockedBySomeoneElse -> stringProvider.getString(R.string.error_voice_broadcast_blocked_by_someone_else_message)
+            RecordingError.NoPermission -> stringProvider.getString(R.string.error_voice_broadcast_permission_denied_message)
+            RecordingError.UserAlreadyBroadcasting -> stringProvider.getString(R.string.error_voice_broadcast_already_in_progress_message)
+        }
+    }
+
     private fun limitExceededError(error: MatrixError): String {
         val delay = error.retryAfterMillis
 
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Context.kt b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
index 14e639bf32..2e3e8c9306 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Context.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.core.extensions
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.net.ConnectivityManager
@@ -91,11 +90,9 @@ fun Context.safeOpenOutputStream(uri: Uri): OutputStream? {
  *
  * @return true if no active connection is found
  */
-@Suppress("deprecation")
-@SuppressLint("NewApi") // false positive
 fun Context.inferNoConnectivity(sdkIntProvider: BuildVersionSdkIntProvider): Boolean {
     val connectivityManager = getSystemService<ConnectivityManager>()!!
-    return if (sdkIntProvider.get() > Build.VERSION_CODES.M) {
+    return if (sdkIntProvider.isAtLeast(Build.VERSION_CODES.M)) {
         val networkCapabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
         when {
             networkCapabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true -> false
@@ -104,6 +101,7 @@ fun Context.inferNoConnectivity(sdkIntProvider: BuildVersionSdkIntProvider): Boo
             else -> true
         }
     } else {
+        @Suppress("DEPRECATION")
         when (connectivityManager.activeNetworkInfo?.type) {
             ConnectivityManager.TYPE_WIFI -> false
             ConnectivityManager.TYPE_MOBILE -> false
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Flow.kt b/vector/src/main/java/im/vector/app/core/extensions/Flow.kt
new file mode 100644
index 0000000000..82e6e5f9a6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/extensions/Flow.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package im.vector.app.core.extensions
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+
+/**
+ * Returns a flow that invokes the given action after the first value of the upstream flow is emitted downstream.
+ */
+fun <T> Flow<T>.onFirst(action: (T) -> Unit): Flow<T> = flow {
+    var emitted = false
+    collect { value ->
+        emit(value) // always emit value
+
+        if (!emitted) {
+            action(value) // execute the action after the first emission
+            emitted = true
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
index 61c4fe2174..f3aef54062 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
@@ -175,7 +175,7 @@ fun Fragment.queryExportKeys(userId: String, activityResultLauncher: ActivityRes
     selectTxtFileToWrite(
             activity = requireActivity(),
             activityResultLauncher = activityResultLauncher,
-            defaultFileName = "$appName-megolm-export-$userId-$timestamp.txt",
+            defaultFileName = "$appName-megolm-export-$userId-${timestamp}.txt",
             chooserHint = getString(R.string.keys_backup_setup_step1_manual_export)
     )
 }
@@ -187,7 +187,7 @@ fun Activity.queryExportKeys(userId: String, activityResultLauncher: ActivityRes
     selectTxtFileToWrite(
             activity = this,
             activityResultLauncher = activityResultLauncher,
-            defaultFileName = "$appName-megolm-export-$userId-$timestamp.txt",
+            defaultFileName = "$appName-megolm-export-$userId-${timestamp}.txt",
             chooserHint = getString(R.string.keys_backup_setup_step1_manual_export)
     )
 }
diff --git a/vector/src/main/java/im/vector/app/core/extensions/MavericksViewModel.kt b/vector/src/main/java/im/vector/app/core/extensions/MavericksViewModel.kt
index 6120a84d7c..8201a1b5e8 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/MavericksViewModel.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/MavericksViewModel.kt
@@ -25,6 +25,7 @@ import com.airbnb.mvrx.MavericksViewModelProvider
 
 inline fun <reified VM : MavericksViewModel<S>, reified S : MavericksState> ComponentActivity.lazyViewModel(): Lazy<VM> {
     return lazy(mode = LazyThreadSafetyMode.NONE) {
+        @Suppress("DEPRECATION")
         MavericksViewModelProvider.get(
                 viewModelClass = VM::class.java,
                 stateClass = S::class.java,
diff --git a/vector/src/main/java/im/vector/app/core/extensions/MenuItemExt.kt b/vector/src/main/java/im/vector/app/core/extensions/MenuItemExt.kt
new file mode 100644
index 0000000000..7d62a0c357
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/extensions/MenuItemExt.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.extensions
+
+import android.view.MenuItem
+import androidx.annotation.ColorInt
+import androidx.core.text.toSpannable
+import im.vector.app.core.utils.colorizeMatchingText
+
+fun MenuItem.setTextColor(@ColorInt color: Int) {
+    val currentTitle = title.orEmpty().toString()
+    title = currentTitle
+            .toSpannable()
+            .colorizeMatchingText(currentTitle, color)
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Service.kt b/vector/src/main/java/im/vector/app/core/extensions/Service.kt
new file mode 100644
index 0000000000..de301df85e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/extensions/Service.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.extensions
+
+import android.app.Notification
+import android.app.Service
+import android.content.pm.ServiceInfo
+import android.os.Build
+
+fun Service.startForegroundCompat(
+        id: Int,
+        notification: Notification,
+        provideForegroundServiceType: (() -> Int)? = null
+) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        startForeground(
+                id,
+                notification,
+                provideForegroundServiceType?.invoke() ?: ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
+        )
+    } else {
+        startForeground(id, notification)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Session.kt b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
index caed413e2b..4f2d387474 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Session.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
@@ -24,20 +24,8 @@ import im.vector.app.core.services.VectorSyncAndroidService
 import im.vector.app.features.session.VectorSessionStore
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
-import org.matrix.android.sdk.api.session.sync.FilterService
 import timber.log.Timber
 
-fun Session.configureAndStart(context: Context, startSyncing: Boolean = true) {
-    Timber.i("Configure and start session for $myUserId")
-    open()
-    filterService().setFilter(FilterService.FilterPreset.ElementFilter)
-    if (startSyncing) {
-        startSyncing(context)
-    }
-    pushersService().refreshPushers()
-    context.singletonEntryPoint().webRtcCallManager().checkForProtocolsSupportIfNeeded()
-}
-
 fun Session.startSyncing(context: Context) {
     val applicationContext = context.applicationContext
     if (!syncService().hasAlreadySynced()) {
diff --git a/vector/src/main/java/im/vector/app/core/di/DefaultSharedPreferences.kt b/vector/src/main/java/im/vector/app/core/extensions/Throwable.kt
similarity index 53%
rename from vector/src/main/java/im/vector/app/core/di/DefaultSharedPreferences.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Throwable.kt
index abee0cb2e7..0aa9039dcb 100644
--- a/vector/src/main/java/im/vector/app/core/di/DefaultSharedPreferences.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Throwable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright (c) 2022 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.
@@ -14,18 +14,21 @@
  * limitations under the License.
  */
 
-package im.vector.app.core.di
+package im.vector.app.core.extensions
 
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.preference.PreferenceManager
-
-object DefaultSharedPreferences {
-
-    @Volatile private var INSTANCE: SharedPreferences? = null
-
-    fun getInstance(context: Context): SharedPreferences =
-            INSTANCE ?: synchronized(this) {
-                INSTANCE ?: PreferenceManager.getDefaultSharedPreferences(context.applicationContext).also { INSTANCE = it }
+/**
+ * Recursive through the throwable and its causes for the given predicate.
+ *
+ * @return true when the predicate finds a match.
+ */
+tailrec fun Throwable?.crawlCausesFor(predicate: (Throwable) -> Boolean): Boolean {
+    return when {
+        this == null -> false
+        else -> {
+            when (predicate(this)) {
+                true -> true
+                else -> this.cause.crawlCausesFor(predicate)
             }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
index 28c1587b1a..c94f9cd921 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
@@ -16,13 +16,33 @@
 
 package im.vector.app.core.extensions
 
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 
 fun TimelineEvent.canReact(): Boolean {
     // Only event of type EventType.MESSAGE, EventType.STICKER and EventType.POLL_START are supported for the moment
-    return root.getClearType() in listOf(EventType.MESSAGE, EventType.STICKER) + EventType.POLL_START &&
+    return root.getClearType() in listOf(EventType.MESSAGE, EventType.STICKER) + EventType.POLL_START.values &&
             root.sendState == SendState.SYNCED &&
             !root.isRedacted()
 }
+
+/**
+ * Get last MessageContent, after a possible edition.
+ * This method iterate on the vector event types and fallback to [getLastMessageContent] from the matrix sdk for the other types.
+ */
+fun TimelineEvent.getVectorLastMessageContent(): MessageContent? {
+    // Iterate on event types which are not part of the matrix sdk, otherwise fallback to the sdk method
+    return when (root.getClearType()) {
+        VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO -> {
+            (annotations?.editSummary?.latestEdit?.getClearContent()?.toModel<MessageVoiceBroadcastInfoContent>()
+                    ?: root.getClearContent().toModel<MessageVoiceBroadcastInfoContent>())
+        }
+        else -> getLastMessageContent()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
index 625ff15ef7..156809d5ad 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
@@ -29,7 +29,13 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.isVisible
+import androidx.transition.ChangeBounds
+import androidx.transition.Fade
+import androidx.transition.Transition
+import androidx.transition.TransitionManager
+import androidx.transition.TransitionSet
 import im.vector.app.R
+import im.vector.app.core.animations.SimpleTransitionListener
 import im.vector.app.features.themes.ThemeUtils
 
 /**
@@ -90,3 +96,18 @@ fun View.setAttributeBackground(@AttrRes attributeId: Int) {
     val attribute = ThemeUtils.getAttribute(context, attributeId)!!
     setBackgroundResource(attribute.resourceId)
 }
+
+fun ViewGroup.animateLayoutChange(animationDuration: Long, transitionComplete: (() -> Unit)? = null) {
+    val transition = TransitionSet().apply {
+        ordering = TransitionSet.ORDERING_SEQUENTIAL
+        addTransition(ChangeBounds())
+        addTransition(Fade(Fade.IN))
+        duration = animationDuration
+        addListener(object : SimpleTransitionListener() {
+            override fun onTransitionEnd(transition: Transition) {
+                transitionComplete?.invoke()
+            }
+        })
+    }
+    TransitionManager.beginDelayedTransition((parent as? ViewGroup ?: this), transition)
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/ViewPager2.kt b/vector/src/main/java/im/vector/app/core/extensions/ViewPager2.kt
index 7d3a678af1..c94352b998 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/ViewPager2.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/ViewPager2.kt
@@ -22,6 +22,7 @@ import android.animation.ValueAnimator
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
 import androidx.viewpager2.widget.ViewPager2
+import im.vector.app.core.animations.SimpleAnimatorListener
 
 fun ViewPager2.setCurrentItem(
         item: Int,
@@ -45,19 +46,16 @@ fun ViewPager2.setCurrentItem(
             previousValue = currentValue
         }.onFailure { animator.cancel() }
     }
-    animator.addListener(object : Animator.AnimatorListener {
-        override fun onAnimationStart(animation: Animator?) {
+    animator.addListener(object : SimpleAnimatorListener() {
+        override fun onAnimationStart(animation: Animator) {
             isUserInputEnabled = false
             beginFakeDrag()
         }
 
-        override fun onAnimationEnd(animation: Animator?) {
+        override fun onAnimationEnd(animation: Animator) {
             isUserInputEnabled = true
             endFakeDrag()
         }
-
-        override fun onAnimationCancel(animation: Animator?) = Unit
-        override fun onAnimationRepeat(animation: Animator?) = Unit
     })
     animator.interpolator = interpolator
     animator.duration = duration
diff --git a/vector/src/main/java/im/vector/app/core/files/FileSaver.kt b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
index 7de5286854..8afcdac73b 100644
--- a/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
+++ b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.core.files
 
+import android.annotation.SuppressLint
 import android.app.DownloadManager
 import android.content.ContentValues
 import android.content.Context
@@ -24,7 +25,6 @@ import android.os.Build
 import android.provider.MediaStore
 import androidx.annotation.WorkerThread
 import androidx.core.content.getSystemService
-import arrow.core.Try
 import okio.buffer
 import okio.sink
 import okio.source
@@ -35,11 +35,10 @@ import java.io.File
  * Save a string to a file with Okio.
  */
 @WorkerThread
-fun writeToFile(str: String, file: File): Try<Unit> {
-    return Try<Unit> {
-        file.sink().buffer().use {
-            it.writeString(str, Charsets.UTF_8)
-        }
+@Throws
+fun writeToFile(str: String, file: File) {
+    file.sink().buffer().use {
+        it.writeString(str, Charsets.UTF_8)
     }
 }
 
@@ -47,14 +46,14 @@ fun writeToFile(str: String, file: File): Try<Unit> {
  * Save a byte array to a file with Okio.
  */
 @WorkerThread
-fun writeToFile(data: ByteArray, file: File): Try<Unit> {
-    return Try<Unit> {
-        file.sink().buffer().use {
-            it.write(data)
-        }
+@Throws
+fun writeToFile(data: ByteArray, file: File) {
+    file.sink().buffer().use {
+        it.write(data)
     }
 }
 
+@SuppressLint("Recycle")
 fun addEntryToDownloadManager(
         context: Context,
         file: File,
diff --git a/vector/src/main/java/im/vector/app/core/notification/NotificationsSettingUpdater.kt b/vector/src/main/java/im/vector/app/core/notification/NotificationsSettingUpdater.kt
new file mode 100644
index 0000000000..a4d18baa64
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/notification/NotificationsSettingUpdater.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.notification
+
+import im.vector.app.features.session.coroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Listen changes in Pusher or Account Data to update the local setting for notification toggle.
+ */
+@Singleton
+class NotificationsSettingUpdater @Inject constructor(
+        private val updateEnableNotificationsSettingOnChangeUseCase: UpdateEnableNotificationsSettingOnChangeUseCase,
+) {
+
+    private var job: Job? = null
+
+    fun onSessionStarted(session: Session) {
+        updateEnableNotificationsSettingOnChange(session)
+    }
+
+    private fun updateEnableNotificationsSettingOnChange(session: Session) {
+        job?.cancel()
+        job = session.coroutineScope.launch {
+            updateEnableNotificationsSettingOnChangeUseCase.execute(session)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/notification/UpdateEnableNotificationsSettingOnChangeUseCase.kt b/vector/src/main/java/im/vector/app/core/notification/UpdateEnableNotificationsSettingOnChangeUseCase.kt
new file mode 100644
index 0000000000..36df939bad
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/notification/UpdateEnableNotificationsSettingOnChangeUseCase.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.notification
+
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.devices.v2.notification.GetNotificationsStatusUseCase
+import im.vector.app.features.settings.devices.v2.notification.NotificationsStatus
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.onEach
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+
+/**
+ * Listen for changes in either Pusher or Account data to update the local enable notifications
+ * setting for the current device.
+ */
+class UpdateEnableNotificationsSettingOnChangeUseCase @Inject constructor(
+        private val vectorPreferences: VectorPreferences,
+        private val getNotificationsStatusUseCase: GetNotificationsStatusUseCase,
+) {
+
+    suspend fun execute(session: Session) {
+        val deviceId = session.sessionParams.deviceId ?: return
+        getNotificationsStatusUseCase.execute(session, deviceId)
+                .onEach(::updatePreference)
+                .collect()
+    }
+
+    private fun updatePreference(notificationStatus: NotificationsStatus) {
+        when (notificationStatus) {
+            NotificationsStatus.ENABLED -> vectorPreferences.setNotificationEnabledForDevice(true)
+            NotificationsStatus.DISABLED -> vectorPreferences.setNotificationEnabledForDevice(false)
+            else -> Unit
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
index 4cd7da2a4f..794d5c7886 100644
--- a/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
@@ -83,6 +83,7 @@ abstract class SimpleFragmentActivity : VectorBaseActivity<ActivityBinding>() {
             // ignore
             return
         }
+        @Suppress("DEPRECATION")
         super.onBackPressed()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/platform/StateView.kt b/vector/src/main/java/im/vector/app/core/platform/StateView.kt
index 6f36787d0c..2fb99c705a 100755
--- a/vector/src/main/java/im/vector/app/core/platform/StateView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/StateView.kt
@@ -21,6 +21,7 @@ import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
+import android.widget.ImageView
 import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.core.extensions.updateConstraintSet
@@ -36,7 +37,8 @@ class StateView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
                 val title: CharSequence? = null,
                 val image: Drawable? = null,
                 val isBigImage: Boolean = false,
-                val message: CharSequence? = null
+                val message: CharSequence? = null,
+                val imageScaleType: ImageView.ScaleType? = ImageView.ScaleType.FIT_CENTER,
         ) : State()
 
         data class Error(val message: CharSequence? = null) : State()
@@ -79,6 +81,7 @@ class StateView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             is State.Content -> Unit
             is State.Loading -> Unit
             is State.Empty -> {
+                views.emptyImageView.scaleType = newState.imageScaleType
                 views.emptyImageView.setImageDrawable(newState.image)
                 views.emptyView.updateConstraintSet {
                     it.constrainPercentHeight(R.id.emptyImageView, if (newState.isBigImage) 0.5f else 0.1f)
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 24a65e1071..4e5116eda9 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -16,12 +16,10 @@
 
 package im.vector.app.core.platform
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -39,8 +37,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.util.Consumer
 import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentFactory
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
@@ -60,6 +56,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ActivityEntryPoint
 import im.vector.app.core.dialogs.DialogLocker
 import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
+import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.error.fatalError
 import im.vector.app.core.extensions.observeEvent
 import im.vector.app.core.extensions.observeNotNull
@@ -67,7 +64,6 @@ import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.restart
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.extensions.singletonEntryPoint
-import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.AndroidSystemSettingsProvider
 import im.vector.app.core.utils.ToolbarConfig
@@ -89,6 +85,7 @@ import im.vector.app.features.rageshake.RageShake
 import im.vector.app.features.session.SessionListener
 import im.vector.app.features.settings.FontScalePreferences
 import im.vector.app.features.settings.FontScalePreferencesImpl
+import im.vector.app.features.settings.VectorLocaleProvider
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.themes.ActivityOtherThemes
 import im.vector.app.features.themes.ThemeUtils
@@ -109,7 +106,7 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
     protected var analyticsScreenName: MobileScreen.ScreenName? = null
 
-    protected lateinit var analyticsTracker: AnalyticsTracker
+    @Inject lateinit var analyticsTracker: AnalyticsTracker
 
     /* ==========================================================================================
      * View
@@ -153,27 +150,23 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
      * ========================================================================================== */
 
     private lateinit var configurationViewModel: ConfigurationViewModel
-    private lateinit var sessionListener: SessionListener
-    protected lateinit var bugReporter: BugReporter
-    private lateinit var pinLocker: PinLocker
 
+    @Inject lateinit var sessionListener: SessionListener
+    @Inject lateinit var bugReporter: BugReporter
+    @Inject lateinit var pinLocker: PinLocker
     @Inject lateinit var rageShake: RageShake
     @Inject lateinit var buildMeta: BuildMeta
     @Inject lateinit var fontScalePreferences: FontScalePreferences
+    @Inject lateinit var vectorLocale: VectorLocaleProvider
+    @Inject lateinit var vectorFeatures: VectorFeatures
+    @Inject lateinit var navigator: Navigator
+    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var errorFormatter: ErrorFormatter
 
     // For debug only
     @Inject lateinit var debugReceiver: DebugReceiver
 
-    @Inject
-    lateinit var vectorFeatures: VectorFeatures
-
-    lateinit var navigator: Navigator
-        private set
-    private lateinit var fragmentFactory: FragmentFactory
-
-    private lateinit var activeSessionHolder: ActiveSessionHolder
-    private lateinit var vectorPreferences: VectorPreferences
-
     // Filter for multiple invalid token error
     private var mainActivityStarted = false
 
@@ -182,8 +175,10 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
     private val restorables = ArrayList<Restorable>()
 
     override fun attachBaseContext(base: Context) {
-        val fontScalePreferences = FontScalePreferencesImpl(PreferenceManager.getDefaultSharedPreferences(base), AndroidSystemSettingsProvider(base))
-        val vectorConfiguration = VectorConfiguration(this, fontScalePreferences)
+        val preferences = PreferenceManager.getDefaultSharedPreferences(base)
+        val fontScalePreferences = FontScalePreferencesImpl(preferences, AndroidSystemSettingsProvider(base))
+        val vectorLocaleProvider = VectorLocaleProvider(preferences)
+        val vectorConfiguration = VectorConfiguration(this, fontScalePreferences, vectorLocaleProvider)
         super.attachBaseContext(vectorConfiguration.getLocalisedContext(base))
     }
 
@@ -207,22 +202,13 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
     @CallSuper
     override fun onCreate(savedInstanceState: Bundle?) {
         Timber.i("onCreate Activity ${javaClass.simpleName}")
-        val singletonEntryPoint = singletonEntryPoint()
         val activityEntryPoint = EntryPointAccessors.fromActivity(this, ActivityEntryPoint::class.java)
         ThemeUtils.setActivityTheme(this, getOtherThemes())
-        fragmentFactory = activityEntryPoint.fragmentFactory()
-        supportFragmentManager.fragmentFactory = fragmentFactory
         viewModelFactory = activityEntryPoint.viewModelFactory()
         super.onCreate(savedInstanceState)
         addOnMultiWindowModeChangedListener(onMultiWindowModeChangedListener)
         setupMenu()
         configurationViewModel = viewModelProvider.get(ConfigurationViewModel::class.java)
-        bugReporter = singletonEntryPoint.bugReporter()
-        pinLocker = singletonEntryPoint.pinLocker()
-        analyticsTracker = singletonEntryPoint.analyticsTracker()
-        navigator = singletonEntryPoint.navigator()
-        activeSessionHolder = singletonEntryPoint.activeSessionHolder()
-        vectorPreferences = singletonEntryPoint.vectorPreferences()
         configurationViewModel.activityRestarter.observe(this) {
             if (!it.hasBeenHandled) {
                 // Recreate the Activity because configuration has changed
@@ -234,7 +220,6 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
                 navigator.openPinCode(this, pinStartForActivityResult, PinMode.AUTH)
             }
         }
-        sessionListener = singletonEntryPoint.sessionListener()
         sessionListener.globalErrorLiveData.observeEvent(this) {
             handleGlobalError(it)
         }
@@ -256,7 +241,7 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
         initUiAndData()
 
-        if (vectorFeatures.isNewAppLayoutEnabled()) {
+        if (vectorPreferences.isNewAppLayoutEnabled()) {
             tryOrNull { // Add to XML theme when feature flag is removed
                 val toolbarBackground = MaterialColors.getColor(views.root, R.attr.vctr_toolbar_background)
                 window.statusBarColor = toolbarBackground
@@ -464,12 +449,6 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
         bugReporter.inMultiWindowMode = it.isInMultiWindowMode
     }
 
-    protected fun createFragment(fragmentClass: Class<out Fragment>, argsParcelable: Parcelable? = null): Fragment {
-        return fragmentFactory.instantiate(classLoader, fragmentClass.name).apply {
-            arguments = argsParcelable?.toMvRxBundle()
-        }
-    }
-
     /* ==========================================================================================
      * PRIVATE METHODS
      * ========================================================================================== */
@@ -477,23 +456,18 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
     /**
      * Force to render the activity in fullscreen.
      */
-    @Suppress("DEPRECATION")
     private fun setFullScreen() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             // New API instead of SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN and SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
             window.setDecorFitsSystemWindows(false)
             // New API instead of SYSTEM_UI_FLAG_IMMERSIVE
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            } else {
-                @SuppressLint("WrongConstant")
-                window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_SWIPE
-            }
+            window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
             // New API instead of FLAG_TRANSLUCENT_STATUS
             window.statusBarColor = ContextCompat.getColor(this, im.vector.lib.attachmentviewer.R.color.half_transparent_status_bar)
             // New API instead of FLAG_TRANSLUCENT_NAVIGATION
             window.navigationBarColor = ContextCompat.getColor(this, im.vector.lib.attachmentviewer.R.color.half_transparent_status_bar)
         } else {
+            @Suppress("DEPRECATION")
             window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                     or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                     or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -520,6 +494,7 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
     private fun onBackPressed(fromToolbar: Boolean) {
         val handled = recursivelyDispatchOnBackPressed(supportFragmentManager, fromToolbar)
         if (!handled) {
+            @Suppress("DEPRECATION")
             super.onBackPressed()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
index ddc281fdd1..ec6f3288f8 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
@@ -25,6 +25,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.annotation.CallSuper
+import androidx.annotation.FloatRange
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
@@ -39,6 +40,7 @@ import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.plan.MobileScreen
+import io.github.hyuwah.draggableviewlib.Utils
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
@@ -165,6 +167,13 @@ abstract class VectorBaseBottomSheetDialogFragment<VB : ViewBinding> : BottomShe
         forceExpandState()
     }
 
+    protected fun setPeekHeightAsScreenPercentage(@FloatRange(from = 0.0, to = 1.0) percentage: Float) {
+        context?.let {
+            val screenHeight = Utils.getScreenHeight(it)
+            bottomSheetBehavior?.setPeekHeight((screenHeight * percentage).toInt(), true)
+        }
+    }
+
     protected fun forceExpandState() {
         if (showExpanded) {
             // Force the bottom sheet to be expanded
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseDialogFragment.kt
new file mode 100644
index 0000000000..5a817b989e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseDialogFragment.kt
@@ -0,0 +1,155 @@
+/*
+ * 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.
+ */
+package im.vector.app.core.platform
+
+import android.content.Context
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.CallSuper
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.viewbinding.ViewBinding
+import com.airbnb.mvrx.MavericksView
+import dagger.hilt.android.EntryPointAccessors
+import im.vector.app.R
+import im.vector.app.core.di.ActivityEntryPoint
+import im.vector.app.core.extensions.singletonEntryPoint
+import im.vector.app.core.extensions.toMvRxBundle
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.themes.ThemeUtils
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import reactivecircus.flowbinding.android.view.clicks
+import timber.log.Timber
+
+/**
+ * Add Mavericks capabilities, handle DI and bindings.
+ */
+abstract class VectorBaseDialogFragment<VB : ViewBinding> : DialogFragment(), MavericksView {
+    /* ==========================================================================================
+     * Analytics
+     * ========================================================================================== */
+
+    protected var analyticsScreenName: MobileScreen.ScreenName? = null
+
+    protected lateinit var analyticsTracker: AnalyticsTracker
+
+    /* ==========================================================================================
+     * View
+     * ========================================================================================== */
+
+    private var _binding: VB? = null
+
+    // This property is only valid between onCreateView and onDestroyView.
+    protected val views: VB
+        get() = _binding!!
+
+    abstract fun getBinding(inflater: LayoutInflater, container: ViewGroup?): VB
+
+    /* ==========================================================================================
+     * View model
+     * ========================================================================================== */
+
+    private lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    protected val activityViewModelProvider
+        get() = ViewModelProvider(requireActivity(), viewModelFactory)
+
+    protected val fragmentViewModelProvider
+        get() = ViewModelProvider(this, viewModelFactory)
+
+    val vectorBaseActivity: VectorBaseActivity<*> by lazy {
+        activity as VectorBaseActivity<*>
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setStyle(STYLE_NORMAL, ThemeUtils.getApplicationThemeRes(requireContext()))
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        _binding = getBinding(inflater, container)
+        return views.root
+    }
+
+    @CallSuper
+    override fun onDestroyView() {
+        _binding = null
+        super.onDestroyView()
+    }
+
+    @CallSuper
+    override fun onDestroy() {
+        super.onDestroy()
+    }
+
+    override fun onAttach(context: Context) {
+        val activityEntryPoint = EntryPointAccessors.fromActivity(vectorBaseActivity, ActivityEntryPoint::class.java)
+        viewModelFactory = activityEntryPoint.viewModelFactory()
+        val singletonEntryPoint = context.singletonEntryPoint()
+        analyticsTracker = singletonEntryPoint.analyticsTracker()
+        super.onAttach(context)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        Timber.i("onResume BottomSheet ${javaClass.simpleName}")
+        analyticsScreenName?.let {
+            analyticsTracker.screen(MobileScreen(screenName = it))
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        // This ensures that invalidate() is called for static screens that don't
+        // subscribe to a ViewModel.
+        postInvalidate()
+        requireDialog().window?.setWindowAnimations(R.style.Animation_AppCompat_Dialog)
+    }
+
+    protected fun setArguments(args: Parcelable? = null) {
+        arguments = args.toMvRxBundle()
+    }
+
+    /* ==========================================================================================
+     * Views
+     * ========================================================================================== */
+
+    protected fun View.debouncedClicks(onClicked: () -> Unit) {
+        clicks()
+                .onEach { onClicked() }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+
+    /* ==========================================================================================
+     * ViewEvents
+     * ========================================================================================== */
+
+    protected fun <T : VectorViewEvents> VectorViewModel<*, *, T>.observeViewEvents(observer: (T) -> Unit) {
+        viewEvents
+                .stream()
+                .onEach {
+                    observer(it)
+                }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index 340c906a6d..8fe2d33f6a 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -123,7 +123,6 @@ abstract class VectorBaseFragment<VB : ViewBinding> : Fragment(), MavericksView
         analyticsTracker = singletonEntryPoint.analyticsTracker()
         unrecognizedCertificateDialog = singletonEntryPoint.unrecognizedCertificateDialog()
         viewModelFactory = activityEntryPoint.viewModelFactory()
-        childFragmentManager.fragmentFactory = activityEntryPoint.fragmentFactory()
         super.onAttach(context)
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/VectorSharedActionViewModel.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
rename to vector/src/main/java/im/vector/app/core/platform/VectorSharedActionViewModel.kt
diff --git a/vector/src/main/java/im/vector/app/core/pushers/EnsureFcmTokenIsRetrievedUseCase.kt b/vector/src/main/java/im/vector/app/core/pushers/EnsureFcmTokenIsRetrievedUseCase.kt
new file mode 100644
index 0000000000..cb955e01f7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/pushers/EnsureFcmTokenIsRetrievedUseCase.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.pushers
+
+import im.vector.app.core.di.ActiveSessionHolder
+import javax.inject.Inject
+
+class EnsureFcmTokenIsRetrievedUseCase @Inject constructor(
+        private val unifiedPushHelper: UnifiedPushHelper,
+        private val fcmHelper: FcmHelper,
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+
+    fun execute(pushersManager: PushersManager, registerPusher: Boolean) {
+        if (unifiedPushHelper.isEmbeddedDistributor()) {
+            fcmHelper.ensureFcmTokenIsRetrieved(pushersManager, shouldAddHttpPusher(registerPusher))
+        }
+    }
+
+    private fun shouldAddHttpPusher(registerPusher: Boolean) = if (registerPusher) {
+        val currentSession = activeSessionHolder.getActiveSession()
+        val currentPushers = currentSession.pushersService().getPushers()
+        currentPushers.none { it.deviceId == currentSession.sessionParams.deviceId }
+    } else {
+        false
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/pushers/FcmHelper.kt b/vector/src/main/java/im/vector/app/core/pushers/FcmHelper.kt
index 7b2c5e3959..381348638d 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/FcmHelper.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/FcmHelper.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.core.pushers
 
-import android.app.Activity
 import im.vector.app.core.di.ActiveSessionHolder
 
 interface FcmHelper {
@@ -39,11 +38,10 @@ interface FcmHelper {
     /**
      * onNewToken may not be called on application upgrade, so ensure my shared pref is set.
      *
-     * @param activity the first launch Activity.
      * @param pushersManager the instance to register the pusher on.
      * @param registerPusher whether the pusher should be registered.
      */
-    fun ensureFcmTokenIsRetrieved(activity: Activity, pushersManager: PushersManager, registerPusher: Boolean)
+    fun ensureFcmTokenIsRetrieved(pushersManager: PushersManager, registerPusher: Boolean)
 
     fun onEnterForeground(activeSessionHolder: ActiveSessionHolder)
 
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt b/vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
similarity index 96%
rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
rename to vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
index 3feee8c63b..63725f01a3 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.fdroid.receiver
+package im.vector.app.core.pushers
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushParser.kt b/vector/src/main/java/im/vector/app/core/pushers/PushParser.kt
index 6f141e3736..8c18295c45 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushParser.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushParser.kt
@@ -24,28 +24,34 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.util.MatrixJsonParser
 import javax.inject.Inject
 
+/**
+ * Parse the received data from Push. Json format are different depending on the source.
+ *
+ * Notifications received by FCM are formatted by the matrix gateway [1]. The data send to FCM is the content
+ * of the "notification" attribute of the json sent to the gateway [2][3].
+ * On the other side, with UnifiedPush, the content of the message received is the content posted to the push
+ * gateway endpoint [3].
+ *
+ * *Note*: If we want to get the same content with FCM and unifiedpush, we can do a new sygnal pusher [4].
+ *
+ * [1] https://github.com/matrix-org/sygnal/blob/main/sygnal/gcmpushkin.py
+ * [2] https://github.com/matrix-org/sygnal/blob/main/sygnal/gcmpushkin.py#L366
+ * [3] https://spec.matrix.org/latest/push-gateway-api/
+ * [4] https://github.com/p1gp1g/sygnal/blob/unifiedpush/sygnal/upfcmpushkin.py (Not tested for a while)
+ */
 class PushParser @Inject constructor() {
-    /**
-     * Parse the received data from Push. Json format are different depending on the source.
-     *
-     * Notifications received by FCM are formatted by the matrix gateway [1]. The data send to FCM is the content
-     * of the "notification" attribute of the json sent to the gateway [2][3].
-     * On the other side, with UnifiedPush, the content of the message received is the content posted to the push
-     * gateway endpoint [3].
-     *
-     * *Note*: If we want to get the same content with FCM and unifiedpush, we can do a new sygnal pusher [4].
-     *
-     * [1] https://github.com/matrix-org/sygnal/blob/main/sygnal/gcmpushkin.py
-     * [2] https://github.com/matrix-org/sygnal/blob/main/sygnal/gcmpushkin.py#L366
-     * [3] https://spec.matrix.org/latest/push-gateway-api/
-     * [4] https://github.com/p1gp1g/sygnal/blob/unifiedpush/sygnal/upfcmpushkin.py (Not tested for a while)
-     */
-    fun parseData(message: String, firebaseFormat: Boolean): PushData? {
-        val moshi = MatrixJsonParser.getMoshi()
-        return if (firebaseFormat) {
-            tryOrNull { moshi.adapter(PushDataFcm::class.java).fromJson(message) }?.toPushData()
-        } else {
-            tryOrNull { moshi.adapter(PushDataUnifiedPush::class.java).fromJson(message) }?.toPushData()
+    fun parsePushDataUnifiedPush(message: ByteArray): PushData? {
+        return MatrixJsonParser.getMoshi().let {
+            tryOrNull { it.adapter(PushDataUnifiedPush::class.java).fromJson(String(message)) }?.toPushData()
         }
     }
+
+    fun parsePushDataFcm(message: Map<String, String?>): PushData {
+        val pushDataFcm = PushDataFcm(
+                eventId = message["event_id"],
+                roomId = message["room_id"],
+                unread = message["unread"]?.let { tryOrNull { Integer.parseInt(it) } },
+        )
+        return pushDataFcm.toPushData()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index 91ab58207d..6f186262fc 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -17,31 +17,34 @@
 package im.vector.app.core.pushers
 
 import im.vector.app.R
+import im.vector.app.core.device.GetDeviceInfoUseCase
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.AppNameProvider
 import im.vector.app.core.resources.LocaleProvider
 import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.session.pushers.HttpPusher
+import org.matrix.android.sdk.api.session.pushers.Pusher
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.math.abs
 
-private const val DEFAULT_PUSHER_FILE_TAG = "mobile"
+internal const val DEFAULT_PUSHER_FILE_TAG = "mobile"
 
 class PushersManager @Inject constructor(
-        private val unifiedPushStore: UnifiedPushStore,
+        private val unifiedPushHelper: UnifiedPushHelper,
         private val activeSessionHolder: ActiveSessionHolder,
         private val localeProvider: LocaleProvider,
         private val stringProvider: StringProvider,
         private val appNameProvider: AppNameProvider,
+        private val getDeviceInfoUseCase: GetDeviceInfoUseCase,
 ) {
     suspend fun testPush() {
         val currentSession = activeSessionHolder.getActiveSession()
 
         currentSession.pushersService().testPush(
-                unifiedPushStore.getPushGateway()!!,
+                unifiedPushHelper.getPushGateway() ?: return,
                 stringProvider.getString(R.string.pusher_app_id),
-                unifiedPushStore.getEndpointOrToken().orEmpty(),
+                unifiedPushHelper.getEndpointOrToken().orEmpty(),
                 TEST_EVENT_ID
         )
     }
@@ -63,15 +66,17 @@ class PushersManager @Inject constructor(
             pushKey: String,
             gateway: String
     ) = HttpPusher(
-            pushKey,
-            stringProvider.getString(R.string.pusher_app_id),
+            pushkey = pushKey,
+            appId = stringProvider.getString(R.string.pusher_app_id),
             profileTag = DEFAULT_PUSHER_FILE_TAG + "_" + abs(activeSessionHolder.getActiveSession().myUserId.hashCode()),
-            localeProvider.current().language,
-            appNameProvider.getAppName(),
-            activeSessionHolder.getActiveSession().sessionParams.deviceId ?: "MOBILE",
-            gateway,
+            lang = localeProvider.current().language,
+            appDisplayName = appNameProvider.getAppName(),
+            deviceDisplayName = getDeviceInfoUseCase.execute().displayName().orEmpty(),
+            url = gateway,
+            enabled = true,
+            deviceId = activeSessionHolder.getActiveSession().sessionParams.deviceId ?: "MOBILE",
             append = false,
-            withEventIdOnly = true
+            withEventIdOnly = true,
     )
 
     suspend fun registerEmailForPush(email: String) {
@@ -86,6 +91,12 @@ class PushersManager @Inject constructor(
         )
     }
 
+    fun getPusherForCurrentSession(): Pusher? {
+        val session = activeSessionHolder.getSafeActiveSession() ?: return null
+        val deviceId = session.sessionParams.deviceId
+        return session.pushersService().getPushers().firstOrNull { it.deviceId == deviceId }
+    }
+
     suspend fun unregisterEmailPusher(email: String) {
         val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
         currentSession.pushersService().removeEmailPusher(email)
diff --git a/vector/src/main/java/im/vector/app/core/pushers/RegisterUnifiedPushUseCase.kt b/vector/src/main/java/im/vector/app/core/pushers/RegisterUnifiedPushUseCase.kt
new file mode 100644
index 0000000000..aa3652a54f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/pushers/RegisterUnifiedPushUseCase.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.pushers
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import im.vector.app.features.VectorFeatures
+import org.unifiedpush.android.connector.UnifiedPush
+import javax.inject.Inject
+
+class RegisterUnifiedPushUseCase @Inject constructor(
+        @ApplicationContext private val context: Context,
+        private val vectorFeatures: VectorFeatures,
+) {
+
+    sealed interface RegisterUnifiedPushResult {
+        object Success : RegisterUnifiedPushResult
+        object NeedToAskUserForDistributor : RegisterUnifiedPushResult
+    }
+
+    fun execute(distributor: String = ""): RegisterUnifiedPushResult {
+        if (distributor.isNotEmpty()) {
+            saveAndRegisterApp(distributor)
+            return RegisterUnifiedPushResult.Success
+        }
+
+        if (!vectorFeatures.allowExternalUnifiedPushDistributors()) {
+            saveAndRegisterApp(context.packageName)
+            return RegisterUnifiedPushResult.Success
+        }
+
+        if (UnifiedPush.getDistributor(context).isNotEmpty()) {
+            registerApp()
+            return RegisterUnifiedPushResult.Success
+        }
+
+        val distributors = UnifiedPush.getDistributors(context)
+
+        return if (distributors.size == 1) {
+            saveAndRegisterApp(distributors.first())
+            RegisterUnifiedPushResult.Success
+        } else {
+            RegisterUnifiedPushResult.NeedToAskUserForDistributor
+        }
+    }
+
+    private fun saveAndRegisterApp(distributor: String) {
+        UnifiedPush.saveDistributor(context, distributor)
+        registerApp()
+    }
+
+    private fun registerApp() {
+        UnifiedPush.registerApp(context)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
index 1f44ab3686..9f96f13ee7 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
@@ -17,18 +17,13 @@
 package im.vector.app.core.pushers
 
 import android.content.Context
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
+import androidx.annotation.MainThread
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.getApplicationLabel
-import im.vector.app.features.VectorFeatures
-import im.vector.app.features.settings.BackgroundSyncMode
-import im.vector.app.features.settings.VectorPreferences
-import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.cache.CacheStrategy
 import org.matrix.android.sdk.api.util.MatrixJsonParser
@@ -41,93 +36,14 @@ class UnifiedPushHelper @Inject constructor(
         private val context: Context,
         private val unifiedPushStore: UnifiedPushStore,
         private val stringProvider: StringProvider,
-        private val vectorPreferences: VectorPreferences,
         private val matrix: Matrix,
-        private val vectorFeatures: VectorFeatures,
         private val fcmHelper: FcmHelper,
 ) {
-    fun register(
-            activity: FragmentActivity,
-            onDoneRunnable: Runnable? = null,
-    ) {
-        registerInternal(
-                activity,
-                onDoneRunnable = onDoneRunnable
-        )
-    }
 
-    fun reRegister(
-            activity: FragmentActivity,
-            pushersManager: PushersManager,
-            onDoneRunnable: Runnable? = null
-    ) {
-        registerInternal(
-                activity,
-                force = true,
-                pushersManager = pushersManager,
-                onDoneRunnable = onDoneRunnable
-        )
-    }
-
-    private fun registerInternal(
-            activity: FragmentActivity,
-            force: Boolean = false,
-            pushersManager: PushersManager? = null,
-            onDoneRunnable: Runnable? = null
-    ) {
-        activity.lifecycleScope.launch {
-            if (!vectorFeatures.allowExternalUnifiedPushDistributors()) {
-                UnifiedPush.saveDistributor(context, context.packageName)
-                UnifiedPush.registerApp(context)
-                onDoneRunnable?.run()
-                return@launch
-            }
-            if (force) {
-                // Un-register first
-                unregister(pushersManager)
-            }
-            if (UnifiedPush.getDistributor(context).isNotEmpty()) {
-                UnifiedPush.registerApp(context)
-                onDoneRunnable?.run()
-                return@launch
-            }
-
-            // By default, use internal solution (fcm/background sync)
-            UnifiedPush.saveDistributor(context, context.packageName)
-            val distributors = UnifiedPush.getDistributors(context)
-
-            if (distributors.size == 1 && !force) {
-                UnifiedPush.saveDistributor(context, distributors.first())
-                UnifiedPush.registerApp(context)
-                onDoneRunnable?.run()
-            } else {
-                openDistributorDialogInternal(activity, pushersManager, onDoneRunnable, distributors, !force, !force)
-            }
-        }
-    }
-
-    fun openDistributorDialog(
-            activity: FragmentActivity,
-            pushersManager: PushersManager,
-            onDoneRunnable: Runnable,
-    ) {
-        val distributors = UnifiedPush.getDistributors(activity)
-        openDistributorDialogInternal(
-                activity,
-                pushersManager,
-                onDoneRunnable, distributors,
-                unregisterFirst = true,
-                cancellable = true,
-        )
-    }
-
-    private fun openDistributorDialogInternal(
-            activity: FragmentActivity,
-            pushersManager: PushersManager?,
-            onDoneRunnable: Runnable?,
-            distributors: List<String>,
-            unregisterFirst: Boolean,
-            cancellable: Boolean,
+    @MainThread
+    fun showSelectDistributorDialog(
+            context: Context,
+            onDistributorSelected: (String) -> Unit,
     ) {
         val internalDistributorName = stringProvider.getString(
                 if (fcmHelper.isFirebaseAvailable()) {
@@ -137,6 +53,7 @@ class UnifiedPushHelper @Inject constructor(
                 }
         )
 
+        val distributors = UnifiedPush.getDistributors(context)
         val distributorsName = distributors.map {
             if (it == context.packageName) {
                 internalDistributorName
@@ -145,43 +62,23 @@ class UnifiedPushHelper @Inject constructor(
             }
         }
 
-        MaterialAlertDialogBuilder(activity)
+        MaterialAlertDialogBuilder(context)
                 .setTitle(stringProvider.getString(R.string.unifiedpush_getdistributors_dialog_title))
                 .setItems(distributorsName.toTypedArray()) { _, which ->
                     val distributor = distributors[which]
-                    if (distributor == UnifiedPush.getDistributor(context)) {
-                        Timber.d("Same distributor selected again, no action")
-                        return@setItems
-                    }
-
-                    activity.lifecycleScope.launch {
-                        if (unregisterFirst) {
-                            // Un-register first
-                            unregister(pushersManager)
-                        }
-                        UnifiedPush.saveDistributor(context, distributor)
-                        Timber.i("Saving distributor: $distributor")
-                        UnifiedPush.registerApp(context)
-                        onDoneRunnable?.run()
+                    onDistributorSelected(distributor)
+                }
+                .setOnCancelListener {
+                    // we do not want to change the distributor on behalf of the user
+                    if (UnifiedPush.getDistributor(context).isEmpty()) {
+                        // By default, use internal solution (fcm/background sync)
+                        onDistributorSelected(context.packageName)
                     }
                 }
-                .setCancelable(cancellable)
+                .setCancelable(true)
                 .show()
     }
 
-    suspend fun unregister(pushersManager: PushersManager? = null) {
-        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME
-        vectorPreferences.setFdroidSyncBackgroundMode(mode)
-        try {
-            pushersManager?.unregisterPusher(unifiedPushStore.getEndpointOrToken().orEmpty())
-        } catch (e: Exception) {
-            Timber.d(e, "Probably unregistering a non existing pusher")
-        }
-        unifiedPushStore.storeUpEndpoint(null)
-        unifiedPushStore.storePushGateway(null)
-        UnifiedPush.unregisterApp(context)
-    }
-
     @JsonClass(generateAdapter = true)
     internal data class DiscoveryResponse(
             @Json(name = "unifiedpush") val unifiedpush: DiscoveryUnifiedPush = DiscoveryUnifiedPush()
@@ -242,15 +139,20 @@ class UnifiedPushHelper @Inject constructor(
     }
 
     fun isEmbeddedDistributor(): Boolean {
-        return UnifiedPush.getDistributor(context) == context.packageName && fcmHelper.isFirebaseAvailable()
+        return isInternalDistributor() && fcmHelper.isFirebaseAvailable()
     }
 
     fun isBackgroundSync(): Boolean {
-        return UnifiedPush.getDistributor(context) == context.packageName && !fcmHelper.isFirebaseAvailable()
+        return isInternalDistributor() && !fcmHelper.isFirebaseAvailable()
+    }
+
+    private fun isInternalDistributor(): Boolean {
+        return UnifiedPush.getDistributor(context).isEmpty() ||
+                UnifiedPush.getDistributor(context) == context.packageName
     }
 
     fun getPrivacyFriendlyUpEndpoint(): String? {
-        val endpoint = unifiedPushStore.getEndpointOrToken()
+        val endpoint = getEndpointOrToken()
         if (endpoint.isNullOrEmpty()) return null
         if (isEmbeddedDistributor()) {
             return endpoint
@@ -263,4 +165,14 @@ class UnifiedPushHelper @Inject constructor(
             null
         }
     }
+
+    fun getEndpointOrToken(): String? {
+        return if (isEmbeddedDistributor()) fcmHelper.getFcmToken()
+        else unifiedPushStore.getEndpoint()
+    }
+
+    fun getPushGateway(): String? {
+        return if (isEmbeddedDistributor()) stringProvider.getString(R.string.pusher_http_url)
+        else unifiedPushStore.getPushGateway()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushStore.kt b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushStore.kt
index 07d291a723..0bdfbe8e22 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushStore.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushStore.kt
@@ -17,21 +17,23 @@
 package im.vector.app.core.pushers
 
 import android.content.Context
+import android.content.SharedPreferences
 import androidx.core.content.edit
-import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.di.DefaultPreferences
 import javax.inject.Inject
 
 class UnifiedPushStore @Inject constructor(
-        context: Context,
+        val context: Context,
+        val fcmHelper: FcmHelper,
+        @DefaultPreferences
+        private val defaultPrefs: SharedPreferences,
 ) {
-    private val defaultPrefs = DefaultSharedPreferences.getInstance(context)
-
     /**
      * Retrieves the UnifiedPush Endpoint.
      *
      * @return the UnifiedPush Endpoint or null if not received
      */
-    fun getEndpointOrToken(): String? {
+    fun getEndpoint(): String? {
         return defaultPrefs.getString(PREFS_ENDPOINT_OR_TOKEN, null)
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/pushers/UnregisterUnifiedPushUseCase.kt b/vector/src/main/java/im/vector/app/core/pushers/UnregisterUnifiedPushUseCase.kt
new file mode 100644
index 0000000000..acad3e649f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/pushers/UnregisterUnifiedPushUseCase.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.pushers
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import im.vector.app.features.settings.BackgroundSyncMode
+import im.vector.app.features.settings.VectorPreferences
+import org.unifiedpush.android.connector.UnifiedPush
+import timber.log.Timber
+import javax.inject.Inject
+
+class UnregisterUnifiedPushUseCase @Inject constructor(
+        @ApplicationContext private val context: Context,
+        private val vectorPreferences: VectorPreferences,
+        private val unifiedPushStore: UnifiedPushStore,
+        private val unifiedPushHelper: UnifiedPushHelper,
+) {
+
+    suspend fun execute(pushersManager: PushersManager?) {
+        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME
+        vectorPreferences.setFdroidSyncBackgroundMode(mode)
+        try {
+            unifiedPushHelper.getEndpointOrToken()?.let {
+                Timber.d("Removing $it")
+                pushersManager?.unregisterPusher(it)
+            }
+        } catch (e: Exception) {
+            Timber.d(e, "Probably unregistering a non existing pusher")
+        }
+        unifiedPushStore.storeUpEndpoint(null)
+        unifiedPushStore.storePushGateway(null)
+        UnifiedPush.unregisterApp(context)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt b/vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
similarity index 56%
rename from vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
rename to vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
index 8e88e44627..04c71e0412 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
@@ -20,20 +20,17 @@ import android.content.Context
 import android.content.Intent
 import android.os.Handler
 import android.os.Looper
-import android.widget.Toast
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.network.WifiDetector
 import im.vector.app.core.pushers.model.PushData
 import im.vector.app.core.resources.BuildMeta
-import im.vector.app.core.services.GuardServiceStarter
 import im.vector.app.features.notifications.NotifiableEventResolver
+import im.vector.app.features.notifications.NotifiableMessageEvent
 import im.vector.app.features.notifications.NotificationActionIds
 import im.vector.app.features.notifications.NotificationDrawerManager
-import im.vector.app.features.settings.BackgroundSyncMode
 import im.vector.app.features.settings.VectorDataStore
 import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.CoroutineScope
@@ -46,30 +43,22 @@ import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
-import org.unifiedpush.android.connector.MessagingReceiver
 import timber.log.Timber
 import javax.inject.Inject
 
 private val loggerTag = LoggerTag("Push", LoggerTag.SYNC)
 
-/**
- * Hilt injection happen at super.onReceive().
- */
-@AndroidEntryPoint
-class VectorMessagingReceiver : MessagingReceiver() {
-    @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
-    @Inject lateinit var notifiableEventResolver: NotifiableEventResolver
-    @Inject lateinit var pushersManager: PushersManager
-    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
-    @Inject lateinit var vectorPreferences: VectorPreferences
-    @Inject lateinit var vectorDataStore: VectorDataStore
-    @Inject lateinit var wifiDetector: WifiDetector
-    @Inject lateinit var guardServiceStarter: GuardServiceStarter
-    @Inject lateinit var unifiedPushHelper: UnifiedPushHelper
-    @Inject lateinit var unifiedPushStore: UnifiedPushStore
-    @Inject lateinit var pushParser: PushParser
-    @Inject lateinit var actionIds: NotificationActionIds
-    @Inject lateinit var buildMeta: BuildMeta
+class VectorPushHandler @Inject constructor(
+    private val notificationDrawerManager: NotificationDrawerManager,
+    private val notifiableEventResolver: NotifiableEventResolver,
+    private val activeSessionHolder: ActiveSessionHolder,
+    private val vectorPreferences: VectorPreferences,
+    private val vectorDataStore: VectorDataStore,
+    private val wifiDetector: WifiDetector,
+    private val actionIds: NotificationActionIds,
+    private val context: Context,
+    private val buildMeta: BuildMeta
+) {
 
     private val coroutineScope = CoroutineScope(SupervisorJob())
 
@@ -81,25 +70,19 @@ class VectorMessagingReceiver : MessagingReceiver() {
     /**
      * Called when message is received.
      *
-     * @param context the Android context
-     * @param message the message
-     * @param instance connection, for multi-account
+     * @param pushData the data received in the push.
      */
-    override fun onMessage(context: Context, message: ByteArray, instance: String) {
-        Timber.tag(loggerTag.value).d("## onMessage() received")
+    fun handle(pushData: PushData) {
+        Timber.tag(loggerTag.value).d("## handling pushData")
 
-        val sMessage = String(message)
         if (buildMeta.lowPrivacyLoggingEnabled) {
-            Timber.tag(loggerTag.value).d("## onMessage() $sMessage")
+            Timber.tag(loggerTag.value).d("## pushData: $pushData")
         }
 
         runBlocking {
             vectorDataStore.incrementPushCounter()
         }
 
-        val pushData = pushParser.parseData(sMessage, unifiedPushHelper.isEmbeddedDistributor())
-                ?: return Unit.also { Timber.tag(loggerTag.value).w("Invalid received data Json format") }
-
         // Diagnostic Push
         if (pushData.eventId == PushersManager.TEST_EVENT_ID) {
             val intent = Intent(actionIds.push)
@@ -117,51 +100,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
                 // we are in foreground, let the sync do the things?
                 Timber.tag(loggerTag.value).d("PUSH received in a foreground state, ignore")
             } else {
-                coroutineScope.launch(Dispatchers.IO) { onMessageReceivedInternal(pushData) }
-            }
-        }
-    }
-
-    override fun onNewEndpoint(context: Context, endpoint: String, instance: String) {
-        Timber.tag(loggerTag.value).i("onNewEndpoint: adding $endpoint")
-        if (vectorPreferences.areNotificationEnabledForDevice() && activeSessionHolder.hasActiveSession()) {
-            // If the endpoint has changed
-            // or the gateway has changed
-            if (unifiedPushStore.getEndpointOrToken() != endpoint) {
-                unifiedPushStore.storeUpEndpoint(endpoint)
-                coroutineScope.launch {
-                    unifiedPushHelper.storeCustomOrDefaultGateway(endpoint) {
-                        unifiedPushStore.getPushGateway()?.let {
-                            pushersManager.enqueueRegisterPusher(endpoint, it)
-                        }
-                    }
-                }
-            } else {
-                Timber.tag(loggerTag.value).i("onNewEndpoint: skipped")
-            }
-        }
-        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_DISABLED
-        vectorPreferences.setFdroidSyncBackgroundMode(mode)
-        guardServiceStarter.stop()
-    }
-
-    override fun onRegistrationFailed(context: Context, instance: String) {
-        Toast.makeText(context, "Push service registration failed", Toast.LENGTH_SHORT).show()
-        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME
-        vectorPreferences.setFdroidSyncBackgroundMode(mode)
-        guardServiceStarter.start()
-    }
-
-    override fun onUnregistered(context: Context, instance: String) {
-        Timber.tag(loggerTag.value).d("Unifiedpush: Unregistered")
-        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME
-        vectorPreferences.setFdroidSyncBackgroundMode(mode)
-        guardServiceStarter.start()
-        runBlocking {
-            try {
-                pushersManager.unregisterPusher(unifiedPushStore.getEndpointOrToken().orEmpty())
-            } catch (e: Exception) {
-                Timber.tag(loggerTag.value).d("Probably unregistering a non existing pusher")
+                coroutineScope.launch(Dispatchers.IO) { handleInternal(pushData) }
             }
         }
     }
@@ -171,15 +110,15 @@ class VectorMessagingReceiver : MessagingReceiver() {
      *
      * @param pushData Object containing message data.
      */
-    private suspend fun onMessageReceivedInternal(pushData: PushData) {
+    private suspend fun handleInternal(pushData: PushData) {
         try {
             if (buildMeta.lowPrivacyLoggingEnabled) {
-                Timber.tag(loggerTag.value).d("## onMessageReceivedInternal() : $pushData")
+                Timber.tag(loggerTag.value).d("## handleInternal() : $pushData")
             } else {
-                Timber.tag(loggerTag.value).d("## onMessageReceivedInternal()")
+                Timber.tag(loggerTag.value).d("## handleInternal()")
             }
 
-            val session = activeSessionHolder.getOrInitializeSession(startSync = false)
+            val session = activeSessionHolder.getOrInitializeSession()
 
             if (session == null) {
                 Timber.tag(loggerTag.value).w("## Can't sync from push, no current session")
@@ -196,7 +135,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
                 }
             }
         } catch (e: Exception) {
-            Timber.tag(loggerTag.value).e(e, "## onMessageReceivedInternal() failed")
+            Timber.tag(loggerTag.value).e(e, "## handleInternal() failed")
         }
     }
 
@@ -204,11 +143,6 @@ class VectorMessagingReceiver : MessagingReceiver() {
         pushData.roomId ?: return
         pushData.eventId ?: return
 
-        // If the room is currently displayed, we will not show a notification, so no need to get the Event faster
-        if (notificationDrawerManager.shouldIgnoreMessageEventInRoom(pushData.roomId)) {
-            return
-        }
-
         if (wifiDetector.isConnectedToWifi().not()) {
             Timber.tag(loggerTag.value).d("No WiFi network, do not get Event")
             return
@@ -219,6 +153,13 @@ class VectorMessagingReceiver : MessagingReceiver() {
 
         val resolvedEvent = notifiableEventResolver.resolveInMemoryEvent(session, event, canBeReplaced = true)
 
+        if (resolvedEvent is NotifiableMessageEvent) {
+            // If the room is currently displayed, we will not show a notification, so no need to get the Event faster
+            if (notificationDrawerManager.shouldIgnoreMessageEventInRoom(resolvedEvent)) {
+                return
+            }
+        }
+
         resolvedEvent
                 ?.also { Timber.tag(loggerTag.value).d("Fast lane: notify drawer") }
                 ?.let {
diff --git a/vector/src/main/java/im/vector/app/core/pushers/VectorUnifiedPushMessagingReceiver.kt b/vector/src/main/java/im/vector/app/core/pushers/VectorUnifiedPushMessagingReceiver.kt
new file mode 100644
index 0000000000..838cbd5935
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/pushers/VectorUnifiedPushMessagingReceiver.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.pushers
+
+import android.content.Context
+import android.widget.Toast
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.services.GuardServiceStarter
+import im.vector.app.features.settings.BackgroundSyncMode
+import im.vector.app.features.settings.VectorPreferences
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.matrix.android.sdk.api.logger.LoggerTag
+import org.unifiedpush.android.connector.MessagingReceiver
+import timber.log.Timber
+import javax.inject.Inject
+
+private val loggerTag = LoggerTag("Push", LoggerTag.SYNC)
+
+/**
+ * Hilt injection happen at super.onReceive().
+ */
+@AndroidEntryPoint
+class VectorUnifiedPushMessagingReceiver : MessagingReceiver() {
+    @Inject lateinit var pushersManager: PushersManager
+    @Inject lateinit var pushParser: PushParser
+    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var vectorPushHandler: VectorPushHandler
+    @Inject lateinit var guardServiceStarter: GuardServiceStarter
+    @Inject lateinit var unifiedPushStore: UnifiedPushStore
+    @Inject lateinit var unifiedPushHelper: UnifiedPushHelper
+
+    private val coroutineScope = CoroutineScope(SupervisorJob())
+
+    /**
+     * Called when message is received.
+     *
+     * @param context the Android context
+     * @param message the message
+     * @param instance connection, for multi-account
+     */
+    override fun onMessage(context: Context, message: ByteArray, instance: String) {
+        Timber.tag(loggerTag.value).d("New message")
+        pushParser.parsePushDataUnifiedPush(message)?.let {
+            vectorPushHandler.handle(it)
+        } ?: run {
+            Timber.tag(loggerTag.value).w("Invalid received data Json format")
+        }
+    }
+
+    override fun onNewEndpoint(context: Context, endpoint: String, instance: String) {
+        Timber.tag(loggerTag.value).i("onNewEndpoint: adding $endpoint")
+        if (vectorPreferences.areNotificationEnabledForDevice() && activeSessionHolder.hasActiveSession()) {
+            // If the endpoint has changed
+            // or the gateway has changed
+            if (unifiedPushHelper.getEndpointOrToken() != endpoint) {
+                unifiedPushStore.storeUpEndpoint(endpoint)
+                coroutineScope.launch {
+                    unifiedPushHelper.storeCustomOrDefaultGateway(endpoint) {
+                        unifiedPushHelper.getPushGateway()?.let {
+                            pushersManager.enqueueRegisterPusher(endpoint, it)
+                        }
+                    }
+                }
+            } else {
+                Timber.tag(loggerTag.value).i("onNewEndpoint: skipped")
+            }
+        }
+        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_DISABLED
+        vectorPreferences.setFdroidSyncBackgroundMode(mode)
+        guardServiceStarter.stop()
+    }
+
+    override fun onRegistrationFailed(context: Context, instance: String) {
+        Toast.makeText(context, "Push service registration failed", Toast.LENGTH_SHORT).show()
+        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME
+        vectorPreferences.setFdroidSyncBackgroundMode(mode)
+        guardServiceStarter.start()
+    }
+
+    override fun onUnregistered(context: Context, instance: String) {
+        Timber.tag(loggerTag.value).d("Unifiedpush: Unregistered")
+        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME
+        vectorPreferences.setFdroidSyncBackgroundMode(mode)
+        guardServiceStarter.start()
+        runBlocking {
+            try {
+                pushersManager.unregisterPusher(unifiedPushHelper.getEndpointOrToken().orEmpty())
+            } catch (e: Exception) {
+                Timber.tag(loggerTag.value).d("Probably unregistering a non existing pusher")
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/pushers/model/PushDataFcm.kt b/vector/src/main/java/im/vector/app/core/pushers/model/PushDataFcm.kt
index 1b9c37ae0a..e78cdf5ff8 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/model/PushDataFcm.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/model/PushDataFcm.kt
@@ -16,8 +16,6 @@
 
 package im.vector.app.core.pushers.model
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.MatrixPatterns
 
 /**
@@ -32,11 +30,10 @@ import org.matrix.android.sdk.api.MatrixPatterns
  * </pre>
  * .
  */
-@JsonClass(generateAdapter = true)
 data class PushDataFcm(
-        @Json(name = "event_id") val eventId: String?,
-        @Json(name = "room_id") val roomId: String?,
-        @Json(name = "unread") var unread: Int?,
+        val eventId: String?,
+        val roomId: String?,
+        var unread: Int?,
 )
 
 fun PushDataFcm.toPushData() = PushData(
diff --git a/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
index 3b6a8b595c..a25862f3a8 100644
--- a/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
@@ -21,9 +21,14 @@ import im.vector.app.core.utils.getApplicationLabel
 import timber.log.Timber
 import javax.inject.Inject
 
-class AppNameProvider @Inject constructor(private val context: Context) {
+interface AppNameProvider {
 
-    fun getAppName(): String {
+    fun getAppName(): String
+}
+
+class DefaultAppNameProvider @Inject constructor(private val context: Context) : AppNameProvider {
+
+    override fun getAppName(): String {
         return try {
             val appPackageName = context.applicationContext.packageName
             var appName = context.getApplicationLabel(appPackageName)
diff --git a/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt b/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
index 6c25348ea1..ddc6f992a9 100644
--- a/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
@@ -24,7 +24,6 @@ data class BuildMeta(
         val gitRevision: String,
         val gitRevisionDate: String,
         val gitBranchName: String,
-        val buildNumber: String,
         val flavorDescription: String,
         val flavorShortDescription: String,
 )
diff --git a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
index d91a09e6df..3bdbc64eb4 100644
--- a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
@@ -23,9 +23,14 @@ import androidx.core.os.ConfigurationCompat
 import java.util.Locale
 import javax.inject.Inject
 
-class LocaleProvider @Inject constructor(private val resources: Resources) {
+interface LocaleProvider {
 
-    fun current(): Locale {
+    fun current(): Locale
+}
+
+class DefaultLocaleProvider @Inject constructor(private val resources: Resources) : LocaleProvider {
+
+    override fun current(): Locale {
         return ConfigurationCompat.getLocales(resources.configuration).get(0) ?: Locale.getDefault()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt b/vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt
index 1e136bbcc2..edb99d472f 100644
--- a/vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt
@@ -19,6 +19,7 @@ package im.vector.app.core.resources
 import android.content.Context
 import android.os.Build
 import androidx.annotation.NonNull
+import org.matrix.android.sdk.api.util.getPackageInfoCompat
 import javax.inject.Inject
 
 class VersionCodeProvider @Inject constructor(private val context: Context) {
@@ -28,7 +29,7 @@ class VersionCodeProvider @Inject constructor(private val context: Context) {
      */
     @NonNull
     fun getVersionCode(): Long {
-        val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+        val packageInfo = context.packageManager.getPackageInfoCompat(context.packageName, 0)
 
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             packageInfo.longVersionCode
diff --git a/vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt b/vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt
index 829fec1652..4925adf69d 100644
--- a/vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt
+++ b/vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt
@@ -23,6 +23,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import java.lang.ref.WeakReference
 
 class BluetoothHeadsetReceiver : BroadcastReceiver() {
@@ -59,7 +60,7 @@ class BluetoothHeadsetReceiver : BroadcastReceiver() {
             else -> return // ignore intermediate states
         }
 
-        val device = intent.getParcelableExtra<BluetoothDevice>(BluetoothDevice.EXTRA_DEVICE)
+        val device = intent.getParcelableExtraCompat<BluetoothDevice>(BluetoothDevice.EXTRA_DEVICE)
         val deviceName = device?.name
         when (device?.bluetoothClass?.deviceClass) {
             BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE,
diff --git a/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt b/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt
index 7a078ce1c8..a4e3872e0f 100644
--- a/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt
@@ -28,6 +28,7 @@ import androidx.media.session.MediaButtonReceiver
 import com.airbnb.mvrx.Mavericks
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.singletonEntryPoint
+import im.vector.app.core.extensions.startForegroundCompat
 import im.vector.app.features.call.CallArgs
 import im.vector.app.features.call.VectorCallActivity
 import im.vector.app.features.call.telecom.CallConnection
@@ -39,6 +40,8 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.popup.IncomingCallAlert
 import im.vector.app.features.popup.PopupAlertManager
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
+import im.vector.lib.core.utils.compat.getSerializableExtraCompat
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.room.model.call.EndCallReason
 import org.matrix.android.sdk.api.util.MatrixItem
@@ -71,7 +74,7 @@ class CallAndroidService : VectorAndroidService() {
     private var mediaSession: MediaSessionCompat? = null
     private val mediaSessionButtonCallback = object : MediaSessionCompat.Callback() {
         override fun onMediaButtonEvent(mediaButtonEvent: Intent?): Boolean {
-            val keyEvent = mediaButtonEvent?.getParcelableExtra<KeyEvent>(Intent.EXTRA_KEY_EVENT) ?: return false
+            val keyEvent = mediaButtonEvent?.getParcelableExtraCompat<KeyEvent>(Intent.EXTRA_KEY_EVENT) ?: return false
             if (keyEvent.keyCode == KeyEvent.KEYCODE_HEADSETHOOK) {
                 callManager.headSetButtonTapped()
                 return true
@@ -158,7 +161,7 @@ class CallAndroidService : VectorAndroidService() {
         val incomingCallAlert = IncomingCallAlert(callId,
                 shouldBeDisplayedIn = { activity ->
                     if (activity is VectorCallActivity) {
-                        activity.intent.getParcelableExtra<CallArgs>(Mavericks.KEY_ARG)?.callId != call.callId
+                        activity.intent.getParcelableExtraCompat<CallArgs>(Mavericks.KEY_ARG)?.callId != call.callId
                     } else true
                 }
         ).apply {
@@ -179,7 +182,7 @@ class CallAndroidService : VectorAndroidService() {
                 fromBg = fromBg
         )
         if (knownCalls.isEmpty()) {
-            startForeground(callId.hashCode(), notification)
+            startForegroundCompat(callId.hashCode(), notification)
         } else {
             notificationManager.notify(callId.hashCode(), notification)
         }
@@ -188,7 +191,7 @@ class CallAndroidService : VectorAndroidService() {
 
     private fun handleCallTerminated(intent: Intent) {
         val callId = intent.getStringExtra(EXTRA_CALL_ID) ?: ""
-        val endCallReason = intent.getSerializableExtra(EXTRA_END_CALL_REASON) as EndCallReason
+        val endCallReason = intent.getSerializableExtraCompat<EndCallReason>(EXTRA_END_CALL_REASON)
         val rejected = intent.getBooleanExtra(EXTRA_END_CALL_REJECTED, false)
         alertManager.cancelAlert(callId)
         val terminatedCall = knownCalls.remove(callId)
@@ -199,10 +202,10 @@ class CallAndroidService : VectorAndroidService() {
         }
         val notification = notificationUtils.buildCallEndedNotification(false)
         val notificationId = callId.hashCode()
-        startForeground(notificationId, notification)
+        startForegroundCompat(notificationId, notification)
         if (knownCalls.isEmpty()) {
             Timber.tag(loggerTag.value).v("No more call, stop the service")
-            stopForeground(true)
+            stopForegroundCompat()
             mediaSession?.isActive = false
             myStopSelf()
         }
@@ -234,7 +237,7 @@ class CallAndroidService : VectorAndroidService() {
                 title = callInformation.opponentMatrixItem?.getBestName() ?: callInformation.opponentUserId
         )
         if (knownCalls.isEmpty()) {
-            startForeground(callId.hashCode(), notification)
+            startForegroundCompat(callId.hashCode(), notification)
         } else {
             notificationManager.notify(callId.hashCode(), notification)
         }
@@ -258,7 +261,7 @@ class CallAndroidService : VectorAndroidService() {
                 title = callInformation.opponentMatrixItem?.getBestName() ?: callInformation.opponentUserId
         )
         if (knownCalls.isEmpty()) {
-            startForeground(callId.hashCode(), notification)
+            startForegroundCompat(callId.hashCode(), notification)
         } else {
             notificationManager.notify(callId.hashCode(), notification)
         }
@@ -271,9 +274,9 @@ class CallAndroidService : VectorAndroidService() {
         callRingPlayerOutgoing?.stop()
         val notification = notificationUtils.buildCallEndedNotification(false)
         if (callId != null) {
-            startForeground(callId.hashCode(), notification)
+            startForegroundCompat(callId.hashCode(), notification)
         } else {
-            startForeground(DEFAULT_NOTIFICATION_ID, notification)
+            startForegroundCompat(DEFAULT_NOTIFICATION_ID, notification)
         }
         if (knownCalls.isEmpty()) {
             mediaSession?.isActive = false
diff --git a/vector/src/main/java/im/vector/app/core/services/VectorAndroidService.kt b/vector/src/main/java/im/vector/app/core/services/VectorAndroidService.kt
index f30a74e9de..04fc746b14 100644
--- a/vector/src/main/java/im/vector/app/core/services/VectorAndroidService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/VectorAndroidService.kt
@@ -18,6 +18,7 @@ package im.vector.app.core.services
 
 import android.app.Service
 import android.content.Intent
+import android.os.Build
 import android.os.IBinder
 import timber.log.Timber
 
@@ -55,4 +56,13 @@ abstract class VectorAndroidService : Service() {
     override fun onBind(intent: Intent?): IBinder? {
         return null
     }
+
+    protected fun stopForegroundCompat() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        } else {
+            @Suppress("DEPRECATION")
+            stopForeground(true)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/services/VectorSyncAndroidService.kt b/vector/src/main/java/im/vector/app/core/services/VectorSyncAndroidService.kt
index 864f69a136..f746c0749b 100644
--- a/vector/src/main/java/im/vector/app/core/services/VectorSyncAndroidService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/VectorSyncAndroidService.kt
@@ -32,6 +32,7 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
+import im.vector.app.core.extensions.startForegroundCompat
 import im.vector.app.core.platform.PendingIntentCompat
 import im.vector.app.core.time.Clock
 import im.vector.app.core.time.DefaultClock
@@ -98,7 +99,7 @@ class VectorSyncAndroidService : SyncAndroidService() {
             R.string.notification_listening_for_notifications
         }
         val notification = notificationUtils.buildForegroundServiceNotification(notificationSubtitleRes, false)
-        startForeground(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE, notification)
+        startForegroundCompat(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE, notification)
     }
 
     override fun onRescheduleAsked(
diff --git a/vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.kt b/vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.kt
new file mode 100644
index 0000000000..c6a2635e6c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import im.vector.app.core.extensions.startSyncing
+import im.vector.app.core.notification.NotificationsSettingUpdater
+import im.vector.app.core.session.clientinfo.UpdateMatrixClientInfoUseCase
+import im.vector.app.features.call.webrtc.WebRtcCallManager
+import im.vector.app.features.session.coroutineScope
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.devices.v2.notification.UpdateNotificationSettingsAccountDataUseCase
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+import timber.log.Timber
+import javax.inject.Inject
+
+class ConfigureAndStartSessionUseCase @Inject constructor(
+        @ApplicationContext private val context: Context,
+        private val webRtcCallManager: WebRtcCallManager,
+        private val updateMatrixClientInfoUseCase: UpdateMatrixClientInfoUseCase,
+        private val vectorPreferences: VectorPreferences,
+        private val notificationsSettingUpdater: NotificationsSettingUpdater,
+        private val updateNotificationSettingsAccountDataUseCase: UpdateNotificationSettingsAccountDataUseCase,
+) {
+
+    fun execute(session: Session, startSyncing: Boolean = true) {
+        Timber.i("Configure and start session for ${session.myUserId}. startSyncing: $startSyncing")
+        session.open()
+        if (startSyncing) {
+            session.startSyncing(context)
+        }
+        session.pushersService().refreshPushers()
+        webRtcCallManager.checkForProtocolsSupportIfNeeded()
+        updateMatrixClientInfoIfNeeded(session)
+        createNotificationSettingsAccountDataIfNeeded(session)
+        notificationsSettingUpdater.onSessionStarted(session)
+    }
+
+    private fun updateMatrixClientInfoIfNeeded(session: Session) {
+        session.coroutineScope.launch {
+            if (vectorPreferences.isClientInfoRecordingEnabled()) {
+                updateMatrixClientInfoUseCase.execute(session)
+            }
+        }
+    }
+
+    private fun createNotificationSettingsAccountDataIfNeeded(session: Session) {
+        session.coroutineScope.launch {
+            updateNotificationSettingsAccountDataUseCase.execute(session)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/session/clientinfo/DeleteMatrixClientInfoUseCase.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/DeleteMatrixClientInfoUseCase.kt
new file mode 100644
index 0000000000..bab3af9af5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/DeleteMatrixClientInfoUseCase.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import im.vector.app.core.di.ActiveSessionHolder
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * This use case delete the account data event containing extended client info.
+ */
+class DeleteMatrixClientInfoUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val setMatrixClientInfoUseCase: SetMatrixClientInfoUseCase,
+) {
+
+    suspend fun execute(): Result<Unit> = runCatching {
+        Timber.d("deleting recorded client info")
+        val session = activeSessionHolder.getActiveSession()
+        val emptyClientInfo = MatrixClientInfoContent(
+                name = "",
+                version = "",
+                url = "",
+        )
+        return setMatrixClientInfoUseCase.execute(session, emptyClientInfo)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/session/clientinfo/DeleteUnusedClientInformationUseCase.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/DeleteUnusedClientInformationUseCase.kt
new file mode 100644
index 0000000000..dcd5c58480
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/DeleteUnusedClientInformationUseCase.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import im.vector.app.core.di.ActiveSessionHolder
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import javax.inject.Inject
+
+class DeleteUnusedClientInformationUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+
+    suspend fun execute(deviceInfoList: List<DeviceInfo>): Result<Unit> = runCatching {
+        // A defensive approach against local storage reports an empty device list (although it is not a seen situation).
+        if (deviceInfoList.isEmpty()) return Result.success(Unit)
+
+        val expectedClientInfoKeyList = deviceInfoList.map { MATRIX_CLIENT_INFO_KEY_PREFIX + it.deviceId }
+        activeSessionHolder
+                .getSafeActiveSession()
+                ?.accountDataService()
+                ?.getUserAccountDataEventsStartWith(MATRIX_CLIENT_INFO_KEY_PREFIX)
+                ?.map { it.type }
+                ?.subtract(expectedClientInfoKeyList.toSet())
+                ?.forEach { userAccountDataKeyToDelete ->
+                    activeSessionHolder.getSafeActiveSession()?.accountDataService()?.deleteUserAccountData(userAccountDataKeyToDelete)
+                }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCase.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCase.kt
new file mode 100644
index 0000000000..18b731ea09
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCase.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.toModel
+import javax.inject.Inject
+
+/**
+ * This use case retrieves the current account data event containing extended client info
+ * for a given deviceId.
+ */
+class GetMatrixClientInfoUseCase @Inject constructor() {
+
+    fun execute(session: Session, deviceId: String): MatrixClientInfoContent? {
+        val type = MATRIX_CLIENT_INFO_KEY_PREFIX + deviceId
+        val content = session.accountDataService().getUserAccountDataEvent(type)?.content
+        return content.toModel()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/session/clientinfo/MatrixClientInfoContent.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/MatrixClientInfoContent.kt
new file mode 100644
index 0000000000..aacee6edef
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/MatrixClientInfoContent.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class MatrixClientInfoContent(
+        // app name
+        @Json(name = "name")
+        val name: String? = null,
+        // app version
+        @Json(name = "version")
+        val version: String? = null,
+        // app url (optional, applicable only for web)
+        @Json(name = "url")
+        val url: String? = null,
+)
diff --git a/vector/src/main/java/im/vector/app/core/session/clientinfo/NoDeviceIdError.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/NoDeviceIdError.kt
new file mode 100644
index 0000000000..c2b4445205
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/NoDeviceIdError.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+class NoDeviceIdError : IllegalStateException("device id is empty")
diff --git a/vector/src/main/java/im/vector/app/core/session/clientinfo/SessionExtendedInfoConstants.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/SessionExtendedInfoConstants.kt
new file mode 100644
index 0000000000..663a715e02
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/SessionExtendedInfoConstants.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+/**
+ * Prefix for the key account data event which holds client info.
+ */
+internal const val MATRIX_CLIENT_INFO_KEY_PREFIX = "io.element.matrix_client_information."
diff --git a/vector/src/main/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCase.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCase.kt
new file mode 100644
index 0000000000..5ec428eed0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCase.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.toContent
+import javax.inject.Inject
+
+/**
+ * This use case sets the account data event containing extended client info.
+ */
+class SetMatrixClientInfoUseCase @Inject constructor() {
+
+    suspend fun execute(session: Session, clientInfo: MatrixClientInfoContent): Result<Unit> = runCatching {
+        val deviceId = session.sessionParams.deviceId.orEmpty()
+        if (deviceId.isNotEmpty()) {
+            val type = MATRIX_CLIENT_INFO_KEY_PREFIX + deviceId
+            session.accountDataService()
+                    .updateUserAccountData(type, clientInfo.toContent())
+        } else {
+            throw NoDeviceIdError()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCase.kt b/vector/src/main/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCase.kt
new file mode 100644
index 0000000000..a46ca4eedb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCase.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import im.vector.app.core.resources.AppNameProvider
+import im.vector.app.core.resources.BuildMeta
+import org.matrix.android.sdk.api.session.Session
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * This use case updates if needed the account data event containing extended client info.
+ */
+class UpdateMatrixClientInfoUseCase @Inject constructor(
+        private val appNameProvider: AppNameProvider,
+        private val buildMeta: BuildMeta,
+        private val getMatrixClientInfoUseCase: GetMatrixClientInfoUseCase,
+        private val setMatrixClientInfoUseCase: SetMatrixClientInfoUseCase,
+) {
+
+    suspend fun execute(session: Session) = runCatching {
+        val clientInfo = MatrixClientInfoContent(
+                name = appNameProvider.getAppName(),
+                version = buildMeta.versionName
+        )
+        val deviceId = session.sessionParams.deviceId.orEmpty()
+        if (deviceId.isNotEmpty()) {
+            val storedClientInfo = getMatrixClientInfoUseCase.execute(session, deviceId)
+            Timber.d("storedClientInfo=$storedClientInfo, current client info=$clientInfo")
+            if (clientInfo != storedClientInfo) {
+                Timber.d("client info need to be updated")
+                return setMatrixClientInfoUseCase.execute(session, clientInfo)
+            }
+        } else {
+            throw NoDeviceIdError()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
index a3e8b3780c..ca3e6a360a 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
@@ -38,6 +38,10 @@ class BottomSheetActionButton @JvmOverloads constructor(
 ) : FrameLayout(context, attrs, defStyleAttr) {
     val views: ViewBottomSheetActionButtonBinding
 
+    override fun setOnClickListener(l: OnClickListener?) {
+        views.bottomSheetActionClickableZone.setOnClickListener(l)
+    }
+
     var title: String? = null
         set(value) {
             field = value
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt b/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
index e789585b63..f0a42dd78d 100755
--- a/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
@@ -20,11 +20,10 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.edit
 import androidx.core.view.isVisible
 import im.vector.app.R
-import im.vector.app.core.di.DefaultSharedPreferences
 import im.vector.app.databinding.ViewKeysBackupBannerBinding
+import im.vector.app.features.workers.signout.BannerState
 import timber.log.Timber
 
 /**
@@ -38,16 +37,12 @@ class KeysBackupBanner @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), View.OnClickListener {
 
     var delegate: Delegate? = null
-    private var state: State = State.Initial
+    private var state: BannerState = BannerState.Initial
 
     private lateinit var views: ViewKeysBackupBannerBinding
 
     init {
         setupView()
-        DefaultSharedPreferences.getInstance(context).edit {
-            putBoolean(BANNER_SETUP_DO_NOT_SHOW_AGAIN, false)
-            putString(BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION, "")
-        }
     }
 
     /**
@@ -56,7 +51,7 @@ class KeysBackupBanner @JvmOverloads constructor(
      * @param newState the newState representing the view
      * @param force true to force the rendering of the view
      */
-    fun render(newState: State, force: Boolean = false) {
+    fun render(newState: BannerState, force: Boolean = false) {
         if (newState == state && !force) {
             Timber.v("State unchanged")
             return
@@ -67,48 +62,26 @@ class KeysBackupBanner @JvmOverloads constructor(
 
         hideAll()
         when (newState) {
-            State.Initial -> renderInitial()
-            State.Hidden -> renderHidden()
-            is State.Setup -> renderSetup(newState.numberOfKeys)
-            is State.Recover -> renderRecover(newState.version)
-            is State.Update -> renderUpdate(newState.version)
-            State.BackingUp -> renderBackingUp()
+            BannerState.Initial -> renderInitial()
+            BannerState.Hidden -> renderHidden()
+            is BannerState.Setup -> renderSetup(newState)
+            is BannerState.Recover -> renderRecover(newState)
+            is BannerState.Update -> renderUpdate(newState)
+            BannerState.BackingUp -> renderBackingUp()
         }
     }
 
     override fun onClick(v: View?) {
         when (state) {
-            is State.Setup -> delegate?.setupKeysBackup()
-            is State.Update,
-            is State.Recover -> delegate?.recoverKeysBackup()
+            is BannerState.Setup -> delegate?.setupKeysBackup()
+            is BannerState.Update,
+            is BannerState.Recover -> delegate?.recoverKeysBackup()
             else -> Unit
         }
     }
 
     private fun onCloseClicked() {
-        state.let {
-            when (it) {
-                is State.Setup -> {
-                    DefaultSharedPreferences.getInstance(context).edit {
-                        putBoolean(BANNER_SETUP_DO_NOT_SHOW_AGAIN, true)
-                    }
-                }
-                is State.Recover -> {
-                    DefaultSharedPreferences.getInstance(context).edit {
-                        putString(BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION, it.version)
-                    }
-                }
-                is State.Update -> {
-                    DefaultSharedPreferences.getInstance(context).edit {
-                        putString(BANNER_UPDATE_DO_NOT_SHOW_FOR_VERSION, it.version)
-                    }
-                }
-                else -> {
-                    // Should not happen, close button is not displayed in other cases
-                }
-            }
-        }
-
+        delegate?.onCloseClicked()
         // Force refresh
         render(state, true)
     }
@@ -133,9 +106,8 @@ class KeysBackupBanner @JvmOverloads constructor(
         isVisible = false
     }
 
-    private fun renderSetup(nbOfKeys: Int) {
-        if (nbOfKeys == 0 ||
-                DefaultSharedPreferences.getInstance(context).getBoolean(BANNER_SETUP_DO_NOT_SHOW_AGAIN, false)) {
+    private fun renderSetup(state: BannerState.Setup) {
+        if (state.numberOfKeys == 0 || state.doNotShowAgain) {
             // Do not display the setup banner if there is no keys to backup, or if the user has already closed it
             isVisible = false
         } else {
@@ -148,8 +120,8 @@ class KeysBackupBanner @JvmOverloads constructor(
         }
     }
 
-    private fun renderRecover(version: String) {
-        if (version == DefaultSharedPreferences.getInstance(context).getString(BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION, null)) {
+    private fun renderRecover(state: BannerState.Recover) {
+        if (state.version == state.doNotShowForVersion) {
             isVisible = false
         } else {
             isVisible = true
@@ -161,8 +133,8 @@ class KeysBackupBanner @JvmOverloads constructor(
         }
     }
 
-    private fun renderUpdate(version: String) {
-        if (version == DefaultSharedPreferences.getInstance(context).getString(BANNER_UPDATE_DO_NOT_SHOW_FOR_VERSION, null)) {
+    private fun renderUpdate(state: BannerState.Update) {
+        if (state.version == state.doNotShowForVersion) {
             isVisible = false
         } else {
             isVisible = true
@@ -191,61 +163,12 @@ class KeysBackupBanner @JvmOverloads constructor(
         views.viewKeysBackupBannerLoading.isVisible = false
     }
 
-    /**
-     * The state representing the view.
-     * It can take one state at a time.
-     */
-    sealed class State {
-        // Not yet rendered
-        object Initial : State()
-
-        // View will be Gone
-        object Hidden : State()
-
-        // Keys backup is not setup, numberOfKeys is the number of locally stored keys
-        data class Setup(val numberOfKeys: Int) : State()
-
-        // Keys backup can be recovered, with version from the server
-        data class Recover(val version: String) : State()
-
-        // Keys backup can be updated
-        data class Update(val version: String) : State()
-
-        // Keys are backing up
-        object BackingUp : State()
-    }
-
     /**
      * An interface to delegate some actions to another object.
      */
     interface Delegate {
+        fun onCloseClicked()
         fun setupKeysBackup()
         fun recoverKeysBackup()
     }
-
-    companion object {
-        /**
-         * Preference key for setup. Value is a boolean.
-         */
-        private const val BANNER_SETUP_DO_NOT_SHOW_AGAIN = "BANNER_SETUP_DO_NOT_SHOW_AGAIN"
-
-        /**
-         * Preference key for recover. Value is a backup version (String).
-         */
-        private const val BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION = "BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION"
-
-        /**
-         * Preference key for update. Value is a backup version (String).
-         */
-        private const val BANNER_UPDATE_DO_NOT_SHOW_FOR_VERSION = "BANNER_UPDATE_DO_NOT_SHOW_FOR_VERSION"
-
-        /**
-         * Inform the banner that a Recover has been done for this version, so do not show the Recover banner for this version.
-         */
-        fun onRecoverDoneForVersion(context: Context, version: String) {
-            DefaultSharedPreferences.getInstance(context).edit {
-                putString(BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION, version)
-            }
-        }
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt
index 4d947f134b..34714d97d0 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt
@@ -22,7 +22,9 @@ import androidx.annotation.DrawableRes
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.view.isVisible
 import im.vector.app.R
+import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
 import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
 
 class ShieldImageView @JvmOverloads constructor(
         context: Context,
@@ -36,6 +38,31 @@ class ShieldImageView @JvmOverloads constructor(
         }
     }
 
+    /**
+     * Renders device shield with the support of unknown shields instead of black shields which is used for rooms.
+     * @param roomEncryptionTrustLevel trust level that is usually calculated with [im.vector.app.features.settings.devices.TrustUtils.shieldForTrust]
+     * @param borderLess if true then the shield icon with border around is used
+     */
+    fun renderDeviceShield(roomEncryptionTrustLevel: RoomEncryptionTrustLevel?, borderLess: Boolean = false) {
+        when (roomEncryptionTrustLevel) {
+            null -> {
+                contentDescription = context.getString(R.string.a11y_trust_level_warning)
+                setImageResource(
+                        if (borderLess) R.drawable.ic_shield_warning_no_border
+                        else R.drawable.ic_shield_warning
+                )
+            }
+            RoomEncryptionTrustLevel.Default -> {
+                contentDescription = context.getString(R.string.a11y_trust_level_default)
+                setImageResource(
+                        if (borderLess) R.drawable.ic_shield_unknown_no_border
+                        else R.drawable.ic_shield_unknown
+                )
+            }
+            else -> render(roomEncryptionTrustLevel, borderLess)
+        }
+    }
+
     fun render(roomEncryptionTrustLevel: RoomEncryptionTrustLevel?, borderLess: Boolean = false) {
         isVisible = roomEncryptionTrustLevel != null
 
@@ -68,6 +95,68 @@ class ShieldImageView @JvmOverloads constructor(
             null -> Unit
         }
     }
+
+    fun renderE2EDecoration(decoration: E2EDecoration?) {
+        isVisible = true
+        when (decoration) {
+            E2EDecoration.WARN_IN_CLEAR -> {
+                contentDescription = context.getString(R.string.unencrypted)
+                setImageResource(R.drawable.ic_shield_warning)
+            }
+            E2EDecoration.WARN_SENT_BY_UNVERIFIED -> {
+                contentDescription = context.getString(R.string.encrypted_unverified)
+                setImageResource(R.drawable.ic_shield_warning)
+            }
+            E2EDecoration.WARN_SENT_BY_UNKNOWN -> {
+                contentDescription = context.getString(R.string.encrypted_unverified)
+                setImageResource(R.drawable.ic_shield_warning)
+            }
+            E2EDecoration.WARN_SENT_BY_DELETED_SESSION -> {
+                contentDescription = context.getString(R.string.encrypted_unverified)
+                setImageResource(R.drawable.ic_shield_warning)
+            }
+            E2EDecoration.WARN_UNSAFE_KEY -> {
+                contentDescription = context.getString(R.string.key_authenticity_not_guaranteed)
+                setImageResource(
+                        R.drawable.ic_shield_gray
+                )
+            }
+            E2EDecoration.NONE,
+            null -> {
+                contentDescription = null
+                isVisible = false
+            }
+        }
+    }
+
+    fun renderUser(userVerificationLevel: UserVerificationLevel?, borderLess: Boolean = false) {
+        isVisible = userVerificationLevel != null
+        when (userVerificationLevel) {
+            UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED -> {
+                contentDescription = context.getString(R.string.a11y_trust_level_trusted)
+                setImageResource(
+                        if (borderLess) R.drawable.ic_shield_trusted_no_border
+                        else R.drawable.ic_shield_trusted
+                )
+            }
+            UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY,
+            UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED -> {
+                contentDescription = context.getString(R.string.a11y_trust_level_warning)
+                setImageResource(
+                        if (borderLess) R.drawable.ic_shield_warning_no_border
+                        else R.drawable.ic_shield_warning
+                )
+            }
+            UserVerificationLevel.WAS_NEVER_VERIFIED -> {
+                contentDescription = context.getString(R.string.a11y_trust_level_default)
+                setImageResource(
+                        if (borderLess) R.drawable.ic_shield_black_no_border
+                        else R.drawable.ic_shield_black
+                )
+            }
+            null -> Unit
+        }
+    }
 }
 
 @DrawableRes
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageView.kt
index 263f043fad..b6dc404d01 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageView.kt
@@ -48,9 +48,4 @@ class TypingMessageView @JvmOverloads constructor(
         views.typingUserText.text = typingHelper.getNotificationTypingMessage(typingUsers)
         views.typingUserAvatars.render(typingUsers, avatarRenderer)
     }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        removeAllViews()
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/utils/CopyToClipboardUseCase.kt b/vector/src/main/java/im/vector/app/core/utils/CopyToClipboardUseCase.kt
new file mode 100644
index 0000000000..19ad9e2bba
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/utils/CopyToClipboardUseCase.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.utils
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import androidx.core.content.getSystemService
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class CopyToClipboardUseCase @Inject constructor(
+        @ApplicationContext private val context: Context,
+) {
+
+    fun execute(text: CharSequence) {
+        context.getSystemService<ClipboardManager>()
+                ?.setPrimaryClip(ClipData.newPlainText("", text))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExpandingBottomSheetBehavior.kt b/vector/src/main/java/im/vector/app/core/utils/ExpandingBottomSheetBehavior.kt
new file mode 100644
index 0000000000..47326bca76
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/utils/ExpandingBottomSheetBehavior.kt
@@ -0,0 +1,798 @@
+package im.vector.app.core.utils
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.VelocityTracker
+import android.view.View
+import android.view.View.MeasureSpec
+import android.view.ViewGroup
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsAnimationCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.children
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import androidx.customview.widget.ViewDragHelper
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import timber.log.Timber
+import java.lang.ref.WeakReference
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * BottomSheetBehavior that dynamically resizes its contents as it grows or shrinks.
+ * Most of the nested scrolling and touch events code is the same as in [BottomSheetBehavior], but we couldn't just extend it.
+ */
+class ExpandingBottomSheetBehavior<V : View> : CoordinatorLayout.Behavior<V> {
+
+    companion object {
+        /** Gets a [ExpandingBottomSheetBehavior] from the passed [view] if it exists. */
+        @Suppress("UNCHECKED_CAST")
+        fun <V : View> from(view: V): ExpandingBottomSheetBehavior<V>? {
+            val params = view.layoutParams as? CoordinatorLayout.LayoutParams ?: return null
+            return params.behavior as? ExpandingBottomSheetBehavior<V>
+        }
+    }
+
+    /** [Callback] to notify changes in dragging state and position. */
+    interface Callback {
+        /** Called when the dragging state of the BottomSheet changes. */
+        fun onStateChanged(state: State) {}
+
+        /** Called when the position of the BottomSheet changes while dragging. */
+        fun onSlidePositionChanged(view: View, yPosition: Float) {}
+    }
+
+    /** Represents the 4 possible states of the BottomSheet. */
+    enum class State(val value: Int) {
+        /** BottomSheet is at min height, collapsed at the bottom. */
+        Collapsed(0),
+
+        /** BottomSheet is being dragged by the user. */
+        Dragging(1),
+
+        /** BottomSheet has been released after being dragged by the user and is animating to its destination. */
+        Settling(2),
+
+        /** BottomSheet is at its max height. */
+        Expanded(3);
+
+        /** Returns whether the BottomSheet is being dragged or is settling after being dragged. */
+        fun isDraggingOrSettling(): Boolean = this == Dragging || this == Settling
+    }
+
+    /** Set to true to enable debug logging of sizes and offsets. Defaults to `false`. */
+    var enableDebugLogs = false
+
+    /** Current BottomSheet state. Default to [State.Collapsed]. */
+    var state: State = State.Collapsed
+        private set
+
+    /** Whether the BottomSheet can be dragged by the user or not. Defaults to `true`. */
+    var isDraggable = true
+
+    /** [Callback] to notify changes in dragging state and position. */
+    var callback: Callback? = null
+        set(value) {
+            field = value
+            // Send initial state
+            value?.onStateChanged(state)
+        }
+
+    /** Additional top offset in `dps` to add to the BottomSheet so it doesn't fill the whole screen. Defaults to `0`. */
+    var topOffset = 0
+        set(value) {
+            field = value
+            expandedOffset = -1
+        }
+
+    /** Whether the BottomSheet should be expanded up to the bottom of any [AppBarLayout] found in the parent [CoordinatorLayout]. Defaults to `false`. */
+    var avoidAppBarLayout = false
+        set(value) {
+            field = value
+            expandedOffset = -1
+        }
+
+    /**
+     * Whether to add the [scrimView], a 'shadow layer' that will be displayed while dragging/expanded so it obscures the content below the BottomSheet.
+     * Defaults to `false`.
+     */
+    var useScrimView = false
+
+    /** Color to use for the [scrimView] shadow layer. */
+    var scrimViewColor = 0x60000000
+
+    /** [View.TRANSLATION_Z] in `dps` to apply to the [scrimView]. Defaults to `0dp`. */
+    var scrimViewTranslationZ = 0
+
+    /** Whether the content view should be layout to the top of the BottomSheet when it's collapsed. Defaults to true. */
+    var applyInsetsToContentViewWhenCollapsed = true
+
+    /** Lambda used to calculate a min collapsed when the view using the behavior should have a special 'collapsed' layout. It's null by default. */
+    var minCollapsedHeight: (() -> Int)? = null
+
+    // Internal BottomSheet implementation properties
+    private var ignoreEvents = false
+    private var touchingScrollingChild = false
+
+    private var lastY: Int = -1
+    private var collapsedOffset = -1
+    private var expandedOffset = -1
+    private var parentWidth = -1
+    private var parentHeight = -1
+
+    private var activePointerId = -1
+
+    private var lastNestedScrollDy = -1
+    private var isNestedScrolled = false
+
+    private var viewRef: WeakReference<V>? = null
+    private var nestedScrollingChildRef: WeakReference<View>? = null
+    private var velocityTracker: VelocityTracker? = null
+
+    private var dragHelper: ViewDragHelper? = null
+    private var scrimView: View? = null
+
+    private val stateSettlingTracker = StateSettlingTracker()
+    private var prevState: State? = null
+
+    private var insetBottom = 0
+    private var insetTop = 0
+    private var insetLeft = 0
+    private var insetRight = 0
+
+    private var initialPaddingTop = 0
+    private var initialPaddingBottom = 0
+    private var initialPaddingLeft = 0
+    private var initialPaddingRight = 0
+    private val minCollapsedOffset: Int?
+        get() {
+            val minHeight = minCollapsedHeight?.invoke() ?: return null
+            if (minHeight == -1) return null
+            return parentHeight - minHeight - insetBottom
+        }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor() : super()
+
+    override fun onLayoutChild(parent: CoordinatorLayout, child: V, layoutDirection: Int): Boolean {
+        parentWidth = parent.width
+        parentHeight = parent.height
+
+        if (viewRef == null) {
+            viewRef = WeakReference(child)
+            setWindowInsetsListener(child)
+            // Prevents clicking on overlapped items below the BottomSheet
+            child.isClickable = true
+        }
+
+        parent.updatePadding(left = insetLeft, right = insetRight)
+
+        ensureViewDragHelper(parent)
+
+        // Top coordinate before this layout pass
+        val savedTop = child.top
+
+        // Calculate default position of the BottomSheet's children
+        parent.onLayoutChild(child, layoutDirection)
+
+        // This should optimise calculations when they're not needed
+        if (state == State.Collapsed) {
+            calculateCollapsedOffset(child)
+        }
+        calculateExpandedOffset(parent)
+
+        // Apply top and bottom insets to contentView if needed
+        val appBar = findAppBarLayout(parent)
+        val contentView = parent.children.find { it !== appBar && it !== child && it !== scrimView }
+        if (applyInsetsToContentViewWhenCollapsed && state == State.Collapsed && contentView != null) {
+            val topOffset = appBar?.measuredHeight ?: 0
+            val bottomOffset = parentHeight - collapsedOffset + insetTop
+            val params = contentView.layoutParams as CoordinatorLayout.LayoutParams
+            if (params.bottomMargin != bottomOffset || params.topMargin != topOffset) {
+                params.topMargin = topOffset
+                params.bottomMargin = bottomOffset
+                contentView.layoutParams = params
+            }
+        }
+
+        // Add scrimView if needed
+        if (useScrimView && scrimView == null) {
+            val scrimView = View(parent.context)
+            scrimView.setBackgroundColor(scrimViewColor)
+            scrimView.translationZ = scrimViewTranslationZ * child.resources.displayMetrics.scaledDensity
+            scrimView.isVisible = false
+            val params = CoordinatorLayout.LayoutParams(
+                    CoordinatorLayout.LayoutParams.MATCH_PARENT,
+                    CoordinatorLayout.LayoutParams.MATCH_PARENT
+            )
+            scrimView.layoutParams = params
+            val currentIndex = parent.children.indexOf(child)
+            parent.addView(scrimView, currentIndex)
+            this.scrimView = scrimView
+        } else if (!useScrimView && scrimView != null) {
+            parent.removeView(scrimView)
+            scrimView = null
+        }
+
+        // Apply insets and resize child based on the current State
+        when (state) {
+            State.Collapsed -> {
+                scrimView?.alpha = 0f
+                val newHeight = parentHeight - collapsedOffset + insetTop
+                val params = child.layoutParams
+                if (params.height != newHeight) {
+                    params.height = newHeight
+                    child.layoutParams = params
+                }
+                // If the offset is < insetTop it will cover the status bar too
+                val newOffset = max(insetTop, collapsedOffset - insetTop)
+                ViewCompat.offsetTopAndBottom(child, newOffset)
+                log("State: Collapsed | Offset: $newOffset | Height: $newHeight")
+            }
+            State.Dragging, State.Settling -> {
+                val newOffset = savedTop - child.top
+                val percentage = max(0f, 1f - (newOffset.toFloat() / collapsedOffset.toFloat()))
+                scrimView?.let {
+                    if (percentage == 0f) {
+                        it.isVisible = false
+                    } else {
+                        it.alpha = percentage
+                        it.isVisible = true
+                    }
+                }
+                val params = child.layoutParams
+                params.height = parentHeight - savedTop
+                child.layoutParams = params
+                ViewCompat.offsetTopAndBottom(child, newOffset)
+                val stateStr = if (state == State.Dragging) "Dragging" else "Settling"
+                log("State: $stateStr | Offset: $newOffset | Percentage: $percentage")
+            }
+            State.Expanded -> {
+                val params = child.layoutParams
+                val newHeight = parentHeight - expandedOffset
+                if (params.height != newHeight) {
+                    params.height = newHeight
+                    child.layoutParams = params
+                }
+                ViewCompat.offsetTopAndBottom(child, expandedOffset)
+                log("State: Expanded | Offset: $expandedOffset | Height: $newHeight")
+            }
+        }
+
+        // Find a nested scrolling child to take into account for touch events
+        if (nestedScrollingChildRef == null) {
+            nestedScrollingChildRef = findScrollingChild(child)?.let { WeakReference(it) }
+        }
+
+        return true
+    }
+
+    // region: Touch events
+    override fun onInterceptTouchEvent(
+            parent: CoordinatorLayout,
+            child: V,
+            ev: MotionEvent
+    ): Boolean {
+        // Almost everything inside here is verbatim to BottomSheetBehavior's onTouchEvent
+        if (viewRef != null && viewRef?.get() !== child) {
+            return true
+        }
+        val action = ev.actionMasked
+
+        if (action == MotionEvent.ACTION_DOWN) {
+            resetTouchEventTracking()
+        }
+        if (velocityTracker == null) {
+            velocityTracker = VelocityTracker.obtain()
+        }
+        velocityTracker?.addMovement(ev)
+
+        when (action) {
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                touchingScrollingChild = false
+                activePointerId = MotionEvent.INVALID_POINTER_ID
+                if (ignoreEvents) {
+                    ignoreEvents = false
+                    return false
+                }
+            }
+            MotionEvent.ACTION_DOWN -> {
+                val x = ev.x.toInt()
+                lastY = ev.y.toInt()
+
+                // Only intercept nested scrolling events here if the view not being moved by the
+                // ViewDragHelper.
+                val scroll = nestedScrollingChildRef?.get()
+                if (state != State.Settling) {
+                    if (scroll != null && parent.isPointInChildBounds(scroll, x, lastY)) {
+                        activePointerId = ev.getPointerId(ev.actionIndex)
+                        touchingScrollingChild = true
+                    }
+                }
+                ignoreEvents = (activePointerId == MotionEvent.INVALID_POINTER_ID &&
+                        !parent.isPointInChildBounds(child, x, lastY))
+            }
+            else -> Unit
+        }
+
+        if (!ignoreEvents && isDraggable && dragHelper?.shouldInterceptTouchEvent(ev) == true) {
+            return true
+        }
+
+        // If using scrim view, a click on it should collapse the bottom sheet
+        if (useScrimView && state == State.Expanded && action == MotionEvent.ACTION_DOWN) {
+            val y = ev.y.toInt()
+            if (y <= expandedOffset) {
+                setState(State.Collapsed)
+                return true
+            }
+        }
+
+        // We have to handle cases that the ViewDragHelper does not capture the bottom sheet because
+        // it is not the top most view of its parent. This is not necessary when the touch event is
+        // happening over the scrolling content as nested scrolling logic handles that case.
+        val scroll = nestedScrollingChildRef?.get()
+        return (action == MotionEvent.ACTION_MOVE &&
+                scroll != null &&
+                !ignoreEvents &&
+                state != State.Dragging &&
+                !parent.isPointInChildBounds(scroll, ev.x.toInt(), ev.y.toInt()) &&
+                dragHelper != null &&
+                abs(lastY - ev.y.toInt()) > (dragHelper?.touchSlop ?: 0))
+    }
+
+    override fun onTouchEvent(parent: CoordinatorLayout, child: V, ev: MotionEvent): Boolean {
+        // Almost everything inside here is verbatim to BottomSheetBehavior's onTouchEvent
+        val action = ev.actionMasked
+        if (state == State.Dragging && action == MotionEvent.ACTION_DOWN) {
+            return true
+        }
+        if (shouldHandleDraggingWithHelper()) {
+            dragHelper?.processTouchEvent(ev)
+        }
+
+        // Record the velocity
+        if (action == MotionEvent.ACTION_DOWN) {
+            resetTouchEventTracking()
+        }
+        if (velocityTracker == null) {
+            velocityTracker = VelocityTracker.obtain()
+        }
+        velocityTracker?.addMovement(ev)
+
+        if (shouldHandleDraggingWithHelper() && action == MotionEvent.ACTION_MOVE && !ignoreEvents) {
+            if (abs(lastY - ev.y.toInt()) > (dragHelper?.touchSlop ?: 0)) {
+                dragHelper?.captureChildView(child, ev.getPointerId(ev.actionIndex))
+            }
+        }
+
+        return !ignoreEvents
+    }
+
+    private fun resetTouchEventTracking() {
+        activePointerId = ViewDragHelper.INVALID_POINTER
+        velocityTracker?.recycle()
+        velocityTracker = null
+    }
+    // endregion
+
+    override fun onAttachedToLayoutParams(params: CoordinatorLayout.LayoutParams) {
+        super.onAttachedToLayoutParams(params)
+
+        viewRef = null
+        dragHelper = null
+    }
+
+    override fun onDetachedFromLayoutParams() {
+        super.onDetachedFromLayoutParams()
+
+        viewRef = null
+        dragHelper = null
+    }
+
+    // region: Size measuring and utils
+    private fun calculateCollapsedOffset(child: View) {
+        val availableSpace = parentHeight - insetTop
+        child.measure(
+                MeasureSpec.makeMeasureSpec(parentWidth, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(availableSpace, MeasureSpec.AT_MOST),
+        )
+        collapsedOffset = parentHeight - child.measuredHeight + insetTop
+    }
+
+    private fun calculateExpandedOffset(parent: CoordinatorLayout): Int {
+        expandedOffset = if (avoidAppBarLayout) {
+            findAppBarLayout(parent)?.measuredHeight ?: 0
+        } else {
+            0
+        } + topOffset + insetTop
+        return expandedOffset
+    }
+
+    private fun ensureViewDragHelper(parent: CoordinatorLayout) {
+        if (dragHelper == null) {
+            dragHelper = ViewDragHelper.create(parent, dragHelperCallback)
+        }
+    }
+
+    private fun findAppBarLayout(view: View): AppBarLayout? {
+        return when (view) {
+            is AppBarLayout -> view
+            is ViewGroup -> view.children.firstNotNullOfOrNull { findAppBarLayout(it) }
+            else -> null
+        }
+    }
+
+    private fun shouldHandleDraggingWithHelper(): Boolean {
+        return dragHelper != null && (isDraggable || state == State.Dragging)
+    }
+
+    private fun log(contents: String, vararg args: Any) {
+        if (!enableDebugLogs) return
+        Timber.d(contents, args)
+    }
+    // endregion
+
+    // region: State and delayed state settling
+    fun setState(state: State) {
+        if (state == this.state) {
+            return
+        } else if (viewRef?.get() == null) {
+            setInternalState(state)
+        } else {
+            viewRef?.get()?.let { child ->
+                runAfterLayout(child) { startSettling(child, state, false) }
+            }
+        }
+    }
+
+    private fun setInternalState(state: State) {
+        if (!this.state.isDraggingOrSettling()) {
+            prevState = this.state
+        }
+        this.state = state
+
+        viewRef?.get()?.requestLayout()
+
+        callback?.onStateChanged(state)
+    }
+
+    private fun startSettling(child: View, state: State, isReleasingView: Boolean) {
+        val top = getTopOffsetForState(state)
+        log("Settling to: $top")
+        val isSettling = dragHelper?.let {
+            if (isReleasingView) {
+                it.settleCapturedViewAt(child.left, top)
+            } else {
+                it.smoothSlideViewTo(child, child.left, top)
+            }
+        } ?: false
+        setInternalState(if (isSettling) State.Settling else state)
+
+        if (isSettling) {
+            stateSettlingTracker.continueSettlingToState(state)
+        }
+    }
+
+    private fun runAfterLayout(child: V, runnable: Runnable) {
+        if (isLayouting(child)) {
+            child.post(runnable)
+        } else {
+            runnable.run()
+        }
+    }
+
+    private fun isLayouting(child: V): Boolean {
+        return child.parent != null && child.parent.isLayoutRequested && ViewCompat.isAttachedToWindow(child)
+    }
+
+    private fun getTopOffsetForState(state: State): Int {
+        return when (state) {
+            State.Collapsed -> minCollapsedOffset ?: collapsedOffset
+            State.Expanded -> expandedOffset
+            else -> error("Cannot get offset for state $state")
+        }
+    }
+    // endregion
+
+    // region: Nested scroll
+    override fun onStartNestedScroll(
+            coordinatorLayout: CoordinatorLayout,
+            child: V,
+            directTargetChild: View,
+            target: View,
+            axes: Int,
+            type: Int
+    ): Boolean {
+        lastNestedScrollDy = 0
+        isNestedScrolled = false
+        return (axes and ViewCompat.SCROLL_AXIS_VERTICAL) != 0
+    }
+
+    override fun onNestedPreScroll(
+            coordinatorLayout: CoordinatorLayout,
+            child: V,
+            target: View,
+            dx: Int,
+            dy: Int,
+            consumed: IntArray,
+            type: Int
+    ) {
+        if (type == ViewCompat.TYPE_NON_TOUCH) return
+        val scrollingChild = nestedScrollingChildRef?.get()
+        if (target != scrollingChild) return
+
+        val currentTop = child.top
+        val newTop = currentTop - dy
+        if (dy > 0) {
+            // Upward scroll
+            if (newTop < expandedOffset) {
+                consumed[1] = currentTop - expandedOffset
+                ViewCompat.offsetTopAndBottom(child, -consumed[1])
+                setInternalState(State.Expanded)
+            } else {
+                if (!isDraggable) return
+
+                consumed[1] = dy
+                ViewCompat.offsetTopAndBottom(child, -dy)
+                setInternalState(State.Dragging)
+            }
+        } else if (dy < 0) {
+            // Scroll downward
+            if (!target.canScrollVertically(-1)) {
+                if (newTop <= collapsedOffset) {
+                    if (!isDraggable) return
+
+                    consumed[1] = dy
+                    ViewCompat.offsetTopAndBottom(child, -dy)
+                    setInternalState(State.Dragging)
+                } else {
+                    consumed[1] = currentTop - collapsedOffset
+                    ViewCompat.offsetTopAndBottom(child, -consumed[1])
+                    setInternalState(State.Collapsed)
+                }
+            }
+        }
+        lastNestedScrollDy = dy
+        isNestedScrolled = true
+    }
+
+    override fun onNestedScroll(
+            coordinatorLayout: CoordinatorLayout,
+            child: V,
+            target: View,
+            dxConsumed: Int,
+            dyConsumed: Int,
+            dxUnconsumed: Int,
+            dyUnconsumed: Int,
+            type: Int,
+            consumed: IntArray
+    ) {
+        // Empty to avoid default behaviour
+    }
+
+    override fun onNestedPreFling(
+            coordinatorLayout: CoordinatorLayout,
+            child: V,
+            target: View,
+            velocityX: Float,
+            velocityY: Float
+    ): Boolean {
+        return target == nestedScrollingChildRef?.get() &&
+                (state != State.Expanded || super.onNestedPreFling(coordinatorLayout, child, target, velocityX, velocityY))
+    }
+
+    private fun findScrollingChild(view: View): View? {
+        return when {
+            !view.isVisible -> null
+            ViewCompat.isNestedScrollingEnabled(view) -> view
+            view is ViewGroup -> {
+                view.children.firstNotNullOfOrNull { findScrollingChild(it) }
+            }
+            else -> null
+        }
+    }
+    // endregion
+
+    // region: Insets
+    private fun setWindowInsetsListener(view: View) {
+        // Create a snapshot of the view's padding state.
+        initialPaddingLeft = view.paddingLeft
+        initialPaddingTop = view.paddingTop
+        initialPaddingRight = view.paddingRight
+        initialPaddingBottom = view.paddingBottom
+
+        // This should only be used to set initial insets and other edge cases where the insets can't be applied using an animation.
+        var isAnimating = false
+
+        // This will animate inset changes, making them look a lot better. However, it won't update initial insets.
+        ViewCompat.setWindowInsetsAnimationCallback(view, object : WindowInsetsAnimationCompat.Callback(DISPATCH_MODE_STOP) {
+            override fun onPrepare(animation: WindowInsetsAnimationCompat) {
+                isAnimating = true
+            }
+
+            override fun onProgress(insets: WindowInsetsCompat, runningAnimations: MutableList<WindowInsetsAnimationCompat>): WindowInsetsCompat {
+                return if (isAnimating) {
+                    applyInsets(view, insets)
+                } else {
+                    insets
+                }
+            }
+
+            override fun onEnd(animation: WindowInsetsAnimationCompat) {
+                isAnimating = false
+                view.requestApplyInsets()
+            }
+        })
+
+        ViewCompat.setOnApplyWindowInsetsListener(view) { _: View, insets: WindowInsetsCompat ->
+            if (isAnimating) {
+                insets
+            } else {
+                applyInsets(view, insets)
+            }
+        }
+
+        // Request to apply insets as soon as the view is attached to a window.
+        if (ViewCompat.isAttachedToWindow(view)) {
+            ViewCompat.requestApplyInsets(view)
+        } else {
+            view.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
+                override fun onViewAttachedToWindow(v: View) {
+                    v.removeOnAttachStateChangeListener(this)
+                    ViewCompat.requestApplyInsets(v)
+                }
+
+                override fun onViewDetachedFromWindow(v: View) = Unit
+            })
+        }
+    }
+
+    private fun applyInsets(view: View, insets: WindowInsetsCompat): WindowInsetsCompat {
+        val insetsType = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+        val imeInsets = insets.getInsets(insetsType)
+        insetTop = imeInsets.top
+        insetBottom = imeInsets.bottom
+        insetLeft = imeInsets.left
+        insetRight = imeInsets.right
+
+        val bottomPadding = initialPaddingBottom + insetBottom
+        view.setPadding(initialPaddingLeft, initialPaddingTop, initialPaddingRight, bottomPadding)
+        if (state == State.Collapsed) {
+            val params = view.layoutParams
+            params.height = CoordinatorLayout.LayoutParams.WRAP_CONTENT
+            view.layoutParams = params
+            calculateCollapsedOffset(view)
+        }
+        return WindowInsetsCompat.CONSUMED
+    }
+    // endregion
+
+    // Used to add dragging animations along with StateSettlingTracker, and set max and min dragging coordinates.
+    private val dragHelperCallback = object : ViewDragHelper.Callback() {
+
+        override fun tryCaptureView(child: View, pointerId: Int): Boolean {
+            if (state == State.Dragging) {
+                return false
+            }
+
+            if (touchingScrollingChild) {
+                return false
+            }
+
+            if (state == State.Expanded && activePointerId == pointerId) {
+                val scroll = nestedScrollingChildRef?.get()
+                if (scroll?.canScrollVertically(-1) == true) {
+                    return false
+                }
+            }
+
+            return viewRef?.get() == child
+        }
+
+        override fun onViewDragStateChanged(state: Int) {
+            if (state == ViewDragHelper.STATE_DRAGGING && isDraggable) {
+                setInternalState(State.Dragging)
+            }
+        }
+
+        override fun onViewPositionChanged(
+                changedView: View,
+                left: Int,
+                top: Int,
+                dx: Int,
+                dy: Int
+        ) {
+            super.onViewPositionChanged(changedView, left, top, dx, dy)
+
+            val params = changedView.layoutParams
+            params.height = parentHeight - top + insetBottom + insetTop
+            changedView.layoutParams = params
+
+            val collapsedOffset = minCollapsedOffset ?: collapsedOffset
+            val percentage = 1f - (top - insetTop).toFloat() / collapsedOffset.toFloat()
+
+            callback?.onSlidePositionChanged(changedView, percentage)
+        }
+
+        override fun onViewReleased(releasedChild: View, xvel: Float, yvel: Float) {
+            val actualCollapsedOffset = minCollapsedOffset ?: collapsedOffset
+            val targetState = if (yvel < 0) {
+                // Moving up
+                val currentTop = releasedChild.top
+
+                val yPositionPercentage = currentTop * 100f / actualCollapsedOffset
+                if (yPositionPercentage >= 0.5f) {
+                    State.Expanded
+                } else {
+                    State.Collapsed
+                }
+            } else if (yvel == 0f || abs(xvel) > abs(yvel)) {
+                // If the Y velocity is 0 or the swipe was mostly horizontal indicated by the X velocity
+                // being greater than the Y velocity, settle to the nearest correct height.
+
+                val currentTop = releasedChild.top
+                if (currentTop < actualCollapsedOffset / 2) {
+                    State.Expanded
+                } else {
+                    State.Collapsed
+                }
+            } else {
+                // Moving down
+                val currentTop = releasedChild.top
+
+                val yPositionPercentage = currentTop * 100f / actualCollapsedOffset
+                if (yPositionPercentage >= 0.5f) {
+                    State.Collapsed
+                } else {
+                    State.Expanded
+                }
+            }
+            startSettling(releasedChild, targetState, true)
+        }
+
+        override fun clampViewPositionHorizontal(child: View, left: Int, dx: Int): Int {
+            return child.left
+        }
+
+        override fun clampViewPositionVertical(child: View, top: Int, dy: Int): Int {
+            val collapsed = minCollapsedOffset ?: collapsedOffset
+            val maxTop = max(top, insetTop)
+            return min(max(maxTop, expandedOffset), collapsed)
+        }
+
+        override fun getViewVerticalDragRange(child: View): Int {
+            return minCollapsedOffset ?: collapsedOffset
+        }
+    }
+
+    // Used to set the current State in a delayed way.
+    private inner class StateSettlingTracker {
+        private lateinit var targetState: State
+        private var isContinueSettlingRunnablePosted = false
+
+        private val continueSettlingRunnable: Runnable = Runnable {
+            isContinueSettlingRunnablePosted = false
+            if (dragHelper?.continueSettling(true) == true) {
+                continueSettlingToState(targetState)
+            } else {
+                setInternalState(targetState)
+            }
+        }
+
+        fun continueSettlingToState(state: State) {
+            val view = viewRef?.get() ?: return
+
+            this.targetState = state
+            if (!isContinueSettlingRunnablePosted) {
+                ViewCompat.postOnAnimation(view, continueSettlingRunnable)
+                isContinueSettlingRunnablePosted = true
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index d52b7088ff..23641bd170 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.core.utils
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.DownloadManager
 import android.content.ActivityNotFoundException
@@ -256,6 +257,7 @@ private fun appendTimeToFilename(name: String): String {
     return """${filename}_$dateExtension.$fileExtension"""
 }
 
+@SuppressLint("Recycle")
 suspend fun saveMedia(
         context: Context,
         file: File,
@@ -309,7 +311,6 @@ suspend fun saveMedia(
     }
 }
 
-@Suppress("DEPRECATION")
 private fun saveMediaLegacy(
         context: Context,
         mediaMimeType: String?,
@@ -340,6 +341,7 @@ private fun saveMediaLegacy(
         val savedFile = saveFileIntoLegacy(file, downloadDir, outputFilename, currentTimeMillis)
         if (savedFile != null) {
             val downloadManager = context.getSystemService<DownloadManager>()
+            @Suppress("DEPRECATION")
             downloadManager?.addCompletedDownload(
                     savedFile.name,
                     title,
@@ -430,7 +432,6 @@ fun selectTxtFileToWrite(
  * @param currentTimeMillis the current time in milliseconds
  * @return               the created file
  */
-@Suppress("DEPRECATION")
 fun saveFileIntoLegacy(sourceFile: File, dstDirPath: File, outputFilename: String?, currentTimeMillis: Long): File? {
     // defines another name for the external media
     var dstFileName: String
diff --git a/vector/src/main/java/im/vector/app/core/utils/FirstItemUpdatedObserver.kt b/vector/src/main/java/im/vector/app/core/utils/FirstItemUpdatedObserver.kt
new file mode 100644
index 0000000000..25901cdf95
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/utils/FirstItemUpdatedObserver.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.utils
+
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * This observer detects when item was added or moved to the first position of the adapter, while recyclerView is scrolled to the top. This is necessary
+ * to force recycler to scroll to the top to make such item visible, because by default it will keep items on screen, while adding new item to the top,
+ * outside of the viewport
+ * @param layoutManager - [LinearLayoutManager] of the recycler view, which displays items
+ * @property onItemUpdated - callback to be called, when observer detects event
+ */
+class FirstItemUpdatedObserver(
+        layoutManager: LinearLayoutManager,
+        private val onItemUpdated: () -> Unit
+) : RecyclerView.AdapterDataObserver() {
+
+    val layoutManager: LinearLayoutManager? by weak(layoutManager)
+
+    override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
+        if ((toPosition == 0 || fromPosition == 0) && layoutManager?.findFirstCompletelyVisibleItemPosition() == 0) {
+            onItemUpdated.invoke()
+        }
+    }
+
+    override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+        if (positionStart == 0 && layoutManager?.findFirstCompletelyVisibleItemPosition() == 0) {
+            onItemUpdated.invoke()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
index 9ad95d3c55..a287626671 100644
--- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
@@ -42,6 +42,7 @@ val PERMISSIONS_FOR_ROOM_AVATAR = listOf(Manifest.permission.CAMERA)
 val PERMISSIONS_FOR_WRITING_FILES = listOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)
 val PERMISSIONS_FOR_PICKING_CONTACT = listOf(Manifest.permission.READ_CONTACTS)
 val PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING = listOf(Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)
+val PERMISSIONS_FOR_VOICE_BROADCAST = listOf(Manifest.permission.RECORD_AUDIO)
 
 // This is not ideal to store the value like that, but it works
 private var permissionDialogDisplayed = false
diff --git a/vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt b/vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt
index bbed2f6000..915d840637 100644
--- a/vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt
@@ -17,103 +17,109 @@
 package im.vector.app.core.utils
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.media.Ringtone
 import android.media.RingtoneManager
 import android.net.Uri
 import androidx.core.content.edit
-import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.di.DefaultPreferences
 import im.vector.app.features.settings.VectorPreferences
+import javax.inject.Inject
 
 /**
- * This file manages the sound ringtone for calls.
- * It allows you to use the default Riot Ringtone, or the standard ringtone or set a different one from the available choices
+ * This class manages the sound ringtone for calls.
+ * It allows you to use the default Element Ringtone, or the standard ringtone or set a different one from the available choices
  * in Android.
  */
+class RingtoneUtils @Inject constructor(
+        @DefaultPreferences
+        private val sharedPreferences: SharedPreferences,
+        private val context: Context,
+) {
+    /**
+     * Returns a Uri object that points to a specific Ringtone.
+     *
+     * If no Ringtone was explicitly set using Riot, it will return the Uri for the current system
+     * ringtone for calls.
+     *
+     * @return the [Uri] of the currently set [Ringtone]
+     * @see Ringtone
+     */
+    fun getCallRingtoneUri(): Uri? {
+        val callRingtone: String? = sharedPreferences
+                .getString(VectorPreferences.SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY, null)
 
-/**
- * Returns a Uri object that points to a specific Ringtone.
- *
- * If no Ringtone was explicitly set using Riot, it will return the Uri for the current system
- * ringtone for calls.
- *
- * @return the [Uri] of the currently set [Ringtone]
- * @see Ringtone
- */
-fun getCallRingtoneUri(context: Context): Uri? {
-    val callRingtone: String? = DefaultSharedPreferences.getInstance(context)
-            .getString(VectorPreferences.SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY, null)
+        callRingtone?.let {
+            return Uri.parse(it)
+        }
 
-    callRingtone?.let {
-        return Uri.parse(it)
+        return try {
+            // Use current system notification sound for incoming calls per default (note that it can return null)
+            RingtoneManager.getActualDefaultRingtoneUri(context, RingtoneManager.TYPE_RINGTONE)
+        } catch (e: SecurityException) {
+            // Ignore for now
+            null
+        }
     }
 
-    return try {
-        // Use current system notification sound for incoming calls per default (note that it can return null)
-        RingtoneManager.getActualDefaultRingtoneUri(context, RingtoneManager.TYPE_RINGTONE)
-    } catch (e: SecurityException) {
-        // Ignore for now
-        null
-    }
-}
+    /**
+     * Returns a Ringtone object that can then be played.
+     *
+     * If no Ringtone was explicitly set using Riot, it will return the current system ringtone
+     * for calls.
+     *
+     * @return the currently set [Ringtone]
+     * @see Ringtone
+     */
+    fun getCallRingtone(): Ringtone? {
+        getCallRingtoneUri()?.let {
+            // Note that it can also return null
+            return RingtoneManager.getRingtone(context, it)
+        }
 
-/**
- * Returns a Ringtone object that can then be played.
- *
- * If no Ringtone was explicitly set using Riot, it will return the current system ringtone
- * for calls.
- *
- * @return the currently set [Ringtone]
- * @see Ringtone
- */
-fun getCallRingtone(context: Context): Ringtone? {
-    getCallRingtoneUri(context)?.let {
-        // Note that it can also return null
-        return RingtoneManager.getRingtone(context, it)
+        return null
     }
 
-    return null
-}
+    /**
+     * Returns a String with the name of the current Ringtone.
+     *
+     * If no Ringtone was explicitly set using Riot, it will return the name of the current system
+     * ringtone for calls.
+     *
+     * @return the name of the currently set [Ringtone], or null
+     * @see Ringtone
+     */
+    fun getCallRingtoneName(): String? {
+        return getCallRingtone()?.getTitle(context)
+    }
 
-/**
- * Returns a String with the name of the current Ringtone.
- *
- * If no Ringtone was explicitly set using Riot, it will return the name of the current system
- * ringtone for calls.
- *
- * @return the name of the currently set [Ringtone], or null
- * @see Ringtone
- */
-fun getCallRingtoneName(context: Context): String? {
-    return getCallRingtone(context)?.getTitle(context)
-}
+    /**
+     * Sets the selected ringtone for riot calls.
+     *
+     * @param ringtoneUri
+     * @see Ringtone
+     */
+    fun setCallRingtoneUri(ringtoneUri: Uri) {
+        sharedPreferences
+                .edit {
+                    putString(VectorPreferences.SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY, ringtoneUri.toString())
+                }
+    }
 
-/**
- * Sets the selected ringtone for riot calls.
- *
- * @param context Android context
- * @param ringtoneUri
- * @see Ringtone
- */
-fun setCallRingtoneUri(context: Context, ringtoneUri: Uri) {
-    DefaultSharedPreferences.getInstance(context)
-            .edit {
-                putString(VectorPreferences.SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY, ringtoneUri.toString())
-            }
-}
+    /**
+     * Set using Riot default ringtone.
+     */
+    fun useRiotDefaultRingtone(): Boolean {
+        return sharedPreferences.getBoolean(VectorPreferences.SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY, true)
+    }
 
-/**
- * Set using Riot default ringtone.
- */
-fun useRiotDefaultRingtone(context: Context): Boolean {
-    return DefaultSharedPreferences.getInstance(context).getBoolean(VectorPreferences.SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY, true)
-}
-
-/**
- * Ask if default Riot ringtone has to be used.
- */
-fun setUseRiotDefaultRingtone(context: Context, useRiotDefault: Boolean) {
-    DefaultSharedPreferences.getInstance(context)
-            .edit {
-                putBoolean(VectorPreferences.SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY, useRiotDefault)
-            }
+    /**
+     * Ask if default Riot ringtone has to be used.
+     */
+    fun setUseRiotDefaultRingtone(useRiotDefault: Boolean) {
+        sharedPreferences
+                .edit {
+                    putBoolean(VectorPreferences.SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY, useRiotDefault)
+                }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index 6cfe8acc16..20eda102e2 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -19,8 +19,6 @@ package im.vector.app.core.utils
 import android.annotation.TargetApi
 import android.app.Activity
 import android.content.ActivityNotFoundException
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -36,6 +34,7 @@ import androidx.core.content.getSystemService
 import androidx.fragment.app.Fragment
 import im.vector.app.R
 import im.vector.app.features.notifications.NotificationUtils
+import org.matrix.android.sdk.api.util.getApplicationInfoCompat
 
 /**
  * Tells if the application ignores battery optimizations.
@@ -65,7 +64,7 @@ fun Context.isAnimationEnabled(): Boolean {
  */
 fun Context.getApplicationLabel(packageName: String): String {
     return try {
-        val ai = packageManager.getApplicationInfo(packageName, 0)
+        val ai = packageManager.getApplicationInfoCompat(packageName, 0)
         packageManager.getApplicationLabel(ai).toString()
     } catch (e: PackageManager.NameNotFoundException) {
         packageName
@@ -100,8 +99,7 @@ fun requestDisablingBatteryOptimization(activity: Activity, activityResultLaunch
  * @param toastMessage content of the toast message as a String resource
  */
 fun copyToClipboard(context: Context, text: CharSequence, showToast: Boolean = true, @StringRes toastMessage: Int = R.string.copied_to_clipboard) {
-    val clipboard = context.getSystemService<ClipboardManager>()!!
-    clipboard.setPrimaryClip(ClipData.newPlainText("", text))
+    CopyToClipboardUseCase(context).execute(text)
     if (showToast) {
         context.toast(toastMessage)
     }
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index 14fae80325..8ce375122e 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -30,23 +30,21 @@ import com.bumptech.glide.Glide
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.startSyncing
 import im.vector.app.core.extensions.vectorStore
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.deleteAllFiles
 import im.vector.app.databinding.ActivityMainBinding
 import im.vector.app.features.analytics.VectorAnalytics
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.home.ShortcutsHandler
 import im.vector.app.features.notifications.NotificationDrawerManager
-import im.vector.app.features.pin.PinCodeStore
-import im.vector.app.features.pin.PinLocker
 import im.vector.app.features.pin.UnlockedActivity
+import im.vector.app.features.pin.lockscreen.crypto.LockScreenKeyRepository
+import im.vector.app.features.pin.lockscreen.pincode.PinCodeHelper
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.session.VectorSessionStore
-import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.signout.hard.SignedOutActivity
 import im.vector.app.features.start.StartAppAction
 import im.vector.app.features.start.StartAppAndroidService
@@ -55,6 +53,7 @@ import im.vector.app.features.start.StartAppViewModel
 import im.vector.app.features.start.StartAppViewState
 import im.vector.app.features.themes.ActivityOtherThemes
 import im.vector.app.features.ui.UiStateRepository
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -128,15 +127,12 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
     private lateinit var args: MainActivityArgs
 
     @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
-    @Inject lateinit var sessionHolder: ActiveSessionHolder
-    @Inject lateinit var errorFormatter: ErrorFormatter
-    @Inject lateinit var vectorPreferences: VectorPreferences
     @Inject lateinit var uiStateRepository: UiStateRepository
     @Inject lateinit var shortcutsHandler: ShortcutsHandler
-    @Inject lateinit var pinCodeStore: PinCodeStore
-    @Inject lateinit var pinLocker: PinLocker
+    @Inject lateinit var pinCodeHelper: PinCodeHelper
     @Inject lateinit var popupAlertManager: PopupAlertManager
     @Inject lateinit var vectorAnalytics: VectorAnalytics
+    @Inject lateinit var lockScreenKeyRepository: LockScreenKeyRepository
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -178,16 +174,18 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
     private fun handleAppStarted() {
         if (intent.hasExtra(EXTRA_NEXT_INTENT)) {
             // Start the next Activity
-            val nextIntent = intent.getParcelableExtra<Intent>(EXTRA_NEXT_INTENT)
+            startSyncing()
+            val nextIntent = intent.getParcelableExtraCompat<Intent>(EXTRA_NEXT_INTENT)
             startIntentAndFinish(nextIntent)
         } else if (intent.hasExtra(EXTRA_INIT_SESSION)) {
+            startSyncing()
             setResult(RESULT_OK)
             finish()
         } else if (intent.action == ACTION_ROOM_DETAILS_FROM_SHORTCUT) {
+            startSyncing()
             val roomId = intent.getStringExtra(EXTRA_ROOM_ID)
             if (roomId?.isNotEmpty() == true) {
-                // TODO Add a trigger Shortcut to the analytics.
-                navigator.openRoom(this, roomId)
+                navigator.openRoom(this, roomId, trigger = ViewRoom.Trigger.Shortcut)
             }
             finish()
         } else {
@@ -199,11 +197,16 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
             if (args.clearCache || args.clearCredentials) {
                 doCleanUp()
             } else {
+                startSyncing()
                 startNextActivityAndFinish()
             }
         }
     }
 
+    private fun startSyncing() {
+        activeSessionHolder.getSafeActiveSession()?.startSyncing(this)
+    }
+
     private fun clearNotifications() {
         // Dismiss all notifications
         notificationDrawerManager.clearAllEvents()
@@ -216,7 +219,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
     }
 
     private fun parseArgs(): MainActivityArgs {
-        val argsFromIntent: MainActivityArgs? = intent.getParcelableExtra(EXTRA_ARGS)
+        val argsFromIntent: MainActivityArgs? = intent.getParcelableExtraCompat(EXTRA_ARGS)
         Timber.w("Starting MainActivity with $argsFromIntent")
 
         return MainActivityArgs(
@@ -229,7 +232,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
     }
 
     private fun doCleanUp() {
-        val session = sessionHolder.getSafeActiveSession()
+        val session = activeSessionHolder.getSafeActiveSession()
         if (session == null) {
             startNextActivityAndFinish()
             return
@@ -241,7 +244,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
                 lifecycleScope.launch {
                     // Just do the local cleanup
                     Timber.w("Account deactivated, start app")
-                    sessionHolder.clearActiveSession()
+                    activeSessionHolder.clearActiveSession()
                     doLocalCleanup(clearPreferences = true, onboardingStore)
                     startNextActivityAndFinish()
                 }
@@ -255,7 +258,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
                         return@launch
                     }
                     Timber.w("SIGN_OUT: success, start app")
-                    sessionHolder.clearActiveSession()
+                    activeSessionHolder.clearActiveSession()
                     doLocalCleanup(clearPreferences = true, onboardingStore)
                     startNextActivityAndFinish()
                 }
@@ -284,9 +287,10 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
             vectorPreferences.clearPreferences()
             uiStateRepository.reset()
             pinLocker.unlock()
-            pinCodeStore.deletePinCode()
+            pinCodeHelper.deletePinCode()
             vectorAnalytics.onSignOut()
             vectorSessionStore.clear()
+            lockScreenKeyRepository.deleteSystemKey()
         }
         withContext(Dispatchers.IO) {
             // On BG thread
@@ -326,10 +330,10 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
             args.isUserLoggedOut ->
                 // the homeserver has invalidated the token (password changed, device deleted, other security reasons)
                 SignedOutActivity.newIntent(this)
-            sessionHolder.hasActiveSession() ->
+            activeSessionHolder.hasActiveSession() ->
                 // We have a session.
                 // Check it can be opened
-                if (sessionHolder.getActiveSession().isOpenable) {
+                if (activeSessionHolder.getActiveSession().isOpenable) {
                     HomeActivity.newIntent(this, firstStartMainActivity = false, existingSession = true)
                 } else {
                     // The token is still invalid
diff --git a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
index e60b225689..99abc15f81 100644
--- a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
+++ b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
@@ -18,6 +18,7 @@ package im.vector.app.features
 
 import im.vector.app.config.Config
 import im.vector.app.config.OnboardingVariant
+import im.vector.app.features.settings.VectorPreferences
 
 interface VectorFeatures {
 
@@ -32,9 +33,18 @@ interface VectorFeatures {
     fun isScreenSharingEnabled(): Boolean
     fun isLocationSharingEnabled(): Boolean
     fun forceUsageOfOpusEncoder(): Boolean
-    fun shouldStartDmOnFirstMessage(): Boolean
-    fun isNewAppLayoutEnabled(): Boolean
-    fun isNewDeviceManagementEnabled(): Boolean
+
+    /**
+     * This is only to enable if the labs flag should be visible and effective.
+     * If on the client-side you want functionality that should be enabled with the new layout,
+     * use [VectorPreferences.isNewAppLayoutEnabled] instead.
+     */
+    fun isNewAppLayoutFeatureEnabled(): Boolean
+    fun isQrCodeLoginEnabled(): Boolean
+    fun isQrCodeLoginForAllServers(): Boolean
+    fun isReciprocateQrCodeLogin(): Boolean
+    fun isVoiceBroadcastEnabled(): Boolean
+    fun isUnverifiedSessionsAlertEnabled(): Boolean
 }
 
 class DefaultVectorFeatures : VectorFeatures {
@@ -49,7 +59,10 @@ class DefaultVectorFeatures : VectorFeatures {
     override fun isScreenSharingEnabled(): Boolean = true
     override fun isLocationSharingEnabled() = Config.ENABLE_LOCATION_SHARING
     override fun forceUsageOfOpusEncoder(): Boolean = false
-    override fun shouldStartDmOnFirstMessage(): Boolean = false
-    override fun isNewAppLayoutEnabled(): Boolean = false
-    override fun isNewDeviceManagementEnabled(): Boolean = false
+    override fun isNewAppLayoutFeatureEnabled(): Boolean = true
+    override fun isQrCodeLoginEnabled(): Boolean = true
+    override fun isQrCodeLoginForAllServers(): Boolean = false
+    override fun isReciprocateQrCodeLogin(): Boolean = false
+    override fun isVoiceBroadcastEnabled(): Boolean = true
+    override fun isUnverifiedSessionsAlertEnabled(): Boolean = true
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt
index bffba6fa9c..cc3eed306d 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt
@@ -21,4 +21,6 @@ data class AnalyticsConfig(
         val postHogHost: String,
         val postHogApiKey: String,
         val policyLink: String,
+        val sentryDSN: String,
+        val sentryEnvironment: String
 )
diff --git a/vector/src/main/java/im/vector/app/features/analytics/VectorAnalytics.kt b/vector/src/main/java/im/vector/app/features/analytics/VectorAnalytics.kt
index 7d11f93883..802ba08092 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/VectorAnalytics.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/VectorAnalytics.kt
@@ -16,9 +16,10 @@
 
 package im.vector.app.features.analytics
 
+import im.vector.app.features.analytics.errors.ErrorTracker
 import kotlinx.coroutines.flow.Flow
 
-interface VectorAnalytics : AnalyticsTracker {
+interface VectorAnalytics : AnalyticsTracker, ErrorTracker {
     /**
      * Return a Flow of Boolean, true if the user has given their consent.
      */
diff --git a/vector/src/main/java/im/vector/app/features/login2/SignMode2.kt b/vector/src/main/java/im/vector/app/features/analytics/errors/ErrorTracker.kt
similarity index 77%
rename from vector/src/main/java/im/vector/app/features/login2/SignMode2.kt
rename to vector/src/main/java/im/vector/app/features/analytics/errors/ErrorTracker.kt
index f3d59837e7..8ad6bfffc0 100644
--- a/vector/src/main/java/im/vector/app/features/login2/SignMode2.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/errors/ErrorTracker.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2022 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.
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.login2
+package im.vector.app.features.analytics.errors
 
-enum class SignMode2 {
-    Unknown,
-
-    // Account creation
-    SignUp,
-
-    // Login
-    SignIn
+interface ErrorTracker {
+    fun trackError(throwable: Throwable)
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt b/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt
index e5446f438b..0ff04f0854 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.analytics.extensions
 
 import im.vector.app.features.analytics.plan.UserProperties
+import im.vector.app.features.home.room.list.home.header.HomeRoomFilter
 import im.vector.app.features.onboarding.FtueUseCase
 
 fun FtueUseCase.toTrackingValue(): UserProperties.FtueUseCaseSelection {
@@ -27,3 +28,12 @@ fun FtueUseCase.toTrackingValue(): UserProperties.FtueUseCaseSelection {
         FtueUseCase.SKIP -> UserProperties.FtueUseCaseSelection.Skip
     }
 }
+
+fun HomeRoomFilter.toTrackingValue(): UserProperties.AllChatsActiveFilter {
+    return when (this) {
+        HomeRoomFilter.ALL -> UserProperties.AllChatsActiveFilter.All
+        HomeRoomFilter.UNREADS -> UserProperties.AllChatsActiveFilter.Unreads
+        HomeRoomFilter.FAVOURITES -> UserProperties.AllChatsActiveFilter.Favourites
+        HomeRoomFilter.PEOPlE -> UserProperties.AllChatsActiveFilter.People
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
index be847dcb7f..ca7608166c 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
@@ -41,6 +41,7 @@ private val IGNORED_OPTIONS: Options? = null
 @Singleton
 class DefaultVectorAnalytics @Inject constructor(
         postHogFactory: PostHogFactory,
+        private val sentryAnalytics: SentryAnalytics,
         analyticsConfig: AnalyticsConfig,
         private val analyticsStore: AnalyticsStore,
         private val lateInitUserPropertiesFactory: LateInitUserPropertiesFactory,
@@ -94,6 +95,9 @@ class DefaultVectorAnalytics @Inject constructor(
     override suspend fun onSignOut() {
         // reset the analyticsId
         setAnalyticsId("")
+
+        // Close Sentry SDK.
+        sentryAnalytics.stopSentry()
     }
 
     private fun observeAnalyticsId() {
@@ -123,10 +127,20 @@ class DefaultVectorAnalytics @Inject constructor(
                     Timber.tag(analyticsTag.value).d("User consent updated to $consent")
                     userConsent = consent
                     optOutPostHog()
+                    initOrStopSentry()
                 }
                 .launchIn(globalScope)
     }
 
+    private fun initOrStopSentry() {
+        userConsent?.let {
+            when (it) {
+                true -> sentryAnalytics.initSentry()
+                false -> sentryAnalytics.stopSentry()
+            }
+        }
+    }
+
     private fun optOutPostHog() {
         userConsent?.let { posthog?.optOut(!it) }
     }
@@ -166,4 +180,10 @@ class DefaultVectorAnalytics @Inject constructor(
             putAll(this@toPostHogUserProperties.filter { it.value != null })
         }
     }
+
+    override fun trackError(throwable: Throwable) {
+        sentryAnalytics
+                .takeIf { userConsent == true }
+                ?.trackError(throwable)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/SentryAnalytics.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/SentryAnalytics.kt
new file mode 100644
index 0000000000..21721a31ae
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/SentryAnalytics.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.analytics.impl
+
+import android.content.Context
+import im.vector.app.features.analytics.AnalyticsConfig
+import im.vector.app.features.analytics.errors.ErrorTracker
+import im.vector.app.features.analytics.log.analyticsTag
+import io.sentry.Sentry
+import io.sentry.SentryOptions
+import io.sentry.android.core.SentryAndroid
+import timber.log.Timber
+import javax.inject.Inject
+
+class SentryAnalytics @Inject constructor(
+        private val context: Context,
+        private val analyticsConfig: AnalyticsConfig,
+) : ErrorTracker {
+
+    fun initSentry() {
+        Timber.tag(analyticsTag.value).d("Initializing Sentry")
+        if (Sentry.isEnabled()) return
+        SentryAndroid.init(context) { options ->
+            options.dsn = analyticsConfig.sentryDSN
+            options.beforeSend = SentryOptions.BeforeSendCallback { event, _ -> event }
+            options.tracesSampleRate = 1.0
+            options.isEnableUserInteractionTracing = true
+            options.environment = analyticsConfig.sentryEnvironment
+            options.diagnosticLevel
+        }
+    }
+
+    fun stopSentry() {
+        Timber.tag(analyticsTag.value).d("Stopping Sentry")
+        Sentry.close()
+    }
+
+    override fun trackError(throwable: Throwable) {
+        Sentry.captureException(throwable)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/metrics/VectorPlugins.kt b/vector/src/main/java/im/vector/app/features/analytics/metrics/VectorPlugins.kt
new file mode 100644
index 0000000000..4278c1011b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/metrics/VectorPlugins.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.analytics.metrics
+
+import im.vector.app.features.analytics.metrics.sentry.SentryDownloadDeviceKeysMetrics
+import im.vector.app.features.analytics.metrics.sentry.SentrySyncDurationMetrics
+import org.matrix.android.sdk.api.metrics.MetricPlugin
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Class that contains the all plugins which can be used for tracking.
+ */
+@Singleton
+data class VectorPlugins @Inject constructor(
+        val sentryDownloadDeviceKeysMetrics: SentryDownloadDeviceKeysMetrics,
+        val sentrySyncDurationMetrics: SentrySyncDurationMetrics,
+) {
+    /**
+     * Returns [List] of all [MetricPlugin] hold by this class.
+     */
+    fun plugins(): List<MetricPlugin> = listOf(sentryDownloadDeviceKeysMetrics, sentrySyncDurationMetrics)
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentryDownloadDeviceKeysMetrics.kt b/vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentryDownloadDeviceKeysMetrics.kt
new file mode 100644
index 0000000000..488b72bfd9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentryDownloadDeviceKeysMetrics.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.analytics.metrics.sentry
+
+import io.sentry.ITransaction
+import io.sentry.Sentry
+import io.sentry.SpanStatus
+import org.matrix.android.sdk.api.metrics.DownloadDeviceKeysMetricsPlugin
+import javax.inject.Inject
+
+class SentryDownloadDeviceKeysMetrics @Inject constructor() : DownloadDeviceKeysMetricsPlugin {
+    private var transaction: ITransaction? = null
+
+    override fun startTransaction() {
+        if (Sentry.isEnabled()) {
+            transaction = Sentry.startTransaction("download_device_keys", "task")
+            logTransaction("Sentry transaction started")
+        }
+    }
+
+    override fun finishTransaction() {
+        transaction?.finish()
+        logTransaction("Sentry transaction finished")
+    }
+
+    override fun onError(throwable: Throwable) {
+        transaction?.apply {
+            this.throwable = throwable
+            this.status = SpanStatus.INTERNAL_ERROR
+        }
+        logTransaction("Sentry transaction encountered error ${throwable.message}")
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentrySyncDurationMetrics.kt b/vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentrySyncDurationMetrics.kt
new file mode 100644
index 0000000000..d69ed01526
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentrySyncDurationMetrics.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.analytics.metrics.sentry
+
+import io.sentry.ISpan
+import io.sentry.ITransaction
+import io.sentry.Sentry
+import io.sentry.SpanStatus
+import org.matrix.android.sdk.api.metrics.SyncDurationMetricPlugin
+import java.util.EmptyStackException
+import java.util.Stack
+import javax.inject.Inject
+
+/**
+ * Sentry based implementation of SyncDurationMetricPlugin.
+ */
+class SentrySyncDurationMetrics @Inject constructor() : SyncDurationMetricPlugin {
+    private var transaction: ITransaction? = null
+
+    // Stacks to keep spans in LIFO order.
+    private var spans: Stack<ISpan> = Stack()
+
+    /**
+     * Starts the span for a sub-task.
+     *
+     * @param operation Name of the new span.
+     * @param description Description of the new span.
+     *
+     * @throws IllegalStateException if this is called without starting a transaction ie. `measureSpan` must be called within `measureMetric`.
+     */
+    override fun startSpan(operation: String, description: String) {
+        if (Sentry.isEnabled()) {
+            val span = Sentry.getSpan() ?: throw IllegalStateException("measureSpan block must be called within measureMetric")
+            val innerSpan = span.startChild(operation, description)
+            spans.push(innerSpan)
+            logTransaction("Sentry span started: operation=[$operation], description=[$description]")
+        }
+    }
+
+    override fun finishSpan() {
+        try {
+            spans.pop()
+        } catch (e: EmptyStackException) {
+            null
+        }?.finish()
+        logTransaction("Sentry span finished")
+    }
+
+    override fun startTransaction() {
+        if (Sentry.isEnabled()) {
+            transaction = Sentry.startTransaction("sync_response_handler", "task", true)
+            logTransaction("Sentry transaction started")
+        }
+    }
+
+    override fun finishTransaction() {
+        transaction?.finish()
+        logTransaction("Sentry transaction finished")
+    }
+
+    override fun onError(throwable: Throwable) {
+        try {
+            spans.peek()
+        } catch (e: EmptyStackException) {
+            null
+        }?.apply {
+            this.throwable = throwable
+            this.status = SpanStatus.INTERNAL_ERROR
+        } ?: transaction?.apply {
+            this.throwable = throwable
+            this.status = SpanStatus.INTERNAL_ERROR
+        }
+        logTransaction("Sentry transaction encountered error ${throwable.message}")
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
index deb9088259..1df1b35439 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
@@ -40,6 +40,46 @@ data class Interaction(
 ) : VectorAnalyticsEvent {
 
     enum class Name {
+        /**
+         * User tapped the All filter in the All Chats filter tab.
+         */
+        MobileAllChatsFilterAll,
+
+        /**
+         * User tapped the Favourites filter in the All Chats filter tab.
+         */
+        MobileAllChatsFilterFavourites,
+
+        /**
+         * User tapped the People filter in the All Chats filter tab.
+         */
+        MobileAllChatsFilterPeople,
+
+        /**
+         * User tapped the Unreads filter in the All Chats filter tab.
+         */
+        MobileAllChatsFilterUnreads,
+
+        /**
+         * User disabled filters from the all chats layout settings.
+         */
+        MobileAllChatsFiltersDisabled,
+
+        /**
+         * User enabled filters from the all chats layout settings.
+         */
+        MobileAllChatsFiltersEnabled,
+
+        /**
+         * User disabled recents from the all chats layout settings.
+         */
+        MobileAllChatsRecentsDisabled,
+
+        /**
+         * User enabled recents from the all chats layout settings.
+         */
+        MobileAllChatsRecentsEnabled,
+
         /**
          * User tapped on Add to Home button on Room Details screen.
          */
@@ -60,6 +100,11 @@ data class Interaction(
          */
         MobileRoomThreadSummaryItem,
 
+        /**
+         * User validated the creation of a new space.
+         */
+        MobileSpaceCreationValidated,
+
         /**
          * User tapped on the filter button on ThreadList screen.
          */
@@ -81,6 +126,12 @@ data class Interaction(
          */
         SpacePanelSwitchSpace,
 
+        /**
+         * User tapped an unselected sub space from the space list -> space
+         * switching should occur.
+         */
+        SpacePanelSwitchSubSpace,
+
         /**
          * User clicked the create room button in the add existing room to space
          * dialog in Element Web/Desktop.
@@ -117,6 +168,12 @@ data class Interaction(
          */
         WebLeftPanelExploreRoomsButton,
 
+        /**
+         * User clicked on the avatar uploader in the profile settings of
+         * Element Web/Desktop.
+         */
+        WebProfileSettingsAvatarUploadButton,
+
         /**
          * User interacted with pin to sidebar checkboxes in the quick settings
          * menu of Element Web/Desktop.
@@ -279,6 +336,18 @@ data class Interaction(
          */
         WebRoomListRoomsSublistPlusMenuExploreRoomsItem,
 
+        /**
+         * User clicked on the button to return to the user onboarding list in
+         * the room list in Element Web/Desktop.
+         */
+        WebRoomListUserOnboardingButton,
+
+        /**
+         * User clicked on the button to close the user onboarding button in the
+         * room list in Element Web/Desktop.
+         */
+        WebRoomListUserOnboardingIgnoreButton,
+
         /**
          * User interacted with leave action in the general tab of the room
          * settings dialog in Element Web/Desktop.
@@ -349,6 +418,36 @@ data class Interaction(
          * Web/Desktop.
          */
         WebUserMenuThemeToggleButton,
+
+        /**
+         * User clicked on the send DM CTA in the header of the new user
+         * onboarding page in Element Web/Desktop.
+         */
+        WebUserOnboardingHeaderSendDm,
+
+        /**
+         * User clicked on the action of the download apps task on the new user
+         * onboarding page in Element Web/Desktop.
+         */
+        WebUserOnboardingTaskDownloadApps,
+
+        /**
+         * User clicked on the action of the enable notifications task on the
+         * new user onboarding page in Element Web/Desktop.
+         */
+        WebUserOnboardingTaskEnableNotifications,
+
+        /**
+         * User clicked on the action of the find people task on the new user
+         * onboarding page in Element Web/Desktop.
+         */
+        WebUserOnboardingTaskSendDm,
+
+        /**
+         * User clicked on the action of the your profile task on the new user
+         * onboarding page in Element Web/Desktop.
+         */
+        WebUserOnboardingTaskSetupProfile,
     }
 
     enum class InteractionType {
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/MobileScreen.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/MobileScreen.kt
index 3ce3dfb578..7ea41e2d78 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/MobileScreen.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/MobileScreen.kt
@@ -43,6 +43,11 @@ data class MobileScreen(
          */
         CreateRoom,
 
+        /**
+         * The screen shown to create a new space.
+         */
+        CreateSpace,
+
         /**
          * The confirmation screen shown before deactivating an account.
          */
@@ -78,6 +83,11 @@ data class MobileScreen(
          */
         InviteFriends,
 
+        /**
+         * Room accessed via space bottom sheet list.
+         */
+        Invites,
+
         /**
          * The screen that displays the login flow (when the user already has an
          * account).
@@ -261,6 +271,11 @@ data class MobileScreen(
          */
         Sidebar,
 
+        /**
+         * Room accessed via space bottom sheet list.
+         */
+        SpaceBottomSheet,
+
         /**
          * Screen that displays the list of rooms and spaces of a space.
          */
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/PermissionChanged.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/PermissionChanged.kt
new file mode 100644
index 0000000000..9f463a4107
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/PermissionChanged.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.analytics.plan
+
+import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
+
+// GENERATED FILE, DO NOT EDIT. FOR MORE INFORMATION VISIT
+// https://github.com/matrix-org/matrix-analytics-events/
+
+/**
+ * Triggered when the user changes a permission status.
+ */
+data class PermissionChanged(
+        /**
+         * Whether the permission has been granted by the user.
+         */
+        val granted: Boolean,
+        /**
+         * The name of the permission.
+         */
+        val permission: Permission,
+) : VectorAnalyticsEvent {
+
+    enum class Permission {
+        /**
+         * Permissions related to sending notifications have changed.
+         */
+        Notification,
+    }
+
+    override fun getName() = "PermissionChanged"
+
+    override fun getProperties(): Map<String, Any>? {
+        return mutableMapOf<String, Any>().apply {
+            put("granted", granted)
+            put("permission", permission.name)
+        }.takeIf { it.isNotEmpty() }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/UserProperties.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/UserProperties.kt
index 77be2456cd..01720453ce 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/UserProperties.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/UserProperties.kt
@@ -25,25 +25,9 @@ package im.vector.app.features.analytics.plan
  */
 data class UserProperties(
         /**
-         * Whether the user has the favourites space enabled.
+         * The active filter in the All Chats screen.
          */
-        val webMetaSpaceFavouritesEnabled: Boolean? = null,
-        /**
-         * Whether the user has the home space set to all rooms.
-         */
-        val webMetaSpaceHomeAllRooms: Boolean? = null,
-        /**
-         * Whether the user has the home space enabled.
-         */
-        val webMetaSpaceHomeEnabled: Boolean? = null,
-        /**
-         * Whether the user has the other rooms space enabled.
-         */
-        val webMetaSpaceOrphansEnabled: Boolean? = null,
-        /**
-         * Whether the user has the people space enabled.
-         */
-        val webMetaSpacePeopleEnabled: Boolean? = null,
+        val allChatsActiveFilter: AllChatsActiveFilter? = null,
         /**
          * The selected messaging use case during the onboarding flow.
          */
@@ -80,13 +64,32 @@ data class UserProperties(
         WorkMessaging,
     }
 
+    enum class AllChatsActiveFilter {
+
+        /**
+         * Filters are activated and All is selected.
+         */
+        All,
+
+        /**
+         * Filters are activated and Favourites is selected.
+         */
+        Favourites,
+
+        /**
+         * Filters are activated and People is selected.
+         */
+        People,
+
+        /**
+         * Filters are activated and Unreads is selected.
+         */
+        Unreads,
+    }
+
     fun getProperties(): Map<String, Any>? {
         return mutableMapOf<String, Any>().apply {
-            webMetaSpaceFavouritesEnabled?.let { put("WebMetaSpaceFavouritesEnabled", it) }
-            webMetaSpaceHomeAllRooms?.let { put("WebMetaSpaceHomeAllRooms", it) }
-            webMetaSpaceHomeEnabled?.let { put("WebMetaSpaceHomeEnabled", it) }
-            webMetaSpaceOrphansEnabled?.let { put("WebMetaSpaceOrphansEnabled", it) }
-            webMetaSpacePeopleEnabled?.let { put("WebMetaSpacePeopleEnabled", it) }
+            allChatsActiveFilter?.let { put("allChatsActiveFilter", it.name) }
             ftueUseCaseSelection?.let { put("ftueUseCaseSelection", it.name) }
             numFavouriteRooms?.let { put("numFavouriteRooms", it) }
             numSpaces?.let { put("numSpaces", it) }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/ViewRoom.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/ViewRoom.kt
index d2f30eec9b..366979025a 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/ViewRoom.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/ViewRoom.kt
@@ -110,6 +110,11 @@ data class ViewRoom(
          */
         MobileSearchContactDetail,
 
+        /**
+         * Room accessed via space bottom sheet list.
+         */
+        MobileSpaceBottomSheet,
+
         /**
          * Room accessed via interacting with direct chat item in the space
          * contact detail screen.
@@ -152,6 +157,11 @@ data class ViewRoom(
          */
         RoomList,
 
+        /**
+         * Room accessed via a shortcut.
+         */
+        Shortcut,
+
         /**
          * Room accessed via a slash command in Element Web/Desktop like /goto.
          */
diff --git a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt
index a5bafa2ee6..fbeeab9ec3 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.setTextWithColoredPart
 import im.vector.app.core.platform.OnBackPressed
@@ -30,9 +31,12 @@ import im.vector.app.databinding.FragmentAnalyticsOptinBinding
 import im.vector.app.features.analytics.AnalyticsConfig
 import javax.inject.Inject
 
-class AnalyticsOptInFragment @Inject constructor(
-        private val analyticsConfig: AnalyticsConfig,
-) : VectorBaseFragment<FragmentAnalyticsOptinBinding>(), OnBackPressed {
+@AndroidEntryPoint
+class AnalyticsOptInFragment :
+        VectorBaseFragment<FragmentAnalyticsOptinBinding>(),
+        OnBackPressed {
+
+    @Inject lateinit var analyticsConfig: AnalyticsConfig
 
     // Share the view model with the Activity so that the Activity
     // can decide what to do when the data has been saved
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentType.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentType.kt
new file mode 100644
index 0000000000..f4b97b9f9c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentType.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.attachments
+
+import im.vector.app.core.utils.PERMISSIONS_EMPTY
+import im.vector.app.core.utils.PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING
+import im.vector.app.core.utils.PERMISSIONS_FOR_PICKING_CONTACT
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSIONS_FOR_VOICE_BROADCAST
+
+/**
+ * The all possible types to pick with their required permissions.
+ */
+enum class AttachmentType(val permissions: List<String>) {
+    CAMERA(PERMISSIONS_FOR_TAKING_PHOTO),
+    GALLERY(PERMISSIONS_EMPTY),
+    FILE(PERMISSIONS_EMPTY),
+    STICKER(PERMISSIONS_EMPTY),
+    CONTACT(PERMISSIONS_FOR_PICKING_CONTACT),
+    POLL(PERMISSIONS_EMPTY),
+    LOCATION(PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING),
+    VOICE_BROADCAST(PERMISSIONS_FOR_VOICE_BROADCAST),
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt
new file mode 100644
index 0000000000..f8d5d768ef
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.attachments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.viewModels
+import com.airbnb.mvrx.parentFragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetAttachmentTypeSelectorBinding
+import im.vector.app.features.home.room.detail.TimelineViewModel
+
+@AndroidEntryPoint
+class AttachmentTypeSelectorBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetAttachmentTypeSelectorBinding>() {
+
+    private val viewModel: AttachmentTypeSelectorViewModel by parentFragmentViewModel()
+    private val timelineViewModel: TimelineViewModel by parentFragmentViewModel()
+    private val sharedActionViewModel: AttachmentTypeSelectorSharedActionViewModel by viewModels(
+            ownerProducer = { requireParentFragment() }
+    )
+
+    override val showExpanded = true
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetAttachmentTypeSelectorBinding {
+        return BottomSheetAttachmentTypeSelectorBinding.inflate(inflater, container, false)
+    }
+
+    override fun invalidate() = withState(viewModel, timelineViewModel) { viewState, timelineState ->
+        super.invalidate()
+        views.location.isVisible = viewState.isLocationVisible
+        views.voiceBroadcast.isVisible = viewState.isVoiceBroadcastVisible
+        views.poll.isVisible = !timelineState.isThreadTimeline()
+        views.textFormatting.isChecked = viewState.isTextFormattingEnabled
+        views.textFormatting.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                if (viewState.isTextFormattingEnabled) {
+                    R.drawable.ic_text_formatting
+                } else {
+                    R.drawable.ic_text_formatting_disabled
+                }, 0, 0, 0
+        )
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        views.gallery.debouncedClicks { onAttachmentSelected(AttachmentType.GALLERY) }
+        views.stickers.debouncedClicks { onAttachmentSelected(AttachmentType.STICKER) }
+        views.file.debouncedClicks { onAttachmentSelected(AttachmentType.FILE) }
+        views.voiceBroadcast.debouncedClicks { onAttachmentSelected(AttachmentType.VOICE_BROADCAST) }
+        views.poll.debouncedClicks { onAttachmentSelected(AttachmentType.POLL) }
+        views.location.debouncedClicks { onAttachmentSelected(AttachmentType.LOCATION) }
+        views.camera.debouncedClicks { onAttachmentSelected(AttachmentType.CAMERA) }
+        views.contact.debouncedClicks { onAttachmentSelected(AttachmentType.CONTACT) }
+        views.textFormatting.setOnCheckedChangeListener { _, isChecked -> onTextFormattingToggled(isChecked) }
+    }
+
+    private fun onAttachmentSelected(attachmentType: AttachmentType) {
+        val action = AttachmentTypeSelectorSharedAction.SelectAttachmentTypeAction(attachmentType)
+        sharedActionViewModel.post(action)
+        dismiss()
+    }
+
+    private fun onTextFormattingToggled(isEnabled: Boolean) =
+            viewModel.handle(AttachmentTypeSelectorAction.ToggleTextFormatting(isEnabled))
+
+    companion object {
+        fun show(fragmentManager: FragmentManager) {
+            val bottomSheet = AttachmentTypeSelectorBottomSheet()
+            bottomSheet.show(fragmentManager, "AttachmentTypeSelectorBottomSheet")
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt
new file mode 100644
index 0000000000..e02b10c54b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ *
+ */
+package im.vector.app.features.attachments
+
+import im.vector.app.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedActionViewModel
+import javax.inject.Inject
+
+class AttachmentTypeSelectorSharedActionViewModel @Inject constructor() :
+        VectorSharedActionViewModel<AttachmentTypeSelectorSharedAction>()
+
+sealed interface AttachmentTypeSelectorSharedAction : VectorSharedAction {
+    data class SelectAttachmentTypeAction(
+            val attachmentType: AttachmentType
+    ) : AttachmentTypeSelectorSharedAction
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
index c85c3aa6b5..55805a0728 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
@@ -30,16 +30,11 @@ import android.view.animation.TranslateAnimation
 import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.PopupWindow
-import androidx.annotation.StringRes
 import androidx.appcompat.widget.TooltipCompat
 import androidx.core.view.doOnNextLayout
 import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.core.epoxy.onClick
-import im.vector.app.core.utils.PERMISSIONS_EMPTY
-import im.vector.app.core.utils.PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING
-import im.vector.app.core.utils.PERMISSIONS_FOR_PICKING_CONTACT
-import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.databinding.ViewAttachmentTypeSelectorBinding
 import im.vector.app.features.attachments.AttachmentTypeSelectorView.Callback
 import kotlin.math.max
@@ -58,7 +53,7 @@ class AttachmentTypeSelectorView(
 ) : PopupWindow(context) {
 
     interface Callback {
-        fun onTypeSelected(type: Type)
+        fun onTypeSelected(type: AttachmentType)
     }
 
     private val views: ViewAttachmentTypeSelectorBinding
@@ -68,13 +63,14 @@ class AttachmentTypeSelectorView(
     init {
         contentView = inflater.inflate(R.layout.view_attachment_type_selector, null, false)
         views = ViewAttachmentTypeSelectorBinding.bind(contentView)
-        views.attachmentGalleryButton.configure(Type.GALLERY)
-        views.attachmentCameraButton.configure(Type.CAMERA)
-        views.attachmentFileButton.configure(Type.FILE)
-        views.attachmentStickersButton.configure(Type.STICKER)
-        views.attachmentContactButton.configure(Type.CONTACT)
-        views.attachmentPollButton.configure(Type.POLL)
-        views.attachmentLocationButton.configure(Type.LOCATION)
+        views.attachmentGalleryButton.configure(AttachmentType.GALLERY)
+        views.attachmentCameraButton.configure(AttachmentType.CAMERA)
+        views.attachmentFileButton.configure(AttachmentType.FILE)
+        views.attachmentStickersButton.configure(AttachmentType.STICKER)
+        views.attachmentContactButton.configure(AttachmentType.CONTACT)
+        views.attachmentPollButton.configure(AttachmentType.POLL)
+        views.attachmentLocationButton.configure(AttachmentType.LOCATION)
+        views.attachmentVoiceBroadcast.configure(AttachmentType.VOICE_BROADCAST)
         width = LinearLayout.LayoutParams.MATCH_PARENT
         height = LinearLayout.LayoutParams.WRAP_CONTENT
         animationStyle = 0
@@ -125,15 +121,16 @@ class AttachmentTypeSelectorView(
         }
     }
 
-    fun setAttachmentVisibility(type: Type, isVisible: Boolean) {
+    fun setAttachmentVisibility(type: AttachmentType, isVisible: Boolean) {
         when (type) {
-            Type.CAMERA -> views.attachmentCameraButton
-            Type.GALLERY -> views.attachmentGalleryButton
-            Type.FILE -> views.attachmentFileButton
-            Type.STICKER -> views.attachmentStickersButton
-            Type.CONTACT -> views.attachmentContactButton
-            Type.POLL -> views.attachmentPollButton
-            Type.LOCATION -> views.attachmentLocationButton
+            AttachmentType.CAMERA -> views.attachmentCameraButton
+            AttachmentType.GALLERY -> views.attachmentGalleryButton
+            AttachmentType.FILE -> views.attachmentFileButton
+            AttachmentType.STICKER -> views.attachmentStickersButton
+            AttachmentType.CONTACT -> views.attachmentContactButton
+            AttachmentType.POLL -> views.attachmentPollButton
+            AttachmentType.LOCATION -> views.attachmentLocationButton
+            AttachmentType.VOICE_BROADCAST -> views.attachmentVoiceBroadcast
         }.let {
             it.isVisible = isVisible
         }
@@ -197,13 +194,13 @@ class AttachmentTypeSelectorView(
         return Pair(x, y)
     }
 
-    private fun ImageButton.configure(type: Type): ImageButton {
+    private fun ImageButton.configure(type: AttachmentType): ImageButton {
         this.setOnClickListener(TypeClickListener(type))
-        TooltipCompat.setTooltipText(this, context.getString(type.tooltipRes))
+        TooltipCompat.setTooltipText(this, context.getString(attachmentTooltipLabels.getValue(type)))
         return this
     }
 
-    private inner class TypeClickListener(private val type: Type) : View.OnClickListener {
+    private inner class TypeClickListener(private val type: AttachmentType) : View.OnClickListener {
 
         override fun onClick(v: View) {
             dismiss()
@@ -214,13 +211,18 @@ class AttachmentTypeSelectorView(
     /**
      * The all possible types to pick with their required permissions and tooltip resource.
      */
-    enum class Type(val permissions: List<String>, @StringRes val tooltipRes: Int) {
-        CAMERA(PERMISSIONS_FOR_TAKING_PHOTO, R.string.tooltip_attachment_photo),
-        GALLERY(PERMISSIONS_EMPTY, R.string.tooltip_attachment_gallery),
-        FILE(PERMISSIONS_EMPTY, R.string.tooltip_attachment_file),
-        STICKER(PERMISSIONS_EMPTY, R.string.tooltip_attachment_sticker),
-        CONTACT(PERMISSIONS_FOR_PICKING_CONTACT, R.string.tooltip_attachment_contact),
-        POLL(PERMISSIONS_EMPTY, R.string.tooltip_attachment_poll),
-        LOCATION(PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING, R.string.tooltip_attachment_location)
+    private companion object {
+        private val attachmentTooltipLabels: Map<AttachmentType, Int> = AttachmentType.values().associateWith {
+            when (it) {
+                AttachmentType.CAMERA -> R.string.tooltip_attachment_photo
+                AttachmentType.GALLERY -> R.string.tooltip_attachment_gallery
+                AttachmentType.FILE -> R.string.tooltip_attachment_file
+                AttachmentType.STICKER -> R.string.tooltip_attachment_sticker
+                AttachmentType.CONTACT -> R.string.tooltip_attachment_contact
+                AttachmentType.POLL -> R.string.tooltip_attachment_poll
+                AttachmentType.LOCATION -> R.string.tooltip_attachment_location
+                AttachmentType.VOICE_BROADCAST -> R.string.tooltip_attachment_voice_broadcast
+            }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt
new file mode 100644
index 0000000000..cb74661eba
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.attachments
+
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.features.VectorFeatures
+import im.vector.app.features.settings.VectorPreferences
+
+class AttachmentTypeSelectorViewModel @AssistedInject constructor(
+        @Assisted initialState: AttachmentTypeSelectorViewState,
+        private val vectorFeatures: VectorFeatures,
+        private val vectorPreferences: VectorPreferences,
+) : VectorViewModel<AttachmentTypeSelectorViewState, AttachmentTypeSelectorAction, EmptyViewEvents>(initialState) {
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<AttachmentTypeSelectorViewModel, AttachmentTypeSelectorViewState> {
+        override fun create(initialState: AttachmentTypeSelectorViewState): AttachmentTypeSelectorViewModel
+    }
+
+    companion object : MavericksViewModelFactory<AttachmentTypeSelectorViewModel, AttachmentTypeSelectorViewState> by hiltMavericksViewModelFactory()
+
+    override fun handle(action: AttachmentTypeSelectorAction) = when (action) {
+        is AttachmentTypeSelectorAction.ToggleTextFormatting -> setTextFormattingEnabled(action.isEnabled)
+    }
+
+    init {
+        setState {
+            copy(
+                    isLocationVisible = vectorFeatures.isLocationSharingEnabled(),
+                    isVoiceBroadcastVisible = vectorFeatures.isVoiceBroadcastEnabled(),
+                    isTextFormattingEnabled = vectorPreferences.isTextFormattingEnabled(),
+            )
+        }
+    }
+
+    private fun setTextFormattingEnabled(isEnabled: Boolean) {
+        vectorPreferences.setTextFormattingEnabled(isEnabled)
+        setState {
+            copy(
+                    isTextFormattingEnabled = isEnabled
+            )
+        }
+    }
+}
+
+data class AttachmentTypeSelectorViewState(
+        val isLocationVisible: Boolean = false,
+        val isVoiceBroadcastVisible: Boolean = false,
+        val isTextFormattingEnabled: Boolean = false,
+) : MavericksState
+
+sealed interface AttachmentTypeSelectorAction : VectorViewModelAction {
+    data class ToggleTextFormatting(val isEnabled: Boolean) : AttachmentTypeSelectorAction
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
index f8aa22f418..9692777e15 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
@@ -16,6 +16,7 @@
 package im.vector.app.features.attachments
 
 import android.app.Activity
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -25,6 +26,8 @@ import im.vector.app.core.dialogs.PhotoOrVideoDialog
 import im.vector.app.core.platform.Restorable
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.lib.core.utils.compat.getParcelableCompat
+import im.vector.lib.core.utils.compat.getSerializableCompat
 import im.vector.lib.multipicker.MultiPicker
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import timber.log.Timber
@@ -44,13 +47,14 @@ class AttachmentsHelper(
     interface Callback {
         fun onContactAttachmentReady(contactAttachment: ContactAttachment)
         fun onContentAttachmentsReady(attachments: List<ContentAttachmentData>)
+        fun onAttachmentError(throwable: Throwable)
     }
 
     // Capture path allows to handle camera image picking. It must be restored if the activity gets killed.
     private var captureUri: Uri? = null
 
     // The pending type is set if we have to handle permission request. It must be restored if the activity gets killed.
-    var pendingType: AttachmentTypeSelectorView.Type? = null
+    var pendingType: AttachmentType? = null
 
     // Restorable
 
@@ -64,8 +68,8 @@ class AttachmentsHelper(
     }
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
-        captureUri = savedInstanceState?.getParcelable(CAPTURE_PATH_KEY) as? Uri
-        pendingType = savedInstanceState?.getSerializable(PENDING_TYPE_KEY) as? AttachmentTypeSelectorView.Type
+        captureUri = savedInstanceState?.getParcelableCompat(CAPTURE_PATH_KEY)
+        pendingType = savedInstanceState?.getSerializableCompat(PENDING_TYPE_KEY)
     }
 
     // Public Methods
@@ -73,21 +77,21 @@ class AttachmentsHelper(
     /**
      * Starts the process for handling file picking.
      */
-    fun selectFile(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    fun selectFile(activityResultLauncher: ActivityResultLauncher<Intent>) = doSafe {
         MultiPicker.get(MultiPicker.FILE).startWith(activityResultLauncher)
     }
 
     /**
      * Starts the process for handling image/video picking.
      */
-    fun selectGallery(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    fun selectGallery(activityResultLauncher: ActivityResultLauncher<Intent>) = doSafe {
         MultiPicker.get(MultiPicker.MEDIA).startWith(activityResultLauncher)
     }
 
     /**
      * Starts the process for handling audio picking.
      */
-    fun selectAudio(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    fun selectAudio(activityResultLauncher: ActivityResultLauncher<Intent>) = doSafe {
         MultiPicker.get(MultiPicker.AUDIO).startWith(activityResultLauncher)
     }
 
@@ -101,11 +105,11 @@ class AttachmentsHelper(
             cameraVideoActivityResultLauncher: ActivityResultLauncher<Intent>
     ) {
         PhotoOrVideoDialog(activity, vectorPreferences).show(object : PhotoOrVideoDialog.PhotoOrVideoDialogListener {
-            override fun takePhoto() {
+            override fun takePhoto() = doSafe {
                 captureUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(context, cameraActivityResultLauncher)
             }
 
-            override fun takeVideo() {
+            override fun takeVideo() = doSafe {
                 captureUri = MultiPicker.get(MultiPicker.CAMERA_VIDEO).startWithExpectingFile(context, cameraVideoActivityResultLauncher)
             }
         })
@@ -114,10 +118,18 @@ class AttachmentsHelper(
     /**
      * Starts the process for handling contact picking.
      */
-    fun selectContact(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    fun selectContact(activityResultLauncher: ActivityResultLauncher<Intent>) = doSafe {
         MultiPicker.get(MultiPicker.CONTACT).startWith(activityResultLauncher)
     }
 
+    private fun doSafe(function: () -> Unit) {
+        try {
+            function()
+        } catch (activityNotFound: ActivityNotFoundException) {
+            callback.onAttachmentError(activityNotFound)
+        }
+    }
+
     /**
      * This methods aims to handle the result data.
      */
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
index 7ddba0d229..4a965022b8 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
@@ -24,6 +24,8 @@ import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.themes.ActivityOtherThemes
+import im.vector.lib.core.utils.compat.getParcelableArrayListExtraCompat
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 
 @AndroidEntryPoint
@@ -41,7 +43,7 @@ class AttachmentsPreviewActivity : VectorBaseActivity<ActivitySimpleBinding>() {
         }
 
         fun getOutput(intent: Intent): List<ContentAttachmentData> {
-            return intent.getParcelableArrayListExtra<ContentAttachmentData>(ATTACHMENTS_PREVIEW_RESULT).orEmpty()
+            return intent.getParcelableArrayListExtraCompat<ContentAttachmentData>(ATTACHMENTS_PREVIEW_RESULT).orEmpty()
         }
 
         fun getKeepOriginalSize(intent: Intent): Boolean {
@@ -57,7 +59,7 @@ class AttachmentsPreviewActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
     override fun initUiAndData() {
         if (isFirstCreation()) {
-            val fragmentArgs: AttachmentsPreviewArgs = intent?.extras?.getParcelable(EXTRA_FRAGMENT_ARGS) ?: return
+            val fragmentArgs: AttachmentsPreviewArgs = intent?.extras?.getParcelableCompat(EXTRA_FRAGMENT_ARGS) ?: return
             addFragment(views.simpleFragmentContainer, AttachmentsPreviewFragment::class.java, fragmentArgs)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
index c3a4ae7df2..e7ab8c9804 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
@@ -39,6 +39,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.yalantis.ucrop.UCrop
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.insertBeforeLast
@@ -63,15 +64,17 @@ data class AttachmentsPreviewArgs(
         val attachments: List<ContentAttachmentData>
 ) : Parcelable
 
-class AttachmentsPreviewFragment @Inject constructor(
-        private val attachmentMiniaturePreviewController: AttachmentMiniaturePreviewController,
-        private val attachmentBigPreviewController: AttachmentBigPreviewController,
-        private val colorProvider: ColorProvider,
-        private val clock: Clock,
-) : VectorBaseFragment<FragmentAttachmentsPreviewBinding>(),
+@AndroidEntryPoint
+class AttachmentsPreviewFragment :
+        VectorBaseFragment<FragmentAttachmentsPreviewBinding>(),
         AttachmentMiniaturePreviewController.Callback,
         VectorMenuProvider {
 
+    @Inject lateinit var attachmentMiniaturePreviewController: AttachmentMiniaturePreviewController
+    @Inject lateinit var attachmentBigPreviewController: AttachmentBigPreviewController
+    @Inject lateinit var colorProvider: ColorProvider
+    @Inject lateinit var clock: Clock
+
     private val fragmentArgs: AttachmentsPreviewArgs by args()
     private val viewModel: AttachmentsPreviewViewModel by fragmentViewModel()
 
@@ -166,11 +169,11 @@ class AttachmentsPreviewFragment @Inject constructor(
         )
     }
 
-    @Suppress("DEPRECATION")
     private fun applyInsets() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             activity?.window?.setDecorFitsSystemWindows(false)
         } else {
+            @Suppress("DEPRECATION")
             view?.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
         }
         ViewCompat.setOnApplyWindowInsetsListener(views.attachmentPreviewerBottomContainer) { v, insets ->
@@ -204,13 +207,13 @@ class AttachmentsPreviewFragment @Inject constructor(
         attachmentMiniaturePreviewController.callback = this
 
         views.attachmentPreviewerMiniatureList.let {
-            it.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+            it.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
             it.setHasFixedSize(true)
             it.adapter = attachmentMiniaturePreviewController.adapter
         }
 
         views.attachmentPreviewerBigList.let {
-            it.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+            it.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
             it.attachSnapHelperWithListener(
                     PagerSnapHelper(),
                     SnapOnScrollListener.Behavior.NOTIFY_ON_SCROLL_STATE_IDLE,
diff --git a/vector/src/main/java/im/vector/app/features/auth/PendingAuthHandler.kt b/vector/src/main/java/im/vector/app/features/auth/PendingAuthHandler.kt
new file mode 100644
index 0000000000..28a6f4b256
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/auth/PendingAuthHandler.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.auth
+
+import im.vector.app.core.di.ActiveSessionHolder
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.auth.UIABaseAuth
+import org.matrix.android.sdk.api.auth.UserPasswordAuth
+import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
+import org.matrix.android.sdk.api.util.fromBase64
+import timber.log.Timber
+import javax.inject.Inject
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+class PendingAuthHandler @Inject constructor(
+        private val matrix: Matrix,
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+    var uiaContinuation: Continuation<UIABaseAuth>? = null
+    var pendingAuth: UIABaseAuth? = null
+
+    fun ssoAuthDone() {
+        pendingAuth?.let {
+            Timber.d("ssoAuthDone, resuming action")
+            uiaContinuation?.resume(it)
+        } ?: run {
+            Timber.d("ssoAuthDone, cannot resume: no pendingAuth")
+            uiaContinuation?.resumeWithException(IllegalArgumentException())
+        }
+    }
+
+    fun passwordAuthDone(password: String) {
+        Timber.d("passwordAuthDone")
+        val decryptedPass = matrix.secureStorageService()
+                .loadSecureSecret<String>(
+                        inputStream = password.fromBase64().inputStream(),
+                        keyAlias = ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS
+                )
+        uiaContinuation?.resume(
+                UserPasswordAuth(
+                        session = pendingAuth?.session,
+                        password = decryptedPass,
+                        user = activeSessionHolder.getActiveSession().myUserId
+                )
+        )
+    }
+
+    fun reAuthCancelled() {
+        Timber.d("reAuthCancelled")
+        uiaContinuation?.resumeWithException(UiaCancelledException())
+        uiaContinuation = null
+        pendingAuth = null
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
index a480b1c279..ff04a4db17 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
@@ -145,7 +145,12 @@ class AutocompleteMemberPresenter @AssistedInject constructor(
     private fun createEveryoneItem(query: CharSequence?) =
             room.roomSummary()
                     ?.takeIf { canNotifyEveryone() }
-                    ?.takeIf { query.isNullOrBlank() || MatrixItem.NOTIFY_EVERYONE.startsWith("@$query") }
+                    ?.takeIf {
+                        query.isNullOrBlank() ||
+                                SUGGEST_ROOM_KEYWORDS.any {
+                                    it.startsWith("@$query")
+                                }
+                    }
                     ?.let {
                         AutocompleteMemberItem.Everyone(it)
                     }
@@ -165,6 +170,7 @@ class AutocompleteMemberPresenter @AssistedInject constructor(
     companion object {
         private const val ID_HEADER_MEMBERS = "ID_HEADER_MEMBERS"
         private const val ID_HEADER_EVERYONE = "ID_HEADER_EVERYONE"
+        private val SUGGEST_ROOM_KEYWORDS = setOf(MatrixItem.NOTIFY_EVERYONE, "@channel", "@everyone", "@here")
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
index aa46feeea6..a96097a830 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -69,6 +69,7 @@ import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import io.github.hyuwah.draggableviewlib.DraggableView
 import io.github.hyuwah.draggableviewlib.setupDraggable
 import kotlinx.parcelize.Parcelize
@@ -178,7 +179,7 @@ class VectorCallActivity :
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
         intent?.takeIf { it.hasExtra(Mavericks.KEY_ARG) }
-                ?.let { intent.getParcelableExtra<CallArgs>(Mavericks.KEY_ARG) }
+                ?.let { intent.getParcelableExtraCompat<CallArgs>(Mavericks.KEY_ARG) }
                 ?.let {
                     callViewModel.handle(VectorCallViewActions.SwitchCall(it))
                 }
@@ -193,6 +194,7 @@ class VectorCallActivity :
 
     override fun onBackPressed() {
         if (!enterPictureInPictureIfRequired()) {
+            @Suppress("DEPRECATION")
             super.onBackPressed()
         }
     }
@@ -230,6 +232,7 @@ class VectorCallActivity :
             }
             android.R.id.home -> {
                 // We check here as we want PiP in some cases
+                @Suppress("DEPRECATION")
                 onBackPressed()
                 true
             }
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt b/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt
index 08612fe573..670cd10ac4 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt
@@ -24,6 +24,7 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.facebook.react.bridge.JavaOnlyMap
+import im.vector.app.config.Config
 import org.jitsi.meet.sdk.BroadcastEmitter
 import org.jitsi.meet.sdk.BroadcastEvent
 import org.jitsi.meet.sdk.JitsiMeet
@@ -35,6 +36,7 @@ sealed class ConferenceEvent(open val data: Map<String, Any>) {
     data class Terminated(override val data: Map<String, Any>) : ConferenceEvent(data)
     data class WillJoin(override val data: Map<String, Any>) : ConferenceEvent(data)
     data class Joined(override val data: Map<String, Any>) : ConferenceEvent(data)
+    object ReadyToClose : ConferenceEvent(emptyMap())
 
     fun extractConferenceUrl(): String? {
         return data[CONFERENCE_URL_DATA_KEY] as? String
@@ -84,14 +86,24 @@ class ConferenceEventObserver(
 
     private fun onBroadcastReceived(intent: Intent) {
         val event = BroadcastEvent(intent)
+        safeLog("onBroadcastReceived: Event received (type ${event.type})", event.data)
         val conferenceEvent = when (event.type) {
             BroadcastEvent.Type.CONFERENCE_JOINED -> ConferenceEvent.Joined(event.data)
             BroadcastEvent.Type.CONFERENCE_TERMINATED -> ConferenceEvent.Terminated(event.data)
             BroadcastEvent.Type.CONFERENCE_WILL_JOIN -> ConferenceEvent.WillJoin(event.data)
+            BroadcastEvent.Type.READY_TO_CLOSE -> ConferenceEvent.ReadyToClose
             else -> null
         }
         if (conferenceEvent != null) {
             onBroadcastEvent(conferenceEvent)
         }
     }
+
+    private fun safeLog(message: String, sensitiveData: Any?) {
+        if (Config.LOW_PRIVACY_LOG_ENABLE) {
+            Timber.v("$message: $sensitiveData")
+        } else {
+            Timber.v(message)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
index b0da4f0e18..d14f358801 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
@@ -25,7 +25,7 @@ import im.vector.app.core.utils.toBase32String
 import im.vector.app.features.call.conference.jwt.JitsiJWTFactory
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.raw.wellknown.getElementWellknown
-import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorLocaleProvider
 import im.vector.app.features.themes.ThemeProvider
 import okhttp3.Request
 import org.jitsi.meet.sdk.JitsiMeetUserInfo
@@ -49,6 +49,7 @@ class JitsiService @Inject constructor(
         private val themeProvider: ThemeProvider,
         private val jitsiJWTFactory: JitsiJWTFactory,
         private val clock: Clock,
+        private val vectorLocale: VectorLocaleProvider,
 ) {
 
     companion object {
@@ -163,7 +164,7 @@ class JitsiService @Inject constructor(
             if (widgetSessionId.length > 8) {
                 widgetSessionId = widgetSessionId.substring(0, 7)
             }
-            roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.lowercase(VectorLocale.applicationLocale)
+            roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.lowercase(vectorLocale.applicationLocale)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index 5bf05d353c..62cc3c1439 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.call.conference
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
@@ -28,6 +29,7 @@ import androidx.core.app.PictureInPictureModeChangedInfo
 import androidx.core.util.Consumer
 import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.Success
@@ -38,11 +40,14 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityJitsiBinding
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.parcelize.Parcelize
+import org.jitsi.meet.sdk.BroadcastIntentHelper
 import org.jitsi.meet.sdk.JitsiMeet
 import org.jitsi.meet.sdk.JitsiMeetActivityDelegate
 import org.jitsi.meet.sdk.JitsiMeetActivityInterface
 import org.jitsi.meet.sdk.JitsiMeetConferenceOptions
+import org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService
 import org.jitsi.meet.sdk.JitsiMeetView
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.util.JsonDict
@@ -65,6 +70,13 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
     private val jitsiViewModel: JitsiCallViewModel by viewModel()
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        val intent = Intent("onConfigurationChanged")
+        intent.putExtra("newConfig", newConfig)
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         addOnPictureInPictureModeChangedListener(pictureInPictureModeChangedInfoConsumer)
@@ -104,17 +116,26 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
     override fun onDestroy() {
         val currentConf = JitsiMeet.getCurrentConference()
-        jitsiMeetView?.leave()
+        handleLeaveConference()
         jitsiMeetView?.dispose()
         // Fake emitting CONFERENCE_TERMINATED event when currentConf is not null (probably when closing the PiP screen).
         if (currentConf != null) {
             ConferenceEventEmitter(this).emitConferenceEnded()
         }
+        JitsiMeetOngoingConferenceService.abort(this)
         JitsiMeetActivityDelegate.onHostDestroy(this)
         removeOnPictureInPictureModeChangedListener(pictureInPictureModeChangedInfoConsumer)
         super.onDestroy()
     }
 
+    // Activity lifecycle methods
+    //
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        @Suppress("DEPRECATION")
+        super.onActivityResult(requestCode, resultCode, data)
+        JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data)
+    }
+
     override fun onBackPressed() {
         JitsiMeetActivityDelegate.onBackPressed()
     }
@@ -127,7 +148,8 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
     }
 
     private fun handleLeaveConference() {
-        jitsiMeetView?.leave()
+        val leaveBroadcastIntent = BroadcastIntentHelper.buildHangUpIntent()
+        LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(leaveBroadcastIntent)
     }
 
     private fun handleConfirmSwitching(action: JitsiCallViewEvents.ConfirmSwitchingConference) {
@@ -200,7 +222,7 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
         // Is it a switch to another conf?
         intent?.takeIf { it.hasExtra(Mavericks.KEY_ARG) }
-                ?.let { intent.getParcelableExtra<Args>(Mavericks.KEY_ARG) }
+                ?.let { intent.getParcelableExtraCompat<Args>(Mavericks.KEY_ARG) }
                 ?.let {
                     jitsiViewModel.handle(JitsiCallViewActions.SwitchTo(it, true))
                 }
@@ -221,10 +243,17 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         Timber.v("Broadcast received: $event")
         when (event) {
             is ConferenceEvent.Terminated -> onConferenceTerminated(event.data)
-            else -> Unit
+            is ConferenceEvent.Joined -> onConferenceJoined(event.data)
+            is ConferenceEvent.ReadyToClose -> onReadyToClose()
+            is ConferenceEvent.WillJoin -> Unit
         }
     }
 
+    private fun onConferenceJoined(extraData: Map<String, Any>) {
+        // Launch the service for the ongoing notification.
+        JitsiMeetOngoingConferenceService.launch(this, HashMap(extraData))
+    }
+
     private fun onConferenceTerminated(data: JsonDict) {
         Timber.v("JitsiMeetViewListener.onConferenceTerminated()")
         // Do not finish if there is an error
@@ -233,6 +262,11 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         }
     }
 
+    private fun onReadyToClose() {
+        Timber.v("SDK is ready to close")
+        finish()
+    }
+
     companion object {
         fun newIntent(context: Context, roomId: String, widgetId: String, enableVideo: Boolean): Intent {
             return Intent(context, VectorJitsiActivity::class.java).apply {
diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/CallDialPadBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/CallDialPadBottomSheet.kt
index 8bf2ce47bd..c157ee42b8 100644
--- a/vector/src/main/java/im/vector/app/features/call/dialpad/CallDialPadBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/CallDialPadBottomSheet.kt
@@ -20,12 +20,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.addChildFragment
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetCallDialPadBinding
-import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorLocaleProvider
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class CallDialPadBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetCallDialPadBinding>() {
 
     companion object {
@@ -41,6 +44,8 @@ class CallDialPadBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetCa
         }
     }
 
+    @Inject lateinit var vectorLocale: VectorLocaleProvider
+
     override val showExpanded = true
 
     var callback: DialPadFragment.Callback? = null
@@ -62,7 +67,7 @@ class CallDialPadBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetCa
                     putBoolean(DialPadFragment.EXTRA_ENABLE_DELETE, showActions)
                     putBoolean(DialPadFragment.EXTRA_ENABLE_OK, showActions)
                     putBoolean(DialPadFragment.EXTRA_CURSOR_VISIBLE, false)
-                    putString(DialPadFragment.EXTRA_REGION_CODE, VectorLocale.applicationLocale.country)
+                    putString(DialPadFragment.EXTRA_REGION_CODE, vectorLocale.applicationLocale.country)
                 }
                 callback = DialPadFragmentCallbackWrapper(this@CallDialPadBottomSheet.callback)
             }.also {
diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/PstnDialActivity.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/PstnDialActivity.kt
new file mode 100644
index 0000000000..1a7571598e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/PstnDialActivity.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.call.dialpad
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatDialog
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.features.call.webrtc.WebRtcCallManager
+import im.vector.app.features.createdirect.DirectRoomHelper
+import im.vector.lib.ui.styles.dialogs.MaterialProgressDialog
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class PstnDialActivity : SimpleFragmentActivity() {
+
+    @Inject lateinit var callManager: WebRtcCallManager
+    @Inject lateinit var directRoomHelper: DirectRoomHelper
+    @Inject lateinit var session: Session
+
+    private var progress: AppCompatDialog? = null
+
+    override fun getTitleRes(): Int = R.string.call
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (isFirstCreation()) {
+            addFragment(
+                    views.container,
+                    createDialPadFragment()
+            )
+        }
+    }
+
+    private fun handleStartCallWithPhoneNumber(rawNumber: String) {
+        lifecycleScope.launch {
+            try {
+                showLoadingDialog()
+                val result = DialPadLookup(session, callManager, directRoomHelper).lookupPhoneNumber(rawNumber)
+                callManager.startOutgoingCall(result.roomId, result.userId, isVideoCall = false)
+                dismissLoadingDialog()
+                finish()
+            } catch (failure: Throwable) {
+                dismissLoadingDialog()
+                displayErrorDialog(failure)
+            }
+        }
+    }
+
+    private fun createDialPadFragment(): Fragment {
+        val fragment = supportFragmentManager.fragmentFactory.instantiate(classLoader, DialPadFragment::class.java.name)
+        return (fragment as DialPadFragment).apply {
+            arguments = Bundle().apply {
+                putBoolean(DialPadFragment.EXTRA_ENABLE_DELETE, true)
+                putBoolean(DialPadFragment.EXTRA_ENABLE_OK, true)
+                putString(DialPadFragment.EXTRA_REGION_CODE, vectorLocale.applicationLocale.country)
+            }
+            callback = object : DialPadFragment.Callback {
+                override fun onOkClicked(formatted: String?, raw: String?) {
+                    if (raw.isNullOrEmpty()) return
+                    handleStartCallWithPhoneNumber(raw)
+                }
+            }
+        }
+    }
+
+    private fun showLoadingDialog() {
+        progress?.dismiss()
+        progress = MaterialProgressDialog(this)
+                .show(getString(R.string.please_wait))
+    }
+
+    private fun dismissLoadingDialog() {
+        progress?.dismiss()
+    }
+
+    private fun displayErrorDialog(throwable: Throwable) {
+        MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.dialog_title_error)
+                .setMessage(errorFormatter.toHumanReadable(throwable))
+                .setPositiveButton(R.string.ok, null)
+                .show()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
index 25e0273528..ae168c5f92 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
@@ -25,11 +25,10 @@ import com.airbnb.mvrx.viewModel
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityCallTransferBinding
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import kotlinx.parcelize.Parcelize
-import javax.inject.Inject
 
 @Parcelize
 data class CallTransferArgs(val callId: String) : Parcelable
@@ -39,8 +38,6 @@ private const val USER_LIST_FRAGMENT_TAG = "USER_LIST_FRAGMENT_TAG"
 @AndroidEntryPoint
 class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>() {
 
-    @Inject lateinit var errorFormatter: ErrorFormatter
-
     private lateinit var sectionsPagerAdapter: CallTransferPagerAdapter
 
     private val callTransferViewModel: CallTransferViewModel by viewModel()
@@ -59,7 +56,7 @@ class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>() {
             }
         }
 
-        sectionsPagerAdapter = CallTransferPagerAdapter(this)
+        sectionsPagerAdapter = CallTransferPagerAdapter(this, vectorLocale)
         views.callTransferViewPager.adapter = sectionsPagerAdapter
 
         TabLayoutMediator(views.callTransferTabLayout, views.callTransferViewPager) { tab, position ->
@@ -112,7 +109,7 @@ class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>() {
         }
 
         fun getCallTransferResult(intent: Intent?): CallTransferResult? {
-            return intent?.extras?.getParcelable(EXTRA_TRANSFER_RESULT)
+            return intent?.extras?.getParcelableCompat(EXTRA_TRANSFER_RESULT)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferPagerAdapter.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferPagerAdapter.kt
index 3ec8f61978..cb62213398 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferPagerAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferPagerAdapter.kt
@@ -22,12 +22,13 @@ import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.features.call.dialpad.DialPadFragment
-import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorLocaleProvider
 import im.vector.app.features.userdirectory.UserListFragment
 import im.vector.app.features.userdirectory.UserListFragmentArgs
 
 class CallTransferPagerAdapter(
-        private val fragmentActivity: FragmentActivity
+        private val fragmentActivity: FragmentActivity,
+        private val vectorLocale: VectorLocaleProvider,
 ) : FragmentStateAdapter(fragmentActivity) {
 
     companion object {
@@ -61,7 +62,7 @@ class CallTransferPagerAdapter(
                 arguments = Bundle().apply {
                     putBoolean(DialPadFragment.EXTRA_ENABLE_DELETE, true)
                     putBoolean(DialPadFragment.EXTRA_ENABLE_OK, false)
-                    putString(DialPadFragment.EXTRA_REGION_CODE, VectorLocale.applicationLocale.country)
+                    putString(DialPadFragment.EXTRA_REGION_CODE, vectorLocale.applicationLocale.country)
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureAndroidService.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureAndroidService.kt
index e7cebfb9c9..00b6bc40d2 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureAndroidService.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureAndroidService.kt
@@ -20,6 +20,7 @@ import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
 import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.startForegroundCompat
 import im.vector.app.core.services.VectorAndroidService
 import im.vector.app.core.time.Clock
 import im.vector.app.features.notifications.NotificationUtils
@@ -41,7 +42,7 @@ class ScreenCaptureAndroidService : VectorAndroidService() {
     private fun showStickyNotification() {
         val notificationId = clock.epochMillis().toInt()
         val notification = notificationUtils.buildScreenSharingNotification()
-        startForeground(notificationId, notification)
+        startForegroundCompat(notificationId, notification)
     }
 
     override fun onBind(intent: Intent?): IBinder {
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
index 00b9a76de7..0bf70690ba 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -167,12 +167,10 @@ class WebRtcCall(
     private var screenSender: RtpSender? = null
 
     private val timer = CountUpTimer(1000L).apply {
-        tickListener = object : CountUpTimer.TickListener {
-            override fun onTick(milliseconds: Long) {
-                val formattedDuration = formatDuration(Duration.ofMillis(milliseconds))
-                listeners.forEach {
-                    tryOrNull { it.onTick(formattedDuration) }
-                }
+        tickListener = CountUpTimer.TickListener { milliseconds ->
+            val formattedDuration = formatDuration(Duration.ofMillis(milliseconds))
+            listeners.forEach {
+                tryOrNull { it.onTick(formattedDuration) }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/command/Command.kt b/vector/src/main/java/im/vector/app/features/command/Command.kt
index 20c8f9d8fe..324029c45b 100644
--- a/vector/src/main/java/im/vector/app/features/command/Command.kt
+++ b/vector/src/main/java/im/vector/app/features/command/Command.kt
@@ -52,6 +52,7 @@ enum class Command(
     MARKDOWN("/markdown", null, "<on|off>", R.string.command_description_markdown, false, false),
     RAINBOW("/rainbow", null, "<message>", R.string.command_description_rainbow, false, true),
     RAINBOW_EMOTE("/rainbowme", null, "<message>", R.string.command_description_rainbow_emote, false, true),
+    DEVTOOLS("/devtools", null, "", R.string.command_description_devtools, true, false),
     CLEAR_SCALAR_TOKEN("/clear_scalar_token", null, "", R.string.command_description_clear_scalar_token, false, false),
     SPOILER("/spoiler", null, "<message>", R.string.command_description_spoiler, false, true),
     SHRUG("/shrug", null, "<message>", R.string.command_description_shrug, false, true),
@@ -65,7 +66,8 @@ enum class Command(
     ADD_TO_SPACE("/addToSpace", null, "spaceId", R.string.command_description_add_to_space, true, false),
     JOIN_SPACE("/joinSpace", null, "spaceId", R.string.command_description_join_space, true, false),
     LEAVE_ROOM("/leave", null, "<roomId?>", R.string.command_description_leave_room, true, false),
-    UPGRADE_ROOM("/upgraderoom", null, "newVersion", R.string.command_description_upgrade_room, true, false);
+    UPGRADE_ROOM("/upgraderoom", null, "newVersion", R.string.command_description_upgrade_room, true, false),
+    TABLE_FLIP("/tableflip", null, "<message>", R.string.command_description_table_flip, false, true);
 
     val allAliases = arrayOf(command, *aliases.orEmpty())
 
diff --git a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
index 1378321026..e08bc9fb64 100644
--- a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
+++ b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.command
 
 import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.isMsisdn
+import im.vector.app.core.extensions.orEmpty
 import im.vector.app.features.home.room.detail.ChatEffect
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
@@ -30,39 +31,30 @@ class CommandParser @Inject constructor() {
     /**
      * Convert the text message into a Slash command.
      *
-     * @param textMessage the text message
+     * @param textMessage the text message in plain text
+     * @param formattedMessage the text messaged in HTML format
      * @param isInThreadTimeline true if the user is currently typing in a thread
      * @return a parsed slash command (ok or error)
      */
-    fun parseSlashCommand(textMessage: CharSequence, isInThreadTimeline: Boolean): ParsedCommand {
+    @Suppress("NAME_SHADOWING")
+    fun parseSlashCommand(textMessage: CharSequence, formattedMessage: String?, isInThreadTimeline: Boolean): ParsedCommand {
         // check if it has the Slash marker
-        return if (!textMessage.startsWith("/")) {
+        val message = formattedMessage ?: textMessage
+        return if (!message.startsWith("/")) {
             ParsedCommand.ErrorNotACommand
         } else {
             // "/" only
-            if (textMessage.length == 1) {
+            if (message.length == 1) {
                 return ParsedCommand.ErrorEmptySlashCommand
             }
 
             // Exclude "//"
-            if ("/" == textMessage.substring(1, 2)) {
+            if ("/" == message.substring(1, 2)) {
                 return ParsedCommand.ErrorNotACommand
             }
 
-            val messageParts = try {
-                textMessage.split("\\s+".toRegex()).dropLastWhile { it.isEmpty() }
-            } catch (e: Exception) {
-                Timber.e(e, "## parseSlashCommand() : split failed")
-                null
-            }
-
-            // test if the string cut fails
-            if (messageParts.isNullOrEmpty()) {
-                return ParsedCommand.ErrorEmptySlashCommand
-            }
-
+            val (messageParts, message) = extractMessage(message.toString()) ?: return ParsedCommand.ErrorEmptySlashCommand
             val slashCommand = messageParts.first()
-            val message = textMessage.substring(slashCommand.length).trim()
 
             getNotSupportedByThreads(isInThreadTimeline, slashCommand)?.let {
                 return ParsedCommand.ErrorCommandNotSupportedInThreads(it)
@@ -71,7 +63,12 @@ class CommandParser @Inject constructor() {
             when {
                 Command.PLAIN.matches(slashCommand) -> {
                     if (message.isNotEmpty()) {
-                        ParsedCommand.SendPlainText(message = message)
+                        if (formattedMessage != null) {
+                            val trimmedPlainTextMessage = extractMessage(textMessage.toString())?.second.orEmpty()
+                            ParsedCommand.SendFormattedText(message = trimmedPlainTextMessage, formattedMessage = message)
+                        } else {
+                            ParsedCommand.SendPlainText(message = message)
+                        }
                     } else {
                         ParsedCommand.ErrorSyntax(Command.PLAIN)
                     }
@@ -317,6 +314,13 @@ class CommandParser @Inject constructor() {
                         ParsedCommand.ErrorSyntax(Command.MARKDOWN)
                     }
                 }
+                Command.DEVTOOLS.matches(slashCommand) -> {
+                    if (messageParts.size == 1) {
+                        ParsedCommand.DevTools
+                    } else {
+                        ParsedCommand.ErrorSyntax(Command.DEVTOOLS)
+                    }
+                }
                 Command.CLEAR_SCALAR_TOKEN.matches(slashCommand) -> {
                     if (messageParts.size == 1) {
                         ParsedCommand.ClearScalarToken
@@ -337,6 +341,9 @@ class CommandParser @Inject constructor() {
                 Command.LENNY.matches(slashCommand) -> {
                     ParsedCommand.SendLenny(message)
                 }
+                Command.TABLE_FLIP.matches(slashCommand) -> {
+                    ParsedCommand.SendTableFlip(message)
+                }
                 Command.DISCARD_SESSION.matches(slashCommand) -> {
                     if (messageParts.size == 1) {
                         ParsedCommand.DiscardSession
@@ -374,15 +381,15 @@ class CommandParser @Inject constructor() {
                     }
                 }
                 Command.ADD_TO_SPACE.matches(slashCommand) -> {
-                    if (messageParts.size == 1) {
-                        ParsedCommand.AddToSpace(spaceId = message)
+                    if (messageParts.size == 2) {
+                        ParsedCommand.AddToSpace(spaceId = messageParts.last())
                     } else {
                         ParsedCommand.ErrorSyntax(Command.ADD_TO_SPACE)
                     }
                 }
                 Command.JOIN_SPACE.matches(slashCommand) -> {
-                    if (messageParts.size == 1) {
-                        ParsedCommand.JoinSpace(spaceIdOrAlias = message)
+                    if (messageParts.size == 2) {
+                        ParsedCommand.JoinSpace(spaceIdOrAlias = messageParts.last())
                     } else {
                         ParsedCommand.ErrorSyntax(Command.JOIN_SPACE)
                     }
@@ -405,6 +412,25 @@ class CommandParser @Inject constructor() {
         }
     }
 
+    private fun extractMessage(message: String): Pair<List<String>, String>? {
+        val messageParts = try {
+            message.split("\\s+".toRegex()).dropLastWhile { it.isEmpty() }
+        } catch (e: Exception) {
+            Timber.e(e, "## parseSlashCommand() : split failed")
+            null
+        }
+
+        // test if the string cut fails
+        if (messageParts.isNullOrEmpty()) {
+            return null
+        }
+
+        val slashCommand = messageParts.first()
+        val trimmedMessage = message.substring(slashCommand.length).trim()
+
+        return messageParts to trimmedMessage
+    }
+
     private val notSupportedThreadsCommands: List<Command> by lazy {
         Command.values().filter {
             !it.isThreadCommand
diff --git a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
index 4571deb54f..670eddefda 100644
--- a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
+++ b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
@@ -39,6 +39,7 @@ sealed interface ParsedCommand {
     // Valid commands:
 
     data class SendPlainText(val message: CharSequence) : ParsedCommand
+    data class SendFormattedText(val message: CharSequence, val formattedMessage: String) : ParsedCommand
     data class SendEmote(val message: CharSequence) : ParsedCommand
     data class SendRainbow(val message: CharSequence) : ParsedCommand
     data class SendRainbowEmote(val message: CharSequence) : ParsedCommand
@@ -60,8 +61,10 @@ sealed interface ParsedCommand {
     data class ChangeAvatarForRoom(val url: String) : ParsedCommand
     data class SetMarkdown(val enable: Boolean) : ParsedCommand
     object ClearScalarToken : ParsedCommand
+    object DevTools : ParsedCommand
     data class SendSpoiler(val message: String) : ParsedCommand
     data class SendShrug(val message: CharSequence) : ParsedCommand
+    data class SendTableFlip(val message: CharSequence) : ParsedCommand
     data class SendLenny(val message: CharSequence) : ParsedCommand
     object DiscardSession : ParsedCommand
     data class ShowUser(val userId: String) : ParsedCommand
diff --git a/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
index a3d801e534..191338de5b 100644
--- a/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
+++ b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
@@ -22,7 +22,7 @@ import android.os.Build
 import android.os.LocaleList
 import androidx.annotation.RequiresApi
 import im.vector.app.features.settings.FontScalePreferences
-import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorLocaleProvider
 import im.vector.app.features.themes.ThemeUtils
 import timber.log.Timber
 import java.util.Locale
@@ -33,21 +33,22 @@ import javax.inject.Inject
  */
 class VectorConfiguration @Inject constructor(
         private val context: Context,
-        private val fontScalePreferences: FontScalePreferences
+        private val fontScalePreferences: FontScalePreferences,
+        private val vectorLocale: VectorLocaleProvider,
 ) {
 
     fun onConfigurationChanged() {
-        if (Locale.getDefault().toString() != VectorLocale.applicationLocale.toString()) {
+        if (Locale.getDefault().toString() != vectorLocale.applicationLocale.toString()) {
             Timber.v("## onConfigurationChanged(): the locale has been updated to ${Locale.getDefault()}")
-            Timber.v("## onConfigurationChanged(): restore the expected value ${VectorLocale.applicationLocale}")
-            Locale.setDefault(VectorLocale.applicationLocale)
+            Timber.v("## onConfigurationChanged(): restore the expected value ${vectorLocale.applicationLocale}")
+            Locale.setDefault(vectorLocale.applicationLocale)
         }
         // Night mode may have changed
         ThemeUtils.init(context)
     }
 
     fun applyToApplicationContext() {
-        val locale = VectorLocale.applicationLocale
+        val locale = vectorLocale.applicationLocale
         val fontScale = fontScalePreferences.getResolvedFontScaleValue()
 
         Locale.setDefault(locale)
@@ -67,7 +68,7 @@ class VectorConfiguration @Inject constructor(
      */
     fun getLocalisedContext(context: Context): Context {
         try {
-            val locale = VectorLocale.applicationLocale
+            val locale = vectorLocale.applicationLocale
 
             // create new configuration passing old configuration from original Context
             val configuration = Configuration(context.resources.configuration)
@@ -107,7 +108,7 @@ class VectorConfiguration @Inject constructor(
      * @return the local status value
      */
     fun getHash(): String {
-        return (VectorLocale.applicationLocale.toString() +
+        return (vectorLocale.applicationLocale.toString() +
                 "_" + fontScalePreferences.getResolvedFontScaleValue().preferenceValue +
                 "_" + ThemeUtils.getApplicationTheme(context))
     }
diff --git a/vector/src/main/java/im/vector/app/features/configuration/VectorCustomEventTypesProvider.kt b/vector/src/main/java/im/vector/app/features/configuration/VectorCustomEventTypesProvider.kt
new file mode 100644
index 0000000000..55244685d7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/configuration/VectorCustomEventTypesProvider.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.configuration
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import org.matrix.android.sdk.api.provider.CustomEventTypesProvider
+import javax.inject.Inject
+
+class VectorCustomEventTypesProvider @Inject constructor() : CustomEventTypesProvider {
+
+    override val customPreviewableEventTypes = listOf(
+            VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
index 8cd7f2de45..4677dce7d6 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
@@ -24,6 +24,7 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.hideKeyboard
@@ -44,9 +45,12 @@ import reactivecircus.flowbinding.android.widget.checkedChanges
 import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
-class ContactsBookFragment @Inject constructor(
-        private val contactsBookController: ContactsBookController
-) : VectorBaseFragment<FragmentContactsBookBinding>(), ContactsBookController.Callback {
+@AndroidEntryPoint
+class ContactsBookFragment :
+        VectorBaseFragment<FragmentContactsBookBinding>(),
+        ContactsBookController.Callback {
+
+    @Inject lateinit var contactsBookController: ContactsBookController
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentContactsBookBinding {
         return FragmentContactsBookBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
index 707b78d328..acaf24dca7 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
@@ -32,7 +32,6 @@ import com.airbnb.mvrx.viewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.platform.SimpleFragmentActivity
@@ -58,7 +57,6 @@ import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class CreateDirectRoomActivity : SimpleFragmentActivity() {
@@ -67,7 +65,6 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
     private val qrViewModel: QrCodeScannerViewModel by viewModel()
 
     private lateinit var sharedActionViewModel: UserListSharedActionViewModel
-    @Inject lateinit var errorFormatter: ErrorFormatter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -78,6 +75,7 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
         sharedActionViewModel
                 .stream()
                 .onEach { action ->
+                    @Suppress("DEPRECATION")
                     when (action) {
                         UserListSharedAction.Close -> finish()
                         UserListSharedAction.GoBack -> onBackPressed()
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
index b306cb6e03..3f67708a28 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
@@ -26,29 +26,28 @@ import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.mvrx.runCatchingToAsync
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.VectorFeatures
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.plan.CreatedRoom
 import im.vector.app.features.raw.wellknown.getElementWellknown
 import im.vector.app.features.raw.wellknown.isE2EByDefault
+import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.userdirectory.PendingSelection
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
-import org.matrix.android.sdk.api.session.user.model.User
 
 class CreateDirectRoomViewModel @AssistedInject constructor(
         @Assisted initialState: CreateDirectRoomViewState,
         private val rawService: RawService,
+        private val vectorPreferences: VectorPreferences,
         val session: Session,
         val analyticsTracker: AnalyticsTracker,
-        val vectorFeatures: VectorFeatures
 ) :
         VectorViewModel<CreateDirectRoomViewState, CreateDirectRoomAction, CreateDirectRoomViewEvents>(initialState) {
 
@@ -78,11 +77,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor(
                 _viewEvents.post(CreateDirectRoomViewEvents.DmSelf)
             } else {
                 // Try to get user from known users and fall back to creating a User object from MXID
-                val qrInvitee = if (session.getUser(mxid) != null) {
-                    session.getUser(mxid)!!
-                } else {
-                    User(mxid, null, null)
-                }
+                val qrInvitee = session.getUserOrDefault(mxid)
                 onSubmitInvitees(setOf(PendingSelection.UserPendingSelection(qrInvitee)))
             }
         }
@@ -129,13 +124,13 @@ class CreateDirectRoomViewModel @AssistedInject constructor(
                     }
 
             val result = runCatchingToAsync {
-                if (vectorFeatures.shouldStartDmOnFirstMessage()) {
+                if (vectorPreferences.isDeferredDmEnabled()) {
                     session.roomService().createLocalRoom(roomParams)
                 } else {
+                    analyticsTracker.capture(CreatedRoom(isDM = roomParams.isDirect.orFalse()))
                     session.roomService().createRoom(roomParams)
                 }
             }
-            analyticsTracker.capture(CreatedRoom(isDM = roomParams.isDirect.orFalse()))
 
             setState {
                 copy(
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt b/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
index de2027f2a5..466aca1176 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
@@ -20,6 +20,7 @@ import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.plan.CreatedRoom
 import im.vector.app.features.raw.wellknown.getElementWellknown
 import im.vector.app.features.raw.wellknown.isE2EByDefault
+import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
@@ -30,7 +31,8 @@ import javax.inject.Inject
 class DirectRoomHelper @Inject constructor(
         private val rawService: RawService,
         private val session: Session,
-        private val analyticsTracker: AnalyticsTracker
+        private val analyticsTracker: AnalyticsTracker,
+        private val vectorPreferences: VectorPreferences,
 ) {
 
     suspend fun ensureDMExists(userId: String): String {
@@ -48,8 +50,12 @@ class DirectRoomHelper @Inject constructor(
                 setDirectMessage()
                 enableEncryptionIfInvitedUsersSupportIt = adminE2EByDefault
             }
-            roomId = session.roomService().createRoom(roomParams)
-            analyticsTracker.capture(CreatedRoom(isDM = roomParams.isDirect.orFalse()))
+            roomId = if (vectorPreferences.isDeferredDmEnabled()) {
+                session.roomService().createLocalRoom(roomParams)
+            } else {
+                analyticsTracker.capture(CreatedRoom(isDM = roomParams.isDirect.orFalse()))
+                session.roomService().createRoom(roomParams)
+            }
         }
         return roomId
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
index 4b3a657740..556d9bcec3 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
@@ -47,10 +47,12 @@ class KeysExporter @Inject constructor(
         when {
             output == null -> throw IllegalStateException("Exported file not found")
             output.statSize != expectedSize -> {
-                throw UnexpectedExportKeysFileSizeException(
+                val exception = UnexpectedExportKeysFileSizeException(
                         expectedFileSize = expectedSize,
                         actualFileSize = output.statSize
                 )
+                output.close()
+                throw exception
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
index 3089481255..4adccf3953 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
@@ -18,19 +18,19 @@ package im.vector.app.features.crypto.keysbackup.restore
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import com.airbnb.mvrx.viewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.extensions.observeEvent
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.SimpleFragmentActivity
-import im.vector.app.core.ui.views.KeysBackupBanner
 import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
+import im.vector.app.features.workers.signout.ServerBackupStatusAction
+import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class KeysBackupRestoreActivity : SimpleFragmentActivity() {
@@ -46,14 +46,14 @@ class KeysBackupRestoreActivity : SimpleFragmentActivity() {
     override fun getTitleRes() = R.string.title_activity_keys_backup_restore
 
     private lateinit var viewModel: KeysBackupRestoreSharedViewModel
+    private val serverBackupStatusViewModel: ServerBackupStatusViewModel by viewModel()
 
     override fun onBackPressed() {
         hideWaitingView()
+        @Suppress("DEPRECATION")
         super.onBackPressed()
     }
 
-    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
-
     override fun initUiAndData() {
         super.initUiAndData()
         viewModel = viewModelProvider.get(KeysBackupRestoreSharedViewModel::class.java)
@@ -95,7 +95,8 @@ class KeysBackupRestoreActivity : SimpleFragmentActivity() {
                 }
                 KeysBackupRestoreSharedViewModel.NAVIGATE_TO_SUCCESS -> {
                     viewModel.keyVersionResult.value?.version?.let {
-                        KeysBackupBanner.onRecoverDoneForVersion(this, it)
+                        // Inform the banner that a Recover has been done for this version, so do not show the Recover banner for this version.
+                        serverBackupStatusViewModel.handle(ServerBackupStatusAction.OnRecoverDoneForVersion(it))
                     }
                     replaceFragment(views.container, KeysBackupRestoreSuccessFragment::class.java, allowStateLoss = true)
                 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
index 42605a850b..9a3d37eed7 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
@@ -22,15 +22,16 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import androidx.core.widget.doOnTextChanged
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.startImportTextFromFileIntent
 import im.vector.app.databinding.FragmentKeysBackupRestoreFromKeyBinding
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import javax.inject.Inject
 
-class KeysBackupRestoreFromKeyFragment @Inject constructor() :
+@AndroidEntryPoint
+class KeysBackupRestoreFromKeyFragment :
         VectorBaseFragment<FragmentKeysBackupRestoreFromKeyBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentKeysBackupRestoreFromKeyBinding {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
index 631bc9ff4f..cf98bc7e4d 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
@@ -24,12 +24,14 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import androidx.core.text.set
 import androidx.core.widget.doOnTextChanged
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentKeysBackupRestoreFromPassphraseBinding
-import javax.inject.Inject
 
-class KeysBackupRestoreFromPassphraseFragment @Inject constructor() : VectorBaseFragment<FragmentKeysBackupRestoreFromPassphraseBinding>() {
+@AndroidEntryPoint
+class KeysBackupRestoreFromPassphraseFragment :
+        VectorBaseFragment<FragmentKeysBackupRestoreFromPassphraseBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentKeysBackupRestoreFromPassphraseBinding {
         return FragmentKeysBackupRestoreFromPassphraseBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
index d26c1e2134..4a1bc49e27 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
@@ -20,13 +20,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.LiveEvent
 import im.vector.app.databinding.FragmentKeysBackupRestoreSuccessBinding
-import javax.inject.Inject
 
-class KeysBackupRestoreSuccessFragment @Inject constructor() : VectorBaseFragment<FragmentKeysBackupRestoreSuccessBinding>() {
+@AndroidEntryPoint
+class KeysBackupRestoreSuccessFragment :
+        VectorBaseFragment<FragmentKeysBackupRestoreSuccessBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentKeysBackupRestoreSuccessBinding {
         return FragmentKeysBackupRestoreSuccessBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
index aabd05d913..32826d013f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
@@ -114,6 +114,7 @@ class KeysBackupManageActivity : SimpleFragmentActivity() {
             finish()
             return
         }
+        @Suppress("DEPRECATION")
         super.onBackPressed()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
index edc44fa796..c0001501d5 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
@@ -22,6 +22,7 @@ import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -30,10 +31,13 @@ import im.vector.app.databinding.FragmentKeysBackupSettingsBinding
 import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
 import javax.inject.Inject
 
-class KeysBackupSettingsFragment @Inject constructor(private val keysBackupSettingsRecyclerViewController: KeysBackupSettingsRecyclerViewController) :
+@AndroidEntryPoint
+class KeysBackupSettingsFragment :
         VectorBaseFragment<FragmentKeysBackupSettingsBinding>(),
         KeysBackupSettingsRecyclerViewController.Listener {
 
+    @Inject lateinit var keysBackupSettingsRecyclerViewController: KeysBackupSettingsRecyclerViewController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentKeysBackupSettingsBinding {
         return FragmentKeysBackupSettingsBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
index 077bcc2cf3..4473d54765 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
@@ -25,7 +25,6 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.dialogs.ExportKeysDialog
 import im.vector.app.core.extensions.observeEvent
 import im.vector.app.core.extensions.queryExportKeys
@@ -45,7 +44,6 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() {
     private lateinit var viewModel: KeysBackupSetupSharedViewModel
 
     @Inject lateinit var keysExporter: KeysExporter
-    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
 
     private val session by lazy {
         activeSessionHolder.getActiveSession()
@@ -183,6 +181,7 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() {
                     }
                     .show()
         } else {
+            @Suppress("DEPRECATION")
             super.onBackPressed()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
index 7d8feba942..9b8386c741 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
@@ -20,12 +20,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.LiveEvent
 import im.vector.app.databinding.FragmentKeysBackupSetupStep1Binding
-import javax.inject.Inject
 
-class KeysBackupSetupStep1Fragment @Inject constructor() : VectorBaseFragment<FragmentKeysBackupSetupStep1Binding>() {
+@AndroidEntryPoint
+class KeysBackupSetupStep1Fragment :
+        VectorBaseFragment<FragmentKeysBackupSetupStep1Binding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentKeysBackupSetupStep1Binding {
         return FragmentKeysBackupSetupStep1Binding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
index 706076dae0..3a6b11715c 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
@@ -24,16 +24,19 @@ import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.viewModelScope
 import androidx.transition.TransitionManager
 import com.nulabinc.zxcvbn.Zxcvbn
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hidePassword
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentKeysBackupSetupStep2Binding
-import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorLocaleProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class KeysBackupSetupStep2Fragment @Inject constructor() : VectorBaseFragment<FragmentKeysBackupSetupStep2Binding>() {
+@AndroidEntryPoint
+class KeysBackupSetupStep2Fragment :
+        VectorBaseFragment<FragmentKeysBackupSetupStep2Binding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentKeysBackupSetupStep2Binding {
         return FragmentKeysBackupSetupStep2Binding.inflate(inflater, container, false)
@@ -41,6 +44,8 @@ class KeysBackupSetupStep2Fragment @Inject constructor() : VectorBaseFragment<Fr
 
     private val zxcvbn = Zxcvbn()
 
+    @Inject lateinit var vectorLocale: VectorLocaleProvider
+
     private fun onPassphraseChanged() {
         viewModel.passphrase.value = views.keysBackupSetupStep2PassphraseEnterEdittext.text.toString()
         viewModel.confirmPassphraseError.value = null
@@ -76,12 +81,12 @@ class KeysBackupSetupStep2Fragment @Inject constructor() : VectorBaseFragment<Fr
                 views.keysBackupSetupStep2PassphraseStrengthLevel.strength = score
 
                 if (score in 1..3) {
-                    val warning = strength.feedback?.getWarning(VectorLocale.applicationLocale)
+                    val warning = strength.feedback?.getWarning(vectorLocale.applicationLocale)
                     if (warning != null) {
                         views.keysBackupSetupStep2PassphraseEnterTil.error = warning
                     }
 
-                    val suggestions = strength.feedback?.getSuggestions(VectorLocale.applicationLocale)
+                    val suggestions = strength.feedback?.getSuggestions(vectorLocale.applicationLocale)
                     if (suggestions != null) {
                         views.keysBackupSetupStep2PassphraseEnterTil.error = suggestions.firstOrNull()
                     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index b8b84ea322..c70c5d979e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -25,9 +25,9 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import arrow.core.Try
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.safeOpenOutputStream
@@ -44,9 +44,10 @@ import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
-import javax.inject.Inject
 
-class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<FragmentKeysBackupSetupStep3Binding>() {
+@AndroidEntryPoint
+class KeysBackupSetupStep3Fragment :
+        VectorBaseFragment<FragmentKeysBackupSetupStep3Binding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentKeysBackupSetupStep3Binding {
         return FragmentKeysBackupSetupStep3Binding.inflate(inflater, container, false)
@@ -134,7 +135,7 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
             selectTxtFileToWrite(
                     activity = requireActivity(),
                     activityResultLauncher = saveRecoveryActivityResultLauncher,
-                    defaultFileName = "recovery-key-$userId-$timestamp.txt",
+                    defaultFileName = "recovery-key-$userId-${timestamp}.txt",
                     chooserHint = getString(R.string.save_recovery_key_chooser_hint)
             )
             dialog.dismiss()
@@ -165,7 +166,7 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
 
     private fun exportRecoveryKeyToFile(uri: Uri, data: String) {
         lifecycleScope.launch(Dispatchers.Main) {
-            Try {
+            try {
                 withContext(Dispatchers.IO) {
                     requireContext().safeOpenOutputStream(uri)
                             ?.use { os ->
@@ -174,24 +175,19 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
                             }
                 }
                         ?: throw IOException("Unable to write the file")
+                viewModel.copyHasBeenMade = true
+                activity?.let {
+                    MaterialAlertDialogBuilder(it)
+                            .setTitle(R.string.dialog_title_success)
+                            .setMessage(R.string.recovery_key_export_saved)
+                }
+            } catch (throwable: Throwable) {
+                activity?.let {
+                    MaterialAlertDialogBuilder(it)
+                            .setTitle(R.string.dialog_title_error)
+                            .setMessage(errorFormatter.toHumanReadable(throwable))
+                }
             }
-                    .fold(
-                            { throwable ->
-                                activity?.let {
-                                    MaterialAlertDialogBuilder(it)
-                                            .setTitle(R.string.dialog_title_error)
-                                            .setMessage(errorFormatter.toHumanReadable(throwable))
-                                }
-                            },
-                            {
-                                viewModel.copyHasBeenMade = true
-                                activity?.let {
-                                    MaterialAlertDialogBuilder(it)
-                                            .setTitle(R.string.dialog_title_success)
-                                            .setMessage(R.string.recovery_key_export_saved)
-                                }
-                            }
-                    )
                     ?.setCancelable(false)
                     ?.setPositiveButton(R.string.ok, null)
                     ?.show()
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
index b39992256d..d393636a8e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
@@ -30,13 +30,11 @@ import com.airbnb.mvrx.viewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.SimpleFragmentActivity
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.features.crypto.recover.SetupMode
 import kotlinx.parcelize.Parcelize
-import javax.inject.Inject
 import kotlin.reflect.KClass
 
 @AndroidEntryPoint
@@ -54,7 +52,6 @@ class SharedSecureStorageActivity :
     ) : Parcelable
 
     private val viewModel: SharedSecureStorageViewModel by viewModel()
-    @Inject lateinit var errorFormatter: ErrorFormatter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
index 5a7aba65a5..efb24ebea7 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
@@ -24,6 +24,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.activityViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
@@ -35,9 +36,10 @@ import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import reactivecircus.flowbinding.android.widget.editorActionEvents
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
-class SharedSecuredStorageKeyFragment @Inject constructor() : VectorBaseFragment<FragmentSsssAccessFromKeyBinding>() {
+@AndroidEntryPoint
+class SharedSecuredStorageKeyFragment :
+        VectorBaseFragment<FragmentSsssAccessFromKeyBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSsssAccessFromKeyBinding {
         return FragmentSsssAccessFromKeyBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
index 5af5480573..877e4aa164 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
@@ -24,20 +24,19 @@ import android.view.inputmethod.EditorInfo
 import androidx.core.text.toSpannable
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.activityViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.ColorProvider
 import im.vector.app.databinding.FragmentSsssAccessFromPassphraseBinding
 import im.vector.lib.core.utils.flow.throttleFirst
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.widget.editorActionEvents
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
-class SharedSecuredStoragePassphraseFragment @Inject constructor(
-        private val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentSsssAccessFromPassphraseBinding>() {
+@AndroidEntryPoint
+class SharedSecuredStoragePassphraseFragment :
+        VectorBaseFragment<FragmentSsssAccessFromPassphraseBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSsssAccessFromPassphraseBinding {
         return FragmentSsssAccessFromPassphraseBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
index c0d0aa8e76..66344107a4 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
@@ -22,14 +22,15 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSsssResetAllBinding
 import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
-import javax.inject.Inject
 
-class SharedSecuredStorageResetAllFragment @Inject constructor() :
+@AndroidEntryPoint
+class SharedSecuredStorageResetAllFragment :
         VectorBaseFragment<FragmentSsssResetAllBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSsssResetAllBinding {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt
index 555f2d7c1c..22ecd3dafd 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import androidx.core.text.toSpannable
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
@@ -30,9 +31,11 @@ import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.databinding.FragmentBootstrapConclusionBinding
 import javax.inject.Inject
 
-class BootstrapConclusionFragment @Inject constructor(
-        private val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentBootstrapConclusionBinding>() {
+@AndroidEntryPoint
+class BootstrapConclusionFragment :
+        VectorBaseFragment<FragmentBootstrapConclusionBinding>() {
+
+    @Inject lateinit var colorProvider: ColorProvider
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapConclusionBinding {
         return FragmentBootstrapConclusionBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
index 3c8137d087..285721ee75 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
@@ -25,6 +25,7 @@ import androidx.core.view.isGone
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.platform.VectorBaseFragment
@@ -34,9 +35,9 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.widget.editorActionEvents
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
-class BootstrapConfirmPassphraseFragment @Inject constructor() :
+@AndroidEntryPoint
+class BootstrapConfirmPassphraseFragment :
         VectorBaseFragment<FragmentBootstrapEnterPassphraseBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapEnterPassphraseBinding {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
index ff6d109b3c..78f0bc6284 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
@@ -24,10 +24,11 @@ import android.view.inputmethod.EditorInfo
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentBootstrapEnterPassphraseBinding
-import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorLocaleProvider
 import im.vector.lib.core.utils.flow.throttleFirst
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -35,13 +36,16 @@ import reactivecircus.flowbinding.android.widget.editorActionEvents
 import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
-class BootstrapEnterPassphraseFragment @Inject constructor() :
+@AndroidEntryPoint
+class BootstrapEnterPassphraseFragment :
         VectorBaseFragment<FragmentBootstrapEnterPassphraseBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapEnterPassphraseBinding {
         return FragmentBootstrapEnterPassphraseBinding.inflate(inflater, container, false)
     }
 
+    @Inject lateinit var vectorLocale: VectorLocaleProvider
+
     val sharedViewModel: BootstrapSharedViewModel by parentFragmentViewModel()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -104,8 +108,8 @@ class BootstrapEnterPassphraseFragment @Inject constructor() :
                 views.ssssPassphraseSecurityProgress.strength = score
                 if (score in 1..3) {
                     val hint =
-                            strength.feedback?.getWarning(VectorLocale.applicationLocale)?.takeIf { it.isNotBlank() }
-                                    ?: strength.feedback?.getSuggestions(VectorLocale.applicationLocale)?.firstOrNull()
+                            strength.feedback?.getWarning(vectorLocale.applicationLocale)?.takeIf { it.isNotBlank() }
+                                    ?: strength.feedback?.getSuggestions(vectorLocale.applicationLocale)?.firstOrNull()
                     if (hint != null && hint != views.ssssPassphraseEnterTil.error.toString()) {
                         views.ssssPassphraseEnterTil.error = hint
                     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
index 2c0ccec9fb..2802c872ee 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
@@ -30,6 +30,7 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.registerStartForActivityResult
@@ -47,9 +48,11 @@ import reactivecircus.flowbinding.android.widget.editorActionEvents
 import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
-class BootstrapMigrateBackupFragment @Inject constructor(
-        private val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentBootstrapMigrateBackupBinding>() {
+@AndroidEntryPoint
+class BootstrapMigrateBackupFragment :
+        VectorBaseFragment<FragmentBootstrapMigrateBackupBinding>() {
+
+    @Inject lateinit var colorProvider: ColorProvider
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapMigrateBackupBinding {
         return FragmentBootstrapMigrateBackupBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapReAuthFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapReAuthFragment.kt
index c46ccbf08e..d5e60631a5 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapReAuthFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapReAuthFragment.kt
@@ -23,15 +23,14 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.ColorProvider
 import im.vector.app.databinding.FragmentBootstrapReauthBinding
-import javax.inject.Inject
 
-class BootstrapReAuthFragment @Inject constructor(
-        private val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentBootstrapReauthBinding>() {
+@AndroidEntryPoint
+class BootstrapReAuthFragment :
+        VectorBaseFragment<FragmentBootstrapReauthBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapReauthBinding {
         return FragmentBootstrapReauthBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
index db24807c1b..21d68dfe99 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
@@ -27,21 +27,20 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.safeOpenOutputStream
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.FragmentBootstrapSaveKeyBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-class BootstrapSaveRecoveryKeyFragment @Inject constructor(
-        private val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentBootstrapSaveKeyBinding>() {
+@AndroidEntryPoint
+class BootstrapSaveRecoveryKeyFragment :
+        VectorBaseFragment<FragmentBootstrapSaveKeyBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapSaveKeyBinding {
         return FragmentBootstrapSaveKeyBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
index 3d078a82ed..b03cbe87a8 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
@@ -23,13 +23,14 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentBootstrapSetupRecoveryBinding
 import im.vector.app.features.raw.wellknown.SecureBackupMethod
-import javax.inject.Inject
 
-class BootstrapSetupRecoveryKeyFragment @Inject constructor() :
+@AndroidEntryPoint
+class BootstrapSetupRecoveryKeyFragment :
         VectorBaseFragment<FragmentBootstrapSetupRecoveryBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapSetupRecoveryBinding {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
index 658fad9284..bab112cd66 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -32,14 +32,13 @@ import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.WaitingViewData
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.auth.ReAuthActivity
+import im.vector.app.features.auth.PendingAuthHandler
 import im.vector.app.features.raw.wellknown.SecureBackupMethod
 import im.vector.app.features.raw.wellknown.getElementWellknown
 import im.vector.app.features.raw.wellknown.isSecureBackupRequired
 import im.vector.app.features.raw.wellknown.secureBackupMethod
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.auth.UserPasswordAuth
@@ -57,10 +56,8 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.toKeysVersionResult
 import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
 import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
 import org.matrix.android.sdk.api.util.awaitCallback
-import org.matrix.android.sdk.api.util.fromBase64
 import java.io.OutputStream
 import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
 class BootstrapSharedViewModel @AssistedInject constructor(
@@ -71,7 +68,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
         private val rawService: RawService,
         private val bootstrapTask: BootstrapCrossSigningTask,
         private val migrationTask: BackupToQuadSMigrationTask,
-        private val matrix: Matrix,
+        private val pendingAuthHandler: PendingAuthHandler,
 ) : VectorViewModel<BootstrapViewState, BootstrapActions, BootstrapViewEvents>(initialState) {
 
     private var doesKeyBackupExist: Boolean = false
@@ -85,11 +82,6 @@ class BootstrapSharedViewModel @AssistedInject constructor(
 
     companion object : MavericksViewModelFactory<BootstrapSharedViewModel, BootstrapViewState> by hiltMavericksViewModelFactory()
 
-//    private var _pendingSession: String? = null
-
-    var uiaContinuation: Continuation<UIABaseAuth>? = null
-    var pendingAuth: UIABaseAuth? = null
-
     init {
 
         setState {
@@ -272,21 +264,10 @@ class BootstrapSharedViewModel @AssistedInject constructor(
             is BootstrapActions.DoMigrateWithRecoveryKey -> {
                 startMigrationFlow(state.step, null, action.recoveryKey)
             }
-            BootstrapActions.SsoAuthDone -> {
-                uiaContinuation?.resume(DefaultBaseAuth(session = pendingAuth?.session ?: ""))
-            }
-            is BootstrapActions.PasswordAuthDone -> {
-                val decryptedPass = matrix.secureStorageService()
-                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
-                uiaContinuation?.resume(
-                        UserPasswordAuth(
-                                session = pendingAuth?.session,
-                                password = decryptedPass,
-                                user = session.myUserId
-                        )
-                )
-            }
+            BootstrapActions.SsoAuthDone -> pendingAuthHandler.ssoAuthDone()
+            is BootstrapActions.PasswordAuthDone -> pendingAuthHandler.passwordAuthDone(action.password)
             BootstrapActions.ReAuthCancelled -> {
+                pendingAuthHandler.reAuthCancelled()
                 setState {
                     copy(step = BootstrapStep.AccountReAuth(stringProvider.getString(R.string.authentication_error)))
                 }
@@ -402,13 +383,13 @@ class BootstrapSharedViewModel @AssistedInject constructor(
             override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                 when (flowResponse.nextUncompletedStage()) {
                     LoginFlowTypes.PASSWORD -> {
-                        pendingAuth = UserPasswordAuth(
+                        pendingAuthHandler.pendingAuth = UserPasswordAuth(
                                 // Note that _pendingSession may or may not be null, this is OK, it will be managed by the task
                                 session = flowResponse.session,
                                 user = session.myUserId,
                                 password = null
                         )
-                        uiaContinuation = promise
+                        pendingAuthHandler.uiaContinuation = promise
                         setState {
                             copy(
                                     step = BootstrapStep.AccountReAuth()
@@ -417,8 +398,8 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                         _viewEvents.post(BootstrapViewEvents.RequestReAuth(flowResponse, errCode))
                     }
                     LoginFlowTypes.SSO -> {
-                        pendingAuth = DefaultBaseAuth(flowResponse.session)
-                        uiaContinuation = promise
+                        pendingAuthHandler.pendingAuth = DefaultBaseAuth(flowResponse.session)
+                        pendingAuthHandler.uiaContinuation = promise
                         setState {
                             copy(
                                     step = BootstrapStep.AccountReAuth()
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt
index e0965e69f9..310bb5ac37 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt
@@ -21,11 +21,12 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentBootstrapWaitingBinding
-import javax.inject.Inject
 
-class BootstrapWaitingFragment @Inject constructor() :
+@AndroidEntryPoint
+class BootstrapWaitingFragment :
         VectorBaseFragment<FragmentBootstrapWaitingBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapWaitingBinding {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index 91bb3fa7f2..0f8f5c633e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -26,11 +26,13 @@ import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
 import javax.inject.Inject
@@ -67,13 +69,14 @@ class IncomingVerificationRequestHandler @Inject constructor(
         when (tx.state) {
             is VerificationTxState.OnStarted -> {
                 // Add a notification for every incoming request
-                val user = session?.userService()?.getUser(tx.otherUserId)
-                val name = user?.toMatrixItem()?.getBestName() ?: tx.otherUserId
+                val user = session.getUserOrDefault(tx.otherUserId).toMatrixItem()
+                val name = user.getBestName()
                 val alert = VerificationVectorAlert(
-                        uid,
-                        context.getString(R.string.sas_incoming_request_notif_title),
-                        context.getString(R.string.sas_incoming_request_notif_content, name),
-                        R.drawable.ic_shield_black,
+                        uid = uid,
+                        title = context.getString(R.string.sas_incoming_request_notif_title),
+                        description = context.getString(R.string.sas_incoming_request_notif_content, name),
+                        iconId = R.drawable.ic_shield_black,
+                        priority = PopupAlertManager.INCOMING_VERIFICATION_REQUEST_PRIORITY,
                         shouldBeDisplayedIn = { activity ->
                             if (activity is VectorBaseActivity<*>) {
                                 // TODO a bit too ugly :/
@@ -83,10 +86,10 @@ class IncomingVerificationRequestHandler @Inject constructor(
                                     }
                                 } ?: true
                             } else true
-                        }
+                        },
                 )
                         .apply {
-                            viewBinder = VerificationVectorAlert.ViewBinder(user?.toMatrixItem(), avatarRenderer.get())
+                            viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer.get())
                             contentAction = Runnable {
                                 (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let {
                                     it.navigator.performDeviceVerification(it, tx.otherUserId, tx.transactionId)
@@ -125,14 +128,11 @@ class IncomingVerificationRequestHandler @Inject constructor(
         // For incoming request we should prompt (if not in activity where this request apply)
         if (pr.isIncoming) {
             // if it's a self verification for my devices, we can discard the review login alert
-            // if not this request will be underneath and not visible by the user...
+            // if not, this request will be underneath and not visible by the user...
             // it will re-appear later
-            if (pr.otherUserId == session?.myUserId) {
-                // XXX this is a bit hard coded :/
-                popupAlertManager.cancelAlert("review_login")
-            }
-            val user = session?.userService()?.getUser(pr.otherUserId)?.toMatrixItem()
-            val name = user?.getBestName() ?: pr.otherUserId
+            cancelAnyVerifySessionAlerts(pr)
+            val user = session.getUserOrDefault(pr.otherUserId).toMatrixItem()
+            val name = user.getBestName()
             val description = if (name == pr.otherUserId) {
                 name
             } else {
@@ -140,21 +140,23 @@ class IncomingVerificationRequestHandler @Inject constructor(
             }
 
             val alert = VerificationVectorAlert(
-                    uniqueIdForVerificationRequest(pr),
-                    context.getString(R.string.sas_incoming_request_notif_title),
-                    description,
-                    R.drawable.ic_shield_black,
+                    uid = uniqueIdForVerificationRequest(pr),
+                    title = context.getString(R.string.sas_incoming_request_notif_title),
+                    description = description,
+                    iconId = R.drawable.ic_shield_black,
+                    priority = PopupAlertManager.INCOMING_VERIFICATION_REQUEST_PRIORITY,
                     shouldBeDisplayedIn = { activity ->
                         if (activity is RoomDetailActivity) {
-                            activity.intent?.extras?.getParcelable<TimelineArgs>(RoomDetailActivity.EXTRA_ROOM_DETAIL_ARGS)?.let {
+                            activity.intent?.extras?.getParcelableCompat<TimelineArgs>(RoomDetailActivity.EXTRA_ROOM_DETAIL_ARGS)?.let {
                                 it.roomId != pr.roomId
                             } ?: true
                         } else true
-                    }
+                    },
             )
                     .apply {
                         viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer.get())
                         contentAction = Runnable {
+                            cancelAnyVerifySessionAlerts(pr)
                             (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let {
                                 val roomId = pr.roomId
                                 if (roomId.isNullOrBlank()) {
@@ -184,6 +186,13 @@ class IncomingVerificationRequestHandler @Inject constructor(
         }
     }
 
+    private fun cancelAnyVerifySessionAlerts(pr: PendingVerificationRequest) {
+        if (pr.otherUserId == session?.myUserId) {
+            popupAlertManager.cancelAlert(PopupAlertManager.REVIEW_LOGIN_UID)
+            popupAlertManager.cancelAlert(PopupAlertManager.VERIFY_SESSION_UID)
+        }
+    }
+
     override fun verificationRequestUpdated(pr: PendingVerificationRequest) {
         // If an incoming request is readied (by another device?) we should discard the alert
         if (pr.isIncoming && (pr.isReady || pr.handledByOtherSession || pr.cancelConclusion != null)) {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/QuadSLoadingFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/QuadSLoadingFragment.kt
index 366348120b..5b6902df98 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/QuadSLoadingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/QuadSLoadingFragment.kt
@@ -18,11 +18,13 @@ package im.vector.app.features.crypto.verification
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentProgressBinding
-import javax.inject.Inject
 
-class QuadSLoadingFragment @Inject constructor() : VectorBaseFragment<FragmentProgressBinding>() {
+@AndroidEntryPoint
+class QuadSLoadingFragment :
+        VectorBaseFragment<FragmentProgressBinding>() {
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentProgressBinding {
         return FragmentProgressBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index eae868eb26..38b72f2022 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -152,29 +152,25 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
     }
 
     override fun invalidate() = withState(viewModel) { state ->
-        state.otherUserMxItem?.let { matrixItem ->
-            if (state.isMe) {
-                avatarRenderer.render(matrixItem, views.otherUserAvatarImageView)
-                if (state.sasTransactionState == VerificationTxState.Verified ||
-                        state.qrTransactionState == VerificationTxState.Verified ||
-                        state.verifiedFromPrivateKeys) {
-                    views.otherUserShield.render(RoomEncryptionTrustLevel.Trusted)
-                } else {
-                    views.otherUserShield.render(RoomEncryptionTrustLevel.Warning)
-                }
-                views.otherUserNameText.text = getString(
-                        if (state.selfVerificationMode) R.string.crosssigning_verify_this_session else R.string.crosssigning_verify_session
-                )
+        avatarRenderer.render(state.otherUserMxItem, views.otherUserAvatarImageView)
+        if (state.isMe) {
+            if (state.sasTransactionState == VerificationTxState.Verified ||
+                    state.qrTransactionState == VerificationTxState.Verified ||
+                    state.verifiedFromPrivateKeys) {
+                views.otherUserShield.render(RoomEncryptionTrustLevel.Trusted)
             } else {
-                avatarRenderer.render(matrixItem, views.otherUserAvatarImageView)
-
-                if (state.sasTransactionState == VerificationTxState.Verified || state.qrTransactionState == VerificationTxState.Verified) {
-                    views.otherUserNameText.text = getString(R.string.verification_verified_user, matrixItem.getBestName())
-                    views.otherUserShield.render(RoomEncryptionTrustLevel.Trusted)
-                } else {
-                    views.otherUserNameText.text = getString(R.string.verification_verify_user, matrixItem.getBestName())
-                    views.otherUserShield.render(null)
-                }
+                views.otherUserShield.render(RoomEncryptionTrustLevel.Warning)
+            }
+            views.otherUserNameText.text = getString(
+                    if (state.selfVerificationMode) R.string.crosssigning_verify_this_session else R.string.crosssigning_verify_session
+            )
+        } else {
+            if (state.sasTransactionState == VerificationTxState.Verified || state.qrTransactionState == VerificationTxState.Verified) {
+                views.otherUserNameText.text = getString(R.string.verification_verified_user, state.otherUserMxItem.getBestName())
+                views.otherUserShield.render(RoomEncryptionTrustLevel.Trusted)
+            } else {
+                views.otherUserNameText.text = getString(R.string.verification_verify_user, state.otherUserMxItem.getBestName())
+                views.otherUserShield.render(null)
             }
         }
 
@@ -235,7 +231,7 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
                     showFragment(
                             VerificationEmojiCodeFragment::class,
                             VerificationArgs(
-                                    state.otherUserMxItem?.id ?: "",
+                                    state.otherUserId,
                                     // If it was outgoing it.transaction id would be null, but the pending request
                                     // would be updated (from localId to txId)
                                     state.pendingRequest.invoke()?.transactionId ?: state.transactionId
@@ -271,7 +267,7 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
                         VerificationQRWaitingFragment::class,
                         VerificationQRWaitingFragment.Args(
                                 isMe = state.isMe,
-                                otherUserName = state.otherUserMxItem?.getBestName() ?: ""
+                                otherUserName = state.otherUserMxItem.getBestName()
                         )
                 )
                 return@withState
@@ -319,7 +315,7 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
                 showFragment(
                         VerificationChooseMethodFragment::class,
                         VerificationArgs(
-                                otherUserId = state.otherUserMxItem?.id ?: "",
+                                otherUserId = state.otherUserId,
                                 verificationId = state.pendingRequest.invoke()?.transactionId
                         )
                 )
@@ -328,7 +324,7 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
                 showFragment(
                         VerificationRequestFragment::class,
                         VerificationArgs(
-                                otherUserId = state.otherUserMxItem?.id ?: "",
+                                otherUserId = state.otherUserId,
                                 verificationId = state.pendingRequest.invoke()?.transactionId,
                                 verificationLocalId = state.roomId
                         )
@@ -340,7 +336,7 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
             showFragment(
                     VerificationChooseMethodFragment::class,
                     VerificationArgs(
-                            otherUserId = state.otherUserMxItem?.id ?: "",
+                            otherUserId = state.otherUserId,
                             verificationId = state.pendingRequest.invoke()?.transactionId
                     )
             )
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index b8146b8041..dfebffcb91 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -37,6 +37,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
@@ -70,7 +71,7 @@ data class VerificationBottomSheetViewState(
         val roomId: String?,
         // true when we display the loading and we wait for the other (incoming request)
         val selfVerificationMode: Boolean,
-        val otherUserMxItem: MatrixItem? = null,
+        val otherUserMxItem: MatrixItem,
         val pendingRequest: Async<PendingVerificationRequest> = Uninitialized,
         val pendingLocalId: String? = null,
         val sasTransactionState: VerificationTxState? = null,
@@ -92,7 +93,8 @@ data class VerificationBottomSheetViewState(
             otherUserId = args.otherUserId,
             verificationId = args.verificationId,
             roomId = args.roomId,
-            selfVerificationMode = args.selfVerificationMode
+            selfVerificationMode = args.selfVerificationMode,
+            otherUserMxItem = MatrixItem.UserItem(args.otherUserId),
     )
 }
 
@@ -126,7 +128,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
             }
         }
 
-        val userItem = session.getUser(initialState.otherUserId)
+        fetchOtherUserProfile(initialState.otherUserId)
 
         var autoReady = false
         val pr = if (initialState.selfVerificationMode) {
@@ -160,7 +162,6 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
 
         setState {
             copy(
-                    otherUserMxItem = userItem?.toMatrixItem(),
                     sasTransactionState = sasTx?.state,
                     qrTransactionState = qrTx?.state,
                     transactionId = pr?.transactionId ?: initialState.verificationId,
@@ -183,6 +184,28 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
         }
     }
 
+    private fun fetchOtherUserProfile(otherUserId: String) {
+        session.getUser(otherUserId)?.toMatrixItem()?.let {
+            setState {
+                copy(
+                        otherUserMxItem = it
+                )
+            }
+        }
+        // Always fetch the latest User data
+        viewModelScope.launch {
+            tryOrNull { session.userService().resolveUser(otherUserId) }
+                    ?.toMatrixItem()
+                    ?.let {
+                        setState {
+                            copy(
+                                    otherUserMxItem = it
+                            )
+                        }
+                    }
+        }
+    }
+
     override fun onCleared() {
         session.cryptoService().verificationService().removeListener(this)
         super.onCleared()
@@ -216,12 +239,12 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
 
     private fun cancelAllPendingVerifications(state: VerificationBottomSheetViewState) {
         session.cryptoService()
-                .verificationService().getExistingVerificationRequest(state.otherUserMxItem?.id ?: "", state.transactionId)?.let {
+                .verificationService().getExistingVerificationRequest(state.otherUserId, state.transactionId)?.let {
                     session.cryptoService().verificationService().cancelVerificationRequest(it)
                 }
         session.cryptoService()
                 .verificationService()
-                .getExistingTransaction(state.otherUserMxItem?.id ?: "", state.transactionId ?: "")
+                .getExistingTransaction(state.otherUserId, state.transactionId ?: "")
                 ?.cancel(CancelCode.User)
     }
 
@@ -249,7 +272,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
     }
 
     override fun handle(action: VerificationAction) = withState { state ->
-        val otherUserId = state.otherUserMxItem?.id ?: return@withState
+        val otherUserId = state.otherUserId
         val roomId = state.roomId
                 ?: session.roomService().getExistingDirectRoomWithUser(otherUserId)
 
@@ -514,7 +537,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
     override fun transactionUpdated(tx: VerificationTransaction) = withState { state ->
         if (state.selfVerificationMode && state.transactionId == null) {
             // is this an incoming with that user
-            if (tx.isIncoming && tx.otherUserId == state.otherUserMxItem?.id) {
+            if (tx.isIncoming && tx.otherUserId == state.otherUserId) {
                 // Also auto accept incoming if needed!
                 if (tx is IncomingSasVerificationTransaction) {
                     if (tx.uxState == IncomingSasVerificationTransaction.UxState.SHOW_ACCEPT) {
@@ -564,7 +587,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
 
         if (state.selfVerificationMode && state.pendingRequest.invoke() == null && state.transactionId == null) {
             // is this an incoming with that user
-            if (pr.isIncoming && pr.otherUserId == state.otherUserMxItem?.id) {
+            if (pr.isIncoming && pr.otherUserId == state.otherUserId) {
                 if (!pr.isReady) {
                     // auto ready in this case, as we are waiting
                     // TODO, can I be here in DM mode? in this case should test if roomID is null?
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
index 1adafe2760..600d5e1be1 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
@@ -26,6 +26,7 @@ import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.features.crypto.verification.VerificationBottomSheetViewState
 import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
 import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
+import im.vector.app.features.displayname.getBestName
 import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
 import javax.inject.Inject
@@ -60,8 +61,8 @@ class VerificationCancelController @Inject constructor(
                 }
             }
         } else {
-            val otherUserID = state.otherUserMxItem?.id ?: ""
-            val otherDisplayName = state.otherUserMxItem?.displayName ?: ""
+            val otherUserID = state.otherUserId
+            val otherDisplayName = state.otherUserMxItem.getBestName()
             bottomSheetVerificationNoticeItem {
                 id("notice")
                 notice(
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt
index 62bab05e42..c972f7834d 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -29,11 +30,13 @@ import im.vector.app.databinding.BottomSheetVerificationChildFragmentBinding
 import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import javax.inject.Inject
 
-class VerificationCancelFragment @Inject constructor(
-        val controller: VerificationCancelController
-) : VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
+@AndroidEntryPoint
+class VerificationCancelFragment :
+        VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
         VerificationCancelController.Listener {
 
+    @Inject lateinit var controller: VerificationCancelController
+
     private val viewModel by parentFragmentViewModel(VerificationBottomSheetViewModel::class)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetVerificationChildFragmentBinding {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt
index 635a56a6c1..05632bdfc3 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -29,11 +30,13 @@ import im.vector.app.databinding.BottomSheetVerificationChildFragmentBinding
 import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import javax.inject.Inject
 
-class VerificationNotMeFragment @Inject constructor(
-        val controller: VerificationNotMeController
-) : VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
+@AndroidEntryPoint
+class VerificationNotMeFragment :
+        VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
         VerificationNotMeController.Listener {
 
+    @Inject lateinit var controller: VerificationNotMeController
+
     private val viewModel by parentFragmentViewModel(VerificationBottomSheetViewModel::class)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetVerificationChildFragmentBinding {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
index 3d3766f430..9f908d83f6 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -39,11 +40,12 @@ import im.vector.app.features.qrcode.QrCodeScannerActivity
 import timber.log.Timber
 import javax.inject.Inject
 
-class VerificationChooseMethodFragment @Inject constructor(
-        val controller: VerificationChooseMethodController
-) : VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
+@AndroidEntryPoint
+class VerificationChooseMethodFragment :
+        VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
         VerificationChooseMethodController.Listener {
 
+    @Inject lateinit var controller: VerificationChooseMethodController
     private val viewModel by fragmentViewModel(VerificationChooseMethodViewModel::class)
 
     private val sharedViewModel by parentFragmentViewModel(VerificationBottomSheetViewModel::class)
@@ -76,7 +78,7 @@ class VerificationChooseMethodFragment @Inject constructor(
     override fun doVerifyBySas() = withState(sharedViewModel) { state ->
         sharedViewModel.handle(
                 VerificationAction.StartSASVerification(
-                        state.otherUserMxItem?.id ?: "",
+                        state.otherUserId,
                         state.pendingRequest.invoke()?.transactionId ?: ""
                 )
         )
@@ -128,7 +130,7 @@ class VerificationChooseMethodFragment @Inject constructor(
     private fun onRemoteQrCodeScanned(remoteQrCode: String) = withState(sharedViewModel) { state ->
         sharedViewModel.handle(
                 VerificationAction.RemoteQrCodeScanned(
-                        state.otherUserMxItem?.id ?: "",
+                        state.otherUserId,
                         state.pendingRequest.invoke()?.transactionId ?: "",
                         remoteQrCode
                 )
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
index 85b90e6004..dd559e8a1b 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -32,11 +33,13 @@ import im.vector.app.features.crypto.verification.VerificationBottomSheetViewMod
 import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
 
-class VerificationConclusionFragment @Inject constructor(
-        val controller: VerificationConclusionController
-) : VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
+@AndroidEntryPoint
+class VerificationConclusionFragment :
+        VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
         VerificationConclusionController.Listener {
 
+    @Inject lateinit var controller: VerificationConclusionController
+
     @Parcelize
     data class Args(
             val isSuccessFull: Boolean,
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
index 98b163f4e3..bf514249d8 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
@@ -136,7 +136,7 @@ class VerificationEmojiCodeController @Inject constructor(
         if (state.isWaitingFromOther) {
             bottomSheetVerificationWaitingItem {
                 id("waiting")
-                title(host.stringProvider.getString(R.string.verification_request_waiting_for, state.otherUser?.getBestName() ?: ""))
+                title(host.stringProvider.getString(R.string.verification_request_waiting_for, state.otherUser.getBestName()))
             }
         } else {
             bottomSheetVerificationActionItem {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt
index 3f4eaf8ac9..58b5c01923 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt
@@ -22,6 +22,7 @@ import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -30,11 +31,13 @@ import im.vector.app.features.crypto.verification.VerificationAction
 import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import javax.inject.Inject
 
-class VerificationEmojiCodeFragment @Inject constructor(
-        val controller: VerificationEmojiCodeController
-) : VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
+@AndroidEntryPoint
+class VerificationEmojiCodeFragment :
+        VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
         VerificationEmojiCodeController.Listener {
 
+    @Inject lateinit var controller: VerificationEmojiCodeController
+
     private val viewModel by fragmentViewModel(VerificationEmojiCodeViewModel::class)
 
     private val sharedViewModel by parentFragmentViewModel(VerificationBottomSheetViewModel::class)
@@ -65,13 +68,13 @@ class VerificationEmojiCodeFragment @Inject constructor(
     }
 
     override fun onMatchButtonTapped() = withState(viewModel) { state ->
-        val otherUserId = state.otherUser?.id ?: return@withState
+        val otherUserId = state.otherUser.id
         val txId = state.transactionId ?: return@withState
         sharedViewModel.handle(VerificationAction.SASMatchAction(otherUserId, txId))
     }
 
     override fun onDoNotMatchButtonTapped() = withState(viewModel) { state ->
-        val otherUserId = state.otherUser?.id ?: return@withState
+        val otherUserId = state.otherUser.id
         val txId = state.transactionId ?: return@withState
         sharedViewModel.handle(VerificationAction.SASDoNotMatchAction(otherUserId, txId))
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
index db9a8fed4a..6761d98a55 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
@@ -40,13 +40,13 @@ import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTra
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 
 data class VerificationEmojiCodeViewState(
         val transactionId: String?,
-        val otherUser: MatrixItem? = null,
+        val otherUser: MatrixItem,
         val supportsEmoji: Boolean = true,
         val emojiDescription: Async<List<EmojiRepresentation>> = Uninitialized,
         val decimalDescription: Async<String> = Uninitialized,
@@ -59,15 +59,13 @@ class VerificationEmojiCodeViewModel @AssistedInject constructor(
 ) : VectorViewModel<VerificationEmojiCodeViewState, EmptyAction, EmptyViewEvents>(initialState), VerificationService.Listener {
 
     init {
-        withState { state ->
-            refreshStateFromTx(
-                    session.cryptoService().verificationService()
-                            .getExistingTransaction(
-                                    state.otherUser?.id ?: "", state.transactionId
-                                    ?: ""
-                            ) as? SasVerificationTransaction
-            )
-        }
+        refreshStateFromTx(
+                session.cryptoService().verificationService()
+                        .getExistingTransaction(
+                                otherUserId = initialState.otherUser.id,
+                                tid = initialState.transactionId ?: ""
+                        ) as? SasVerificationTransaction
+        )
 
         session.cryptoService().verificationService().addListener(this)
     }
@@ -165,10 +163,10 @@ class VerificationEmojiCodeViewModel @AssistedInject constructor(
 
     companion object : MavericksViewModelFactory<VerificationEmojiCodeViewModel, VerificationEmojiCodeViewState> by hiltMavericksViewModelFactory() {
 
-        override fun initialState(viewModelContext: ViewModelContext): VerificationEmojiCodeViewState? {
+        override fun initialState(viewModelContext: ViewModelContext): VerificationEmojiCodeViewState {
             val args = viewModelContext.args<VerificationBottomSheet.VerificationArgs>()
             val session = EntryPoints.get(viewModelContext.app(), SingletonEntryPoint::class.java).activeSessionHolder().getActiveSession()
-            val matrixItem = session.getUser(args.otherUserId)?.toMatrixItem()
+            val matrixItem = session.getUserOrDefault(args.otherUserId).toMatrixItem()
 
             return VerificationEmojiCodeViewState(
                     transactionId = args.verificationId,
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt
index 441885dd10..dc538597db 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt
@@ -22,16 +22,20 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.Mavericks
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.BottomSheetVerificationChildFragmentBinding
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
 
-class VerificationQRWaitingFragment @Inject constructor(
-        val controller: VerificationQRWaitingController
-) : VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>() {
+@AndroidEntryPoint
+class VerificationQRWaitingFragment :
+        VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>() {
+
+    @Inject lateinit var controller: VerificationQRWaitingController
 
     @Parcelize
     data class Args(
@@ -46,7 +50,7 @@ class VerificationQRWaitingFragment @Inject constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupRecyclerView()
-        (arguments?.getParcelable(Mavericks.KEY_ARG) as? Args)?.let {
+        (arguments?.getParcelableCompat<Args>(Mavericks.KEY_ARG))?.let {
             controller.update(it)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt
index 71d64b99bc..639ebac29e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt
@@ -54,7 +54,7 @@ class VerificationQrScannedByOtherController @Inject constructor(
                 if (state.isMe) {
                     notice(host.stringProvider.getString(R.string.qr_code_scanned_self_verif_notice).toEpoxyCharSequence())
                 } else {
-                    val name = state.otherUserMxItem?.getBestName() ?: ""
+                    val name = state.otherUserMxItem.getBestName()
                     notice(host.stringProvider.getString(R.string.qr_code_scanned_by_other_notice, name).toEpoxyCharSequence())
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt
index 9e77506e3b..0fdbd03174 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt
@@ -21,6 +21,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -29,11 +30,13 @@ import im.vector.app.features.crypto.verification.VerificationAction
 import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import javax.inject.Inject
 
-class VerificationQrScannedByOtherFragment @Inject constructor(
-        val controller: VerificationQrScannedByOtherController
-) : VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
+@AndroidEntryPoint
+class VerificationQrScannedByOtherFragment :
+        VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
         VerificationQrScannedByOtherController.Listener {
 
+    @Inject lateinit var controller: VerificationQrScannedByOtherController
+
     private val sharedViewModel by parentFragmentViewModel(VerificationBottomSheetViewModel::class)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetVerificationChildFragmentBinding {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
index e050c5bfb0..185ee48351 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
@@ -52,7 +52,6 @@ class VerificationRequestController @Inject constructor(
 
     override fun buildModels() {
         val state = viewState ?: return
-        val matrixItem = viewState?.otherUserMxItem ?: return
         val host = this
 
         if (state.selfVerificationMode) {
@@ -107,11 +106,9 @@ class VerificationRequestController @Inject constructor(
                     if (state.isMe) {
                         stringProvider.getString(R.string.verify_new_session_notice)
                     } else {
-                        matrixItem.let {
-                            stringProvider.getString(R.string.verification_request_notice, it.id)
-                                    .toSpannable()
-                                    .colorizeMatchingText(it.id, colorProvider.getColorFromAttribute(R.attr.vctr_notice_text_color))
-                        }
+                        stringProvider.getString(R.string.verification_request_notice, state.otherUserId)
+                                .toSpannable()
+                                .colorizeMatchingText(state.otherUserId, colorProvider.getColorFromAttribute(R.attr.vctr_notice_text_color))
                     }
 
             bottomSheetVerificationNoticeItem {
@@ -138,7 +135,7 @@ class VerificationRequestController @Inject constructor(
                 is Loading -> {
                     bottomSheetVerificationWaitingItem {
                         id("waiting")
-                        title(host.stringProvider.getString(R.string.verification_request_waiting_for, matrixItem.getBestName()))
+                        title(host.stringProvider.getString(R.string.verification_request_waiting_for, state.otherUserMxItem.getBestName()))
                     }
                 }
                 is Success -> {
@@ -151,7 +148,7 @@ class VerificationRequestController @Inject constructor(
                         } else {
                             bottomSheetVerificationWaitingItem {
                                 id("waiting")
-                                title(host.stringProvider.getString(R.string.verification_request_waiting_for, matrixItem.getBestName()))
+                                title(host.stringProvider.getString(R.string.verification_request_waiting_for, state.otherUserMxItem.getBestName()))
                             }
                         }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt
index 238249683f..a466759eae 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt
@@ -21,6 +21,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -29,11 +30,13 @@ import im.vector.app.features.crypto.verification.VerificationAction
 import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import javax.inject.Inject
 
-class VerificationRequestFragment @Inject constructor(
-        val controller: VerificationRequestController
-) : VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
+@AndroidEntryPoint
+class VerificationRequestFragment :
+        VectorBaseFragment<BottomSheetVerificationChildFragmentBinding>(),
         VerificationRequestController.Listener {
 
+    @Inject lateinit var controller: VerificationRequestController
+
     private val viewModel by parentFragmentViewModel(VerificationBottomSheetViewModel::class)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetVerificationChildFragmentBinding {
@@ -61,9 +64,7 @@ class VerificationRequestFragment @Inject constructor(
     }
 
     override fun onClickOnVerificationStart(): Unit = withState(viewModel) { state ->
-        state.otherUserMxItem?.id?.let { otherUserId ->
-            viewModel.handle(VerificationAction.RequestVerificationByDM(otherUserId, state.roomId))
-        }
+        viewModel.handle(VerificationAction.RequestVerificationByDM(state.otherUserId, state.roomId))
     }
 
     override fun onClickRecoverFromPassphrase() {
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
index 774460eb1f..011deb612f 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
@@ -109,15 +109,15 @@ class RoomDevToolActivity :
                 }
                 RoomDevToolViewState.Mode.StateEventList,
                 RoomDevToolViewState.Mode.StateEventListByType -> {
-                    val frag = createFragment(RoomDevToolStateEventListFragment::class.java)
+                    val frag = RoomDevToolStateEventListFragment()
                     navigateTo(frag)
                 }
                 RoomDevToolViewState.Mode.EditEventContent -> {
-                    val frag = createFragment(RoomDevToolEditFragment::class.java)
+                    val frag = RoomDevToolEditFragment()
                     navigateTo(frag)
                 }
                 is RoomDevToolViewState.Mode.SendEventForm -> {
-                    val frag = createFragment(RoomDevToolSendFormFragment::class.java)
+                    val frag = RoomDevToolSendFormFragment()
                     navigateTo(frag)
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolEditFragment.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolEditFragment.kt
index 1b6fbb7359..3bbb43013d 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolEditFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolEditFragment.kt
@@ -23,15 +23,16 @@ import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentDevtoolsEditorBinding
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
-class RoomDevToolEditFragment @Inject constructor() :
+@AndroidEntryPoint
+class RoomDevToolEditFragment :
         VectorBaseFragment<FragmentDevtoolsEditorBinding>() {
 
     private val sharedViewModel: RoomDevToolViewModel by activityViewModel()
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolFragment.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolFragment.kt
index 0e1a2418b8..0ebbf7d8bf 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolFragment.kt
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -28,11 +29,13 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import javax.inject.Inject
 
-class RoomDevToolFragment @Inject constructor(
-        private val epoxyController: RoomDevToolRootController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class RoomDevToolFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         DevToolsInteractionListener {
 
+    @Inject lateinit var epoxyController: RoomDevToolRootController
+
     private val sharedViewModel: RoomDevToolViewModel by activityViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolSendFormFragment.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolSendFormFragment.kt
index 6b7dea7d53..3ec49e25f6 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolSendFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolSendFormFragment.kt
@@ -22,15 +22,19 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import javax.inject.Inject
 
-class RoomDevToolSendFormFragment @Inject constructor(
-        private val epoxyController: RoomDevToolSendFormController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(), DevToolsInteractionListener {
+@AndroidEntryPoint
+class RoomDevToolSendFormFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+        DevToolsInteractionListener {
+
+    @Inject lateinit var epoxyController: RoomDevToolSendFormController
 
     val sharedViewModel: RoomDevToolViewModel by activityViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolStateEventListFragment.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolStateEventListFragment.kt
index 728fb62d66..dfc74e7e74 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolStateEventListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolStateEventListFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -29,9 +30,12 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import javax.inject.Inject
 
-class RoomDevToolStateEventListFragment @Inject constructor(
-        private val epoxyController: RoomStateListController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(), DevToolsInteractionListener {
+@AndroidEntryPoint
+class RoomDevToolStateEventListFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+        DevToolsInteractionListener {
+
+    @Inject lateinit var epoxyController: RoomStateListController
 
     val sharedViewModel: RoomDevToolViewModel by activityViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt b/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
index 1c6afb30b2..8214ab7120 100644
--- a/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
+++ b/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
@@ -17,44 +17,46 @@
 package im.vector.app.features.disclaimer
 
 import android.app.Activity
-import android.content.Context
+import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
-import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.di.DefaultPreferences
 import im.vector.app.core.utils.openUrlInChromeCustomTab
 import im.vector.app.features.settings.VectorSettingsUrls
+import javax.inject.Inject
 
 // Increase this value to show again the disclaimer dialog after an upgrade of the application
 private const val CURRENT_DISCLAIMER_VALUE = 2
 
 const val SHARED_PREF_KEY = "LAST_DISCLAIMER_VERSION_VALUE"
 
-fun showDisclaimerDialog(activity: Activity) {
-    val sharedPrefs = DefaultSharedPreferences.getInstance(activity)
+class DisclaimerDialog @Inject constructor(
+        @DefaultPreferences
+        private val sharedPrefs: SharedPreferences,
+) {
+    fun showDisclaimerDialog(activity: Activity) {
+        if (sharedPrefs.getInt(SHARED_PREF_KEY, 0) < CURRENT_DISCLAIMER_VALUE) {
+            sharedPrefs.edit {
+                putInt(SHARED_PREF_KEY, CURRENT_DISCLAIMER_VALUE)
+            }
 
-    if (sharedPrefs.getInt(SHARED_PREF_KEY, 0) < CURRENT_DISCLAIMER_VALUE) {
+            val dialogLayout = activity.layoutInflater.inflate(R.layout.dialog_disclaimer_content, null)
+
+            MaterialAlertDialogBuilder(activity)
+                    .setView(dialogLayout)
+                    .setCancelable(false)
+                    .setNegativeButton(R.string.disclaimer_negative_button, null)
+                    .setPositiveButton(R.string.disclaimer_positive_button) { _, _ ->
+                        openUrlInChromeCustomTab(activity, null, VectorSettingsUrls.DISCLAIMER_URL)
+                    }
+                    .show()
+        }
+    }
+
+    fun doNotShowDisclaimerDialog() {
         sharedPrefs.edit {
             putInt(SHARED_PREF_KEY, CURRENT_DISCLAIMER_VALUE)
         }
-
-        val dialogLayout = activity.layoutInflater.inflate(R.layout.dialog_disclaimer_content, null)
-
-        MaterialAlertDialogBuilder(activity)
-                .setView(dialogLayout)
-                .setCancelable(false)
-                .setNegativeButton(R.string.disclaimer_negative_button, null)
-                .setPositiveButton(R.string.disclaimer_positive_button) { _, _ ->
-                    openUrlInChromeCustomTab(activity, null, VectorSettingsUrls.DISCLAIMER_URL)
-                }
-                .show()
-    }
-}
-
-fun doNotShowDisclaimerDialog(context: Context) {
-    val sharedPrefs = DefaultSharedPreferences.getInstance(context)
-
-    sharedPrefs.edit {
-        putInt(SHARED_PREF_KEY, CURRENT_DISCLAIMER_VALUE)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
index 285d0f728f..8c801bdf89 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
@@ -25,6 +25,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -43,11 +44,13 @@ import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.terms.TermsService
 import javax.inject.Inject
 
-class DiscoverySettingsFragment @Inject constructor(
-        private val controller: DiscoverySettingsController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class DiscoverySettingsFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         DiscoverySettingsController.Listener {
 
+    @Inject lateinit var controller: DiscoverySettingsController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
index ee36345418..f8499219aa 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
@@ -28,6 +28,7 @@ import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.toReducedUrl
@@ -42,9 +43,11 @@ import org.matrix.android.sdk.api.session.terms.TermsService
 import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
-class SetIdentityServerFragment @Inject constructor(
-        val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentSetIdentityServerBinding>() {
+@AndroidEntryPoint
+class SetIdentityServerFragment :
+        VectorBaseFragment<FragmentSetIdentityServerBinding>() {
+
+    @Inject lateinit var colorProvider: ColorProvider
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSetIdentityServerBinding {
         return FragmentSetIdentityServerBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/displayname/VectorMatrixItemDisplayNameFallbackProvider.kt b/vector/src/main/java/im/vector/app/features/displayname/VectorMatrixItemDisplayNameFallbackProvider.kt
index 23b55335b8..77f08bf578 100644
--- a/vector/src/main/java/im/vector/app/features/displayname/VectorMatrixItemDisplayNameFallbackProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/displayname/VectorMatrixItemDisplayNameFallbackProvider.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.displayname
 
-import org.matrix.android.sdk.api.MatrixItemDisplayNameFallbackProvider
+import org.matrix.android.sdk.api.provider.MatrixItemDisplayNameFallbackProvider
 import org.matrix.android.sdk.api.util.MatrixItem
 
 // Used to provide the fallback to the MatrixSDK, in the MatrixConfiguration
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index 9f32980874..7618a84bb1 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -58,6 +58,9 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>(R.la
     @EpoxyAttribute
     var singleLine: Boolean = true
 
+    @EpoxyAttribute
+    var autoCapitalize: Boolean = false
+
     @EpoxyAttribute
     var imeOptions: Int? = null
 
@@ -132,10 +135,9 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>(R.la
      */
     private fun configureInputType(holder: Holder) {
         val newInputType =
-                inputType ?: when (singleLine) {
-                    true -> InputType.TYPE_CLASS_TEXT
-                    false -> InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
-                }
+                inputType ?: InputType.TYPE_CLASS_TEXT
+                        .let { if (autoCapitalize) it or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES else it }
+                        .let { if (!singleLine) it or InputType.TYPE_TEXT_FLAG_MULTI_LINE else it }
 
         // This is a must in order to avoid extreme lag in some devices, on fast typing
         if (holder.textInputEditText.inputType != newInputType) {
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
index 816b9acb24..3c1d20cc87 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
@@ -37,9 +37,10 @@ import im.vector.app.features.themes.ThemeUtils
 @EpoxyModelClass
 abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Holder>(R.layout.item_space) {
 
+    @EpoxyAttribute var text: String = ""
     @EpoxyAttribute var selected: Boolean = false
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: ClickListener? = null
-    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State.Count(0, false)
     @EpoxyAttribute var showSeparator: Boolean = false
 
     override fun getViewType(): Int {
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
new file mode 100644
index 0000000000..0903897011
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ *
+ */
+
+package im.vector.app.features.grouplist
+
+import android.content.res.ColorStateList
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import im.vector.app.features.themes.ThemeUtils
+
+@EpoxyModelClass
+abstract class NewHomeSpaceSummaryItem : VectorEpoxyModel<NewHomeSpaceSummaryItem.Holder>(R.layout.item_new_space) {
+
+    @EpoxyAttribute var text: String = ""
+    @EpoxyAttribute var selected: Boolean = false
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: ClickListener? = null
+    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State.Count(0, false)
+    @EpoxyAttribute var showSeparator: Boolean = false
+
+    override fun getViewType() = R.id.space_item_home
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.root.onClick(listener)
+        holder.name.text = holder.view.context.getString(R.string.all_chats)
+        holder.root.isChecked = selected
+        holder.root.context.resources
+        holder.avatar.background = ContextCompat.getDrawable(holder.view.context, R.drawable.new_space_home_background)
+        holder.avatar.backgroundTintList = ColorStateList.valueOf(
+                ColorUtils.setAlphaComponent(ThemeUtils.getColor(holder.view.context, R.attr.vctr_content_tertiary), (255 * 0.3).toInt()))
+        holder.avatar.setImageResource(R.drawable.ic_space_home)
+        holder.avatar.imageTintList = ColorStateList.valueOf(ThemeUtils.getColor(holder.view.context, R.attr.vctr_content_primary))
+        holder.avatar.scaleType = ImageView.ScaleType.CENTER_INSIDE
+
+        holder.unreadCounter.render(countState)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val root by bind<CheckableConstraintLayout>(R.id.root)
+        val avatar by bind<ImageView>(R.id.avatar)
+        val name by bind<TextView>(R.id.name)
+        val unreadCounter by bind<UnreadCounterBadgeView>(R.id.unread_counter)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index fe57b9f735..e08ed6db46 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -37,16 +37,15 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.SpaceStateHandler
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.extensions.restart
 import im.vector.app.core.extensions.validateBackPressed
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorMenuProvider
-import im.vector.app.core.pushers.FcmHelper
-import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.pushers.UnifiedPushHelper
+import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.ActivityHomeBinding
 import im.vector.app.features.MainActivity
@@ -55,7 +54,11 @@ import im.vector.app.features.analytics.accountdata.AnalyticsAccountDataViewMode
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.crypto.recover.SetupMode
-import im.vector.app.features.disclaimer.showDisclaimerDialog
+import im.vector.app.features.disclaimer.DisclaimerDialog
+import im.vector.app.features.home.room.list.actions.RoomListSharedAction
+import im.vector.app.features.home.room.list.actions.RoomListSharedActionViewModel
+import im.vector.app.features.home.room.list.home.layout.HomeLayoutSettingBottomDialogFragment
+import im.vector.app.features.home.room.list.home.release.ReleaseNotesActivity
 import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.navigation.Navigator
@@ -71,7 +74,6 @@ import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
 import im.vector.app.features.rageshake.ReportType
 import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
@@ -79,7 +81,9 @@ import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
 import im.vector.app.features.spaces.invite.SpaceInviteBottomSheet
 import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
 import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.features.usercode.UserCodeActivity
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
@@ -109,6 +113,7 @@ class HomeActivity :
         VectorMenuProvider {
 
     private lateinit var sharedActionViewModel: HomeSharedActionViewModel
+    private lateinit var roomListSharedActionViewModel: RoomListSharedActionViewModel
 
     private val homeActivityViewModel: HomeActivityViewModel by viewModel()
 
@@ -120,11 +125,8 @@ class HomeActivity :
 
     private val serverBackupStatusViewModel: ServerBackupStatusViewModel by viewModel()
 
-    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var vectorUncaughtExceptionHandler: VectorUncaughtExceptionHandler
-    @Inject lateinit var pushManager: PushersManager
     @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
-    @Inject lateinit var vectorPreferences: VectorPreferences
     @Inject lateinit var popupAlertManager: PopupAlertManager
     @Inject lateinit var shortcutsHandler: ShortcutsHandler
     @Inject lateinit var permalinkHandler: PermalinkHandler
@@ -132,8 +134,11 @@ class HomeActivity :
     @Inject lateinit var initSyncStepFormatter: InitSyncStepFormatter
     @Inject lateinit var spaceStateHandler: SpaceStateHandler
     @Inject lateinit var unifiedPushHelper: UnifiedPushHelper
-    @Inject lateinit var fcmHelper: FcmHelper
     @Inject lateinit var nightlyProxy: NightlyProxy
+    @Inject lateinit var disclaimerDialog: DisclaimerDialog
+    @Inject lateinit var notificationPermissionManager: NotificationPermissionManager
+
+    private var isNewAppLayoutEnabled: Boolean = false // delete once old app layout is removed
 
     private val createSpaceResultLauncher = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
@@ -154,12 +159,17 @@ class HomeActivity :
                 navigator.switchToSpace(
                         context = this,
                         spaceId = spaceId,
-                        postSwitchOption
+                        postSwitchOption,
                 )
+                roomListSharedActionViewModel.post(RoomListSharedAction.CloseBottomSheet)
             }
         }
     }
 
+    private val postPermissionLauncher = registerForPermissionsResult { _, _ ->
+        // Nothing to do with the result.
+    }
+
     private val fragmentLifecycleCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
         override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
             if (f is MatrixToBottomSheet) {
@@ -192,26 +202,20 @@ class HomeActivity :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        isNewAppLayoutEnabled = vectorPreferences.isNewAppLayoutEnabled()
         analyticsScreenName = MobileScreen.ScreenName.Home
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
-        unifiedPushHelper.register(this) {
-            if (unifiedPushHelper.isEmbeddedDistributor()) {
-                fcmHelper.ensureFcmTokenIsRetrieved(
-                        this,
-                        pushManager,
-                        vectorPreferences.areNotificationEnabledForDevice()
-                )
-            }
-        }
         sharedActionViewModel = viewModelProvider[HomeSharedActionViewModel::class.java]
+        roomListSharedActionViewModel = viewModelProvider[RoomListSharedActionViewModel::class.java]
         views.drawerLayout.addDrawerListener(drawerListener)
         if (isFirstCreation()) {
-            if (vectorFeatures.isNewAppLayoutEnabled()) {
+            if (vectorPreferences.isNewAppLayoutEnabled()) {
                 views.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
                 replaceFragment(views.homeDetailFragmentContainer, NewHomeDetailFragment::class.java)
             } else {
                 replaceFragment(views.homeDetailFragmentContainer, HomeDetailFragment::class.java)
                 replaceFragment(views.homeDrawerFragmentContainer, HomeDrawerFragment::class.java)
+                views.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
             }
         }
 
@@ -231,7 +235,7 @@ class HomeActivity :
                 }
                 .launchIn(lifecycleScope)
 
-        val args = intent.getParcelableExtra<HomeActivityArgs>(Mavericks.KEY_ARG)
+        val args = intent.getParcelableExtraCompat<HomeActivityArgs>(Mavericks.KEY_ARG)
 
         if (args?.clearNotification == true) {
             notificationDrawerManager.clearAllEvents()
@@ -258,8 +262,11 @@ class HomeActivity :
                 }
                 is HomeActivityViewEvents.OnCrossSignedInvalidated -> handleCrossSigningInvalidated(it)
                 HomeActivityViewEvents.ShowAnalyticsOptIn -> handleShowAnalyticsOptIn()
+                HomeActivityViewEvents.ShowNotificationDialog -> handleShowNotificationDialog()
+                HomeActivityViewEvents.ShowReleaseNotes -> handleShowReleaseNotes()
                 HomeActivityViewEvents.NotifyUserForThreadsMigration -> handleNotifyUserForThreadsMigration()
                 is HomeActivityViewEvents.MigrateThreads -> migrateThreadsIfNeeded(it.checkSession)
+                is HomeActivityViewEvents.AskUserForPushDistributor -> askUserToSelectPushDistributor()
             }
         }
         homeActivityViewModel.onEach { renderState(it) }
@@ -272,6 +279,20 @@ class HomeActivity :
         homeActivityViewModel.handle(HomeActivityViewActions.ViewStarted)
     }
 
+    private fun askUserToSelectPushDistributor() {
+        unifiedPushHelper.showSelectDistributorDialog(this) { selection ->
+            homeActivityViewModel.handle(HomeActivityViewActions.RegisterPushDistributor(selection))
+        }
+    }
+
+    private fun handleShowNotificationDialog() {
+        notificationPermissionManager.eventuallyRequestPermission(this, postPermissionLauncher)
+    }
+
+    private fun handleShowReleaseNotes() {
+        startActivity(Intent(this, ReleaseNotesActivity::class.java))
+    }
+
     private fun showSpaceSettings(spaceId: String) {
         // open bottom sheet
         SpaceSettingsMenuBottomSheet
@@ -283,6 +304,11 @@ class HomeActivity :
                 .show(supportFragmentManager, "SPACE_SETTINGS")
     }
 
+    private fun showLayoutSettings() {
+        HomeLayoutSettingBottomDialogFragment()
+                .show(supportFragmentManager, "LAYOUT_SETTINGS")
+    }
+
     private fun openSpaceInvite(spaceId: String) {
         SpaceInviteBottomSheet.newInstance(spaceId)
                 .show(supportFragmentManager, "SPACE_INVITE")
@@ -303,7 +329,7 @@ class HomeActivity :
     private fun migrateThreadsIfNeeded(checkSession: Boolean) {
         if (checkSession) {
             // We should check session to ensure we will only clear cache if needed
-            val args = intent.getParcelableExtra<HomeActivityArgs>(Mavericks.KEY_ARG)
+            val args = intent.getParcelableExtraCompat<HomeActivityArgs>(Mavericks.KEY_ARG)
             if (args?.hasExistingSession == true) {
                 // existingSession --> Will be true only if we came from an existing active session
                 Timber.i("----> Migrating threads from an existing session..")
@@ -356,7 +382,7 @@ class HomeActivity :
 
             lifecycleScope.launch {
                 val isHandled = permalinkHandler.launch(
-                        context = this@HomeActivity,
+                        fragmentActivity = this@HomeActivity,
                         deepLink = resolvedLink,
                         navigationInterceptor = this@HomeActivity,
                         buildTask = true
@@ -411,9 +437,10 @@ class HomeActivity :
     private fun handleAskPasswordToInitCrossSigning(events: HomeActivityViewEvents.AskPasswordToInitCrossSigning) {
         // We need to ask
         promptSecurityEvent(
-                events.userItem,
-                R.string.upgrade_security,
-                R.string.security_prompt_text
+                uid = PopupAlertManager.UPGRADE_SECURITY_UID,
+                userItem = events.userItem,
+                titleRes = R.string.upgrade_security,
+                descRes = R.string.security_prompt_text,
         ) {
             it.navigator.upgradeSessionSecurity(it, true)
         }
@@ -422,9 +449,10 @@ class HomeActivity :
     private fun handleCrossSigningInvalidated(event: HomeActivityViewEvents.OnCrossSignedInvalidated) {
         // We need to ask
         promptSecurityEvent(
-                event.userItem,
-                R.string.crosssigning_verify_this_session,
-                R.string.confirm_your_identity
+                uid = PopupAlertManager.VERIFY_SESSION_UID,
+                userItem = event.userItem,
+                titleRes = R.string.crosssigning_verify_this_session,
+                descRes = R.string.confirm_your_identity,
         ) {
             it.navigator.waitSessionVerification(it)
         }
@@ -433,9 +461,10 @@ class HomeActivity :
     private fun handleOnNewSession(event: HomeActivityViewEvents.CurrentSessionNotVerified) {
         // We need to ask
         promptSecurityEvent(
-                event.userItem,
-                R.string.crosssigning_verify_this_session,
-                R.string.confirm_your_identity
+                uid = PopupAlertManager.VERIFY_SESSION_UID,
+                userItem = event.userItem,
+                titleRes = R.string.crosssigning_verify_this_session,
+                descRes = R.string.confirm_your_identity,
         ) {
             if (event.waitForIncomingRequest) {
                 it.navigator.waitSessionVerification(it)
@@ -448,9 +477,10 @@ class HomeActivity :
     private fun handleCantVerify(event: HomeActivityViewEvents.CurrentSessionCannotBeVerified) {
         // We need to ask
         promptSecurityEvent(
-                event.userItem,
-                R.string.crosssigning_cannot_verify_this_session,
-                R.string.crosssigning_cannot_verify_this_session_desc
+                uid = PopupAlertManager.UPGRADE_SECURITY_UID,
+                userItem = event.userItem,
+                titleRes = R.string.crosssigning_cannot_verify_this_session,
+                descRes = R.string.crosssigning_cannot_verify_this_session_desc,
         ) {
             it.navigator.open4SSetup(it, SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET)
         }
@@ -459,7 +489,7 @@ class HomeActivity :
     private fun handlePromptToEnablePush() {
         popupAlertManager.postVectorAlert(
                 DefaultVectorAlert(
-                        uid = "enablePush",
+                        uid = PopupAlertManager.ENABLE_PUSH_UID,
                         title = getString(R.string.alert_push_are_disabled_title),
                         description = getString(R.string.alert_push_are_disabled_description),
                         iconId = R.drawable.ic_room_actions_notifications_mutes,
@@ -492,10 +522,16 @@ class HomeActivity :
         )
     }
 
-    private fun promptSecurityEvent(userItem: MatrixItem.UserItem?, titleRes: Int, descRes: Int, action: ((VectorBaseActivity<*>) -> Unit)) {
+    private fun promptSecurityEvent(
+            uid: String,
+            userItem: MatrixItem.UserItem,
+            titleRes: Int,
+            descRes: Int,
+            action: ((VectorBaseActivity<*>) -> Unit),
+    ) {
         popupAlertManager.postVectorAlert(
                 VerificationVectorAlert(
-                        uid = "upgradeSecurity",
+                        uid = uid,
                         title = getString(titleRes),
                         description = getString(descRes),
                         iconId = R.drawable.ic_shield_warning
@@ -514,7 +550,7 @@ class HomeActivity :
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-        val parcelableExtra = intent?.getParcelableExtra<HomeActivityArgs>(Mavericks.KEY_ARG)
+        val parcelableExtra = intent?.getParcelableExtraCompat<HomeActivityArgs>(Mavericks.KEY_ARG)
         if (parcelableExtra?.clearNotification == true) {
             notificationDrawerManager.clearAllEvents()
         }
@@ -547,17 +583,27 @@ class HomeActivity :
                     .setNegativeButton(R.string.no) { _, _ -> bugReporter.deleteCrashFile() }
                     .show()
         } else {
-            showDisclaimerDialog(this)
+            disclaimerDialog.showDisclaimerDialog(this)
         }
 
         // Force remote backup state update to update the banner if needed
         serverBackupStatusViewModel.refreshRemoteStateIfNeeded()
 
         // Check nightly
-        nightlyProxy.onHomeResumed()
+        if (nightlyProxy.canDisplayPopup()) {
+            nightlyProxy.updateApplication()
+        }
+
+        checkNewAppLayoutFlagChange()
     }
 
-    override fun getMenuRes() = if (vectorFeatures.isNewAppLayoutEnabled()) R.menu.menu_new_home else R.menu.menu_home
+    private fun checkNewAppLayoutFlagChange() {
+        if (vectorPreferences.isNewAppLayoutEnabled() != isNewAppLayoutEnabled) {
+            restart()
+        }
+    }
+
+    override fun getMenuRes() = if (vectorPreferences.isNewAppLayoutEnabled()) R.menu.menu_new_home else R.menu.menu_home
 
     override fun handlePrepareMenu(menu: Menu) {
         menu.findItem(R.id.menu_home_init_sync_legacy).isVisible = vectorPreferences.developerMode()
@@ -596,14 +642,26 @@ class HomeActivity :
                 navigator.openSettings(this)
                 true
             }
+            R.id.menu_home_layout_settings -> {
+                showLayoutSettings()
+                true
+            }
             R.id.menu_home_invite_friends -> {
                 launchInviteFriends()
                 true
             }
+            R.id.menu_home_qr -> {
+                launchQrCode()
+                true
+            }
             else -> false
         }
     }
 
+    private fun launchQrCode() {
+        startActivity(UserCodeActivity.newIntent(this, sharedActionViewModel.session.myUserId))
+    }
+
     private fun launchInviteFriends() {
         activeSessionHolder.getSafeActiveSession()?.permalinkService()?.createPermalink(sharedActionViewModel.session.myUserId)?.let { permalink ->
             analyticsTracker.screen(MobileScreen(screenName = MobileScreen.ScreenName.InviteFriends))
@@ -623,7 +681,10 @@ class HomeActivity :
         if (views.drawerLayout.isDrawerOpen(GravityCompat.START)) {
             views.drawerLayout.closeDrawer(GravityCompat.START)
         } else {
-            validateBackPressed { super.onBackPressed() }
+            validateBackPressed {
+                @Suppress("DEPRECATION")
+                super.onBackPressed()
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt
index 5f89c89bc9..54392d5f56 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt
@@ -21,4 +21,5 @@ import im.vector.app.core.platform.VectorViewModelAction
 sealed interface HomeActivityViewActions : VectorViewModelAction {
     object ViewStarted : HomeActivityViewActions
     object PushPromptHasBeenReviewed : HomeActivityViewActions
+    data class RegisterPushDistributor(val distributor: String) : HomeActivityViewActions
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
index 170550d5b4..be5aa7def0 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
@@ -20,19 +20,24 @@ import im.vector.app.core.platform.VectorViewEvents
 import org.matrix.android.sdk.api.util.MatrixItem
 
 sealed interface HomeActivityViewEvents : VectorViewEvents {
-    data class AskPasswordToInitCrossSigning(val userItem: MatrixItem.UserItem?) : HomeActivityViewEvents
+    data class AskPasswordToInitCrossSigning(val userItem: MatrixItem.UserItem) : HomeActivityViewEvents
     data class CurrentSessionNotVerified(
-            val userItem: MatrixItem.UserItem?,
+            val userItem: MatrixItem.UserItem,
             val waitForIncomingRequest: Boolean = true,
     ) : HomeActivityViewEvents
+
     data class CurrentSessionCannotBeVerified(
-            val userItem: MatrixItem.UserItem?,
+            val userItem: MatrixItem.UserItem,
     ) : HomeActivityViewEvents
+
     data class OnCrossSignedInvalidated(val userItem: MatrixItem.UserItem) : HomeActivityViewEvents
     object PromptToEnableSessionPush : HomeActivityViewEvents
     object ShowAnalyticsOptIn : HomeActivityViewEvents
+    object ShowNotificationDialog : HomeActivityViewEvents
+    object ShowReleaseNotes : HomeActivityViewEvents
     object NotifyUserForThreadsMigration : HomeActivityViewEvents
     data class MigrateThreads(val checkSession: Boolean) : HomeActivityViewEvents
     object StartRecoverySetupFlow : HomeActivityViewEvents
     data class ForceVerification(val sendRequest: Boolean) : HomeActivityViewEvents
+    object AskUserForPushDistributor : HomeActivityViewEvents
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index cfe76706a5..8f16121a30 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -26,11 +26,16 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.pushers.EnsureFcmTokenIsRetrievedUseCase
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.pushers.RegisterUnifiedPushUseCase
+import im.vector.app.core.pushers.UnregisterUnifiedPushUseCase
 import im.vector.app.features.analytics.AnalyticsConfig
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.extensions.toAnalyticsType
 import im.vector.app.features.analytics.plan.Signup
 import im.vector.app.features.analytics.store.AnalyticsStore
+import im.vector.app.features.home.room.list.home.release.ReleaseNotesPreferencesStore
 import im.vector.app.features.login.ReAuthHelper
 import im.vector.app.features.onboarding.AuthenticationDescription
 import im.vector.app.features.raw.wellknown.ElementWellKnown
@@ -39,6 +44,8 @@ import im.vector.app.features.raw.wellknown.isSecureBackupRequired
 import im.vector.app.features.raw.wellknown.withElementWellKnown
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.voicebroadcast.recording.usecase.StopOngoingVoiceBroadcastUseCase
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
@@ -58,7 +65,7 @@ import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.pushrules.RuleIds
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
@@ -82,6 +89,12 @@ class HomeActivityViewModel @AssistedInject constructor(
         private val vectorPreferences: VectorPreferences,
         private val analyticsTracker: AnalyticsTracker,
         private val analyticsConfig: AnalyticsConfig,
+        private val releaseNotesPreferencesStore: ReleaseNotesPreferencesStore,
+        private val stopOngoingVoiceBroadcastUseCase: StopOngoingVoiceBroadcastUseCase,
+        private val pushersManager: PushersManager,
+        private val registerUnifiedPushUseCase: RegisterUnifiedPushUseCase,
+        private val unregisterUnifiedPushUseCase: UnregisterUnifiedPushUseCase,
+        private val ensureFcmTokenIsRetrievedUseCase: EnsureFcmTokenIsRetrievedUseCase,
 ) : VectorViewModel<HomeActivityViewState, HomeActivityViewActions, HomeActivityViewEvents>(initialState) {
 
     @AssistedFactory
@@ -92,7 +105,7 @@ class HomeActivityViewModel @AssistedInject constructor(
     companion object : MavericksViewModelFactory<HomeActivityViewModel, HomeActivityViewState> by hiltMavericksViewModelFactory() {
         override fun initialState(viewModelContext: ViewModelContext): HomeActivityViewState? {
             val activity: HomeActivity = viewModelContext.activity()
-            val args: HomeActivityArgs? = activity.intent.getParcelableExtra(Mavericks.KEY_ARG)
+            val args: HomeActivityArgs? = activity.intent.getParcelableExtraCompat(Mavericks.KEY_ARG)
             return args?.let { HomeActivityViewState(authenticationDescription = it.authenticationDescription) }
                     ?: super.initialState(viewModelContext)
         }
@@ -105,12 +118,60 @@ class HomeActivityViewModel @AssistedInject constructor(
     private fun initialize() {
         if (isInitialized) return
         isInitialized = true
+        registerUnifiedPushIfNeeded()
         cleanupFiles()
         observeInitialSync()
         checkSessionPushIsOn()
         observeCrossSigningReset()
         observeAnalytics()
+        observeReleaseNotes()
         initThreadsMigration()
+        viewModelScope.launch { stopOngoingVoiceBroadcastUseCase.execute() }
+    }
+
+    private fun registerUnifiedPushIfNeeded() {
+        if (vectorPreferences.areNotificationEnabledForDevice()) {
+            registerUnifiedPush(distributor = "")
+        } else {
+            unregisterUnifiedPush()
+        }
+    }
+
+    private fun registerUnifiedPush(distributor: String) {
+        viewModelScope.launch {
+            when (registerUnifiedPushUseCase.execute(distributor = distributor)) {
+                is RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.NeedToAskUserForDistributor -> {
+                    _viewEvents.post(HomeActivityViewEvents.AskUserForPushDistributor)
+                }
+                RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success -> {
+                    ensureFcmTokenIsRetrievedUseCase.execute(pushersManager, registerPusher = vectorPreferences.areNotificationEnabledForDevice())
+                }
+            }
+        }
+    }
+
+    private fun unregisterUnifiedPush() {
+        viewModelScope.launch {
+            unregisterUnifiedPushUseCase.execute(pushersManager)
+        }
+    }
+
+    private fun observeReleaseNotes() = withState { state ->
+        if (vectorPreferences.isNewAppLayoutEnabled()) {
+            // we don't want to show release notes for new users or after relogin
+            if (state.authenticationDescription == null) {
+                releaseNotesPreferencesStore.appLayoutOnboardingShown.onEach { isAppLayoutOnboardingShown ->
+                    if (!isAppLayoutOnboardingShown) {
+                        _viewEvents.post(HomeActivityViewEvents.ShowReleaseNotes)
+                    }
+                }.launchIn(viewModelScope)
+            } else {
+                // we assume that users which came from auth flow either have seen updates already (relogin) or don't need them (new user)
+                viewModelScope.launch {
+                    releaseNotesPreferencesStore.setAppLayoutOnboardingShown(true)
+                }
+            }
+        }
     }
 
     private fun observeAnalytics() {
@@ -119,6 +180,8 @@ class HomeActivityViewModel @AssistedInject constructor(
                     .onEach { didAskUser ->
                         if (!didAskUser) {
                             _viewEvents.post(HomeActivityViewEvents.ShowAnalyticsOptIn)
+                        } else {
+                            _viewEvents.post(HomeActivityViewEvents.ShowNotificationDialog)
                         }
                     }
                     .launchIn(viewModelScope)
@@ -138,6 +201,8 @@ class HomeActivityViewModel @AssistedInject constructor(
                     // do nothing
                 }
             }
+        } else {
+            _viewEvents.post(HomeActivityViewEvents.ShowNotificationDialog)
         }
     }
 
@@ -189,6 +254,12 @@ class HomeActivityViewModel @AssistedInject constructor(
 //        }
 
         when {
+            !vectorPreferences.areThreadMessagesEnabled() && !vectorPreferences.wasThreadFlagChangedManually() -> {
+                vectorPreferences.setThreadMessagesEnabled()
+                lightweightSettingsStorage.setThreadMessagesEnabled(vectorPreferences.areThreadMessagesEnabled())
+                // Clear Cache
+                _viewEvents.post(HomeActivityViewEvents.MigrateThreads(checkSession = false))
+            }
             // Notify users
             vectorPreferences.shouldNotifyUserAboutThreads() && vectorPreferences.areThreadMessagesEnabled() -> {
                 Timber.i("----> Notify users about threads")
@@ -291,10 +362,10 @@ class HomeActivityViewModel @AssistedInject constructor(
         } else {
             // cross signing keys have been reset
             // Trigger a popup to re-verify
-            // Note: user can be null in case of logout
-            session.getUser(session.myUserId)
-                    ?.toMatrixItem()
-                    ?.let { user ->
+            // Note: user can be unknown in case of logout
+            session.getUserOrDefault(session.myUserId)
+                    .toMatrixItem()
+                    .let { user ->
                         _viewEvents.post(HomeActivityViewEvents.OnCrossSignedInvalidated(user))
                     }
         }
@@ -375,7 +446,7 @@ class HomeActivityViewModel @AssistedInject constructor(
                                 // New session
                                 _viewEvents.post(
                                         HomeActivityViewEvents.CurrentSessionNotVerified(
-                                                session.getUser(session.myUserId)?.toMatrixItem(),
+                                                session.getUserOrDefault(session.myUserId).toMatrixItem(),
                                                 // Always send request instead of waiting for an incoming as per recent EW changes
                                                 false
                                         )
@@ -383,7 +454,7 @@ class HomeActivityViewModel @AssistedInject constructor(
                             } else {
                                 _viewEvents.post(
                                         HomeActivityViewEvents.CurrentSessionCannotBeVerified(
-                                                session.getUser(session.myUserId)?.toMatrixItem(),
+                                                session.getUserOrDefault(session.myUserId).toMatrixItem(),
                                         )
                                 )
                             }
@@ -403,7 +474,7 @@ class HomeActivityViewModel @AssistedInject constructor(
                         // Check this is not an SSO account
                         if (session.homeServerCapabilitiesService().getHomeServerCapabilities().canChangePassword) {
                             // Ask password to the user: Upgrade security
-                            _viewEvents.post(HomeActivityViewEvents.AskPasswordToInitCrossSigning(session.getUser(session.myUserId)?.toMatrixItem()))
+                            _viewEvents.post(HomeActivityViewEvents.AskPasswordToInitCrossSigning(session.getUserOrDefault(session.myUserId).toMatrixItem()))
                         }
                         // Else (SSO) just ignore for the moment
                     } else {
@@ -444,6 +515,9 @@ class HomeActivityViewModel @AssistedInject constructor(
             HomeActivityViewActions.ViewStarted -> {
                 initialize()
             }
+            is HomeActivityViewActions.RegisterPushDistributor -> {
+                registerUnifiedPush(distributor = action.distributor)
+            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
index 843f9bdfec..f9c1b37ed5 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
@@ -22,5 +22,5 @@ import org.matrix.android.sdk.api.session.sync.SyncRequestState
 
 data class HomeActivityViewState(
         val syncRequestState: SyncRequestState = SyncRequestState.Idle,
-        val authenticationDescription: AuthenticationDescription? = null
+        val authenticationDescription: AuthenticationDescription? = null,
 ) : MavericksState
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index d4c89c1bca..d310f574dd 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -28,6 +28,7 @@ import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.badge.BadgeDrawable
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.SpaceStateHandler
 import im.vector.app.core.extensions.commitTransaction
@@ -50,29 +51,33 @@ import im.vector.app.features.home.room.list.RoomListParams
 import im.vector.app.features.home.room.list.UnreadCounterBadgeView
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
-import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorLocaleProvider
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity.Companion.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.BannerState
+import im.vector.app.features.workers.signout.ServerBackupStatusAction
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
-class HomeDetailFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer,
-        private val colorProvider: ColorProvider,
-        private val alertManager: PopupAlertManager,
-        private val callManager: WebRtcCallManager,
-        private val vectorPreferences: VectorPreferences,
-        private val spaceStateHandler: SpaceStateHandler,
-) : VectorBaseFragment<FragmentHomeDetailBinding>(),
+@AndroidEntryPoint
+class HomeDetailFragment :
+        VectorBaseFragment<FragmentHomeDetailBinding>(),
         KeysBackupBanner.Delegate,
         CurrentCallsView.Callback,
         OnBackPressed,
         VectorMenuProvider {
 
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var colorProvider: ColorProvider
+    @Inject lateinit var alertManager: PopupAlertManager
+    @Inject lateinit var callManager: WebRtcCallManager
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var spaceStateHandler: SpaceStateHandler
+    @Inject lateinit var vectorLocale: VectorLocaleProvider
+
     private val viewModel: HomeDetailViewModel by fragmentViewModel()
     private val unknownDeviceDetectorSharedViewModel: UnknownDeviceDetectorSharedViewModel by activityViewModel()
     private val unreadMessagesSharedViewModel: UnreadMessagesSharedViewModel by activityViewModel()
@@ -151,7 +156,7 @@ class HomeDetailFragment @Inject constructor(
         unknownDeviceDetectorSharedViewModel.onEach { state ->
             state.unknownSessions.invoke()?.let { unknownDevices ->
                 if (unknownDevices.firstOrNull()?.currentSessionTrust == true) {
-                    val uid = "review_login"
+                    val uid = PopupAlertManager.REVIEW_LOGIN_UID
                     alertManager.cancelAlert(uid)
                     val olderUnverified = unknownDevices.filter { !it.isNew }
                     val newest = unknownDevices.firstOrNull { it.isNew }?.deviceInfo
@@ -167,7 +172,7 @@ class HomeDetailFragment @Inject constructor(
 
         unreadMessagesSharedViewModel.onEach { state ->
             views.drawerUnreadCounterBadgeView.render(
-                    UnreadCounterBadgeView.State(
+                    UnreadCounterBadgeView.State.Count(
                             count = state.otherSpacesUnread.totalCount,
                             highlighted = state.otherSpacesUnread.isHighlight
                     )
@@ -183,7 +188,7 @@ class HomeDetailFragment @Inject constructor(
     }
 
     private fun navigateBack() {
-        val previousSpaceId = spaceStateHandler.getSpaceBackstack().removeLastOrNull()
+        val previousSpaceId = spaceStateHandler.popSpaceBackstack()
         val parentSpaceId = spaceStateHandler.getCurrentSpace()?.flattenParentIds?.lastOrNull()
         setCurrentSpace(previousSpaceId ?: parentSpaceId)
     }
@@ -229,16 +234,17 @@ class HomeDetailFragment @Inject constructor(
                     viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer)
                     colorInt = colorProvider.getColorFromAttribute(R.attr.colorPrimary)
                     contentAction = Runnable {
-                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)
-                                ?.navigator
-                                ?.requestSessionVerification(requireContext(), newest.deviceId ?: "")
+                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let { vectorBaseActivity ->
+                            vectorBaseActivity.navigator
+                                    .requestSessionVerification(vectorBaseActivity, newest.deviceId ?: "")
+                        }
                         unknownDeviceDetectorSharedViewModel.handle(
-                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(newest.deviceId?.let { listOf(it) }.orEmpty())
+                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreNewLogin(newest.deviceId?.let { listOf(it) }.orEmpty())
                         )
                     }
                     dismissedAction = Runnable {
                         unknownDeviceDetectorSharedViewModel.handle(
-                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(newest.deviceId?.let { listOf(it) }.orEmpty())
+                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreNewLogin(newest.deviceId?.let { listOf(it) }.orEmpty())
                         )
                     }
                 }
@@ -250,8 +256,8 @@ class HomeDetailFragment @Inject constructor(
         alertManager.postVectorAlert(
                 VerificationVectorAlert(
                         uid = uid,
-                        title = getString(R.string.review_logins),
-                        description = getString(R.string.verify_other_sessions),
+                        title = getString(R.string.review_unverified_sessions_title),
+                        description = getString(R.string.review_unverified_sessions_description),
                         iconId = R.drawable.ic_shield_warning
                 ).apply {
                     viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer)
@@ -284,13 +290,15 @@ class HomeDetailFragment @Inject constructor(
     }
 
     private fun setupKeysBackupBanner() {
+        serverBackupStatusViewModel.handle(ServerBackupStatusAction.OnBannerDisplayed)
         serverBackupStatusViewModel
                 .onEach {
                     when (val banState = it.bannerState.invoke()) {
-                        is BannerState.Setup -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Setup(banState.numberOfKeys), false)
-                        BannerState.BackingUp -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.BackingUp, false)
-                        null,
-                        BannerState.Hidden -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Hidden, false)
+                        is BannerState.Setup,
+                        BannerState.BackingUp,
+                        BannerState.Hidden -> views.homeKeysBackupBanner.render(banState, false)
+                        null -> views.homeKeysBackupBanner.render(BannerState.Hidden, false)
+                        else -> Unit /* No op? */
                     }
                 }
         views.homeKeysBackupBanner.delegate = this
@@ -374,7 +382,7 @@ class HomeDetailFragment @Inject constructor(
             arguments = Bundle().apply {
                 putBoolean(DialPadFragment.EXTRA_ENABLE_DELETE, true)
                 putBoolean(DialPadFragment.EXTRA_ENABLE_OK, true)
-                putString(DialPadFragment.EXTRA_REGION_CODE, VectorLocale.applicationLocale.country)
+                putString(DialPadFragment.EXTRA_REGION_CODE, vectorLocale.applicationLocale.country)
             }
             applyCallback()
         }
@@ -397,6 +405,10 @@ class HomeDetailFragment @Inject constructor(
      * KeysBackupBanner Listener
      * ========================================================================================== */
 
+    override fun onCloseClicked() {
+        serverBackupStatusViewModel.handle(ServerBackupStatusAction.OnBannerClosed)
+    }
+
     override fun setupKeysBackup() {
         navigator.openKeysBackupSetup(requireActivity(), false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index 535f38e68e..22d9709229 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.observeK
 import im.vector.app.core.extensions.replaceChildFragment
@@ -31,6 +32,7 @@ import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.FragmentHomeDrawerBinding
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.permalink.PermalinkFactory
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.spaces.SpaceListFragment
@@ -40,12 +42,15 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class HomeDrawerFragment @Inject constructor(
-        private val session: Session,
-        private val vectorPreferences: VectorPreferences,
-        private val avatarRenderer: AvatarRenderer,
-        private val buildMeta: BuildMeta,
-) : VectorBaseFragment<FragmentHomeDrawerBinding>() {
+@AndroidEntryPoint
+class HomeDrawerFragment :
+        VectorBaseFragment<FragmentHomeDrawerBinding>() {
+
+    @Inject lateinit var session: Session
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var buildMeta: BuildMeta
+    @Inject lateinit var permalinkFactory: PermalinkFactory
 
     private lateinit var sharedActionViewModel: HomeSharedActionViewModel
 
@@ -98,7 +103,7 @@ class HomeDrawerFragment @Inject constructor(
         }
 
         views.homeDrawerInviteFriendButton.debouncedClicks {
-            session.permalinkService().createPermalink(sharedActionViewModel.session.myUserId)?.let { permalink ->
+            permalinkFactory.createPermalinkOfCurrentUser()?.let { permalink ->
                 analyticsTracker.screen(MobileScreen(screenName = MobileScreen.ScreenName.InviteFriends))
                 val text = getString(R.string.invite_friends_text, permalink)
 
@@ -113,10 +118,14 @@ class HomeDrawerFragment @Inject constructor(
         }
 
         // Debug menu
-        views.homeDrawerHeaderDebugView.isVisible = buildMeta.isDebug && vectorPreferences.developerMode()
         views.homeDrawerHeaderDebugView.debouncedClicks {
             sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
             navigator.openDebug(requireActivity())
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        views.homeDrawerHeaderDebugView.isVisible = buildMeta.isDebug && vectorPreferences.developerMode()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/IsNewLoginAlertShownUseCase.kt b/vector/src/main/java/im/vector/app/features/home/IsNewLoginAlertShownUseCase.kt
new file mode 100644
index 0000000000..5a0d4743dc
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/IsNewLoginAlertShownUseCase.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home
+
+import im.vector.app.features.settings.VectorPreferences
+import javax.inject.Inject
+
+class IsNewLoginAlertShownUseCase @Inject constructor(
+        private val vectorPreferences: VectorPreferences,
+) {
+
+    fun execute(deviceId: String?): Boolean {
+        deviceId ?: return false
+
+        return vectorPreferences.isNewLoginAlertShownForDevice(deviceId)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt b/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt
index 47cfd1c28f..c5e33abf34 100644
--- a/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt
@@ -21,11 +21,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentLoadingBinding
-import javax.inject.Inject
 
-class LoadingFragment @Inject constructor() : VectorBaseFragment<FragmentLoadingBinding>() {
+@AndroidEntryPoint
+class LoadingFragment : VectorBaseFragment<FragmentLoadingBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoadingBinding {
         return FragmentLoadingBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
index 2e36748069..3189c2b99e 100644
--- a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
@@ -16,18 +16,20 @@
 
 package im.vector.app.features.home
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import com.google.android.material.badge.BadgeDrawable
+import com.google.android.material.appbar.AppBarLayout
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.SpaceStateHandler
 import im.vector.app.core.extensions.commitTransaction
@@ -35,6 +37,7 @@ import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.platform.VectorMenuProvider
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.ui.views.CurrentCallsView
 import im.vector.app.core.ui.views.CurrentCallsViewPresenter
@@ -42,47 +45,53 @@ import im.vector.app.core.ui.views.KeysBackupBanner
 import im.vector.app.databinding.FragmentNewHomeDetailBinding
 import im.vector.app.features.call.SharedKnownCallsViewModel
 import im.vector.app.features.call.VectorCallActivity
-import im.vector.app.features.call.dialpad.DialPadFragment
+import im.vector.app.features.call.dialpad.PstnDialActivity
 import im.vector.app.features.call.webrtc.WebRtcCallManager
+import im.vector.app.features.home.room.list.actions.RoomListSharedAction
+import im.vector.app.features.home.room.list.actions.RoomListSharedActionViewModel
 import im.vector.app.features.home.room.list.home.HomeRoomListFragment
+import im.vector.app.features.home.room.list.home.NewChatBottomSheet
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
-import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity.Companion.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS
-import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.features.spaces.SpaceListBottomSheet
 import im.vector.app.features.workers.signout.BannerState
+import im.vector.app.features.workers.signout.ServerBackupStatusAction
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.session.Session
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class NewHomeDetailFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer,
-        private val colorProvider: ColorProvider,
-        private val alertManager: PopupAlertManager,
-        private val callManager: WebRtcCallManager,
-        private val vectorPreferences: VectorPreferences,
-        private val appStateHandler: SpaceStateHandler,
-        private val session: Session,
-) : VectorBaseFragment<FragmentNewHomeDetailBinding>(),
+@AndroidEntryPoint
+class NewHomeDetailFragment :
+        VectorBaseFragment<FragmentNewHomeDetailBinding>(),
         KeysBackupBanner.Delegate,
         CurrentCallsView.Callback,
         OnBackPressed,
         VectorMenuProvider {
 
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var colorProvider: ColorProvider
+    @Inject lateinit var alertManager: PopupAlertManager
+    @Inject lateinit var callManager: WebRtcCallManager
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var spaceStateHandler: SpaceStateHandler
+    @Inject lateinit var buildMeta: BuildMeta
+
     private val viewModel: HomeDetailViewModel by fragmentViewModel()
     private val unknownDeviceDetectorSharedViewModel: UnknownDeviceDetectorSharedViewModel by activityViewModel()
-    private val unreadMessagesSharedViewModel: UnreadMessagesSharedViewModel by activityViewModel()
     private val serverBackupStatusViewModel: ServerBackupStatusViewModel by activityViewModel()
 
     private lateinit var sharedActionViewModel: HomeSharedActionViewModel
+    private lateinit var sharedRoomListActionViewModel: RoomListSharedActionViewModel
     private lateinit var sharedCallActionViewModel: SharedKnownCallsViewModel
 
+    private val newChatBottomSheet = NewChatBottomSheet()
+    private val spaceListBottomSheet = SpaceListBottomSheet()
+
     private var hasUnreadRooms = false
         set(value) {
             if (value != field) {
@@ -99,6 +108,10 @@ class NewHomeDetailFragment @Inject constructor(
                 viewModel.handle(HomeDetailAction.MarkAllRoomsRead)
                 true
             }
+            R.id.menu_home_dialpad -> {
+                startActivity(Intent(requireContext(), PstnDialActivity::class.java))
+                true
+            }
             else -> false
         }
     }
@@ -107,6 +120,7 @@ class NewHomeDetailFragment @Inject constructor(
         withState(viewModel) { state ->
             val isRoomList = state.currentTab is HomeTab.RoomList
             menu.findItem(R.id.menu_home_mark_all_as_read).isVisible = isRoomList && hasUnreadRooms
+            menu.findItem(R.id.menu_home_dialpad).isVisible = state.showDialPadTab
         }
     }
 
@@ -120,32 +134,25 @@ class NewHomeDetailFragment @Inject constructor(
         super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(HomeSharedActionViewModel::class.java)
         sharedCallActionViewModel = activityViewModelProvider.get(SharedKnownCallsViewModel::class.java)
-        setupBottomNavigationView()
         setupToolbar()
         setupKeysBackupBanner()
         setupActiveCallView()
+        setupDebugButton()
+        setupFabs()
+        setupObservers()
 
-        withState(viewModel) {
-            // Update the navigation view if needed (for when we restore the tabs)
-            views.bottomNavigationView.selectedItemId = it.currentTab.toMenuId()
+        childFragmentManager.commitTransaction {
+            add(R.id.roomListContainer, HomeRoomListFragment::class.java, null, HOME_ROOM_LIST_FRAGMENT_TAG)
         }
 
         viewModel.onEach(HomeDetailViewState::selectedSpace) { selectedSpace ->
             onSpaceChange(selectedSpace)
         }
 
-        viewModel.onEach(HomeDetailViewState::currentTab) { currentTab ->
-            updateUIForTab(currentTab)
-        }
-
-        viewModel.onEach(HomeDetailViewState::showDialPadTab) { showDialPadTab ->
-            updateTabVisibilitySafely(R.id.bottom_action_dial_pad, showDialPadTab)
-        }
-
         viewModel.observeViewEvents { viewEvent ->
             when (viewEvent) {
-                HomeDetailViewEvents.CallStarted -> handleCallStarted()
-                is HomeDetailViewEvents.FailToCall -> showFailure(viewEvent.failure)
+                HomeDetailViewEvents.CallStarted -> Unit
+                is HomeDetailViewEvents.FailToCall -> Unit
                 HomeDetailViewEvents.Loading -> showLoadingDialog()
             }
         }
@@ -153,7 +160,7 @@ class NewHomeDetailFragment @Inject constructor(
         unknownDeviceDetectorSharedViewModel.onEach { state ->
             state.unknownSessions.invoke()?.let { unknownDevices ->
                 if (unknownDevices.firstOrNull()?.currentSessionTrust == true) {
-                    val uid = "review_login"
+                    val uid = PopupAlertManager.REVIEW_LOGIN_UID
                     alertManager.cancelAlert(uid)
                     val olderUnverified = unknownDevices.filter { !it.isNew }
                     val newest = unknownDevices.firstOrNull { it.isNew }?.deviceInfo
@@ -175,23 +182,43 @@ class NewHomeDetailFragment @Inject constructor(
                 }
     }
 
-    private fun navigateBack() {
-        val previousSpaceId = appStateHandler.getSpaceBackstack().removeLastOrNull()
-        val parentSpaceId = appStateHandler.getCurrentSpace()?.flattenParentIds?.lastOrNull()
-        setCurrentSpace(previousSpaceId ?: parentSpaceId)
+    private fun setupObservers() {
+        sharedRoomListActionViewModel = activityViewModelProvider[RoomListSharedActionViewModel::class.java]
+
+        sharedRoomListActionViewModel
+                .stream()
+                .onEach(::handleSharedAction)
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+
+    private fun handleSharedAction(action: RoomListSharedAction) {
+        when (action) {
+            RoomListSharedAction.CloseBottomSheet -> spaceListBottomSheet.dismiss()
+        }
+    }
+
+    private fun setupFabs() {
+        showFABs()
+
+        views.newLayoutCreateChatButton.debouncedClicks {
+            newChatBottomSheet.takeIf { !it.isAdded }?.show(requireActivity().supportFragmentManager, NewChatBottomSheet.TAG)
+        }
+
+        views.newLayoutOpenSpacesButton.debouncedClicks {
+            spaceListBottomSheet.takeIf { !it.isAdded }?.show(requireActivity().supportFragmentManager, SpaceListBottomSheet.TAG)
+        }
+    }
+
+    private fun showFABs() {
+        views.newLayoutCreateChatButton.show()
+        views.newLayoutOpenSpacesButton.show()
     }
 
     private fun setCurrentSpace(spaceId: String?) {
-        appStateHandler.setCurrentSpace(spaceId, isForwardNavigation = false)
+        spaceStateHandler.setCurrentSpace(spaceId, isForwardNavigation = false)
         sharedActionViewModel.post(HomeActivitySharedAction.OnCloseSpace)
     }
 
-    private fun handleCallStarted() {
-        dismissLoadingDialog()
-        val fragmentTag = HomeTab.DialPad.toFragmentTag()
-        (childFragmentManager.findFragmentByTag(fragmentTag) as? DialPadFragment)?.clear()
-    }
-
     override fun onDestroyView() {
         currentCallsViewPresenter.unBind()
         super.onDestroyView()
@@ -199,13 +226,12 @@ class NewHomeDetailFragment @Inject constructor(
 
     override fun onResume() {
         super.onResume()
-        updateTabVisibilitySafely(R.id.bottom_action_notification, vectorPreferences.labAddNotificationTab())
         callManager.checkForProtocolsSupportIfNeeded()
         refreshSpaceState()
     }
 
     private fun refreshSpaceState() {
-        appStateHandler.getCurrentSpace()?.let {
+        spaceStateHandler.getCurrentSpace()?.let {
             onSpaceChange(it)
         }
     }
@@ -222,16 +248,17 @@ class NewHomeDetailFragment @Inject constructor(
                     viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer)
                     colorInt = colorProvider.getColorFromAttribute(R.attr.colorPrimary)
                     contentAction = Runnable {
-                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)
-                                ?.navigator
-                                ?.requestSessionVerification(requireContext(), newest.deviceId ?: "")
+                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let { vectorBaseActivity ->
+                            vectorBaseActivity.navigator
+                                    .requestSessionVerification(vectorBaseActivity, newest.deviceId ?: "")
+                        }
                         unknownDeviceDetectorSharedViewModel.handle(
-                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(newest.deviceId?.let { listOf(it) }.orEmpty())
+                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreNewLogin(newest.deviceId?.let { listOf(it) }.orEmpty())
                         )
                     }
                     dismissedAction = Runnable {
                         unknownDeviceDetectorSharedViewModel.handle(
-                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(newest.deviceId?.let { listOf(it) }.orEmpty())
+                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreNewLogin(newest.deviceId?.let { listOf(it) }.orEmpty())
                         )
                     }
                 }
@@ -243,8 +270,8 @@ class NewHomeDetailFragment @Inject constructor(
         alertManager.postVectorAlert(
                 VerificationVectorAlert(
                         uid = uid,
-                        title = getString(R.string.review_logins),
-                        description = getString(R.string.verify_other_sessions),
+                        title = getString(R.string.review_unverified_sessions_title),
+                        description = getString(R.string.review_unverified_sessions_description),
                         iconId = R.drawable.ic_shield_warning
                 ).apply {
                     viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer)
@@ -268,18 +295,19 @@ class NewHomeDetailFragment @Inject constructor(
     }
 
     private fun onSpaceChange(spaceSummary: RoomSummary?) {
-        // Reimplement in next PR
-        println(spaceSummary)
+        views.collapsingToolbar.title = (spaceSummary?.displayName ?: getString(R.string.all_chats))
     }
 
     private fun setupKeysBackupBanner() {
+        serverBackupStatusViewModel.handle(ServerBackupStatusAction.OnBannerDisplayed)
         serverBackupStatusViewModel
                 .onEach {
                     when (val banState = it.bannerState.invoke()) {
-                        is BannerState.Setup -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Setup(banState.numberOfKeys), false)
-                        BannerState.BackingUp -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.BackingUp, false)
-                        null,
-                        BannerState.Hidden -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Hidden, false)
+                        is BannerState.Setup,
+                        BannerState.BackingUp,
+                        BannerState.Hidden -> views.homeKeysBackupBanner.render(banState, false)
+                        null -> views.homeKeysBackupBanner.render(BannerState.Hidden, false)
+                        else -> Unit /* No op? */
                     }
                 }
         views.homeKeysBackupBanner.delegate = this
@@ -292,95 +320,39 @@ class NewHomeDetailFragment @Inject constructor(
     private fun setupToolbar() {
         setupToolbar(views.toolbar)
 
-        lifecycleScope.launch(Dispatchers.IO) {
-            session.userService().getUser(session.myUserId)?.let { user ->
-                avatarRenderer.render(user.toMatrixItem(), views.avatar)
-            }
-        }
+        views.collapsingToolbar.debouncedClicks(::openSpaceSettings)
+        views.toolbar.debouncedClicks(::openSpaceSettings)
 
         views.avatar.debouncedClicks {
             navigator.openSettings(requireContext())
         }
     }
 
-    private fun setupBottomNavigationView() {
-        views.bottomNavigationView.menu.findItem(R.id.bottom_action_notification).isVisible = vectorPreferences.labAddNotificationTab()
-        views.bottomNavigationView.setOnItemSelectedListener {
-            val tab = when (it.itemId) {
-                R.id.bottom_action_people -> HomeTab.RoomList(RoomListDisplayMode.PEOPLE)
-                R.id.bottom_action_rooms -> HomeTab.RoomList(RoomListDisplayMode.ROOMS)
-                R.id.bottom_action_notification -> HomeTab.RoomList(RoomListDisplayMode.NOTIFICATIONS)
-                else -> HomeTab.DialPad
-            }
-            viewModel.handle(HomeDetailAction.SwitchTab(tab))
-            true
+    private fun openSpaceSettings() = withState(viewModel) { viewState ->
+        viewState.selectedSpace?.let {
+            sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(it.roomId))
         }
     }
 
-    private fun updateUIForTab(tab: HomeTab) {
-        views.bottomNavigationView.menu.findItem(tab.toMenuId()).isChecked = true
-        updateSelectedFragment(tab)
-        invalidateOptionsMenu()
-    }
-
-    private fun HomeTab.toFragmentTag() = "FRAGMENT_TAG_$this"
-
-    private fun updateSelectedFragment(tab: HomeTab) {
-        val fragmentTag = tab.toFragmentTag()
-        val fragmentToShow = childFragmentManager.findFragmentByTag(fragmentTag)
-        childFragmentManager.commitTransaction {
-            childFragmentManager.fragments
-                    .filter { it != fragmentToShow }
-                    .forEach {
-                        detach(it)
-                    }
-            if (fragmentToShow == null) {
-                when (tab) {
-                    is HomeTab.RoomList -> {
-                        add(R.id.roomListContainer, HomeRoomListFragment::class.java, null, fragmentTag)
-                    }
-                    is HomeTab.DialPad -> {
-                        add(R.id.roomListContainer, createDialPadFragment(), fragmentTag)
-                    }
-                }
-            } else {
-                if (tab is HomeTab.DialPad) {
-                    (fragmentToShow as? DialPadFragment)?.applyCallback()
-                }
-                attach(fragmentToShow)
-            }
+    private fun setupDebugButton() {
+        views.debugButton.debouncedClicks {
+            sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
+            navigator.openDebug(requireActivity())
         }
-    }
 
-    private fun createDialPadFragment(): Fragment {
-        val fragment = childFragmentManager.fragmentFactory.instantiate(vectorBaseActivity.classLoader, DialPadFragment::class.java.name)
-        return (fragment as DialPadFragment).apply {
-            arguments = Bundle().apply {
-                putBoolean(DialPadFragment.EXTRA_ENABLE_DELETE, true)
-                putBoolean(DialPadFragment.EXTRA_ENABLE_OK, true)
-                putString(DialPadFragment.EXTRA_REGION_CODE, VectorLocale.applicationLocale.country)
-            }
-            applyCallback()
-        }
-    }
-
-    private fun updateTabVisibilitySafely(tabId: Int, isVisible: Boolean) {
-        val wasVisible = views.bottomNavigationView.menu.findItem(tabId).isVisible
-        views.bottomNavigationView.menu.findItem(tabId).isVisible = isVisible
-        if (wasVisible && !isVisible) {
-            // As we hide it check if it's not the current item!
-            withState(viewModel) {
-                if (it.currentTab.toMenuId() == tabId) {
-                    viewModel.handle(HomeDetailAction.SwitchTab(HomeTab.RoomList(RoomListDisplayMode.PEOPLE)))
-                }
-            }
-        }
+        views.appBarLayout.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { _, verticalOffset ->
+            views.debugButton.isVisible = verticalOffset == 0 && buildMeta.isDebug && vectorPreferences.developerMode()
+        })
     }
 
     /* ==========================================================================================
      * KeysBackupBanner Listener
      * ========================================================================================== */
 
+    override fun onCloseClicked() {
+        serverBackupStatusViewModel.handle(ServerBackupStatusAction.OnBannerClosed)
+    }
+
     override fun setupKeysBackup() {
         navigator.openKeysBackupSetup(requireActivity(), false)
     }
@@ -390,9 +362,6 @@ class NewHomeDetailFragment @Inject constructor(
     }
 
     override fun invalidate() = withState(viewModel) {
-        views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_people).render(it.notificationCountPeople, it.notificationHighlightPeople)
-        views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_rooms).render(it.notificationCountRooms, it.notificationHighlightRooms)
-        views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_notification).render(it.notificationCountCatchup, it.notificationHighlightCatchup)
         views.syncStateView.render(
                 it.syncState,
                 it.incrementalSyncRequestState,
@@ -400,27 +369,13 @@ class NewHomeDetailFragment @Inject constructor(
                 vectorPreferences.developerShowDebugInfo()
         )
 
+        refreshAvatar()
         hasUnreadRooms = it.hasUnreadMessages
     }
 
-    private fun BadgeDrawable.render(count: Int, highlight: Boolean) {
-        isVisible = count > 0
-        number = count
-        maxCharacterCount = 3
-        badgeTextColor = ThemeUtils.getColor(requireContext(), R.attr.colorOnPrimary)
-        backgroundColor = if (highlight) {
-            ThemeUtils.getColor(requireContext(), R.attr.colorError)
-        } else {
-            ThemeUtils.getColor(requireContext(), R.attr.vctr_unread_background)
-        }
-    }
-
-    private fun HomeTab.toMenuId() = when (this) {
-        is HomeTab.DialPad -> R.id.bottom_action_dial_pad
-        is HomeTab.RoomList -> when (displayMode) {
-            RoomListDisplayMode.PEOPLE -> R.id.bottom_action_people
-            RoomListDisplayMode.ROOMS -> R.id.bottom_action_rooms
-            else -> R.id.bottom_action_notification
+    private fun refreshAvatar() = withState(viewModel) { state ->
+        state.myMatrixItem?.let { user ->
+            avatarRenderer.render(user, views.avatar)
         }
     }
 
@@ -440,20 +395,17 @@ class NewHomeDetailFragment @Inject constructor(
         }
     }
 
-    private fun DialPadFragment.applyCallback(): DialPadFragment {
-        callback = object : DialPadFragment.Callback {
-            override fun onOkClicked(formatted: String?, raw: String?) {
-                if (raw.isNullOrEmpty()) return
-                viewModel.handle(HomeDetailAction.StartCallWithPhoneNumber(raw))
-            }
-        }
-        return this
+    override fun onBackPressed(toolbarButton: Boolean) = if (spaceStateHandler.isRoot()) {
+        false
+    } else {
+        val lastSpace = spaceStateHandler.popSpaceBackstack()
+        spaceStateHandler.setCurrentSpace(lastSpace, isForwardNavigation = false)
+        true
     }
 
-    override fun onBackPressed(toolbarButton: Boolean) = if (appStateHandler.getCurrentSpace() != null) {
-        navigateBack()
-        true
-    } else {
-        false
+    private fun SpaceStateHandler.isRoot() = getSpaceBackstack().isEmpty()
+
+    companion object {
+        private const val HOME_ROOM_LIST_FRAGMENT_TAG = "TAG_HOME_ROOM_LIST"
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/NightlyProxy.kt b/vector/src/main/java/im/vector/app/features/home/NightlyProxy.kt
index b25add2ac9..42b93bf1a5 100644
--- a/vector/src/main/java/im/vector/app/features/home/NightlyProxy.kt
+++ b/vector/src/main/java/im/vector/app/features/home/NightlyProxy.kt
@@ -17,5 +17,18 @@
 package im.vector.app.features.home
 
 interface NightlyProxy {
-    fun onHomeResumed()
+    /**
+     * Return true if this is a nightly build (checking the package of the app), and only once a day.
+     */
+    fun canDisplayPopup(): Boolean
+
+    /**
+     * Return true if this is a nightly build (checking the package of the app).
+     */
+    fun isNightlyBuild(): Boolean
+
+    /**
+     * Try to update the application, if update is available. Will also take care of the user sign in.
+     */
+    fun updateApplication()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/NotificationPermissionManager.kt b/vector/src/main/java/im/vector/app/features/home/NotificationPermissionManager.kt
new file mode 100644
index 0000000000..4f585becca
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/NotificationPermissionManager.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home
+
+import android.Manifest
+import android.app.Activity
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.activity.result.ActivityResultLauncher
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import im.vector.app.R
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
+import javax.inject.Inject
+
+class NotificationPermissionManager @Inject constructor(
+        private val sdkIntProvider: BuildVersionSdkIntProvider,
+        private val vectorPreferences: VectorPreferences,
+) {
+
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+    fun isPermissionGranted(activity: Activity): Boolean {
+        return ContextCompat.checkSelfPermission(
+                activity,
+                Manifest.permission.POST_NOTIFICATIONS
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+
+    fun eventuallyRequestPermission(
+            activity: Activity,
+            requestPermissionLauncher: ActivityResultLauncher<Array<String>>,
+            showRationale: Boolean = true,
+            ignorePreference: Boolean = false,
+    ) {
+        if (!sdkIntProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU)) return
+        if (!vectorPreferences.areNotificationEnabledForDevice() && !ignorePreference) return
+        checkPermissions(
+                listOf(Manifest.permission.POST_NOTIFICATIONS),
+                activity,
+                activityResultLauncher = requestPermissionLauncher,
+                if (showRationale) R.string.permissions_rationale_msg_notification else 0
+        )
+    }
+
+    @RequiresApi(33)
+    fun askPermission(requestPermissionLauncher: ActivityResultLauncher<Array<String>>) {
+        requestPermissionLauncher.launch(
+                arrayOf(Manifest.permission.POST_NOTIFICATIONS)
+        )
+    }
+
+    fun eventuallyRevokePermission(
+            activity: Activity,
+    ) {
+        if (!sdkIntProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU)) return
+        activity.revokeSelfPermissionOnKill(Manifest.permission.POST_NOTIFICATIONS)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/SetNewLoginAlertShownUseCase.kt b/vector/src/main/java/im/vector/app/features/home/SetNewLoginAlertShownUseCase.kt
new file mode 100644
index 0000000000..d313f93043
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/SetNewLoginAlertShownUseCase.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home
+
+import im.vector.app.features.settings.VectorPreferences
+import javax.inject.Inject
+
+class SetNewLoginAlertShownUseCase @Inject constructor(
+        private val vectorPreferences: VectorPreferences,
+) {
+
+    fun execute(deviceIds: List<String>) {
+        deviceIds.forEach {
+            vectorPreferences.setNewLoginAlertShownForDevice(it)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/SetUnverifiedSessionsAlertShownUseCase.kt b/vector/src/main/java/im/vector/app/features/home/SetUnverifiedSessionsAlertShownUseCase.kt
new file mode 100644
index 0000000000..4580ac0f31
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/SetUnverifiedSessionsAlertShownUseCase.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home
+
+import im.vector.app.core.time.Clock
+import im.vector.app.features.settings.VectorPreferences
+import javax.inject.Inject
+
+class SetUnverifiedSessionsAlertShownUseCase @Inject constructor(
+        private val vectorPreferences: VectorPreferences,
+        private val clock: Clock,
+) {
+
+    fun execute(deviceIds: List<String>) {
+        val epochMillis = clock.epochMillis()
+        deviceIds.forEach {
+            vectorPreferences.setUnverifiedSessionsAlertLastShownMillis(it, epochMillis)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
index 861fdc64b2..a0bcea217f 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.graphics.Bitmap
 import android.os.Build
+import androidx.annotation.ChecksSdkIntAtLeast
 import androidx.annotation.WorkerThread
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
@@ -28,10 +29,12 @@ import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.MainActivity
+import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
+@ChecksSdkIntAtLeast(api = Build.VERSION_CODES.O)
 private val useAdaptiveIcon = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
 private const val adaptiveIconSizeDp = 108
 private const val adaptiveIconOuterSidesDp = 18
@@ -53,6 +56,7 @@ class ShortcutCreator @Inject constructor(
             dimensionConverter.dpToPx(72)
         }
     }
+    @Inject lateinit var vectorPreferences: VectorPreferences
 
     fun canCreateShortcut(): Boolean {
         return ShortcutManagerCompat.isRequestPinShortcutSupported(context)
@@ -71,10 +75,12 @@ class ShortcutCreator @Inject constructor(
         } catch (failure: Throwable) {
             null
         }
-        val categories = if (Build.VERSION.SDK_INT >= 25) {
-            setOf(directShareCategory, ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)
-        } else {
-            setOf(directShareCategory)
+        val categories = mutableSetOf<String>()
+        if (vectorPreferences.directShareEnabled()) {
+            categories.add(directShareCategory)
+        }
+        if (Build.VERSION.SDK_INT >= 25) {
+            categories.add(ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)
         }
 
         return ShortcutInfoCompat.Builder(context, roomSummary.roomId)
diff --git a/vector/src/main/java/im/vector/app/features/home/ShouldShowUnverifiedSessionsAlertUseCase.kt b/vector/src/main/java/im/vector/app/features/home/ShouldShowUnverifiedSessionsAlertUseCase.kt
new file mode 100644
index 0000000000..18c7ed9689
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/ShouldShowUnverifiedSessionsAlertUseCase.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home
+
+import im.vector.app.config.Config
+import im.vector.app.core.time.Clock
+import im.vector.app.features.VectorFeatures
+import im.vector.app.features.settings.VectorPreferences
+import javax.inject.Inject
+
+class ShouldShowUnverifiedSessionsAlertUseCase @Inject constructor(
+        private val vectorFeatures: VectorFeatures,
+        private val vectorPreferences: VectorPreferences,
+        private val clock: Clock,
+) {
+
+    fun execute(deviceId: String?): Boolean {
+        deviceId ?: return false
+
+        val isUnverifiedSessionsAlertEnabled = vectorFeatures.isUnverifiedSessionsAlertEnabled()
+        val unverifiedSessionsAlertLastShownMillis = vectorPreferences.getUnverifiedSessionsAlertLastShownMillis(deviceId)
+        return isUnverifiedSessionsAlertEnabled &&
+                clock.epochMillis() - unverifiedSessionsAlertLastShownMillis >= Config.SHOW_UNVERIFIED_SESSIONS_ALERT_AFTER_MILLIS
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
index 34bdc5fcd3..665498153a 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
@@ -19,35 +19,38 @@ package im.vector.app.features.home
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.MavericksViewModelFactory
-import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import dagger.hilt.EntryPoints
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.SingletonEntryPoint
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.core.session.clientinfo.DeleteUnusedClientInformationUseCase
 import im.vector.app.core.time.Clock
-import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.sample
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
 
 data class UnknownDevicesState(
-        val myMatrixItem: MatrixItem.UserItem? = null,
+        val myMatrixItem: MatrixItem.UserItem,
         val unknownSessions: Async<List<DeviceDetectionInfo>> = Uninitialized
 ) : MavericksState
 
@@ -60,12 +63,17 @@ data class DeviceDetectionInfo(
 class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(
         @Assisted initialState: UnknownDevicesState,
         session: Session,
-        private val vectorPreferences: VectorPreferences,
         clock: Clock,
+        private val shouldShowUnverifiedSessionsAlertUseCase: ShouldShowUnverifiedSessionsAlertUseCase,
+        private val setUnverifiedSessionsAlertShownUseCase: SetUnverifiedSessionsAlertShownUseCase,
+        private val isNewLoginAlertShownUseCase: IsNewLoginAlertShownUseCase,
+        private val setNewLoginAlertShownUseCase: SetNewLoginAlertShownUseCase,
+        private val deleteUnusedClientInformationUseCase: DeleteUnusedClientInformationUseCase,
 ) : VectorViewModel<UnknownDevicesState, UnknownDeviceDetectorSharedViewModel.Action, EmptyViewEvents>(initialState) {
 
     sealed class Action : VectorViewModelAction {
         data class IgnoreDevice(val deviceIds: List<String>) : Action()
+        data class IgnoreNewLogin(val deviceIds: List<String>) : Action()
     }
 
     @AssistedFactory
@@ -73,9 +81,15 @@ class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(
         override fun create(initialState: UnknownDevicesState): UnknownDeviceDetectorSharedViewModel
     }
 
-    companion object : MavericksViewModelFactory<UnknownDeviceDetectorSharedViewModel, UnknownDevicesState> by hiltMavericksViewModelFactory()
+    companion object : MavericksViewModelFactory<UnknownDeviceDetectorSharedViewModel, UnknownDevicesState> by hiltMavericksViewModelFactory() {
+        override fun initialState(viewModelContext: ViewModelContext): UnknownDevicesState {
+            val session = EntryPoints.get(viewModelContext.app(), SingletonEntryPoint::class.java).activeSessionHolder().getActiveSession()
 
-    private val ignoredDeviceList = ArrayList<String>()
+            return UnknownDevicesState(
+                    myMatrixItem = session.getUserOrDefault(session.myUserId).toMatrixItem()
+            )
+        }
+    }
 
     init {
         val currentSessionTs = session.cryptoService().getCryptoDeviceInfo(session.myUserId)
@@ -84,12 +98,6 @@ class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(
                 ?: clock.epochMillis()
         Timber.v("## Detector - Current Session first time seen $currentSessionTs")
 
-        ignoredDeviceList.addAll(
-                vectorPreferences.getUnknownDeviceDismissedList().also {
-                    Timber.v("## Detector - Remembered ignored list $it")
-                }
-        )
-
         combine(
                 session.flow().liveUserCryptoDevices(session.myUserId),
                 session.flow().liveMyDevicesInfo(),
@@ -97,19 +105,24 @@ class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(
         ) { cryptoList, infoList, pInfo ->
             //                    Timber.v("## Detector trigger ${cryptoList.map { "${it.deviceId} ${it.trustLevel}" }}")
 //                    Timber.v("## Detector trigger canCrossSign ${pInfo.get().selfSigned != null}")
+
+            deleteUnusedClientInformation(infoList)
+
             infoList
                     .filter { info ->
-                        // filter verified session, by checking the crypto device info
+                        // filter out verified sessions or those which do not support encryption (i.e. without crypto info)
                         cryptoList.firstOrNull { info.deviceId == it.deviceId }?.isVerified?.not().orFalse()
                     }
                     // filter out ignored devices
-                    .filter { !ignoredDeviceList.contains(it.deviceId) }
+                    .filter { shouldShowUnverifiedSessionsAlertUseCase.execute(it.deviceId) }
                     .sortedByDescending { it.lastSeenTs }
                     .map { deviceInfo ->
                         val deviceKnownSince = cryptoList.firstOrNull { it.deviceId == deviceInfo.deviceId }?.firstTimeSeenLocalTs ?: 0
+                        val isNew = isNewLoginAlertShownUseCase.execute(deviceInfo.deviceId).not() && deviceKnownSince > currentSessionTs
+
                         DeviceDetectionInfo(
                                 deviceInfo,
-                                deviceKnownSince > currentSessionTs + 60_000, // short window to avoid false positive,
+                                isNew,
                                 pInfo.getOrNull()?.selfSigned != null // adding this to pass distinct when cross sign change
                         )
                     }
@@ -118,7 +131,7 @@ class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(
                 .execute { async ->
                     //                    Timber.v("## Detector trigger passed distinct")
                     copy(
-                            myMatrixItem = session.getUser(session.myUserId)?.toMatrixItem(),
+                            myMatrixItem = session.getUserOrDefault(session.myUserId).toMatrixItem(),
                             unknownSessions = async
                     )
                 }
@@ -136,25 +149,20 @@ class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(
         session.cryptoService().fetchDevicesList(NoOpMatrixCallback())
     }
 
-    override fun handle(action: Action) {
-        when (action) {
-            is Action.IgnoreDevice -> {
-                ignoredDeviceList.addAll(action.deviceIds)
-                // local echo
-                withState { state ->
-                    state.unknownSessions.invoke()?.let { detectedSessions ->
-                        val updated = detectedSessions.filter { !action.deviceIds.contains(it.deviceInfo.deviceId) }
-                        setState {
-                            copy(unknownSessions = Success(updated))
-                        }
-                    }
-                }
-            }
+    private fun deleteUnusedClientInformation(deviceFullInfoList: List<DeviceInfo>) {
+        viewModelScope.launch {
+            deleteUnusedClientInformationUseCase.execute(deviceFullInfoList)
         }
     }
 
-    override fun onCleared() {
-        vectorPreferences.storeUnknownDeviceDismissedList(ignoredDeviceList)
-        super.onCleared()
+    override fun handle(action: Action) {
+        when (action) {
+            is Action.IgnoreDevice -> {
+                setUnverifiedSessionsAlertShownUseCase.execute(action.deviceIds)
+            }
+            is Action.IgnoreNewLogin -> {
+                setNewLoginAlertShownUseCase.execute(action.deviceIds)
+            }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt
index 4d44ff775a..c5d7d76322 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -30,11 +31,13 @@ import im.vector.app.features.home.room.detail.RoomDetailSharedAction
 import im.vector.app.features.home.room.detail.RoomDetailSharedActionViewModel
 import javax.inject.Inject
 
-class BreadcrumbsFragment @Inject constructor(
-        private val breadcrumbsController: BreadcrumbsController
-) : VectorBaseFragment<FragmentBreadcrumbsBinding>(),
+@AndroidEntryPoint
+class BreadcrumbsFragment :
+        VectorBaseFragment<FragmentBreadcrumbsBinding>(),
         BreadcrumbsController.Listener {
 
+    @Inject lateinit var breadcrumbsController: BreadcrumbsController
+
     private lateinit var sharedActionViewModel: RoomDetailSharedActionViewModel
     private val breadcrumbsViewModel: BreadcrumbsViewModel by fragmentViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
index cfc9b124d7..a7b2ed6b96 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
@@ -50,7 +50,7 @@ abstract class BreadcrumbsItem : VectorEpoxyModel<BreadcrumbsItem.Holder>(R.layo
         holder.unreadIndentIndicator.isVisible = hasUnreadMessage
         avatarRenderer.render(matrixItem, holder.avatarImageView)
         holder.avatarImageView.contentDescription = matrixItem.getBestName()
-        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State(unreadNotificationCount, showHighlighted))
+        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State.Count(unreadNotificationCount, showHighlighted))
         holder.draftIndentIndicator.isVisible = hasDraft
         holder.typingIndicator.isVisible = hasTypingUsers
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index c1e3b58a80..9fe296e1f9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -20,6 +20,7 @@ import android.net.Uri
 import android.view.View
 import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.features.call.conference.ConferenceEvent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
@@ -119,4 +120,21 @@ sealed class RoomDetailAction : VectorViewModelAction {
     object StopLiveLocationSharing : RoomDetailAction()
 
     object OpenElementCallWidget : RoomDetailAction()
+
+    sealed class VoiceBroadcastAction : RoomDetailAction() {
+        sealed class Recording : VoiceBroadcastAction() {
+            object Start : Recording()
+            object Pause : Recording()
+            object Resume : Recording()
+            object Stop : Recording()
+            object StopConfirmed : Recording()
+        }
+
+        sealed class Listening : VoiceBroadcastAction() {
+            data class PlayOrResume(val voiceBroadcast: VoiceBroadcast) : Listening()
+            object Pause : Listening()
+            object Stop : Listening()
+            data class SeekTo(val voiceBroadcast: VoiceBroadcast, val positionMillis: Int, val duration: Int) : Listening()
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
index 75cda67ce6..2ed3bf8614 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
@@ -18,10 +18,12 @@ package im.vector.app.features.home.room.detail
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.core.view.GravityCompat
+import androidx.core.view.WindowCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -46,6 +48,7 @@ import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.room.RequireActiveMembershipAction
 import im.vector.app.features.room.RequireActiveMembershipViewEvents
 import im.vector.app.features.room.RequireActiveMembershipViewModel
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
@@ -97,9 +100,14 @@ class RoomDetailActivity :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        // For dealing with insets and status bar background color
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        window.statusBarColor = Color.TRANSPARENT
+
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
         waitingView = views.waitingView.waitingView
-        val timelineArgs: TimelineArgs = intent?.extras?.getParcelable(EXTRA_ROOM_DETAIL_ARGS) ?: return
+        val timelineArgs: TimelineArgs = intent?.extras?.getParcelableCompat(EXTRA_ROOM_DETAIL_ARGS) ?: return
         intent.putExtra(Mavericks.KEY_ARG, timelineArgs)
         currentRoomId = timelineArgs.roomId
 
@@ -177,6 +185,7 @@ class RoomDetailActivity :
         if (views.drawerLayout.isDrawerOpen(GravityCompat.START)) {
             views.drawerLayout.closeDrawer(GravityCompat.START)
         } else {
+            @Suppress("DEPRECATION")
             super.onBackPressed()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
index 3af849e965..77dd826cfe 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
@@ -51,7 +51,7 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
     object OpenRoomProfile : RoomDetailViewEvents()
     data class ShowRoomAvatarFullScreen(val matrixItem: MatrixItem?, val view: View?) : RoomDetailViewEvents()
 
-    object ShowWaitingView : RoomDetailViewEvents()
+    data class ShowWaitingView(val text: String? = null) : RoomDetailViewEvents()
     object HideWaitingView : RoomDetailViewEvents()
 
     data class DownloadFileState(
@@ -71,6 +71,8 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
 
     object DisplayEnableIntegrationsWarning : RoomDetailViewEvents()
 
+    object DisplayPromptToStopVoiceBroadcast : RoomDetailViewEvents()
+
     data class OpenStickerPicker(val widget: Widget) : RoomDetailViewEvents()
 
     object OpenIntegrationManager : RoomDetailViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index 7aa7d5a877..897594ffad 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -20,6 +20,7 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.Uninitialized
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
+import im.vector.app.features.share.SharedData
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
@@ -77,6 +78,8 @@ data class RoomDetailViewState(
         val threadNotificationBadgeState: ThreadNotificationBadgeState = ThreadNotificationBadgeState(),
         val typingUsers: List<SenderInfo>? = null,
         val isSharingLiveLocation: Boolean = false,
+        val showKeyboardWhenPresented: Boolean = false,
+        val sharedData: SharedData? = null,
 ) : MavericksState {
 
     constructor(args: TimelineArgs) : this(
@@ -86,7 +89,9 @@ data class RoomDetailViewState(
             // Also highlight the target event, if any
             highlightedEventId = args.eventId,
             switchToParentSpace = args.switchToParentSpace,
-            rootThreadEventId = args.threadTimelineArgs?.rootThreadEventId
+            rootThreadEventId = args.threadTimelineArgs?.rootThreadEventId,
+            showKeyboardWhenPresented = args.threadTimelineArgs?.showKeyboard.orFalse(),
+            sharedData = args.sharedData,
     )
 
     fun isCallOptionAvailable(): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index f164183914..980e8ebac5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -19,40 +19,34 @@ package im.vector.app.features.home.room.detail
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.text.Spannable
-import android.text.format.DateUtils
 import android.text.method.LinkMovementMethod
 import android.view.HapticFeedbackConstants
-import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
-import androidx.annotation.DrawableRes
+import androidx.activity.addCallback
 import androidx.annotation.StringRes
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.net.toUri
-import androidx.core.text.buildSpannedString
 import androidx.core.text.toSpannable
 import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.forEach
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import androidx.fragment.app.setFragmentResultListener
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -62,36 +56,34 @@ import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.OnModelBuildFinishedListener
 import com.airbnb.epoxy.addGlidePreloader
 import com.airbnb.epoxy.glidePreloader
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.vanniktech.emoji.EmojiPopup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.animations.play
 import im.vector.app.core.dialogs.ConfirmationDialogBuilder
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelperFactory
 import im.vector.app.core.epoxy.LayoutManagerStateRestorer
-import im.vector.app.core.error.fatalError
 import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.containsRtLOverride
 import im.vector.app.core.extensions.ensureEndsLeftToRight
 import im.vector.app.core.extensions.filterDirectionOverrides
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.setTextOrHide
-import im.vector.app.core.extensions.showKeyboard
 import im.vector.app.core.extensions.trackItemsVisibilityChange
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.glide.GlideRequests
-import im.vector.app.core.hardware.vibrate
 import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.platform.VectorMenuProvider
-import im.vector.app.core.platform.lifecycleAwareLazy
 import im.vector.app.core.platform.showOptimizedSnackbar
-import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.core.time.Clock
@@ -103,7 +95,6 @@ import im.vector.app.core.ui.views.NotificationAreaView
 import im.vector.app.core.utils.Debouncer
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.core.utils.KeyboardStateUtils
-import im.vector.app.core.utils.PERMISSIONS_FOR_VOICE_MESSAGE
 import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.colorizeMatchingText
@@ -113,7 +104,6 @@ import im.vector.app.core.utils.createUIHandler
 import im.vector.app.core.utils.isAnimationEnabled
 import im.vector.app.core.utils.isValidUrl
 import im.vector.app.core.utils.onPermissionDeniedDialog
-import im.vector.app.core.utils.onPermissionDeniedSnackbar
 import im.vector.app.core.utils.openLocation
 import im.vector.app.core.utils.openUrlInExternalBrowser
 import im.vector.app.core.utils.registerForPermissionsResult
@@ -129,13 +119,7 @@ import im.vector.app.features.VectorFeatures
 import im.vector.app.features.analytics.extensions.toAnalyticsInteraction
 import im.vector.app.features.analytics.plan.Interaction
 import im.vector.app.features.analytics.plan.MobileScreen
-import im.vector.app.features.attachments.AttachmentTypeSelectorView
-import im.vector.app.features.attachments.AttachmentsHelper
-import im.vector.app.features.attachments.ContactAttachment
 import im.vector.app.features.attachments.ShareIntentHandler
-import im.vector.app.features.attachments.preview.AttachmentsPreviewActivity
-import im.vector.app.features.attachments.preview.AttachmentsPreviewArgs
-import im.vector.app.features.attachments.toGroupedContentAttachmentData
 import im.vector.app.features.call.SharedKnownCallsViewModel
 import im.vector.app.features.call.VectorCallActivity
 import im.vector.app.features.call.conference.ConferenceEvent
@@ -143,22 +127,17 @@ import im.vector.app.features.call.conference.ConferenceEventEmitter
 import im.vector.app.features.call.conference.ConferenceEventObserver
 import im.vector.app.features.call.conference.JitsiCallViewModel
 import im.vector.app.features.call.webrtc.WebRtcCallManager
-import im.vector.app.features.command.Command
-import im.vector.app.features.command.ParsedCommand
 import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.detail.composer.CanSendStatus
 import im.vector.app.features.home.room.detail.composer.MessageComposerAction
-import im.vector.app.features.home.room.detail.composer.MessageComposerView
-import im.vector.app.features.home.room.detail.composer.MessageComposerViewEvents
+import im.vector.app.features.home.room.detail.composer.MessageComposerFragment
 import im.vector.app.features.home.room.detail.composer.MessageComposerViewModel
-import im.vector.app.features.home.room.detail.composer.MessageComposerViewState
-import im.vector.app.features.home.room.detail.composer.SendMode
 import im.vector.app.features.home.room.detail.composer.boolean
-import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
-import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
+import im.vector.app.features.home.room.detail.composer.voice.VoiceRecorderFragment
+import im.vector.app.features.home.room.detail.error.RoomNotFound
 import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.action.EventSharedAction
@@ -167,7 +146,6 @@ import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActi
 import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet
 import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
-import im.vector.app.features.home.room.detail.timeline.image.buildImageContentRendererData
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageAudioItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem
@@ -184,7 +162,6 @@ import im.vector.app.features.home.room.detail.widget.RoomWidgetsBottomSheet
 import im.vector.app.features.home.room.threads.ThreadsManager
 import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
 import im.vector.app.features.html.EventHtmlRenderer
-import im.vector.app.features.html.PillImageSpan
 import im.vector.app.features.html.PillsPostProcessor
 import im.vector.app.features.invite.VectorInviteView
 import im.vector.app.features.location.LocationSharingMode
@@ -195,6 +172,7 @@ import im.vector.app.features.media.VideoContentRenderer
 import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.permalink.NavigationInterceptor
+import im.vector.app.features.permalink.PermalinkFactory
 import im.vector.app.features.permalink.PermalinkHandler
 import im.vector.app.features.poll.PollMode
 import im.vector.app.features.reactions.EmojiReactionPickerActivity
@@ -202,25 +180,19 @@ import im.vector.app.features.roomprofile.RoomProfileActivity
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
-import im.vector.app.features.share.SharedData
 import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
 import im.vector.app.features.themes.ThemeUtils
-import im.vector.app.features.voice.VoiceFailure
 import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgs
 import im.vector.app.features.widgets.WidgetKind
 import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.billcarsonfr.jsonviewer.JSonViewerDialog
-import org.commonmark.parser.Parser
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.content.WithHeldCode
@@ -229,11 +201,8 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageLocationContent
-import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
@@ -242,86 +211,56 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachme
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
-import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.api.util.toMatrixItem
-import reactivecircus.flowbinding.android.view.focusChanges
-import reactivecircus.flowbinding.android.widget.textChanges
 import timber.log.Timber
 import java.net.URL
 import java.util.UUID
 import javax.inject.Inject
 
-class TimelineFragment @Inject constructor(
-        private val session: Session,
-        private val avatarRenderer: AvatarRenderer,
-        private val timelineEventController: TimelineEventController,
-        autoCompleterFactory: AutoCompleter.Factory,
-        private val permalinkHandler: PermalinkHandler,
-        private val notificationDrawerManager: NotificationDrawerManager,
-        private val eventHtmlRenderer: EventHtmlRenderer,
-        private val vectorPreferences: VectorPreferences,
-        private val threadsManager: ThreadsManager,
-        private val colorProvider: ColorProvider,
-        private val dimensionConverter: DimensionConverter,
-        private val userPreferencesProvider: UserPreferencesProvider,
-        private val notificationUtils: NotificationUtils,
-        private val matrixItemColorProvider: MatrixItemColorProvider,
-        private val imageContentRenderer: ImageContentRenderer,
-        private val roomDetailPendingActionStore: RoomDetailPendingActionStore,
-        private val pillsPostProcessorFactory: PillsPostProcessor.Factory,
-        private val callManager: WebRtcCallManager,
-        private val audioMessagePlaybackTracker: AudioMessagePlaybackTracker,
-        private val shareIntentHandler: ShareIntentHandler,
-        private val clock: Clock,
-        private val vectorFeatures: VectorFeatures,
-        private val buildMeta: BuildMeta,
-) :
+@AndroidEntryPoint
+class TimelineFragment :
         VectorBaseFragment<FragmentTimelineBinding>(),
         TimelineEventController.Callback,
         VectorInviteView.Callback,
-        AttachmentTypeSelectorView.Callback,
-        AttachmentsHelper.Callback,
         GalleryOrCameraDialogHelper.Listener,
         CurrentCallsView.Callback,
         VectorMenuProvider {
 
+    @Inject lateinit var session: Session
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var timelineEventController: TimelineEventController
+    @Inject lateinit var permalinkHandler: PermalinkHandler
+    @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
+    @Inject lateinit var eventHtmlRenderer: EventHtmlRenderer
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var threadsManager: ThreadsManager
+    @Inject lateinit var colorProvider: ColorProvider
+    @Inject lateinit var dimensionConverter: DimensionConverter
+    @Inject lateinit var userPreferencesProvider: UserPreferencesProvider
+    @Inject lateinit var notificationUtils: NotificationUtils
+    @Inject lateinit var matrixItemColorProvider: MatrixItemColorProvider
+    @Inject lateinit var imageContentRenderer: ImageContentRenderer
+    @Inject lateinit var roomDetailPendingActionStore: RoomDetailPendingActionStore
+    @Inject lateinit var pillsPostProcessorFactory: PillsPostProcessor.Factory
+    @Inject lateinit var callManager: WebRtcCallManager
+    @Inject lateinit var audioMessagePlaybackTracker: AudioMessagePlaybackTracker
+    @Inject lateinit var shareIntentHandler: ShareIntentHandler
+    @Inject lateinit var clock: Clock
+    @Inject lateinit var vectorFeatures: VectorFeatures
+    @Inject lateinit var galleryOrCameraDialogHelperFactory: GalleryOrCameraDialogHelperFactory
+    @Inject lateinit var permalinkFactory: PermalinkFactory
+
     companion object {
-
-        /**
-         * Sanitize the display name.
-         *
-         * @param displayName the display name to sanitize
-         * @return the sanitized display name
-         */
-        private fun sanitizeDisplayName(displayName: String): String {
-            if (displayName.endsWith(ircPattern)) {
-                return displayName.substring(0, displayName.length - ircPattern.length)
-            }
-
-            return displayName
-        }
-
         const val MAX_TYPING_MESSAGE_USERS_COUNT = 4
-        private const val ircPattern = " (IRC)"
     }
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
+    private lateinit var galleryOrCameraDialogHelper: GalleryOrCameraDialogHelper
 
     private val timelineArgs: TimelineArgs by args()
-    private val glideRequests by lazy {
-        GlideApp.with(this)
-    }
-    private val pillsPostProcessor by lazy {
-        pillsPostProcessorFactory.create(timelineArgs.roomId)
-    }
-
-    private val autoCompleter: AutoCompleter by lazy {
-        autoCompleterFactory.create(timelineArgs.roomId, isThreadTimeLine())
-    }
 
     private val timelineViewModel: TimelineViewModel by fragmentViewModel()
     private val messageComposerViewModel: MessageComposerViewModel by fragmentViewModel()
@@ -345,28 +284,34 @@ class TimelineFragment @Inject constructor(
     private lateinit var jumpToBottomViewVisibilityManager: JumpToBottomViewVisibilityManager
     private var modelBuildListener: OnModelBuildFinishedListener? = null
 
-    private lateinit var attachmentsHelper: AttachmentsHelper
     private lateinit var keyboardStateUtils: KeyboardStateUtils
     private lateinit var callActionsHandler: StartCallActionsHandler
 
-    private lateinit var attachmentTypeSelector: AttachmentTypeSelectorView
-
-    private var lockSendButton = false
     private val currentCallsViewPresenter = CurrentCallsViewPresenter()
 
     private val lazyLoadedViews = RoomDetailLazyLoadedViews()
-    private val emojiPopup: EmojiPopup by lifecycleAwareLazy {
-        createEmojiPopup()
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         analyticsScreenName = MobileScreen.ScreenName.Room
+        galleryOrCameraDialogHelper = galleryOrCameraDialogHelperFactory.create(this)
         setFragmentResultListener(MigrateRoomBottomSheet.REQUEST_KEY) { _, bundle ->
             bundle.getString(MigrateRoomBottomSheet.BUNDLE_KEY_REPLACEMENT_ROOM)?.let { replacementRoomId ->
                 timelineViewModel.handle(RoomDetailAction.RoomUpgradeSuccess(replacementRoomId))
             }
         }
+
+        if (childFragmentManager.findFragmentById(R.id.composerContainer) == null) {
+            childFragmentManager.commitTransaction {
+                replace(R.id.composerContainer, MessageComposerFragment())
+            }
+        }
+
+        if (childFragmentManager.findFragmentById(R.id.voiceMessageRecorderContainer) == null) {
+            childFragmentManager.commitTransaction {
+                replace(R.id.voiceMessageRecorderContainer, VoiceRecorderFragment())
+            }
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -375,7 +320,6 @@ class TimelineFragment @Inject constructor(
         sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
         sharedActivityActionViewModel = activityViewModelProvider.get(RoomDetailSharedActionViewModel::class.java)
         knownCallsViewModel = activityViewModelProvider.get(SharedKnownCallsViewModel::class.java)
-        attachmentsHelper = AttachmentsHelper(requireContext(), this, buildMeta).register()
         callActionsHandler = StartCallActionsHandler(
                 roomId = timelineArgs.roomId,
                 fragment = this,
@@ -391,15 +335,13 @@ class TimelineFragment @Inject constructor(
         setupToolbar(views.roomToolbar)
                 .allowBack()
         setupRecyclerView()
-        setupComposer()
         setupNotificationView()
         setupJumpToReadMarkerView()
         setupActiveCallView()
         setupJumpToBottomView()
-        setupEmojiButton()
         setupRemoveJitsiWidgetView()
-        setupVoiceMessageView()
         setupLiveLocationIndicator()
+        setupBackPressHandling()
 
         views.includeRoomToolbar.roomToolbarContentView.debouncedClicks {
             navigator.openRoomProfile(requireActivity(), timelineArgs.roomId)
@@ -423,19 +365,6 @@ class TimelineFragment @Inject constructor(
             updateJumpToReadMarkerViewVisibility()
         }
 
-        messageComposerViewModel.onEach(MessageComposerViewState::sendMode, MessageComposerViewState::canSendMessage) { mode, canSend ->
-            if (!canSend.boolean()) {
-                return@onEach
-            }
-            when (mode) {
-                is SendMode.Regular -> renderRegularMode(mode.text)
-                is SendMode.Edit -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_edit, R.string.edit, mode.text)
-                is SendMode.Quote -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.action_quote, mode.text)
-                is SendMode.Reply -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_reply, R.string.reply, mode.text)
-                is SendMode.Voice -> renderVoiceMessageMode(mode.text)
-            }
-        }
-
         timelineViewModel.onEach(
                 RoomDetailViewState::syncState,
                 RoomDetailViewState::incrementalSyncRequestState,
@@ -449,24 +378,6 @@ class TimelineFragment @Inject constructor(
             )
         }
 
-        messageComposerViewModel.observeViewEvents {
-            when (it) {
-                is MessageComposerViewEvents.JoinRoomCommandSuccess -> handleJoinedToAnotherRoom(it)
-                is MessageComposerViewEvents.SlashCommandConfirmationRequest -> handleSlashCommandConfirmationRequest(it)
-                is MessageComposerViewEvents.SendMessageResult -> renderSendMessageResult(it)
-                is MessageComposerViewEvents.ShowMessage -> showSnackWithMessage(it.message)
-                is MessageComposerViewEvents.ShowRoomUpgradeDialog -> handleShowRoomUpgradeDialog(it)
-                is MessageComposerViewEvents.AnimateSendButtonVisibility -> handleSendButtonVisibilityChanged(it)
-                is MessageComposerViewEvents.OpenRoomMemberProfile -> openRoomMemberProfile(it.userId)
-                is MessageComposerViewEvents.VoicePlaybackOrRecordingFailure -> {
-                    if (it.throwable is VoiceFailure.UnableToRecord) {
-                        onCannotRecord()
-                    }
-                    showErrorInSnackbar(it.throwable)
-                }
-            }
-        }
-
         timelineViewModel.observeViewEvents {
             when (it) {
                 is RoomDetailViewEvents.Failure -> displayErrorMessage(it)
@@ -486,11 +397,11 @@ class TimelineFragment @Inject constructor(
                 is RoomDetailViewEvents.ShowInfoOkDialog -> showDialogWithMessage(it.message)
                 is RoomDetailViewEvents.JoinJitsiConference -> joinJitsiRoom(it.widget, it.withVideo)
                 RoomDetailViewEvents.LeaveJitsiConference -> leaveJitsiConference()
-                RoomDetailViewEvents.ShowWaitingView -> vectorBaseActivity.showWaitingView()
+                is RoomDetailViewEvents.ShowWaitingView -> vectorBaseActivity.showWaitingView(it.text)
                 RoomDetailViewEvents.HideWaitingView -> vectorBaseActivity.hideWaitingView()
                 is RoomDetailViewEvents.RequestNativeWidgetPermission -> requestNativeWidgetPermission(it)
                 is RoomDetailViewEvents.OpenRoom -> handleOpenRoom(it)
-                RoomDetailViewEvents.OpenInvitePeople -> navigator.openInviteUsersToRoom(requireContext(), timelineArgs.roomId)
+                RoomDetailViewEvents.OpenInvitePeople -> navigator.openInviteUsersToRoom(requireActivity(), timelineArgs.roomId)
                 RoomDetailViewEvents.OpenSetRoomAvatarDialog -> galleryOrCameraDialogHelper.show()
                 RoomDetailViewEvents.OpenRoomSettings -> handleOpenRoomSettings(RoomProfileActivity.EXTRA_DIRECT_ACCESS_ROOM_SETTINGS)
                 RoomDetailViewEvents.OpenRoomProfile -> handleOpenRoomSettings()
@@ -502,52 +413,29 @@ class TimelineFragment @Inject constructor(
                 is RoomDetailViewEvents.DisplayAndAcceptCall -> acceptIncomingCall(it)
                 RoomDetailViewEvents.RoomReplacementStarted -> handleRoomReplacement()
                 RoomDetailViewEvents.OpenElementCallWidget -> handleOpenElementCallWidget()
+                RoomDetailViewEvents.DisplayPromptToStopVoiceBroadcast -> displayPromptToStopVoiceBroadcast()
             }
         }
 
-        if (savedInstanceState == null) {
-            handleShareData()
-            handleSpaceShare()
+        ViewCompat.setOnApplyWindowInsetsListener(views.coordinatorLayout) { _, insets ->
+            val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime() or WindowInsetsCompat.Type.systemBars())
+            views.appBarLayout.updatePadding(top = imeInsets.top)
+            views.voiceMessageRecorderContainer.updatePadding(bottom = imeInsets.bottom)
+            insets
         }
     }
 
-    private fun handleSlashCommandConfirmationRequest(action: MessageComposerViewEvents.SlashCommandConfirmationRequest) {
-        when (action.parsedCommand) {
-            is ParsedCommand.UnignoreUser -> promptUnignoreUser(action.parsedCommand)
-            else -> TODO("Add case for ${action.parsedCommand.javaClass.simpleName}")
-        }
-        lockSendButton = false
-    }
-
-    private fun promptUnignoreUser(command: ParsedCommand.UnignoreUser) {
-        MaterialAlertDialogBuilder(requireActivity())
-                .setTitle(R.string.room_participants_action_unignore_title)
-                .setMessage(getString(R.string.settings_unignore_user, command.userId))
-                .setPositiveButton(R.string.unignore) { _, _ ->
-                    messageComposerViewModel.handle(MessageComposerAction.SlashCommandConfirmed(command))
+    private fun setupBackPressHandling() {
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            withState(messageComposerViewModel) { state ->
+                if (state.isFullScreen) {
+                    messageComposerViewModel.handle(MessageComposerAction.SetFullScreen(false))
+                } else {
+                    remove() // Remove callback to avoid infinite loop
+                    @Suppress("DEPRECATION")
+                    requireActivity().onBackPressed()
                 }
-                .setNegativeButton(R.string.action_cancel, null)
-                .show()
-    }
-
-    private fun renderVoiceMessageMode(content: String) {
-        ContentAttachmentData.fromJsonString(content)?.let { audioAttachmentData ->
-            views.voiceMessageRecorderView.isVisible = true
-            messageComposerViewModel.handle(MessageComposerAction.InitializeVoiceRecorder(audioAttachmentData))
-        }
-    }
-
-    private fun handleSendButtonVisibilityChanged(event: MessageComposerViewEvents.AnimateSendButtonVisibility) {
-        if (event.isVisible) {
-            views.voiceMessageRecorderView.isVisible = false
-            views.composerLayout.views.sendButton.alpha = 0f
-            views.composerLayout.views.sendButton.isVisible = true
-            views.composerLayout.views.sendButton.animate().alpha(1f).setDuration(150).start()
-        } else {
-            views.composerLayout.views.sendButton.isInvisible = true
-            views.voiceMessageRecorderView.alpha = 0f
-            views.voiceMessageRecorderView.isVisible = true
-            views.voiceMessageRecorderView.animate().alpha(1f).setDuration(150).start()
+            }
         }
     }
 
@@ -571,11 +459,6 @@ class TimelineFragment @Inject constructor(
         timelineViewModel.handle(RoomDetailAction.UpdateJoinJitsiCallStatus(conferenceEvent))
     }
 
-    private fun onCannotRecord() {
-        // Update the UI, cancel the animation
-        messageComposerViewModel.handle(MessageComposerAction.OnVoiceRecordingUiStateChanged(RecordingUiState.Idle))
-    }
-
     private fun acceptIncomingCall(event: RoomDetailViewEvents.DisplayAndAcceptCall) {
         val intent = VectorCallActivity.newIntent(
                 context = vectorBaseActivity,
@@ -592,12 +475,6 @@ class TimelineFragment @Inject constructor(
         JoinReplacementRoomBottomSheet().show(childFragmentManager, tag)
     }
 
-    private fun handleShowRoomUpgradeDialog(roomDetailViewEvents: MessageComposerViewEvents.ShowRoomUpgradeDialog) {
-        val tag = MigrateRoomBottomSheet::javaClass.name
-        MigrateRoomBottomSheet.newInstance(timelineArgs.roomId, roomDetailViewEvents.newVersion)
-                .show(parentFragmentManager, tag)
-    }
-
     private fun handleChatEffect(chatEffect: ChatEffect) {
         if (!requireContext().isAnimationEnabled()) {
             Timber.d("Do not perform chat effect, animations are disabled.")
@@ -714,52 +591,6 @@ class TimelineFragment @Inject constructor(
         )
     }
 
-    private fun setupEmojiButton() {
-        views.composerLayout.views.composerEmojiButton.debouncedClicks {
-            emojiPopup.toggle()
-        }
-    }
-
-    private fun createEmojiPopup(): EmojiPopup {
-        return EmojiPopup(
-                rootView = views.rootConstraintLayout,
-                keyboardAnimationStyle = R.style.emoji_fade_animation_style,
-                onEmojiPopupShownListener = {
-                    views.composerLayout.views.composerEmojiButton.apply {
-                        contentDescription = getString(R.string.a11y_close_emoji_picker)
-                        setImageResource(R.drawable.ic_keyboard)
-                    }
-                },
-                onEmojiPopupDismissListener = lifecycleAwareDismissAction {
-                    views.composerLayout.views.composerEmojiButton.apply {
-                        contentDescription = getString(R.string.a11y_open_emoji_picker)
-                        setImageResource(R.drawable.ic_insert_emoji)
-                    }
-                },
-                editText = views.composerLayout.views.composerEditText
-        )
-    }
-
-    /**
-     *  Ensure dismiss actions only trigger when the fragment is in the started state.
-     *  EmojiPopup by default dismisses onViewDetachedFromWindow, this can cause race conditions with onDestroyView.
-     */
-    private fun lifecycleAwareDismissAction(action: () -> Unit): () -> Unit {
-        return {
-            if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
-                action()
-            }
-        }
-    }
-
-    private val permissionVoiceMessageLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
-        if (allGranted) {
-            // In this case, let the user start again the gesture
-        } else if (deniedPermanently) {
-            vectorBaseActivity.onPermissionDeniedSnackbar(R.string.denied_permission_voice_message)
-        }
-    }
-
     private fun createFailedMessagesWarningCallback(): FailedMessagesWarningView.Callback {
         return object : FailedMessagesWarningView.Callback {
             override fun onDeleteAllClicked() {
@@ -779,86 +610,6 @@ class TimelineFragment @Inject constructor(
         }
     }
 
-    private fun setupVoiceMessageView() {
-        audioMessagePlaybackTracker.track(AudioMessagePlaybackTracker.RECORDING_ID, views.voiceMessageRecorderView)
-        views.voiceMessageRecorderView.callback = object : VoiceMessageRecorderView.Callback {
-
-            override fun onVoiceRecordingStarted() {
-                if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
-                    messageComposerViewModel.handle(MessageComposerAction.StartRecordingVoiceMessage)
-                    vibrate(requireContext())
-                    updateRecordingUiState(RecordingUiState.Recording(clock.epochMillis()))
-                }
-            }
-
-            override fun onVoicePlaybackButtonClicked() {
-                messageComposerViewModel.handle(MessageComposerAction.PlayOrPauseRecordingPlayback)
-            }
-
-            override fun onVoiceRecordingCancelled() {
-                messageComposerViewModel.handle(MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true, rootThreadEventId = getRootThreadEventId()))
-                vibrate(requireContext())
-                updateRecordingUiState(RecordingUiState.Idle)
-            }
-
-            override fun onVoiceRecordingLocked() {
-                val startedState = withState(messageComposerViewModel) { it.voiceRecordingUiState as? RecordingUiState.Recording }
-                val startTime = startedState?.recordingStartTimestamp ?: clock.epochMillis()
-                updateRecordingUiState(RecordingUiState.Locked(startTime))
-            }
-
-            override fun onVoiceRecordingEnded() {
-                onSendVoiceMessage()
-            }
-
-            override fun onSendVoiceMessage() {
-                messageComposerViewModel.handle(
-                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = false, rootThreadEventId = getRootThreadEventId())
-                )
-                updateRecordingUiState(RecordingUiState.Idle)
-            }
-
-            override fun onDeleteVoiceMessage() {
-                messageComposerViewModel.handle(
-                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true, rootThreadEventId = getRootThreadEventId())
-                )
-                updateRecordingUiState(RecordingUiState.Idle)
-            }
-
-            override fun onRecordingLimitReached() {
-                messageComposerViewModel.handle(
-                        MessageComposerAction.PauseRecordingVoiceMessage
-                )
-                updateRecordingUiState(RecordingUiState.Draft)
-            }
-
-            override fun onRecordingWaveformClicked() {
-                messageComposerViewModel.handle(
-                        MessageComposerAction.PauseRecordingVoiceMessage
-                )
-                updateRecordingUiState(RecordingUiState.Draft)
-            }
-
-            override fun onVoiceWaveformTouchedUp(percentage: Float, duration: Int) {
-                messageComposerViewModel.handle(
-                        MessageComposerAction.VoiceWaveformTouchedUp(AudioMessagePlaybackTracker.RECORDING_ID, duration, percentage)
-                )
-            }
-
-            override fun onVoiceWaveformMoved(percentage: Float, duration: Int) {
-                messageComposerViewModel.handle(
-                        MessageComposerAction.VoiceWaveformTouchedUp(AudioMessagePlaybackTracker.RECORDING_ID, duration, percentage)
-                )
-            }
-
-            private fun updateRecordingUiState(state: RecordingUiState) {
-                messageComposerViewModel.handle(
-                        MessageComposerAction.OnVoiceRecordingUiStateChanged(state)
-                )
-            }
-        }
-    }
-
     private fun setupLiveLocationIndicator() {
         views.liveLocationStatusIndicator.stopButton.debouncedClicks {
             timelineViewModel.handle(RoomDetailAction.StopLiveLocationSharing)
@@ -936,25 +687,6 @@ class TimelineFragment @Inject constructor(
                 .show()
     }
 
-    private fun handleJoinedToAnotherRoom(action: MessageComposerViewEvents.JoinRoomCommandSuccess) {
-        views.composerLayout.setTextIfDifferent("")
-        lockSendButton = false
-        navigator.openRoom(vectorBaseActivity, action.roomId)
-    }
-
-    private fun handleShareData() {
-        when (val sharedData = timelineArgs.sharedData) {
-            is SharedData.Text -> {
-                messageComposerViewModel.handle(MessageComposerAction.EnterRegularMode(sharedData.text, fromSharing = true))
-            }
-            is SharedData.Attachments -> {
-                // open share edition
-                onContentAttachmentsReady(sharedData.attachmentData)
-            }
-            null -> Timber.v("No share data to process")
-        }
-    }
-
     private fun handleSpaceShare() {
         timelineArgs.openShareSpaceForId?.let { spaceId ->
             ShareSpaceBottomSheet.show(childFragmentManager, spaceId, true)
@@ -965,13 +697,11 @@ class TimelineFragment @Inject constructor(
     }
 
     override fun onDestroyView() {
-        messageComposerViewModel.endAllVoiceActions()
         lazyLoadedViews.unBind()
         timelineEventController.callback = null
         timelineEventController.removeModelBuildListener(modelBuildListener)
         currentCallsViewPresenter.unBind()
         modelBuildListener = null
-        autoCompleter.clear()
         debouncer.cancelAll()
         views.timelineRecyclerView.cleanup()
         super.onDestroyView()
@@ -987,9 +717,9 @@ class TimelineFragment @Inject constructor(
         views.jumpToBottomView.debouncedClicks {
             timelineViewModel.handle(RoomDetailAction.ExitTrackingUnreadMessagesState)
             views.jumpToBottomView.visibility = View.INVISIBLE
-            if (!timelineViewModel.timeline.isLive) {
+            if (timelineViewModel.timeline?.isLive == false) {
                 scrollOnNewMessageCallback.forceScrollOnNextUpdate()
-                timelineViewModel.timeline.restartWithEventId(null)
+                timelineViewModel.timeline?.restartWithEventId(null)
             } else {
                 layoutManager.scrollToPosition(0)
             }
@@ -1067,7 +797,7 @@ class TimelineFragment @Inject constructor(
         }
         // We use a custom layout for this menu item, so we need to set a ClickListener
         menu.findItem(R.id.open_matrix_apps)?.let { menuItem ->
-            menuItem.actionView.debouncedClicks {
+            menuItem.actionView?.debouncedClicks {
                 handleMenuItemSelected(menuItem)
             }
         }
@@ -1078,7 +808,7 @@ class TimelineFragment @Inject constructor(
 
         // Custom thread notification menu item
         menu.findItem(R.id.menu_timeline_thread_list)?.let { menuItem ->
-            menuItem.actionView.debouncedClicks {
+            menuItem.actionView?.debouncedClicks {
                 handleMenuItemSelected(menuItem)
             }
         }
@@ -1107,16 +837,17 @@ class TimelineFragment @Inject constructor(
                 // icon should be default color no badge
                 val actionView = matrixAppsMenuItem.actionView
                 actionView
-                        .findViewById<ImageView>(R.id.action_view_icon_image)
-                        .setColorFilter(ThemeUtils.getColor(requireContext(), R.attr.vctr_content_secondary))
-                actionView.findViewById<TextView>(R.id.cart_badge).isVisible = false
+                        ?.findViewById<ImageView>(R.id.action_view_icon_image)
+                        ?.setColorFilter(ThemeUtils.getColor(requireContext(), R.attr.vctr_content_secondary))
+                actionView?.findViewById<TextView>(R.id.cart_badge)?.isVisible = false
                 matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
             } else {
                 val actionView = matrixAppsMenuItem.actionView
                 actionView
-                        .findViewById<ImageView>(R.id.action_view_icon_image)
-                        .setColorFilter(colorProvider.getColorFromAttribute(R.attr.colorPrimary))
-                actionView.findViewById<TextView>(R.id.cart_badge).setTextOrHide("$widgetsCount")
+                        ?.findViewById<ImageView>(R.id.action_view_icon_image)
+                        ?.setColorFilter(colorProvider.getColorFromAttribute(R.attr.colorPrimary))
+                actionView?.findViewById<TextView>(R.id.cart_badge)?.setTextOrHide("$widgetsCount")
+                @Suppress("AlwaysShowAction")
                 matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
             }
 
@@ -1161,7 +892,7 @@ class TimelineFragment @Inject constructor(
             }
             R.id.menu_thread_timeline_copy_link -> {
                 getRootThreadEventId()?.let {
-                    val permalink = session.permalinkService().createPermalink(timelineArgs.roomId, it)
+                    val permalink = permalinkFactory.createPermalink(timelineArgs.roomId, it)
                     copyToClipboard(requireContext(), permalink, false)
                     showSnackWithMessage(getString(R.string.copied_to_clipboard))
                 }
@@ -1173,7 +904,7 @@ class TimelineFragment @Inject constructor(
             }
             R.id.menu_thread_timeline_share -> {
                 getRootThreadEventId()?.let {
-                    val permalink = session.permalinkService().createPermalink(timelineArgs.roomId, it)
+                    val permalink = permalinkFactory.createPermalink(timelineArgs.roomId, it)
                     shareText(requireContext(), permalink)
                 }
                 true
@@ -1187,7 +918,7 @@ class TimelineFragment @Inject constructor(
      */
     private fun updateMenuThreadNotificationBadge(menu: Menu, state: RoomDetailViewState) {
         val menuThreadList = menu.findItem(R.id.menu_timeline_thread_list).actionView
-        val badgeFrameLayout = menuThreadList.findViewById<FrameLayout>(R.id.threadNotificationBadgeFrameLayout)
+        val badgeFrameLayout = menuThreadList?.findViewById<FrameLayout>(R.id.threadNotificationBadgeFrameLayout) ?: return
         val badgeTextView = menuThreadList.findViewById<TextView>(R.id.threadNotificationBadgeTextView)
 
         val unreadThreadMessages = state.threadNotificationBadgeState.numberOfLocalUnreadThreads
@@ -1219,12 +950,12 @@ class TimelineFragment @Inject constructor(
         }
     }
 
-    private fun handleSearchAction() {
+    private fun handleSearchAction() = withState(timelineViewModel) { state ->
         navigator.openSearch(
                 context = requireContext(),
                 roomId = timelineArgs.roomId,
-                roomDisplayName = timelineViewModel.getRoomSummary()?.displayName,
-                roomAvatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl
+                roomDisplayName = state.asyncRoomSummary()?.displayName,
+                roomAvatarUrl = state.asyncRoomSummary()?.avatarUrl
         )
     }
 
@@ -1239,87 +970,13 @@ class TimelineFragment @Inject constructor(
                 .show()
     }
 
-    private fun renderRegularMode(content: String) {
-        autoCompleter.exitSpecialMode()
-        views.composerLayout.collapse()
-        views.composerLayout.setTextIfDifferent(content)
-        views.composerLayout.views.sendButton.contentDescription = getString(R.string.action_send)
-    }
-
-    private fun renderSpecialMode(
-            event: TimelineEvent,
-            @DrawableRes iconRes: Int,
-            @StringRes descriptionRes: Int,
-            defaultContent: String
-    ) {
-        autoCompleter.enterSpecialMode()
-        // switch to expanded bar
-        views.composerLayout.views.composerRelatedMessageTitle.apply {
-            text = event.senderInfo.disambiguatedDisplayName
-            setTextColor(matrixItemColorProvider.getColor(MatrixItem.UserItem(event.root.senderId ?: "@")))
-        }
-
-        val messageContent: MessageContent? = event.getLastMessageContent()
-        val nonFormattedBody = when (messageContent) {
-            is MessageAudioContent -> getAudioContentBodyText(messageContent)
-            is MessagePollContent -> messageContent.getBestPollCreationInfo()?.question?.getBestQuestion()
-            is MessageBeaconInfoContent -> getString(R.string.live_location_description)
-            else -> messageContent?.body.orEmpty()
-        }
-        var formattedBody: CharSequence? = null
-        if (messageContent is MessageTextContent && messageContent.format == MessageFormat.FORMAT_MATRIX_HTML) {
-            val parser = Parser.builder().build()
-            val document = parser.parse(messageContent.formattedBody ?: messageContent.body)
-            formattedBody = eventHtmlRenderer.render(document, pillsPostProcessor)
-        }
-        views.composerLayout.views.composerRelatedMessageContent.text = (formattedBody ?: nonFormattedBody)
-
-        // Image Event
-        val data = event.buildImageContentRendererData(dimensionConverter.dpToPx(66))
-        val isImageVisible = if (data != null) {
-            imageContentRenderer.render(data, ImageContentRenderer.Mode.THUMBNAIL, views.composerLayout.views.composerRelatedMessageImage)
-            true
-        } else {
-            imageContentRenderer.clear(views.composerLayout.views.composerRelatedMessageImage)
-            false
-        }
-
-        views.composerLayout.views.composerRelatedMessageImage.isVisible = isImageVisible
-
-        views.composerLayout.setTextIfDifferent(defaultContent)
-
-        views.composerLayout.views.composerRelatedMessageActionIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), iconRes))
-        views.composerLayout.views.sendButton.contentDescription = getString(descriptionRes)
-
-        avatarRenderer.render(event.senderInfo.toMatrixItem(), views.composerLayout.views.composerRelatedMessageAvatar)
-
-        views.composerLayout.expand {
-            if (isAdded) {
-                // need to do it here also when not using quick reply
-                focusComposerAndShowKeyboard()
-                views.composerLayout.views.composerRelatedMessageImage.isVisible = isImageVisible
-            }
-        }
-        focusComposerAndShowKeyboard()
-    }
-
-    private fun getAudioContentBodyText(messageContent: MessageAudioContent): String {
-        val formattedDuration = DateUtils.formatElapsedTime(((messageContent.audioInfo?.duration ?: 0) / 1000).toLong())
-        return if (messageContent.voiceMessageIndicator != null) {
-            getString(R.string.voice_message_reply_content, formattedDuration)
-        } else {
-            getString(R.string.audio_message_reply_content, messageContent.body, formattedDuration)
-        }
-    }
-
     override fun onResume() {
         super.onResume()
         notificationDrawerManager.setCurrentRoom(timelineArgs.roomId)
+        notificationDrawerManager.setCurrentThread(timelineArgs.threadTimelineArgs?.rootThreadEventId)
         roomDetailPendingActionStore.data?.let { handlePendingAction(it) }
         roomDetailPendingActionStore.data = null
-
-        // Removed listeners should be set again
-        setupVoiceMessageView()
+        views.timelineRecyclerView.adapter = timelineEventController.adapter
     }
 
     private fun handlePendingAction(roomDetailPendingAction: RoomDetailPendingAction) {
@@ -1328,7 +985,7 @@ class TimelineFragment @Inject constructor(
             is RoomDetailPendingAction.JumpToReadReceipt ->
                 timelineViewModel.handle(RoomDetailAction.JumpToReadReceipt(roomDetailPendingAction.userId))
             is RoomDetailPendingAction.MentionUser ->
-                insertUserDisplayNameInTextEditor(roomDetailPendingAction.userId)
+                messageComposerViewModel.handle(MessageComposerAction.InsertUserDisplayName(roomDetailPendingAction.userId))
             is RoomDetailPendingAction.OpenRoom ->
                 handleOpenRoom(RoomDetailViewEvents.OpenRoom(roomDetailPendingAction.roomId, roomDetailPendingAction.closeCurrentRoom))
         }
@@ -1337,52 +994,8 @@ class TimelineFragment @Inject constructor(
     override fun onPause() {
         super.onPause()
         notificationDrawerManager.setCurrentRoom(null)
-        audioMessagePlaybackTracker.pauseAllPlaybacks()
-
-        if (withState(messageComposerViewModel) { it.isVoiceRecording } && requireActivity().isChangingConfigurations) {
-            // we're rotating, maintain any active recordings
-        } else {
-            messageComposerViewModel.handle(MessageComposerAction.OnEntersBackground(views.composerLayout.text.toString()))
-        }
-    }
-
-    private val attachmentFileActivityResultLauncher = registerStartForActivityResult {
-        if (it.resultCode == Activity.RESULT_OK) {
-            attachmentsHelper.onFileResult(it.data)
-        }
-    }
-
-    private val attachmentContactActivityResultLauncher = registerStartForActivityResult {
-        if (it.resultCode == Activity.RESULT_OK) {
-            attachmentsHelper.onContactResult(it.data)
-        }
-    }
-
-    private val attachmentMediaActivityResultLauncher = registerStartForActivityResult {
-        if (it.resultCode == Activity.RESULT_OK) {
-            attachmentsHelper.onMediaResult(it.data)
-        }
-    }
-
-    private val attachmentCameraActivityResultLauncher = registerStartForActivityResult {
-        if (it.resultCode == Activity.RESULT_OK) {
-            attachmentsHelper.onCameraResult()
-        }
-    }
-
-    private val attachmentCameraVideoActivityResultLauncher = registerStartForActivityResult {
-        if (it.resultCode == Activity.RESULT_OK) {
-            attachmentsHelper.onCameraVideoResult()
-        }
-    }
-
-    private val contentAttachmentActivityResultLauncher = registerStartForActivityResult { activityResult ->
-        val data = activityResult.data ?: return@registerStartForActivityResult
-        if (activityResult.resultCode == Activity.RESULT_OK) {
-            val sendData = AttachmentsPreviewActivity.getOutput(data)
-            val keepOriginalSize = AttachmentsPreviewActivity.getKeepOriginalSize(data)
-            timelineViewModel.handle(RoomDetailAction.SendMedia(sendData, !keepOriginalSize))
-        }
+        notificationDrawerManager.setCurrentThread(null)
+        views.timelineRecyclerView.adapter = null
     }
 
     private val emojiActivityResultLauncher = registerStartForActivityResult { activityResult ->
@@ -1426,8 +1039,8 @@ class TimelineFragment @Inject constructor(
         timelineEventController.timeline = timelineViewModel.timeline
 
         views.timelineRecyclerView.trackItemsVisibilityChange()
-        layoutManager = object : LinearLayoutManager(context, RecyclerView.VERTICAL, true) {
-            override fun onLayoutCompleted(state: RecyclerView.State?) {
+        layoutManager = object : LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, true) {
+            override fun onLayoutCompleted(state: RecyclerView.State) {
                 super.onLayoutCompleted(state)
                 updateJumpToReadMarkerViewVisibility()
                 jumpToBottomViewVisibilityManager.maybeShowJumpToBottomViewVisibilityWithDelay()
@@ -1448,14 +1061,13 @@ class TimelineFragment @Inject constructor(
             it.dispatchTo(scrollOnHighlightedEventCallback)
         }
         timelineEventController.addModelBuildListener(modelBuildListener)
-        views.timelineRecyclerView.adapter = timelineEventController.adapter
 
         if (vectorPreferences.swipeToReplyIsEnabled()) {
             val quickReplyHandler = object : RoomMessageTouchHelperCallback.QuickReplayHandler {
                 override fun performQuickReplyOnHolder(model: EpoxyModel<*>) {
                     (model as? AbsMessageItem)?.attributes?.informationData?.let {
                         val eventId = it.eventId
-                        messageComposerViewModel.handle(MessageComposerAction.EnterReplyMode(eventId, views.composerLayout.text.toString()))
+                        messageComposerViewModel.handle(MessageComposerAction.EnterReplyMode(eventId))
                     }
                 }
 
@@ -1522,122 +1134,14 @@ class TimelineFragment @Inject constructor(
         }
     }
 
-    private fun setupComposer() {
-        val composerEditText = views.composerLayout.views.composerEditText
-        autoCompleter.setup(composerEditText)
-
-        observerUserTyping()
-
-        if (vectorPreferences.sendMessageWithEnter()) {
-            // imeOptions="actionSend" only works with single line, so we remove multiline inputType
-            composerEditText.inputType = composerEditText.inputType and EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE.inv()
-            composerEditText.imeOptions = EditorInfo.IME_ACTION_SEND
-        }
-
-        composerEditText.setOnEditorActionListener { v, actionId, keyEvent ->
-            val imeActionId = actionId and EditorInfo.IME_MASK_ACTION
-            if (EditorInfo.IME_ACTION_DONE == imeActionId || EditorInfo.IME_ACTION_SEND == imeActionId) {
-                sendTextMessage(v.text)
-                true
-            }
-            // Add external keyboard functionality (to send messages)
-            else if (null != keyEvent &&
-                    !keyEvent.isShiftPressed &&
-                    keyEvent.keyCode == KeyEvent.KEYCODE_ENTER &&
-                    resources.configuration.keyboard != Configuration.KEYBOARD_NOKEYS) {
-                sendTextMessage(v.text)
-                true
-            } else false
-        }
-
-        views.composerLayout.views.composerEmojiButton.isVisible = vectorPreferences.showEmojiKeyboard()
-
-        if (isThreadTimeLine() && timelineArgs.threadTimelineArgs?.showKeyboard == true) {
-            // Show keyboard when the user started a thread
-            views.composerLayout.views.composerEditText.showKeyboard(andRequestFocus = true)
-        }
-        views.composerLayout.callback = object : MessageComposerView.Callback {
-            override fun onAddAttachment() {
-                if (!::attachmentTypeSelector.isInitialized) {
-                    attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@TimelineFragment)
-                    attachmentTypeSelector.setAttachmentVisibility(
-                            AttachmentTypeSelectorView.Type.LOCATION,
-                            vectorFeatures.isLocationSharingEnabled(),
-                    )
-                    attachmentTypeSelector.setAttachmentVisibility(
-                            AttachmentTypeSelectorView.Type.POLL, !isThreadTimeLine()
-                    )
-                }
-                attachmentTypeSelector.show(views.composerLayout.views.attachmentButton)
-            }
-
-            override fun onSendMessage(text: CharSequence) {
-                sendTextMessage(text)
-            }
-
-            override fun onCloseRelatedMessage() {
-                messageComposerViewModel.handle(MessageComposerAction.EnterRegularMode(views.composerLayout.text.toString(), false))
-            }
-
-            override fun onRichContentSelected(contentUri: Uri): Boolean {
-                return sendUri(contentUri)
-            }
-
-            override fun onTextChanged(text: CharSequence) {
-                messageComposerViewModel.handle(MessageComposerAction.OnTextChanged(text))
-            }
-        }
-    }
-
-    private fun sendTextMessage(text: CharSequence) {
-        if (lockSendButton) {
-            Timber.w("Send button is locked")
-            return
-        }
-        if (text.isNotBlank()) {
-            // We collapse ASAP, if not there will be a slight annoying delay
-            views.composerLayout.collapse(true)
-            lockSendButton = true
-            messageComposerViewModel.handle(MessageComposerAction.SendMessage(text, vectorPreferences.isMarkdownEnabled()))
-            emojiPopup.dismiss()
-        }
-    }
-
-    private fun observerUserTyping() {
-        if (isThreadTimeLine()) return
-        views.composerLayout.views.composerEditText.textChanges()
-                .skipInitialValue()
-                .debounce(300)
-                .map { it.isNotEmpty() }
-                .onEach {
-                    Timber.d("Typing: User is typing: $it")
-                    messageComposerViewModel.handle(MessageComposerAction.UserIsTyping(it))
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-
-        views.composerLayout.views.composerEditText.focusChanges()
-                .onEach {
-                    timelineViewModel.handle(RoomDetailAction.ComposerFocusChange(it))
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
-    private fun sendUri(uri: Uri): Boolean {
-        val shareIntent = Intent(Intent.ACTION_SEND, uri)
-        val isHandled = shareIntentHandler.handleIncomingShareIntent(shareIntent, ::onContentAttachmentsReady, onPlainText = {
-            fatalError("Should not happen as we're generating a File based share Intent", vectorPreferences.failFast())
-        })
-        if (!isHandled) {
-            Toast.makeText(requireContext(), R.string.error_handling_incoming_share, Toast.LENGTH_SHORT).show()
-        }
-        return isHandled
-    }
-
     override fun invalidate() = withState(timelineViewModel, messageComposerViewModel) { mainState, messageComposerState ->
         invalidateOptionsMenu()
+        if (mainState.asyncRoomSummary is Fail) {
+            handleRoomSummaryFailure(mainState.asyncRoomSummary)
+            return@withState
+        }
         val summary = mainState.asyncRoomSummary()
         renderToolbar(summary)
-        renderTypingMessageNotification(summary, mainState)
         views.removeJitsiWidgetView.render(mainState)
         if (mainState.hasFailedSending) {
             lazyLoadedViews.failedMessagesWarningView(inflateIfNeeded = true, createFailedMessagesWarningCallback())?.isVisible = true
@@ -1652,12 +1156,8 @@ class TimelineFragment @Inject constructor(
             lazyLoadedViews.inviteView(false)?.isVisible = false
 
             if (mainState.tombstoneEvent == null) {
-                views.composerLayout.isInvisible = !messageComposerState.isComposerVisible
-                views.voiceMessageRecorderView.isVisible = messageComposerState.isVoiceMessageRecorderVisible
-                views.composerLayout.views.sendButton.isInvisible = !messageComposerState.isSendButtonVisible
-                views.voiceMessageRecorderView.render(messageComposerState.voiceRecordingUiState)
-                views.composerLayout.setRoomEncrypted(summary.isEncrypted)
-                // views.composerLayout.alwaysShowSendButton = false
+                views.composerContainer.isInvisible = !messageComposerState.isComposerVisible
+                views.voiceMessageRecorderContainer.isVisible = messageComposerState.isVoiceMessageRecorderVisible
                 when (messageComposerState.canSendMessage) {
                     CanSendStatus.Allowed -> {
                         NotificationAreaView.State.Hidden
@@ -1690,24 +1190,30 @@ class TimelineFragment @Inject constructor(
         updateLiveLocationIndicator(mainState.isSharingLiveLocation)
     }
 
+    private fun handleRoomSummaryFailure(asyncRoomSummary: Fail<RoomSummary>) {
+        views.roomNotFound.isVisible = true
+        views.roomNotFoundText.text = when (asyncRoomSummary.error) {
+            is RoomNotFound -> {
+                getString(
+                        R.string.timeline_error_room_not_found,
+                        if (vectorPreferences.developerMode()) {
+                            "\nDeveloper info: $timelineArgs"
+                        } else {
+                            ""
+                        }
+                )
+            }
+            else -> errorFormatter.toHumanReadable(asyncRoomSummary.error)
+        }
+    }
+
     private fun updateLiveLocationIndicator(isSharingLiveLocation: Boolean) {
         views.liveLocationStatusIndicator.isVisible = isSharingLiveLocation
     }
 
     private fun FragmentTimelineBinding.hideComposerViews() {
-        composerLayout.isVisible = false
-        voiceMessageRecorderView.isVisible = false
-    }
-
-    private fun renderTypingMessageNotification(roomSummary: RoomSummary?, state: RoomDetailViewState) {
-        if (!isThreadTimeLine() && roomSummary != null) {
-            views.typingMessageView.isInvisible = state.typingUsers.isNullOrEmpty()
-            state.typingUsers
-                    ?.take(MAX_TYPING_MESSAGE_USERS_COUNT)
-                    ?.let { senders -> views.typingMessageView.render(senders, avatarRenderer) }
-        } else {
-            views.typingMessageView.isInvisible = true
-        }
+        composerContainer.isVisible = false
+        voiceMessageRecorderContainer.isVisible = false
     }
 
     private fun renderToolbar(roomSummary: RoomSummary?) {
@@ -1749,54 +1255,6 @@ class TimelineFragment @Inject constructor(
         }
     }
 
-    private fun renderSendMessageResult(sendMessageResult: MessageComposerViewEvents.SendMessageResult) {
-        when (sendMessageResult) {
-            is MessageComposerViewEvents.SlashCommandLoading -> {
-                showLoading(null)
-            }
-            is MessageComposerViewEvents.SlashCommandError -> {
-                displayCommandError(getString(R.string.command_problem_with_parameters, sendMessageResult.command.command))
-            }
-            is MessageComposerViewEvents.SlashCommandUnknown -> {
-                displayCommandError(getString(R.string.unrecognized_command, sendMessageResult.command))
-            }
-            is MessageComposerViewEvents.SlashCommandResultOk -> {
-                handleSlashCommandResultOk(sendMessageResult.parsedCommand)
-            }
-            is MessageComposerViewEvents.SlashCommandResultError -> {
-                dismissLoadingDialog()
-                displayCommandError(errorFormatter.toHumanReadable(sendMessageResult.throwable))
-            }
-            is MessageComposerViewEvents.SlashCommandNotImplemented -> {
-                displayCommandError(getString(R.string.not_implemented))
-            }
-            is MessageComposerViewEvents.SlashCommandNotSupportedInThreads -> {
-                displayCommandError(getString(R.string.command_not_supported_in_threads, sendMessageResult.command.command))
-            }
-        }
-
-        lockSendButton = false
-    }
-
-    private fun handleSlashCommandResultOk(parsedCommand: ParsedCommand) {
-        dismissLoadingDialog()
-        views.composerLayout.setTextIfDifferent("")
-        when (parsedCommand) {
-            is ParsedCommand.SetMarkdown -> {
-                showSnackWithMessage(getString(if (parsedCommand.enable) R.string.markdown_has_been_enabled else R.string.markdown_has_been_disabled))
-            }
-            else -> Unit
-        }
-    }
-
-    private fun displayCommandError(message: String) {
-        MaterialAlertDialogBuilder(requireActivity())
-                .setTitle(R.string.command_error)
-                .setMessage(message)
-                .setPositiveButton(R.string.ok, null)
-                .show()
-    }
-
     private fun displayE2eError(withHeldCode: WithHeldCode?) {
         val msgId = when (withHeldCode) {
             WithHeldCode.BLACKLISTED -> R.string.crypto_error_withheld_blacklisted
@@ -1842,8 +1300,12 @@ class TimelineFragment @Inject constructor(
     }
 
     private fun displayRoomDetailActionFailure(result: RoomDetailViewEvents.ActionFailure) {
+        @StringRes val titleResId = when (result.action) {
+            RoomDetailAction.VoiceBroadcastAction.Recording.Start -> R.string.error_voice_broadcast_unauthorized_title
+            else -> R.string.dialog_title_error
+        }
         MaterialAlertDialogBuilder(requireActivity())
-                .setTitle(R.string.dialog_title_error)
+                .setTitle(titleResId)
                 .setMessage(errorFormatter.toHumanReadable(result.throwable))
                 .setPositiveButton(R.string.ok, null)
                 .show()
@@ -2025,7 +1487,7 @@ class TimelineFragment @Inject constructor(
                 inMemory = inMemory
         ) { pairs ->
             pairs.add(Pair(views.roomToolbar, ViewCompat.getTransitionName(views.roomToolbar) ?: ""))
-            pairs.add(Pair(views.composerLayout, ViewCompat.getTransitionName(views.composerLayout) ?: ""))
+            pairs.add(Pair(views.composerContainer, ViewCompat.getTransitionName(views.composerContainer) ?: ""))
         }
     }
 
@@ -2037,16 +1499,10 @@ class TimelineFragment @Inject constructor(
                 view = view
         ) { pairs ->
             pairs.add(Pair(views.roomToolbar, ViewCompat.getTransitionName(views.roomToolbar) ?: ""))
-            pairs.add(Pair(views.composerLayout, ViewCompat.getTransitionName(views.composerLayout) ?: ""))
+            pairs.add(Pair(views.composerContainer, ViewCompat.getTransitionName(views.composerContainer) ?: ""))
         }
     }
 
-    private fun cleanUpAfterPermissionNotGranted() {
-        // Reset all pending data
-        timelineViewModel.pendingAction = null
-        attachmentsHelper.pendingType = null
-    }
-
     override fun onLoadMore(direction: Timeline.Direction) {
         timelineViewModel.handle(RoomDetailAction.LoadMoreTimelineEvents(direction))
     }
@@ -2128,7 +1584,7 @@ class TimelineFragment @Inject constructor(
     }
 
     override fun onMemberNameClicked(informationData: MessageInformationData) {
-        insertUserDisplayNameInTextEditor(informationData.senderId)
+        messageComposerViewModel.handle(MessageComposerAction.InsertUserDisplayName(informationData.senderId))
     }
 
     override fun onClickOnReactionPill(informationData: MessageInformationData, reaction: String, on: Boolean) {
@@ -2162,7 +1618,7 @@ class TimelineFragment @Inject constructor(
     override fun onRoomCreateLinkClicked(url: String) {
         viewLifecycleOwner.lifecycleScope.launchWhenResumed {
             permalinkHandler
-                    .launch(requireContext(), url, object : NavigationInterceptor {
+                    .launch(requireActivity(), url, object : NavigationInterceptor {
                         override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?, rootThreadEventId: String?): Boolean {
                             requireActivity().finish()
                             return false
@@ -2243,6 +1699,11 @@ class TimelineFragment @Inject constructor(
         }
     }
 
+    private fun cleanUpAfterPermissionNotGranted() {
+        // Reset all pending data
+        timelineViewModel.pendingAction = null
+    }
+
     private fun onSaveActionClicked(action: EventSharedAction.Save) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
                 !checkPermissions(PERMISSIONS_FOR_WRITING_FILES, requireActivity(), saveActionActivityResultLauncher)) {
@@ -2317,20 +1778,20 @@ class TimelineFragment @Inject constructor(
                 timelineViewModel.handle(RoomDetailAction.UpdateQuickReactAction(action.eventId, action.clickedOn, action.add))
             }
             is EventSharedAction.Edit -> {
-                if (action.eventType in EventType.POLL_START) {
+                if (action.eventType in EventType.POLL_START.values) {
                     navigator.openCreatePoll(requireContext(), timelineArgs.roomId, action.eventId, PollMode.EDIT)
                 } else if (withState(messageComposerViewModel) { it.isVoiceMessageIdle }) {
-                    messageComposerViewModel.handle(MessageComposerAction.EnterEditMode(action.eventId, views.composerLayout.text.toString()))
+                    messageComposerViewModel.handle(MessageComposerAction.EnterEditMode(action.eventId))
                 } else {
                     requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
                 }
             }
             is EventSharedAction.Quote -> {
-                messageComposerViewModel.handle(MessageComposerAction.EnterQuoteMode(action.eventId, views.composerLayout.text.toString()))
+                messageComposerViewModel.handle(MessageComposerAction.EnterQuoteMode(action.eventId))
             }
             is EventSharedAction.Reply -> {
                 if (withState(messageComposerViewModel) { it.isVoiceMessageIdle }) {
-                    messageComposerViewModel.handle(MessageComposerAction.EnterReplyMode(action.eventId, views.composerLayout.text.toString()))
+                    messageComposerViewModel.handle(MessageComposerAction.EnterReplyMode(action.eventId))
                 } else {
                     requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
                 }
@@ -2350,7 +1811,7 @@ class TimelineFragment @Inject constructor(
                 }
             }
             is EventSharedAction.CopyPermalink -> {
-                val permalink = session.permalinkService().createPermalink(timelineArgs.roomId, action.eventId)
+                val permalink = permalinkFactory.createPermalink(timelineArgs.roomId, action.eventId)
                 copyToClipboard(requireContext(), permalink, false)
                 showSnackWithMessage(getString(R.string.copied_to_clipboard))
             }
@@ -2431,63 +1892,6 @@ class TimelineFragment @Inject constructor(
                 .show()
     }
 
-    /**
-     * Insert a user displayName in the message editor.
-     *
-     * @param userId the userId.
-     */
-    @SuppressLint("SetTextI18n")
-    private fun insertUserDisplayNameInTextEditor(userId: String) {
-        val startToCompose = views.composerLayout.text.isNullOrBlank()
-
-        if (startToCompose &&
-                userId == session.myUserId) {
-            // Empty composer, current user: start an emote
-            views.composerLayout.views.composerEditText.setText(Command.EMOTE.command + " ")
-            views.composerLayout.views.composerEditText.setSelection(Command.EMOTE.command.length + 1)
-        } else {
-            val roomMember = timelineViewModel.getMember(userId)
-            // TODO move logic outside of fragment
-            (roomMember?.displayName ?: userId)
-                    .let { sanitizeDisplayName(it) }
-                    .let { displayName ->
-                        buildSpannedString {
-                            append(displayName)
-                            setSpan(
-                                    PillImageSpan(
-                                            glideRequests,
-                                            avatarRenderer,
-                                            requireContext(),
-                                            MatrixItem.UserItem(userId, displayName, roomMember?.avatarUrl)
-                                    )
-                                            .also { it.bind(views.composerLayout.views.composerEditText) },
-                                    0,
-                                    displayName.length,
-                                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-                            )
-                            append(if (startToCompose) ": " else " ")
-                        }.let { pill ->
-                            if (startToCompose) {
-                                if (displayName.startsWith("/")) {
-                                    // Ensure displayName will not be interpreted as a Slash command
-                                    views.composerLayout.views.composerEditText.append("\\")
-                                }
-                                views.composerLayout.views.composerEditText.append(pill)
-                            } else {
-                                views.composerLayout.views.composerEditText.text?.insert(views.composerLayout.views.composerEditText.selectionStart, pill)
-                            }
-                        }
-                    }
-        }
-        focusComposerAndShowKeyboard()
-    }
-
-    private fun focusComposerAndShowKeyboard() {
-        if (views.composerLayout.isVisible) {
-            views.composerLayout.views.composerEditText.showKeyboard(andRequestFocus = true)
-        }
-    }
-
     private fun showSnackWithMessage(message: String) {
         view?.showOptimizedSnackbar(message)
     }
@@ -2515,15 +1919,19 @@ class TimelineFragment @Inject constructor(
      * Navigate to Threads timeline for the specified rootThreadEventId
      * using the ThreadsActivity.
      */
-    private fun navigateToThreadTimeline(rootThreadEventId: String, startsThread: Boolean = false, showKeyboard: Boolean = false) {
+    private fun navigateToThreadTimeline(
+            rootThreadEventId: String,
+            startsThread: Boolean = false,
+            showKeyboard: Boolean = false,
+    ) = withState(timelineViewModel) { state ->
         analyticsTracker.capture(Interaction.Name.MobileRoomThreadSummaryItem.toAnalyticsInteraction())
         context?.let {
             val roomThreadDetailArgs = ThreadTimelineArgs(
                     startsThread = startsThread,
                     roomId = timelineArgs.roomId,
-                    displayName = timelineViewModel.getRoomSummary()?.displayName,
-                    avatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl,
-                    roomEncryptionTrustLevel = timelineViewModel.getRoomSummary()?.roomEncryptionTrustLevel,
+                    displayName = state.asyncRoomSummary()?.displayName,
+                    avatarUrl = state.asyncRoomSummary()?.avatarUrl,
+                    roomEncryptionTrustLevel = state.asyncRoomSummary()?.roomEncryptionTrustLevel,
                     rootThreadEventId = rootThreadEventId,
                     showKeyboard = showKeyboard
             )
@@ -2554,14 +1962,14 @@ class TimelineFragment @Inject constructor(
      * Navigate to Threads list for the current room
      * using the ThreadsActivity.
      */
-    private fun navigateToThreadList() {
+    private fun navigateToThreadList() = withState(timelineViewModel) { state ->
         analyticsTracker.capture(Interaction.Name.MobileRoomThreadListButton.toAnalyticsInteraction())
         context?.let {
             val roomThreadDetailArgs = ThreadTimelineArgs(
                     roomId = timelineArgs.roomId,
-                    displayName = timelineViewModel.getRoomSummary()?.displayName,
-                    roomEncryptionTrustLevel = timelineViewModel.getRoomSummary()?.roomEncryptionTrustLevel,
-                    avatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl
+                    displayName = state.asyncRoomSummary()?.displayName,
+                    roomEncryptionTrustLevel = state.asyncRoomSummary()?.roomEncryptionTrustLevel,
+                    avatarUrl = state.asyncRoomSummary()?.avatarUrl
             )
             navigator.openThreadList(it, roomThreadDetailArgs)
         }
@@ -2585,74 +1993,6 @@ class TimelineFragment @Inject constructor(
         }
     }
 
-    // AttachmentTypeSelectorView.Callback
-    private val typeSelectedActivityResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
-        if (allGranted) {
-            val pendingType = attachmentsHelper.pendingType
-            if (pendingType != null) {
-                attachmentsHelper.pendingType = null
-                launchAttachmentProcess(pendingType)
-            }
-        } else {
-            if (deniedPermanently) {
-                activity?.onPermissionDeniedDialog(R.string.denied_permission_generic)
-            }
-            cleanUpAfterPermissionNotGranted()
-        }
-    }
-
-    override fun onTypeSelected(type: AttachmentTypeSelectorView.Type) {
-        if (checkPermissions(type.permissions, requireActivity(), typeSelectedActivityResultLauncher)) {
-            launchAttachmentProcess(type)
-        } else {
-            attachmentsHelper.pendingType = type
-        }
-    }
-
-    private fun launchAttachmentProcess(type: AttachmentTypeSelectorView.Type) {
-        when (type) {
-            AttachmentTypeSelectorView.Type.CAMERA -> attachmentsHelper.openCamera(
-                    activity = requireActivity(),
-                    vectorPreferences = vectorPreferences,
-                    cameraActivityResultLauncher = attachmentCameraActivityResultLauncher,
-                    cameraVideoActivityResultLauncher = attachmentCameraVideoActivityResultLauncher
-            )
-            AttachmentTypeSelectorView.Type.FILE -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentMediaActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.CONTACT -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.STICKER -> timelineViewModel.handle(RoomDetailAction.SelectStickerAttachment)
-            AttachmentTypeSelectorView.Type.POLL -> navigator.openCreatePoll(requireContext(), timelineArgs.roomId, null, PollMode.CREATE)
-            AttachmentTypeSelectorView.Type.LOCATION -> {
-                navigator
-                        .openLocationSharing(
-                                context = requireContext(),
-                                roomId = timelineArgs.roomId,
-                                mode = LocationSharingMode.STATIC_SHARING,
-                                initialLocationData = null,
-                                locationOwnerId = session.myUserId
-                        )
-            }
-        }
-    }
-
-    // AttachmentsHelper.Callback
-    override fun onContentAttachmentsReady(attachments: List<ContentAttachmentData>) {
-        val grouped = attachments.toGroupedContentAttachmentData()
-        if (grouped.notPreviewables.isNotEmpty()) {
-            // Send the not previewable attachments right now (?)
-            timelineViewModel.handle(RoomDetailAction.SendMedia(grouped.notPreviewables, false))
-        }
-        if (grouped.previewables.isNotEmpty()) {
-            val intent = AttachmentsPreviewActivity.newIntent(requireContext(), AttachmentsPreviewArgs(grouped.previewables))
-            contentAttachmentActivityResultLauncher.launch(intent)
-        }
-    }
-
-    override fun onContactAttachmentReady(contactAttachment: ContactAttachment) {
-        val formattedContact = contactAttachment.toHumanReadable()
-        messageComposerViewModel.handle(MessageComposerAction.SendMessage(formattedContact, false))
-    }
-
     private fun onViewWidgetsClicked() {
         RoomWidgetsBottomSheet.newInstance()
                 .show(childFragmentManager, "ROOM_WIDGETS_BOTTOM_SHEET")
@@ -2667,6 +2007,20 @@ class TimelineFragment @Inject constructor(
                 }
     }
 
+    private fun displayPromptToStopVoiceBroadcast() {
+        ConfirmationDialogBuilder
+                .show(
+                        activity = requireActivity(),
+                        askForReason = false,
+                        confirmationRes = R.string.stop_voice_broadcast_content,
+                        positiveRes = R.string.action_stop,
+                        reasonHintRes = 0,
+                        titleRes = R.string.stop_voice_broadcast_dialog_title
+                ) {
+                    timelineViewModel.handle(RoomDetailAction.VoiceBroadcastAction.Recording.StopConfirmed)
+                }
+    }
+
     override fun onTapToReturnToCall() {
         callManager.getCurrentCall()?.let { call ->
             VectorCallActivity.newIntent(
@@ -2686,7 +2040,7 @@ class TimelineFragment @Inject constructor(
     /**
      * Returns true if the current room is a Thread room, false otherwise.
      */
-    private fun isThreadTimeLine(): Boolean = timelineArgs.threadTimelineArgs?.rootThreadEventId != null
+    private fun isThreadTimeLine(): Boolean = withState(timelineViewModel) { it.isThreadTimeline() }
 
     /**
      * Returns true if the current room is a local room, false otherwise.
@@ -2696,5 +2050,5 @@ class TimelineFragment @Inject constructor(
     /**
      * Returns the root thread event if we are in a thread room, otherwise returns null.
      */
-    fun getRootThreadEventId(): String? = timelineArgs.threadTimelineArgs?.rootThreadEventId
+    fun getRootThreadEventId(): String? = withState(timelineViewModel) { it.rootThreadEventId }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
index c0f90aba7a..ff24872ab8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.detail
 
 import android.net.Uri
 import androidx.annotation.IdRes
+import androidx.lifecycle.asFlow
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
@@ -39,6 +40,7 @@ import im.vector.app.core.utils.BehaviorDataSource
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.DecryptionFailureTracker
 import im.vector.app.features.analytics.extensions.toAnalyticsJoinedRoom
+import im.vector.app.features.analytics.plan.CreatedRoom
 import im.vector.app.features.analytics.plan.JoinedRoom
 import im.vector.app.features.call.conference.ConferenceEvent
 import im.vector.app.features.call.conference.JitsiActiveConferenceHolder
@@ -48,6 +50,8 @@ import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.createdirect.DirectRoomHelper
 import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
 import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider
+import im.vector.app.features.home.room.detail.RoomDetailAction.VoiceBroadcastAction
+import im.vector.app.features.home.room.detail.error.RoomNotFound
 import im.vector.app.features.home.room.detail.location.RedactLiveLocationShareEventUseCase
 import im.vector.app.features.home.room.detail.sticker.StickerPickerActionHandler
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineFactory
@@ -63,6 +67,7 @@ import im.vector.app.features.raw.wellknown.withElementWellKnown
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorDataStore
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.voicebroadcast.VoiceBroadcastHelper
 import im.vector.lib.core.utils.flow.chunk
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -77,6 +82,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.raw.RawService
@@ -92,14 +98,17 @@ import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.location.UpdateLiveLocationShareResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.LocalRoomCreationState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
 import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 import org.matrix.android.sdk.api.session.room.model.tombstone.RoomTombstoneContent
@@ -142,16 +151,17 @@ class TimelineViewModel @AssistedInject constructor(
         private val cryptoConfig: CryptoConfig,
         buildMeta: BuildMeta,
         timelineFactory: TimelineFactory,
-        spaceStateHandler: SpaceStateHandler,
+        private val spaceStateHandler: SpaceStateHandler,
+        private val voiceBroadcastHelper: VoiceBroadcastHelper,
 ) : VectorViewModel<RoomDetailViewState, RoomDetailAction, RoomDetailViewEvents>(initialState),
         Timeline.Listener, ChatEffectManager.Delegate, CallProtocolsChecker.Listener, LocationSharingServiceConnection.Callback {
 
-    private val room = session.getRoom(initialState.roomId)!!
+    private val room = session.getRoom(initialState.roomId)
     private val eventId = initialState.eventId
     private val invisibleEventsSource = BehaviorDataSource<RoomDetailAction.TimelineEventTurnsInvisible>()
     private val visibleEventsSource = BehaviorDataSource<RoomDetailAction.TimelineEventTurnsVisible>()
     private var timelineEvents = MutableSharedFlow<List<TimelineEvent>>(0)
-    val timeline = timelineFactory.createTimeline(viewModelScope, room, eventId, initialState.rootThreadEventId)
+    val timeline: Timeline?
 
     // Same lifecycle than the ViewModel (survive to screen rotation)
     val previewUrlRetriever = PreviewUrlRetriever(session, viewModelScope, buildMeta)
@@ -180,9 +190,21 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     init {
+        // This method will take care of a null room to update the state.
+        observeRoomSummary()
+        observeLocalRoomSummary()
+        if (room == null) {
+            timeline = null
+        } else {
+            // Nominal case, we have retrieved the room.
+            timeline = timelineFactory.createTimeline(viewModelScope, room, eventId, initialState.rootThreadEventId)
+            initSafe(room, timeline)
+        }
+    }
+
+    private fun initSafe(room: Room, timeline: Timeline) {
         timeline.start(initialState.rootThreadEventId)
         timeline.addListener(this)
-        observeRoomSummary()
         observeMembershipChanges()
         observeSummaryState()
         getUnreadState()
@@ -194,9 +216,8 @@ class TimelineViewModel @AssistedInject constructor(
         observeActiveRoomWidgets()
         observePowerLevel()
         setupPreviewUrlObservers()
-        room.getRoomSummaryLive()
         viewModelScope.launch(Dispatchers.IO) {
-            tryOrNull { room.readService().markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
+            tryOrNull { room.readService().markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT, mainTimeLineOnly = true) }
         }
         // Inform the SDK that the room is displayed
         viewModelScope.launch(Dispatchers.IO) {
@@ -265,6 +286,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun prepareForEncryption() {
+        if (room == null) return
         // check if there is not already a call made, or if there has been an error
         if (prepareToEncrypt.shouldLoad) {
             prepareToEncrypt = Loading()
@@ -281,6 +303,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun observePowerLevel() {
+        if (room == null) return
         PowerLevelsFlowFactory(room).createFlow()
                 .onEach {
                     val canInvite = PowerLevelsHelper(it).isUserAbleToInvite(session.myUserId)
@@ -329,6 +352,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun observeMyRoomMember() {
+        if (room == null) return
         val queryParams = roomMemberQueryParams {
             this.userId = QueryStringValue.Equals(session.myUserId, QueryStringValue.Case.SENSITIVE)
         }
@@ -344,6 +368,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun setupPreviewUrlObservers() {
+        if (room == null) return
         if (!vectorPreferences.showUrlPreviews()) {
             return
         }
@@ -372,6 +397,7 @@ class TimelineViewModel @AssistedInject constructor(
      * This is a local implementation has nothing to do with APIs.
      */
     private fun markThreadTimelineAsReadLocal() {
+        if (room == null) return
         initialState.rootThreadEventId?.let {
             session.coroutineScope.launch {
                 room.threadsLocalService().markThreadAsRead(it)
@@ -383,27 +409,43 @@ class TimelineViewModel @AssistedInject constructor(
      * Observe local unread threads.
      */
     private fun observeLocalThreadNotifications() {
-        room.flow()
-                .liveLocalUnreadThreadList()
-                .execute {
-                    val threadList = it.invoke()
-                    val isUserMentioned = threadList?.firstOrNull { threadRootEvent ->
-                        threadRootEvent.root.threadDetails?.threadNotificationState == ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
-                    }?.let { true } ?: false
-                    val numberOfLocalUnreadThreads = threadList?.size ?: 0
-                    copy(
-                            threadNotificationBadgeState = ThreadNotificationBadgeState(
-                                    numberOfLocalUnreadThreads = numberOfLocalUnreadThreads,
-                                    isUserMentioned = isUserMentioned
-                            )
-                    )
-                }
+        if (room == null) return
+        val threadNotificationsSupported = session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreadReadReceiptsAndNotifications
+        if (threadNotificationsSupported) {
+            room.getRoomSummaryLive()
+                    .asFlow()
+                    .onEach {
+                        it.getOrNull()?.let {
+                            setState {
+                                copy(
+                                        threadNotificationBadgeState = ThreadNotificationBadgeState(
+                                                numberOfLocalUnreadThreads = it.threadNotificationCount + it.threadHighlightCount,
+                                                isUserMentioned = it.threadHighlightCount > 0,
+                                        )
+                                )
+                            }
+                        }
+                    }
+                    .launchIn(viewModelScope)
+        } else {
+            room.flow()
+                    .liveLocalUnreadThreadList()
+                    .execute {
+                        val threadList = it.invoke()
+                        val isUserMentioned = threadList?.firstOrNull { threadRootEvent ->
+                            threadRootEvent.root.threadDetails?.threadNotificationState == ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
+                        } != null
+                        val numberOfLocalUnreadThreads = threadList?.size ?: 0
+                        copy(
+                                threadNotificationBadgeState = ThreadNotificationBadgeState(
+                                        numberOfLocalUnreadThreads = numberOfLocalUnreadThreads,
+                                        isUserMentioned = isUserMentioned
+                                )
+                        )
+                    }
+        }
     }
 
-    fun getOtherUserIds() = room.roomSummary()?.otherMemberIds
-
-    fun getRoomSummary() = room.roomSummary()
-
     override fun handle(action: RoomDetailAction) {
         when (action) {
             is RoomDetailAction.ComposerFocusChange -> handleComposerFocusChange(action)
@@ -437,6 +479,7 @@ class TimelineViewModel @AssistedInject constructor(
             is RoomDetailAction.ReRequestKeys -> handleReRequestKeys(action)
             is RoomDetailAction.TapOnFailedToDecrypt -> handleTapOnFailedToDecrypt(action)
             is RoomDetailAction.SelectStickerAttachment -> handleSelectStickerAttachment()
+            is VoiceBroadcastAction -> handleVoiceBroadcastAction(action)
             is RoomDetailAction.OpenIntegrationManager -> handleOpenIntegrationManager()
             is RoomDetailAction.StartCall -> handleStartCall(action)
             is RoomDetailAction.AcceptCall -> handleAcceptCall(action)
@@ -518,6 +561,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleSetNewAvatar(action: RoomDetailAction.SetAvatarAction) {
+        if (room == null) return
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 room.stateService().updateAvatar(action.newAvatarUri, action.newAvatarFileName)
@@ -537,11 +581,13 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleJumpToReadReceipt(action: RoomDetailAction.JumpToReadReceipt) {
+        if (room == null) return
         room.readService().getUserReadReceipt(action.userId)
                 ?.let { handleNavigateToEvent(RoomDetailAction.NavigateToEvent(it, true)) }
     }
 
     private fun handleSendSticker(action: RoomDetailAction.SendSticker) {
+        if (room == null) return
         val content = initialState.rootThreadEventId?.let {
             action.stickerContent.copy(
                     relatesTo = RelationDefaultContent(
@@ -556,6 +602,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleStartCall(action: RoomDetailAction.StartCall) {
+        if (room == null) return
         viewModelScope.launch {
             room.roomSummary()?.otherMemberIds?.firstOrNull()?.let {
                 callManager.startOutgoingCall(room.roomId, it, action.isVideo)
@@ -574,6 +621,28 @@ class TimelineViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleVoiceBroadcastAction(action: VoiceBroadcastAction) {
+        if (room == null) return
+        viewModelScope.launch {
+            when (action) {
+                VoiceBroadcastAction.Recording.Start -> {
+                    voiceBroadcastHelper.startVoiceBroadcast(room.roomId).fold(
+                            { _viewEvents.post(RoomDetailViewEvents.ActionSuccess(action)) },
+                            { _viewEvents.post(RoomDetailViewEvents.ActionFailure(action, it)) },
+                    )
+                }
+                VoiceBroadcastAction.Recording.Pause -> voiceBroadcastHelper.pauseVoiceBroadcast(room.roomId)
+                VoiceBroadcastAction.Recording.Resume -> voiceBroadcastHelper.resumeVoiceBroadcast(room.roomId)
+                VoiceBroadcastAction.Recording.Stop -> _viewEvents.post(RoomDetailViewEvents.DisplayPromptToStopVoiceBroadcast)
+                VoiceBroadcastAction.Recording.StopConfirmed -> voiceBroadcastHelper.stopVoiceBroadcast(room.roomId)
+                is VoiceBroadcastAction.Listening.PlayOrResume -> voiceBroadcastHelper.playOrResumePlayback(action.voiceBroadcast)
+                VoiceBroadcastAction.Listening.Pause -> voiceBroadcastHelper.pausePlayback()
+                VoiceBroadcastAction.Listening.Stop -> voiceBroadcastHelper.stopPlayback()
+                is VoiceBroadcastAction.Listening.SeekTo -> voiceBroadcastHelper.seekTo(action.voiceBroadcast, action.positionMillis, action.duration)
+            }
+        }
+    }
+
     private fun handleOpenIntegrationManager() {
         viewModelScope.launch {
             val viewEvent = withContext(Dispatchers.Default) {
@@ -598,10 +667,10 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleAddJitsiConference(action: RoomDetailAction.AddJitsiWidget) {
-        _viewEvents.post(RoomDetailViewEvents.ShowWaitingView)
+        _viewEvents.post(RoomDetailViewEvents.ShowWaitingView())
         viewModelScope.launch(Dispatchers.IO) {
             try {
-                val widget = jitsiService.createJitsiWidget(room.roomId, action.withVideo)
+                val widget = jitsiService.createJitsiWidget(initialState.roomId, action.withVideo)
                 _viewEvents.post(RoomDetailViewEvents.JoinJitsiConference(widget, action.withVideo))
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.ShowMessage(stringProvider.getString(R.string.failed_to_add_widget)))
@@ -618,9 +687,9 @@ class TimelineViewModel @AssistedInject constructor(
                 if (isJitsiWidget) {
                     setState { copy(jitsiState = jitsiState.copy(deleteWidgetInProgress = true)) }
                 } else {
-                    _viewEvents.post(RoomDetailViewEvents.ShowWaitingView)
+                    _viewEvents.post(RoomDetailViewEvents.ShowWaitingView())
                 }
-                session.widgetService().destroyRoomWidget(room.roomId, widgetId)
+                session.widgetService().destroyRoomWidget(initialState.roomId, widgetId)
                 // local echo
                 setState {
                     copy(
@@ -669,6 +738,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun stopTrackingUnreadMessages() {
+        if (room == null) return
         if (trackUnreadMessages.getAndSet(false)) {
             mostRecentDisplayedEvent?.root?.eventId?.also {
                 session.coroutineScope.launch {
@@ -685,10 +755,11 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     fun getMember(userId: String): RoomMemberSummary? {
-        return room.membershipService().getRoomMember(userId)
+        return room?.membershipService()?.getRoomMember(userId)
     }
 
     private fun handleComposerFocusChange(action: RoomDetailAction.ComposerFocusChange) {
+        if (room == null) return
         // Ensure outbound session keys
         if (room.roomCryptoService().isEncrypted()) {
             rawService.withElementWellKnown(viewModelScope, session.sessionParams) {
@@ -778,11 +849,12 @@ class TimelineViewModel @AssistedInject constructor(
     // PRIVATE METHODS *****************************************************************************
 
     private fun handleSendReaction(action: RoomDetailAction.SendReaction) {
+        if (room == null) return
         room.relationService().sendReaction(action.targetEventId, action.reaction)
     }
 
     private fun handleRedactEvent(action: RoomDetailAction.RedactAction) {
-        val event = room.getTimelineEvent(action.targetEventId) ?: return
+        val event = room?.getTimelineEvent(action.targetEventId) ?: return
         if (event.isLiveLocation()) {
             viewModelScope.launch {
                 redactLiveLocationShareEventUseCase.execute(event.root, room, action.reason)
@@ -793,6 +865,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleUndoReact(action: RoomDetailAction.UndoReaction) {
+        if (room == null) return
         viewModelScope.launch {
             tryOrNull {
                 room.relationService().undoReaction(action.targetEventId, action.reaction)
@@ -801,6 +874,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleUpdateQuickReaction(action: RoomDetailAction.UpdateQuickReactAction) {
+        if (room == null) return
         if (action.add) {
             room.relationService().sendReaction(action.targetEventId, action.selectedReaction)
         } else {
@@ -813,6 +887,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleSendMedia(action: RoomDetailAction.SendMedia) {
+        if (room == null) return
         room.sendService().sendMedias(
                 action.attachments,
                 action.compressBeforeSending,
@@ -822,6 +897,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleEventVisible(action: RoomDetailAction.TimelineEventTurnsVisible) {
+        if (room == null) return
         viewModelScope.launch(Dispatchers.Default) {
             if (action.event.root.sendState.isSent()) { // ignore pending/local events
                 visibleEventsSource.post(action)
@@ -849,6 +925,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleLoadMore(action: RoomDetailAction.LoadMoreTimelineEvents) {
+        if (timeline == null) return
         timeline.paginate(action.direction, PAGINATION_COUNT)
     }
 
@@ -856,7 +933,7 @@ class TimelineViewModel @AssistedInject constructor(
         notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(initialState.roomId) }
         viewModelScope.launch {
             try {
-                session.roomService().leaveRoom(room.roomId)
+                session.roomService().leaveRoom(initialState.roomId)
             } catch (throwable: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.Failure(throwable, showInDialog = true))
             }
@@ -867,7 +944,7 @@ class TimelineViewModel @AssistedInject constructor(
         notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(initialState.roomId) }
         viewModelScope.launch {
             try {
-                session.roomService().joinRoom(room.roomId)
+                session.roomService().joinRoom(initialState.roomId)
                 trackRoomJoined()
             } catch (throwable: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.Failure(throwable, showInDialog = true))
@@ -876,6 +953,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun trackRoomJoined() {
+        if (room == null) return
         val trigger = if (initialState.isInviteAlreadyAccepted) {
             JoinedRoom.Trigger.Invite
         } else {
@@ -933,6 +1011,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleNavigateToEvent(action: RoomDetailAction.NavigateToEvent) {
+        if (timeline == null) return
         val targetEventId: String = action.eventId
         val indexOfEvent = timeline.getIndexOfEvent(targetEventId)
         if (indexOfEvent == null) {
@@ -946,6 +1025,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleResendEvent(action: RoomDetailAction.ResendMessage) {
+        if (room == null) return
         val targetEventId = action.eventId
         room.getTimelineEvent(targetEventId)?.let {
             // State must be UNDELIVERED or Failed
@@ -964,6 +1044,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleRemove(action: RoomDetailAction.RemoveFailedEcho) {
+        if (room == null) return
         val targetEventId = action.eventId
         room.getTimelineEvent(targetEventId)?.let {
             // State must be UNDELIVERED or Failed
@@ -976,6 +1057,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleCancel(action: RoomDetailAction.CancelSend) {
+        if (room == null) return
         if (action.force) {
             room.sendService().cancelSend(action.eventId)
             return
@@ -992,14 +1074,17 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleResendAll() {
+        if (room == null) return
         room.sendService().resendAllFailedMessages()
     }
 
     private fun handleRemoveAllFailedMessages() {
+        if (room == null) return
         room.sendService().cancelAllFailedMessages()
     }
 
     private fun observeEventDisplayedActions() {
+        if (room == null) return
         // We are buffering scroll events for one second
         // and keep the most recent one to set the read receipt on.
 
@@ -1019,7 +1104,8 @@ class TimelineViewModel @AssistedInject constructor(
                     }
                     bufferedMostRecentDisplayedEvent.root.eventId?.let { eventId ->
                         session.coroutineScope.launch {
-                            tryOrNull { room.readService().setReadReceipt(eventId) }
+                            val threadId = initialState.rootThreadEventId ?: ReadService.THREAD_ID_MAIN
+                            tryOrNull { room.readService().setReadReceipt(eventId, threadId = threadId) }
                         }
                     }
                 }
@@ -1031,21 +1117,23 @@ class TimelineViewModel @AssistedInject constructor(
      * Returns the index of event in the timeline.
      * Returns Int.MAX_VALUE if not found
      */
-    private fun TimelineEvent.indexOfEvent(): Int = timeline.getIndexOfEvent(eventId) ?: Int.MAX_VALUE
+    private fun TimelineEvent.indexOfEvent(): Int = timeline?.getIndexOfEvent(eventId) ?: Int.MAX_VALUE
 
     private fun handleMarkAllAsRead() {
+        if (room == null) return
         setState { copy(unreadState = UnreadState.HasNoUnread) }
         viewModelScope.launch {
-            tryOrNull { room.readService().markAsRead(ReadService.MarkAsReadParams.BOTH) }
+            tryOrNull { room.readService().markAsRead(ReadService.MarkAsReadParams.BOTH, mainTimeLineOnly = true) }
         }
     }
 
     private fun handleReportContent(action: RoomDetailAction.ReportContent) {
+        if (room == null) return
         viewModelScope.launch {
             val event = try {
                 room.reportingService().reportContent(action.eventId, -100, action.reason)
                 RoomDetailViewEvents.ActionSuccess(action)
-            } catch (failure: Exception) {
+            } catch (failure: Throwable) {
                 RoomDetailViewEvents.ActionFailure(action, failure)
             }
             _viewEvents.post(event)
@@ -1069,11 +1157,11 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleAcceptVerification(action: RoomDetailAction.AcceptVerificationRequest) {
-        Timber.v("## SAS handleAcceptVerification ${action.otherUserId},  roomId:${room.roomId}, txId:${action.transactionId}")
+        Timber.v("## SAS handleAcceptVerification ${action.otherUserId},  roomId:${initialState.roomId}, txId:${action.transactionId}")
         if (session.cryptoService().verificationService().readyPendingVerificationInDMs(
                         supportedVerificationMethodsProvider.provide(),
                         action.otherUserId,
-                        room.roomId,
+                        initialState.roomId,
                         action.transactionId
                 )) {
             _viewEvents.post(RoomDetailViewEvents.ActionSuccess(action))
@@ -1086,7 +1174,7 @@ class TimelineViewModel @AssistedInject constructor(
         session.cryptoService().verificationService().declineVerificationRequestInDMs(
                 action.otherUserId,
                 action.transactionId,
-                room.roomId
+                initialState.roomId
         )
     }
 
@@ -1097,7 +1185,7 @@ class TimelineViewModel @AssistedInject constructor(
 
     private fun handleResumeRequestVerification(action: RoomDetailAction.ResumeVerification) {
         // Check if this request is still active and handled by me
-        session.cryptoService().verificationService().getExistingVerificationRequestInRoom(room.roomId, action.transactionId)?.let {
+        session.cryptoService().verificationService().getExistingVerificationRequestInRoom(initialState.roomId, action.transactionId)?.let {
             if (it.handledByOtherSession) return
             if (!it.isFinished) {
                 _viewEvents.post(
@@ -1112,6 +1200,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleReRequestKeys(action: RoomDetailAction.ReRequestKeys) {
+        if (room == null) return
         // Check if this request is still active and handled by me
         room.getTimelineEvent(action.eventId)?.let {
             session.cryptoService().reRequestRoomKeyForEvent(it.root)
@@ -1120,6 +1209,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleTapOnFailedToDecrypt(action: RoomDetailAction.TapOnFailedToDecrypt) {
+        if (room == null) return
         room.getTimelineEvent(action.eventId)?.let {
             val code = when (it.root.mCryptoError) {
                 MXCryptoError.ErrorType.KEYS_WITHHELD -> {
@@ -1133,6 +1223,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleVoteToPoll(action: RoomDetailAction.VoteToPoll) {
+        if (room == null) return
         // Do not allow to vote unsent local echo of the poll event
         if (LocalEcho.isLocalEchoId(action.eventId)) return
         // Do not allow to vote the same option twice
@@ -1145,6 +1236,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleEndPoll(eventId: String) {
+        if (room == null) return
         room.sendService().endPoll(eventId)
     }
 
@@ -1164,7 +1256,7 @@ class TimelineViewModel @AssistedInject constructor(
 
     private fun handleStopLiveLocationSharing() {
         viewModelScope.launch {
-            val result = stopLiveLocationShareUseCase.execute(room.roomId)
+            val result = stopLiveLocationShareUseCase.execute(initialState.roomId)
             if (result is UpdateLiveLocationShareResult.Failure) {
                 _viewEvents.post(RoomDetailViewEvents.Failure(throwable = result.error, showInDialog = true))
             }
@@ -1172,16 +1264,52 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun observeRoomSummary() {
-        room.flow().liveRoomSummary()
-                .unwrap()
-                .execute { async ->
-                    copy(
-                            asyncRoomSummary = async
-                    )
-                }
+        if (room == null) {
+            Timber.w("Warning, room with Id ${initialState.roomId} is not found.")
+            setState {
+                copy(
+                        asyncRoomSummary = Fail(RoomNotFound())
+                )
+            }
+        } else {
+            room.flow().liveRoomSummary()
+                    .unwrap()
+                    .execute { async ->
+                        copy(
+                                asyncRoomSummary = async
+                        )
+                    }
+        }
+    }
+
+    private fun observeLocalRoomSummary() {
+        if (room != null && RoomLocalEcho.isLocalEchoId(room.roomId)) {
+            room.flow().liveLocalRoomSummary()
+                    .unwrap()
+                    .map { it.creationState }
+                    .distinctUntilChanged()
+                    .onEach { creationState ->
+                        when (creationState) {
+                            LocalRoomCreationState.NOT_CREATED -> Unit
+                            LocalRoomCreationState.CREATING ->
+                                _viewEvents.post(RoomDetailViewEvents.ShowWaitingView(stringProvider.getString(R.string.creating_direct_room)))
+                            LocalRoomCreationState.FAILURE -> {
+                                _viewEvents.post(RoomDetailViewEvents.HideWaitingView)
+                            }
+                            LocalRoomCreationState.CREATED -> {
+                                room.localRoomSummary()?.let {
+                                    analyticsTracker.capture(CreatedRoom(isDM = it.roomSummary?.isDirect.orFalse()))
+                                    _viewEvents.post(RoomDetailViewEvents.OpenRoom(it.replacementRoomId!!, true))
+                                }
+                            }
+                        }
+                    }
+                    .launchIn(viewModelScope)
+        }
     }
 
     private fun getUnreadState() {
+        if (room == null) return
         combine(
                 timelineEvents,
                 room.flow().liveRoomSummary().unwrap()
@@ -1206,6 +1334,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun computeUnreadState(events: List<TimelineEvent>, roomSummary: RoomSummary): UnreadState {
+        if (timeline == null) return UnreadState.Unknown
         if (events.isEmpty()) return UnreadState.Unknown
         val readMarkerIdSnapshot = roomSummary.readMarkerId ?: return UnreadState.Unknown
         val firstDisplayableEventIndex = timeline.getIndexOfEvent(readMarkerIdSnapshot)
@@ -1252,6 +1381,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun observeSummaryState() {
+        if (room == null) return
         onAsync(RoomDetailViewState::asyncRoomSummary) { summary ->
             setState {
                 val typingMessage = typingHelper.getTypingMessage(summary.typingUsers)
@@ -1280,6 +1410,7 @@ class TimelineViewModel @AssistedInject constructor(
      */
     private var threadPermalinkHandled = false
     private fun navigateToThreadEventIfNeeded(snapshot: List<TimelineEvent>) {
+        if (timeline == null) return
         if (eventId != null && initialState.rootThreadEventId != null) {
             // When we have a permalink and we are in a thread timeline
             if (snapshot.firstOrNull { it.eventId == eventId } != null && !threadPermalinkHandled) {
@@ -1302,6 +1433,7 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     override fun onTimelineFailure(throwable: Throwable) {
+        if (timeline == null) return
         // If we have a critical timeline issue, we get back to live.
         timeline.restartWithEventId(null)
         _viewEvents.post(RoomDetailViewEvents.Failure(throwable))
@@ -1327,11 +1459,11 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     override fun onCleared() {
-        timeline.dispose()
-        timeline.removeAllListeners()
-        decryptionFailureTracker.onTimeLineDisposed(room.roomId)
+        timeline?.dispose()
+        timeline?.removeAllListeners()
+        decryptionFailureTracker.onTimeLineDisposed(initialState.roomId)
         if (vectorPreferences.sendTypingNotifs()) {
-            room.typingService().userStopsTyping()
+            room?.typingService()?.userStopsTyping()
         }
         chatEffectManager.delegate = null
         chatEffectManager.dispose()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
index 2e150daee6..900de041d0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
@@ -48,15 +48,15 @@ class AudioMessageHelper @Inject constructor(
 ) {
     private var mediaPlayer: MediaPlayer? = null
     private var currentPlayingId: String? = null
-    private var voiceRecorder: VoiceRecorder = voiceRecorderProvider.provideVoiceRecorder()
+    private val voiceRecorder: VoiceRecorder by lazy { voiceRecorderProvider.provideVoiceRecorder() }
 
     private val amplitudeList = mutableListOf<Int>()
 
     private var amplitudeTicker: CountUpTimer? = null
     private var playbackTicker: CountUpTimer? = null
 
-    fun initializeRecorder(attachmentData: ContentAttachmentData) {
-        voiceRecorder.initializeRecord(attachmentData)
+    fun initializeRecorder(roomId: String, attachmentData: ContentAttachmentData) {
+        voiceRecorder.initializeRecord(roomId, attachmentData)
         amplitudeList.clear()
         attachmentData.waveform?.let {
             amplitudeList.addAll(it)
@@ -66,7 +66,7 @@ class AudioMessageHelper @Inject constructor(
 
     fun startRecording(roomId: String) {
         stopPlayback()
-        playbackTracker.makeAllPlaybacksIdle()
+        playbackTracker.pauseAllPlaybacks()
         amplitudeList.clear()
 
         try {
@@ -79,18 +79,19 @@ class AudioMessageHelper @Inject constructor(
     }
 
     fun stopRecording(): MultiPickerAudioType? {
-        tryOrNull("Cannot stop media recording amplitude") {
-            stopRecordingAmplitudes()
-        }
         val voiceMessageFile = tryOrNull("Cannot stop media recorder!") {
             voiceRecorder.stopRecord()
             voiceRecorder.getVoiceMessageFile()
         }
 
-        try {
+        tryOrNull("Cannot stop media recording amplitude") {
+            stopRecordingAmplitudes()
+        }
+
+        return try {
             voiceMessageFile?.let {
                 val outputFileUri = FileProvider.getUriForFile(context, buildMeta.applicationId + ".fileProvider", it, "Voice message.${it.extension}")
-                return outputFileUri
+                outputFileUri
                         .toMultiPickerAudioType(context)
                         ?.apply {
                             waveform = if (amplitudeList.size < 50) {
@@ -99,10 +100,13 @@ class AudioMessageHelper @Inject constructor(
                                 amplitudeList.chunked(amplitudeList.size / 50) { items -> items.maxOrNull() ?: 0 }
                             }
                         }
-            } ?: return null
+            }
         } catch (e: FileNotFoundException) {
             Timber.e(e, "Cannot stop voice recording")
-            return null
+            null
+        } catch (e: RuntimeException) {
+            Timber.e(e, "Error while retrieving metadata")
+            null
         }
     }
 
@@ -110,6 +114,7 @@ class AudioMessageHelper @Inject constructor(
      * When entering in playback mode actually.
      */
     fun pauseRecording() {
+        // TODO should we pause instead of stop?
         voiceRecorder.stopRecord()
         stopRecordingAmplitudes()
     }
@@ -144,7 +149,7 @@ class AudioMessageHelper @Inject constructor(
     }
 
     private fun startPlayback(id: String, file: File) {
-        val currentPlaybackTime = playbackTracker.getPlaybackTime(id)
+        val currentPlaybackTime = playbackTracker.getPlaybackTime(id) ?: 0
 
         try {
             FileInputStream(file).use { fis ->
@@ -194,11 +199,7 @@ class AudioMessageHelper @Inject constructor(
     private fun startRecordingAmplitudes() {
         amplitudeTicker?.stop()
         amplitudeTicker = CountUpTimer(50).apply {
-            tickListener = object : CountUpTimer.TickListener {
-                override fun onTick(milliseconds: Long) {
-                    onAmplitudeTick()
-                }
-            }
+            tickListener = CountUpTimer.TickListener { onAmplitudeTick() }
             resume()
         }
     }
@@ -217,6 +218,10 @@ class AudioMessageHelper @Inject constructor(
         }
     }
 
+    private fun resumeRecordingAmplitudes() {
+        amplitudeTicker?.resume()
+    }
+
     private fun stopRecordingAmplitudes() {
         amplitudeTicker?.stop()
         amplitudeTicker = null
@@ -225,11 +230,7 @@ class AudioMessageHelper @Inject constructor(
     private fun startPlaybackTicker(id: String) {
         playbackTicker?.stop()
         playbackTicker = CountUpTimer().apply {
-            tickListener = object : CountUpTimer.TickListener {
-                override fun onTick(milliseconds: Long) {
-                    onPlaybackTick(id)
-                }
-            }
+            tickListener = CountUpTimer.TickListener { onPlaybackTick(id) }
             resume()
         }
         onPlaybackTick(id)
@@ -252,8 +253,8 @@ class AudioMessageHelper @Inject constructor(
         playbackTicker = null
     }
 
-    fun clearTracker() {
-        playbackTracker.clear()
+    fun stopTracking() {
+        playbackTracker.unregisterListeners()
     }
 
     fun stopAllVoiceActions(deleteRecord: Boolean = true): MultiPickerAudioType? {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
index c751053cdf..9e88882866 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
@@ -20,10 +20,12 @@ package im.vector.app.features.home.room.detail.composer
 import android.content.ClipData
 import android.content.Context
 import android.net.Uri
+import android.os.Build
 import android.text.Editable
 import android.util.AttributeSet
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputConnection
+import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.view.OnReceiveContentListener
 import androidx.core.view.ViewCompat
@@ -79,6 +81,27 @@ class ComposerEditText @JvmOverloads constructor(
         return ic
     }
 
+    /** Set whether the keyboard should disable personalized learning. */
+    @RequiresApi(Build.VERSION_CODES.O)
+    fun setUseIncognitoKeyboard(useIncognitoKeyboard: Boolean) {
+        imeOptions = if (useIncognitoKeyboard) {
+            imeOptions or EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
+        } else {
+            imeOptions and EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING.inv()
+        }
+    }
+
+    /** Set whether enter should send the message or add a new line. */
+    fun setSendMessageWithEnter(sendMessageWithEnter: Boolean) {
+        if (sendMessageWithEnter) {
+            inputType = inputType and EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE.inv()
+            imeOptions = imeOptions or EditorInfo.IME_ACTION_SEND
+        } else {
+            inputType = inputType or EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE
+            imeOptions = imeOptions and EditorInfo.IME_ACTION_SEND.inv()
+        }
+    }
+
     init {
         addTextChangedListener(
                 object : SimpleTextWatcher() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
index 527f42a67a..ffaaa235cf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
@@ -23,15 +23,17 @@ import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 
 sealed class MessageComposerAction : VectorViewModelAction {
-    data class SendMessage(val text: CharSequence, val autoMarkdown: Boolean) : MessageComposerAction()
-    data class EnterEditMode(val eventId: String, val text: String) : MessageComposerAction()
-    data class EnterQuoteMode(val eventId: String, val text: String) : MessageComposerAction()
-    data class EnterReplyMode(val eventId: String, val text: String) : MessageComposerAction()
-    data class EnterRegularMode(val text: String, val fromSharing: Boolean) : MessageComposerAction()
+    data class SendMessage(val text: CharSequence, val formattedText: String?, val autoMarkdown: Boolean) : MessageComposerAction()
+    data class EnterEditMode(val eventId: String) : MessageComposerAction()
+    data class EnterQuoteMode(val eventId: String) : MessageComposerAction()
+    data class EnterReplyMode(val eventId: String) : MessageComposerAction()
+    data class EnterRegularMode(val fromSharing: Boolean) : MessageComposerAction()
     data class UserIsTyping(val isTyping: Boolean) : MessageComposerAction()
     data class OnTextChanged(val text: CharSequence) : MessageComposerAction()
     data class OnEntersBackground(val composerText: String) : MessageComposerAction()
     data class SlashCommandConfirmed(val parsedCommand: ParsedCommand) : MessageComposerAction()
+    data class InsertUserDisplayName(val userId: String) : MessageComposerAction()
+    data class SetFullScreen(val isFullScreen: Boolean) : MessageComposerAction()
 
     // Voice Message
     data class InitializeVoiceRecorder(val attachmentData: ContentAttachmentData) : MessageComposerAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
new file mode 100644
index 0000000000..4849e20b6d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
@@ -0,0 +1,832 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Intent
+import android.content.res.Configuration
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.text.Spannable
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import android.widget.Toast
+import androidx.annotation.RequiresApi
+import androidx.core.text.buildSpannedString
+import androidx.core.view.isGone
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.parentFragmentViewModel
+import com.airbnb.mvrx.withState
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.vanniktech.emoji.EmojiPopup
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.error.fatalError
+import im.vector.app.core.extensions.registerStartForActivityResult
+import im.vector.app.core.extensions.showKeyboard
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.platform.lifecycleAwareLazy
+import im.vector.app.core.platform.showOptimizedSnackbar
+import im.vector.app.core.resources.BuildMeta
+import im.vector.app.core.utils.ExpandingBottomSheetBehavior
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.onPermissionDeniedDialog
+import im.vector.app.core.utils.registerForPermissionsResult
+import im.vector.app.databinding.FragmentComposerBinding
+import im.vector.app.features.VectorFeatures
+import im.vector.app.features.analytics.errors.ErrorTracker
+import im.vector.app.features.attachments.AttachmentType
+import im.vector.app.features.attachments.AttachmentTypeSelectorBottomSheet
+import im.vector.app.features.attachments.AttachmentTypeSelectorSharedAction
+import im.vector.app.features.attachments.AttachmentTypeSelectorSharedActionViewModel
+import im.vector.app.features.attachments.AttachmentTypeSelectorView
+import im.vector.app.features.attachments.AttachmentTypeSelectorViewModel
+import im.vector.app.features.attachments.AttachmentsHelper
+import im.vector.app.features.attachments.ContactAttachment
+import im.vector.app.features.attachments.ShareIntentHandler
+import im.vector.app.features.attachments.preview.AttachmentsPreviewActivity
+import im.vector.app.features.attachments.preview.AttachmentsPreviewArgs
+import im.vector.app.features.attachments.toGroupedContentAttachmentData
+import im.vector.app.features.command.Command
+import im.vector.app.features.command.ParsedCommand
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.AutoCompleter
+import im.vector.app.features.home.room.detail.RoomDetailAction
+import im.vector.app.features.home.room.detail.RoomDetailAction.VoiceBroadcastAction
+import im.vector.app.features.home.room.detail.TimelineViewModel
+import im.vector.app.features.home.room.detail.composer.link.SetLinkFragment
+import im.vector.app.features.home.room.detail.composer.link.SetLinkSharedAction
+import im.vector.app.features.home.room.detail.composer.link.SetLinkSharedActionViewModel
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
+import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel
+import im.vector.app.features.home.room.detail.upgrade.MigrateRoomBottomSheet
+import im.vector.app.features.html.PillImageSpan
+import im.vector.app.features.location.LocationSharingMode
+import im.vector.app.features.poll.PollMode
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.share.SharedData
+import im.vector.app.features.voice.VoiceFailure
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.util.MatrixItem
+import reactivecircus.flowbinding.android.view.focusChanges
+import reactivecircus.flowbinding.android.widget.textChanges
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), AttachmentsHelper.Callback, AttachmentTypeSelectorView.Callback {
+
+    companion object {
+        private const val ircPattern = " (IRC)"
+    }
+
+    @Inject lateinit var autoCompleterFactory: AutoCompleter.Factory
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var shareIntentHandler: ShareIntentHandler
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var vectorFeatures: VectorFeatures
+    @Inject lateinit var buildMeta: BuildMeta
+    @Inject lateinit var session: Session
+    @Inject lateinit var errorTracker: ErrorTracker
+
+    private val roomId: String get() = withState(timelineViewModel) { it.roomId }
+
+    private val autoCompleter: AutoCompleter by lazy {
+        autoCompleterFactory.create(roomId, isThreadTimeLine())
+    }
+
+    private val emojiPopup: EmojiPopup by lifecycleAwareLazy {
+        createEmojiPopup()
+    }
+
+    private val glideRequests by lazy {
+        GlideApp.with(this)
+    }
+
+    private val isEmojiKeyboardVisible: Boolean
+        get() = vectorPreferences.showEmojiKeyboard()
+
+    private var lockSendButton = false
+
+    private lateinit var attachmentsHelper: AttachmentsHelper
+    private lateinit var attachmentTypeSelector: AttachmentTypeSelectorView
+    private var bottomSheetBehavior: ExpandingBottomSheetBehavior<View>? = null
+
+    private val timelineViewModel: TimelineViewModel by parentFragmentViewModel()
+    private val messageComposerViewModel: MessageComposerViewModel by parentFragmentViewModel()
+    private lateinit var sharedActionViewModel: MessageSharedActionViewModel
+    private val attachmentViewModel: AttachmentTypeSelectorViewModel by fragmentViewModel()
+    private val attachmentActionsViewModel: AttachmentTypeSelectorSharedActionViewModel by viewModels()
+    private val setLinkActionsViewModel: SetLinkSharedActionViewModel by viewModels()
+
+    private val composer: MessageComposerView get() {
+        return if (vectorPreferences.isRichTextEditorEnabled()) {
+            views.richTextComposerLayout
+        } else {
+            views.composerLayout
+        }
+    }
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentComposerBinding {
+        return FragmentComposerBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
+
+        attachmentsHelper = AttachmentsHelper(requireContext(), this, buildMeta).register()
+
+        setupBottomSheet()
+        setupComposer()
+        setupEmojiButton()
+
+        views.composerLayout.isGone = vectorPreferences.isRichTextEditorEnabled()
+        views.richTextComposerLayout.isVisible = vectorPreferences.isRichTextEditorEnabled()
+        views.richTextComposerLayout.setOnErrorListener(errorTracker::trackError)
+
+        messageComposerViewModel.observeViewEvents {
+            when (it) {
+                is MessageComposerViewEvents.JoinRoomCommandSuccess -> handleJoinedToAnotherRoom(it)
+                is MessageComposerViewEvents.SlashCommandConfirmationRequest -> handleSlashCommandConfirmationRequest(it)
+                is MessageComposerViewEvents.SendMessageResult -> renderSendMessageResult(it)
+                is MessageComposerViewEvents.ShowMessage -> showSnackWithMessage(it.message)
+                is MessageComposerViewEvents.ShowRoomUpgradeDialog -> handleShowRoomUpgradeDialog(it)
+                is MessageComposerViewEvents.AnimateSendButtonVisibility -> handleSendButtonVisibilityChanged(it)
+                is MessageComposerViewEvents.OpenRoomMemberProfile -> openRoomMemberProfile(it.userId)
+                is MessageComposerViewEvents.VoicePlaybackOrRecordingFailure -> {
+                    if (it.throwable is VoiceFailure.UnableToRecord) {
+                        onCannotRecord()
+                    }
+                    showErrorInSnackbar(it.throwable)
+                }
+                is MessageComposerViewEvents.InsertUserDisplayName -> insertUserDisplayNameInTextEditor(it.userId)
+            }
+        }
+
+        messageComposerViewModel.onEach(MessageComposerViewState::sendMode, MessageComposerViewState::canSendMessage) { mode, canSend ->
+            if (!canSend.boolean()) {
+                return@onEach
+            }
+            when (mode) {
+                is SendMode.Regular -> renderRegularMode(mode.text.toString())
+                is SendMode.Edit -> renderSpecialMode(MessageComposerMode.Edit(mode.timelineEvent, mode.text.toString()))
+                is SendMode.Quote -> renderSpecialMode(MessageComposerMode.Quote(mode.timelineEvent, mode.text.toString()))
+                is SendMode.Reply -> renderSpecialMode(MessageComposerMode.Reply(mode.timelineEvent, mode.text.toString()))
+                is SendMode.Voice -> renderVoiceMessageMode(mode.text)
+            }
+        }
+
+        attachmentActionsViewModel.stream()
+                .filterIsInstance<AttachmentTypeSelectorSharedAction.SelectAttachmentTypeAction>()
+                .onEach { onTypeSelected(it.attachmentType) }
+                .launchIn(lifecycleScope)
+
+        setLinkActionsViewModel.stream()
+                .onEach { when (it) {
+                    is SetLinkSharedAction.Insert -> views.richTextComposerLayout.insertLink(it.link, it.text)
+                    is SetLinkSharedAction.Set -> views.richTextComposerLayout.setLink(it.link)
+                    SetLinkSharedAction.Remove -> views.richTextComposerLayout.removeLink()
+                } }
+                .launchIn(lifecycleScope)
+
+        messageComposerViewModel.stateFlow.map { it.isFullScreen }
+                .distinctUntilChanged()
+                .onEach { isFullScreen ->
+                    val state = if (isFullScreen) ExpandingBottomSheetBehavior.State.Expanded else ExpandingBottomSheetBehavior.State.Collapsed
+                    bottomSheetBehavior?.setState(state)
+                }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+
+        if (savedInstanceState == null) {
+            handleShareData()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+
+        withState(messageComposerViewModel) {
+            when {
+                it.isVoiceRecording && requireActivity().isChangingConfigurations -> {
+                    // we're rotating, maintain any active recordings
+                }
+                // TODO remove this when there will be a recording indicator outside of the timeline
+                // Pause voice broadcast if the timeline is not shown anymore
+                it.isRecordingVoiceBroadcast && !requireActivity().isChangingConfigurations -> timelineViewModel.handle(VoiceBroadcastAction.Recording.Pause)
+                else -> {
+                    timelineViewModel.handle(VoiceBroadcastAction.Listening.Pause)
+                    messageComposerViewModel.handle(MessageComposerAction.OnEntersBackground(composer.text.toString()))
+                }
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+
+        if (!vectorPreferences.isRichTextEditorEnabled()) {
+            autoCompleter.clear()
+        }
+        messageComposerViewModel.endAllVoiceActions()
+    }
+
+    override fun invalidate() = withState(
+            timelineViewModel, messageComposerViewModel, attachmentViewModel
+    ) { mainState, messageComposerState, attachmentState ->
+        if (mainState.tombstoneEvent != null) return@withState
+
+        (composer as? View)?.isVisible = messageComposerState.isComposerVisible
+        composer.sendButton.isInvisible = !messageComposerState.isSendButtonVisible
+        (composer as? RichTextComposerLayout)?.isTextFormattingEnabled = attachmentState.isTextFormattingEnabled
+    }
+
+    private fun setupBottomSheet() {
+        val parentView = view?.parent as? View ?: return
+        bottomSheetBehavior = ExpandingBottomSheetBehavior.from(parentView)?.apply {
+            applyInsetsToContentViewWhenCollapsed = true
+            topOffset = 22
+            useScrimView = true
+            scrimViewTranslationZ = 8
+            minCollapsedHeight = {
+                (composer as? RichTextComposerLayout)?.estimateCollapsedHeight() ?: -1
+            }
+            isDraggable = false
+            callback = object : ExpandingBottomSheetBehavior.Callback {
+                override fun onStateChanged(state: ExpandingBottomSheetBehavior.State) {
+                    // Dragging is disabled while the composer is collapsed
+                    bottomSheetBehavior?.isDraggable = state != ExpandingBottomSheetBehavior.State.Collapsed
+
+                    val setFullScreen = when (state) {
+                        ExpandingBottomSheetBehavior.State.Collapsed -> false
+                        ExpandingBottomSheetBehavior.State.Expanded -> true
+                        else -> return
+                    }
+
+                    (composer as? RichTextComposerLayout)?.setFullScreen(setFullScreen, true)
+
+                    messageComposerViewModel.handle(MessageComposerAction.SetFullScreen(setFullScreen))
+                }
+
+                override fun onSlidePositionChanged(view: View, yPosition: Float) {
+                    (composer as? RichTextComposerLayout)?.notifyIsBeingDragged(yPosition)
+                }
+            }
+        }
+    }
+
+    private fun setupComposer() {
+        val composerEditText = composer.editText
+        composerEditText.setHint(R.string.room_message_placeholder)
+
+        if (!vectorPreferences.isRichTextEditorEnabled()) {
+            autoCompleter.setup(composerEditText)
+        }
+
+        observerUserTyping()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            composerEditText.setUseIncognitoKeyboard(vectorPreferences.useIncognitoKeyboard())
+        }
+        composerEditText.setSendMessageWithEnter(vectorPreferences.sendMessageWithEnter())
+
+        composerEditText.setOnEditorActionListener { v, actionId, keyEvent ->
+            val imeActionId = actionId and EditorInfo.IME_MASK_ACTION
+            val isSendAction = EditorInfo.IME_ACTION_DONE == imeActionId || EditorInfo.IME_ACTION_SEND == imeActionId
+            // Add external keyboard functionality (to send messages)
+            val externalKeyboardPressedEnter = null != keyEvent &&
+                    !keyEvent.isShiftPressed &&
+                    keyEvent.keyCode == KeyEvent.KEYCODE_ENTER &&
+                    resources.configuration.keyboard != Configuration.KEYBOARD_NOKEYS
+            val sendMessageWithEnter = externalKeyboardPressedEnter && vectorPreferences.sendMessageWithEnter()
+            val result = if (isSendAction || sendMessageWithEnter) {
+                sendTextMessage(v.text)
+                true
+            } else false
+            result
+        }
+
+        composer.emojiButton?.isVisible = vectorPreferences.showEmojiKeyboard()
+
+        val showKeyboard = withState(timelineViewModel) { it.showKeyboardWhenPresented }
+        if (isThreadTimeLine() && showKeyboard) {
+            // Show keyboard when the user started a thread
+            composerEditText.showKeyboard(andRequestFocus = true)
+        }
+        composer.callback = object : Callback {
+            override fun onAddAttachment() {
+                if (vectorPreferences.isRichTextEditorEnabled()) {
+                    AttachmentTypeSelectorBottomSheet.show(childFragmentManager)
+                } else {
+                    if (!::attachmentTypeSelector.isInitialized) {
+                        attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@MessageComposerFragment)
+                        attachmentTypeSelector.setAttachmentVisibility(
+                                AttachmentType.LOCATION,
+                                vectorFeatures.isLocationSharingEnabled(),
+                        )
+                        attachmentTypeSelector.setAttachmentVisibility(
+                                AttachmentType.POLL, !isThreadTimeLine()
+                        )
+                        attachmentTypeSelector.setAttachmentVisibility(
+                                AttachmentType.VOICE_BROADCAST,
+                                vectorPreferences.isVoiceBroadcastEnabled(), // TODO check user permission
+                        )
+                    }
+                    attachmentTypeSelector.show(composer.attachmentButton)
+                }
+            }
+
+            override fun onExpandOrCompactChange() {
+                composer.emojiButton?.isVisible = isEmojiKeyboardVisible
+            }
+
+            override fun onSendMessage(text: CharSequence) = withState(messageComposerViewModel) { state ->
+                sendTextMessage(text, composer.formattedText)
+
+                if (state.isFullScreen) {
+                    messageComposerViewModel.handle(MessageComposerAction.SetFullScreen(false))
+                }
+            }
+
+            override fun onCloseRelatedMessage() {
+                messageComposerViewModel.handle(MessageComposerAction.EnterRegularMode(false))
+            }
+
+            override fun onRichContentSelected(contentUri: Uri): Boolean {
+                return sendUri(contentUri)
+            }
+
+            override fun onTextChanged(text: CharSequence) {
+                messageComposerViewModel.handle(MessageComposerAction.OnTextChanged(text))
+            }
+
+            override fun onFullScreenModeChanged() = withState(messageComposerViewModel) { state ->
+                messageComposerViewModel.handle(MessageComposerAction.SetFullScreen(!state.isFullScreen))
+            }
+
+            override fun onSetLink(isTextSupported: Boolean, initialLink: String?) {
+                SetLinkFragment.show(isTextSupported, initialLink, childFragmentManager)
+            }
+        }
+    }
+
+    private fun sendTextMessage(text: CharSequence, formattedText: String? = null) {
+        if (lockSendButton) {
+            Timber.w("Send button is locked")
+            return
+        }
+        if (text.isNotBlank()) {
+            composer.renderComposerMode(MessageComposerMode.Normal(""))
+            lockSendButton = true
+            if (formattedText != null) {
+                messageComposerViewModel.handle(MessageComposerAction.SendMessage(text, formattedText, false))
+            } else {
+                messageComposerViewModel.handle(MessageComposerAction.SendMessage(text, null, vectorPreferences.isMarkdownEnabled()))
+            }
+            emojiPopup.dismiss()
+        }
+    }
+
+    private fun sendUri(uri: Uri): Boolean {
+        val shareIntent = Intent(Intent.ACTION_SEND, uri)
+        val isHandled = shareIntentHandler.handleIncomingShareIntent(shareIntent, ::onContentAttachmentsReady, onPlainText = {
+            fatalError("Should not happen as we're generating a File based share Intent", vectorPreferences.failFast())
+        })
+        if (!isHandled) {
+            Toast.makeText(requireContext(), R.string.error_handling_incoming_share, Toast.LENGTH_SHORT).show()
+        }
+        return isHandled
+    }
+
+    private fun renderRegularMode(content: CharSequence) {
+        autoCompleter.exitSpecialMode()
+        composer.renderComposerMode(MessageComposerMode.Normal(content))
+    }
+
+    private fun renderSpecialMode(mode: MessageComposerMode.Special) {
+        autoCompleter.enterSpecialMode()
+        composer.renderComposerMode(mode)
+    }
+
+    private fun observerUserTyping() {
+        if (isThreadTimeLine()) return
+        composer.editText.textChanges()
+                .skipInitialValue()
+                .debounce(300)
+                .map { it.isNotEmpty() }
+                .onEach {
+                    Timber.d("Typing: User is typing: $it")
+                    messageComposerViewModel.handle(MessageComposerAction.UserIsTyping(it))
+                }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+
+        composer.editText.focusChanges()
+                .onEach {
+                    timelineViewModel.handle(RoomDetailAction.ComposerFocusChange(it))
+                }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+
+    private fun focusComposerAndShowKeyboard() {
+        if ((composer as? View)?.isVisible == true) {
+            composer.editText.showKeyboard(andRequestFocus = true)
+        }
+    }
+
+    private fun handleSendButtonVisibilityChanged(event: MessageComposerViewEvents.AnimateSendButtonVisibility) {
+        if (event.isVisible) {
+            composer.sendButton.alpha = 0f
+            composer.sendButton.isVisible = true
+            composer.sendButton.animate().alpha(1f).setDuration(150).start()
+        } else {
+            composer.sendButton.isInvisible = true
+        }
+    }
+
+    private fun renderVoiceMessageMode(content: String) {
+        ContentAttachmentData.fromJsonString(content)?.let { audioAttachmentData ->
+            messageComposerViewModel.handle(MessageComposerAction.InitializeVoiceRecorder(audioAttachmentData))
+        }
+    }
+
+    private fun createEmojiPopup(): EmojiPopup {
+        return EmojiPopup(
+                rootView = views.root,
+                keyboardAnimationStyle = R.style.emoji_fade_animation_style,
+                onEmojiPopupShownListener = {
+                    composer.emojiButton?.apply {
+                        contentDescription = getString(R.string.a11y_close_emoji_picker)
+                        setImageResource(R.drawable.ic_keyboard)
+                    }
+                },
+                onEmojiPopupDismissListener = lifecycleAwareDismissAction {
+                    composer.emojiButton?.apply {
+                        contentDescription = getString(R.string.a11y_open_emoji_picker)
+                        setImageResource(R.drawable.ic_insert_emoji)
+                    }
+                },
+                editText = composer.editText
+        )
+    }
+
+    /**
+     *  Ensure dismiss actions only trigger when the fragment is in the started state.
+     *  EmojiPopup by default dismisses onViewDetachedFromWindow, this can cause race conditions with onDestroyView.
+     */
+    private fun lifecycleAwareDismissAction(action: () -> Unit): () -> Unit {
+        return {
+            if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                action()
+            }
+        }
+    }
+
+    private fun setupEmojiButton() {
+        composer.emojiButton?.debouncedClicks {
+            emojiPopup.toggle()
+        }
+    }
+
+    private fun onCannotRecord() {
+        // Update the UI, cancel the animation
+        messageComposerViewModel.handle(MessageComposerAction.OnVoiceRecordingUiStateChanged(VoiceMessageRecorderView.RecordingUiState.Idle))
+    }
+
+    private fun handleJoinedToAnotherRoom(action: MessageComposerViewEvents.JoinRoomCommandSuccess) {
+        composer.setTextIfDifferent("")
+        lockSendButton = false
+        navigator.openRoom(vectorBaseActivity, action.roomId)
+    }
+
+    private fun handleSlashCommandConfirmationRequest(action: MessageComposerViewEvents.SlashCommandConfirmationRequest) {
+        when (action.parsedCommand) {
+            is ParsedCommand.UnignoreUser -> promptUnignoreUser(action.parsedCommand)
+            else -> TODO("Add case for ${action.parsedCommand.javaClass.simpleName}")
+        }
+        lockSendButton = false
+    }
+
+    private fun promptUnignoreUser(command: ParsedCommand.UnignoreUser) {
+        MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(R.string.room_participants_action_unignore_title)
+                .setMessage(getString(R.string.settings_unignore_user, command.userId))
+                .setPositiveButton(R.string.unignore) { _, _ ->
+                    messageComposerViewModel.handle(MessageComposerAction.SlashCommandConfirmed(command))
+                }
+                .setNegativeButton(R.string.action_cancel, null)
+                .show()
+    }
+
+    private fun renderSendMessageResult(sendMessageResult: MessageComposerViewEvents.SendMessageResult) {
+        when (sendMessageResult) {
+            is MessageComposerViewEvents.SlashCommandLoading -> {
+                showLoading(null)
+            }
+            is MessageComposerViewEvents.SlashCommandError -> {
+                displayCommandError(getString(R.string.command_problem_with_parameters, sendMessageResult.command.command))
+            }
+            is MessageComposerViewEvents.SlashCommandUnknown -> {
+                displayCommandError(getString(R.string.unrecognized_command, sendMessageResult.command))
+            }
+            is MessageComposerViewEvents.SlashCommandResultOk -> {
+                handleSlashCommandResultOk(sendMessageResult.parsedCommand)
+            }
+            is MessageComposerViewEvents.SlashCommandResultError -> {
+                dismissLoadingDialog()
+                displayCommandError(errorFormatter.toHumanReadable(sendMessageResult.throwable))
+            }
+            is MessageComposerViewEvents.SlashCommandNotImplemented -> {
+                displayCommandError(getString(R.string.not_implemented))
+            }
+            is MessageComposerViewEvents.SlashCommandNotSupportedInThreads -> {
+                displayCommandError(getString(R.string.command_not_supported_in_threads, sendMessageResult.command.command))
+            }
+        }
+
+        lockSendButton = false
+    }
+
+    private fun handleSlashCommandResultOk(parsedCommand: ParsedCommand) {
+        dismissLoadingDialog()
+        composer.setTextIfDifferent("")
+        when (parsedCommand) {
+            is ParsedCommand.DevTools -> {
+                navigator.openDevTools(requireContext(), roomId)
+            }
+            is ParsedCommand.SetMarkdown -> {
+                showSnackWithMessage(getString(if (parsedCommand.enable) R.string.markdown_has_been_enabled else R.string.markdown_has_been_disabled))
+            }
+            else -> Unit
+        }
+    }
+
+    private fun displayCommandError(message: String) {
+        MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(R.string.command_error)
+                .setMessage(message)
+                .setPositiveButton(R.string.ok, null)
+                .show()
+    }
+
+    private fun showSnackWithMessage(message: String) {
+        view?.showOptimizedSnackbar(message)
+    }
+
+    private fun handleShowRoomUpgradeDialog(roomDetailViewEvents: MessageComposerViewEvents.ShowRoomUpgradeDialog) {
+        val tag = MigrateRoomBottomSheet::javaClass.name
+        val roomId = withState(timelineViewModel) { it.roomId }
+        MigrateRoomBottomSheet.newInstance(roomId, roomDetailViewEvents.newVersion)
+                .show(parentFragmentManager, tag)
+    }
+
+    private fun openRoomMemberProfile(userId: String) {
+        navigator.openRoomMemberProfile(userId = userId, roomId = roomId, context = requireActivity())
+    }
+
+    private val contentAttachmentActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        val data = activityResult.data ?: return@registerStartForActivityResult
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val sendData = AttachmentsPreviewActivity.getOutput(data)
+            val keepOriginalSize = AttachmentsPreviewActivity.getKeepOriginalSize(data)
+            timelineViewModel.handle(RoomDetailAction.SendMedia(sendData, !keepOriginalSize))
+        }
+    }
+
+    // AttachmentsHelper.Callback
+    override fun onContentAttachmentsReady(attachments: List<ContentAttachmentData>) {
+        val grouped = attachments.toGroupedContentAttachmentData()
+        if (grouped.notPreviewables.isNotEmpty()) {
+            // Send the not previewable attachments right now (?)
+            timelineViewModel.handle(RoomDetailAction.SendMedia(grouped.notPreviewables, false))
+        }
+        if (grouped.previewables.isNotEmpty()) {
+            val intent = AttachmentsPreviewActivity.newIntent(requireContext(), AttachmentsPreviewArgs(grouped.previewables))
+            contentAttachmentActivityResultLauncher.launch(intent)
+        }
+    }
+
+    override fun onContactAttachmentReady(contactAttachment: ContactAttachment) {
+        val formattedContact = contactAttachment.toHumanReadable()
+        messageComposerViewModel.handle(MessageComposerAction.SendMessage(formattedContact, null, false))
+    }
+
+    override fun onAttachmentError(throwable: Throwable) {
+        showFailure(throwable)
+    }
+
+    // AttachmentTypeSelectorView.Callback
+    private val typeSelectedActivityResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
+        if (allGranted) {
+            val pendingType = attachmentsHelper.pendingType
+            if (pendingType != null) {
+                attachmentsHelper.pendingType = null
+                launchAttachmentProcess(pendingType)
+            }
+        } else {
+            if (deniedPermanently) {
+                activity?.onPermissionDeniedDialog(R.string.denied_permission_generic)
+            }
+            cleanUpAfterPermissionNotGranted()
+        }
+    }
+
+    private fun launchAttachmentProcess(type: AttachmentType) {
+        when (type) {
+            AttachmentType.CAMERA -> attachmentsHelper.openCamera(
+                    activity = requireActivity(),
+                    vectorPreferences = vectorPreferences,
+                    cameraActivityResultLauncher = attachmentCameraActivityResultLauncher,
+                    cameraVideoActivityResultLauncher = attachmentCameraVideoActivityResultLauncher
+            )
+            AttachmentType.FILE -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
+            AttachmentType.GALLERY -> attachmentsHelper.selectGallery(attachmentMediaActivityResultLauncher)
+            AttachmentType.CONTACT -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
+            AttachmentType.STICKER -> timelineViewModel.handle(RoomDetailAction.SelectStickerAttachment)
+            AttachmentType.POLL -> navigator.openCreatePoll(requireContext(), roomId, null, PollMode.CREATE)
+            AttachmentType.LOCATION -> {
+                navigator
+                        .openLocationSharing(
+                                context = requireContext(),
+                                roomId = roomId,
+                                mode = LocationSharingMode.STATIC_SHARING,
+                                initialLocationData = null,
+                                locationOwnerId = session.myUserId
+                        )
+            }
+            AttachmentType.VOICE_BROADCAST -> timelineViewModel.handle(VoiceBroadcastAction.Recording.Start)
+        }
+    }
+
+    override fun onTypeSelected(type: AttachmentType) {
+        if (checkPermissions(type.permissions, requireActivity(), typeSelectedActivityResultLauncher)) {
+            launchAttachmentProcess(type)
+        } else {
+            attachmentsHelper.pendingType = type
+        }
+    }
+
+    private val attachmentFileActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onFileResult(it.data)
+        }
+    }
+
+    private val attachmentContactActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onContactResult(it.data)
+        }
+    }
+
+    private val attachmentMediaActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onMediaResult(it.data)
+        }
+    }
+
+    private val attachmentCameraActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onCameraResult()
+        }
+    }
+
+    private val attachmentCameraVideoActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onCameraVideoResult()
+        }
+    }
+
+    private fun cleanUpAfterPermissionNotGranted() {
+        // Reset all pending data
+        timelineViewModel.pendingAction = null
+        attachmentsHelper.pendingType = null
+    }
+
+    private fun handleShareData() {
+        when (val sharedData = withState(timelineViewModel) { it.sharedData }) {
+            is SharedData.Text -> {
+                messageComposerViewModel.handle(MessageComposerAction.OnTextChanged(sharedData.text))
+                messageComposerViewModel.handle(MessageComposerAction.EnterRegularMode(fromSharing = true))
+            }
+            is SharedData.Attachments -> {
+                // open share edition
+                onContentAttachmentsReady(sharedData.attachmentData)
+            }
+            null -> Timber.v("No share data to process")
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun insertUserDisplayNameInTextEditor(userId: String) {
+        val startToCompose = composer.text.isNullOrBlank()
+
+        if (startToCompose &&
+                userId == session.myUserId) {
+            // Empty composer, current user: start an emote
+            composer.editText.setText("${Command.EMOTE.command} ")
+            composer.editText.setSelection(Command.EMOTE.command.length + 1)
+        } else {
+            val roomMember = timelineViewModel.getMember(userId)
+            val displayName = sanitizeDisplayName(roomMember?.displayName ?: userId)
+            val pill = buildSpannedString {
+                append(displayName)
+                setSpan(
+                        PillImageSpan(
+                                glideRequests,
+                                avatarRenderer,
+                                requireContext(),
+                                MatrixItem.UserItem(userId, displayName, roomMember?.avatarUrl)
+                        )
+                                .also { it.bind(composer.editText) },
+                        0,
+                        displayName.length,
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                append(if (startToCompose) ": " else " ")
+            }
+            if (startToCompose) {
+                if (displayName.startsWith("/")) {
+                    // Ensure displayName will not be interpreted as a Slash command
+                    composer.editText.append("\\")
+                }
+                composer.editText.append(pill)
+            } else {
+                composer.editText.text?.insert(composer.editText.selectionStart, pill)
+            }
+        }
+        focusComposerAndShowKeyboard()
+    }
+
+    /**
+     * Sanitize the display name.
+     *
+     * @param displayName the display name to sanitize
+     * @return the sanitized display name
+     */
+    private fun sanitizeDisplayName(displayName: String): String {
+        if (displayName.endsWith(ircPattern)) {
+            return displayName.substring(0, displayName.length - ircPattern.length)
+        }
+
+        return displayName
+    }
+
+    /**
+     * Returns true if the current room is a Thread room, false otherwise.
+     */
+    private fun isThreadTimeLine(): Boolean = withState(timelineViewModel) { it.isThreadTimeline() }
+
+    /** Set whether the keyboard should disable personalized learning. */
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun EditText.setUseIncognitoKeyboard(useIncognitoKeyboard: Boolean) {
+        imeOptions = if (useIncognitoKeyboard) {
+            imeOptions or EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
+        } else {
+            imeOptions and EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING.inv()
+        }
+    }
+
+    /** Set whether enter should send the message or add a new line. */
+    private fun EditText.setSendMessageWithEnter(sendMessageWithEnter: Boolean) {
+        if (sendMessageWithEnter) {
+            inputType = inputType and EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE.inv()
+            imeOptions = imeOptions or EditorInfo.IME_ACTION_SEND
+        } else {
+            inputType = inputType or EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE
+            imeOptions = imeOptions and EditorInfo.IME_ACTION_SEND.inv()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerMode.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerMode.kt
new file mode 100644
index 0000000000..89cb148639
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerMode.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer
+
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+
+sealed interface MessageComposerMode {
+    data class Normal(val content: CharSequence?) : MessageComposerMode
+
+    sealed class Special(open val event: TimelineEvent, open val defaultContent: CharSequence) : MessageComposerMode
+    data class Edit(override val event: TimelineEvent, override val defaultContent: CharSequence) : Special(event, defaultContent)
+    data class Quote(override val event: TimelineEvent, override val defaultContent: CharSequence) : Special(event, defaultContent)
+    data class Reply(override val event: TimelineEvent, override val defaultContent: CharSequence) : Special(event, defaultContent)
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
index 1522960cc9..b68f4046c8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2022 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,142 +16,34 @@
 
 package im.vector.app.features.home.room.detail.composer
 
-import android.content.Context
-import android.net.Uri
 import android.text.Editable
-import android.util.AttributeSet
-import android.view.ViewGroup
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.constraintlayout.widget.ConstraintSet
-import androidx.core.text.toSpannable
-import androidx.transition.ChangeBounds
-import androidx.transition.Fade
-import androidx.transition.Transition
-import androidx.transition.TransitionManager
-import androidx.transition.TransitionSet
-import im.vector.app.R
-import im.vector.app.core.extensions.setTextIfDifferent
-import im.vector.app.databinding.ComposerLayoutBinding
+import android.widget.EditText
+import android.widget.ImageButton
 
-/**
- * Encapsulate the timeline composer UX.
- */
-class MessageComposerView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr) {
+interface MessageComposerView {
 
-    interface Callback : ComposerEditText.Callback {
-        fun onCloseRelatedMessage()
-        fun onSendMessage(text: CharSequence)
-        fun onAddAttachment()
+    companion object {
+        const val MAX_LINES_WHEN_COLLAPSED = 10
     }
 
-    val views: ComposerLayoutBinding
-
-    var callback: Callback? = null
-
-    private var currentConstraintSetId: Int = -1
-
-    private val animationDuration = 100L
-
     val text: Editable?
-        get() = views.composerEditText.text
+    val formattedText: String?
+    val editText: EditText
+    val emojiButton: ImageButton?
+    val sendButton: ImageButton
+    val attachmentButton: ImageButton
 
-    init {
-        inflate(context, R.layout.composer_layout, this)
-        views = ComposerLayoutBinding.bind(this)
+    var callback: Callback?
 
-        collapse(false)
-
-        views.composerEditText.callback = object : ComposerEditText.Callback {
-            override fun onRichContentSelected(contentUri: Uri): Boolean {
-                return callback?.onRichContentSelected(contentUri) ?: false
-            }
-
-            override fun onTextChanged(text: CharSequence) {
-                callback?.onTextChanged(text)
-            }
-        }
-        views.composerRelatedMessageCloseButton.setOnClickListener {
-            collapse()
-            callback?.onCloseRelatedMessage()
-        }
-
-        views.sendButton.setOnClickListener {
-            val textMessage = text?.toSpannable() ?: ""
-            callback?.onSendMessage(textMessage)
-        }
-
-        views.attachmentButton.setOnClickListener {
-            callback?.onAddAttachment()
-        }
-    }
-
-    fun collapse(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) {
-        if (currentConstraintSetId == R.layout.composer_layout_constraint_set_compact) {
-            // ignore we good
-            return
-        }
-        currentConstraintSetId = R.layout.composer_layout_constraint_set_compact
-        applyNewConstraintSet(animate, transitionComplete)
-    }
-
-    fun expand(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) {
-        if (currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded) {
-            // ignore we good
-            return
-        }
-        currentConstraintSetId = R.layout.composer_layout_constraint_set_expanded
-        applyNewConstraintSet(animate, transitionComplete)
-    }
-
-    fun setTextIfDifferent(text: CharSequence?): Boolean {
-        return views.composerEditText.setTextIfDifferent(text)
-    }
-
-    private fun applyNewConstraintSet(animate: Boolean, transitionComplete: (() -> Unit)?) {
-        // val wasSendButtonInvisible = views.sendButton.isInvisible
-        if (animate) {
-            configureAndBeginTransition(transitionComplete)
-        }
-        ConstraintSet().also {
-            it.clone(context, currentConstraintSetId)
-            it.applyTo(this)
-        }
-        // Might be updated by view state just after, but avoid blinks
-        // views.sendButton.isInvisible = wasSendButtonInvisible
-    }
-
-    private fun configureAndBeginTransition(transitionComplete: (() -> Unit)? = null) {
-        val transition = TransitionSet().apply {
-            ordering = TransitionSet.ORDERING_SEQUENTIAL
-            addTransition(ChangeBounds())
-            addTransition(Fade(Fade.IN))
-            duration = animationDuration
-            addListener(object : Transition.TransitionListener {
-                override fun onTransitionEnd(transition: Transition) {
-                    transitionComplete?.invoke()
-                }
-
-                override fun onTransitionResume(transition: Transition) {}
-
-                override fun onTransitionPause(transition: Transition) {}
-
-                override fun onTransitionCancel(transition: Transition) {}
-
-                override fun onTransitionStart(transition: Transition) {}
-            })
-        }
-        TransitionManager.beginDelayedTransition((parent as? ViewGroup ?: this), transition)
-    }
-
-    fun setRoomEncrypted(isEncrypted: Boolean) {
-        if (isEncrypted) {
-            views.composerEditText.setHint(R.string.room_message_placeholder)
-        } else {
-            views.composerEditText.setHint(R.string.room_message_placeholder)
-        }
-    }
+    fun setTextIfDifferent(text: CharSequence?): Boolean
+    fun renderComposerMode(mode: MessageComposerMode)
+}
+
+interface Callback : ComposerEditText.Callback {
+    fun onCloseRelatedMessage()
+    fun onSendMessage(text: CharSequence)
+    fun onAddAttachment()
+    fun onExpandOrCompactChange()
+    fun onFullScreenModeChanged()
+    fun onSetLink(isTextSupported: Boolean, initialLink: String?)
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
index e1f6923d21..3a949acb07 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
@@ -47,4 +47,6 @@ sealed class MessageComposerViewEvents : VectorViewEvents {
     data class ShowRoomUpgradeDialog(val newVersion: String, val isPublic: Boolean) : MessageComposerViewEvents()
 
     data class VoicePlaybackOrRecordingFailure(val throwable: Throwable) : MessageComposerViewEvents()
+
+    data class InsertUserDisplayName(val userId: String) : MessageComposerViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
index ca86010915..c02eb1fa8a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
@@ -16,6 +16,8 @@
 
 package im.vector.app.features.home.room.detail.composer
 
+import android.text.SpannableString
+import androidx.lifecycle.asFlow
 import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -23,6 +25,7 @@ import dagger.assisted.AssistedInject
 import im.vector.app.R
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.extensions.getVectorLastMessageContent
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.analytics.AnalyticsTracker
@@ -39,8 +42,12 @@ import im.vector.app.features.home.room.detail.toMessageType
 import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.VoiceBroadcastHelper
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
@@ -52,17 +59,18 @@ import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.getRoomSummary
+import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomAvatarContent
 import org.matrix.android.sdk.api.session.room.model.RoomEncryptionAlgorithm
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContentWithFormattedBody
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.relation.shouldRenderInThread
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.send.UserDraft
-import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.getRelationContent
 import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
 import org.matrix.android.sdk.api.session.space.CreateSpaceParams
@@ -79,40 +87,49 @@ class MessageComposerViewModel @AssistedInject constructor(
         private val rainbowGenerator: RainbowGenerator,
         private val audioMessageHelper: AudioMessageHelper,
         private val analyticsTracker: AnalyticsTracker,
+        private val voiceBroadcastHelper: VoiceBroadcastHelper,
 ) : VectorViewModel<MessageComposerViewState, MessageComposerAction, MessageComposerViewEvents>(initialState) {
 
-    private val room = session.getRoom(initialState.roomId)!!
+    private val room = session.getRoom(initialState.roomId)
 
     // Keep it out of state to avoid invalidate being called
     private var currentComposerText: CharSequence = ""
 
     init {
-        loadDraftIfAny()
-        observePowerLevelAndEncryption()
-        subscribeToStateInternal()
+        if (room != null) {
+            loadDraftIfAny(room)
+            observePowerLevelAndEncryption(room)
+            observeVoiceBroadcast(room)
+            subscribeToStateInternal()
+        } else {
+            onRoomError()
+        }
     }
 
     override fun handle(action: MessageComposerAction) {
+        val room = this.room ?: return
         when (action) {
-            is MessageComposerAction.EnterEditMode -> handleEnterEditMode(action)
-            is MessageComposerAction.EnterQuoteMode -> handleEnterQuoteMode(action)
+            is MessageComposerAction.EnterEditMode -> handleEnterEditMode(room, action)
+            is MessageComposerAction.EnterQuoteMode -> handleEnterQuoteMode(room, action)
             is MessageComposerAction.EnterRegularMode -> handleEnterRegularMode(action)
-            is MessageComposerAction.EnterReplyMode -> handleEnterReplyMode(action)
-            is MessageComposerAction.SendMessage -> handleSendMessage(action)
-            is MessageComposerAction.UserIsTyping -> handleUserIsTyping(action)
+            is MessageComposerAction.EnterReplyMode -> handleEnterReplyMode(room, action)
+            is MessageComposerAction.SendMessage -> handleSendMessage(room, action)
+            is MessageComposerAction.UserIsTyping -> handleUserIsTyping(room, action)
             is MessageComposerAction.OnTextChanged -> handleOnTextChanged(action)
             is MessageComposerAction.OnVoiceRecordingUiStateChanged -> handleOnVoiceRecordingUiStateChanged(action)
-            is MessageComposerAction.StartRecordingVoiceMessage -> handleStartRecordingVoiceMessage()
-            is MessageComposerAction.EndRecordingVoiceMessage -> handleEndRecordingVoiceMessage(action.isCancelled, action.rootThreadEventId)
+            is MessageComposerAction.StartRecordingVoiceMessage -> handleStartRecordingVoiceMessage(room)
+            is MessageComposerAction.EndRecordingVoiceMessage -> handleEndRecordingVoiceMessage(room, action.isCancelled, action.rootThreadEventId)
             is MessageComposerAction.PlayOrPauseVoicePlayback -> handlePlayOrPauseVoicePlayback(action)
             MessageComposerAction.PauseRecordingVoiceMessage -> handlePauseRecordingVoiceMessage()
             MessageComposerAction.PlayOrPauseRecordingPlayback -> handlePlayOrPauseRecordingPlayback()
-            is MessageComposerAction.InitializeVoiceRecorder -> handleInitializeVoiceRecorder(action.attachmentData)
-            is MessageComposerAction.OnEntersBackground -> handleEntersBackground(action.composerText)
+            is MessageComposerAction.InitializeVoiceRecorder -> handleInitializeVoiceRecorder(room, action.attachmentData)
+            is MessageComposerAction.OnEntersBackground -> handleEntersBackground(room, action.composerText)
             is MessageComposerAction.VoiceWaveformTouchedUp -> handleVoiceWaveformTouchedUp(action)
             is MessageComposerAction.VoiceWaveformMovedTo -> handleVoiceWaveformMovedTo(action)
             is MessageComposerAction.AudioSeekBarMovedTo -> handleAudioSeekBarMovedTo(action)
-            is MessageComposerAction.SlashCommandConfirmed -> handleSlashCommandConfirmed(action)
+            is MessageComposerAction.SlashCommandConfirmed -> handleSlashCommandConfirmed(room, action)
+            is MessageComposerAction.InsertUserDisplayName -> handleInsertUserDisplayName(action)
+            is MessageComposerAction.SetFullScreen -> handleSetFullScreen(action)
         }
     }
 
@@ -121,12 +138,11 @@ class MessageComposerViewModel @AssistedInject constructor(
     }
 
     private fun handleOnTextChanged(action: MessageComposerAction.OnTextChanged) {
-        setState {
-            // Makes sure currentComposerText is upToDate when accessing further setState
-            currentComposerText = action.text
-            this
+            val needsSendButtonVisibilityUpdate = currentComposerText.isEmpty() != action.text.isEmpty()
+        currentComposerText = SpannableString(action.text)
+        if (needsSendButtonVisibilityUpdate) {
+            updateIsSendButtonVisibility(true)
         }
-        updateIsSendButtonVisibility(true)
     }
 
     private fun subscribeToStateInternal() {
@@ -144,16 +160,21 @@ class MessageComposerViewModel @AssistedInject constructor(
     }
 
     private fun handleEnterRegularMode(action: MessageComposerAction.EnterRegularMode) = setState {
-        copy(sendMode = SendMode.Regular(action.text, action.fromSharing))
+        copy(sendMode = SendMode.Regular(currentComposerText, action.fromSharing))
     }
 
-    private fun handleEnterEditMode(action: MessageComposerAction.EnterEditMode) {
+    private fun handleEnterEditMode(room: Room, action: MessageComposerAction.EnterEditMode) {
         room.getTimelineEvent(action.eventId)?.let { timelineEvent ->
-            setState { copy(sendMode = SendMode.Edit(timelineEvent, timelineEvent.getTextEditableContent())) }
+            val formatted = vectorPreferences.isRichTextEditorEnabled()
+            setState { copy(sendMode = SendMode.Edit(timelineEvent, timelineEvent.getTextEditableContent(formatted))) }
         }
     }
 
-    private fun observePowerLevelAndEncryption() {
+    private fun handleSetFullScreen(action: MessageComposerAction.SetFullScreen) {
+        setState { copy(isFullScreen = action.isFullScreen) }
+    }
+
+    private fun observePowerLevelAndEncryption(room: Room) {
         combine(
                 PowerLevelsFlowFactory(room).createFlow(),
                 room.flow().liveRoomSummary().unwrap()
@@ -179,19 +200,29 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleEnterQuoteMode(action: MessageComposerAction.EnterQuoteMode) {
+    private fun observeVoiceBroadcast(room: Room) {
+        room.stateService().getStateEventLive(VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO, QueryStringValue.Equals(session.myUserId))
+                .asFlow()
+                .unwrap()
+                .mapNotNull { it.asVoiceBroadcastEvent()?.content?.voiceBroadcastState }
+                .setOnEach {
+                    copy(voiceBroadcastState = it)
+                }
+    }
+
+    private fun handleEnterQuoteMode(room: Room, action: MessageComposerAction.EnterQuoteMode) {
         room.getTimelineEvent(action.eventId)?.let { timelineEvent ->
-            setState { copy(sendMode = SendMode.Quote(timelineEvent, action.text)) }
+            setState { copy(sendMode = SendMode.Quote(timelineEvent, currentComposerText)) }
         }
     }
 
-    private fun handleEnterReplyMode(action: MessageComposerAction.EnterReplyMode) {
+    private fun handleEnterReplyMode(room: Room, action: MessageComposerAction.EnterReplyMode) {
         room.getTimelineEvent(action.eventId)?.let { timelineEvent ->
-            setState { copy(sendMode = SendMode.Reply(timelineEvent, action.text)) }
+            setState { copy(sendMode = SendMode.Reply(timelineEvent, currentComposerText)) }
         }
     }
 
-    private fun handleSendMessage(action: MessageComposerAction.SendMessage) {
+    private fun handleSendMessage(room: Room, action: MessageComposerAction.SendMessage) {
         withState { state ->
             analyticsTracker.capture(state.toAnalyticsComposer()).also {
                 setState { copy(startsThread = false) }
@@ -200,6 +231,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                 is SendMode.Regular -> {
                     when (val parsedCommand = commandParser.parseSlashCommand(
                             textMessage = action.text,
+                            formattedMessage = action.formattedText,
                             isInThreadTimeline = state.isInThreadTimeline()
                     )) {
                         is ParsedCommand.ErrorNotACommand -> {
@@ -208,14 +240,19 @@ class MessageComposerViewModel @AssistedInject constructor(
                                 room.relationService().replyInThread(
                                         rootThreadEventId = state.rootThreadEventId,
                                         replyInThreadText = action.text,
+                                        formattedText = action.formattedText,
                                         autoMarkdown = action.autoMarkdown
                                 )
                             } else {
-                                room.sendService().sendTextMessage(action.text, autoMarkdown = action.autoMarkdown)
+                                if (action.formattedText != null) {
+                                    room.sendService().sendFormattedTextMessage(action.text.toString(), action.formattedText)
+                                } else {
+                                    room.sendService().sendTextMessage(action.text, autoMarkdown = action.autoMarkdown)
+                                }
                             }
 
                             _viewEvents.post(MessageComposerViewEvents.MessageSent)
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.ErrorSyntax -> {
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandError(parsedCommand.command))
@@ -241,19 +278,41 @@ class MessageComposerViewModel @AssistedInject constructor(
                                 room.sendService().sendTextMessage(parsedCommand.message, autoMarkdown = false)
                             }
                             _viewEvents.post(MessageComposerViewEvents.MessageSent)
-                            popDraft()
+                            popDraft(room)
+                        }
+                        is ParsedCommand.SendFormattedText -> {
+                            // Send the text message to the room, without markdown
+                            if (state.rootThreadEventId != null) {
+                                room.relationService().replyInThread(
+                                        rootThreadEventId = state.rootThreadEventId,
+                                        replyInThreadText = parsedCommand.message,
+                                        formattedText = parsedCommand.formattedMessage,
+                                        autoMarkdown = false
+                                )
+                            } else {
+                                room.sendService().sendFormattedTextMessage(
+                                        text = parsedCommand.message.toString(),
+                                        formattedText = parsedCommand.formattedMessage
+                                )
+                            }
+                            _viewEvents.post(MessageComposerViewEvents.MessageSent)
+                            popDraft(room)
                         }
                         is ParsedCommand.ChangeRoomName -> {
-                            handleChangeRoomNameSlashCommand(parsedCommand)
+                            handleChangeRoomNameSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.Invite -> {
-                            handleInviteSlashCommand(parsedCommand)
+                            handleInviteSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.Invite3Pid -> {
-                            handleInvite3pidSlashCommand(parsedCommand)
+                            handleInvite3pidSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.SetUserPowerLevel -> {
-                            handleSetUserPowerLevel(parsedCommand)
+                            handleSetUserPowerLevel(room, parsedCommand)
+                        }
+                        is ParsedCommand.DevTools -> {
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
+                            popDraft(room)
                         }
                         is ParsedCommand.ClearScalarToken -> {
                             // TODO
@@ -262,29 +321,29 @@ class MessageComposerViewModel @AssistedInject constructor(
                         is ParsedCommand.SetMarkdown -> {
                             vectorPreferences.setMarkdownEnabled(parsedCommand.enable)
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.BanUser -> {
-                            handleBanSlashCommand(parsedCommand)
+                            handleBanSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.UnbanUser -> {
-                            handleUnbanSlashCommand(parsedCommand)
+                            handleUnbanSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.IgnoreUser -> {
-                            handleIgnoreSlashCommand(parsedCommand)
+                            handleIgnoreSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.UnignoreUser -> {
                             handleUnignoreSlashCommand(parsedCommand)
                         }
                         is ParsedCommand.RemoveUser -> {
-                            handleRemoveSlashCommand(parsedCommand)
+                            handleRemoveSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.JoinRoom -> {
                             handleJoinToAnotherRoomSlashCommand(parsedCommand)
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.PartRoom -> {
-                            handlePartSlashCommand(parsedCommand)
+                            handlePartSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.SendEmote -> {
                             if (state.rootThreadEventId != null) {
@@ -302,7 +361,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                                 )
                             }
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.SendRainbow -> {
                             val message = parsedCommand.message.toString()
@@ -316,7 +375,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                                 room.sendService().sendFormattedTextMessage(message, rainbowGenerator.generate(message))
                             }
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.SendRainbowEmote -> {
                             val message = parsedCommand.message.toString()
@@ -332,7 +391,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                             }
 
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.SendSpoiler -> {
                             val text = "[${stringProvider.getString(R.string.spoiler)}](${parsedCommand.message})"
@@ -350,48 +409,53 @@ class MessageComposerViewModel @AssistedInject constructor(
                                 )
                             }
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.SendShrug -> {
-                            sendPrefixedMessage("¯\\_(ツ)_/¯", parsedCommand.message, state.rootThreadEventId)
+                            sendPrefixedMessage(room, "¯\\_(ツ)_/¯", parsedCommand.message, state.rootThreadEventId)
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.SendLenny -> {
-                            sendPrefixedMessage("( ͡° ͜ʖ ͡°)", parsedCommand.message, state.rootThreadEventId)
+                            sendPrefixedMessage(room, "( ͡° ͜ʖ ͡°)", parsedCommand.message, state.rootThreadEventId)
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                            popDraft()
+                            popDraft(room)
+                        }
+                        is ParsedCommand.SendTableFlip -> {
+                            sendPrefixedMessage(room, "(╯°□°）╯︵ ┻━┻", parsedCommand.message, state.rootThreadEventId)
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
+                            popDraft(room)
                         }
                         is ParsedCommand.SendChatEffect -> {
-                            sendChatEffect(parsedCommand)
+                            sendChatEffect(room, parsedCommand)
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.ChangeTopic -> {
-                            handleChangeTopicSlashCommand(parsedCommand)
+                            handleChangeTopicSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.ChangeDisplayName -> {
-                            handleChangeDisplayNameSlashCommand(parsedCommand)
+                            handleChangeDisplayNameSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.ChangeDisplayNameForRoom -> {
-                            handleChangeDisplayNameForRoomSlashCommand(parsedCommand)
+                            handleChangeDisplayNameForRoomSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.ChangeRoomAvatar -> {
-                            handleChangeRoomAvatarSlashCommand(parsedCommand)
+                            handleChangeRoomAvatarSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.ChangeAvatarForRoom -> {
-                            handleChangeAvatarForRoomSlashCommand(parsedCommand)
+                            handleChangeAvatarForRoomSlashCommand(room, parsedCommand)
                         }
                         is ParsedCommand.ShowUser -> {
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                             handleWhoisSlashCommand(parsedCommand)
-                            popDraft()
+                            popDraft(room)
                         }
                         is ParsedCommand.DiscardSession -> {
                             if (room.roomCryptoService().isEncrypted()) {
                                 session.cryptoService().discardOutboundSession(room.roomId)
                                 _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                                popDraft()
+                                popDraft(room)
                             } else {
                                 _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                                 _viewEvents.post(
@@ -416,7 +480,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                                                     null,
                                                     true
                                             )
-                                    popDraft()
+                                    popDraft(room)
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                                 } catch (failure: Throwable) {
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
@@ -435,7 +499,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                                                     null,
                                                     false
                                             )
-                                    popDraft()
+                                    popDraft(room)
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                                 } catch (failure: Throwable) {
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
@@ -448,7 +512,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
                                     session.spaceService().joinSpace(parsedCommand.spaceIdOrAlias)
-                                    popDraft()
+                                    popDraft(room)
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                                 } catch (failure: Throwable) {
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
@@ -460,7 +524,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
                                     session.roomService().leaveRoom(parsedCommand.roomId)
-                                    popDraft()
+                                    popDraft(room)
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                                 } catch (failure: Throwable) {
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
@@ -476,7 +540,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                                     )
                             )
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
-                            popDraft()
+                            popDraft(room)
                         }
                     }
                 }
@@ -500,16 +564,24 @@ class MessageComposerViewModel @AssistedInject constructor(
                     if (inReplyTo != null) {
                         // TODO check if same content?
                         room.getTimelineEvent(inReplyTo)?.let {
-                            room.relationService().editReply(state.sendMode.timelineEvent, it, action.text.toString())
+                            room.relationService().editReply(state.sendMode.timelineEvent, it, action.text.toString(), action.formattedText)
                         }
                     } else {
-                        val messageContent = state.sendMode.timelineEvent.getLastMessageContent()
-                        val existingBody = messageContent?.body ?: ""
-                        if (existingBody != action.text) {
+                        val messageContent = state.sendMode.timelineEvent.getVectorLastMessageContent()
+                        val existingBody: String
+                        val needsEdit = if (messageContent is MessageContentWithFormattedBody) {
+                            existingBody = messageContent.formattedBody ?: ""
+                            existingBody != action.formattedText
+                        } else {
+                            existingBody = messageContent?.body ?: ""
+                            existingBody != action.text
+                        }
+                        if (needsEdit) {
                             room.relationService().editTextMessage(
                                     state.sendMode.timelineEvent,
                                     messageContent?.msgType ?: MessageType.MSGTYPE_TEXT,
                                     action.text,
+                                    action.formattedText,
                                     action.autoMarkdown
                             )
                         } else {
@@ -517,17 +589,18 @@ class MessageComposerViewModel @AssistedInject constructor(
                         }
                     }
                     _viewEvents.post(MessageComposerViewEvents.MessageSent)
-                    popDraft()
+                    popDraft(room)
                 }
                 is SendMode.Quote -> {
                     room.sendService().sendQuotedTextMessage(
                             quotedEvent = state.sendMode.timelineEvent,
                             text = action.text.toString(),
+                            formattedText = action.formattedText,
                             autoMarkdown = action.autoMarkdown,
                             rootThreadEventId = state.rootThreadEventId
                     )
                     _viewEvents.post(MessageComposerViewEvents.MessageSent)
-                    popDraft()
+                    popDraft(room)
                 }
                 is SendMode.Reply -> {
                     val timelineEvent = state.sendMode.timelineEvent
@@ -539,18 +612,20 @@ class MessageComposerViewModel @AssistedInject constructor(
                                 rootThreadEventId = it,
                                 replyInThreadText = action.text.toString(),
                                 autoMarkdown = action.autoMarkdown,
+                                formattedText = action.formattedText,
                                 eventReplied = timelineEvent
                         )
                     } ?: room.relationService().replyToMessage(
                             eventReplied = timelineEvent,
                             replyText = action.text.toString(),
+                            replyFormattedText = action.formattedText,
                             autoMarkdown = action.autoMarkdown,
                             showInThread = showInThread,
                             rootThreadEventId = rootThreadEventId
                     )
 
                     _viewEvents.post(MessageComposerViewEvents.MessageSent)
-                    popDraft()
+                    popDraft(room)
                 }
                 is SendMode.Voice -> {
                     // do nothing
@@ -559,10 +634,10 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun popDraft() = withState {
+    private fun popDraft(room: Room) = withState {
         if (it.sendMode is SendMode.Regular && it.sendMode.fromSharing) {
             // If we were sharing, we want to get back our last value from draft
-            loadDraftIfAny()
+            loadDraftIfAny(room)
         } else {
             // Otherwise we clear the composer and remove the draft from db
             setState { copy(sendMode = SendMode.Regular("", false)) }
@@ -572,7 +647,7 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun loadDraftIfAny() {
+    private fun loadDraftIfAny(room: Room) {
         val currentDraft = room.draftService().getDraft()
         setState {
             copy(
@@ -601,7 +676,7 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleUserIsTyping(action: MessageComposerAction.UserIsTyping) {
+    private fun handleUserIsTyping(room: Room, action: MessageComposerAction.UserIsTyping) {
         if (vectorPreferences.sendTypingNotifs()) {
             if (action.isTyping) {
                 room.typingService().userIsTyping()
@@ -611,7 +686,7 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun sendChatEffect(sendChatEffect: ParsedCommand.SendChatEffect) {
+    private fun sendChatEffect(room: Room, sendChatEffect: ParsedCommand.SendChatEffect) {
         // If message is blank, convert to an emote, with default message
         if (sendChatEffect.message.isBlank()) {
             val defaultMessage = stringProvider.getString(
@@ -663,25 +738,25 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleChangeTopicSlashCommand(changeTopic: ParsedCommand.ChangeTopic) {
-        launchSlashCommandFlowSuspendable(changeTopic) {
+    private fun handleChangeTopicSlashCommand(room: Room, changeTopic: ParsedCommand.ChangeTopic) {
+        launchSlashCommandFlowSuspendable(room, changeTopic) {
             room.stateService().updateTopic(changeTopic.topic)
         }
     }
 
-    private fun handleInviteSlashCommand(invite: ParsedCommand.Invite) {
-        launchSlashCommandFlowSuspendable(invite) {
+    private fun handleInviteSlashCommand(room: Room, invite: ParsedCommand.Invite) {
+        launchSlashCommandFlowSuspendable(room, invite) {
             room.membershipService().invite(invite.userId, invite.reason)
         }
     }
 
-    private fun handleInvite3pidSlashCommand(invite: ParsedCommand.Invite3Pid) {
-        launchSlashCommandFlowSuspendable(invite) {
+    private fun handleInvite3pidSlashCommand(room: Room, invite: ParsedCommand.Invite3Pid) {
+        launchSlashCommandFlowSuspendable(room, invite) {
             room.membershipService().invite3pid(invite.threePid)
         }
     }
 
-    private fun handleSetUserPowerLevel(setUserPowerLevel: ParsedCommand.SetUserPowerLevel) {
+    private fun handleSetUserPowerLevel(room: Room, setUserPowerLevel: ParsedCommand.SetUserPowerLevel) {
         val newPowerLevelsContent = room.getStateEvent(EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.IsEmpty)
                 ?.content
                 ?.toModel<PowerLevelsContent>()
@@ -689,19 +764,19 @@ class MessageComposerViewModel @AssistedInject constructor(
                 ?.toContent()
                 ?: return
 
-        launchSlashCommandFlowSuspendable(setUserPowerLevel) {
+        launchSlashCommandFlowSuspendable(room, setUserPowerLevel) {
             room.stateService().sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent)
         }
     }
 
-    private fun handleChangeDisplayNameSlashCommand(changeDisplayName: ParsedCommand.ChangeDisplayName) {
-        launchSlashCommandFlowSuspendable(changeDisplayName) {
+    private fun handleChangeDisplayNameSlashCommand(room: Room, changeDisplayName: ParsedCommand.ChangeDisplayName) {
+        launchSlashCommandFlowSuspendable(room, changeDisplayName) {
             session.profileService().setDisplayName(session.myUserId, changeDisplayName.displayName)
         }
     }
 
-    private fun handlePartSlashCommand(command: ParsedCommand.PartRoom) {
-        launchSlashCommandFlowSuspendable(command) {
+    private fun handlePartSlashCommand(room: Room, command: ParsedCommand.PartRoom) {
+        launchSlashCommandFlowSuspendable(room, command) {
             if (command.roomAlias == null) {
                 // Leave the current room
                 room
@@ -716,39 +791,39 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleRemoveSlashCommand(removeUser: ParsedCommand.RemoveUser) {
-        launchSlashCommandFlowSuspendable(removeUser) {
+    private fun handleRemoveSlashCommand(room: Room, removeUser: ParsedCommand.RemoveUser) {
+        launchSlashCommandFlowSuspendable(room, removeUser) {
             room.membershipService().remove(removeUser.userId, removeUser.reason)
         }
     }
 
-    private fun handleBanSlashCommand(ban: ParsedCommand.BanUser) {
-        launchSlashCommandFlowSuspendable(ban) {
+    private fun handleBanSlashCommand(room: Room, ban: ParsedCommand.BanUser) {
+        launchSlashCommandFlowSuspendable(room, ban) {
             room.membershipService().ban(ban.userId, ban.reason)
         }
     }
 
-    private fun handleUnbanSlashCommand(unban: ParsedCommand.UnbanUser) {
-        launchSlashCommandFlowSuspendable(unban) {
+    private fun handleUnbanSlashCommand(room: Room, unban: ParsedCommand.UnbanUser) {
+        launchSlashCommandFlowSuspendable(room, unban) {
             room.membershipService().unban(unban.userId, unban.reason)
         }
     }
 
-    private fun handleChangeRoomNameSlashCommand(changeRoomName: ParsedCommand.ChangeRoomName) {
-        launchSlashCommandFlowSuspendable(changeRoomName) {
+    private fun handleChangeRoomNameSlashCommand(room: Room, changeRoomName: ParsedCommand.ChangeRoomName) {
+        launchSlashCommandFlowSuspendable(room, changeRoomName) {
             room.stateService().updateName(changeRoomName.name)
         }
     }
 
-    private fun getMyRoomMemberContent(): RoomMemberContent? {
+    private fun getMyRoomMemberContent(room: Room): RoomMemberContent? {
         return room.getStateEvent(EventType.STATE_ROOM_MEMBER, QueryStringValue.Equals(session.myUserId))
                 ?.content
                 ?.toModel<RoomMemberContent>()
     }
 
-    private fun handleChangeDisplayNameForRoomSlashCommand(changeDisplayName: ParsedCommand.ChangeDisplayNameForRoom) {
-        launchSlashCommandFlowSuspendable(changeDisplayName) {
-            getMyRoomMemberContent()
+    private fun handleChangeDisplayNameForRoomSlashCommand(room: Room, changeDisplayName: ParsedCommand.ChangeDisplayNameForRoom) {
+        launchSlashCommandFlowSuspendable(room, changeDisplayName) {
+            getMyRoomMemberContent(room)
                     ?.copy(displayName = changeDisplayName.displayName)
                     ?.toContent()
                     ?.let {
@@ -757,15 +832,15 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleChangeRoomAvatarSlashCommand(changeAvatar: ParsedCommand.ChangeRoomAvatar) {
-        launchSlashCommandFlowSuspendable(changeAvatar) {
+    private fun handleChangeRoomAvatarSlashCommand(room: Room, changeAvatar: ParsedCommand.ChangeRoomAvatar) {
+        launchSlashCommandFlowSuspendable(room, changeAvatar) {
             room.stateService().sendStateEvent(EventType.STATE_ROOM_AVATAR, stateKey = "", RoomAvatarContent(changeAvatar.url).toContent())
         }
     }
 
-    private fun handleChangeAvatarForRoomSlashCommand(changeAvatar: ParsedCommand.ChangeAvatarForRoom) {
-        launchSlashCommandFlowSuspendable(changeAvatar) {
-            getMyRoomMemberContent()
+    private fun handleChangeAvatarForRoomSlashCommand(room: Room, changeAvatar: ParsedCommand.ChangeAvatarForRoom) {
+        launchSlashCommandFlowSuspendable(room, changeAvatar) {
+            getMyRoomMemberContent(room)
                     ?.copy(avatarUrl = changeAvatar.url)
                     ?.toContent()
                     ?.let {
@@ -774,8 +849,8 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleIgnoreSlashCommand(ignore: ParsedCommand.IgnoreUser) {
-        launchSlashCommandFlowSuspendable(ignore) {
+    private fun handleIgnoreSlashCommand(room: Room, ignore: ParsedCommand.IgnoreUser) {
+        launchSlashCommandFlowSuspendable(room, ignore) {
             session.userService().ignoreUserIds(listOf(ignore.userId))
         }
     }
@@ -784,15 +859,15 @@ class MessageComposerViewModel @AssistedInject constructor(
         _viewEvents.post(MessageComposerViewEvents.SlashCommandConfirmationRequest(unignore))
     }
 
-    private fun handleSlashCommandConfirmed(action: MessageComposerAction.SlashCommandConfirmed) {
+    private fun handleSlashCommandConfirmed(room: Room, action: MessageComposerAction.SlashCommandConfirmed) {
         when (action.parsedCommand) {
-            is ParsedCommand.UnignoreUser -> handleUnignoreSlashCommandConfirmed(action.parsedCommand)
+            is ParsedCommand.UnignoreUser -> handleUnignoreSlashCommandConfirmed(room, action.parsedCommand)
             else -> TODO("Not handled yet")
         }
     }
 
-    private fun handleUnignoreSlashCommandConfirmed(unignore: ParsedCommand.UnignoreUser) {
-        launchSlashCommandFlowSuspendable(unignore) {
+    private fun handleUnignoreSlashCommandConfirmed(room: Room, unignore: ParsedCommand.UnignoreUser) {
+        launchSlashCommandFlowSuspendable(room, unignore) {
             session.userService().unIgnoreUserIds(listOf(unignore.userId))
         }
     }
@@ -801,7 +876,7 @@ class MessageComposerViewModel @AssistedInject constructor(
         _viewEvents.post(MessageComposerViewEvents.OpenRoomMemberProfile(whois.userId))
     }
 
-    private fun sendPrefixedMessage(prefix: String, message: CharSequence, rootThreadEventId: String?) {
+    private fun sendPrefixedMessage(room: Room, prefix: String, message: CharSequence, rootThreadEventId: String?) {
         val sequence = buildString {
             append(prefix)
             if (message.isNotEmpty()) {
@@ -817,7 +892,7 @@ class MessageComposerViewModel @AssistedInject constructor(
     /**
      * Convert a send mode to a draft and save the draft.
      */
-    private fun handleSaveTextDraft(draft: String) = withState {
+    private fun handleSaveTextDraft(room: Room, draft: String) = withState {
         session.coroutineScope.launch {
             when {
                 it.sendMode is SendMode.Regular && !it.sendMode.fromSharing -> {
@@ -840,7 +915,7 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleStartRecordingVoiceMessage() {
+    private fun handleStartRecordingVoiceMessage(room: Room) {
         try {
             audioMessageHelper.startRecording(room.roomId)
         } catch (failure: Throwable) {
@@ -848,7 +923,7 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleEndRecordingVoiceMessage(isCancelled: Boolean, rootThreadEventId: String? = null) {
+    private fun handleEndRecordingVoiceMessage(room: Room, isCancelled: Boolean, rootThreadEventId: String? = null) {
         audioMessageHelper.stopPlayback()
         if (isCancelled) {
             audioMessageHelper.deleteRecording()
@@ -866,7 +941,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                 }
             }
         }
-        handleEnterRegularMode(MessageComposerAction.EnterRegularMode(text = "", fromSharing = false))
+        handleEnterRegularMode(MessageComposerAction.EnterRegularMode(fromSharing = false))
     }
 
     private fun handlePlayOrPauseVoicePlayback(action: MessageComposerAction.PlayOrPauseVoicePlayback) {
@@ -883,16 +958,20 @@ class MessageComposerViewModel @AssistedInject constructor(
     }
 
     private fun handlePlayOrPauseRecordingPlayback() {
-        audioMessageHelper.startOrPauseRecordingPlayback()
+        try {
+            audioMessageHelper.startOrPauseRecordingPlayback()
+        } catch (failure: Throwable) {
+            _viewEvents.post(MessageComposerViewEvents.VoicePlaybackOrRecordingFailure(failure))
+        }
     }
 
     fun endAllVoiceActions(deleteRecord: Boolean = true) {
-        audioMessageHelper.clearTracker()
+        audioMessageHelper.stopTracking()
         audioMessageHelper.stopAllVoiceActions(deleteRecord)
     }
 
-    private fun handleInitializeVoiceRecorder(attachmentData: ContentAttachmentData) {
-        audioMessageHelper.initializeRecorder(attachmentData)
+    private fun handleInitializeVoiceRecorder(room: Room, attachmentData: ContentAttachmentData) {
+        audioMessageHelper.initializeRecorder(room.roomId, attachmentData)
         setState { copy(voiceRecordingUiState = VoiceMessageRecorderView.RecordingUiState.Draft) }
     }
 
@@ -912,9 +991,11 @@ class MessageComposerViewModel @AssistedInject constructor(
         audioMessageHelper.movePlaybackTo(action.eventId, action.percentage, action.duration)
     }
 
-    private fun handleEntersBackground(composerText: String) {
+    private fun handleEntersBackground(room: Room, composerText: String) {
         // Always stop all voice actions. It may be playing in timeline or active recording
         val playingAudioContent = audioMessageHelper.stopAllVoiceActions(deleteRecord = false)
+        // TODO remove this when there will be a listening indicator outside of the timeline
+        voiceBroadcastHelper.pausePlayback()
 
         val isVoiceRecording = com.airbnb.mvrx.withState(this) { it.isVoiceRecording }
         if (isVoiceRecording) {
@@ -926,16 +1007,20 @@ class MessageComposerViewModel @AssistedInject constructor(
                 }
             }
         } else {
-            handleSaveTextDraft(draft = composerText)
+            handleSaveTextDraft(room = room, draft = composerText)
         }
     }
 
-    private fun launchSlashCommandFlowSuspendable(parsedCommand: ParsedCommand, block: suspend () -> Unit) {
+    private fun handleInsertUserDisplayName(action: MessageComposerAction.InsertUserDisplayName) {
+        _viewEvents.post(MessageComposerViewEvents.InsertUserDisplayName(action.userId))
+    }
+
+    private fun launchSlashCommandFlowSuspendable(room: Room, parsedCommand: ParsedCommand, block: suspend () -> Unit) {
         _viewEvents.post(MessageComposerViewEvents.SlashCommandLoading)
         viewModelScope.launch {
             val event = try {
                 block()
-                popDraft()
+                popDraft(room)
                 MessageComposerViewEvents.SlashCommandResultOk(parsedCommand)
             } catch (failure: Throwable) {
                 MessageComposerViewEvents.SlashCommandResultError(failure)
@@ -944,6 +1029,10 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
+    private fun onRoomError() = setState {
+        copy(isRoomError = true)
+    }
+
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<MessageComposerViewModel, MessageComposerViewState> {
         override fun create(initialState: MessageComposerViewState): MessageComposerViewModel
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
index 5698414ab4..235ca574fc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.home.room.detail.composer
 import com.airbnb.mvrx.MavericksState
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import kotlin.random.Random
@@ -33,15 +34,15 @@ import kotlin.random.Random
  */
 sealed interface SendMode {
     data class Regular(
-            val text: String,
+            val text: CharSequence,
             val fromSharing: Boolean,
             // This is necessary for forcing refresh on selectSubscribe
             private val random: Int = Random.nextInt()
     ) : SendMode
 
-    data class Quote(val timelineEvent: TimelineEvent, val text: String) : SendMode
-    data class Edit(val timelineEvent: TimelineEvent, val text: String) : SendMode
-    data class Reply(val timelineEvent: TimelineEvent, val text: String) : SendMode
+    data class Quote(val timelineEvent: TimelineEvent, val text: CharSequence) : SendMode
+    data class Edit(val timelineEvent: TimelineEvent, val text: CharSequence) : SendMode
+    data class Reply(val timelineEvent: TimelineEvent, val text: CharSequence) : SendMode
     data class Voice(val text: String) : SendMode
 }
 
@@ -61,12 +62,16 @@ fun CanSendStatus.boolean(): Boolean {
 
 data class MessageComposerViewState(
         val roomId: String,
+        val isRoomError: Boolean = false,
         val canSendMessage: CanSendStatus = CanSendStatus.Allowed,
         val isSendButtonVisible: Boolean = false,
         val rootThreadEventId: String? = null,
         val startsThread: Boolean = false,
         val sendMode: SendMode = SendMode.Regular("", false),
-        val voiceRecordingUiState: VoiceMessageRecorderView.RecordingUiState = VoiceMessageRecorderView.RecordingUiState.Idle
+        val voiceRecordingUiState: VoiceMessageRecorderView.RecordingUiState = VoiceMessageRecorderView.RecordingUiState.Idle,
+        val voiceBroadcastState: VoiceBroadcastState? = null,
+        val text: CharSequence? = null,
+        val isFullScreen: Boolean = false,
 ) : MavericksState {
 
     val isVoiceRecording = when (voiceRecordingUiState) {
@@ -76,10 +81,16 @@ data class MessageComposerViewState(
         is VoiceMessageRecorderView.RecordingUiState.Recording -> true
     }
 
+    val isRecordingVoiceBroadcast = when (voiceBroadcastState) {
+        VoiceBroadcastState.STARTED,
+        VoiceBroadcastState.RESUMED -> true
+        else -> false
+    }
+
     val isVoiceMessageIdle = !isVoiceRecording
 
-    val isComposerVisible = canSendMessage.boolean() && !isVoiceRecording
-    val isVoiceMessageRecorderVisible = canSendMessage.boolean() && !isSendButtonVisible
+    val isComposerVisible = canSendMessage.boolean() && !isVoiceRecording && !isRoomError
+    val isVoiceMessageRecorderVisible = canSendMessage.boolean() && !isSendButtonVisible && !isRoomError
 
     constructor(args: TimelineArgs) : this(
             roomId = args.roomId,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
new file mode 100644
index 0000000000..8f4dd9b71d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
@@ -0,0 +1,229 @@
+/*
+ * 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer
+
+import android.content.Context
+import android.net.Uri
+import android.text.Editable
+import android.text.format.DateUtils
+import android.util.AttributeSet
+import android.widget.EditText
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import androidx.core.text.toSpannable
+import androidx.core.view.isVisible
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.getVectorLastMessageContent
+import im.vector.app.core.extensions.setTextIfDifferent
+import im.vector.app.core.extensions.showKeyboard
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.databinding.ComposerLayoutBinding
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
+import im.vector.app.features.home.room.detail.timeline.image.buildImageContentRendererData
+import im.vector.app.features.html.EventHtmlRenderer
+import im.vector.app.features.html.PillsPostProcessor
+import im.vector.app.features.media.ImageContentRenderer
+import org.commonmark.parser.Parser
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
+import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+/**
+ * Encapsulate the timeline composer UX.
+ */
+@AndroidEntryPoint
+class PlainTextComposerLayout @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr), MessageComposerView {
+
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var matrixItemColorProvider: MatrixItemColorProvider
+    @Inject lateinit var eventHtmlRenderer: EventHtmlRenderer
+    @Inject lateinit var dimensionConverter: DimensionConverter
+    @Inject lateinit var imageContentRenderer: ImageContentRenderer
+    @Inject lateinit var pillsPostProcessorFactory: PillsPostProcessor.Factory
+
+    private val views: ComposerLayoutBinding
+
+    override var callback: Callback? = null
+
+    override val text: Editable?
+        get() = views.composerEditText.text
+
+    override val formattedText: String? = null
+
+    override val editText: EditText
+        get() = views.composerEditText
+
+    @Suppress("RedundantNullableReturnType")
+    override val emojiButton: ImageButton?
+        get() = views.composerEmojiButton
+
+    override val sendButton: ImageButton
+        get() = views.sendButton
+
+    override val attachmentButton: ImageButton
+        get() = views.attachmentButton
+
+    init {
+        inflate(context, R.layout.composer_layout, this)
+        views = ComposerLayoutBinding.bind(this)
+
+        views.composerEditText.maxLines = MessageComposerView.MAX_LINES_WHEN_COLLAPSED
+
+        collapse()
+
+        views.composerEditText.callback = object : ComposerEditText.Callback {
+            override fun onRichContentSelected(contentUri: Uri): Boolean {
+                return callback?.onRichContentSelected(contentUri) ?: false
+            }
+
+            override fun onTextChanged(text: CharSequence) {
+                callback?.onTextChanged(text)
+            }
+        }
+        views.composerRelatedMessageCloseButton.setOnClickListener {
+            collapse()
+            callback?.onCloseRelatedMessage()
+        }
+
+        views.sendButton.setOnClickListener {
+            val textMessage = text?.toSpannable() ?: ""
+            callback?.onSendMessage(textMessage)
+        }
+
+        views.attachmentButton.setOnClickListener {
+            callback?.onAddAttachment()
+        }
+    }
+
+    private fun collapse(transitionComplete: (() -> Unit)? = null) {
+        views.relatedMessageGroup.isVisible = false
+        transitionComplete?.invoke()
+        callback?.onExpandOrCompactChange()
+    }
+
+    private fun expand(transitionComplete: (() -> Unit)? = null) {
+        views.relatedMessageGroup.isVisible = true
+        transitionComplete?.invoke()
+        callback?.onExpandOrCompactChange()
+    }
+
+    override fun setTextIfDifferent(text: CharSequence?): Boolean {
+        return views.composerEditText.setTextIfDifferent(text)
+    }
+
+    override fun renderComposerMode(mode: MessageComposerMode) {
+        val specialMode = mode as? MessageComposerMode.Special
+        if (specialMode != null) {
+            renderSpecialMode(specialMode)
+        } else if (mode is MessageComposerMode.Normal) {
+            collapse()
+            editText.setTextIfDifferent(mode.content)
+        }
+
+        views.sendButton.apply {
+            if (mode is MessageComposerMode.Edit) {
+                contentDescription = resources.getString(R.string.action_save)
+                setImageResource(R.drawable.ic_composer_rich_text_save)
+            } else {
+                contentDescription = resources.getString(R.string.action_send)
+                setImageResource(R.drawable.ic_rich_composer_send)
+            }
+        }
+    }
+
+    private fun renderSpecialMode(specialMode: MessageComposerMode.Special) {
+        val event = specialMode.event
+        val defaultContent = specialMode.defaultContent
+
+        val iconRes: Int = when (specialMode) {
+            is MessageComposerMode.Reply -> R.drawable.ic_reply
+            is MessageComposerMode.Edit -> R.drawable.ic_edit
+            is MessageComposerMode.Quote -> R.drawable.ic_quote
+        }
+
+        val pillsPostProcessor = pillsPostProcessorFactory.create(event.roomId)
+
+        // switch to expanded bar
+        views.composerRelatedMessageTitle.apply {
+            text = event.senderInfo.disambiguatedDisplayName
+            setTextColor(matrixItemColorProvider.getColor(MatrixItem.UserItem(event.root.senderId ?: "@")))
+        }
+
+        val messageContent: MessageContent? = event.getVectorLastMessageContent()
+        val nonFormattedBody = when (messageContent) {
+            is MessageAudioContent -> getAudioContentBodyText(messageContent)
+            is MessagePollContent -> messageContent.getBestPollCreationInfo()?.question?.getBestQuestion()
+            is MessageBeaconInfoContent -> resources.getString(R.string.live_location_description)
+            else -> messageContent?.body.orEmpty()
+        }
+        var formattedBody: CharSequence? = null
+        if (messageContent is MessageTextContent && messageContent.format == MessageFormat.FORMAT_MATRIX_HTML) {
+            val parser = Parser.builder().build()
+            val document = parser.parse(messageContent.formattedBody ?: messageContent.body)
+            formattedBody = eventHtmlRenderer.render(document, pillsPostProcessor)
+        }
+        views.composerRelatedMessageContent.text = (formattedBody ?: nonFormattedBody)
+
+        // Image Event
+        val data = event.buildImageContentRendererData(dimensionConverter.dpToPx(66))
+        val isImageVisible = if (data != null) {
+            imageContentRenderer.render(data, ImageContentRenderer.Mode.THUMBNAIL, views.composerRelatedMessageImage)
+            true
+        } else {
+            imageContentRenderer.clear(views.composerRelatedMessageImage)
+            false
+        }
+
+        views.composerRelatedMessageImage.isVisible = isImageVisible
+
+        views.composerRelatedMessageActionIcon.setImageDrawable(ContextCompat.getDrawable(context, iconRes))
+
+        avatarRenderer.render(event.senderInfo.toMatrixItem(), views.composerRelatedMessageAvatar)
+
+        views.composerEditText.setText(defaultContent)
+
+        expand {
+            // need to do it here also when not using quick reply
+            if (isVisible) {
+                showKeyboard(andRequestFocus = true)
+            }
+            views.composerRelatedMessageImage.isVisible = isImageVisible
+        }
+    }
+
+    private fun getAudioContentBodyText(messageContent: MessageAudioContent): String {
+        val formattedDuration = DateUtils.formatElapsedTime(((messageContent.audioInfo?.duration ?: 0) / 1000).toLong())
+        return if (messageContent.voiceMessageIndicator != null) {
+            resources.getString(R.string.voice_message_reply_content, formattedDuration)
+        } else {
+            resources.getString(R.string.audio_message_reply_content, messageContent.body, formattedDuration)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
new file mode 100644
index 0000000000..1bb82b41fe
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
@@ -0,0 +1,476 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.ColorStateList
+import android.content.res.Configuration
+import android.graphics.Color
+import android.text.Editable
+import android.text.TextWatcher
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.core.text.toSpannable
+import androidx.core.view.isGone
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import com.google.android.material.shape.MaterialShapeDrawable
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextIfDifferent
+import im.vector.app.core.extensions.showKeyboard
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.databinding.ComposerRichTextLayoutBinding
+import im.vector.app.databinding.ViewRichTextMenuButtonBinding
+import io.element.android.wysiwyg.EditorEditText
+import io.element.android.wysiwyg.inputhandlers.models.InlineFormat
+import io.element.android.wysiwyg.inputhandlers.models.LinkAction
+import io.element.android.wysiwyg.utils.RustErrorCollector
+import uniffi.wysiwyg_composer.ActionState
+import uniffi.wysiwyg_composer.ComposerAction
+
+internal class RichTextComposerLayout @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr), MessageComposerView {
+
+    private val views: ComposerRichTextLayoutBinding
+
+    override var callback: Callback? = null
+
+    // There is no need to persist these values since they're always updated by the parent fragment
+    private var isFullScreen = false
+    private var hasRelatedMessage = false
+    private var composerMode: MessageComposerMode? = null
+
+    var isTextFormattingEnabled = true
+        set(value) {
+            if (field == value) return
+            syncEditTexts()
+            field = value
+            updateTextFieldBorder(isFullScreen)
+            updateEditTextVisibility()
+            updateFullScreenButtonVisibility()
+            // If formatting is no longer enabled and it's in full screen, minimise the editor
+            if (!value && isFullScreen) {
+                callback?.onFullScreenModeChanged()
+            }
+        }
+
+    override val text: Editable?
+        get() = editText.text
+    override val formattedText: String?
+        get() = (editText as? EditorEditText)?.getHtmlOutput()
+    override val editText: EditText
+        get() = if (isTextFormattingEnabled) {
+            views.richTextComposerEditText
+        } else {
+            views.plainTextComposerEditText
+        }
+    override val emojiButton: ImageButton?
+        get() = null
+    override val sendButton: ImageButton
+        get() = views.sendButton
+    override val attachmentButton: ImageButton
+        get() = views.attachmentButton
+
+    // Border of the EditText
+    private val borderShapeDrawable: MaterialShapeDrawable by lazy {
+        MaterialShapeDrawable().apply {
+            val typedData = TypedValue()
+            val lineColor = context.theme.obtainStyledAttributes(typedData.data, intArrayOf(R.attr.vctr_content_quaternary))
+                    .getColor(0, 0)
+            strokeColor = ColorStateList.valueOf(lineColor)
+            strokeWidth = 1 * resources.displayMetrics.scaledDensity
+            fillColor = ColorStateList.valueOf(Color.TRANSPARENT)
+            val cornerSize = resources.getDimensionPixelSize(R.dimen.rich_text_composer_corner_radius_single_line)
+            setCornerSize(cornerSize.toFloat())
+        }
+    }
+
+    private val dimensionConverter = DimensionConverter(resources)
+
+    fun setFullScreen(isFullScreen: Boolean, animated: Boolean) {
+        if (!animated && views.composerLayout.layoutParams != null) {
+            views.composerLayout.updateLayoutParams<ViewGroup.LayoutParams> {
+                height =
+                        if (isFullScreen) ViewGroup.LayoutParams.MATCH_PARENT else ViewGroup.LayoutParams.WRAP_CONTENT
+            }
+        }
+        editText.updateLayoutParams<ViewGroup.LayoutParams> {
+            height = if (isFullScreen) ViewGroup.LayoutParams.MATCH_PARENT else ViewGroup.LayoutParams.WRAP_CONTENT
+        }
+
+        updateTextFieldBorder(isFullScreen)
+        updateEditTextVisibility()
+
+        updateEditTextFullScreenState(views.richTextComposerEditText, isFullScreen)
+        updateEditTextFullScreenState(views.plainTextComposerEditText, isFullScreen)
+
+        views.composerFullScreenButton.setImageResource(
+                if (isFullScreen) R.drawable.ic_composer_collapse else R.drawable.ic_composer_full_screen
+        )
+
+        views.bottomSheetHandle.isVisible = isFullScreen
+        if (isFullScreen) {
+            editText.showKeyboard(true)
+        }
+        this.isFullScreen = isFullScreen
+    }
+
+    fun notifyIsBeingDragged(percentage: Float) {
+        // Calculate a new shape for the border according to the position in screen
+        val isSingleLine = editText.lineCount == 1
+        val cornerSize = if (!isSingleLine || hasRelatedMessage) {
+            resources.getDimensionPixelSize(R.dimen.rich_text_composer_corner_radius_expanded).toFloat()
+        } else {
+            val multilineCornerSize = resources.getDimensionPixelSize(R.dimen.rich_text_composer_corner_radius_expanded)
+            val singleLineCornerSize = resources.getDimensionPixelSize(R.dimen.rich_text_composer_corner_radius_single_line)
+            val diff = singleLineCornerSize - multilineCornerSize
+            multilineCornerSize + diff * (1 - percentage)
+        }
+        if (cornerSize != borderShapeDrawable.bottomLeftCornerResolvedSize) {
+            borderShapeDrawable.setCornerSize(cornerSize)
+        }
+
+        // Change maxLines while dragging, this should improve the smoothness of animations
+        val maxLines = if (percentage > 0.25f) {
+            Int.MAX_VALUE
+        } else {
+            MessageComposerView.MAX_LINES_WHEN_COLLAPSED
+        }
+        views.richTextComposerEditText.maxLines = maxLines
+        views.plainTextComposerEditText.maxLines = maxLines
+
+        views.bottomSheetHandle.isVisible = true
+    }
+
+    init {
+        inflate(context, R.layout.composer_rich_text_layout, this)
+        views = ComposerRichTextLayoutBinding.bind(this)
+
+        // Workaround to avoid cut-off text caused by padding in scrolled TextView (there is no clipToPadding).
+        // In TextView, clipTop = padding, but also clipTop -= shadowRadius. So if we set the shadowRadius to padding, they cancel each other
+        views.richTextComposerEditText.setShadowLayer(views.richTextComposerEditText.paddingBottom.toFloat(), 0f, 0f, 0)
+        views.plainTextComposerEditText.setShadowLayer(views.richTextComposerEditText.paddingBottom.toFloat(), 0f, 0f, 0)
+
+        renderComposerMode(MessageComposerMode.Normal(null))
+
+        views.richTextComposerEditText.addTextChangedListener(
+                TextChangeListener({ callback?.onTextChanged(it) }, { updateTextFieldBorder(isFullScreen) })
+        )
+        views.plainTextComposerEditText.addTextChangedListener(
+                TextChangeListener({ callback?.onTextChanged(it) }, { updateTextFieldBorder(isFullScreen) })
+        )
+
+        disallowParentInterceptTouchEvent(views.richTextComposerEditText)
+        disallowParentInterceptTouchEvent(views.plainTextComposerEditText)
+
+        views.composerModeCloseView.setOnClickListener {
+            callback?.onCloseRelatedMessage()
+        }
+
+        views.sendButton.setOnClickListener {
+            val textMessage = text?.toSpannable() ?: ""
+            callback?.onSendMessage(textMessage)
+        }
+
+        views.attachmentButton.setOnClickListener {
+            callback?.onAddAttachment()
+        }
+
+        views.composerFullScreenButton.apply {
+            updateFullScreenButtonVisibility()
+            setOnClickListener {
+                callback?.onFullScreenModeChanged()
+            }
+        }
+
+        views.composerEditTextOuterBorder.background = borderShapeDrawable
+
+        setupRichTextMenu()
+
+        updateTextFieldBorder(isFullScreen)
+    }
+
+    private fun setupRichTextMenu() {
+        addRichTextMenuItem(R.drawable.ic_composer_bold, R.string.rich_text_editor_format_bold, ComposerAction.BOLD) {
+            views.richTextComposerEditText.toggleInlineFormat(InlineFormat.Bold)
+        }
+        addRichTextMenuItem(R.drawable.ic_composer_italic, R.string.rich_text_editor_format_italic, ComposerAction.ITALIC) {
+            views.richTextComposerEditText.toggleInlineFormat(InlineFormat.Italic)
+        }
+        addRichTextMenuItem(R.drawable.ic_composer_underlined, R.string.rich_text_editor_format_underline, ComposerAction.UNDERLINE) {
+            views.richTextComposerEditText.toggleInlineFormat(InlineFormat.Underline)
+        }
+        addRichTextMenuItem(R.drawable.ic_composer_strikethrough, R.string.rich_text_editor_format_strikethrough, ComposerAction.STRIKE_THROUGH) {
+            views.richTextComposerEditText.toggleInlineFormat(InlineFormat.StrikeThrough)
+        }
+        addRichTextMenuItem(R.drawable.ic_composer_link, R.string.rich_text_editor_link, ComposerAction.LINK) {
+            views.richTextComposerEditText.getLinkAction()?.let {
+                when (it) {
+                    LinkAction.InsertLink -> callback?.onSetLink(isTextSupported = true, initialLink = null)
+                    is LinkAction.SetLink -> callback?.onSetLink(isTextSupported = false, initialLink = it.currentLink)
+                }
+            }
+        }
+        addRichTextMenuItem(R.drawable.ic_composer_bullet_list, R.string.rich_text_editor_bullet_list, ComposerAction.UNORDERED_LIST) {
+            views.richTextComposerEditText.toggleList(ordered = false)
+        }
+        addRichTextMenuItem(R.drawable.ic_composer_numbered_list, R.string.rich_text_editor_numbered_list, ComposerAction.ORDERED_LIST) {
+            views.richTextComposerEditText.toggleList(ordered = true)
+        }
+    }
+
+    fun setLink(link: String?) =
+            views.richTextComposerEditText.setLink(link)
+
+    fun insertLink(link: String, text: String) =
+            views.richTextComposerEditText.insertLink(link, text)
+
+    fun removeLink() =
+            views.richTextComposerEditText.removeLink()
+
+    @SuppressLint("ClickableViewAccessibility")
+    private fun disallowParentInterceptTouchEvent(view: View) {
+        view.setOnTouchListener { v, event ->
+            if (v.hasFocus()) {
+                v.parent?.requestDisallowInterceptTouchEvent(true)
+                val action = event.actionMasked
+                if (action == MotionEvent.ACTION_SCROLL) {
+                    v.parent?.requestDisallowInterceptTouchEvent(false)
+                    return@setOnTouchListener true
+                }
+            }
+            false
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        views.richTextComposerEditText.actionStatesChangedListener = EditorEditText.OnActionStatesChangedListener { state ->
+            for (action in state.keys) {
+                updateMenuStateFor(action, state)
+            }
+        }
+        updateEditTextVisibility()
+    }
+
+    fun setOnErrorListener(onError: (e: RichTextEditorException) -> Unit) {
+        views.richTextComposerEditText.rustErrorCollector = RustErrorCollector {
+            onError(RichTextEditorException(it))
+        }
+    }
+
+    private fun updateEditTextVisibility() {
+        views.richTextComposerEditText.isVisible = isTextFormattingEnabled
+        views.richTextMenu.isVisible = isTextFormattingEnabled
+        views.plainTextComposerEditText.isVisible = !isTextFormattingEnabled
+
+        // The layouts for formatted text mode and plain text mode are different, so we need to update the constraints
+        val dpToPx = { dp: Int -> dimensionConverter.dpToPx(dp) }
+        ConstraintSet().apply {
+            clone(views.composerLayoutContent)
+            clear(R.id.composerEditTextOuterBorder, ConstraintSet.TOP)
+            clear(R.id.composerEditTextOuterBorder, ConstraintSet.BOTTOM)
+            clear(R.id.composerEditTextOuterBorder, ConstraintSet.START)
+            clear(R.id.composerEditTextOuterBorder, ConstraintSet.END)
+            if (isTextFormattingEnabled) {
+                connect(R.id.composerEditTextOuterBorder, ConstraintSet.TOP, R.id.composerLayoutContent, ConstraintSet.TOP, dpToPx(8))
+                connect(R.id.composerEditTextOuterBorder, ConstraintSet.BOTTOM, R.id.sendButton, ConstraintSet.TOP, 0)
+                connect(R.id.composerEditTextOuterBorder, ConstraintSet.START, R.id.composerLayoutContent, ConstraintSet.START, dpToPx(12))
+                connect(R.id.composerEditTextOuterBorder, ConstraintSet.END, R.id.composerLayoutContent, ConstraintSet.END, dpToPx(12))
+            } else {
+                connect(R.id.composerEditTextOuterBorder, ConstraintSet.TOP, R.id.composerLayoutContent, ConstraintSet.TOP, dpToPx(8))
+                connect(R.id.composerEditTextOuterBorder, ConstraintSet.BOTTOM, R.id.composerLayoutContent, ConstraintSet.BOTTOM, dpToPx(8))
+                connect(R.id.composerEditTextOuterBorder, ConstraintSet.START, R.id.attachmentButton, ConstraintSet.END, 0)
+                connect(R.id.composerEditTextOuterBorder, ConstraintSet.END, R.id.sendButton, ConstraintSet.START, 0)
+            }
+            applyTo(views.composerLayoutContent)
+        }
+    }
+
+    private fun updateFullScreenButtonVisibility() {
+        val isLargeScreenDevice = resources.configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
+        val isLandscape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+        // There's no point in having full screen in landscape since there's almost no vertical space
+        views.composerFullScreenButton.isInvisible = !isTextFormattingEnabled || (isLandscape && !isLargeScreenDevice)
+    }
+
+    /**
+     * Updates the non-active input with the contents of the active input.
+     */
+    private fun syncEditTexts() =
+        if (isTextFormattingEnabled) {
+            views.plainTextComposerEditText.setText(views.richTextComposerEditText.getMarkdown())
+        } else {
+            views.richTextComposerEditText.setMarkdown(views.plainTextComposerEditText.text.toString())
+        }
+
+    private fun addRichTextMenuItem(@DrawableRes iconId: Int, @StringRes description: Int, action: ComposerAction, onClick: () -> Unit) {
+        val inflater = LayoutInflater.from(context)
+        val button = ViewRichTextMenuButtonBinding.inflate(inflater, views.richTextMenu, true)
+        button.root.tag = action
+        with(button.root) {
+            contentDescription = resources.getString(description)
+            setImageResource(iconId)
+            setOnClickListener {
+                onClick()
+            }
+        }
+    }
+
+    private fun updateMenuStateFor(action: ComposerAction, menuState: Map<ComposerAction, ActionState>) {
+        val button = findViewWithTag<ImageButton>(action) ?: return
+        val stateForAction = menuState[action]
+        button.isEnabled = stateForAction != ActionState.DISABLED
+        button.isSelected = stateForAction == ActionState.REVERSED
+    }
+
+    fun estimateCollapsedHeight(): Int {
+        val editText = this.editText
+        val originalLines = editText.maxLines
+        val originalParamsHeight = editText.layoutParams.height
+        editText.maxLines = MessageComposerView.MAX_LINES_WHEN_COLLAPSED
+        editText.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+        measure(
+                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.UNSPECIFIED,
+        )
+        val result = measuredHeight
+        editText.layoutParams.height = originalParamsHeight
+        editText.maxLines = originalLines
+        return result
+    }
+
+    private fun updateTextFieldBorder(isFullScreen: Boolean) {
+        val isMultiline = editText.editableText.lines().count() > 1 || isFullScreen || hasRelatedMessage
+        val cornerSize = if (isMultiline) {
+            resources.getDimensionPixelSize(R.dimen.rich_text_composer_corner_radius_expanded)
+        } else {
+            resources.getDimensionPixelSize(R.dimen.rich_text_composer_corner_radius_single_line)
+        }.toFloat()
+        borderShapeDrawable.setCornerSize(cornerSize)
+    }
+
+    private fun replaceFormattedContent(text: CharSequence) {
+        views.richTextComposerEditText.setHtml(text.toString())
+        updateTextFieldBorder(isFullScreen)
+    }
+
+    override fun setTextIfDifferent(text: CharSequence?): Boolean {
+        val result = editText.setTextIfDifferent(text)
+        updateTextFieldBorder(isFullScreen)
+        return result
+    }
+
+    private fun updateEditTextFullScreenState(editText: EditText, isFullScreen: Boolean) {
+        if (isFullScreen) {
+            editText.maxLines = Int.MAX_VALUE
+        } else {
+            editText.maxLines = MessageComposerView.MAX_LINES_WHEN_COLLAPSED
+        }
+    }
+
+    override fun renderComposerMode(mode: MessageComposerMode) {
+        if (mode is MessageComposerMode.Special) {
+            views.composerModeGroup.isVisible = true
+            if (isTextFormattingEnabled) {
+                replaceFormattedContent(mode.defaultContent)
+            } else {
+                views.plainTextComposerEditText.setText(mode.defaultContent)
+            }
+            hasRelatedMessage = true
+            editText.showKeyboard(andRequestFocus = true)
+        } else {
+            views.composerModeGroup.isGone = true
+            (mode as? MessageComposerMode.Normal)?.content?.let { text ->
+                if (isTextFormattingEnabled) {
+                    replaceFormattedContent(text)
+                } else {
+                    views.plainTextComposerEditText.setText(text)
+                }
+            }
+            hasRelatedMessage = false
+        }
+
+        updateTextFieldBorder(isFullScreen)
+
+        if (this.composerMode == mode) return
+        this.composerMode = mode
+
+        views.sendButton.apply {
+            if (mode is MessageComposerMode.Edit) {
+                contentDescription = resources.getString(R.string.action_save)
+                setImageResource(R.drawable.ic_composer_rich_text_save)
+            } else {
+                contentDescription = resources.getString(R.string.action_send)
+                setImageResource(R.drawable.ic_rich_composer_send)
+            }
+        }
+
+        when (mode) {
+            is MessageComposerMode.Edit -> {
+                views.composerModeTitleView.setText(R.string.editing)
+                views.composerModeIconView.setImageResource(R.drawable.ic_composer_rich_text_editor_edit)
+            }
+            is MessageComposerMode.Quote -> {
+                views.composerModeTitleView.setText(R.string.quoting)
+                views.composerModeIconView.setImageResource(R.drawable.ic_quote)
+            }
+            is MessageComposerMode.Reply -> {
+                val senderInfo = mode.event.senderInfo
+                val userName = senderInfo.displayName ?: senderInfo.disambiguatedDisplayName
+                views.composerModeTitleView.text = resources.getString(R.string.replying_to, userName)
+                views.composerModeIconView.setImageResource(R.drawable.ic_reply)
+            }
+            else -> Unit
+        }
+    }
+
+    private class TextChangeListener(
+            private val onTextChanged: (s: Editable) -> Unit,
+            private val onExpandedChanged: (isExpanded: Boolean) -> Unit,
+    ) : TextWatcher {
+        private var previousTextWasExpanded = false
+
+        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        override fun afterTextChanged(s: Editable) {
+            onTextChanged.invoke(s)
+
+            val isExpanded = s.lines().count() > 1
+            if (previousTextWasExpanded != isExpanded) {
+                onExpandedChanged(isExpanded)
+            }
+            previousTextWasExpanded = isExpanded
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextEditorException.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextEditorException.kt
new file mode 100644
index 0000000000..9bdef59ae3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextEditorException.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer
+
+internal class RichTextEditorException(
+        cause: Throwable,
+) : Exception(cause)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkAction.kt
new file mode 100644
index 0000000000..5cc31022ea
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkAction.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer.link
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class SetLinkAction : VectorViewModelAction {
+    data class LinkChanged(
+            val newLink: String
+    ) : SetLinkAction()
+
+    data class Save(
+            val link: String,
+            val text: String,
+    ) : SetLinkAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkFragment.kt
new file mode 100644
index 0000000000..008a8017ee
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkFragment.kt
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer.link
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isGone
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import com.airbnb.mvrx.args
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseDialogFragment
+import im.vector.app.databinding.FragmentSetLinkBinding
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.parcelize.Parcelize
+import reactivecircus.flowbinding.android.widget.textChanges
+
+@AndroidEntryPoint
+class SetLinkFragment :
+        VectorBaseDialogFragment<FragmentSetLinkBinding>() {
+
+    @Parcelize
+    data class Args(
+            val isTextSupported: Boolean,
+            val initialLink: String?,
+    ) : Parcelable
+
+    private val viewModel: SetLinkViewModel by fragmentViewModel()
+    private val sharedActionViewModel: SetLinkSharedActionViewModel by viewModels(
+            ownerProducer = { requireParentFragment() }
+    )
+    private val args: Args by args()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSetLinkBinding {
+        return FragmentSetLinkBinding.inflate(inflater, container, false)
+    }
+
+    companion object {
+        fun show(isTextSupported: Boolean, initialLink: String?, fragmentManager: FragmentManager) =
+                SetLinkFragment().apply {
+                    setArguments(Args(isTextSupported, initialLink))
+                }.show(fragmentManager, "SetLinkBottomSheet")
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        views.link.setText(args.initialLink)
+        views.link.textChanges()
+                .onEach {
+                    viewModel.handle(SetLinkAction.LinkChanged(it.toString()))
+                }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+
+        views.save.debouncedClicks {
+            viewModel.handle(
+                    SetLinkAction.Save(
+                            link = views.link.text.toString(),
+                            text = views.text.text.toString(),
+                    )
+            )
+        }
+
+        views.cancel.debouncedClicks(::onCancel)
+        views.remove.debouncedClicks(::onRemove)
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is SetLinkViewEvents.SavedLinkAndText -> handleInsert(link = it.link, text = it.text)
+                is SetLinkViewEvents.SavedLink -> handleSet(link = it.link)
+            }
+        }
+
+        views.toolbar.setNavigationOnClickListener {
+            dismiss()
+        }
+    }
+
+    override fun invalidate() = withState(viewModel) { viewState ->
+        views.toolbar.title = getString(
+                if (viewState.initialLink != null) {
+                    R.string.set_link_edit
+                } else {
+                    R.string.set_link_create
+                }
+        )
+
+        views.remove.isGone = !viewState.removeVisible
+        views.save.isEnabled = viewState.saveEnabled
+        views.textLayout.isGone = !viewState.isTextSupported
+    }
+
+    private fun handleInsert(link: String, text: String) {
+        sharedActionViewModel.post(SetLinkSharedAction.Insert(text, link))
+        dismiss()
+    }
+
+    private fun handleSet(link: String) {
+        sharedActionViewModel.post(SetLinkSharedAction.Set(link))
+        dismiss()
+    }
+
+    private fun onRemove() {
+        sharedActionViewModel.post(SetLinkSharedAction.Remove)
+        dismiss()
+    }
+
+    private fun onCancel() = dismiss()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkSharedActionViewModel.kt
new file mode 100644
index 0000000000..fb9f3f0d5b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkSharedActionViewModel.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ *
+ */
+package im.vector.app.features.home.room.detail.composer.link
+
+import im.vector.app.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedActionViewModel
+import javax.inject.Inject
+
+class SetLinkSharedActionViewModel @Inject constructor() :
+        VectorSharedActionViewModel<SetLinkSharedAction>()
+
+sealed interface SetLinkSharedAction : VectorSharedAction {
+    data class Set(
+            val link: String,
+    ) : SetLinkSharedAction
+
+    data class Insert(
+            val text: String,
+            val link: String,
+    ) : SetLinkSharedAction
+
+    object Remove : SetLinkSharedAction
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewEvents.kt
new file mode 100644
index 0000000000..cd42651c22
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewEvents.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer.link
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SetLinkViewEvents : VectorViewEvents {
+
+    data class SavedLink(
+            val link: String,
+    ) : SetLinkViewEvents()
+
+    data class SavedLinkAndText(
+            val link: String,
+            val text: String,
+    ) : SetLinkViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewModel.kt
new file mode 100644
index 0000000000..9a5b5cd8dd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewModel.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer.link
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.VectorViewModel
+
+class SetLinkViewModel @AssistedInject constructor(
+        @Assisted private val initialState: SetLinkViewState,
+) : VectorViewModel<SetLinkViewState, SetLinkAction, SetLinkViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<SetLinkViewModel, SetLinkViewState> {
+        override fun create(initialState: SetLinkViewState): SetLinkViewModel
+    }
+
+    companion object : MavericksViewModelFactory<SetLinkViewModel, SetLinkViewState> by hiltMavericksViewModelFactory()
+
+    override fun handle(action: SetLinkAction) = when (action) {
+        is SetLinkAction.LinkChanged -> handleLinkChanged(action.newLink)
+        is SetLinkAction.Save -> handleSave(action.link, action.text)
+    }
+
+    private fun handleLinkChanged(newLink: String) = setState {
+        copy(saveEnabled = newLink != initialLink.orEmpty())
+    }
+
+    private fun handleSave(
+            link: String,
+            text: String
+    ) = if (initialState.isTextSupported) {
+        _viewEvents.post(SetLinkViewEvents.SavedLinkAndText(link, text))
+    } else {
+        _viewEvents.post(SetLinkViewEvents.SavedLink(link))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewState.kt
new file mode 100644
index 0000000000..ea61f7eb72
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewState.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer.link
+
+import com.airbnb.mvrx.MavericksState
+
+data class SetLinkViewState(
+        val isTextSupported: Boolean,
+        val initialLink: String?,
+        val saveEnabled: Boolean,
+) : MavericksState {
+
+    constructor(args: SetLinkFragment.Args) : this(
+            isTextSupported = args.isTextSupported,
+            initialLink = args.initialLink,
+            saveEnabled = false,
+    )
+
+    val removeVisible = initialLink != null
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
index 1355c89006..1ff937add5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
@@ -21,6 +21,7 @@ import android.view.MotionEvent
 import im.vector.app.R
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.DraggingState
+import kotlin.math.absoluteValue
 
 class DraggableStateProcessor(
         resources: Resources,
@@ -46,7 +47,7 @@ class DraggableStateProcessor(
     fun process(event: MotionEvent, draggingState: DraggingState): DraggingState {
         val currentX = event.rawX
         val currentY = event.rawY
-        val distanceX = firstX - currentX
+        val distanceX = (firstX - currentX).absoluteValue
         val distanceY = firstY - currentY
         return draggingState.nextDragState(currentX, currentY, distanceX, distanceY).also {
             lastDistanceX = distanceX
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 13e0477ab6..a7b926f29a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -189,11 +189,9 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         val startMs = ((clock.epochMillis() - startAt)).coerceAtLeast(0)
         recordingTicker?.stop()
         recordingTicker = CountUpTimer().apply {
-            tickListener = object : CountUpTimer.TickListener {
-                override fun onTick(milliseconds: Long) {
-                    val isLocked = startFromLocked || lastKnownState is RecordingUiState.Locked
-                    onRecordingTick(isLocked, milliseconds + startMs)
-                }
+            tickListener = CountUpTimer.TickListener { milliseconds ->
+                val isLocked = startFromLocked || lastKnownState is RecordingUiState.Locked
+                onRecordingTick(isLocked, milliseconds + startMs)
             }
             resume()
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
index 1eac3b440a..ca31c53bb3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -147,7 +147,8 @@ class VoiceMessageViews(
     }
 
     fun showRecordingViews() {
-        views.voiceMessageMicButton.setImageResource(R.drawable.ic_voice_mic_recording)
+        views.voiceMessageBackgroundView.isVisible = true
+        views.voiceMessageMicButton.setImageResource(R.drawable.ic_composer_rich_mic_pressed)
         views.voiceMessageMicButton.setAttributeTintedBackground(R.drawable.circle_with_halo, R.attr.colorPrimary)
         views.voiceMessageMicButton.updateLayoutParams<ViewGroup.MarginLayoutParams> {
             setMargins(0, 0, 0, 0)
@@ -172,6 +173,7 @@ class VoiceMessageViews(
 
     fun hideRecordingViews(recordingState: RecordingUiState) {
         // We need to animate the lock image first
+        views.voiceMessageBackgroundView.isVisible = false
         if (recordingState !is RecordingUiState.Locked) {
             views.voiceMessageLockImage.isVisible = false
             views.voiceMessageLockImage.animate().translationY(0f).start()
@@ -260,7 +262,7 @@ class VoiceMessageViews(
 
     fun resetMicButtonUi() {
         views.voiceMessageMicButton.isVisible = true
-        views.voiceMessageMicButton.setImageResource(R.drawable.ic_voice_mic)
+        views.voiceMessageMicButton.setImageResource(R.drawable.ic_microphone)
         views.voiceMessageMicButton.setAttributeBackground(android.R.attr.selectableItemBackgroundBorderless)
         views.voiceMessageMicButton.updateLayoutParams<ViewGroup.MarginLayoutParams> {
             if (rtlXMultiplier == -1) {
@@ -278,6 +280,7 @@ class VoiceMessageViews(
 
     fun showDraftViews() {
         hideRecordingViews(RecordingUiState.Idle)
+        views.voiceMessageBackgroundView.isVisible = true
         views.voiceMessageMicButton.isVisible = false
         views.voiceMessageSendButton.isVisible = true
         views.voiceMessagePlaybackLayout.isVisible = true
@@ -288,6 +291,7 @@ class VoiceMessageViews(
 
     fun showRecordingLockedViews(recordingState: RecordingUiState) {
         hideRecordingViews(recordingState)
+        views.voiceMessageBackgroundView.isVisible = true
         views.voiceMessagePlaybackLayout.isVisible = true
         views.voiceMessagePlaybackTimerIndicator.isVisible = true
         views.voicePlaybackControlButton.isVisible = false
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceRecorderFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceRecorderFragment.kt
new file mode 100644
index 0000000000..25764f3654
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceRecorderFragment.kt
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer.voice
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.parentFragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.hardware.vibrate
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.time.Clock
+import im.vector.app.core.utils.PERMISSIONS_FOR_VOICE_MESSAGE
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.onPermissionDeniedSnackbar
+import im.vector.app.core.utils.registerForPermissionsResult
+import im.vector.app.databinding.FragmentVoiceRecorderBinding
+import im.vector.app.features.home.room.detail.TimelineViewModel
+import im.vector.app.features.home.room.detail.composer.MessageComposerAction
+import im.vector.app.features.home.room.detail.composer.MessageComposerViewEvents
+import im.vector.app.features.home.room.detail.composer.MessageComposerViewModel
+import im.vector.app.features.home.room.detail.composer.MessageComposerViewState
+import im.vector.app.features.home.room.detail.composer.SendMode
+import im.vector.app.features.home.room.detail.composer.boolean
+import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class VoiceRecorderFragment : VectorBaseFragment<FragmentVoiceRecorderBinding>() {
+
+    @Inject lateinit var audioMessagePlaybackTracker: AudioMessagePlaybackTracker
+    @Inject lateinit var clock: Clock
+
+    private val timelineViewModel: TimelineViewModel by parentFragmentViewModel()
+    private val messageComposerViewModel: MessageComposerViewModel by parentFragmentViewModel()
+
+    private val permissionVoiceMessageLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
+        if (allGranted) {
+            // In this case, let the user start again the gesture
+        } else if (deniedPermanently) {
+            vectorBaseActivity.onPermissionDeniedSnackbar(R.string.denied_permission_voice_message)
+        }
+    }
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentVoiceRecorderBinding {
+        return FragmentVoiceRecorderBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        messageComposerViewModel.observeViewEvents {
+            when (it) {
+                is MessageComposerViewEvents.AnimateSendButtonVisibility -> handleSendButtonVisibilityChanged(it.isVisible)
+                else -> Unit
+            }
+        }
+
+        messageComposerViewModel.onEach(MessageComposerViewState::sendMode, MessageComposerViewState::canSendMessage) { mode, canSend ->
+            if (!canSend.boolean()) {
+                return@onEach
+            }
+            if (mode is SendMode.Voice) {
+                views.voiceMessageRecorderView.isVisible = true
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // Removed listeners should be set again
+        setupVoiceMessageView()
+    }
+
+    override fun onPause() {
+        super.onPause()
+
+        audioMessagePlaybackTracker.pauseAllPlaybacks()
+    }
+
+    override fun invalidate() = withState(timelineViewModel, messageComposerViewModel) { mainState, messageComposerState ->
+        if (mainState.tombstoneEvent != null) return@withState
+
+        val hasVoiceDraft = messageComposerState.voiceRecordingUiState is VoiceMessageRecorderView.RecordingUiState.Draft
+        with(views.root) {
+            isVisible = messageComposerState.isVoiceMessageRecorderVisible || hasVoiceDraft
+            render(messageComposerState.voiceRecordingUiState)
+        }
+    }
+
+    private fun handleSendButtonVisibilityChanged(isSendButtonVisible: Boolean) {
+        if (isSendButtonVisible) {
+            views.root.isVisible = false
+        } else {
+            views.root.alpha = 0f
+            views.root.isVisible = true
+            views.root.animate().alpha(1f).setDuration(150).start()
+        }
+    }
+
+    private fun setupVoiceMessageView() {
+        audioMessagePlaybackTracker.track(AudioMessagePlaybackTracker.RECORDING_ID, views.voiceMessageRecorderView)
+        views.voiceMessageRecorderView.callback = object : VoiceMessageRecorderView.Callback {
+
+            override fun onVoiceRecordingStarted() {
+                if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
+                    messageComposerViewModel.handle(MessageComposerAction.StartRecordingVoiceMessage)
+                    vibrate(requireContext())
+                    updateRecordingUiState(VoiceMessageRecorderView.RecordingUiState.Recording(clock.epochMillis()))
+                }
+            }
+
+            override fun onVoicePlaybackButtonClicked() {
+                messageComposerViewModel.handle(MessageComposerAction.PlayOrPauseRecordingPlayback)
+            }
+
+            override fun onVoiceRecordingCancelled() {
+                messageComposerViewModel.handle(MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true, rootThreadEventId = getRootThreadEventId()))
+                vibrate(requireContext())
+                updateRecordingUiState(VoiceMessageRecorderView.RecordingUiState.Idle)
+            }
+
+            override fun onVoiceRecordingLocked() {
+                val startedState = withState(messageComposerViewModel) { it.voiceRecordingUiState as? VoiceMessageRecorderView.RecordingUiState.Recording }
+                val startTime = startedState?.recordingStartTimestamp ?: clock.epochMillis()
+                updateRecordingUiState(VoiceMessageRecorderView.RecordingUiState.Locked(startTime))
+            }
+
+            override fun onVoiceRecordingEnded() {
+                onSendVoiceMessage()
+            }
+
+            override fun onSendVoiceMessage() {
+                messageComposerViewModel.handle(
+                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = false, rootThreadEventId = getRootThreadEventId())
+                )
+                updateRecordingUiState(VoiceMessageRecorderView.RecordingUiState.Idle)
+            }
+
+            override fun onDeleteVoiceMessage() {
+                messageComposerViewModel.handle(
+                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true, rootThreadEventId = getRootThreadEventId())
+                )
+                updateRecordingUiState(VoiceMessageRecorderView.RecordingUiState.Idle)
+            }
+
+            override fun onRecordingLimitReached() = pauseRecording()
+
+            override fun onRecordingWaveformClicked() = pauseRecording()
+
+            override fun onVoiceWaveformTouchedUp(percentage: Float, duration: Int) {
+                messageComposerViewModel.handle(
+                        MessageComposerAction.VoiceWaveformTouchedUp(AudioMessagePlaybackTracker.RECORDING_ID, duration, percentage)
+                )
+            }
+
+            override fun onVoiceWaveformMoved(percentage: Float, duration: Int) {
+                messageComposerViewModel.handle(
+                        MessageComposerAction.VoiceWaveformTouchedUp(AudioMessagePlaybackTracker.RECORDING_ID, duration, percentage)
+                )
+            }
+
+            private fun updateRecordingUiState(state: VoiceMessageRecorderView.RecordingUiState) {
+                messageComposerViewModel.handle(
+                        MessageComposerAction.OnVoiceRecordingUiStateChanged(state)
+                )
+            }
+
+            private fun pauseRecording() {
+                messageComposerViewModel.handle(
+                        MessageComposerAction.PauseRecordingVoiceMessage
+                )
+                updateRecordingUiState(VoiceMessageRecorderView.RecordingUiState.Draft)
+            }
+        }
+    }
+
+    /**
+     * Returns the root thread event if we are in a thread room, otherwise returns null.
+     */
+    fun getRootThreadEventId(): String? = withState(timelineViewModel) { it.rootThreadEventId }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/error/RoomNotFound.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/error/RoomNotFound.kt
new file mode 100644
index 0000000000..3a8554ae4c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/error/RoomNotFound.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.error
+
+class RoomNotFound : Throwable()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
index eed596cda0..06f438d78e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
@@ -25,6 +25,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySearchBinding
+import im.vector.lib.core.utils.compat.getParcelableCompat
 
 @AndroidEntryPoint
 class SearchActivity : VectorBaseActivity<ActivitySearchBinding>() {
@@ -46,7 +47,7 @@ class SearchActivity : VectorBaseActivity<ActivitySearchBinding>() {
 
     override fun initUiAndData() {
         if (isFirstCreation()) {
-            val fragmentArgs: SearchArgs = intent?.extras?.getParcelable(Mavericks.KEY_ARG) ?: return
+            val fragmentArgs: SearchArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return
             addFragment(views.searchFragmentContainer, SearchFragment::class.java, fragmentArgs, FRAGMENT_TAG)
         }
         views.searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index de51adf05a..713ca80089 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -29,6 +29,7 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -51,12 +52,13 @@ data class SearchArgs(
         val roomAvatarUrl: String?
 ) : Parcelable
 
-class SearchFragment @Inject constructor(
-        private val controller: SearchResultController
-) : VectorBaseFragment<FragmentSearchBinding>(),
+@AndroidEntryPoint
+class SearchFragment :
+        VectorBaseFragment<FragmentSearchBinding>(),
         StateView.EventCallback,
         SearchResultController.Listener {
 
+    @Inject lateinit var controller: SearchResultController
     private val fragmentArgs: SearchArgs by args()
     private val searchViewModel: SearchViewModel by fragmentViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 18c626bda8..f845a42dcd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -32,6 +32,7 @@ import im.vector.app.core.extensions.localDateTime
 import im.vector.app.core.extensions.nextOrNull
 import im.vector.app.core.extensions.prevOrNull
 import im.vector.app.core.time.Clock
+import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.JitsiState
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.RoomDetailViewState
@@ -57,6 +58,7 @@ import im.vector.app.features.home.room.detail.timeline.item.MessageInformationD
 import im.vector.app.features.home.room.detail.timeline.item.ReactionsSummaryEvents
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem
+import im.vector.app.features.home.room.detail.timeline.item.TypingItem_
 import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
 import im.vector.app.features.media.AttachmentData
 import im.vector.app.features.media.ImageContentRenderer
@@ -72,6 +74,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.read.ReadService
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import timber.log.Timber
@@ -94,6 +97,7 @@ class TimelineEventController @Inject constructor(
         private val readReceiptsItemFactory: ReadReceiptsItemFactory,
         private val reactionListFactory: ReactionsSummaryFactory,
         private val clock: Clock,
+        private val avatarRenderer: AvatarRenderer,
 ) : EpoxyController(backgroundHandler, backgroundHandler), Timeline.Listener, EpoxyController.Interceptor {
 
     /**
@@ -104,7 +108,7 @@ class TimelineEventController @Inject constructor(
             val highlightedEventId: String? = null,
             val jitsiState: JitsiState = JitsiState(),
             val roomSummary: RoomSummary? = null,
-            val rootThreadEventId: String? = null
+            val rootThreadEventId: String? = null,
     ) {
 
         constructor(state: RoomDetailViewState) : this(
@@ -112,7 +116,7 @@ class TimelineEventController @Inject constructor(
                 highlightedEventId = state.highlightedEventId,
                 jitsiState = state.jitsiState,
                 roomSummary = state.asyncRoomSummary(),
-                rootThreadEventId = state.rootThreadEventId
+                rootThreadEventId = state.rootThreadEventId,
         )
 
         fun isFromThreadTimeline(): Boolean = rootThreadEventId != null
@@ -286,7 +290,7 @@ class TimelineEventController @Inject constructor(
 
     private val interceptorHelper = TimelineControllerInterceptorHelper(
             ::positionOfReadMarker,
-            adapterPositionMapping
+            adapterPositionMapping,
     )
 
     init {
@@ -334,6 +338,12 @@ class TimelineEventController @Inject constructor(
                 .setVisibilityStateChangedListener(Timeline.Direction.FORWARDS)
                 .addWhenLoading(Timeline.Direction.FORWARDS)
 
+        if (!showingForwardLoader) {
+            val typingUsers = partialState.roomSummary?.typingUsers.orEmpty()
+            val typingItem = TypingItem_().id("typing_view").avatarRenderer(avatarRenderer).users(typingUsers)
+            add(typingItem)
+        }
+
         val timelineModels = getModels()
         add(timelineModels)
         if (hasReachedInvite && hasUTD) {
@@ -433,6 +443,7 @@ class TimelineEventController @Inject constructor(
                 val timelineEventsGroup = timelineEventsGroups.getOrNull(event)
                 val params = TimelineItemFactoryParams(
                         event = event,
+                        lastEdit = event.annotations?.editSummary?.latestEdit,
                         prevEvent = prevEvent,
                         prevDisplayableEvent = prevDisplayableEvent,
                         nextEvent = nextEvent,
@@ -506,7 +517,7 @@ class TimelineEventController @Inject constructor(
                         event.eventId,
                         readReceipts,
                         callback,
-                        partialState.isFromThreadTimeline()
+                        partialState.isFromThreadTimeline(),
                 ),
                 formattedDayModel = formattedDayModel,
                 mergedHeaderModel = mergedHeaderModel
@@ -549,7 +560,7 @@ class TimelineEventController @Inject constructor(
             val event = itr.previous()
             timelineEventsGroups.addOrIgnore(event)
             val currentReadReceipts = ArrayList(event.readReceipts).filter {
-                it.roomMember.userId != session.myUserId
+                it.roomMember.userId != session.myUserId && it.isVisibleInThisThread()
             }
             if (timelineEventVisibilityHelper.shouldShowEvent(
                             timelineEvent = event,
@@ -567,6 +578,14 @@ class TimelineEventController @Inject constructor(
         }
     }
 
+    private fun ReadReceipt.isVisibleInThisThread(): Boolean {
+        return if (partialState.isFromThreadTimeline()) {
+            this.threadId == partialState.rootThreadEventId
+        } else {
+            this.threadId == null || this.threadId == ReadService.THREAD_ID_MAIN
+        }
+    }
+
     private fun buildDaySeparatorItem(originServerTs: Long?): DaySeparatorItem {
         val formattedDay = dateFormatter.format(originServerTs, DateFormatKind.TIMELINE_DAY_DIVIDER)
         return DaySeparatorItem_().formattedDay(formattedDay).id(formattedDay)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanRedactEventUseCase.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanRedactEventUseCase.kt
index 3bc3a5e351..dedd4a53c8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanRedactEventUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanRedactEventUseCase.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.home.room.detail.timeline.action
 
 import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
@@ -27,8 +28,13 @@ class CheckIfCanRedactEventUseCase @Inject constructor(
 
     fun execute(event: TimelineEvent, actionPermissions: ActionPermissions): Boolean {
         // Only some event types are supported for the moment
-        val canRedactEventTypes = listOf(EventType.MESSAGE, EventType.STICKER) +
-                EventType.POLL_START + EventType.STATE_ROOM_BEACON_INFO
+        val canRedactEventTypes: List<String> = listOf(
+                EventType.MESSAGE,
+                EventType.STICKER,
+                VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+        ) +
+                EventType.POLL_START.values +
+                EventType.STATE_ROOM_BEACON_INFO.values
 
         return event.root.getClearType() in canRedactEventTypes &&
                 // Message sent by the current user can always be redacted, else check permission for messages sent by other users
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
index c312ef31b7..a9df059cc1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
@@ -26,7 +26,7 @@ class CheckIfCanReplyEventUseCase @Inject constructor() {
 
     fun execute(event: TimelineEvent, messageContent: MessageContent?, actionPermissions: ActionPermissions): Boolean {
         // Only EventType.MESSAGE, EventType.POLL_START and EventType.STATE_ROOM_BEACON_INFO event types are supported for the moment
-        if (event.root.getClearType() !in EventType.STATE_ROOM_BEACON_INFO + EventType.POLL_START + EventType.MESSAGE) return false
+        if (event.root.getClearType() !in EventType.STATE_ROOM_BEACON_INFO.values + EventType.POLL_START.values + EventType.MESSAGE) return false
         if (!actionPermissions.canSendMessage) return false
         return when (messageContent?.msgType) {
             MessageType.MSGTYPE_TEXT,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index d918703f95..5daf82fae6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -143,6 +143,14 @@ class MessageActionsEpoxyController @Inject constructor(
                     drawableStart(R.drawable.ic_shield_warning_small)
                 }
             }
+            E2EDecoration.WARN_UNSAFE_KEY -> {
+                bottomSheetSendStateItem {
+                    id("e2e_unsafe")
+                    showProgress(false)
+                    text(host.stringProvider.getString(R.string.key_authenticity_not_guaranteed))
+                    drawableStart(R.drawable.ic_shield_gray)
+                }
+            }
             else -> {
                 // nothing
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 3dfb6744e0..a6d7e8386f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -25,6 +25,7 @@ import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.canReact
+import im.vector.app.core.extensions.getVectorLastMessageContent
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
@@ -60,7 +61,6 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachme
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
-import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.hasBeenEdited
 import org.matrix.android.sdk.api.session.room.timeline.isPoll
 import org.matrix.android.sdk.api.session.room.timeline.isRootThread
@@ -187,7 +187,7 @@ class MessageActionsViewModel @AssistedInject constructor(
                 when (timelineEvent.root.getClearType()) {
                     EventType.MESSAGE,
                     EventType.STICKER -> {
-                        val messageContent: MessageContent? = timelineEvent.getLastMessageContent()
+                        val messageContent: MessageContent? = timelineEvent.getVectorLastMessageContent()
                         if (messageContent is MessageTextContent && messageContent.format == MessageFormat.FORMAT_MATRIX_HTML) {
                             val html = messageContent.formattedBody
                                     ?.takeIf { it.isNotBlank() }
@@ -215,7 +215,7 @@ class MessageActionsViewModel @AssistedInject constructor(
                     EventType.CALL_ANSWER -> {
                         noticeEventFormatter.format(timelineEvent, room?.roomSummary()?.isDirect.orFalse())
                     }
-                    in EventType.POLL_START -> {
+                    in EventType.POLL_START.values -> {
                         timelineEvent.root.getClearContent().toModel<MessagePollContent>(catchError = true)
                                 ?.getBestPollCreationInfo()?.question?.getBestQuestion() ?: ""
                     }
@@ -253,7 +253,7 @@ class MessageActionsViewModel @AssistedInject constructor(
     }
 
     private fun actionsForEvent(timelineEvent: TimelineEvent, actionPermissions: ActionPermissions): List<EventSharedAction> {
-        val messageContent = timelineEvent.getLastMessageContent()
+        val messageContent = timelineEvent.getVectorLastMessageContent()
         val msgType = messageContent?.msgType
 
         return arrayListOf<EventSharedAction>().apply {
@@ -383,7 +383,7 @@ class MessageActionsViewModel @AssistedInject constructor(
             }
 
             if (canRedact(timelineEvent, actionPermissions)) {
-                if (timelineEvent.root.getClearType() in EventType.POLL_START) {
+                if (timelineEvent.root.getClearType() in EventType.POLL_START.values) {
                     add(
                             EventSharedAction.Redact(
                                     eventId,
@@ -530,13 +530,13 @@ class MessageActionsViewModel @AssistedInject constructor(
 
     private fun canViewReactions(event: TimelineEvent): Boolean {
         // Only event of type EventType.MESSAGE, EventType.STICKER and EventType.POLL_START are supported for the moment
-        if (event.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER) + EventType.POLL_START) return false
+        if (event.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER) + EventType.POLL_START.values) return false
         return event.annotations?.reactionsSummary?.isNotEmpty() ?: false
     }
 
     private fun canEdit(event: TimelineEvent, myUserId: String, actionPermissions: ActionPermissions): Boolean {
         // Only event of type EventType.MESSAGE and EventType.POLL_START are supported for the moment
-        if (event.root.getClearType() !in listOf(EventType.MESSAGE) + EventType.POLL_START) return false
+        if (event.root.getClearType() !in listOf(EventType.MESSAGE) + EventType.POLL_START.values) return false
         if (!actionPermissions.canSendMessage) return false
         // TODO if user is admin or moderator
         val messageContent = event.root.getClearContent().toModel<MessageContent>()
@@ -582,14 +582,14 @@ class MessageActionsViewModel @AssistedInject constructor(
     }
 
     private fun canEndPoll(event: TimelineEvent, actionPermissions: ActionPermissions): Boolean {
-        return event.root.getClearType() in EventType.POLL_START &&
+        return event.root.getClearType() in EventType.POLL_START.values &&
                 canRedact(event, actionPermissions) &&
                 event.annotations?.pollResponseSummary?.closedTime == null
     }
 
     private fun canEditPoll(event: TimelineEvent): Boolean {
-        return event.root.getClearType() in EventType.POLL_START &&
+        return event.root.getClearType() in EventType.POLL_START.values &&
                 event.annotations?.pollResponseSummary?.closedTime == null &&
-                event.annotations?.pollResponseSummary?.aggregatedContent?.totalVotes ?: 0 == 0
+                (event.annotations?.pollResponseSummary?.aggregatedContent?.totalVotes ?: 0) == 0
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
index c8a3bb8967..ca93c1389e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
@@ -83,7 +83,8 @@ class ViewEditHistoryViewModel @AssistedInject constructor(
                                 payload = result.clearEvent,
                                 senderKey = result.senderCurve25519Key,
                                 keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
-                                forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                                forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
+                                isSafe = result.isSafe
                         )
                     } catch (e: MXCryptoError) {
                         Timber.w("Failed to decrypt event in history")
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 28e256c064..42e031a3c4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -28,6 +28,7 @@ import dagger.Lazy
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.getVectorLastMessageContent
 import im.vector.app.core.files.LocalFilesHelper
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
@@ -44,6 +45,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.MessageInformatio
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
+import im.vector.app.features.home.room.detail.timeline.item.BaseEventItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageAudioItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageAudioItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem
@@ -64,6 +66,7 @@ import im.vector.app.features.home.room.detail.timeline.item.RedactedMessageItem
 import im.vector.app.features.home.room.detail.timeline.item.VerificationRequestItem
 import im.vector.app.features.home.room.detail.timeline.item.VerificationRequestItem_
 import im.vector.app.features.home.room.detail.timeline.render.EventTextRenderer
+import im.vector.app.features.home.room.detail.timeline.render.ProcessBodyOfReplyToEventUseCase
 import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
 import im.vector.app.features.home.room.detail.timeline.tools.linkify
 import im.vector.app.features.html.EventHtmlRenderer
@@ -77,6 +80,8 @@ import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.voice.AudioWaveformView
+import im.vector.app.features.voicebroadcast.isVoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
 import me.gujun.android.span.span
 import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
@@ -100,9 +105,10 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
 import org.matrix.android.sdk.api.session.room.model.message.getThumbnailUrl
-import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.api.session.room.model.relation.ReplyToContent
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import org.matrix.android.sdk.api.util.MimeTypes
 import javax.inject.Inject
@@ -135,6 +141,8 @@ class MessageItemFactory @Inject constructor(
         private val urlMapProvider: UrlMapProvider,
         private val liveLocationShareMessageItemFactory: LiveLocationShareMessageItemFactory,
         private val pollItemViewStateFactory: PollItemViewStateFactory,
+        private val voiceBroadcastItemFactory: VoiceBroadcastItemFactory,
+        private val processBodyOfReplyToEventUseCase: ProcessBodyOfReplyToEventUseCase,
 ) {
 
     // TODO inject this properly?
@@ -163,7 +171,7 @@ class MessageItemFactory @Inject constructor(
             return buildRedactedItem(attributes, highlight)
         }
 
-        val messageContent = event.getLastMessageContent()
+        val messageContent = event.getVectorLastMessageContent()
         if (messageContent == null) {
             val malformedText = stringProvider.getString(R.string.malformed_message)
             return defaultItemFactory.create(malformedText, informationData, highlight, callback)
@@ -196,7 +204,8 @@ class MessageItemFactory @Inject constructor(
             is MessageVerificationRequestContent -> buildVerificationRequestMessageItem(messageContent, informationData, highlight, callback, attributes)
             is MessagePollContent -> buildPollItem(messageContent, informationData, highlight, callback, attributes)
             is MessageLocationContent -> buildLocationItem(messageContent, informationData, highlight, attributes)
-            is MessageBeaconInfoContent -> liveLocationShareMessageItemFactory.create(params.event, highlight, attributes)
+            is MessageBeaconInfoContent -> liveLocationShareMessageItemFactory.create(event, highlight, attributes)
+            is MessageVoiceBroadcastInfoContent -> voiceBroadcastItemFactory.create(params, messageContent, highlight, attributes)
             else -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
         }
         return messageItem?.apply {
@@ -245,7 +254,7 @@ class MessageItemFactory @Inject constructor(
                 .pollQuestion(createPollQuestion(informationData, pollViewState.question, callback))
                 .canVote(pollViewState.canVote)
                 .votesStatus(pollViewState.votesStatus)
-                .optionViewStates(pollViewState.optionViewStates)
+                .optionViewStates(pollViewState.optionViewStates.orEmpty())
                 .edited(informationData.hasBeenEdited)
                 .highlighted(highlight)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
@@ -279,7 +288,7 @@ class MessageItemFactory @Inject constructor(
                 .duration(messageContent.audioInfo?.duration ?: 0)
                 .playbackControlButtonClickListener(playbackControlButtonClickListener)
                 .audioMessagePlaybackTracker(audioMessagePlaybackTracker)
-                .isLocalFile(localFilesHelper.isLocalFile(fileUrl))
+                .izLocalFile(localFilesHelper.isLocalFile(fileUrl))
                 .fileSize(messageContent.audioInfo?.size ?: 0L)
                 .onSeek { params.callback?.onAudioSeekBarMovedTo(informationData.eventId, duration, it) }
                 .mxcUrl(fileUrl)
@@ -316,7 +325,12 @@ class MessageItemFactory @Inject constructor(
             informationData: MessageInformationData,
             highlight: Boolean,
             attributes: AbsMessageItem.Attributes
-    ): MessageVoiceItem {
+    ): BaseEventItem<*>? {
+        // Do not display voice broadcast messages
+        if (params.event.root.asMessageAudioEvent().isVoiceBroadcast()) {
+            return noticeItemFactory.create(params)
+        }
+
         val fileUrl = getAudioFileUrl(messageContent, informationData)
         val playbackControlButtonClickListener = createOnPlaybackButtonClickListener(messageContent, informationData, params)
 
@@ -339,7 +353,7 @@ class MessageItemFactory @Inject constructor(
                 .playbackControlButtonClickListener(playbackControlButtonClickListener)
                 .waveformTouchListener(waveformTouchListener)
                 .audioMessagePlaybackTracker(audioMessagePlaybackTracker)
-                .isLocalFile(localFilesHelper.isLocalFile(fileUrl))
+                .izLocalFile(localFilesHelper.isLocalFile(fileUrl))
                 .mxcUrl(fileUrl)
                 .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
                 .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder)
@@ -399,8 +413,8 @@ class MessageItemFactory @Inject constructor(
         return MessageFileItem_()
                 .attributes(attributes)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
-                .isLocalFile(localFilesHelper.isLocalFile(messageContent.getFileUrl()))
-                .isDownloaded(session.fileService().isFileInCache(messageContent))
+                .izLocalFile(localFilesHelper.isLocalFile(messageContent.getFileUrl()))
+                .izDownloaded(session.fileService().isFileInCache(messageContent))
                 .mxcUrl(mxcUrl)
                 .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
                 .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder)
@@ -429,7 +443,14 @@ class MessageItemFactory @Inject constructor(
             attributes: AbsMessageItem.Attributes
     ): MessageTextItem? {
         // For compatibility reason we should display the body
-        return buildMessageTextItem(messageContent.body, false, informationData, highlight, callback, attributes)
+        return buildMessageTextItem(
+                messageContent.body,
+                false,
+                informationData,
+                highlight,
+                callback,
+                attributes,
+        )
     }
 
     private fun buildImageMessageItem(
@@ -453,12 +474,15 @@ class MessageItemFactory @Inject constructor(
                 maxWidth = maxWidth,
                 allowNonMxcUrls = informationData.sendState.isSending()
         )
+
+        val playable = messageContent.mimeType == MimeTypes.Gif
+
         return MessageImageVideoItem_()
                 .attributes(attributes)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .imageContentRenderer(imageContentRenderer)
                 .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
-                .playable(messageContent.mimeType == MimeTypes.Gif)
+                .playable(playable)
                 .highlighted(highlight)
                 .mediaData(data)
                 .apply {
@@ -472,6 +496,10 @@ class MessageItemFactory @Inject constructor(
                             callback?.onImageMessageClicked(messageContent, data, view, emptyList())
                         }
                     }
+                }.apply {
+                    if (playable && vectorPreferences.autoplayAnimatedImages()) {
+                        mode(ImageContentRenderer.Mode.ANIMATED_THUMBNAIL)
+                    }
                 }
     }
 
@@ -525,7 +553,8 @@ class MessageItemFactory @Inject constructor(
     ): VectorEpoxyModel<*>? {
         val matrixFormattedBody = messageContent.matrixFormattedBody
         return if (matrixFormattedBody != null) {
-            buildFormattedTextItem(matrixFormattedBody, informationData, highlight, callback, attributes)
+            val replyToContent = messageContent.relatesTo?.inReplyTo
+            buildFormattedTextItem(matrixFormattedBody, informationData, highlight, callback, attributes, replyToContent)
         } else {
             buildMessageTextItem(messageContent.body, false, informationData, highlight, callback, attributes)
         }
@@ -537,10 +566,21 @@ class MessageItemFactory @Inject constructor(
             highlight: Boolean,
             callback: TimelineEventController.Callback?,
             attributes: AbsMessageItem.Attributes,
+            replyToContent: ReplyToContent?,
     ): MessageTextItem? {
-        val compressed = htmlCompressor.compress(matrixFormattedBody)
+        val processedBody = replyToContent
+                ?.let { processBodyOfReplyToEventUseCase.execute(roomId, matrixFormattedBody, it) }
+                ?: matrixFormattedBody
+        val compressed = htmlCompressor.compress(processedBody)
         val renderedFormattedBody = htmlRenderer.get().render(compressed, pillsPostProcessor) as Spanned
-        return buildMessageTextItem(renderedFormattedBody, true, informationData, highlight, callback, attributes)
+        return buildMessageTextItem(
+                renderedFormattedBody,
+                true,
+                informationData,
+                highlight,
+                callback,
+                attributes,
+        )
     }
 
     private fun buildMessageTextItem(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
index 6a711ec2dc..8607af6891 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
@@ -21,16 +21,20 @@ import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem_
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import javax.inject.Inject
 
-class ReadReceiptsItemFactory @Inject constructor(private val avatarRenderer: AvatarRenderer) {
+class ReadReceiptsItemFactory @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val session: Session
+) {
 
     fun create(
             eventId: String,
             readReceipts: List<ReadReceipt>,
             callback: TimelineEventController.Callback?,
-            isFromThreadTimeLine: Boolean
+            isFromThreadTimeLine: Boolean,
     ): ReadReceiptsItem? {
         if (readReceipts.isEmpty()) {
             return null
@@ -40,12 +44,13 @@ class ReadReceiptsItemFactory @Inject constructor(private val avatarRenderer: Av
                     ReadReceiptData(it.roomMember.userId, it.roomMember.avatarUrl, it.roomMember.displayName, it.originServerTs)
                 }
                 .sortedByDescending { it.timestamp }
+        val threadReadReceiptsSupported = session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreadReadReceiptsAndNotifications
         return ReadReceiptsItem_()
                 .id("read_receipts_$eventId")
                 .eventId(eventId)
                 .readReceipts(readReceiptsData)
                 .avatarRenderer(avatarRenderer)
-                .shouldHideReadReceipts(isFromThreadTimeLine)
+                .shouldHideReadReceipts(isFromThreadTimeLine && !threadReadReceiptsSupported)
                 .clickListener {
                     callback?.onReadReceiptsClicked(readReceiptsData)
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 6c5a66d39d..ae3ea143a7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -21,6 +21,7 @@ import im.vector.app.core.epoxy.TimelineEmptyItem_
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.features.analytics.DecryptionFailureTracker
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import timber.log.Timber
@@ -87,7 +88,8 @@ class TimelineItemFactory @Inject constructor(
                     EventType.STATE_ROOM_ENCRYPTION -> encryptionItemFactory.create(params)
                     // State room create
                     EventType.STATE_ROOM_CREATE -> roomCreateItemFactory.create(params)
-                    in EventType.STATE_ROOM_BEACON_INFO -> messageItemFactory.create(params)
+                    in EventType.STATE_ROOM_BEACON_INFO.values -> messageItemFactory.create(params)
+                    VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO -> messageItemFactory.create(params)
                     // Unhandled state event types
                     else -> {
                         // Should only happen when shouldShowHiddenEvents() settings is ON
@@ -99,7 +101,7 @@ class TimelineItemFactory @Inject constructor(
                 when (event.root.getClearType()) {
                     // Message itemsX
                     EventType.STICKER,
-                    in EventType.POLL_START,
+                    in EventType.POLL_START.values,
                     EventType.MESSAGE -> messageItemFactory.create(params)
                     EventType.REDACTION,
                     EventType.KEY_VERIFICATION_ACCEPT,
@@ -112,9 +114,9 @@ class TimelineItemFactory @Inject constructor(
                     EventType.CALL_SELECT_ANSWER,
                     EventType.CALL_NEGOTIATE,
                     EventType.REACTION,
-                    in EventType.POLL_RESPONSE,
-                    in EventType.POLL_END -> noticeItemFactory.create(params)
-                    in EventType.BEACON_LOCATION_DATA -> {
+                    in EventType.POLL_RESPONSE.values,
+                    in EventType.POLL_END.values -> noticeItemFactory.create(params)
+                    in EventType.BEACON_LOCATION_DATA.values -> {
                         if (event.root.isRedacted()) {
                             messageItemFactory.create(params)
                         } else {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
index 7c02b6f058..dd4494a613 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
@@ -19,10 +19,12 @@ package im.vector.app.features.home.room.detail.timeline.factory
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventsGroup
 import im.vector.app.features.home.room.detail.timeline.item.ReactionsSummaryEvents
+import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 data class TimelineItemFactoryParams(
         val event: TimelineEvent,
+        val lastEdit: Event? = null,
         val prevEvent: TimelineEvent? = null,
         val prevDisplayableEvent: TimelineEvent? = null,
         val nextEvent: TimelineEvent? = null,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
new file mode 100644
index 0000000000..cc3a015120
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2022 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.
+ */
+package im.vector.app.features.home.room.detail.timeline.factory
+
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.features.displayname.getBestName
+import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
+import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.VoiceBroadcastEventsGroup
+import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
+import im.vector.app.features.home.room.detail.timeline.item.AbsMessageVoiceBroadcastItem
+import im.vector.app.features.home.room.detail.timeline.item.BaseEventItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastListeningItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastListeningItem_
+import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastRecordingItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastRecordingItem_
+import im.vector.app.features.voicebroadcast.listening.VoiceBroadcastPlayer
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getUserOrDefault
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class VoiceBroadcastItemFactory @Inject constructor(
+        private val session: Session,
+        private val avatarSizeProvider: AvatarSizeProvider,
+        private val colorProvider: ColorProvider,
+        private val drawableProvider: DrawableProvider,
+        private val voiceBroadcastRecorder: VoiceBroadcastRecorder?,
+        private val voiceBroadcastPlayer: VoiceBroadcastPlayer,
+        private val playbackTracker: AudioMessagePlaybackTracker,
+        private val noticeItemFactory: NoticeItemFactory,
+) {
+
+    fun create(
+            params: TimelineItemFactoryParams,
+            messageContent: MessageVoiceBroadcastInfoContent,
+            highlight: Boolean,
+            attributes: AbsMessageItem.Attributes,
+    ): BaseEventItem<*>? {
+        // Only display item of the initial event with updated data
+        if (messageContent.voiceBroadcastState != VoiceBroadcastState.STARTED) {
+            return noticeItemFactory.create(params)
+        }
+
+        val voiceBroadcastEventsGroup = params.eventsGroup?.let { VoiceBroadcastEventsGroup(it) } ?: return null
+        val voiceBroadcastEvent = voiceBroadcastEventsGroup.getLastDisplayableEvent().root.asVoiceBroadcastEvent() ?: return null
+        val voiceBroadcastContent = voiceBroadcastEvent.content ?: return null
+        val voiceBroadcast = VoiceBroadcast(voiceBroadcastId = voiceBroadcastEventsGroup.voiceBroadcastId, roomId = params.event.roomId)
+
+        val isRecording = voiceBroadcastContent.voiceBroadcastState != VoiceBroadcastState.STOPPED &&
+                voiceBroadcastEvent.root.stateKey == session.myUserId &&
+                messageContent.deviceId == session.sessionParams.deviceId
+
+        val voiceBroadcastAttributes = AbsMessageVoiceBroadcastItem.Attributes(
+                voiceBroadcast = voiceBroadcast,
+                voiceBroadcastState = voiceBroadcastContent.voiceBroadcastState,
+                duration = voiceBroadcastEventsGroup.getDuration(),
+                recorderName = params.event.root.stateKey?.let { session.getUserOrDefault(it) }?.toMatrixItem()?.getBestName().orEmpty(),
+                recorder = voiceBroadcastRecorder,
+                player = voiceBroadcastPlayer,
+                playbackTracker = playbackTracker,
+                roomItem = session.getRoom(params.event.roomId)?.roomSummary()?.toMatrixItem(),
+                colorProvider = colorProvider,
+                drawableProvider = drawableProvider,
+        )
+
+        return if (isRecording) {
+            createRecordingItem(highlight, attributes, voiceBroadcastAttributes)
+        } else {
+            createListeningItem(highlight, attributes, voiceBroadcastAttributes)
+        }
+    }
+
+    private fun createRecordingItem(
+            highlight: Boolean,
+            attributes: AbsMessageItem.Attributes,
+            voiceBroadcastAttributes: AbsMessageVoiceBroadcastItem.Attributes,
+    ): MessageVoiceBroadcastRecordingItem {
+        return MessageVoiceBroadcastRecordingItem_()
+                .id("voice_broadcast_${voiceBroadcastAttributes.voiceBroadcast.voiceBroadcastId}")
+                .attributes(attributes)
+                .voiceBroadcastAttributes(voiceBroadcastAttributes)
+                .highlighted(highlight)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+    }
+
+    private fun createListeningItem(
+            highlight: Boolean,
+            attributes: AbsMessageItem.Attributes,
+            voiceBroadcastAttributes: AbsMessageVoiceBroadcastItem.Attributes,
+    ): MessageVoiceBroadcastListeningItem {
+        return MessageVoiceBroadcastListeningItem_()
+                .id("voice_broadcast_${voiceBroadcastAttributes.voiceBroadcast.voiceBroadcastId}")
+                .attributes(attributes)
+                .voiceBroadcastAttributes(voiceBroadcastAttributes)
+                .highlighted(highlight)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
index 7b9bd4530b..5fa9576dd4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
@@ -19,9 +19,16 @@ package im.vector.app.features.home.room.detail.timeline.format
 import dagger.Lazy
 import im.vector.app.EmojiSpanify
 import im.vector.app.R
+import im.vector.app.core.extensions.getVectorLastMessageContent
+import im.vector.app.core.extensions.orEmpty
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.html.EventHtmlRenderer
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.isLive
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import me.gujun.android.span.image
 import me.gujun.android.span.span
 import org.commonmark.node.Document
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -34,13 +41,13 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
-import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.getTextDisplayableContent
 import javax.inject.Inject
 
 class DisplayableEventFormatter @Inject constructor(
         private val stringProvider: StringProvider,
         private val colorProvider: ColorProvider,
+        private val drawableProvider: DrawableProvider,
         private val emojiSpanify: EmojiSpanify,
         private val noticeEventFormatter: NoticeEventFormatter,
         private val htmlRenderer: Lazy<EventHtmlRenderer>
@@ -60,7 +67,7 @@ class DisplayableEventFormatter @Inject constructor(
 
         return when (timelineEvent.root.getClearType()) {
             EventType.MESSAGE -> {
-                timelineEvent.getLastMessageContent()?.let { messageContent ->
+                timelineEvent.getVectorLastMessageContent()?.let { messageContent ->
                     when (messageContent.msgType) {
                         MessageType.MSGTYPE_TEXT -> {
                             val body = messageContent.getTextDisplayableContent()
@@ -122,19 +129,22 @@ class DisplayableEventFormatter @Inject constructor(
             EventType.CALL_CANDIDATES -> {
                 span { }
             }
-            in EventType.POLL_START -> {
+            in EventType.POLL_START.values -> {
                 timelineEvent.root.getClearContent().toModel<MessagePollContent>(catchError = true)?.getBestPollCreationInfo()?.question?.getBestQuestion()
                         ?: stringProvider.getString(R.string.sent_a_poll)
             }
-            in EventType.POLL_RESPONSE -> {
+            in EventType.POLL_RESPONSE.values -> {
                 stringProvider.getString(R.string.poll_response_room_list_preview)
             }
-            in EventType.POLL_END -> {
+            in EventType.POLL_END.values -> {
                 stringProvider.getString(R.string.poll_end_room_list_preview)
             }
-            in EventType.STATE_ROOM_BEACON_INFO -> {
+            in EventType.STATE_ROOM_BEACON_INFO.values -> {
                 simpleFormat(senderName, stringProvider.getString(R.string.sent_live_location), appendAuthor)
             }
+            VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO -> {
+                formatVoiceBroadcastEvent(timelineEvent.root, isDm, senderName)
+            }
             else -> {
                 span {
                     text = noticeEventFormatter.format(timelineEvent, isDm) ?: ""
@@ -220,17 +230,17 @@ class DisplayableEventFormatter @Inject constructor(
                     emojiSpanify.spanify(stringProvider.getString(R.string.sent_a_reaction, it.key))
                 } ?: span { }
             }
-            in EventType.POLL_START -> {
+            in EventType.POLL_START.values -> {
                 event.getClearContent().toModel<MessagePollContent>(catchError = true)?.pollCreationInfo?.question?.question
                         ?: stringProvider.getString(R.string.sent_a_poll)
             }
-            in EventType.POLL_RESPONSE -> {
+            in EventType.POLL_RESPONSE.values -> {
                 stringProvider.getString(R.string.poll_response_room_list_preview)
             }
-            in EventType.POLL_END -> {
+            in EventType.POLL_END.values -> {
                 stringProvider.getString(R.string.poll_end_room_list_preview)
             }
-            in EventType.STATE_ROOM_BEACON_INFO -> {
+            in EventType.STATE_ROOM_BEACON_INFO.values -> {
                 stringProvider.getString(R.string.sent_live_location)
             }
             else -> {
@@ -252,4 +262,20 @@ class DisplayableEventFormatter @Inject constructor(
             body
         }
     }
+
+    private fun formatVoiceBroadcastEvent(event: Event, isDm: Boolean, senderName: String): CharSequence {
+        return if (event.asVoiceBroadcastEvent()?.isLive == true) {
+            span {
+                drawableProvider.getDrawable(R.drawable.ic_voice_broadcast, colorProvider.getColor(R.color.palette_vermilion))?.let {
+                    image(it)
+                    +" "
+                }
+                span(stringProvider.getString(R.string.voice_broadcast_live_broadcast)) {
+                    textColor = colorProvider.getColor(R.color.palette_vermilion)
+                }
+            }
+        } else {
+            noticeEventFormatter.format(event, senderName, isDm).orEmpty()
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 19f9fc17a3..a306dd6b2f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -21,6 +21,9 @@ import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.roomprofile.permissions.RoleFormatter
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
 import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.api.extensions.appendNl
 import org.matrix.android.sdk.api.extensions.orFalse
@@ -66,30 +69,32 @@ class NoticeEventFormatter @Inject constructor(
     private fun Event.isSentByCurrentUser() = senderId != null && senderId == currentUserId
 
     fun format(timelineEvent: TimelineEvent, isDm: Boolean): CharSequence? {
-        return when (val type = timelineEvent.root.getClearType()) {
-            EventType.STATE_ROOM_JOIN_RULES -> formatJoinRulesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
-            EventType.STATE_ROOM_CREATE -> formatRoomCreateEvent(timelineEvent.root, isDm)
-            EventType.STATE_ROOM_NAME -> formatRoomNameEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_TOPIC -> formatRoomTopicEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_AVATAR -> formatRoomAvatarEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_MEMBER -> formatRoomMemberEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
-            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
-            EventType.STATE_ROOM_ALIASES -> formatRoomAliasesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_CANONICAL_ALIAS -> formatRoomCanonicalAliasEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_HISTORY_VISIBILITY ->
-                formatRoomHistoryVisibilityEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
-            EventType.STATE_ROOM_SERVER_ACL -> formatRoomServerAclEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_GUEST_ACCESS -> formatRoomGuestAccessEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
-            EventType.STATE_ROOM_ENCRYPTION -> formatRoomEncryptionEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
+        val event = timelineEvent.root
+        val senderName = timelineEvent.senderInfo.disambiguatedDisplayName
+        return when (val type = event.getClearType()) {
+            EventType.STATE_ROOM_JOIN_RULES -> formatJoinRulesEvent(event, senderName, isDm)
+            EventType.STATE_ROOM_CREATE -> formatRoomCreateEvent(event, isDm)
+            EventType.STATE_ROOM_NAME -> formatRoomNameEvent(event, senderName)
+            EventType.STATE_ROOM_TOPIC -> formatRoomTopicEvent(event, senderName)
+            EventType.STATE_ROOM_AVATAR -> formatRoomAvatarEvent(event, senderName)
+            EventType.STATE_ROOM_MEMBER -> formatRoomMemberEvent(event, senderName, isDm)
+            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(event, senderName, isDm)
+            EventType.STATE_ROOM_ALIASES -> formatRoomAliasesEvent(event, senderName)
+            EventType.STATE_ROOM_CANONICAL_ALIAS -> formatRoomCanonicalAliasEvent(event, senderName)
+            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(event, senderName, isDm)
+            EventType.STATE_ROOM_SERVER_ACL -> formatRoomServerAclEvent(event, senderName)
+            EventType.STATE_ROOM_GUEST_ACCESS -> formatRoomGuestAccessEvent(event, senderName, isDm)
+            EventType.STATE_ROOM_ENCRYPTION -> formatRoomEncryptionEvent(event, senderName)
             EventType.STATE_ROOM_WIDGET,
-            EventType.STATE_ROOM_WIDGET_LEGACY -> formatWidgetEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_TOMBSTONE -> formatRoomTombstoneEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
-            EventType.STATE_ROOM_POWER_LEVELS -> formatRoomPowerLevels(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
+            EventType.STATE_ROOM_WIDGET_LEGACY -> formatWidgetEvent(event, senderName)
+            EventType.STATE_ROOM_TOMBSTONE -> formatRoomTombstoneEvent(event, senderName, isDm)
+            EventType.STATE_ROOM_POWER_LEVELS -> formatRoomPowerLevels(event, senderName)
             EventType.CALL_INVITE,
             EventType.CALL_CANDIDATES,
             EventType.CALL_HANGUP,
             EventType.CALL_REJECT,
-            EventType.CALL_ANSWER -> formatCallEvent(type, timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
+            EventType.CALL_ANSWER -> formatCallEvent(type, event, senderName)
+            VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO -> formatVoiceBroadcastEvent(event, senderName)
             EventType.CALL_NEGOTIATE,
             EventType.CALL_SELECT_ANSWER,
             EventType.CALL_REPLACES,
@@ -106,9 +111,9 @@ class NoticeEventFormatter @Inject constructor(
             EventType.STATE_SPACE_PARENT,
             EventType.REDACTION,
             EventType.STICKER,
-            in EventType.POLL_RESPONSE,
-            in EventType.POLL_END,
-            in EventType.BEACON_LOCATION_DATA -> formatDebug(timelineEvent.root)
+            in EventType.POLL_RESPONSE.values,
+            in EventType.POLL_END.values,
+            in EventType.BEACON_LOCATION_DATA.values -> formatDebug(event)
             else -> {
                 Timber.v("Type $type not handled by this formatter")
                 null
@@ -189,6 +194,7 @@ class NoticeEventFormatter @Inject constructor(
             EventType.CALL_REJECT,
             EventType.CALL_ANSWER -> formatCallEvent(type, event, senderName)
             EventType.STATE_ROOM_TOMBSTONE -> formatRoomTombstoneEvent(event, senderName, isDm)
+            VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO -> formatVoiceBroadcastEvent(event, senderName)
             else -> {
                 Timber.v("Type $type not handled by this formatter")
                 null
@@ -892,4 +898,16 @@ class NoticeEventFormatter @Inject constructor(
                     }
                 }
     }
+
+    private fun formatVoiceBroadcastEvent(event: Event, senderName: String?): CharSequence {
+        return if (event.asVoiceBroadcastEvent()?.content?.voiceBroadcastState == VoiceBroadcastState.STOPPED) {
+            if (event.isSentByCurrentUser()) {
+                sp.getString(R.string.notice_voice_broadcast_ended_by_you)
+            } else {
+                sp.getString(R.string.notice_voice_broadcast_ended, senderName)
+            }
+        } else {
+            formatDebug(event)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AudioMessagePlaybackTracker.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AudioMessagePlaybackTracker.kt
index 6937cd3a46..c34cbbc74a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AudioMessagePlaybackTracker.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AudioMessagePlaybackTracker.kt
@@ -51,15 +51,7 @@ class AudioMessagePlaybackTracker @Inject constructor() {
     }
 
     fun pauseAllPlaybacks() {
-        listeners.keys.forEach { key ->
-            pausePlayback(key)
-        }
-    }
-
-    fun makeAllPlaybacksIdle() {
-        listeners.keys.forEach { key ->
-            setState(key, Listener.State.Idle)
-        }
+        listeners.keys.forEach(::pausePlayback)
     }
 
     /**
@@ -75,8 +67,8 @@ class AudioMessagePlaybackTracker @Inject constructor() {
     }
 
     fun startPlayback(id: String) {
-        val currentPlaybackTime = getPlaybackTime(id)
-        val currentPercentage = getPercentage(id)
+        val currentPlaybackTime = getPlaybackTime(id) ?: 0
+        val currentPercentage = getPercentage(id) ?: 0f
         val currentState = Listener.State.Playing(currentPlaybackTime, currentPercentage)
         setState(id, currentState)
         // Pause any active playback
@@ -93,9 +85,10 @@ class AudioMessagePlaybackTracker @Inject constructor() {
     }
 
     fun pausePlayback(id: String) {
-        if (getPlaybackState(id) is Listener.State.Playing) {
-            val currentPlaybackTime = getPlaybackTime(id)
-            val currentPercentage = getPercentage(id)
+        val state = getPlaybackState(id)
+        if (state is Listener.State.Playing) {
+            val currentPlaybackTime = state.playbackTime
+            val currentPercentage = state.percentage
             setState(id, Listener.State.Paused(currentPlaybackTime, currentPercentage))
         }
     }
@@ -118,37 +111,38 @@ class AudioMessagePlaybackTracker @Inject constructor() {
 
     fun getPlaybackState(id: String) = states[id]
 
-    fun getPlaybackTime(id: String): Int {
+    fun getPlaybackTime(id: String): Int? {
         return when (val state = states[id]) {
             is Listener.State.Playing -> state.playbackTime
             is Listener.State.Paused -> state.playbackTime
-            /* Listener.State.Idle, */
-            else -> 0
+            is Listener.State.Recording,
+            Listener.State.Idle,
+            null -> null
         }
     }
 
-    private fun getPercentage(id: String): Float {
+    fun getPercentage(id: String): Float? {
         return when (val state = states[id]) {
             is Listener.State.Playing -> state.percentage
             is Listener.State.Paused -> state.percentage
-            /* Listener.State.Idle, */
-            else -> 0f
+            is Listener.State.Recording,
+            Listener.State.Idle,
+            null -> null
         }
     }
 
-    fun clear() {
+    fun unregisterListeners() {
         listeners.forEach {
             it.value.onUpdate(Listener.State.Idle)
         }
         listeners.clear()
-        states.clear()
     }
 
     companion object {
         const val RECORDING_ID = "RECORDING_ID"
     }
 
-    interface Listener {
+    fun interface Listener {
 
         fun onUpdate(state: State)
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/LocationPinProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/LocationPinProvider.kt
index 8ef910c931..7f276f2f73 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/LocationPinProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/LocationPinProvider.kt
@@ -29,7 +29,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.AvatarRenderer
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
 import javax.inject.Inject
@@ -67,9 +67,9 @@ class LocationPinProvider @Inject constructor(
 
         activeSessionHolder
                 .getActiveSession()
-                .getUser(userId)
-                ?.toMatrixItem()
-                ?.let { userItem ->
+                .getUserOrDefault(userId)
+                .toMatrixItem()
+                .let { userItem ->
                     val size = dimensionConverter.dpToPx(44)
                     val bgTintColor = matrixItemColorProvider.getColor(userItem)
                     avatarRenderer.render(glideRequests, userItem, object : CustomTarget<Drawable>(size, size) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index e86d3b2ec6..57a4388f74 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.detail.timeline.helper
 
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.extensions.getVectorLastMessageContent
 import im.vector.app.core.extensions.localDateTime
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactoryParams
 import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
@@ -30,17 +31,19 @@ import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLay
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationState
+import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.getMsgType
 import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
+import org.matrix.android.sdk.api.session.events.model.isSticker
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.events.model.toValidDecryptedEvent
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
-import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.hasBeenEdited
 import javax.inject.Inject
 
@@ -71,8 +74,8 @@ class MessageInformationDataFactory @Inject constructor(
                 prevDisplayableEvent?.root?.localDateTime()?.toLocalDate() != date.toLocalDate()
 
         val time = dateFormatter.format(event.root.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
-        val e2eDecoration = getE2EDecoration(roomSummary, event)
-
+        val e2eDecoration = getE2EDecoration(roomSummary, params.lastEdit ?: event.root)
+        val senderId = getSenderId(event)
         // SendState Decoration
         val sendStateDecoration = if (isSentByMe) {
             getSendStateDecoration(
@@ -88,7 +91,7 @@ class MessageInformationDataFactory @Inject constructor(
 
         return MessageInformationData(
                 eventId = eventId,
-                senderId = event.root.senderId ?: "",
+                senderId = senderId,
                 sendState = event.root.sendState,
                 time = time,
                 ageLocalTS = event.root.ageLocalTs,
@@ -122,10 +125,22 @@ class MessageInformationDataFactory @Inject constructor(
                 isLastFromThisSender = isLastFromThisSender,
                 e2eDecoration = e2eDecoration,
                 sendStateDecoration = sendStateDecoration,
-                messageType = event.root.getMsgType()
+                messageType = if (event.root.isSticker()) {
+                    MessageType.MSGTYPE_STICKER_LOCAL
+                } else {
+                    event.root.getMsgType()
+                }
         )
     }
 
+    private fun getSenderId(event: TimelineEvent) = if (event.isEncrypted()) {
+        event.root.toValidDecryptedEvent()?.let {
+            session.cryptoService().deviceWithIdentityKey(it.cryptoSenderKey, it.algorithm)?.userId
+        } ?: event.root.senderId.orEmpty()
+    } else {
+        event.root.senderId.orEmpty()
+    }
+
     private fun getSendStateDecoration(
             event: TimelineEvent,
             lastSentEventWithoutReadReceipts: String?,
@@ -143,56 +158,83 @@ class MessageInformationDataFactory @Inject constructor(
         }
     }
 
-    private fun getE2EDecoration(roomSummary: RoomSummary?, event: TimelineEvent): E2EDecoration {
-        return if (
-                event.root.sendState == SendState.SYNCED &&
-                roomSummary?.isEncrypted.orFalse() &&
-                // is user verified
-                session.cryptoService().crossSigningService().getUserCrossSigningKeys(event.root.senderId ?: "")?.isTrusted() == true) {
-            val ts = roomSummary?.encryptionEventTs ?: 0
-            val eventTs = event.root.originServerTs ?: 0
-            if (event.isEncrypted()) {
+    private fun getE2EDecoration(roomSummary: RoomSummary?, event: Event): E2EDecoration {
+        if (roomSummary?.isEncrypted != true) {
+            // No decoration for clear room
+            // Questionable? what if the event is E2E?
+            return E2EDecoration.NONE
+        }
+        if (event.sendState != SendState.SYNCED) {
+            // we don't display e2e decoration if event not synced back
+            return E2EDecoration.NONE
+        }
+        val userCrossSigningInfo = session.cryptoService()
+                .crossSigningService()
+                .getUserCrossSigningKeys(event.senderId.orEmpty())
+
+        if (userCrossSigningInfo?.isTrusted() == true) {
+            return if (event.isEncrypted()) {
                 // Do not decorate failed to decrypt, or redaction (we lost sender device info)
-                if (event.root.getClearType() == EventType.ENCRYPTED || event.root.isRedacted()) {
+                if (event.getClearType() == EventType.ENCRYPTED || event.isRedacted()) {
                     E2EDecoration.NONE
                 } else {
-                    val sendingDevice = event.root.content
-                            .toModel<EncryptedEventContent>()
-                            ?.deviceId
-                            ?.let { deviceId ->
-                                session.cryptoService().getDeviceInfo(event.root.senderId ?: "", deviceId)
+                    val sendingDevice = event.getSenderKey()
+                            ?.let {
+                                session.cryptoService().deviceWithIdentityKey(
+                                        it,
+                                        event.content?.get("algorithm") as? String ?: ""
+                                )
+                            }
+                    if (event.mxDecryptionResult?.isSafe == false) {
+                        E2EDecoration.WARN_UNSAFE_KEY
+                    } else {
+                        when {
+                            sendingDevice == null -> {
+                                // For now do not decorate this with warning
+                                // maybe it's a deleted session
+                                E2EDecoration.WARN_SENT_BY_DELETED_SESSION
+                            }
+                            sendingDevice.trustLevel == null -> {
+                                E2EDecoration.WARN_SENT_BY_UNKNOWN
+                            }
+                            sendingDevice.trustLevel?.isVerified().orFalse() -> {
+                                E2EDecoration.NONE
+                            }
+                            else -> {
+                                E2EDecoration.WARN_SENT_BY_UNVERIFIED
                             }
-                    when {
-                        sendingDevice == null -> {
-                            // For now do not decorate this with warning
-                            // maybe it's a deleted session
-                            E2EDecoration.NONE
-                        }
-                        sendingDevice.trustLevel == null -> {
-                            E2EDecoration.WARN_SENT_BY_UNKNOWN
-                        }
-                        sendingDevice.trustLevel?.isVerified().orFalse() -> {
-                            E2EDecoration.NONE
-                        }
-                        else -> {
-                            E2EDecoration.WARN_SENT_BY_UNVERIFIED
                         }
                     }
                 }
             } else {
-                if (event.root.isStateEvent()) {
-                    // Do not warn for state event, they are always in clear
-                    E2EDecoration.NONE
-                } else {
-                    // If event is in clear after the room enabled encryption we should warn
-                    if (eventTs > ts) E2EDecoration.WARN_IN_CLEAR else E2EDecoration.NONE
-                }
+                e2EDecorationForClearEventInE2ERoom(event, roomSummary)
             }
         } else {
-            E2EDecoration.NONE
+            return if (!event.isEncrypted()) {
+                e2EDecorationForClearEventInE2ERoom(event, roomSummary)
+            } else if (event.mxDecryptionResult != null) {
+                if (event.mxDecryptionResult?.isSafe == true) {
+                    E2EDecoration.NONE
+                } else {
+                    E2EDecoration.WARN_UNSAFE_KEY
+                }
+            } else {
+                E2EDecoration.NONE
+            }
         }
     }
 
+    private fun e2EDecorationForClearEventInE2ERoom(event: Event, roomSummary: RoomSummary) =
+            if (event.isStateEvent()) {
+                // Do not warn for state event, they are always in clear
+                E2EDecoration.NONE
+            } else {
+                val ts = roomSummary.encryptionEventTs ?: 0
+                val eventTs = event.originServerTs ?: 0
+                // If event is in clear after the room enabled encryption we should warn
+                if (eventTs > ts) E2EDecoration.WARN_IN_CLEAR else E2EDecoration.NONE
+            }
+
     /**
      * Tiles type message never show the sender information (like verification request), so we should repeat it for next message
      * even if same sender.
@@ -202,7 +244,7 @@ class MessageInformationDataFactory @Inject constructor(
             EventType.KEY_VERIFICATION_DONE,
             EventType.KEY_VERIFICATION_CANCEL -> true
             EventType.MESSAGE -> {
-                event.getLastMessageContent() is MessageVerificationRequestContent
+                event.getVectorLastMessageContent() is MessageVerificationRequestContent
             }
             else -> false
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
index 655d46194d..87c6a1efda 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.home.room.detail.timeline.helper
 import android.os.Handler
 import android.os.HandlerThread
 
-private const val THREAD_NAME = "Timeline_Building_Thread"
+private const val THREAD_NAME = "Vector-Timeline_Building_Thread"
 
 object TimelineAsyncHelper {
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
index 23db2a721c..51e961f247 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home.room.detail.timeline.helper
 
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
@@ -24,7 +25,7 @@ object TimelineDisplayableEvents {
     /**
      * All types we have an item to build with. Every type not defined here will be shown as DefaultItem if forced to be shown, otherwise will be hidden.
      */
-    val DISPLAYABLE_TYPES = listOf(
+    val DISPLAYABLE_TYPES: List<String> = listOf(
             EventType.MESSAGE,
             EventType.STATE_ROOM_WIDGET_LEGACY,
             EventType.STATE_ROOM_WIDGET,
@@ -51,7 +52,11 @@ object TimelineDisplayableEvents {
             EventType.STATE_ROOM_JOIN_RULES,
             EventType.KEY_VERIFICATION_DONE,
             EventType.KEY_VERIFICATION_CANCEL,
-    ) + EventType.POLL_START + EventType.STATE_ROOM_BEACON_INFO + EventType.BEACON_LOCATION_DATA
+            VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+    ) +
+            EventType.POLL_START.values +
+            EventType.STATE_ROOM_BEACON_INFO.values +
+            EventType.BEACON_LOCATION_DATA.values
 }
 
 fun TimelineEvent.isRoomConfiguration(roomCreatorUserId: String?): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
index e6765bf35a..703a5cb911 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
@@ -18,6 +18,10 @@ package im.vector.app.features.home.room.detail.timeline.helper
 
 import im.vector.app.core.extensions.localDateTime
 import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.isVoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.RelationType
@@ -28,6 +32,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
+import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
@@ -229,8 +234,9 @@ class TimelineEventVisibilityHelper @Inject constructor(
 
         // Hide fake events for local rooms
         if (RoomLocalEcho.isLocalEchoId(roomId) &&
-                root.getClearType() == EventType.STATE_ROOM_MEMBER ||
-                root.getClearType() == EventType.STATE_ROOM_HISTORY_VISIBILITY) {
+                (root.getClearType() == EventType.STATE_ROOM_MEMBER ||
+                        root.getClearType() == EventType.STATE_ROOM_HISTORY_VISIBILITY ||
+                        root.getClearType() == EventType.STATE_ROOM_THIRD_PARTY_INVITE)) {
             return true
         }
 
@@ -241,10 +247,19 @@ class TimelineEventVisibilityHelper @Inject constructor(
             } else root.eventId != rootThreadEventId
         }
 
-        if (root.getClearType() in EventType.BEACON_LOCATION_DATA) {
+        if (root.getClearType() in EventType.BEACON_LOCATION_DATA.values) {
             return !root.isRedacted()
         }
 
+        if (root.getClearType() == VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO &&
+                root.asVoiceBroadcastEvent()?.content?.voiceBroadcastState !in arrayOf(VoiceBroadcastState.STARTED, VoiceBroadcastState.STOPPED)) {
+            return true
+        }
+
+        if (root.asMessageAudioEvent().isVoiceBroadcast()) {
+            return true
+        }
+
         return false
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventsGroups.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventsGroups.kt
index 4ff8a9fa43..a4bfa9e155 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventsGroups.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventsGroups.kt
@@ -17,10 +17,17 @@
 package im.vector.app.features.home.room.detail.timeline.helper
 
 import im.vector.app.core.utils.TextUtils
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.duration
+import im.vector.app.features.voicebroadcast.getVoiceBroadcastEventId
+import im.vector.app.features.voicebroadcast.isVoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
+import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
 import org.threeten.bp.Duration
@@ -54,12 +61,17 @@ class TimelineEventsGroups {
     private fun TimelineEvent.getGroupIdOrNull(): String? {
         val type = root.getClearType()
         val content = root.getClearContent()
-        return if (EventType.isCallEvent(type)) {
-            (content?.get("call_id") as? String)
-        } else if (type == EventType.STATE_ROOM_WIDGET || type == EventType.STATE_ROOM_WIDGET_LEGACY) {
-            root.stateKey
-        } else {
-            null
+        return when {
+            EventType.isCallEvent(type) -> (content?.get("call_id") as? String)
+            type == VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO -> root.asVoiceBroadcastEvent()?.reference?.eventId
+            type == EventType.STATE_ROOM_WIDGET || type == EventType.STATE_ROOM_WIDGET_LEGACY -> root.stateKey
+            type == EventType.MESSAGE && root.asMessageAudioEvent().isVoiceBroadcast() -> {
+                // Group voice messages with a reference to an eventId
+                root.asMessageAudioEvent()?.getVoiceBroadcastEventId()
+            }
+            else -> {
+                null
+            }
         }
     }
 
@@ -128,3 +140,17 @@ class CallSignalingEventsGroup(private val group: TimelineEventsGroup) {
         return group.events.firstOrNull { it.root.getClearType() == EventType.CALL_REJECT }
     }
 }
+
+class VoiceBroadcastEventsGroup(private val group: TimelineEventsGroup) {
+
+    val voiceBroadcastId = group.groupId
+
+    fun getLastDisplayableEvent(): TimelineEvent {
+        return group.events.find { it.root.asVoiceBroadcastEvent()?.content?.voiceBroadcastState == VoiceBroadcastState.STOPPED }
+                ?: group.events.filter { it.root.type == VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO }.maxBy { it.root.originServerTs ?: 0L }
+    }
+
+    fun getDuration(): Int {
+        return group.events.mapNotNull { it.root.asMessageAudioEvent()?.duration }.sum()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
index 5e23f4db16..ab383f04ff 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
@@ -40,7 +40,6 @@ import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.view.TimelineMessageLayoutRenderer
 import im.vector.app.features.reactions.widget.ReactionButton
 import im.vector.app.features.themes.ThemeUtils
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 import org.matrix.android.sdk.api.session.room.send.SendState
 
 private const val MAX_REACTIONS_TO_SHOW = 8
@@ -80,17 +79,7 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder>(@LayoutRes layo
     override fun bind(holder: H) {
         super.bind(holder)
         renderReactions(holder, baseAttributes.informationData.reactionsSummary)
-        when (baseAttributes.informationData.e2eDecoration) {
-            E2EDecoration.NONE -> {
-                holder.e2EDecorationView.render(null)
-            }
-            E2EDecoration.WARN_IN_CLEAR,
-            E2EDecoration.WARN_SENT_BY_UNVERIFIED,
-            E2EDecoration.WARN_SENT_BY_UNKNOWN -> {
-                holder.e2EDecorationView.render(RoomEncryptionTrustLevel.Warning)
-            }
-        }
-
+        holder.e2EDecorationView.renderE2EDecoration(baseAttributes.informationData.e2eDecoration)
         holder.view.onClick(baseAttributes.itemClickListener)
         holder.view.setOnLongClickListener(baseAttributes.itemLongClickListener)
         (holder.view as? TimelineMessageLayoutRenderer)?.renderMessageLayout(baseAttributes.informationData.messageLayout)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 8dba0117b5..869b7d17e2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -63,12 +63,6 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder>(
         }
     }
 
-    private val _memberNameClickListener = object : ClickListener {
-        override fun invoke(p1: View) {
-            attributes.avatarCallback?.onMemberNameClicked(attributes.informationData)
-        }
-    }
-
     private val _threadClickListener = object : ClickListener {
         override fun invoke(p1: View) {
             attributes.threadCallback?.onThreadSummaryClicked(attributes.informationData.eventId, attributes.threadDetails?.isRootThread ?: false)
@@ -95,7 +89,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder>(
             holder.memberNameView.isVisible = true
             holder.memberNameView.text = attributes.informationData.memberName
             holder.memberNameView.setTextColor(attributes.getMemberNameColor())
-            holder.memberNameView.onClick(_memberNameClickListener)
+            holder.memberNameView.onClick(attributes.memberClickListener)
             holder.memberNameView.setOnLongClickListener(attributes.itemLongClickListener)
         } else {
             holder.memberNameView.setOnClickListener(null)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageVoiceBroadcastItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageVoiceBroadcastItem.kt
new file mode 100644
index 0000000000..c6b90cdabe
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageVoiceBroadcastItem.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.item
+
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.IdRes
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import im.vector.app.R
+import im.vector.app.core.extensions.tintBackground
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
+import im.vector.app.features.voicebroadcast.listening.VoiceBroadcastPlayer
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import org.matrix.android.sdk.api.util.MatrixItem
+
+abstract class AbsMessageVoiceBroadcastItem<H : AbsMessageVoiceBroadcastItem.Holder> : AbsMessageItem<H>() {
+
+    @EpoxyAttribute
+    lateinit var voiceBroadcastAttributes: Attributes
+
+    protected val voiceBroadcast get() = voiceBroadcastAttributes.voiceBroadcast
+    protected val voiceBroadcastState get() = voiceBroadcastAttributes.voiceBroadcastState
+    protected val recorderName get() = voiceBroadcastAttributes.recorderName
+    protected val recorder get() = voiceBroadcastAttributes.recorder
+    protected val player get() = voiceBroadcastAttributes.player
+    protected val playbackTracker get() = voiceBroadcastAttributes.playbackTracker
+    protected val duration get() = voiceBroadcastAttributes.duration
+    protected val roomItem get() = voiceBroadcastAttributes.roomItem
+    protected val colorProvider get() = voiceBroadcastAttributes.colorProvider
+    protected val drawableProvider get() = voiceBroadcastAttributes.drawableProvider
+    protected val avatarRenderer get() = attributes.avatarRenderer
+    protected val callback get() = attributes.callback
+
+    override fun isCacheable(): Boolean = false
+
+    override fun bind(holder: H) {
+        super.bind(holder)
+        renderHeader(holder)
+    }
+
+    private fun renderHeader(holder: H) {
+        with(holder) {
+            roomItem?.let {
+                avatarRenderer.render(it, roomAvatarImageView)
+                titleText.text = it.displayName
+            }
+        }
+        renderLiveIndicator(holder)
+        renderMetadata(holder)
+    }
+
+    abstract fun renderLiveIndicator(holder: H)
+
+    protected fun renderPlayingLiveIndicator(holder: H) {
+        with(holder) {
+            liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorError))
+            liveIndicator.isVisible = true
+        }
+    }
+
+    protected fun renderPausedLiveIndicator(holder: H) {
+        with(holder) {
+            liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.vctr_content_quaternary))
+            liveIndicator.isVisible = true
+        }
+    }
+
+    protected fun renderNoLiveIndicator(holder: H) {
+        holder.liveIndicator.isVisible = false
+    }
+
+    abstract fun renderMetadata(holder: H)
+
+    abstract class Holder(@IdRes stubId: Int) : AbsMessageItem.Holder(stubId) {
+        val liveIndicator by bind<TextView>(R.id.liveIndicator)
+        val roomAvatarImageView by bind<ImageView>(R.id.roomAvatarImageView)
+        val titleText by bind<TextView>(R.id.titleText)
+    }
+
+    data class Attributes(
+            val voiceBroadcast: VoiceBroadcast,
+            val voiceBroadcastState: VoiceBroadcastState?,
+            val duration: Int,
+            val recorderName: String,
+            val recorder: VoiceBroadcastRecorder?,
+            val player: VoiceBroadcastPlayer,
+            val playbackTracker: AudioMessagePlaybackTracker,
+            val roomItem: MatrixItem?,
+            val colorProvider: ColorProvider,
+            val drawableProvider: DrawableProvider,
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
index 58d267fb0e..86aada82ac 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
@@ -246,7 +246,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageCallStub
+        private val STUB_ID = R.id.messageCallStub
     }
 
     data class Attributes(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
index 9bc42dca28..a17489b8bc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
@@ -61,6 +61,6 @@ abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>(R.layout.item_tim
     )
 
     companion object {
-        private const val STUB_ID = R.id.messageContentDefaultStub
+        private val STUB_ID = R.id.messageContentDefaultStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
index 47401c34e7..a5e2b0d064 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
@@ -271,7 +271,7 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentMergedCreationStub
+        private val STUB_ID = R.id.messageContentMergedCreationStub
     }
 
     data class Attributes(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedSimilarEventsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedSimilarEventsItem.kt
index 60d7eb4aba..34dc452eae 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedSimilarEventsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedSimilarEventsItem.kt
@@ -63,7 +63,7 @@ abstract class MergedSimilarEventsItem : BasedMergedItem<MergedSimilarEventsItem
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentMergedHeaderStub
+        private val STUB_ID = R.id.messageContentMergedHeaderStub
     }
 
     data class Attributes(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
index 7153c0f442..3e8d6cb487 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
@@ -53,8 +53,7 @@ abstract class MessageAudioItem : AbsMessageItem<MessageAudioItem.Holder>() {
     var fileSize: Long = 0
 
     @EpoxyAttribute
-    @JvmField
-    var isLocalFile = false
+    var izLocalFile = false
 
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var onSeek: ((percentage: Float) -> Unit)? = null
@@ -91,7 +90,7 @@ abstract class MessageAudioItem : AbsMessageItem<MessageAudioItem.Holder>() {
                     holder.view.context.getString(R.string.error_audio_message_unable_to_play, filename)
             holder.progressLayout.isVisible = false
         } else {
-            contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, isLocalFile, holder.progressLayout)
+            contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, izLocalFile, holder.progressLayout)
         }
     }
 
@@ -141,16 +140,14 @@ abstract class MessageAudioItem : AbsMessageItem<MessageAudioItem.Holder>() {
     }
 
     private fun renderStateBasedOnAudioPlayback(holder: Holder) {
-        audioMessagePlaybackTracker.track(attributes.informationData.eventId, object : AudioMessagePlaybackTracker.Listener {
-            override fun onUpdate(state: AudioMessagePlaybackTracker.Listener.State) {
-                when (state) {
-                    is AudioMessagePlaybackTracker.Listener.State.Idle -> renderIdleState(holder)
-                    is AudioMessagePlaybackTracker.Listener.State.Playing -> renderPlayingState(holder, state)
-                    is AudioMessagePlaybackTracker.Listener.State.Paused -> renderPausedState(holder, state)
-                    is AudioMessagePlaybackTracker.Listener.State.Recording -> Unit
-                }
+        audioMessagePlaybackTracker.track(attributes.informationData.eventId) { state ->
+            when (state) {
+                is AudioMessagePlaybackTracker.Listener.State.Idle -> renderIdleState(holder)
+                is AudioMessagePlaybackTracker.Listener.State.Playing -> renderPlayingState(holder, state)
+                is AudioMessagePlaybackTracker.Listener.State.Paused -> renderPausedState(holder, state)
+                is AudioMessagePlaybackTracker.Listener.State.Recording -> Unit
             }
-        })
+        }
     }
 
     private fun renderIdleState(holder: Holder) {
@@ -210,6 +207,6 @@ abstract class MessageAudioItem : AbsMessageItem<MessageAudioItem.Holder>() {
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentAudioStub
+        private val STUB_ID = R.id.messageContentAudioStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
index 2224d9ac3b..bf16c8959e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
@@ -48,12 +48,10 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
     var iconRes: Int = 0
 
     @EpoxyAttribute
-    @JvmField
-    var isLocalFile = false
+    var izLocalFile = false
 
     @EpoxyAttribute
-    @JvmField
-    var isDownloaded = false
+    var izDownloaded = false
 
     @EpoxyAttribute
     lateinit var contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder
@@ -66,7 +64,7 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
         renderSendState(holder.fileLayout, holder.filenameView)
 
         if (!attributes.informationData.sendState.hasFailed()) {
-            contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, isLocalFile, holder.progressLayout)
+            contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, izLocalFile, holder.progressLayout)
         } else {
             holder.fileImageView.setImageResource(R.drawable.ic_cross)
             holder.progressLayout.isVisible = false
@@ -77,7 +75,7 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
         if (attributes.informationData.sendState.isSending()) {
             holder.fileImageView.setImageResource(iconRes)
         } else {
-            if (isDownloaded) {
+            if (izDownloaded) {
                 holder.fileImageView.setImageResource(iconRes)
                 holder.fileDownloadProgress.progress = 0
             } else {
@@ -118,6 +116,6 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentFileStub
+        private val STUB_ID = R.id.messageContentFileStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
index 910776f5d7..2ed20ab417 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
@@ -82,7 +82,7 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
         holder.mediaContentView.onClick(attributes.itemClickListener)
         holder.mediaContentView.setOnLongClickListener(attributes.itemLongClickListener)
 
-        val isImageMessage = attributes.informationData.messageType == MessageType.MSGTYPE_IMAGE
+        val isImageMessage = attributes.informationData.messageType in listOf(MessageType.MSGTYPE_IMAGE, MessageType.MSGTYPE_STICKER_LOCAL)
         val autoplayAnimatedImages = attributes.autoplayAnimatedImages
 
         holder.playContentView.visibility = if (playable && isImageMessage && autoplayAnimatedImages) {
@@ -113,6 +113,6 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentMediaStub
+        private val STUB_ID = R.id.messageContentMediaStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index 9b24720c88..757246d4e4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -106,7 +106,9 @@ enum class E2EDecoration {
     NONE,
     WARN_IN_CLEAR,
     WARN_SENT_BY_UNVERIFIED,
-    WARN_SENT_BY_UNKNOWN
+    WARN_SENT_BY_UNKNOWN,
+    WARN_SENT_BY_DELETED_SESSION,
+    WARN_UNSAFE_KEY
 }
 
 enum class SendStateDecoration {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt
index 5c72980cc8..0c81aa6eb5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt
@@ -47,6 +47,6 @@ abstract class MessageLiveLocationInactiveItem :
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentLiveLocationInactiveStub
+        private val STUB_ID = R.id.messageContentLiveLocationInactiveStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
index 863d03b18c..010abecc73 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
@@ -116,6 +116,6 @@ abstract class MessageLiveLocationItem : AbsMessageLocationItem<MessageLiveLocat
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentLiveLocationStub
+        private val STUB_ID = R.id.messageContentLiveLocationStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationStartItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationStartItem.kt
index 129ae2a17a..5a51274e36 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationStartItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationStartItem.kt
@@ -47,6 +47,6 @@ abstract class MessageLiveLocationStartItem :
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentLiveLocationStartStub
+        private val STUB_ID = R.id.messageContentLiveLocationStartStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
index b5f513fbe9..0e0c15aefa 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
@@ -27,6 +27,6 @@ abstract class MessageLocationItem : AbsMessageLocationItem<MessageLocationItem.
     class Holder : AbsMessageLocationItem.Holder(STUB_ID)
 
     companion object {
-        private const val STUB_ID = R.id.messageContentLocationStub
+        private val STUB_ID = R.id.messageContentLocationStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
index d63d29553d..3a9d21dfc4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
@@ -144,6 +144,6 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentTextStub
+        private val STUB_ID = R.id.messageContentTextStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
new file mode 100644
index 0000000000..b788d79214
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.item
+
+import android.text.format.DateUtils
+import android.widget.ImageButton
+import android.widget.SeekBar
+import android.widget.TextView
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.features.home.room.detail.RoomDetailAction.VoiceBroadcastAction
+import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker.Listener.State
+import im.vector.app.features.voicebroadcast.listening.VoiceBroadcastPlayer
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.views.VoiceBroadcastBufferingView
+import im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+
+@EpoxyModelClass
+abstract class MessageVoiceBroadcastListeningItem : AbsMessageVoiceBroadcastItem<MessageVoiceBroadcastListeningItem.Holder>() {
+
+    private lateinit var playerListener: VoiceBroadcastPlayer.Listener
+    private var isUserSeeking = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        bindVoiceBroadcastItem(holder)
+    }
+
+    private fun bindVoiceBroadcastItem(holder: Holder) {
+        playerListener = object : VoiceBroadcastPlayer.Listener {
+            override fun onPlayingStateChanged(state: VoiceBroadcastPlayer.State) {
+                renderPlayingState(holder, state)
+            }
+
+            override fun onLiveModeChanged(isLive: Boolean) {
+                renderLiveIndicator(holder)
+            }
+        }
+        player.addListener(voiceBroadcast, playerListener)
+        bindSeekBar(holder)
+        bindButtons(holder)
+    }
+
+    private fun bindButtons(holder: Holder) {
+        with(holder) {
+            playPauseButton.setOnClickListener {
+                if (player.currentVoiceBroadcast == voiceBroadcast) {
+                    when (player.playingState) {
+                        VoiceBroadcastPlayer.State.PLAYING,
+                        VoiceBroadcastPlayer.State.BUFFERING -> callback?.onTimelineItemAction(VoiceBroadcastAction.Listening.Pause)
+                        VoiceBroadcastPlayer.State.PAUSED,
+                        VoiceBroadcastPlayer.State.IDLE -> callback?.onTimelineItemAction(VoiceBroadcastAction.Listening.PlayOrResume(voiceBroadcast))
+                    }
+                } else {
+                    callback?.onTimelineItemAction(VoiceBroadcastAction.Listening.PlayOrResume(voiceBroadcast))
+                }
+            }
+            fastBackwardButton.setOnClickListener {
+                val newPos = seekBar.progress.minus(30_000).coerceIn(0, duration)
+                callback?.onTimelineItemAction(VoiceBroadcastAction.Listening.SeekTo(voiceBroadcast, newPos, duration))
+            }
+            fastForwardButton.setOnClickListener {
+                val newPos = seekBar.progress.plus(30_000).coerceIn(0, duration)
+                callback?.onTimelineItemAction(VoiceBroadcastAction.Listening.SeekTo(voiceBroadcast, newPos, duration))
+            }
+        }
+    }
+
+    override fun renderMetadata(holder: Holder) {
+        with(holder) {
+            broadcasterNameMetadata.value = recorderName
+            listenersCountMetadata.isVisible = false
+        }
+    }
+
+    override fun renderLiveIndicator(holder: Holder) {
+        when {
+            voiceBroadcastState == null || voiceBroadcastState == VoiceBroadcastState.STOPPED -> renderNoLiveIndicator(holder)
+            voiceBroadcastState == VoiceBroadcastState.PAUSED -> renderPausedLiveIndicator(holder)
+            else -> renderPlayingLiveIndicator(holder)
+        }
+    }
+
+    private fun renderPlayingState(holder: Holder, state: VoiceBroadcastPlayer.State) {
+        with(holder) {
+            bufferingView.isVisible = state == VoiceBroadcastPlayer.State.BUFFERING
+            voiceBroadcastMetadata.isVisible = state != VoiceBroadcastPlayer.State.BUFFERING
+
+            when (state) {
+                VoiceBroadcastPlayer.State.PLAYING,
+                VoiceBroadcastPlayer.State.BUFFERING -> {
+                    playPauseButton.setImageResource(R.drawable.ic_play_pause_pause)
+                    playPauseButton.contentDescription = view.resources.getString(R.string.a11y_pause_voice_broadcast)
+                }
+                VoiceBroadcastPlayer.State.IDLE,
+                VoiceBroadcastPlayer.State.PAUSED -> {
+                    playPauseButton.setImageResource(R.drawable.ic_play_pause_play)
+                    playPauseButton.contentDescription = view.resources.getString(R.string.a11y_play_voice_broadcast)
+                }
+            }
+
+            renderLiveIndicator(holder)
+        }
+    }
+
+    private fun bindSeekBar(holder: Holder) {
+        with(holder) {
+            remainingTimeView.text = formatRemainingTime(duration)
+            elapsedTimeView.text = formatPlaybackTime(0)
+            seekBar.max = duration
+            seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+                override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                    remainingTimeView.text = formatRemainingTime(duration - progress)
+                    elapsedTimeView.text = formatPlaybackTime(progress)
+                }
+
+                override fun onStartTrackingTouch(seekBar: SeekBar) {
+                    isUserSeeking = true
+                }
+
+                override fun onStopTrackingTouch(seekBar: SeekBar) {
+                    callback?.onTimelineItemAction(VoiceBroadcastAction.Listening.SeekTo(voiceBroadcast, seekBar.progress, duration))
+                    isUserSeeking = false
+                }
+            })
+        }
+        playbackTracker.track(voiceBroadcast.voiceBroadcastId) { playbackState ->
+            renderBackwardForwardButtons(holder, playbackState)
+            renderLiveIndicator(holder)
+            if (!isUserSeeking) {
+                holder.seekBar.progress = playbackTracker.getPlaybackTime(voiceBroadcast.voiceBroadcastId) ?: 0
+            }
+        }
+    }
+
+    private fun renderBackwardForwardButtons(holder: Holder, playbackState: State) {
+        val isPlayingOrPaused = playbackState is State.Playing || playbackState is State.Paused
+        val playbackTime = playbackTracker.getPlaybackTime(voiceBroadcast.voiceBroadcastId) ?: 0
+        val canBackward = isPlayingOrPaused && playbackTime > 0
+        val canForward = isPlayingOrPaused && playbackTime < duration
+        holder.fastBackwardButton.isInvisible = !canBackward
+        holder.fastForwardButton.isInvisible = !canForward
+    }
+
+    private fun formatPlaybackTime(time: Int) = DateUtils.formatElapsedTime((time / 1000).toLong())
+    private fun formatRemainingTime(time: Int) = if (time < 1000) formatPlaybackTime(time) else String.format("-%s", formatPlaybackTime(time))
+
+    override fun unbind(holder: Holder) {
+        super.unbind(holder)
+        player.removeListener(voiceBroadcast, playerListener)
+        playbackTracker.untrack(voiceBroadcast.voiceBroadcastId)
+        with(holder) {
+            seekBar.setOnSeekBarChangeListener(null)
+            playPauseButton.onClick(null)
+            fastForwardButton.onClick(null)
+            fastBackwardButton.onClick(null)
+        }
+    }
+
+    override fun getViewStubId() = STUB_ID
+
+    class Holder : AbsMessageVoiceBroadcastItem.Holder(STUB_ID) {
+        val playPauseButton by bind<ImageButton>(R.id.playPauseButton)
+        val bufferingView by bind<VoiceBroadcastBufferingView>(R.id.bufferingMetadata)
+        val fastBackwardButton by bind<ImageButton>(R.id.fastBackwardButton)
+        val fastForwardButton by bind<ImageButton>(R.id.fastForwardButton)
+        val seekBar by bind<SeekBar>(R.id.seekBar)
+        val remainingTimeView by bind<TextView>(R.id.remainingTime)
+        val elapsedTimeView by bind<TextView>(R.id.elapsedTime)
+        val broadcasterNameMetadata by bind<VoiceBroadcastMetadataView>(R.id.broadcasterNameMetadata)
+        val voiceBroadcastMetadata by bind<VoiceBroadcastMetadataView>(R.id.voiceBroadcastMetadata)
+        val listenersCountMetadata by bind<VoiceBroadcastMetadataView>(R.id.listenersCountMetadata)
+    }
+
+    companion object {
+        private val STUB_ID = R.id.messageVoiceBroadcastListeningStub
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
new file mode 100644
index 0000000000..39d2d73c68
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.item
+
+import android.widget.ImageButton
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.utils.TextUtils
+import im.vector.app.features.home.room.detail.RoomDetailAction.VoiceBroadcastAction
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+import org.threeten.bp.Duration
+
+@EpoxyModelClass
+abstract class MessageVoiceBroadcastRecordingItem : AbsMessageVoiceBroadcastItem<MessageVoiceBroadcastRecordingItem.Holder>() {
+
+    private var recorderListener: VoiceBroadcastRecorder.Listener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        bindVoiceBroadcastItem(holder)
+    }
+
+    private fun bindVoiceBroadcastItem(holder: Holder) {
+        if (recorder != null && recorder?.recordingState != VoiceBroadcastRecorder.State.Idle) {
+            recorderListener = object : VoiceBroadcastRecorder.Listener {
+                override fun onStateUpdated(state: VoiceBroadcastRecorder.State) {
+                    renderRecordingState(holder, state)
+                }
+
+                override fun onRemainingTimeUpdated(remainingTime: Long?) {
+                    renderRemainingTime(holder, remainingTime)
+                }
+            }.also { recorder?.addListener(it) }
+        } else {
+            renderVoiceBroadcastState(holder)
+        }
+    }
+
+    override fun renderLiveIndicator(holder: Holder) {
+        when (voiceBroadcastState) {
+            VoiceBroadcastState.STARTED,
+            VoiceBroadcastState.RESUMED -> renderPlayingLiveIndicator(holder)
+            VoiceBroadcastState.PAUSED -> renderPausedLiveIndicator(holder)
+            VoiceBroadcastState.STOPPED, null -> renderNoLiveIndicator(holder)
+        }
+    }
+
+    override fun renderMetadata(holder: Holder) {
+        holder.listenersCountMetadata.isVisible = false
+    }
+
+    private fun renderRemainingTime(holder: Holder, remainingTime: Long?) {
+        if (remainingTime != null) {
+            val formattedDuration = TextUtils.formatDurationWithUnits(
+                    holder.view.context,
+                    Duration.ofSeconds(remainingTime.coerceAtLeast(0L))
+            )
+            holder.remainingTimeMetadata.value = holder.view.resources.getString(R.string.voice_broadcast_recording_time_left, formattedDuration)
+            holder.remainingTimeMetadata.isVisible = true
+        } else {
+            holder.remainingTimeMetadata.isVisible = false
+        }
+    }
+
+    private fun renderRecordingState(holder: Holder, state: VoiceBroadcastRecorder.State) {
+        when (state) {
+            VoiceBroadcastRecorder.State.Recording -> renderRecordingState(holder)
+            VoiceBroadcastRecorder.State.Paused -> renderPausedState(holder)
+            VoiceBroadcastRecorder.State.Idle -> renderStoppedState(holder)
+        }
+    }
+
+    private fun renderVoiceBroadcastState(holder: Holder) {
+        when (voiceBroadcastState) {
+            VoiceBroadcastState.STARTED,
+            VoiceBroadcastState.RESUMED -> renderRecordingState(holder)
+            VoiceBroadcastState.PAUSED -> renderPausedState(holder)
+            VoiceBroadcastState.STOPPED,
+            null -> renderStoppedState(holder)
+        }
+    }
+
+    private fun renderRecordingState(holder: Holder) = with(holder) {
+        stopRecordButton.isEnabled = true
+        recordButton.isEnabled = true
+
+        val drawableColor = colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary)
+        val drawable = drawableProvider.getDrawable(R.drawable.ic_play_pause_pause, drawableColor)
+        recordButton.setImageDrawable(drawable)
+        recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_pause_voice_broadcast_record)
+        recordButton.onClick { callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Pause) }
+        stopRecordButton.onClick { callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
+    }
+
+    private fun renderPausedState(holder: Holder) = with(holder) {
+        stopRecordButton.isEnabled = true
+        recordButton.isEnabled = true
+
+        recordButton.setImageResource(R.drawable.ic_recording_dot)
+        recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_resume_voice_broadcast_record)
+        recordButton.onClick { callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Resume) }
+        stopRecordButton.onClick { callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
+    }
+
+    private fun renderStoppedState(holder: Holder) = with(holder) {
+        recordButton.isEnabled = false
+        stopRecordButton.isEnabled = false
+    }
+
+    override fun unbind(holder: Holder) {
+        super.unbind(holder)
+        recorderListener?.let { recorder?.removeListener(it) }
+        recorderListener = null
+        with(holder) {
+            recordButton.onClick(null)
+            stopRecordButton.onClick(null)
+        }
+    }
+
+    override fun getViewStubId() = STUB_ID
+
+    class Holder : AbsMessageVoiceBroadcastItem.Holder(STUB_ID) {
+        val listenersCountMetadata by bind<VoiceBroadcastMetadataView>(R.id.listenersCountMetadata)
+        val remainingTimeMetadata by bind<VoiceBroadcastMetadataView>(R.id.remainingTimeMetadata)
+        val recordButton by bind<ImageButton>(R.id.recordButton)
+        val stopRecordButton by bind<ImageButton>(R.id.stopRecordButton)
+    }
+
+    companion object {
+        private val STUB_ID = R.id.messageVoiceBroadcastRecordingStub
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
index 72a00d704b..d3f320db7d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
@@ -55,8 +55,7 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
     var waveform: List<Int> = emptyList()
 
     @EpoxyAttribute
-    @JvmField
-    var isLocalFile = false
+    var izLocalFile = false
 
     @EpoxyAttribute
     lateinit var contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder
@@ -77,7 +76,7 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
         super.bind(holder)
         renderSendState(holder.voiceLayout, null)
         if (!attributes.informationData.sendState.hasFailed()) {
-            contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, isLocalFile, holder.progressLayout)
+            contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, izLocalFile, holder.progressLayout)
         } else {
             holder.voicePlaybackControlButton.setImageResource(R.drawable.ic_cross)
             holder.voicePlaybackControlButton.contentDescription = holder.view.context.getString(R.string.error_voice_message_unable_to_play)
@@ -123,16 +122,14 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
             true
         }
 
-        audioMessagePlaybackTracker.track(attributes.informationData.eventId, object : AudioMessagePlaybackTracker.Listener {
-            override fun onUpdate(state: AudioMessagePlaybackTracker.Listener.State) {
-                when (state) {
-                    is AudioMessagePlaybackTracker.Listener.State.Idle -> renderIdleState(holder, waveformColorIdle, waveformColorPlayed)
-                    is AudioMessagePlaybackTracker.Listener.State.Playing -> renderPlayingState(holder, state, waveformColorIdle, waveformColorPlayed)
-                    is AudioMessagePlaybackTracker.Listener.State.Paused -> renderPausedState(holder, state, waveformColorIdle, waveformColorPlayed)
-                    is AudioMessagePlaybackTracker.Listener.State.Recording -> Unit
-                }
+        audioMessagePlaybackTracker.track(attributes.informationData.eventId) { state ->
+            when (state) {
+                is AudioMessagePlaybackTracker.Listener.State.Idle -> renderIdleState(holder, waveformColorIdle, waveformColorPlayed)
+                is AudioMessagePlaybackTracker.Listener.State.Playing -> renderPlayingState(holder, state, waveformColorIdle, waveformColorPlayed)
+                is AudioMessagePlaybackTracker.Listener.State.Paused -> renderPausedState(holder, state, waveformColorIdle, waveformColorPlayed)
+                is AudioMessagePlaybackTracker.Listener.State.Recording -> Unit
             }
-        })
+        }
     }
 
     private fun getTouchedPositionPercentage(motionEvent: MotionEvent, view: View) = (motionEvent.x / view.width).coerceIn(0f, 1f)
@@ -179,6 +176,6 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentVoiceStub
+        private val STUB_ID = R.id.messageContentVoiceStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
index ad62249459..d5a48db268 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
@@ -28,7 +28,6 @@ import im.vector.app.core.ui.views.ShieldImageView
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 
 @EpoxyModelClass
 abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>(R.layout.item_timeline_event_base_noinfo) {
@@ -43,16 +42,7 @@ abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>(R.layout.item_timel
         holder.view.setOnLongClickListener(attributes.itemLongClickListener)
         holder.avatarImageView.onClick(attributes.avatarClickListener)
 
-        when (attributes.informationData.e2eDecoration) {
-            E2EDecoration.NONE -> {
-                holder.e2EDecorationView.render(null)
-            }
-            E2EDecoration.WARN_IN_CLEAR,
-            E2EDecoration.WARN_SENT_BY_UNVERIFIED,
-            E2EDecoration.WARN_SENT_BY_UNKNOWN -> {
-                holder.e2EDecorationView.render(RoomEncryptionTrustLevel.Warning)
-            }
-        }
+        holder.e2EDecorationView.renderE2EDecoration(attributes.informationData.e2eDecoration)
     }
 
     override fun unbind(holder: Holder) {
@@ -83,6 +73,6 @@ abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>(R.layout.item_timel
     )
 
     companion object {
-        private const val STUB_ID = R.id.messageContentNoticeStub
+        private val STUB_ID = R.id.messageContentNoticeStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollItem.kt
index 5dd721b007..54be4092ed 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollItem.kt
@@ -92,6 +92,6 @@ abstract class PollItem : AbsMessageItem<PollItem.Holder>() {
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentPollStub
+        private val STUB_ID = R.id.messageContentPollStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
index 057a9bad0e..f04d681862 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
@@ -29,6 +29,6 @@ abstract class RedactedMessageItem : AbsMessageItem<RedactedMessageItem.Holder>(
     class Holder : AbsMessageItem.Holder(STUB_ID)
 
     companion object {
-        private const val STUB_ID = R.id.messageContentRedactedStub
+        private val STUB_ID = R.id.messageContentRedactedStub
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
index c4dd4bedeb..1e5bb0521d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
@@ -76,7 +76,7 @@ abstract class StatusTileTimelineItem : AbsBaseMessageItem<StatusTileTimelineIte
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageVerificationDoneStub
+        private val STUB_ID = R.id.messageVerificationDoneStub
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TypingItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TypingItem.kt
new file mode 100644
index 0000000000..2ca0ebea48
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TypingItem.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.item
+
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import com.airbnb.epoxy.EpoxyModelWithHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.ui.views.TypingMessageView
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+
+@EpoxyModelClass
+abstract class TypingItem : EpoxyModelWithHolder<TypingItem.TypingHolder>() {
+
+    companion object {
+        private const val MAX_TYPING_MESSAGE_USERS_COUNT = 4
+    }
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    lateinit var avatarRenderer: AvatarRenderer
+
+    @EpoxyAttribute
+    var users: List<SenderInfo> = emptyList()
+
+    override fun getDefaultLayout(): Int = R.layout.item_typing_users
+
+    override fun bind(holder: TypingHolder) {
+        super.bind(holder)
+
+        val typingUsers = users.take(MAX_TYPING_MESSAGE_USERS_COUNT)
+        holder.typingView.apply {
+            animate().cancel()
+            val duration = 100L
+            if (typingUsers.isEmpty()) {
+                animate().translationY(height.toFloat())
+                        .alpha(0f)
+                        .setDuration(duration)
+                        .withEndAction {
+                            isInvisible = true
+                        }.start()
+            } else {
+                isVisible = true
+
+                translationY = height.toFloat()
+                alpha = 0f
+                render(typingUsers, avatarRenderer)
+                animate().translationY(0f)
+                        .alpha(1f)
+                        .setDuration(duration)
+                        .start()
+            }
+        }
+    }
+
+    class TypingHolder : VectorEpoxyHolder() {
+        val typingView by bind<TypingMessageView>(R.id.typingMessageView)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
index 1abed2031d..25656080f8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
@@ -137,7 +137,7 @@ abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestI
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageVerificationRequestStub
+        private val STUB_ID = R.id.messageVerificationRequestStub
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/WidgetTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/WidgetTileTimelineItem.kt
index 5a73a20aa3..883e09e6a0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/WidgetTileTimelineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/WidgetTileTimelineItem.kt
@@ -66,7 +66,7 @@ abstract class WidgetTileTimelineItem : AbsBaseMessageItem<WidgetTileTimelineIte
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageWidgetStub
+        private val STUB_ID = R.id.messageWidgetStub
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt
index 920f3e3b80..c46112f995 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt
@@ -34,22 +34,22 @@ class EventTextRenderer @AssistedInject constructor(
         @Assisted private val roomId: String?,
         private val context: Context,
         private val avatarRenderer: AvatarRenderer,
-        private val sessionHolder: ActiveSessionHolder
+        private val activeSessionHolder: ActiveSessionHolder,
 ) {
 
-    /* ==========================================================================================
-     * Public api
-     * ========================================================================================== */
-
     @AssistedFactory
     interface Factory {
         fun create(roomId: String?): EventTextRenderer
     }
 
     /**
-     * @param text the text you want to render
+     * @param text the text to be rendered
      */
     fun render(text: CharSequence): CharSequence {
+        return renderNotifyEveryone(text)
+    }
+
+    private fun renderNotifyEveryone(text: CharSequence): CharSequence {
         return if (roomId != null && text.contains(MatrixItem.NOTIFY_EVERYONE)) {
             SpannableStringBuilder(text).apply {
                 addNotifyEveryoneSpans(this, roomId)
@@ -59,12 +59,8 @@ class EventTextRenderer @AssistedInject constructor(
         }
     }
 
-    /* ==========================================================================================
-     * Helper methods
-     * ========================================================================================== */
-
     private fun addNotifyEveryoneSpans(text: Spannable, roomId: String) {
-        val room: RoomSummary? = sessionHolder.getSafeActiveSession()?.roomService()?.getRoomSummary(roomId)
+        val room: RoomSummary? = activeSessionHolder.getSafeActiveSession()?.roomService()?.getRoomSummary(roomId)
         val matrixItem = MatrixItem.EveryoneInRoomItem(
                 id = roomId,
                 avatarUrl = room?.avatarUrl,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/ProcessBodyOfReplyToEventUseCase.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/ProcessBodyOfReplyToEventUseCase.kt
new file mode 100644
index 0000000000..2197d89a2c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/ProcessBodyOfReplyToEventUseCase.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.render
+
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.events.model.getPollQuestion
+import org.matrix.android.sdk.api.session.events.model.isAudioMessage
+import org.matrix.android.sdk.api.session.events.model.isFileMessage
+import org.matrix.android.sdk.api.session.events.model.isImageMessage
+import org.matrix.android.sdk.api.session.events.model.isLiveLocation
+import org.matrix.android.sdk.api.session.events.model.isPoll
+import org.matrix.android.sdk.api.session.events.model.isSticker
+import org.matrix.android.sdk.api.session.events.model.isVideoMessage
+import org.matrix.android.sdk.api.session.events.model.isVoiceMessage
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
+import org.matrix.android.sdk.api.session.room.model.relation.ReplyToContent
+import javax.inject.Inject
+
+private const val IN_REPLY_TO = "In reply to"
+private const val BREAKING_LINE = "<br />"
+private const val ENDING_BLOCK_QUOTE = "</blockquote>"
+
+class ProcessBodyOfReplyToEventUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val stringProvider: StringProvider,
+) {
+
+    fun execute(roomId: String, matrixFormattedBody: String, replyToContent: ReplyToContent): String {
+        val repliedToEvent = replyToContent.eventId?.let { getEvent(it, roomId) }
+        val breakingLineIndex = matrixFormattedBody.indexOf(BREAKING_LINE)
+        val endOfBlockQuoteIndex = matrixFormattedBody.lastIndexOf(ENDING_BLOCK_QUOTE)
+
+        val withTranslatedContent = if (repliedToEvent != null && breakingLineIndex != -1 && endOfBlockQuoteIndex != -1) {
+            val afterBreakingLineIndex = breakingLineIndex + BREAKING_LINE.length
+            when {
+                repliedToEvent.isFileMessage() -> {
+                    matrixFormattedBody.replaceRange(
+                            afterBreakingLineIndex,
+                            endOfBlockQuoteIndex,
+                            stringProvider.getString(R.string.message_reply_to_sender_sent_file)
+                    )
+                }
+                repliedToEvent.isVoiceMessage() -> {
+                    matrixFormattedBody.replaceRange(
+                            afterBreakingLineIndex,
+                            endOfBlockQuoteIndex,
+                            stringProvider.getString(R.string.message_reply_to_sender_sent_voice_message)
+                    )
+                }
+                repliedToEvent.isAudioMessage() -> {
+                    matrixFormattedBody.replaceRange(
+                            afterBreakingLineIndex,
+                            endOfBlockQuoteIndex,
+                            stringProvider.getString(R.string.message_reply_to_sender_sent_audio_file)
+                    )
+                }
+                repliedToEvent.isImageMessage() -> {
+                    matrixFormattedBody.replaceRange(
+                            afterBreakingLineIndex,
+                            endOfBlockQuoteIndex,
+                            stringProvider.getString(R.string.message_reply_to_sender_sent_image)
+                    )
+                }
+                repliedToEvent.isVideoMessage() -> {
+                    matrixFormattedBody.replaceRange(
+                            afterBreakingLineIndex,
+                            endOfBlockQuoteIndex,
+                            stringProvider.getString(R.string.message_reply_to_sender_sent_video)
+                    )
+                }
+                repliedToEvent.isSticker() -> {
+                    matrixFormattedBody.replaceRange(
+                            afterBreakingLineIndex,
+                            endOfBlockQuoteIndex,
+                            stringProvider.getString(R.string.message_reply_to_sender_sent_sticker)
+                    )
+                }
+                repliedToEvent.isPoll() -> {
+                    matrixFormattedBody.replaceRange(
+                            afterBreakingLineIndex,
+                            endOfBlockQuoteIndex,
+                            repliedToEvent.getPollQuestion() ?: stringProvider.getString(R.string.message_reply_to_sender_created_poll)
+                    )
+                }
+                repliedToEvent.isLiveLocation() -> {
+                    matrixFormattedBody.replaceRange(
+                            afterBreakingLineIndex,
+                            endOfBlockQuoteIndex,
+                            stringProvider.getString(R.string.live_location_description)
+                    )
+                }
+                else -> matrixFormattedBody
+            }
+        } else {
+            matrixFormattedBody
+        }
+
+        return withTranslatedContent.replace(
+                IN_REPLY_TO,
+                stringProvider.getString(R.string.message_reply_to_prefix)
+        )
+    }
+
+    private fun getEvent(eventId: String, roomId: String) =
+            activeSessionHolder.getSafeActiveSession()
+                    ?.getRoom(roomId)
+                    ?.getTimelineEvent(eventId)
+                    ?.root
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
index e1707decc9..c207a5f67e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.detail.timeline.style
 
 import android.content.res.Resources
 import im.vector.app.R
+import im.vector.app.core.extensions.getVectorLastMessageContent
 import im.vector.app.core.extensions.localDateTime
 import im.vector.app.core.resources.LocaleProvider
 import im.vector.app.core.resources.isRTL
@@ -29,7 +30,6 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
-import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.isEdition
 import org.matrix.android.sdk.api.session.room.timeline.isRootThread
 import javax.inject.Inject
@@ -47,8 +47,10 @@ class TimelineMessageLayoutFactory @Inject constructor(
         private val EVENT_TYPES_WITH_BUBBLE_LAYOUT = setOf(
                 EventType.MESSAGE,
                 EventType.ENCRYPTED,
-                EventType.STICKER
-        ) + EventType.POLL_START + EventType.STATE_ROOM_BEACON_INFO
+                EventType.STICKER,
+        ) +
+                EventType.POLL_START.values +
+                EventType.STATE_ROOM_BEACON_INFO.values
 
         // Can't be rendered in bubbles, so get back to default layout
         private val MSG_TYPES_WITHOUT_BUBBLE_LAYOUT = setOf(
@@ -68,6 +70,7 @@ class TimelineMessageLayoutFactory @Inject constructor(
         private val MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE = setOf(
                 MessageType.MSGTYPE_IMAGE,
                 MessageType.MSGTYPE_VIDEO,
+                MessageType.MSGTYPE_STICKER_LOCAL,
                 MessageType.MSGTYPE_BEACON_INFO,
                 MessageType.MSGTYPE_LOCATION,
                 MessageType.MSGTYPE_BEACON_LOCATION_DATA,
@@ -125,7 +128,7 @@ class TimelineMessageLayoutFactory @Inject constructor(
                             isLastFromThisSender = isLastFromThisSender
                     )
 
-                    val messageContent = event.getLastMessageContent()
+                    val messageContent = event.getVectorLastMessageContent()
                     TimelineMessageLayout.Bubble(
                             showAvatar = showInformation && !isSentByMe,
                             showDisplayName = showInformation && !isSentByMe,
@@ -166,7 +169,7 @@ class TimelineMessageLayoutFactory @Inject constructor(
     private fun TimelineEvent.shouldBuildBubbleLayout(): Boolean {
         val type = root.getClearType()
         if (type in EVENT_TYPES_WITH_BUBBLE_LAYOUT) {
-            val messageContent = getLastMessageContent()
+            val messageContent = getVectorLastMessageContent()
             return messageContent?.msgType !in MSG_TYPES_WITHOUT_BUBBLE_LAYOUT
         }
         return false
@@ -211,7 +214,7 @@ class TimelineMessageLayoutFactory @Inject constructor(
             EventType.KEY_VERIFICATION_DONE,
             EventType.KEY_VERIFICATION_CANCEL -> true
             EventType.MESSAGE -> {
-                event.getLastMessageContent() is MessageVerificationRequestContent
+                event.getVectorLastMessageContent() is MessageVerificationRequestContent
             }
             else -> false
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleContentLayout.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleContentLayout.kt
index f11b1c6951..6d8fd87a52 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleContentLayout.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleContentLayout.kt
@@ -27,7 +27,7 @@ import androidx.core.view.marginEnd
 import androidx.core.view.marginStart
 import androidx.core.view.marginTop
 import im.vector.app.R
-import im.vector.app.core.resources.LocaleProvider
+import im.vector.app.core.resources.DefaultLocaleProvider
 import im.vector.app.core.resources.getLayoutDirectionFromCurrentLocale
 
 class MessageBubbleContentLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) :
@@ -53,7 +53,7 @@ class MessageBubbleContentLayout @JvmOverloads constructor(context: Context, att
             textViewStub.setOnInflateListener(null)
             messageTextView = inflated.findViewById(R.id.messageTextView)
         }
-        localeLayoutDirection = LocaleProvider(resources).getLayoutDirectionFromCurrentLocale()
+        localeLayoutDirection = DefaultLocaleProvider(resources).getLayoutDirectionFromCurrentLocale()
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
index c9665a9125..6ac787b719 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
@@ -33,7 +33,7 @@ import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.google.android.material.shape.MaterialShapeDrawable
 import im.vector.app.R
-import im.vector.app.core.resources.LocaleProvider
+import im.vector.app.core.resources.DefaultLocaleProvider
 import im.vector.app.core.resources.getLayoutDirectionFromCurrentLocale
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.databinding.ViewMessageBubbleBinding
@@ -67,7 +67,7 @@ class MessageBubbleView @JvmOverloads constructor(
     override fun onFinishInflate() {
         super.onFinishInflate()
         views = ViewMessageBubbleBinding.bind(this)
-        val currentLayoutDirection = LocaleProvider(resources).getLayoutDirectionFromCurrentLocale()
+        val currentLayoutDirection = DefaultLocaleProvider(resources).getLayoutDirectionFromCurrentLocale()
         val layoutDirectionToSet = if (isIncoming) {
             currentLayoutDirection
         } else {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
index a7804bd049..85c910f7e1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
@@ -46,7 +46,7 @@ abstract class RoomCategoryItem : VectorEpoxyModel<RoomCategoryItem.Holder>(R.la
         val expandedArrowDrawable = ContextCompat.getDrawable(holder.rootView.context, expandedArrowDrawableRes)?.also {
             DrawableCompat.setTint(it, tintColor)
         }
-        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State(unreadNotificationCount, showHighlighted))
+        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State.Count(unreadNotificationCount, showHighlighted))
         holder.titleView.text = title
         holder.counterView.text = itemCount.takeIf { it > 0 }?.toString().orEmpty()
         holder.counterView.setCompoundDrawablesWithIntrinsicBounds(null, null, expandedArrowDrawable, null)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
index e6b6b34503..aa982741f7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
@@ -31,4 +31,5 @@ sealed class RoomListAction : VectorViewModelAction {
     data class LeaveRoom(val roomId: String) : RoomListAction()
     data class JoinSuggestedRoom(val roomId: String, val viaServers: List<String>?) : RoomListAction()
     data class ShowRoomDetails(val roomId: String, val viaServers: List<String>?) : RoomListAction()
+    object DeleteAllLocalRoom : RoomListAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index c25fe546c3..970b1c34e1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -35,6 +35,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.epoxy.LayoutManagerStateRestorer
 import im.vector.app.core.extensions.cleanup
@@ -70,17 +71,19 @@ data class RoomListParams(
         val displayMode: RoomListDisplayMode
 ) : Parcelable
 
-class RoomListFragment @Inject constructor(
-        private val pagedControllerFactory: RoomSummaryPagedControllerFactory,
-        private val notificationDrawerManager: NotificationDrawerManager,
-        private val footerController: RoomListFooterController,
-        private val userPreferencesProvider: UserPreferencesProvider
-) : VectorBaseFragment<FragmentRoomListBinding>(),
+@AndroidEntryPoint
+class RoomListFragment :
+        VectorBaseFragment<FragmentRoomListBinding>(),
         RoomListListener,
         OnBackPressed,
         FilteredRoomFooterItem.Listener,
         NotifsFabMenuView.Listener {
 
+    @Inject lateinit var pagedControllerFactory: RoomSummaryPagedControllerFactory
+    @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
+    @Inject lateinit var footerController: RoomListFooterController
+    @Inject lateinit var userPreferencesProvider: UserPreferencesProvider
+
     private var modelBuildListener: OnModelBuildFinishedListener? = null
     private lateinit var sharedActionViewModel: RoomListQuickActionsSharedActionViewModel
     private val roomListParams: RoomListParams by args()
@@ -146,10 +149,13 @@ class RoomListFragment @Inject constructor(
                         (it.contentEpoxyController as? RoomSummaryPagedController)?.roomChangeMembershipStates = ms
                     }
         }
-        roomListViewModel.onEach(RoomListViewState::localRoomIds) {
-            // Local rooms should not exist anymore when the room list is shown
-            roomListViewModel.deleteLocalRooms(it)
-        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        // Local rooms should not exist anymore when the room list is shown
+        roomListViewModel.handle(RoomListAction.DeleteAllLocalRoom)
     }
 
     private fun refreshCollapseStates() {
@@ -185,7 +191,7 @@ class RoomListFragment @Inject constructor(
     }
 
     private fun handleShowMxToLink(link: String) {
-        navigator.openMatrixToBottomSheet(requireContext(), link, OriginOfMatrixTo.ROOM_LIST)
+        navigator.openMatrixToBottomSheet(requireActivity(), link, OriginOfMatrixTo.ROOM_LIST)
     }
 
     override fun onDestroyView() {
@@ -279,7 +285,7 @@ class RoomListFragment @Inject constructor(
     }
 
     private fun setupRecyclerView() {
-        val layoutManager = LinearLayoutManager(context)
+        val layoutManager = LinearLayoutManager(requireContext())
         stateRestorer = LayoutManagerStateRestorer(layoutManager).register()
         views.roomListView.layoutManager = layoutManager
         views.roomListView.itemAnimator = RoomListAnimator()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 4b76daf502..74b55d435d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -47,7 +47,6 @@ import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
-import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
@@ -98,7 +97,6 @@ class RoomListViewModel @AssistedInject constructor(
 
     init {
         observeMembershipChanges()
-        observeLocalRooms()
 
         spaceStateHandler.getSelectedSpaceFlow()
                 .distinctUntilChanged()
@@ -126,37 +124,20 @@ class RoomListViewModel @AssistedInject constructor(
                 }
     }
 
-    private fun observeLocalRooms() {
-        val queryParams = roomSummaryQueryParams {
-            memberships = listOf(Membership.JOIN)
-        }
-        session
-                .flow()
-                .liveRoomSummaries(queryParams)
-                .map { roomSummaries ->
-                    roomSummaries.mapNotNull { summary ->
-                        summary.roomId.takeIf { RoomLocalEcho.isLocalEchoId(it) }
-                    }.toSet()
-                }
-                .setOnEach { roomIds ->
-                    copy(localRoomIds = roomIds)
-                }
-    }
-
     companion object : MavericksViewModelFactory<RoomListViewModel, RoomListViewState> by hiltMavericksViewModelFactory()
 
     private val roomListSectionBuilder = RoomListSectionBuilder(
-                session,
-                stringProvider,
-                spaceStateHandler,
-                viewModelScope,
-                autoAcceptInvites,
-                {
-                    updatableQuery = it
-                },
-                suggestedRoomJoiningState,
-                !vectorPreferences.prefSpacesShowAllRoomInHome()
-        )
+            session,
+            stringProvider,
+            spaceStateHandler,
+            viewModelScope,
+            autoAcceptInvites,
+            {
+                updatableQuery = it
+            },
+            suggestedRoomJoiningState,
+            !vectorPreferences.prefSpacesShowAllRoomInHome()
+    )
 
     val sections: List<RoomsSection> by lazy {
         roomListSectionBuilder.buildSections(initialState.displayMode)
@@ -174,6 +155,7 @@ class RoomListViewModel @AssistedInject constructor(
             is RoomListAction.ToggleSection -> handleToggleSection(action.section)
             is RoomListAction.JoinSuggestedRoom -> handleJoinSuggestedRoom(action)
             is RoomListAction.ShowRoomDetails -> handleShowRoomDetails(action)
+            RoomListAction.DeleteAllLocalRoom -> handleDeleteLocalRooms()
         }
     }
 
@@ -181,14 +163,6 @@ class RoomListViewModel @AssistedInject constructor(
         return session.getRoom(roomId)?.stateService()?.isPublic().orFalse()
     }
 
-    fun deleteLocalRooms(roomsIds: Set<String>) {
-        viewModelScope.launch {
-            roomsIds.forEach {
-                session.roomService().deleteLocalRoom(it)
-            }
-        }
-    }
-
     // PRIVATE METHODS *****************************************************************************
 
     private fun handleSelectRoom(action: RoomListAction.SelectRoom) = withState {
@@ -271,7 +245,7 @@ class RoomListViewModel @AssistedInject constructor(
             viewModelScope.launch {
                 try {
                     room.roomPushRuleService().setRoomNotificationState(action.notificationState)
-                } catch (failure: Exception) {
+                } catch (failure: Throwable) {
                     _viewEvents.post(RoomListViewEvents.Failure(failure))
                 }
             }
@@ -346,4 +320,16 @@ class RoomListViewModel @AssistedInject constructor(
             _viewEvents.post(value)
         }
     }
+
+    private fun handleDeleteLocalRooms() {
+        val localRoomIds = session.roomService()
+                .getRoomSummaries(roomSummaryQueryParams { roomId = QueryStringValue.Contains(RoomLocalEcho.PREFIX) })
+                .map { it.roomId }
+
+        viewModelScope.launch {
+            localRoomIds.forEach {
+                session.roomService().deleteLocalRoom(it)
+            }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index 3f46293346..d897225fd6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -31,7 +31,6 @@ data class RoomListViewState(
         val asyncSuggestedRooms: Async<List<SpaceChildInfo>> = Uninitialized,
         val currentUserName: String? = null,
         val asyncSelectedSpace: Async<RoomSummary?> = Uninitialized,
-        val localRoomIds: Set<String> = emptySet()
 ) : MavericksState {
 
     constructor(args: RoomListParams) : this(displayMode = args.displayMode)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemCentered.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryCenteredItem.kt
similarity index 96%
rename from vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemCentered.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryCenteredItem.kt
index 440df0952c..764f50456c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemCentered.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryCenteredItem.kt
@@ -41,7 +41,7 @@ import org.matrix.android.sdk.api.session.presence.model.UserPresence
 import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass
-abstract class RoomSummaryItemCentered : VectorEpoxyModel<RoomSummaryItemCentered.Holder>(R.layout.item_room_centered) {
+abstract class RoomSummaryCenteredItem : VectorEpoxyModel<RoomSummaryCenteredItem.Holder>(R.layout.item_room_centered) {
 
     @EpoxyAttribute
     lateinit var avatarRenderer: AvatarRenderer
@@ -61,8 +61,8 @@ abstract class RoomSummaryItemCentered : VectorEpoxyModel<RoomSummaryItemCentere
     @EpoxyAttribute
     var showPresence: Boolean = false
 
-    @EpoxyAttribute @JvmField
-    var isPublic: Boolean = false
+    @EpoxyAttribute
+    var izPublic: Boolean = false
 
     @EpoxyAttribute
     var unreadNotificationCount: Int = 0
@@ -96,7 +96,7 @@ abstract class RoomSummaryItemCentered : VectorEpoxyModel<RoomSummaryItemCentere
         holder.titleView.text = matrixItem.getBestName()
         avatarRenderer.render(matrixItem, holder.avatarImageView)
         holder.roomAvatarDecorationImageView.render(encryptionTrustLevel)
-        holder.roomAvatarPublicDecorationImageView.isVisible = isPublic
+        holder.roomAvatarPublicDecorationImageView.isVisible = izPublic
         holder.roomAvatarFailSendingImageView.isVisible = hasFailedSending
         renderSelection(holder, showSelected)
         holder.roomAvatarPresenceImageView.render(showPresence, userPresence)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
index 8dc0ac0784..4eaf9ff0bf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
@@ -76,8 +76,8 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>(R.layo
     @EpoxyAttribute
     var showPresence: Boolean = false
 
-    @EpoxyAttribute @JvmField
-    var isPublic: Boolean = false
+    @EpoxyAttribute
+    var izPublic: Boolean = false
 
     @EpoxyAttribute
     var unreadNotificationCount: Int = 0
@@ -103,6 +103,9 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>(R.layo
     @EpoxyAttribute
     var showSelected: Boolean = false
 
+    @EpoxyAttribute
+    var useSingleLineForLastEvent: Boolean = false
+
     override fun bind(holder: Holder) {
         super.bind(holder)
 
@@ -113,15 +116,19 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>(R.layo
             itemLongClickListener?.onLongClick(it) ?: false
         }
         holder.titleView.text = matrixItem.getBestName()
-        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State(unreadNotificationCount, showHighlighted))
+        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State.Count(unreadNotificationCount, showHighlighted))
         holder.unreadIndentIndicator.isVisible = hasUnreadMessage
         holder.draftView.isVisible = hasDraft
         avatarRenderer.render(matrixItem, holder.avatarImageView)
         holder.roomAvatarDecorationImageView.render(encryptionTrustLevel)
-        holder.roomAvatarPublicDecorationImageView.isVisible = isPublic
+        holder.roomAvatarPublicDecorationImageView.isVisible = izPublic
         holder.roomAvatarFailSendingImageView.isVisible = hasFailedSending
         renderSelection(holder, showSelected)
         holder.roomAvatarPresenceImageView.render(showPresence, userPresence)
+
+        if (useSingleLineForLastEvent) {
+            holder.subtitleView.setLines(1)
+        }
     }
 
     private fun renderDisplayMode(holder: Holder) = when (displayMode) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 85879e6807..a55900a5c4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -22,6 +22,7 @@ import com.airbnb.mvrx.Loading
 import im.vector.app.R
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.resources.StringProvider
@@ -29,21 +30,33 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter
 import im.vector.app.features.home.room.typing.TypingHelper
+import im.vector.app.features.voicebroadcast.isLive
+import im.vector.app.features.voicebroadcast.isVoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.usecase.GetRoomLiveVoiceBroadcastsUseCase
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class RoomSummaryItemFactory @Inject constructor(
+        private val sessionHolder: ActiveSessionHolder,
         private val displayableEventFormatter: DisplayableEventFormatter,
         private val dateFormatter: VectorDateFormatter,
         private val stringProvider: StringProvider,
         private val typingHelper: TypingHelper,
         private val avatarRenderer: AvatarRenderer,
-        private val errorFormatter: ErrorFormatter
+        private val errorFormatter: ErrorFormatter,
+        private val getRoomLiveVoiceBroadcastsUseCase: GetRoomLiveVoiceBroadcastsUseCase,
 ) {
 
     fun create(
@@ -51,7 +64,8 @@ class RoomSummaryItemFactory @Inject constructor(
             roomChangeMembershipStates: Map<String, ChangeMembershipState>,
             selectedRoomIds: Set<String>,
             displayMode: RoomListDisplayMode,
-            listener: RoomListListener?
+            listener: RoomListListener?,
+            singleLineLastEvent: Boolean = false
     ): VectorEpoxyModel<*> {
         return when (roomSummary.membership) {
             Membership.INVITE -> {
@@ -59,7 +73,7 @@ class RoomSummaryItemFactory @Inject constructor(
                 createInvitationItem(roomSummary, changeMembershipState, listener)
             }
             else -> createRoomItem(
-                    roomSummary, selectedRoomIds, displayMode, listener?.let { it::onRoomClicked }, listener?.let { it::onRoomLongClicked }
+                    roomSummary, selectedRoomIds, displayMode, singleLineLastEvent, listener?.let { it::onRoomClicked }, listener?.let { it::onRoomLongClicked }
             )
         }
     }
@@ -118,8 +132,9 @@ class RoomSummaryItemFactory @Inject constructor(
             roomSummary: RoomSummary,
             selectedRoomIds: Set<String>,
             displayMode: RoomListDisplayMode,
+            singleLineLastEvent: Boolean,
             onClick: ((RoomSummary) -> Unit)?,
-            onLongClick: ((RoomSummary) -> Boolean)?
+            onLongClick: ((RoomSummary) -> Boolean)?,
     ): VectorEpoxyModel<*> {
         val subtitle = getSearchResultSubtitle(roomSummary)
         val unreadCount = roomSummary.notificationCount
@@ -127,20 +142,22 @@ class RoomSummaryItemFactory @Inject constructor(
         val showSelected = selectedRoomIds.contains(roomSummary.roomId)
         var latestFormattedEvent: CharSequence = ""
         var latestEventTime = ""
-        val latestEvent = roomSummary.latestPreviewableEvent
+        val latestEvent = roomSummary.getVectorLatestPreviewableEvent()
         if (latestEvent != null) {
             latestFormattedEvent = displayableEventFormatter.format(latestEvent, roomSummary.isDirect, roomSummary.isDirect.not())
             latestEventTime = dateFormatter.format(latestEvent.root.originServerTs, DateFormatKind.ROOM_LIST)
         }
 
         val typingMessage = typingHelper.getTypingMessage(roomSummary.typingUsers)
+                // Skip typing while there is a live voice broadcast
+                .takeUnless { latestEvent?.root?.asVoiceBroadcastEvent()?.isLive.orFalse() }.orEmpty()
 
         return if (subtitle.isBlank() && displayMode == RoomListDisplayMode.FILTERED) {
             createCenteredRoomSummaryItem(roomSummary, displayMode, showSelected, unreadCount, onClick, onLongClick)
         } else {
             createRoomSummaryItem(
                     roomSummary, displayMode, subtitle, latestEventTime, typingMessage,
-                    latestFormattedEvent, showHighlighted, showSelected, unreadCount, onClick, onLongClick
+                    latestFormattedEvent, showHighlighted, showSelected, unreadCount, singleLineLastEvent, onClick, onLongClick
             )
         }
     }
@@ -155,6 +172,7 @@ class RoomSummaryItemFactory @Inject constructor(
             showHighlighted: Boolean,
             showSelected: Boolean,
             unreadCount: Int,
+            singleLineLastEvent: Boolean,
             onClick: ((RoomSummary) -> Unit)?,
             onLongClick: ((RoomSummary) -> Boolean)?
     ) = RoomSummaryItem_()
@@ -164,7 +182,7 @@ class RoomSummaryItemFactory @Inject constructor(
             // .encryptionTrustLevel(roomSummary.roomEncryptionTrustLevel)
             .displayMode(displayMode)
             .subtitle(subtitle)
-            .isPublic(roomSummary.isPublic)
+            .izPublic(roomSummary.isPublic)
             .showPresence(roomSummary.isDirect)
             .userPresence(roomSummary.directUserPresence)
             .matrixItem(roomSummary.toMatrixItem())
@@ -177,6 +195,7 @@ class RoomSummaryItemFactory @Inject constructor(
             .unreadNotificationCount(unreadCount)
             .hasUnreadMessage(roomSummary.hasUnreadMessages)
             .hasDraft(roomSummary.userDrafts.isNotEmpty())
+            .useSingleLineForLastEvent(singleLineLastEvent)
             .itemLongClickListener { _ -> onLongClick?.invoke(roomSummary) ?: false }
             .itemClickListener { onClick?.invoke(roomSummary) }
 
@@ -187,13 +206,13 @@ class RoomSummaryItemFactory @Inject constructor(
             unreadCount: Int,
             onClick: ((RoomSummary) -> Unit)?,
             onLongClick: ((RoomSummary) -> Boolean)?
-    ) = RoomSummaryItemCentered_()
+    ) = RoomSummaryCenteredItem_()
             .id(roomSummary.roomId)
             .avatarRenderer(avatarRenderer)
             // We do not display shield in the room list anymore
             // .encryptionTrustLevel(roomSummary.roomEncryptionTrustLevel)
             .displayMode(displayMode)
-            .isPublic(roomSummary.isPublic)
+            .izPublic(roomSummary.isPublic)
             .showPresence(roomSummary.isDirect)
             .userPresence(roomSummary.directUserPresence)
             .matrixItem(roomSummary.toMatrixItem())
@@ -221,4 +240,14 @@ class RoomSummaryItemFactory @Inject constructor(
             else -> stringProvider.getQuantityString(R.plurals.search_space_multiple_parents, size - 1, directParentNames[0], size - 1)
         }
     }
+
+    private fun RoomSummary.getVectorLatestPreviewableEvent(): TimelineEvent? {
+        val room = sessionHolder.getSafeActiveSession()?.getRoom(roomId) ?: return latestPreviewableEvent
+        val liveVoiceBroadcastTimelineEvent = getRoomLiveVoiceBroadcastsUseCase.execute(roomId).lastOrNull()
+                ?.root?.eventId?.let { room.getTimelineEvent(it) }
+        return latestPreviewableEvent?.takeIf { it.root.getClearType() == EventType.CALL_INVITE }
+                ?: liveVoiceBroadcastTimelineEvent
+                ?: latestPreviewableEvent
+                        ?.takeUnless { it.root.asMessageAudioEvent()?.isVoiceBroadcast().orFalse() } // Skip voice messages related to voice broadcast
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
index 2eb8921fd5..a2b6ed51d9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
@@ -17,18 +17,26 @@
 package im.vector.app.features.home.room.list
 
 import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.settings.FontScalePreferences
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 class RoomSummaryListController(
         private val roomSummaryItemFactory: RoomSummaryItemFactory,
-        private val displayMode: RoomListDisplayMode
+        private val displayMode: RoomListDisplayMode,
+        fontScalePreferences: FontScalePreferences
 ) : CollapsableTypedEpoxyController<List<RoomSummary>>() {
 
     var listener: RoomListListener? = null
+    private val shouldUseSingleLine: Boolean
+
+    init {
+        val fontScale = fontScalePreferences.getResolvedFontScaleValue()
+        shouldUseSingleLine = fontScale.scale > FontScalePreferences.SCALE_LARGE
+    }
 
     override fun buildModels(data: List<RoomSummary>?) {
         data?.forEach {
-            add(roomSummaryItemFactory.create(it, emptyMap(), emptySet(), displayMode, listener))
+            add(roomSummaryItemFactory.create(it, emptyMap(), emptySet(), displayMode, listener, shouldUseSingleLine))
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
index 445438eec9..43b20296af 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
@@ -20,18 +20,26 @@ import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.paging.PagedListEpoxyController
 import im.vector.app.core.utils.createUIHandler
 import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.settings.FontScalePreferences
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 class RoomSummaryPagedController(
         private val roomSummaryItemFactory: RoomSummaryItemFactory,
-        private val displayMode: RoomListDisplayMode
+        private val displayMode: RoomListDisplayMode,
+        fontScalePreferences: FontScalePreferences
 ) : PagedListEpoxyController<RoomSummary>(
         // Important it must match the PageList builder notify Looper
         modelBuildingHandler = createUIHandler()
 ), CollapsableControllerExtension {
 
     var listener: RoomListListener? = null
+    private val shouldUseSingleLine: Boolean
+
+    init {
+        val fontScale = fontScalePreferences.getResolvedFontScaleValue()
+        shouldUseSingleLine = fontScale.scale > FontScalePreferences.SCALE_LARGE
+    }
 
     var roomChangeMembershipStates: Map<String, ChangeMembershipState>? = null
         set(value) {
@@ -57,8 +65,14 @@ class RoomSummaryPagedController(
     }
 
     override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
-        // for place holder if enabled
-        item ?: return RoomSummaryItemPlaceHolder_().apply { id(currentPosition) }
-        return roomSummaryItemFactory.create(item, roomChangeMembershipStates.orEmpty(), emptySet(), displayMode, listener)
+        return if (item == null) {
+            val host = this
+            RoomSummaryPlaceHolderItem_().apply {
+                id(currentPosition)
+                useSingleLineForLastEvent(host.shouldUseSingleLine)
+            }
+        } else {
+            roomSummaryItemFactory.create(item, roomChangeMembershipStates.orEmpty(), emptySet(), displayMode, listener, shouldUseSingleLine)
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt
index f72698048d..c5edd9c063 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt
@@ -17,18 +17,20 @@
 package im.vector.app.features.home.room.list
 
 import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.settings.FontScalePreferences
 import javax.inject.Inject
 
 class RoomSummaryPagedControllerFactory @Inject constructor(
-        private val roomSummaryItemFactory: RoomSummaryItemFactory
+        private val roomSummaryItemFactory: RoomSummaryItemFactory,
+        private val fontScalePreferences: FontScalePreferences
 ) {
 
     fun createRoomSummaryPagedController(displayMode: RoomListDisplayMode): RoomSummaryPagedController {
-        return RoomSummaryPagedController(roomSummaryItemFactory, displayMode)
+        return RoomSummaryPagedController(roomSummaryItemFactory, displayMode, fontScalePreferences)
     }
 
     fun createRoomSummaryListController(displayMode: RoomListDisplayMode): RoomSummaryListController {
-        return RoomSummaryListController(roomSummaryItemFactory, displayMode)
+        return RoomSummaryListController(roomSummaryItemFactory, displayMode, fontScalePreferences)
     }
 
     fun createSuggestedRoomListController(): SuggestedRoomListController {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPlaceHolderItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPlaceHolderItem.kt
new file mode 100644
index 0000000000..75156ad5d9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPlaceHolderItem.kt
@@ -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.
+ */
+
+package im.vector.app.features.home.room.list
+
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+
+@EpoxyModelClass
+abstract class RoomSummaryPlaceHolderItem : VectorEpoxyModel<RoomSummaryPlaceHolderItem.Holder>(R.layout.item_room_placeholder) {
+
+    @EpoxyAttribute
+    var useSingleLineForLastEvent: Boolean = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        if (useSingleLineForLastEvent) {
+            holder.subtitleView.setLines(1)
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val subtitleView by bind<TextView>(R.id.subtitleView)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
index 3f1dfebf7b..6cbc467628 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
@@ -97,7 +97,9 @@ class SectionHeaderAdapter constructor(
             binding.root.isClickable = roomsSectionData.isCollapsable
             binding.roomCategoryCounterView.setCompoundDrawablesWithIntrinsicBounds(null, null, collapsableArrowDrawable, null)
             binding.roomCategoryCounterView.text = roomsSectionData.itemCount.takeIf { it > 0 }?.toString().orEmpty()
-            binding.roomCategoryUnreadCounterBadgeView.render(UnreadCounterBadgeView.State(roomsSectionData.notificationCount, roomsSectionData.isHighlighted))
+            binding.roomCategoryUnreadCounterBadgeView.render(
+                    UnreadCounterBadgeView.State.Count(roomsSectionData.notificationCount, roomsSectionData.isHighlighted)
+            )
         }
 
         companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceDirectoryFilterNoResults.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceDirectoryFilterNoResultsItem.kt
similarity index 84%
rename from vector/src/main/java/im/vector/app/features/home/room/list/SpaceDirectoryFilterNoResults.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/SpaceDirectoryFilterNoResultsItem.kt
index 6899b59f38..1efbf53214 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceDirectoryFilterNoResults.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceDirectoryFilterNoResultsItem.kt
@@ -22,6 +22,6 @@ import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass
-abstract class SpaceDirectoryFilterNoResults : VectorEpoxyModel<SpaceDirectoryFilterNoResults.Holder>(R.layout.item_space_directory_filter_no_results) {
+abstract class SpaceDirectoryFilterNoResultsItem : VectorEpoxyModel<SpaceDirectoryFilterNoResultsItem.Holder>(R.layout.item_space_directory_filter_no_results) {
     class Holder : VectorEpoxyHolder()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt b/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
index 9887e06654..0cc843ea55 100755
--- a/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
@@ -30,22 +30,44 @@ class UnreadCounterBadgeView : MaterialTextView {
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
 
     fun render(state: State) {
-        if (state.count == 0) {
-            visibility = View.INVISIBLE
-        } else {
-            visibility = View.VISIBLE
-            val bgRes = if (state.highlighted) {
-                R.drawable.bg_unread_highlight
-            } else {
-                R.drawable.bg_unread_notification
-            }
-            setBackgroundResource(bgRes)
-            text = RoomSummaryFormatter.formatUnreadMessagesCounter(state.count)
+        when (state) {
+            is State.Count -> renderAsCount(state)
+            is State.Text -> renderAsText(state)
         }
     }
 
-    data class State(
-            val count: Int,
-            val highlighted: Boolean
-    )
+    private fun renderAsCount(state: State.Count) {
+        val view = this
+
+        with(state) {
+            if (count == 0) {
+                visibility = View.INVISIBLE
+            } else {
+                visibility = View.VISIBLE
+                val bgRes = if (highlighted) {
+                    R.drawable.bg_unread_highlight
+                } else {
+                    R.drawable.bg_unread_notification
+                }
+                setBackgroundResource(bgRes)
+                view.text = RoomSummaryFormatter.formatUnreadMessagesCounter(count)
+            }
+        }
+    }
+
+    private fun renderAsText(state: State.Text) {
+        val view = this
+
+        with(state) {
+            visibility = View.VISIBLE
+            val bgRes = if (highlighted) R.drawable.bg_unread_highlight else R.drawable.bg_unread_notification
+            setBackgroundResource(bgRes)
+            view.text = text
+        }
+    }
+
+    sealed class State {
+        data class Count(val count: Int, val highlighted: Boolean) : State()
+        data class Text(val text: String, val highlighted: Boolean) : State()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
index 0423a8fffc..8c84aa55e1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
@@ -25,8 +25,7 @@ sealed class RoomListQuickActionsSharedAction(
         @StringRes val titleRes: Int,
         @DrawableRes val iconResId: Int?,
         val destructive: Boolean = false
-) :
-        VectorSharedAction {
+) : VectorSharedAction {
 
     data class NotificationsAllNoisy(val roomId: String) : RoomListQuickActionsSharedAction(
             R.string.room_list_quick_actions_notifications_all_noisy,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListSharedAction.kt
new file mode 100644
index 0000000000..766bc6eea1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListSharedAction.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.actions
+
+import im.vector.app.core.platform.VectorSharedAction
+
+sealed class RoomListSharedAction : VectorSharedAction {
+
+    object CloseBottomSheet : RoomListSharedAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListSharedActionViewModel.kt
new file mode 100644
index 0000000000..e2545accc8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListSharedActionViewModel.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.actions
+
+import im.vector.app.core.platform.VectorSharedActionViewModel
+import javax.inject.Inject
+
+class RoomListSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<RoomListSharedAction>()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeFilteredRoomsController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeFilteredRoomsController.kt
new file mode 100644
index 0000000000..500039e3eb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeFilteredRoomsController.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home
+
+import androidx.paging.PagedList
+import com.airbnb.epoxy.EpoxyModel
+import com.airbnb.epoxy.paging.PagedListEpoxyController
+import im.vector.app.core.platform.StateView
+import im.vector.app.core.utils.createUIHandler
+import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.home.room.list.RoomListListener
+import im.vector.app.features.home.room.list.RoomSummaryItemFactory
+import im.vector.app.features.home.room.list.RoomSummaryPlaceHolderItem_
+import im.vector.app.features.settings.FontScalePreferences
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import javax.inject.Inject
+
+class HomeFilteredRoomsController @Inject constructor(
+        private val roomSummaryItemFactory: RoomSummaryItemFactory,
+        fontScalePreferences: FontScalePreferences
+) : PagedListEpoxyController<RoomSummary>(
+        // Important it must match the PageList builder notify Looper
+        modelBuildingHandler = createUIHandler()
+) {
+
+    private var roomChangeMembershipStates: Map<String, ChangeMembershipState>? = null
+        set(value) {
+            field = value
+            // ideally we could search for visible models and update only those
+            requestForcedModelBuild()
+        }
+
+    var listener: RoomListListener? = null
+
+    private var emptyStateData: StateView.State.Empty? = null
+
+    private val shouldUseSingleLine: Boolean
+
+    init {
+        val fontScale = fontScalePreferences.getResolvedFontScaleValue()
+        shouldUseSingleLine = fontScale.scale > FontScalePreferences.SCALE_LARGE
+    }
+
+    fun submitRoomsList(roomsList: PagedList<RoomSummary>) {
+        submitList(roomsList)
+        // If room is empty we may have a new EmptyState to display
+        if (roomsList.isEmpty()) {
+            requestForcedModelBuild()
+        }
+    }
+
+    override fun addModels(models: List<EpoxyModel<*>>) {
+        val emptyStateData = this.emptyStateData
+        if (models.isEmpty() && emptyStateData != null) {
+            roomListEmptyItem {
+                id("state_item")
+                emptyData(emptyStateData)
+            }
+        } else {
+            super.addModels(models)
+        }
+    }
+
+    fun submitEmptyStateData(state: StateView.State.Empty?) {
+        this.emptyStateData = state
+    }
+
+    override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
+        return if (item == null) {
+            val host = this
+            RoomSummaryPlaceHolderItem_().apply {
+                id(currentPosition)
+                useSingleLineForLastEvent(host.shouldUseSingleLine)
+            }
+        } else {
+            roomSummaryItemFactory.create(
+                    roomSummary = item,
+                    roomChangeMembershipStates = roomChangeMembershipStates.orEmpty(),
+                    selectedRoomIds = emptySet(),
+                    displayMode = RoomListDisplayMode.ROOMS,
+                    listener = listener,
+                    singleLineLastEvent = shouldUseSingleLine
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeLayoutPreferencesStore.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeLayoutPreferencesStore.kt
new file mode 100644
index 0000000000..11cd892406
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeLayoutPreferencesStore.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.preferencesDataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import org.matrix.android.sdk.api.extensions.orFalse
+import javax.inject.Inject
+
+private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "layout_preferences")
+
+class HomeLayoutPreferencesStore @Inject constructor(
+        private val context: Context
+) {
+
+    private val areRecentsEnbabled = booleanPreferencesKey("SETTINGS_PREFERENCES_HOME_RECENTS")
+    private val areFiltersEnabled = booleanPreferencesKey("SETTINGS_PREFERENCES_HOME_FILTERS")
+    private val isAZOrderingEnabled = booleanPreferencesKey("SETTINGS_PREFERENCES_USE_AZ_ORDER")
+
+    val areRecentsEnabledFlow: Flow<Boolean> = context.dataStore.data
+            .map { preferences -> preferences[areRecentsEnbabled].orFalse() }
+            .distinctUntilChanged()
+
+    val areFiltersEnabledFlow: Flow<Boolean> = context.dataStore.data
+            .map { preferences -> preferences[areFiltersEnabled].orFalse() }
+            .distinctUntilChanged()
+
+    val isAZOrderingEnabledFlow: Flow<Boolean> = context.dataStore.data
+            .map { preferences -> preferences[isAZOrderingEnabled].orFalse() }
+            .distinctUntilChanged()
+
+    suspend fun setRecentsEnabled(isEnabled: Boolean) {
+        context.dataStore.edit { settings ->
+            settings[areRecentsEnbabled] = isEnabled
+        }
+    }
+
+    suspend fun setFiltersEnabled(isEnabled: Boolean) {
+        context.dataStore.edit { settings ->
+            settings[areFiltersEnabled] = isEnabled
+        }
+    }
+
+    suspend fun setAZOrderingEnabled(isEnabled: Boolean) {
+        context.dataStore.edit { settings ->
+            settings[isAZOrderingEnabled] = isEnabled
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
index 6d17792969..5760874812 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
@@ -17,7 +17,7 @@
 package im.vector.app.features.home.room.list.home
 
 import im.vector.app.core.platform.VectorViewModelAction
-import im.vector.app.features.home.room.list.home.filter.HomeRoomFilter
+import im.vector.app.features.home.room.list.home.header.HomeRoomFilter
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 
@@ -27,4 +27,5 @@ sealed class HomeRoomListAction : VectorViewModelAction {
     data class ToggleTag(val roomId: String, val tag: String) : HomeRoomListAction()
     data class LeaveRoom(val roomId: String) : HomeRoomListAction()
     data class ChangeRoomFilter(val filter: HomeRoomFilter) : HomeRoomListAction()
+    object DeleteAllLocalRoom : HomeRoomListAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
index c98d22a34f..d8c71e3e17 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home.room.list.home
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -23,29 +24,27 @@ import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.airbnb.epoxy.EpoxyControllerAdapter
 import com.airbnb.epoxy.OnModelBuildFinishedListener
 import com.airbnb.mvrx.fragmentViewModel
-import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.epoxy.LayoutManagerStateRestorer
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.core.utils.FirstItemUpdatedObserver
 import im.vector.app.databinding.FragmentRoomListBinding
 import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.home.room.list.RoomListAnimator
 import im.vector.app.features.home.room.list.RoomListListener
-import im.vector.app.features.home.room.list.RoomSummaryItemFactory
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
-import im.vector.app.features.home.room.list.home.filter.HomeFilteredRoomsController
-import im.vector.app.features.home.room.list.home.filter.HomeRoomFilter
-import im.vector.app.features.home.room.list.home.recent.RecentRoomCarouselController
+import im.vector.app.features.home.room.list.home.header.HomeRoomFilter
+import im.vector.app.features.home.room.list.home.header.HomeRoomsHeadersController
+import im.vector.app.features.home.room.list.home.invites.InvitesActivity
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -54,16 +53,19 @@ import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import javax.inject.Inject
 
-class HomeRoomListFragment @Inject constructor(
-        private val roomSummaryItemFactory: RoomSummaryItemFactory,
-        private val userPreferencesProvider: UserPreferencesProvider,
-        private val recentRoomCarouselController: RecentRoomCarouselController
-) : VectorBaseFragment<FragmentRoomListBinding>(),
+@AndroidEntryPoint
+class HomeRoomListFragment :
+        VectorBaseFragment<FragmentRoomListBinding>(),
         RoomListListener {
 
+    @Inject lateinit var userPreferencesProvider: UserPreferencesProvider
+    @Inject lateinit var headersController: HomeRoomsHeadersController
+    @Inject lateinit var roomsController: HomeFilteredRoomsController
+
     private val roomListViewModel: HomeRoomListViewModel by fragmentViewModel()
-    private lateinit var sharedActionViewModel: RoomListQuickActionsSharedActionViewModel
+    private lateinit var sharedQuickActionsViewModel: RoomListQuickActionsSharedActionViewModel
     private var concatAdapter = ConcatAdapter()
+    private lateinit var firstItemObserver: FirstItemUpdatedObserver
     private var modelBuildListener: OnModelBuildFinishedListener? = null
 
     private lateinit var stateRestorer: LayoutManagerStateRestorer
@@ -74,15 +76,25 @@ class HomeRoomListFragment @Inject constructor(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        sharedActionViewModel = activityViewModelProvider[RoomListQuickActionsSharedActionViewModel::class.java]
-        sharedActionViewModel
-                .stream()
-                .onEach { handleQuickActions(it) }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-
         views.stateView.contentView = views.roomListView
         views.stateView.state = StateView.State.Loading
+        setupObservers()
+        setupRecyclerView()
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        // Local rooms should not exist anymore when the room list is shown
+        roomListViewModel.handle(HomeRoomListAction.DeleteAllLocalRoom)
+    }
+
+    private fun setupObservers() {
+        sharedQuickActionsViewModel = activityViewModelProvider[RoomListQuickActionsSharedActionViewModel::class.java]
+        sharedQuickActionsViewModel
+                .stream()
+                .onEach(::handleQuickActions)
+                .launchIn(viewLifecycleOwner.lifecycleScope)
 
         roomListViewModel.observeViewEvents {
             when (it) {
@@ -92,70 +104,6 @@ class HomeRoomListFragment @Inject constructor(
                 is HomeRoomListViewEvents.Done -> Unit
             }
         }
-
-        setupRecyclerView()
-        setupFabs()
-    }
-
-    private fun setupRecyclerView() {
-        val layoutManager = LinearLayoutManager(context)
-        stateRestorer = LayoutManagerStateRestorer(layoutManager).register()
-        views.roomListView.layoutManager = layoutManager
-        views.roomListView.itemAnimator = RoomListAnimator()
-        layoutManager.recycleChildrenOnDetach = true
-
-        modelBuildListener = OnModelBuildFinishedListener { it.dispatchTo(stateRestorer) }
-
-        roomListViewModel.sections.onEach { sections ->
-            setUpAdapters(sections)
-        }.launchIn(lifecycleScope)
-
-        views.roomListView.adapter = concatAdapter
-    }
-
-    private fun setupFabs() {
-        showFABs()
-
-        views.newLayoutCreateChatButton.setOnClickListener {
-            // Click action for create chat modal goes here (Issue #6717)
-        }
-
-        views.newLayoutOpenSpacesButton.setOnClickListener {
-            // Click action for open spaces modal goes here (Issue #6499)
-        }
-
-        // Hide FABs when list is scrolling
-        views.roomListView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                views.createChatFabMenu.handler.removeCallbacksAndMessages(null)
-
-                when (newState) {
-                    RecyclerView.SCROLL_STATE_IDLE -> views.createChatFabMenu.postDelayed(::showFABs, 250)
-                    RecyclerView.SCROLL_STATE_DRAGGING,
-                    RecyclerView.SCROLL_STATE_SETTLING -> hideFABs()
-                }
-            }
-        })
-    }
-
-    private fun showFABs() {
-        views.newLayoutCreateChatButton.show()
-        views.newLayoutOpenSpacesButton.show()
-    }
-
-    private fun hideFABs() {
-        views.newLayoutCreateChatButton.hide()
-        views.newLayoutOpenSpacesButton.hide()
-    }
-
-    override fun invalidate() = withState(roomListViewModel) { state ->
-        views.stateView.state = state.state
-    }
-
-    private fun setUpAdapters(sections: Set<HomeRoomSection>) {
-        sections.forEach {
-            concatAdapter.addAdapter(getAdapterForData(it))
-        }
     }
 
     private fun handleQuickActions(quickAction: RoomListQuickActionsSharedAction) {
@@ -182,12 +130,59 @@ class HomeRoomListFragment @Inject constructor(
                 roomListViewModel.handle(HomeRoomListAction.ToggleTag(quickAction.roomId, RoomTag.ROOM_TAG_LOW_PRIORITY))
             }
             is RoomListQuickActionsSharedAction.Leave -> {
-                roomListViewModel.handle(HomeRoomListAction.LeaveRoom(quickAction.roomId))
                 promptLeaveRoom(quickAction.roomId)
             }
         }
     }
 
+    private fun setupRecyclerView() {
+        views.stateView.state = StateView.State.Content
+        val layoutManager = LinearLayoutManager(requireContext())
+        firstItemObserver = FirstItemUpdatedObserver(layoutManager) {
+            layoutManager.scrollToPosition(0)
+        }
+        stateRestorer = LayoutManagerStateRestorer(layoutManager).register()
+        views.roomListView.layoutManager = layoutManager
+        views.roomListView.itemAnimator = RoomListAnimator()
+        layoutManager.recycleChildrenOnDetach = true
+
+        modelBuildListener = OnModelBuildFinishedListener { it.dispatchTo(stateRestorer) }
+
+        roomListViewModel.onEach(HomeRoomListViewState::headersData) {
+            headersController.submitData(it)
+        }
+        roomListViewModel.roomsLivePagedList.observe(viewLifecycleOwner) { roomsList ->
+            roomsController.submitRoomsList(roomsList)
+        }
+        roomListViewModel.onEach(HomeRoomListViewState::emptyState) { emptyState ->
+            roomsController.submitEmptyStateData(emptyState)
+        }
+
+        setUpAdapters()
+
+        views.roomListView.adapter = concatAdapter
+
+        concatAdapter.registerAdapterDataObserver(firstItemObserver)
+    }
+
+    override fun invalidate() = Unit
+
+    private fun setUpAdapters() {
+        val headersAdapter = headersController.also { controller ->
+            controller.invitesClickListener = ::onInvitesCounterClicked
+            controller.onFilterChangedListener = ::onRoomFilterChanged
+            controller.recentsRoomListener = this
+        }.adapter
+
+        val roomsAdapter = roomsController
+                .also { controller ->
+                    controller.listener = this
+                }.adapter
+
+        concatAdapter.addAdapter(headersAdapter)
+        concatAdapter.addAdapter(roomsAdapter)
+    }
+
     private fun promptLeaveRoom(roomId: String) {
         val isPublicRoom = roomListViewModel.isPublicRoom(roomId)
         val message = buildString {
@@ -207,30 +202,8 @@ class HomeRoomListFragment @Inject constructor(
                 .show()
     }
 
-    private fun getAdapterForData(section: HomeRoomSection): EpoxyControllerAdapter {
-        return when (section) {
-            is HomeRoomSection.RoomSummaryData -> {
-                HomeFilteredRoomsController(
-                        roomSummaryItemFactory,
-                        showFilters = section.showFilters,
-                ).also { controller ->
-                    controller.listener = this
-                    controller.onFilterChanged = ::onRoomFilterChanged
-                    section.filtersData.onEach {
-                        controller.submitFiltersData(it)
-                    }.launchIn(lifecycleScope)
-                    section.list.observe(viewLifecycleOwner) { list ->
-                        controller.submitList(list)
-                    }
-                }.adapter
-            }
-            is HomeRoomSection.RecentRoomsData -> recentRoomCarouselController.also { controller ->
-                controller.listener = this
-                section.list.observe(viewLifecycleOwner) { list ->
-                    controller.submitList(list)
-                }
-            }.adapter
-        }
+    private fun onInvitesCounterClicked() {
+        startActivity(Intent(activity, InvitesActivity::class.java))
     }
 
     private fun onRoomFilterChanged(filter: HomeRoomFilter) {
@@ -248,7 +221,15 @@ class HomeRoomListFragment @Inject constructor(
 
     override fun onDestroyView() {
         views.roomListView.cleanup()
-        recentRoomCarouselController.listener = null
+
+        headersController.recentsRoomListener = null
+        headersController.invitesClickListener = null
+        headersController.onFilterChangedListener = null
+
+        roomsController.listener = null
+
+        concatAdapter.unregisterAdapterDataObserver(firstItemObserver)
+
         super.onDestroyView()
     }
 
@@ -266,21 +247,13 @@ class HomeRoomListFragment @Inject constructor(
         return true
     }
 
-    override fun onRejectRoomInvitation(room: RoomSummary) {
-        TODO("Not yet implemented")
-    }
+    override fun onRejectRoomInvitation(room: RoomSummary) = Unit
 
-    override fun onAcceptRoomInvitation(room: RoomSummary) {
-        TODO("Not yet implemented")
-    }
+    override fun onAcceptRoomInvitation(room: RoomSummary) = Unit
 
-    override fun onJoinSuggestedRoom(room: SpaceChildInfo) {
-        TODO("Not yet implemented")
-    }
+    override fun onJoinSuggestedRoom(room: SpaceChildInfo) = Unit
 
-    override fun onSuggestedRoomClicked(room: SpaceChildInfo) {
-        TODO("Not yet implemented")
-    }
+    override fun onSuggestedRoomClicked(room: SpaceChildInfo) = Unit
 
     // endregion
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
index 1fed9eba86..f358601399 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
@@ -16,24 +16,33 @@
 
 package im.vector.app.features.home.room.list.home
 
+import android.widget.ImageView
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import androidx.paging.PagedList
-import arrow.core.toOption
 import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.R
 import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.home.room.list.home.filter.HomeRoomFilter
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.extensions.toTrackingValue
+import im.vector.app.features.analytics.plan.UserProperties
+import im.vector.app.features.displayname.getBestName
+import im.vector.app.features.home.room.list.home.header.HomeRoomFilter
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -46,19 +55,29 @@ import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.query.toActiveSpaceOrNoFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.state.isPublic
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.api.util.toOption
 import org.matrix.android.sdk.flow.flow
 
 class HomeRoomListViewModel @AssistedInject constructor(
         @Assisted initialState: HomeRoomListViewState,
         private val session: Session,
         private val spaceStateHandler: SpaceStateHandler,
+        private val preferencesStore: HomeLayoutPreferencesStore,
+        private val stringProvider: StringProvider,
+        private val drawableProvider: DrawableProvider,
+        private val analyticsTracker: AnalyticsTracker,
 ) : VectorViewModel<HomeRoomListViewState, HomeRoomListAction, HomeRoomListViewEvents>(initialState) {
 
     @AssistedFactory
@@ -72,61 +91,26 @@ class HomeRoomListViewModel @AssistedInject constructor(
             .setPageSize(10)
             .setInitialLoadSizeHint(20)
             .setEnablePlaceholders(true)
-            .setPrefetchDistance(10)
             .build()
 
-    private val _sections = MutableSharedFlow<Set<HomeRoomSection>>(replay = 1)
-    val sections = _sections.asSharedFlow()
+    private val _roomsLivePagedList = MutableLiveData<PagedList<RoomSummary>>()
+    val roomsLivePagedList: LiveData<PagedList<RoomSummary>> = _roomsLivePagedList
+
+    private val internalPagedListObserver = Observer<PagedList<RoomSummary>> {
+        _roomsLivePagedList.postValue(it)
+    }
 
     private var filteredPagedRoomSummariesLive: UpdatableLivePageResult? = null
 
     init {
-        configureSections()
+        observeOrderPreferences()
+        observeInvites()
+        observeRecents()
+        observeFilterTabs()
+        observeSpaceChanges()
     }
 
-    private fun configureSections() {
-        val newSections = mutableSetOf<HomeRoomSection>()
-
-        newSections.add(getRecentRoomsSection())
-        newSections.add(getFilteredRoomsSection())
-
-        viewModelScope.launch {
-            _sections.emit(newSections)
-        }
-
-        setState {
-            copy(state = StateView.State.Content)
-        }
-    }
-
-    private fun getRecentRoomsSection(): HomeRoomSection {
-        val liveList = session.roomService()
-                .getBreadcrumbsLive(roomSummaryQueryParams {
-                    displayName = QueryStringValue.NoCondition
-                    memberships = listOf(Membership.JOIN)
-                })
-
-        return HomeRoomSection.RecentRoomsData(
-                list = liveList
-        )
-    }
-
-    private fun getFilteredRoomsSection(): HomeRoomSection.RoomSummaryData {
-        val builder = RoomSummaryQueryParams.Builder().also {
-            it.memberships = listOf(Membership.JOIN)
-        }
-
-        val params = getFilteredQueryParams(HomeRoomFilter.ALL, builder.build())
-        val sortOrder = RoomSortOrder.ACTIVITY // #6506
-
-        val liveResults = session.roomService().getFilteredPagedRoomSummariesLive(
-                params,
-                pagedListConfig,
-                sortOrder
-        ).also {
-            this.filteredPagedRoomSummariesLive = it
-        }
-
+    private fun observeSpaceChanges() {
         spaceStateHandler.getSelectedSpaceFlow()
                 .distinctUntilChanged()
                 .onStart {
@@ -134,43 +118,109 @@ class HomeRoomListViewModel @AssistedInject constructor(
                 }
                 .onEach { selectedSpaceOption ->
                     val selectedSpace = selectedSpaceOption.orNull()
-                    liveResults.queryParams = liveResults.queryParams.copy(
-                            spaceFilter =  selectedSpace?.roomId.toActiveSpaceOrNoFilter()
-                    )
-                }.launchIn(viewModelScope)
-
-        return HomeRoomSection.RoomSummaryData(
-                list = liveResults.livePagedList,
-                showFilters = true, // #6506
-                filtersData = getFiltersDataFlow()
-        )
+                    updateEmptyState()
+                    filteredPagedRoomSummariesLive?.let { liveResults ->
+                        liveResults.queryParams = liveResults.queryParams.copy(
+                                spaceFilter = selectedSpace?.roomId.toActiveSpaceOrNoFilter()
+                        )
+                    }
+                }
+                .launchIn(viewModelScope)
     }
 
-    private fun getFiltersDataFlow(): SharedFlow<List<HomeRoomFilter>> {
-        val flow = MutableSharedFlow<List<HomeRoomFilter>>(replay = 1)
-
-        val favouritesFlow = session.flow()
+    private fun observeInvites() {
+        session.flow()
                 .liveRoomSummaries(
-                        RoomSummaryQueryParams.Builder().also { builder ->
-                            builder.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
-                        }.build()
-                )
-                .map { it.isNotEmpty() }
-                .distinctUntilChanged()
+                        roomSummaryQueryParams {
+                            memberships = listOf(Membership.INVITE)
+                        },
+                        RoomSortOrder.ACTIVITY
+                ).onEach { list ->
+                    setState { copy(headersData = headersData.copy(invitesCount = list.size)) }
+                }.launchIn(viewModelScope)
+    }
 
-        val dmsFLow = session.flow()
-                .liveRoomSummaries(
-                        RoomSummaryQueryParams.Builder().also { builder ->
-                            builder.memberships = listOf(Membership.JOIN)
-                            builder.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                        }.build()
-                )
-                .map { it.isNotEmpty() }
+    private fun observeRecents() {
+        preferencesStore.areRecentsEnabledFlow
                 .distinctUntilChanged()
+                .flatMapLatest { areEnabled ->
+                    if (areEnabled) {
+                        session.flow()
+                                .liveBreadcrumbs(roomSummaryQueryParams {
+                                    memberships = listOf(Membership.JOIN)
+                                })
+                                .map { Optional.from(it) }
+                    } else {
+                        flowOf(Optional.empty())
+                    }.onEach { listOptional ->
+                        setState { copy(headersData = headersData.copy(recents = listOptional.getOrNull())) }
+                    }
+                }.launchIn(viewModelScope)
+    }
 
-        favouritesFlow.combine(dmsFLow) { hasFavourite, hasDm ->
+    private fun observeFilterTabs() {
+        preferencesStore.areFiltersEnabledFlow
+                .distinctUntilChanged()
+                .flatMapLatest { areEnabled ->
+                    getFilterTabsFlow(areEnabled)
+                }.onEach { filtersOptional ->
+                    val filters = filtersOptional.getOrNull()
+                    if (!isCurrentFilterStillValid(filters)) {
+                        changeRoomFilter(HomeRoomFilter.ALL)
+                    }
+                    setState {
+                        copy(
+                                headersData = headersData.copy(
+                                        filtersList = filters,
+                                )
+                        )
+                    }
+                }.launchIn(viewModelScope)
+    }
+
+    private suspend fun isCurrentFilterStillValid(filtersList: List<HomeRoomFilter>?): Boolean {
+        if (filtersList.isNullOrEmpty()) return false
+        val currentFilter = awaitState().headersData.currentFilter
+        return filtersList.contains(currentFilter)
+    }
+
+    private fun getFilterTabsFlow(isEnabled: Boolean): Flow<Optional<MutableList<HomeRoomFilter>>> {
+        if (!isEnabled) return flowOf(Optional.empty())
+        val spaceFLow = spaceStateHandler.getSelectedSpaceFlow()
+                .distinctUntilChanged()
+                .onStart {
+                    emit(spaceStateHandler.getCurrentSpace().toOption())
+                }
+        val favouritesFlow =
+                spaceFLow.flatMapLatest { selectedSpace ->
+                    session.flow()
+                            .liveRoomSummaries(
+                                    RoomSummaryQueryParams.Builder().also { builder ->
+                                        builder.spaceFilter = selectedSpace.orNull()?.roomId.toActiveSpaceOrNoFilter()
+                                        builder.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
+                                    }.build()
+                            )
+                }
+                        .map { it.isNotEmpty() }
+                        .distinctUntilChanged()
+
+        val dmsFLow =
+                spaceFLow.flatMapLatest { selectedSpace ->
+                    session.flow()
+                            .liveRoomSummaries(
+                                    RoomSummaryQueryParams.Builder().also { builder ->
+                                        builder.spaceFilter = selectedSpace.orNull()?.roomId.toActiveSpaceOrNoFilter()
+                                        builder.memberships = listOf(Membership.JOIN)
+                                        builder.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                                    }.build()
+                            )
+                }
+                        .map { it.isNotEmpty() }
+                        .distinctUntilChanged()
+
+        return combine(favouritesFlow, dmsFLow) { hasFavourite, hasDm ->
             hasFavourite to hasDm
-        }.onEach { (hasFavourite, hasDm) ->
+        }.map { (hasFavourite, hasDm) ->
             val filtersData = mutableListOf(
                     HomeRoomFilter.ALL,
                     HomeRoomFilter.UNREADS
@@ -185,11 +235,44 @@ class HomeRoomListViewModel @AssistedInject constructor(
                         HomeRoomFilter.PEOPlE
                 )
             }
+            Optional.from(filtersData)
+        }
+    }
 
-            flow.emit(filtersData)
-        }.launchIn(viewModelScope)
+    private fun observeRooms(currentFilter: HomeRoomFilter, isAZOrdering: Boolean) {
+        filteredPagedRoomSummariesLive?.livePagedList?.removeObserver(internalPagedListObserver)
+        val builder = RoomSummaryQueryParams.Builder().also {
+            it.memberships = listOf(Membership.JOIN)
+            it.spaceFilter = spaceStateHandler.getCurrentSpace()?.roomId.toActiveSpaceOrNoFilter()
+        }
+        val params = getFilteredQueryParams(currentFilter, builder.build())
+        val sortOrder = if (isAZOrdering) {
+            RoomSortOrder.NAME
+        } else {
+            RoomSortOrder.ACTIVITY
+        }
+        val liveResults = session.roomService().getFilteredPagedRoomSummariesLive(
+                params,
+                pagedListConfig,
+                sortOrder
+        ).also {
+            filteredPagedRoomSummariesLive = it
+        }
+        liveResults.livePagedList.observeForever(internalPagedListObserver)
+    }
 
-        return flow
+    private fun observeOrderPreferences() {
+        preferencesStore.isAZOrderingEnabledFlow
+                .onEach { isAZOrdering ->
+                    val currentFilter = awaitState().headersData.currentFilter
+                    observeRooms(currentFilter, isAZOrdering)
+                }.launchIn(viewModelScope)
+    }
+
+    private suspend fun updateEmptyState() {
+        val currentFilter = awaitState().headersData.currentFilter
+        val emptyState = getEmptyStateData(currentFilter, spaceStateHandler.getCurrentSpace())
+        setState { copy(emptyState = emptyState) }
     }
 
     private fun getFilteredQueryParams(filter: HomeRoomFilter, currentParams: RoomSummaryQueryParams): RoomSummaryQueryParams {
@@ -214,19 +297,70 @@ class HomeRoomListViewModel @AssistedInject constructor(
         }
     }
 
+    private fun getEmptyStateData(filter: HomeRoomFilter, selectedSpace: RoomSummary?): StateView.State.Empty? {
+        return when (filter) {
+            HomeRoomFilter.ALL ->
+                if (selectedSpace != null) {
+                    StateView.State.Empty(
+                            title = stringProvider.getString(R.string.home_empty_space_no_rooms_title, selectedSpace.displayName),
+                            message = stringProvider.getString(R.string.home_empty_space_no_rooms_message),
+                            image = drawableProvider.getDrawable(R.drawable.ill_empty_space),
+                            isBigImage = true
+                    )
+                } else {
+                    val userName = session.getUserOrDefault(session.myUserId).toMatrixItem().getBestName()
+                    StateView.State.Empty(
+                            title = stringProvider.getString(R.string.home_empty_no_rooms_title, userName),
+                            message = stringProvider.getString(R.string.home_empty_no_rooms_message),
+                            image = drawableProvider.getDrawable(R.drawable.ill_empty_all_chats),
+                            isBigImage = true
+                    )
+                }
+            HomeRoomFilter.UNREADS ->
+                StateView.State.Empty(
+                        title = stringProvider.getString(R.string.home_empty_no_unreads_title),
+                        message = stringProvider.getString(R.string.home_empty_no_unreads_message),
+                        image = drawableProvider.getDrawable(R.drawable.ill_empty_unreads),
+                        isBigImage = true,
+                        imageScaleType = ImageView.ScaleType.CENTER_INSIDE
+                )
+            else ->
+                null
+        }
+    }
+
     override fun handle(action: HomeRoomListAction) {
         when (action) {
             is HomeRoomListAction.SelectRoom -> handleSelectRoom(action)
             is HomeRoomListAction.LeaveRoom -> handleLeaveRoom(action)
             is HomeRoomListAction.ChangeRoomNotificationState -> handleChangeNotificationMode(action)
             is HomeRoomListAction.ToggleTag -> handleToggleTag(action)
-            is HomeRoomListAction.ChangeRoomFilter -> handleChangeRoomFilter(action)
+            is HomeRoomListAction.ChangeRoomFilter -> handleChangeRoomFilter(action.filter)
+            HomeRoomListAction.DeleteAllLocalRoom -> handleDeleteLocalRooms()
         }
     }
 
-    private fun handleChangeRoomFilter(action: HomeRoomListAction.ChangeRoomFilter) {
+    override fun onCleared() {
+        filteredPagedRoomSummariesLive?.livePagedList?.removeObserver(internalPagedListObserver)
+        super.onCleared()
+    }
+
+    private fun handleChangeRoomFilter(newFilter: HomeRoomFilter) {
+        viewModelScope.launch {
+            changeRoomFilter(newFilter)
+        }
+    }
+
+    private suspend fun changeRoomFilter(newFilter: HomeRoomFilter) {
+        val currentFilter = awaitState().headersData.currentFilter
+        if (currentFilter == newFilter) {
+            return
+        }
+        setState { copy(headersData = headersData.copy(currentFilter = newFilter)) }
+        updateEmptyState()
+        analyticsTracker.updateUserProperties(UserProperties(allChatsActiveFilter = newFilter.toTrackingValue()))
         filteredPagedRoomSummariesLive?.let { liveResults ->
-            liveResults.queryParams = getFilteredQueryParams(action.filter, liveResults.queryParams)
+            liveResults.queryParams = getFilteredQueryParams(newFilter, liveResults.queryParams)
         }
     }
 
@@ -248,12 +382,12 @@ class HomeRoomListViewModel @AssistedInject constructor(
     }
 
     private fun handleChangeNotificationMode(action: HomeRoomListAction.ChangeRoomNotificationState) {
-        val room = session.getRoom(action.roomId)
-        if (room != null) {
-            viewModelScope.launch {
+        viewModelScope.launch {
+            val room = session.getRoom(action.roomId)
+            if (room != null) {
                 try {
                     room.roomPushRuleService().setRoomNotificationState(action.notificationState)
-                } catch (failure: Exception) {
+                } catch (failure: Throwable) {
                     _viewEvents.post(HomeRoomListViewEvents.Failure(failure))
                 }
             }
@@ -261,8 +395,8 @@ class HomeRoomListViewModel @AssistedInject constructor(
     }
 
     private fun handleToggleTag(action: HomeRoomListAction.ToggleTag) {
-        session.getRoom(action.roomId)?.let { room ->
-            viewModelScope.launch(Dispatchers.IO) {
+        viewModelScope.launch {
+            session.getRoom(action.roomId)?.let { room ->
                 try {
                     if (room.roomSummary()?.hasTag(action.tag) == false) {
                         // Favorite and low priority tags are exclusive, so maybe delete the other tag first
@@ -284,6 +418,18 @@ class HomeRoomListViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleDeleteLocalRooms() = withState {
+        viewModelScope.launch {
+            val localRoomIds = session.roomService()
+                    .getRoomSummaries(roomSummaryQueryParams { roomId = QueryStringValue.Contains(RoomLocalEcho.PREFIX) })
+                    .map { it.roomId }
+
+            localRoomIds.forEach {
+                session.roomService().deleteLocalRoom(it)
+            }
+        }
+    }
+
     private fun String.otherTag(): String? {
         return when (this) {
             RoomTag.ROOM_TAG_FAVOURITE -> RoomTag.ROOM_TAG_LOW_PRIORITY
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewState.kt
index bfcaea22e9..ceaaf9b9dc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewState.kt
@@ -18,7 +18,9 @@ package im.vector.app.features.home.room.list.home
 
 import com.airbnb.mvrx.MavericksState
 import im.vector.app.core.platform.StateView
+import im.vector.app.features.home.room.list.home.header.RoomsHeadersData
 
 data class HomeRoomListViewState(
-        val state: StateView.State = StateView.State.Loading
+        val emptyState: StateView.State.Empty? = null,
+        val headersData: RoomsHeadersData = RoomsHeadersData(),
 ) : MavericksState
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt
new file mode 100644
index 0000000000..3f12ae4a63
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.FragmentNewChatBottomSheetBinding
+import im.vector.app.features.navigation.Navigator
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class NewChatBottomSheet : VectorBaseBottomSheetDialogFragment<FragmentNewChatBottomSheetBinding>() {
+
+    @Inject lateinit var navigator: Navigator
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentNewChatBottomSheetBinding {
+        return FragmentNewChatBottomSheetBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        initFABs()
+    }
+
+    private fun initFABs() {
+        views.startChat.debouncedClicks {
+            dismiss()
+            navigator.openCreateDirectRoom(requireActivity())
+        }
+
+        views.createRoom.debouncedClicks {
+            dismiss()
+            navigator.openCreateRoom(requireActivity())
+        }
+
+        views.exploreRooms.debouncedClicks {
+            dismiss()
+            navigator.openRoomDirectory(requireContext())
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return super.onCreateDialog(savedInstanceState).apply {
+            setPeekHeightAsScreenPercentage(0.5f)
+        }
+    }
+
+    companion object {
+        const val TAG = "NewChatBottomSheet"
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/RoomListEmptyItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/RoomListEmptyItem.kt
new file mode 100644
index 0000000000..f7b3262529
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/RoomListEmptyItem.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home
+
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.StateView
+
+@EpoxyModelClass
+abstract class RoomListEmptyItem : VectorEpoxyModel<RoomListEmptyItem.Holder>(R.layout.item_state_view) {
+
+    @EpoxyAttribute
+    lateinit var emptyData: StateView.State.Empty
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.stateView.state = emptyData
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val stateView by bind<StateView>(R.id.stateView)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/filter/HomeRoomFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomFilter.kt
similarity index 94%
rename from vector/src/main/java/im/vector/app/features/home/room/list/home/filter/HomeRoomFilter.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomFilter.kt
index ce33440238..9bd800a47c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/filter/HomeRoomFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomFilter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.home.room.list.home.filter
+package im.vector.app.features.home.room.list.home.header
 
 import androidx.annotation.StringRes
 import im.vector.app.R
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomsHeadersController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomsHeadersController.kt
new file mode 100644
index 0000000000..3cc058985a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/HomeRoomsHeadersController.kt
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.header
+
+import android.content.res.Resources
+import android.util.TypedValue
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.airbnb.epoxy.Carousel
+import com.airbnb.epoxy.CarouselModelBuilder
+import com.airbnb.epoxy.EpoxyController
+import com.airbnb.epoxy.EpoxyModel
+import com.airbnb.epoxy.carousel
+import com.google.android.material.color.MaterialColors
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.FirstItemUpdatedObserver
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.RoomListListener
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class HomeRoomsHeadersController @Inject constructor(
+        val stringProvider: StringProvider,
+        private val avatarRenderer: AvatarRenderer,
+        resources: Resources,
+        private val analyticsTracker: AnalyticsTracker,
+) : EpoxyController() {
+
+    private var data: RoomsHeadersData = RoomsHeadersData()
+
+    var onFilterChangedListener: ((HomeRoomFilter) -> Unit)? = null
+    var recentsRoomListener: RoomListListener? = null
+    var invitesClickListener: (() -> Unit)? = null
+
+    private var carousel: Carousel? = null
+
+    private var carouselAdapterObserver: FirstItemUpdatedObserver? = null
+
+    private val recentsHPadding = TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            4f,
+            resources.displayMetrics
+    ).toInt()
+
+    private val recentsTopPadding = TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            12f,
+            resources.displayMetrics
+    ).toInt()
+
+    override fun buildModels() {
+        val host = this
+        if (data.invitesCount != 0) {
+            addInviteCounter(host.invitesClickListener, data.invitesCount)
+        }
+
+        data.recents?.let {
+            addRecents(host, it)
+        }
+
+        host.data.filtersList?.let {
+            addRoomFilterHeaderItem(
+                    filterChangedListener = host.onFilterChangedListener,
+                    filtersList = it,
+                    currentFilter = host.data.currentFilter,
+                    analyticsTracker = analyticsTracker)
+        }
+    }
+
+    private fun addInviteCounter(invitesClickListener: (() -> Unit)?, invitesCount: Int) {
+        inviteCounterItem {
+            id("invites_counter")
+            invitesCount(invitesCount)
+            listener { invitesClickListener?.invoke() }
+        }
+    }
+
+    private fun addRecents(host: HomeRoomsHeadersController, recents: List<RoomSummary>) {
+        carousel {
+            id("recents_carousel")
+            padding(
+                    Carousel.Padding(
+                            host.recentsHPadding,
+                            host.recentsTopPadding,
+                            host.recentsHPadding,
+                            0,
+                            0,
+                    )
+            )
+            onBind { _, view, _ ->
+                host.carousel = view
+                host.unsubscribeAdapterObserver()
+                host.subscribeAdapterObserver()
+
+                val colorSurface = MaterialColors.getColor(view, R.attr.vctr_toolbar_background)
+                view.setBackgroundColor(colorSurface)
+            }
+
+            onUnbind { _, _ ->
+                host.carousel = null
+                host.unsubscribeAdapterObserver()
+            }
+
+            withModelsFrom(recents) { roomSummary ->
+                val onClick = host.recentsRoomListener?.let { it::onRoomClicked }
+                val onLongClick = host.recentsRoomListener?.let { it::onRoomLongClicked }
+
+                RecentRoomItem_()
+                        .id(roomSummary.roomId)
+                        .avatarRenderer(host.avatarRenderer)
+                        .matrixItem(roomSummary.toMatrixItem())
+                        .unreadNotificationCount(roomSummary.notificationCount)
+                        .showHighlighted(roomSummary.highlightCount > 0)
+                        .itemLongClickListener { _ -> onLongClick?.invoke(roomSummary) ?: false }
+                        .itemClickListener { onClick?.invoke(roomSummary) }
+            }
+        }
+    }
+
+    private fun unsubscribeAdapterObserver() {
+        carouselAdapterObserver?.let { observer ->
+            try {
+                carousel?.adapter?.unregisterAdapterDataObserver(observer)
+                carouselAdapterObserver = null
+            } catch (e: IllegalStateException) {
+                // do nothing
+            }
+        }
+    }
+
+    private fun subscribeAdapterObserver() {
+        (carousel?.layoutManager as? LinearLayoutManager)?.let { layoutManager ->
+            carouselAdapterObserver = FirstItemUpdatedObserver(layoutManager) {
+                carousel?.post {
+                    layoutManager.scrollToPosition(0)
+                }
+            }.also { observer ->
+                try {
+                    carousel?.adapter?.registerAdapterDataObserver(observer)
+                } catch (e: IllegalStateException) {
+                    // do nothing
+                }
+            }
+        }
+    }
+
+    private fun addRoomFilterHeaderItem(
+            filterChangedListener: ((HomeRoomFilter) -> Unit)?,
+            filtersList: List<HomeRoomFilter>,
+            currentFilter: HomeRoomFilter?,
+            analyticsTracker: AnalyticsTracker,
+    ) {
+        roomFilterHeaderItem {
+            id("filter_header")
+            filtersData(filtersList)
+            selectedFilter(currentFilter)
+            onFilterChangedListener(filterChangedListener)
+            analyticsTracker(analyticsTracker)
+        }
+    }
+
+    fun submitData(data: RoomsHeadersData) {
+        this.data = data
+        requestModelBuild()
+    }
+}
+
+private inline fun <T> CarouselModelBuilder.withModelsFrom(
+        items: List<T>,
+        modelBuilder: (T) -> EpoxyModel<*>
+) {
+    models(items.map { modelBuilder(it) })
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/header/InviteCounterItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/InviteCounterItem.kt
new file mode 100644
index 0000000000..5c43c86933
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/InviteCounterItem.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.header
+
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+
+@EpoxyModelClass
+abstract class InviteCounterItem : VectorEpoxyModel<InviteCounterItem.Holder>(R.layout.item_invites_count) {
+
+    @EpoxyAttribute var invitesCount: Int = 0
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: ClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.view.setOnClickListener(listener)
+        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State.Count(invitesCount, true))
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val unreadCounterBadgeView by bind<UnreadCounterBadgeView>(R.id.invites_count_badge)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RecentRoomItem.kt
similarity index 96%
rename from vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/home/header/RecentRoomItem.kt
index 6a575a2b6a..9cd28624a5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RecentRoomItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.home.room.list.home.recent
+package im.vector.app.features.home.room.list.home.header
 
 import android.view.HapticFeedbackConstants
 import android.view.View
@@ -58,7 +58,7 @@ abstract class RecentRoomItem : VectorEpoxyModel<RecentRoomItem.Holder>(R.layout
 
         avatarRenderer.render(matrixItem, holder.avatarImageView)
         holder.avatarImageView.contentDescription = matrixItem.getBestName()
-        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State(unreadNotificationCount, showHighlighted))
+        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State.Count(unreadNotificationCount, showHighlighted))
         holder.title.text = matrixItem.getBestName()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/filter/RoomFilterHeaderItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomFilterHeaderItem.kt
similarity index 61%
rename from vector/src/main/java/im/vector/app/features/home/room/list/home/filter/RoomFilterHeaderItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomFilterHeaderItem.kt
index bbe503806b..fd4333b722 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/filter/RoomFilterHeaderItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomFilterHeaderItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.home.room.list.home.filter
+package im.vector.app.features.home.room.list.home.header
 
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
@@ -22,6 +22,8 @@ import com.google.android.material.tabs.TabLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.plan.Interaction
 
 @EpoxyModelClass
 abstract class RoomFilterHeaderItem : VectorEpoxyModel<RoomFilterHeaderItem.Holder>(R.layout.item_home_filter_tabs) {
@@ -32,18 +34,29 @@ abstract class RoomFilterHeaderItem : VectorEpoxyModel<RoomFilterHeaderItem.Hold
     @EpoxyAttribute
     var filtersData: List<HomeRoomFilter>? = null
 
+    @EpoxyAttribute
+    var selectedFilter: HomeRoomFilter? = null
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var analyticsTracker: AnalyticsTracker? = null
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         with(holder.tabLayout) {
             removeAllTabs()
+            clearOnTabSelectedListeners()
 
             filtersData?.forEach { filter ->
-                addTab(newTab().setText(filter.titleRes).setTag(filter))
+                addTab(
+                        newTab().setText(filter.titleRes).setTag(filter),
+                        filter == (selectedFilter ?: HomeRoomFilter.ALL)
+                )
             }
 
             addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
                 override fun onTabSelected(tab: TabLayout.Tab?) {
                     (tab?.tag as? HomeRoomFilter)?.let { filter ->
+                        trackFilterChangeEvent(filter)
                         onFilterChangedListener?.invoke(filter)
                     }
                 }
@@ -54,6 +67,23 @@ abstract class RoomFilterHeaderItem : VectorEpoxyModel<RoomFilterHeaderItem.Hold
         }
     }
 
+    private fun trackFilterChangeEvent(filter: HomeRoomFilter) {
+        val interactionName = when (filter) {
+            HomeRoomFilter.ALL -> Interaction.Name.MobileAllChatsFilterAll
+            HomeRoomFilter.UNREADS -> Interaction.Name.MobileAllChatsFilterUnreads
+            HomeRoomFilter.FAVOURITES -> Interaction.Name.MobileAllChatsFilterFavourites
+            HomeRoomFilter.PEOPlE -> Interaction.Name.MobileAllChatsFilterPeople
+        }
+
+        analyticsTracker?.capture(
+                Interaction(
+                        index = null,
+                        interactionType = null,
+                        name = interactionName
+                )
+        )
+    }
+
     override fun unbind(holder: Holder) {
         holder.tabLayout.clearOnTabSelectedListeners()
         super.unbind(holder)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomsHeadersData.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomsHeadersData.kt
new file mode 100644
index 0000000000..db7f8b9a96
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/header/RoomsHeadersData.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.header
+
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+data class RoomsHeadersData(
+        val invitesCount: Int = 0,
+        val filtersList: List<HomeRoomFilter>? = null,
+        val currentFilter: HomeRoomFilter = HomeRoomFilter.ALL,
+        val recents: List<RoomSummary>? = null
+)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomSection.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesAction.kt
similarity index 53%
rename from vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomSection.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesAction.kt
index f51b479d37..d96e0f01de 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomSection.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesAction.kt
@@ -14,22 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.home.room.list.home
+package im.vector.app.features.home.room.list.home.invites
 
-import androidx.lifecycle.LiveData
-import androidx.paging.PagedList
-import im.vector.app.features.home.room.list.home.filter.HomeRoomFilter
-import kotlinx.coroutines.flow.SharedFlow
+import im.vector.app.core.platform.VectorViewModelAction
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
-sealed class HomeRoomSection {
-    data class RoomSummaryData(
-            val list: LiveData<PagedList<RoomSummary>>,
-            val showFilters: Boolean,
-            val filtersData: SharedFlow<List<HomeRoomFilter>>
-    ) : HomeRoomSection()
-
-    data class RecentRoomsData(
-            val list: LiveData<List<RoomSummary>>
-    ) : HomeRoomSection()
+sealed class InvitesAction : VectorViewModelAction {
+    data class SelectRoom(val roomSummary: RoomSummary) : InvitesAction()
+    data class AcceptInvitation(val roomSummary: RoomSummary) : InvitesAction()
+    data class RejectInvitation(val roomSummary: RoomSummary) : InvitesAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesActivity.kt
new file mode 100644
index 0000000000..b590caab42
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesActivity.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.invites
+
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivitySimpleBinding
+
+@AndroidEntryPoint
+class InvitesActivity : VectorBaseActivity<ActivitySimpleBinding>() {
+
+    override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
+
+    override fun initUiAndData() {
+        if (isFirstCreation()) {
+            addFragment(views.simpleFragmentContainer, InvitesFragment::class.java)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/filter/HomeFilteredRoomsController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesController.kt
similarity index 62%
rename from vector/src/main/java/im/vector/app/features/home/room/list/home/filter/HomeFilteredRoomsController.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesController.kt
index 7c1f154d52..b59dfbdd43 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/filter/HomeFilteredRoomsController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesController.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.home.room.list.home.filter
+package im.vector.app.features.home.room.list.home.invites
 
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.paging.PagedListEpoxyController
@@ -22,49 +22,28 @@ import im.vector.app.core.utils.createUIHandler
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.home.room.list.RoomListListener
 import im.vector.app.features.home.room.list.RoomSummaryItemFactory
-import im.vector.app.features.home.room.list.RoomSummaryItemPlaceHolder_
+import im.vector.app.features.home.room.list.RoomSummaryPlaceHolderItem_
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import javax.inject.Inject
 
-class HomeFilteredRoomsController(
+class InvitesController @Inject constructor(
         private val roomSummaryItemFactory: RoomSummaryItemFactory,
-        private val showFilters: Boolean,
 ) : PagedListEpoxyController<RoomSummary>(
         // Important it must match the PageList builder notify Looper
         modelBuildingHandler = createUIHandler()
 ) {
 
-    private var roomChangeMembershipStates: Map<String, ChangeMembershipState>? = null
+    var roomChangeMembershipStates: Map<String, ChangeMembershipState>? = null
         set(value) {
             field = value
-            // ideally we could search for visible models and update only those
             requestForcedModelBuild()
         }
 
     var listener: RoomListListener? = null
-    var onFilterChanged: ((HomeRoomFilter) -> Unit)? = null
-
-    private var filtersData: List<HomeRoomFilter>? = null
-
-    override fun addModels(models: List<EpoxyModel<*>>) {
-        val host = this
-        if (showFilters) {
-            roomFilterHeaderItem {
-                id("filter_header")
-                filtersData(host.filtersData)
-                onFilterChangedListener(host.onFilterChanged)
-            }
-        }
-        super.addModels(models)
-    }
-
-    fun submitFiltersData(data: List<HomeRoomFilter>) {
-        this.filtersData = data
-        requestForcedModelBuild()
-    }
 
     override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
-        item ?: return RoomSummaryItemPlaceHolder_().apply { id(currentPosition) }
+        item ?: return RoomSummaryPlaceHolderItem_().apply { id(currentPosition) }
         return roomSummaryItemFactory.create(item, roomChangeMembershipStates.orEmpty(), emptySet(), RoomListDisplayMode.ROOMS, listener)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesFragment.kt
new file mode 100644
index 0000000000..ac39d7d567
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesFragment.kt
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.invites
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
+import com.airbnb.mvrx.fragmentViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.StateView
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentInvitesBinding
+import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.analytics.plan.ViewRoom
+import im.vector.app.features.home.room.list.RoomListListener
+import im.vector.app.features.notifications.NotificationDrawerManager
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class InvitesFragment : VectorBaseFragment<FragmentInvitesBinding>(), RoomListListener {
+
+    @Inject lateinit var controller: InvitesController
+    @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
+
+    private val viewModel by fragmentViewModel(InvitesViewModel::class)
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentInvitesBinding {
+        return FragmentInvitesBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        analyticsScreenName = MobileScreen.ScreenName.Invites
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        setupToolbar(views.invitesToolbar)
+                .allowBack()
+
+        views.invitesStateView.contentView = views.invitesRecycler
+
+        views.invitesRecycler.configureWith(controller)
+        controller.listener = this
+
+        viewModel.onEach(InvitesViewState::roomMembershipChanges) {
+            controller.roomChangeMembershipStates = it
+        }
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is InvitesViewEvents.Failure -> showFailure(it.throwable)
+                is InvitesViewEvents.OpenRoom -> handleOpenRoom(it.roomSummary, it.shouldCloseInviteView, it.isInviteAlreadySelected)
+            }
+        }
+
+        viewModel.invites.onEach {
+            when (it) {
+                is InvitesContentState.Content -> {
+                    views.invitesStateView.state = StateView.State.Content
+                    controller.submitList(it.content)
+                }
+                is InvitesContentState.Empty -> {
+                    views.invitesStateView.state = StateView.State.Empty(
+                            title = it.title,
+                            image = it.image,
+                            message = it.message
+                    )
+                }
+                is InvitesContentState.Error -> {
+                    when (views.invitesStateView.state) {
+                        StateView.State.Content -> showErrorInSnackbar(it.throwable)
+                        else -> views.invitesStateView.state = StateView.State.Error(it.throwable.message)
+                    }
+                }
+                InvitesContentState.Loading -> views.invitesStateView.state = StateView.State.Loading
+            }
+        }.launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+
+    private fun handleOpenRoom(
+            roomSummary: RoomSummary,
+            shouldCloseInviteView: Boolean,
+            isInviteAlreadyAccepted: Boolean,
+    ) {
+        navigator.openRoom(
+                context = requireActivity(),
+                roomId = roomSummary.roomId,
+                isInviteAlreadyAccepted = isInviteAlreadyAccepted,
+                trigger = ViewRoom.Trigger.RoomList // #6508
+        )
+        if (shouldCloseInviteView) {
+            requireActivity().finish()
+        }
+    }
+
+    override fun onRejectRoomInvitation(room: RoomSummary) {
+        notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(room.roomId) }
+        viewModel.handle(InvitesAction.RejectInvitation(room))
+    }
+
+    override fun onAcceptRoomInvitation(room: RoomSummary) {
+        notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(room.roomId) }
+        viewModel.handle(InvitesAction.AcceptInvitation(room))
+    }
+
+    override fun onJoinSuggestedRoom(room: SpaceChildInfo) = Unit
+
+    override fun onSuggestedRoomClicked(room: SpaceChildInfo) = Unit
+
+    override fun onRoomClicked(room: RoomSummary) {
+        viewModel.handle(InvitesAction.SelectRoom(room))
+    }
+
+    override fun onRoomLongClicked(room: RoomSummary): Boolean = false
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesViewEvents.kt
new file mode 100644
index 0000000000..69749b8c48
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesViewEvents.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.invites
+
+import im.vector.app.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+sealed class InvitesViewEvents : VectorViewEvents {
+    data class Failure(val throwable: Throwable) : InvitesViewEvents()
+    data class OpenRoom(
+            val roomSummary: RoomSummary,
+            val shouldCloseInviteView: Boolean,
+            val isInviteAlreadySelected: Boolean,
+    ) : InvitesViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesViewModel.kt
new file mode 100644
index 0000000000..8ef7c2bfef
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesViewModel.kt
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.invites
+
+import androidx.lifecycle.asFlow
+import androidx.paging.PagedList
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.R
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.resources.StringProvider
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.RoomSortOrder
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
+import timber.log.Timber
+
+class InvitesViewModel @AssistedInject constructor(
+        @Assisted val initialState: InvitesViewState,
+        private val session: Session,
+        private val stringProvider: StringProvider,
+        private val drawableProvider: DrawableProvider
+) : VectorViewModel<InvitesViewState, InvitesAction, InvitesViewEvents>(initialState) {
+
+    private val pagedListConfig = PagedList.Config.Builder()
+            .setPageSize(10)
+            .setInitialLoadSizeHint(20)
+            .setEnablePlaceholders(true)
+            .setPrefetchDistance(10)
+            .build()
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<InvitesViewModel, InvitesViewState> {
+        override fun create(initialState: InvitesViewState): InvitesViewModel
+    }
+
+    companion object : MavericksViewModelFactory<InvitesViewModel, InvitesViewState> by hiltMavericksViewModelFactory()
+
+    private val _invites = MutableSharedFlow<InvitesContentState>(replay = 1)
+    val invites = _invites.asSharedFlow()
+
+    private var invitesCount = -1
+
+    init {
+        observeInvites()
+    }
+
+    override fun handle(action: InvitesAction) {
+        when (action) {
+            is InvitesAction.SelectRoom -> handleSelectRoom(action)
+            is InvitesAction.AcceptInvitation -> handleAcceptInvitation(action)
+            is InvitesAction.RejectInvitation -> handleRejectInvitation(action)
+        }
+    }
+
+    private fun handleSelectRoom(action: InvitesAction.SelectRoom) {
+        _viewEvents.post(InvitesViewEvents.OpenRoom(
+                roomSummary = action.roomSummary,
+                shouldCloseInviteView = false,
+                isInviteAlreadySelected = false,
+        ))
+    }
+
+    private fun handleRejectInvitation(action: InvitesAction.RejectInvitation) = withState { state ->
+        val roomId = action.roomSummary.roomId
+        val roomMembershipChange = state.roomMembershipChanges[roomId]
+        if (roomMembershipChange?.isInProgress().orFalse()) {
+            // Request already sent, should not happen
+            Timber.w("Try to left an already leaving or joining room. Should not happen")
+            return@withState
+        }
+
+        viewModelScope.launch {
+            try {
+                session.roomService().leaveRoom(roomId)
+                // We do not update the rejectingRoomsIds here, because, the room is not rejected yet regarding the sync data.
+                // Instead, we wait for the room to be rejected
+                // Known bug: if the user is invited again (after rejecting the first invitation), the loading will be displayed instead of the buttons.
+                // If we update the state, the button will be displayed again, so it's not ideal...
+            } catch (failure: Throwable) {
+                // Notify the user
+                _viewEvents.post(InvitesViewEvents.Failure(failure))
+            }
+        }
+    }
+
+    private fun handleAcceptInvitation(action: InvitesAction.AcceptInvitation) = withState { state ->
+        val roomId = action.roomSummary.roomId
+        val roomMembershipChange = state.roomMembershipChanges[roomId]
+        if (roomMembershipChange?.isInProgress().orFalse()) {
+            // Request already sent, should not happen
+            Timber.w("Try to join an already joining room. Should not happen")
+            return@withState
+        }
+        // close invites view when navigate to a room from the last one invite
+
+        val shouldCloseInviteView = invitesCount == 1
+
+        // quick echo
+        setState {
+            copy(
+                    roomMembershipChanges = roomMembershipChanges.mapValues {
+                        if (it.key == roomId) {
+                            ChangeMembershipState.Joining
+                        } else {
+                            it.value
+                        }
+                    }
+            )
+        }
+
+        _viewEvents.post(InvitesViewEvents.OpenRoom(action.roomSummary, shouldCloseInviteView, isInviteAlreadySelected = true))
+    }
+
+    private fun observeInvites() {
+        val builder = RoomSummaryQueryParams.Builder().also {
+            it.memberships = listOf(Membership.INVITE)
+        }
+        val pagedList = session.roomService().getPagedRoomSummariesLive(
+                queryParams = builder.build(),
+                pagedListConfig = pagedListConfig,
+                sortOrder = RoomSortOrder.ACTIVITY
+        )
+
+        pagedList.asFlow()
+                .map {
+                    if (it.isEmpty()) {
+                        InvitesContentState.Empty(
+                                title = stringProvider.getString(R.string.invites_empty_title),
+                                image = drawableProvider.getDrawable(R.drawable.ic_invites_empty),
+                                message = stringProvider.getString(R.string.invites_empty_message)
+                        )
+                    } else {
+                        invitesCount = it.loadedCount
+                        InvitesContentState.Content(it)
+                    }
+                }
+                .catch {
+                    emit(InvitesContentState.Error(it))
+                }
+                .onStart {
+                    emit(InvitesContentState.Loading)
+                }.onEach {
+                    _invites.emit(it)
+                }.launchIn(viewModelScope)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesViewState.kt
new file mode 100644
index 0000000000..2f82c3fe76
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesViewState.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.invites
+
+import android.graphics.drawable.Drawable
+import androidx.paging.PagedList
+import com.airbnb.mvrx.MavericksState
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+data class InvitesViewState(
+        val roomMembershipChanges: Map<String, ChangeMembershipState> = emptyMap(),
+) : MavericksState
+
+sealed interface InvitesContentState {
+    object Loading : InvitesContentState
+    data class Empty(
+            val title: CharSequence,
+            val image: Drawable?,
+            val message: CharSequence
+    ) : InvitesContentState
+
+    data class Content(val content: PagedList<RoomSummary>) : InvitesContentState
+    data class Error(val throwable: Throwable) : InvitesContentState
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/layout/HomeLayoutSettingBottomDialogFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/layout/HomeLayoutSettingBottomDialogFragment.kt
new file mode 100644
index 0000000000..63b7f557e3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/layout/HomeLayoutSettingBottomDialogFragment.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.layout
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetHomeLayoutSettingsBinding
+import im.vector.app.features.analytics.plan.Interaction
+import im.vector.app.features.home.room.list.home.HomeLayoutPreferencesStore
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class HomeLayoutSettingBottomDialogFragment : VectorBaseBottomSheetDialogFragment<BottomSheetHomeLayoutSettingsBinding>() {
+
+    @Inject lateinit var preferencesStore: HomeLayoutPreferencesStore
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetHomeLayoutSettingsBinding {
+        return BottomSheetHomeLayoutSettingsBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            views.homeLayoutSettingsRecents.isChecked = preferencesStore.areRecentsEnabledFlow.first()
+            views.homeLayoutSettingsFilters.isChecked = preferencesStore.areFiltersEnabledFlow.first()
+
+            if (preferencesStore.isAZOrderingEnabledFlow.first()) {
+                views.homeLayoutSettingsSortName.isChecked = true
+            } else {
+                views.homeLayoutSettingsSortActivity.isChecked = true
+            }
+        }
+
+        views.homeLayoutSettingsRecents.setOnCheckedChangeListener { _, isChecked ->
+            trackRecentsStateEvent(isChecked)
+            setRecentsEnabled(isChecked)
+        }
+        views.homeLayoutSettingsFilters.setOnCheckedChangeListener { _, isChecked ->
+            trackFiltersStateEvent(isChecked)
+            setFiltersEnabled(isChecked)
+        }
+        views.homeLayoutSettingsSortGroup.setOnCheckedChangeListener { _, checkedId ->
+            setAzOrderingEnabled(checkedId == R.id.home_layout_settings_sort_name)
+        }
+    }
+
+    private fun trackRecentsStateEvent(areEnabled: Boolean) {
+        val interactionName = if (areEnabled) {
+            Interaction.Name.MobileAllChatsRecentsEnabled
+        } else {
+            Interaction.Name.MobileAllChatsRecentsDisabled
+        }
+        analyticsTracker.capture(
+                Interaction(
+                        index = null,
+                        interactionType = null,
+                        name = interactionName
+                )
+        )
+    }
+
+    private fun setRecentsEnabled(isEnabled: Boolean) = lifecycleScope.launch {
+        preferencesStore.setRecentsEnabled(isEnabled)
+    }
+
+    private fun trackFiltersStateEvent(areEnabled: Boolean) {
+        val interactionName = if (areEnabled) {
+            Interaction.Name.MobileAllChatsFiltersEnabled
+        } else {
+            Interaction.Name.MobileAllChatsFiltersDisabled
+        }
+        analyticsTracker.capture(
+                Interaction(
+                        index = null,
+                        interactionType = null,
+                        name = interactionName
+                )
+        )
+    }
+
+    private fun setFiltersEnabled(isEnabled: Boolean) = lifecycleScope.launch {
+        preferencesStore.setFiltersEnabled(isEnabled)
+    }
+
+    private fun setAzOrderingEnabled(isEnabled: Boolean) = lifecycleScope.launch {
+        preferencesStore.setAZOrderingEnabled(isEnabled)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
deleted file mode 100644
index 53832bbc74..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2022 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.
- */
-
-package im.vector.app.features.home.room.list.home.recent
-
-import android.content.res.Resources
-import android.util.TypedValue
-import com.airbnb.epoxy.Carousel
-import com.airbnb.epoxy.CarouselModelBuilder
-import com.airbnb.epoxy.EpoxyController
-import com.airbnb.epoxy.EpoxyModel
-import com.airbnb.epoxy.carousel
-import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.room.list.RoomListListener
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.util.toMatrixItem
-import javax.inject.Inject
-
-class RecentRoomCarouselController @Inject constructor(
-        private val avatarRenderer: AvatarRenderer,
-        private val resources: Resources,
-) : EpoxyController() {
-
-    private var data: List<RoomSummary>? = null
-    var listener: RoomListListener? = null
-
-    private val hPadding = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            16f,
-            resources.displayMetrics
-    ).toInt()
-
-    private val itemSpacing = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            24f,
-            resources.displayMetrics
-    ).toInt()
-
-    fun submitList(recentList: List<RoomSummary>) {
-        this.data = recentList
-        requestModelBuild()
-    }
-
-    override fun buildModels() {
-        val host = this
-        data?.let { data ->
-            carousel {
-                id("recents_carousel")
-                padding(Carousel.Padding(host.hPadding, host.itemSpacing))
-                withModelsFrom(data) { roomSummary ->
-                    val onClick = host.listener?.let { it::onRoomClicked }
-                    val onLongClick = host.listener?.let { it::onRoomLongClicked }
-
-                    RecentRoomItem_()
-                            .id(roomSummary.roomId)
-                            .avatarRenderer(host.avatarRenderer)
-                            .matrixItem(roomSummary.toMatrixItem())
-                            .unreadNotificationCount(roomSummary.notificationCount)
-                            .showHighlighted(roomSummary.highlightCount > 0)
-                            .itemLongClickListener { _ -> onLongClick?.invoke(roomSummary) ?: false }
-                            .itemClickListener { onClick?.invoke(roomSummary) }
-                }
-            }
-        }
-    }
-}
-
-private inline fun <T> CarouselModelBuilder.withModelsFrom(
-        items: List<T>,
-        modelBuilder: (T) -> EpoxyModel<*>
-) {
-    models(items.map { modelBuilder(it) })
-}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseCarouselData.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseCarouselData.kt
new file mode 100644
index 0000000000..22431b0bf9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseCarouselData.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.release
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+
+class ReleaseCarouselData(
+        val items: List<Item>
+) {
+    data class Item(
+            @StringRes val title: Int,
+            @StringRes val body: Int,
+            @DrawableRes val image: Int,
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseCarouselItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseCarouselItem.kt
new file mode 100644
index 0000000000..49eb0761f7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseCarouselItem.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.release
+
+import android.widget.ImageView
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+
+@EpoxyModelClass
+abstract class ReleaseCarouselItem : VectorEpoxyModel<ReleaseCarouselItem.Holder>(R.layout.item_release_carousel) {
+
+    @EpoxyAttribute
+    lateinit var item: ReleaseCarouselData.Item
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+
+        holder.image.setImageResource(item.image)
+        holder.title.setText(item.title)
+        holder.body.setText(item.body)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val image by bind<ImageView>(R.id.carousel_item_image)
+        val title by bind<TextView>(R.id.carousel_item_title)
+        val body by bind<TextView>(R.id.carousel_item_body)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesAction.kt
new file mode 100644
index 0000000000..7a66d00589
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesAction.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.release
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class ReleaseNotesAction : VectorViewModelAction {
+    data class NextPressed(
+            val isLastItemSelected: Boolean = false
+    ) : ReleaseNotesAction()
+    data class PageSelected(
+            val selectedPageIndex: Int  = 0
+    ) : ReleaseNotesAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesActivity.kt
new file mode 100644
index 0000000000..4d8cfc9f23
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesActivity.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.release
+
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ScreenOrientationLocker
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivitySimpleBinding
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ReleaseNotesActivity : VectorBaseActivity<ActivitySimpleBinding>() {
+
+    @Inject lateinit var orientationLocker: ScreenOrientationLocker
+    @Inject lateinit var releaseNotesPreferencesStore: ReleaseNotesPreferencesStore
+
+    override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
+
+    override fun getCoordinatorLayout() = views.coordinatorLayout
+
+    override fun initUiAndData() {
+        orientationLocker.lockPhonesToPortrait(this)
+        if (isFirstCreation()) {
+            addFragment(views.simpleFragmentContainer, ReleaseNotesFragment::class.java)
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        lifecycleScope.launch {
+            releaseNotesPreferencesStore.setAppLayoutOnboardingShown(true)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesCarouselController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesCarouselController.kt
new file mode 100644
index 0000000000..22d2915c47
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesCarouselController.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.home.room.list.home.release
+
+import com.airbnb.epoxy.TypedEpoxyController
+import javax.inject.Inject
+
+class ReleaseNotesCarouselController @Inject constructor() : TypedEpoxyController<ReleaseCarouselData>() {
+    override fun buildModels(data: ReleaseCarouselData) {
+        data.items.forEachIndexed { index, item ->
+            releaseCarouselItem {
+                id(index)
+                item(item)
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesFragment.kt
new file mode 100644
index 0000000000..6b86897dc8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesFragment.kt
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.release
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.viewpager2.widget.ViewPager2
+import com.airbnb.mvrx.fragmentViewModel
+import com.google.android.material.tabs.TabLayoutMediator
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.BottomSheetReleaseNotesBinding
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ReleaseNotesFragment : VectorBaseFragment<BottomSheetReleaseNotesBinding>() {
+
+    @Inject lateinit var carouselController: ReleaseNotesCarouselController
+    private var tabLayoutMediator: TabLayoutMediator? = null
+
+    private val viewModel by fragmentViewModel(ReleaseNotesViewModel::class)
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetReleaseNotesBinding {
+        return BottomSheetReleaseNotesBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val carouselAdapter = carouselController.adapter
+        views.releaseNotesCarousel.adapter = carouselAdapter
+
+        tabLayoutMediator = TabLayoutMediator(views.releaseNotesCarouselIndicator, views.releaseNotesCarousel) { _, _ -> }
+                .also { it.attach() }
+
+        val pageCallback = object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                viewModel.handle(ReleaseNotesAction.PageSelected(position))
+                updateButtonText(position)
+            }
+        }
+
+        viewLifecycleOwner.lifecycle.addObserver(object : DefaultLifecycleObserver {
+            override fun onCreate(owner: LifecycleOwner) {
+                views.releaseNotesCarousel.registerOnPageChangeCallback(pageCallback)
+            }
+
+            override fun onDestroy(owner: LifecycleOwner) {
+                views.releaseNotesCarousel.unregisterOnPageChangeCallback(pageCallback)
+            }
+        })
+
+        carouselController.setData(createCarouselData())
+
+        views.releaseNotesBtnClose.onClick { close() }
+        views.releaseNotesButtonNext.onClick {
+            val isLastItemSelected = with(views.releaseNotesCarouselIndicator) {
+                selectedTabPosition == tabCount - 1
+            }
+            viewModel.handle(ReleaseNotesAction.NextPressed(isLastItemSelected))
+        }
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is ReleaseNotesViewEvents.SelectPage -> selectPage(it.index)
+                ReleaseNotesViewEvents.Close -> close()
+            }
+        }
+    }
+
+    private fun createCarouselData(): ReleaseCarouselData {
+        return ReleaseCarouselData(
+                listOf(
+                        ReleaseCarouselData.Item(
+                                R.string.onboarding_new_app_layout_welcome_title,
+                                R.string.onboarding_new_app_layout_welcome_message,
+                                R.drawable.ill_app_layout_onboarding_rooms
+                        ),
+                        ReleaseCarouselData.Item(
+                                R.string.onboarding_new_app_layout_spaces_title,
+                                R.string.onboarding_new_app_layout_spaces_message,
+                                R.drawable.ill_app_layout_onboarding_spaces
+                        ),
+                        ReleaseCarouselData.Item(
+                                R.string.onboarding_new_app_layout_feedback_title,
+                                R.string.onboarding_new_app_layout_feedback_message,
+                                R.drawable.ill_app_layout_onboarding_rooms
+                        ),
+                )
+        )
+    }
+
+    private fun close() {
+        requireActivity().finish()
+    }
+
+    private fun selectPage(index: Int) {
+        views.releaseNotesCarouselIndicator.selectTab(views.releaseNotesCarouselIndicator.getTabAt(index))
+        updateButtonText(index)
+    }
+
+    private fun updateButtonText(selectedIndex: Int) {
+        val isLastItem = selectedIndex == views.releaseNotesCarouselIndicator.tabCount - 1
+        if (isLastItem) {
+            views.releaseNotesButtonNext.setText(R.string.onboarding_new_app_layout_button_try)
+        } else {
+            views.releaseNotesButtonNext.setText(R.string.action_next)
+        }
+    }
+
+    override fun onDestroyView() {
+        tabLayoutMediator?.detach()
+        tabLayoutMediator = null
+
+        views.releaseNotesCarousel.adapter = null
+        super.onDestroyView()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesPreferencesStore.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesPreferencesStore.kt
new file mode 100644
index 0000000000..3320bdf314
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesPreferencesStore.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.release
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.preferencesDataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import org.matrix.android.sdk.api.extensions.orFalse
+import javax.inject.Inject
+
+private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "release_notes")
+
+class ReleaseNotesPreferencesStore @Inject constructor(
+        private val context: Context
+) {
+
+    private val isAppLayoutOnboardingShown = booleanPreferencesKey("SETTINGS_APP_LAYOUT_ONBOARDING_DISPLAYED")
+
+    val appLayoutOnboardingShown: Flow<Boolean> = context.dataStore.data
+            .map { preferences -> preferences[isAppLayoutOnboardingShown].orFalse() }
+            .distinctUntilChanged()
+
+    suspend fun setAppLayoutOnboardingShown(isShown: Boolean) {
+        context.dataStore.edit { settings ->
+            settings[isAppLayoutOnboardingShown] = isShown
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesViewEvents.kt
new file mode 100644
index 0000000000..7901a8b28f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesViewEvents.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.release
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class ReleaseNotesViewEvents : VectorViewEvents {
+    object Close : ReleaseNotesViewEvents()
+    data class SelectPage(val index: Int) : ReleaseNotesViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesViewModel.kt
new file mode 100644
index 0000000000..23e2364d0c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesViewModel.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.list.home.release
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.VectorDummyViewState
+import im.vector.app.core.platform.VectorViewModel
+
+class ReleaseNotesViewModel @AssistedInject constructor(
+        @Assisted initialState: VectorDummyViewState,
+) : VectorViewModel<VectorDummyViewState, ReleaseNotesAction, ReleaseNotesViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<ReleaseNotesViewModel, VectorDummyViewState> {
+        override fun create(initialState: VectorDummyViewState): ReleaseNotesViewModel
+    }
+
+    companion object : MavericksViewModelFactory<ReleaseNotesViewModel, VectorDummyViewState> by hiltMavericksViewModelFactory()
+
+    private var selectedPageIndex = 0
+
+    init {
+        _viewEvents.post(ReleaseNotesViewEvents.SelectPage(0))
+    }
+
+    override fun handle(action: ReleaseNotesAction) {
+        when (action) {
+            is ReleaseNotesAction.NextPressed -> handleNextPressed(action)
+            is ReleaseNotesAction.PageSelected -> handlePageSelected(action)
+        }
+    }
+
+    private fun handlePageSelected(action: ReleaseNotesAction.PageSelected) {
+        selectedPageIndex = action.selectedPageIndex
+    }
+
+    private fun handleNextPressed(action: ReleaseNotesAction.NextPressed) {
+        if (action.isLastItemSelected) {
+            _viewEvents.post(ReleaseNotesViewEvents.Close)
+        } else {
+            _viewEvents.post(ReleaseNotesViewEvents.SelectPage(++selectedPageIndex))
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
index 71a24da5ae..014b9f0504 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
@@ -26,6 +26,7 @@ import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityThreadsBinding
+import im.vector.app.features.MainActivity
 import im.vector.app.features.analytics.extensions.toAnalyticsInteraction
 import im.vector.app.features.analytics.plan.Interaction
 import im.vector.app.features.home.AvatarRenderer
@@ -34,13 +35,13 @@ import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.threads.arguments.ThreadListArgs
 import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
 import im.vector.app.features.home.room.threads.list.views.ThreadListFragment
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
 
-    @Inject
-    lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var avatarRenderer: AvatarRenderer
 
 //    private val roomThreadDetailFragment: RoomThreadDetailFragment?
 //        get() {
@@ -129,8 +130,8 @@ class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
         return DisplayFragment.ErrorFragment
     }
 
-    private fun getThreadTimelineArgs(): ThreadTimelineArgs? = intent?.extras?.getParcelable(THREAD_TIMELINE_ARGS)
-    private fun getThreadListArgs(): ThreadListArgs? = intent?.extras?.getParcelable(THREAD_LIST_ARGS)
+    private fun getThreadTimelineArgs(): ThreadTimelineArgs? = intent?.extras?.getParcelableCompat(THREAD_TIMELINE_ARGS)
+    private fun getThreadListArgs(): ThreadListArgs? = intent?.extras?.getParcelableCompat(THREAD_LIST_ARGS)
     private fun getEventIdToNavigate(): String? = intent?.extras?.getString(THREAD_EVENT_ID_TO_NAVIGATE)
 
     companion object {
@@ -143,13 +144,20 @@ class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
                 context: Context,
                 threadTimelineArgs: ThreadTimelineArgs?,
                 threadListArgs: ThreadListArgs?,
-                eventIdToNavigate: String? = null
+                eventIdToNavigate: String? = null,
+                firstStartMainActivity: Boolean = false
         ): Intent {
-            return Intent(context, ThreadsActivity::class.java).apply {
+            val intent = Intent(context, ThreadsActivity::class.java).apply {
                 putExtra(THREAD_TIMELINE_ARGS, threadTimelineArgs)
                 putExtra(THREAD_EVENT_ID_TO_NAVIGATE, eventIdToNavigate)
                 putExtra(THREAD_LIST_ARGS, threadListArgs)
             }
+
+            return if (firstStartMainActivity) {
+                MainActivity.getIntentWithNextIntent(context, intent)
+            } else {
+                intent
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListController.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListController.kt
index 14098fd8b0..3cbe652076 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListController.kt
@@ -19,24 +19,18 @@ package im.vector.app.features.home.room.threads.list.viewmodel
 import com.airbnb.epoxy.EpoxyController
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
-import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter
 import im.vector.app.features.home.room.threads.list.model.threadListItem
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummary
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
 import org.matrix.android.sdk.api.util.toMatrixItem
-import org.matrix.android.sdk.api.util.toMatrixItemOrNull
 import javax.inject.Inject
 
 class ThreadListController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
-        private val stringProvider: StringProvider,
         private val dateFormatter: VectorDateFormatter,
         private val displayableEventFormatter: DisplayableEventFormatter,
-        private val session: Session
 ) : EpoxyController() {
 
     var listener: Listener? = null
@@ -48,64 +42,7 @@ class ThreadListController @Inject constructor(
         requestModelBuild()
     }
 
-    override fun buildModels() =
-            when (session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreading) {
-                true -> buildThreadSummaries()
-                false -> buildThreadList()
-            }
-
-    /**
-     * Building thread summaries when homeserver supports threading.
-     */
-    private fun buildThreadSummaries() {
-        val safeViewState = viewState ?: return
-        val host = this
-        safeViewState.threadSummaryList.invoke()
-                ?.filter {
-                    if (safeViewState.shouldFilterThreads) {
-                        it.isUserParticipating
-                    } else {
-                        true
-                    }
-                }
-                ?.forEach { threadSummary ->
-                    val date = dateFormatter.format(threadSummary.latestEvent?.originServerTs, DateFormatKind.ROOM_LIST)
-                    val lastMessageFormatted = threadSummary.let {
-                        displayableEventFormatter.formatThreadSummary(
-                                event = it.latestEvent,
-                                latestEdition = it.threadEditions.latestThreadEdition
-                        ).toString()
-                    }
-                    val rootMessageFormatted = threadSummary.let {
-                        displayableEventFormatter.formatThreadSummary(
-                                event = it.rootEvent,
-                                latestEdition = it.threadEditions.rootThreadEdition
-                        ).toString()
-                    }
-                    threadListItem {
-                        id(threadSummary.rootEvent?.eventId)
-                        avatarRenderer(host.avatarRenderer)
-                        matrixItem(threadSummary.rootThreadSenderInfo.toMatrixItem())
-                        title(threadSummary.rootThreadSenderInfo.displayName.orEmpty())
-                        date(date)
-                        rootMessageDeleted(threadSummary.rootEvent?.isRedacted() ?: false)
-                        // TODO refactor notifications that with the new thread summary
-                        threadNotificationState(threadSummary.rootEvent?.threadDetails?.threadNotificationState ?: ThreadNotificationState.NO_NEW_MESSAGE)
-                        rootMessage(rootMessageFormatted)
-                        lastMessage(lastMessageFormatted)
-                        lastMessageCounter(threadSummary.numberOfThreads.toString())
-                        lastMessageMatrixItem(threadSummary.latestThreadSenderInfo.toMatrixItemOrNull())
-                        itemClickListener {
-                            host.listener?.onThreadSummaryClicked(threadSummary)
-                        }
-                    }
-                }
-    }
-
-    /**
-     * Building local thread list when homeserver do not support threading.
-     */
-    private fun buildThreadList() {
+    override fun buildModels() {
         val safeViewState = viewState ?: return
         val host = this
         safeViewState.rootThreadEventList.invoke()
@@ -152,7 +89,6 @@ class ThreadListController @Inject constructor(
     }
 
     interface Listener {
-        fun onThreadSummaryClicked(threadSummary: ThreadSummary)
         fun onThreadListClicked(timelineEvent: TimelineEvent)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListPagedController.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListPagedController.kt
new file mode 100644
index 0000000000..171b690a33
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListPagedController.kt
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+package im.vector.app.features.home.room.threads.list.viewmodel
+
+import com.airbnb.epoxy.EpoxyModel
+import com.airbnb.epoxy.paging.PagedListEpoxyController
+import im.vector.app.core.date.DateFormatKind
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.utils.createUIHandler
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter
+import im.vector.app.features.home.room.threads.list.model.ThreadListItem_
+import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummary
+import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItemOrNull
+import javax.inject.Inject
+
+class ThreadListPagedController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val dateFormatter: VectorDateFormatter,
+        private val displayableEventFormatter: DisplayableEventFormatter,
+) : PagedListEpoxyController<ThreadSummary>(
+        // Important it must match the PageList builder notify Looper
+        modelBuildingHandler = createUIHandler()
+) {
+
+    var listener: Listener? = null
+
+    override fun buildItemModel(currentPosition: Int, item: ThreadSummary?): EpoxyModel<*> {
+        if (item == null) {
+            throw java.lang.NullPointerException()
+        }
+        val host = this
+        val date = dateFormatter.format(item.latestEvent?.originServerTs, DateFormatKind.ROOM_LIST)
+        val lastMessageFormatted = item.let {
+            displayableEventFormatter.formatThreadSummary(
+                    event = it.latestEvent,
+                    latestEdition = it.threadEditions.latestThreadEdition
+            ).toString()
+        }
+        val rootMessageFormatted = item.let {
+            displayableEventFormatter.formatThreadSummary(
+                    event = it.rootEvent,
+                    latestEdition = it.threadEditions.rootThreadEdition
+            ).toString()
+        }
+
+        return ThreadListItem_()
+                .id(item.rootEvent?.eventId)
+                .avatarRenderer(host.avatarRenderer)
+                .matrixItem(item.rootThreadSenderInfo.toMatrixItem())
+                .title(item.rootThreadSenderInfo.displayName.orEmpty())
+                .date(date)
+                .rootMessageDeleted(item.rootEvent?.isRedacted() ?: false)
+                // TODO refactor notifications that with the new thread summary
+                .threadNotificationState(item.rootEvent?.threadDetails?.threadNotificationState ?: ThreadNotificationState.NO_NEW_MESSAGE)
+                .rootMessage(rootMessageFormatted)
+                .lastMessage(lastMessageFormatted)
+                .lastMessageCounter(item.numberOfThreads.toString())
+                .lastMessageMatrixItem(item.latestThreadSenderInfo.toMatrixItemOrNull())
+                .itemClickListener {
+                    host.listener?.onThreadSummaryClicked(item)
+                }
+    }
+
+    interface Listener {
+        fun onThreadSummaryClicked(threadSummary: ThreadSummary)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
index 4b7af330fb..7124727bb7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
@@ -16,6 +16,11 @@
 
 package im.vector.app.features.home.room.threads.list.viewmodel
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import androidx.lifecycle.asFlow
+import androidx.paging.PagedList
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MavericksViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
@@ -29,23 +34,47 @@ import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.extensions.toAnalyticsInteraction
 import im.vector.app.features.analytics.plan.Interaction
 import im.vector.app.features.home.room.threads.list.views.ThreadListFragment
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.threads.FetchThreadsResult
+import org.matrix.android.sdk.api.session.room.threads.ThreadFilter
+import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummary
 import org.matrix.android.sdk.api.session.threads.ThreadTimelineEvent
 import org.matrix.android.sdk.flow.flow
 
 class ThreadListViewModel @AssistedInject constructor(
         @Assisted val initialState: ThreadListViewState,
         private val analyticsTracker: AnalyticsTracker,
-        private val session: Session
-) :
-        VectorViewModel<ThreadListViewState, EmptyAction, EmptyViewEvents>(initialState) {
+        private val session: Session,
+) : VectorViewModel<ThreadListViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     private val room = session.getRoom(initialState.roomId)
 
+    private val defaultPagedListConfig = PagedList.Config.Builder()
+            .setPageSize(20)
+            .setInitialLoadSizeHint(40)
+            .setEnablePlaceholders(false)
+            .setPrefetchDistance(10)
+            .build()
+
+    private var nextBatchId: String? = null
+    private var hasReachedEnd: Boolean = false
+    private var boundariesJob: Job? = null
+
+    private var livePagedList: LiveData<PagedList<ThreadSummary>>? = null
+    private val _threadsLivePagedList = MutableLiveData<PagedList<ThreadSummary>>()
+    val threadsLivePagedList: LiveData<PagedList<ThreadSummary>> = _threadsLivePagedList
+    private val internalPagedListObserver = Observer<PagedList<ThreadSummary>> {
+        _threadsLivePagedList.postValue(it)
+        setLoading(false)
+    }
+
     @AssistedFactory
     interface Factory {
         fun create(initialState: ThreadListViewState): ThreadListViewModel
@@ -54,7 +83,7 @@ class ThreadListViewModel @AssistedInject constructor(
     companion object : MavericksViewModelFactory<ThreadListViewModel, ThreadListViewState> {
 
         @JvmStatic
-        override fun create(viewModelContext: ViewModelContext, state: ThreadListViewState): ThreadListViewModel? {
+        override fun create(viewModelContext: ViewModelContext, state: ThreadListViewState): ThreadListViewModel {
             val fragment: ThreadListFragment = (viewModelContext as FragmentViewModelContext).fragment()
             return fragment.threadListViewModelFactory.create(state)
         }
@@ -72,7 +101,7 @@ class ThreadListViewModel @AssistedInject constructor(
     private fun fetchAndObserveThreads() {
         when (session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreading) {
             true -> {
-                fetchThreadList()
+                setLoading(true)
                 observeThreadSummaries()
             }
             false -> observeThreadsList()
@@ -82,14 +111,33 @@ class ThreadListViewModel @AssistedInject constructor(
     /**
      * Observing thread summaries when homeserver support threading.
      */
-    private fun observeThreadSummaries() {
-        room?.flow()
-                ?.liveThreadSummaries()
-                ?.map { room.threadsService().enhanceThreadWithEditions(it) }
-                ?.flowOn(room.coroutineDispatchers.io)
-                ?.execute { asyncThreads ->
-                    copy(threadSummaryList = asyncThreads)
-                }
+    private fun observeThreadSummaries() = withState { state ->
+        viewModelScope.launch {
+            nextBatchId = null
+            hasReachedEnd = false
+
+            livePagedList?.removeObserver(internalPagedListObserver)
+
+            room?.threadsService()
+                    ?.getPagedThreadsList(state.shouldFilterThreads, defaultPagedListConfig)?.let { result ->
+                        livePagedList = result.livePagedList
+
+                        livePagedList?.observeForever(internalPagedListObserver)
+
+                        boundariesJob = result.liveBoundaries.asFlow()
+                                .onEach {
+                                    if (it.endLoaded) {
+                                        if (!hasReachedEnd) {
+                                            fetchNextPage()
+                                        }
+                                    }
+                                }
+                                .launchIn(viewModelScope)
+                    }
+
+            setLoading(true)
+            fetchNextPage()
+        }
     }
 
     /**
@@ -111,14 +159,6 @@ class ThreadListViewModel @AssistedInject constructor(
                 }
     }
 
-    private fun fetchThreadList() {
-        viewModelScope.launch {
-            setLoading(true)
-            room?.threadsService()?.fetchThreadSummaries()
-            setLoading(false)
-        }
-    }
-
     private fun setLoading(isLoading: Boolean) {
         setState {
             copy(isLoading = isLoading)
@@ -132,5 +172,30 @@ class ThreadListViewModel @AssistedInject constructor(
         setState {
             copy(shouldFilterThreads = shouldFilterThreads)
         }
+
+        fetchAndObserveThreads()
+    }
+
+    private suspend fun fetchNextPage() {
+        val filter = when (awaitState().shouldFilterThreads) {
+            true -> ThreadFilter.PARTICIPATED
+            false -> ThreadFilter.ALL
+        }
+        room?.threadsService()?.fetchThreadList(
+                nextBatchId = nextBatchId,
+                limit = defaultPagedListConfig.pageSize,
+                filter = filter,
+        ).let { result ->
+            when (result) {
+                is FetchThreadsResult.ReachedEnd -> {
+                    hasReachedEnd = true
+                }
+                is FetchThreadsResult.ShouldFetchMore -> {
+                    nextBatchId = result.nextBatch
+                }
+                else -> {
+                }
+            }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewState.kt
index 2328da0b8a..60ccfb59af 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewState.kt
@@ -20,11 +20,9 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.Uninitialized
 import im.vector.app.features.home.room.threads.arguments.ThreadListArgs
-import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummary
 import org.matrix.android.sdk.api.session.threads.ThreadTimelineEvent
 
 data class ThreadListViewState(
-        val threadSummaryList: Async<List<ThreadSummary>> = Uninitialized,
         val rootThreadEventList: Async<List<ThreadTimelineEvent>> = Uninitialized,
         val shouldFilterThreads: Boolean = false,
         val isLoading: Boolean = false,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
index aaa9846c39..318c250906 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
@@ -26,6 +26,7 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -39,6 +40,7 @@ import im.vector.app.features.home.room.threads.ThreadsActivity
 import im.vector.app.features.home.room.threads.arguments.ThreadListArgs
 import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
 import im.vector.app.features.home.room.threads.list.viewmodel.ThreadListController
+import im.vector.app.features.home.room.threads.list.viewmodel.ThreadListPagedController
 import im.vector.app.features.home.room.threads.list.viewmodel.ThreadListViewModel
 import im.vector.app.features.home.room.threads.list.viewmodel.ThreadListViewState
 import im.vector.app.features.rageshake.BugReporter
@@ -48,15 +50,19 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.MatrixItem
 import javax.inject.Inject
 
-class ThreadListFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer,
-        private val bugReporter: BugReporter,
-        private val threadListController: ThreadListController,
-        val threadListViewModelFactory: ThreadListViewModel.Factory
-) : VectorBaseFragment<FragmentThreadListBinding>(),
+@AndroidEntryPoint
+class ThreadListFragment :
+        VectorBaseFragment<FragmentThreadListBinding>(),
+        ThreadListPagedController.Listener,
         ThreadListController.Listener,
         VectorMenuProvider {
 
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var bugReporter: BugReporter
+    @Inject lateinit var threadListController: ThreadListPagedController
+    @Inject lateinit var legacyThreadListController: ThreadListController
+    @Inject lateinit var threadListViewModelFactory: ThreadListViewModel.Factory
+
     private val threadListViewModel: ThreadListViewModel by fragmentViewModel()
 
     private val threadListArgs: ThreadListArgs by args()
@@ -75,7 +81,7 @@ class ThreadListFragment @Inject constructor(
     override fun handlePostCreateMenu(menu: Menu) {
         // We use a custom layout for this menu item, so we need to set a ClickListener
         menu.findItem(R.id.menu_thread_list_filter)?.let { menuItem ->
-            menuItem.actionView.debouncedClicks {
+            menuItem.actionView?.debouncedClicks {
                 handleMenuItemSelected(menuItem)
             }
         }
@@ -93,11 +99,11 @@ class ThreadListFragment @Inject constructor(
 
     override fun handlePrepareMenu(menu: Menu) {
         withState(threadListViewModel) { state ->
-            val filterIcon = menu.findItem(R.id.menu_thread_list_filter).actionView
+            val filterIcon = menu.findItem(R.id.menu_thread_list_filter).actionView ?: return@withState
             val filterBadge = filterIcon.findViewById<View>(R.id.threadListFilterBadge)
             filterBadge.isVisible = state.shouldFilterThreads
             when (threadListViewModel.canHomeserverUseThreading()) {
-                true -> menu.findItem(R.id.menu_thread_list_filter).isVisible = !state.threadSummaryList.invoke().isNullOrEmpty()
+                true -> menu.findItem(R.id.menu_thread_list_filter).isVisible = true
                 false -> menu.findItem(R.id.menu_thread_list_filter).isVisible = !state.rootThreadEventList.invoke().isNullOrEmpty()
             }
         }
@@ -108,8 +114,18 @@ class ThreadListFragment @Inject constructor(
         initToolbar()
         initTextConstants()
         initBetaFeedback()
-        views.threadListRecyclerView.configureWith(threadListController, TimelineItemAnimator(), hasFixedSize = false)
-        threadListController.listener = this
+
+        if (threadListViewModel.canHomeserverUseThreading()) {
+            views.threadListRecyclerView.configureWith(threadListController, TimelineItemAnimator(), hasFixedSize = false)
+            threadListController.listener = this
+
+            threadListViewModel.threadsLivePagedList.observe(viewLifecycleOwner) { threadsList ->
+                threadListController.submitList(threadsList)
+            }
+        } else {
+            views.threadListRecyclerView.configureWith(legacyThreadListController, TimelineItemAnimator(), hasFixedSize = false)
+            legacyThreadListController.listener = this
+        }
     }
 
     override fun onDestroyView() {
@@ -141,7 +157,9 @@ class ThreadListFragment @Inject constructor(
     override fun invalidate() = withState(threadListViewModel) { state ->
         invalidateOptionsMenu()
         renderEmptyStateIfNeeded(state)
-        threadListController.update(state)
+        if (!threadListViewModel.canHomeserverUseThreading()) {
+            legacyThreadListController.update(state)
+        }
         renderLoaderIfNeeded(state)
     }
 
@@ -182,7 +200,7 @@ class ThreadListFragment @Inject constructor(
 
     private fun renderEmptyStateIfNeeded(state: ThreadListViewState) {
         when (threadListViewModel.canHomeserverUseThreading()) {
-            true -> views.threadListEmptyConstraintLayout.isVisible = state.threadSummaryList.invoke().isNullOrEmpty()
+            true -> views.threadListEmptyConstraintLayout.isVisible = false
             false -> views.threadListEmptyConstraintLayout.isVisible = state.rootThreadEventList.invoke().isNullOrEmpty()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
index 4eca377e28..636c557da9 100644
--- a/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
@@ -16,29 +16,36 @@
 
 package im.vector.app.features.homeserver
 
-import android.content.Context
+import android.content.SharedPreferences
 import androidx.core.content.edit
 import im.vector.app.R
-import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.di.DefaultPreferences
+import im.vector.app.core.resources.StringProvider
+import javax.inject.Inject
 
 /**
  * Object to store and retrieve home and identity server urls.
  */
-object ServerUrlsRepository {
+class ServerUrlsRepository @Inject constructor(
+        @DefaultPreferences
+        private val sharedPreferences: SharedPreferences,
+        private val stringProvider: StringProvider,
+) {
+    companion object {
+        // Keys used to store default servers urls from the referrer
+        private const val DEFAULT_REFERRER_HOME_SERVER_URL_PREF = "default_referrer_home_server_url"
+        private const val DEFAULT_REFERRER_IDENTITY_SERVER_URL_PREF = "default_referrer_identity_server_url"
 
-    // Keys used to store default servers urls from the referrer
-    private const val DEFAULT_REFERRER_HOME_SERVER_URL_PREF = "default_referrer_home_server_url"
-    private const val DEFAULT_REFERRER_IDENTITY_SERVER_URL_PREF = "default_referrer_identity_server_url"
-
-    // Keys used to store current homeserver url and identity url
-    const val HOME_SERVER_URL_PREF = "home_server_url"
-    const val IDENTITY_SERVER_URL_PREF = "identity_server_url"
+        // Keys used to store current homeserver url and identity url
+        const val HOME_SERVER_URL_PREF = "home_server_url"
+        const val IDENTITY_SERVER_URL_PREF = "identity_server_url"
+    }
 
     /**
      * Save home and identity sever urls received by the Referrer receiver.
      */
-    fun setDefaultUrlsFromReferrer(context: Context, homeServerUrl: String, identityServerUrl: String) {
-        DefaultSharedPreferences.getInstance(context)
+    fun setDefaultUrlsFromReferrer(homeServerUrl: String, identityServerUrl: String) {
+        sharedPreferences
                 .edit {
                     if (homeServerUrl.isNotEmpty()) {
                         putString(DEFAULT_REFERRER_HOME_SERVER_URL_PREF, homeServerUrl)
@@ -53,8 +60,8 @@ object ServerUrlsRepository {
     /**
      * Save home and identity sever urls entered by the user. May be custom or default value.
      */
-    fun saveServerUrls(context: Context, homeServerUrl: String, identityServerUrl: String) {
-        DefaultSharedPreferences.getInstance(context)
+    fun saveServerUrls(homeServerUrl: String, identityServerUrl: String) {
+        sharedPreferences
                 .edit {
                     putString(HOME_SERVER_URL_PREF, homeServerUrl)
                     putString(IDENTITY_SERVER_URL_PREF, identityServerUrl)
@@ -64,14 +71,12 @@ object ServerUrlsRepository {
     /**
      * Return last used homeserver url, or the default one from referrer or the default one from resources.
      */
-    fun getLastHomeServerUrl(context: Context): String {
-        val prefs = DefaultSharedPreferences.getInstance(context)
-
-        return prefs.getString(
+    fun getLastHomeServerUrl(): String {
+        return sharedPreferences.getString(
                 HOME_SERVER_URL_PREF,
-                prefs.getString(
+                sharedPreferences.getString(
                         DEFAULT_REFERRER_HOME_SERVER_URL_PREF,
-                        getDefaultHomeServerUrl(context)
+                        getDefaultHomeServerUrl()
                 )!!
         )!!
     }
@@ -79,10 +84,10 @@ object ServerUrlsRepository {
     /**
      * Return true if url is the default homeserver url form resources.
      */
-    fun isDefaultHomeServerUrl(context: Context, url: String) = url == getDefaultHomeServerUrl(context)
+    fun isDefaultHomeServerUrl(url: String) = url == getDefaultHomeServerUrl()
 
     /**
      * Return default homeserver url from resources.
      */
-    fun getDefaultHomeServerUrl(context: Context): String = context.getString(R.string.matrix_org_server_url)
+    fun getDefaultHomeServerUrl() = stringProvider.getString(R.string.matrix_org_server_url)
 }
diff --git a/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
index 725f23cddd..21fcbffb03 100644
--- a/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
@@ -27,24 +27,36 @@ package im.vector.app.features.html
 
 import android.content.Context
 import android.content.res.Resources
+import android.graphics.Typeface
+import android.graphics.drawable.Drawable
 import android.text.Spannable
 import androidx.core.text.toSpannable
+import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.request.target.Target
+import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.settings.VectorPreferences
 import io.noties.markwon.AbstractMarkwonPlugin
 import io.noties.markwon.Markwon
 import io.noties.markwon.MarkwonPlugin
+import io.noties.markwon.MarkwonSpansFactory
 import io.noties.markwon.PrecomputedFutureTextSetterCompat
 import io.noties.markwon.ext.latex.JLatexMathPlugin
 import io.noties.markwon.ext.latex.JLatexMathTheme
 import io.noties.markwon.html.HtmlPlugin
+import io.noties.markwon.image.AsyncDrawable
+import io.noties.markwon.image.glide.GlideImagesPlugin
 import io.noties.markwon.inlineparser.EntityInlineProcessor
 import io.noties.markwon.inlineparser.HtmlInlineProcessor
 import io.noties.markwon.inlineparser.MarkwonInlineParser
 import io.noties.markwon.inlineparser.MarkwonInlineParserPlugin
+import me.gujun.android.span.style.CustomTypefaceSpan
+import org.commonmark.node.Emphasis
 import org.commonmark.node.Node
 import org.commonmark.parser.Parser
+import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -53,7 +65,8 @@ import javax.inject.Singleton
 class EventHtmlRenderer @Inject constructor(
         htmlConfigure: MatrixHtmlPluginConfigure,
         context: Context,
-        vectorPreferences: VectorPreferences
+        vectorPreferences: VectorPreferences,
+        private val activeSessionHolder: ActiveSessionHolder
 ) {
 
     interface PostProcessor {
@@ -62,6 +75,23 @@ class EventHtmlRenderer @Inject constructor(
 
     private val builder = Markwon.builder(context)
             .usePlugin(HtmlPlugin.create(htmlConfigure))
+            .usePlugin(GlideImagesPlugin.create(object : GlideImagesPlugin.GlideStore {
+                override fun load(drawable: AsyncDrawable): RequestBuilder<Drawable> {
+                    val url = drawable.destination
+                    if (url.isMxcUrl()) {
+                        val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
+                        val imageUrl = contentUrlResolver.resolveFullSize(url)
+                        // Override size to avoid crashes for huge pictures
+                        return Glide.with(context).load(imageUrl).override(500)
+                    }
+                    // We don't want to support other url schemes here, so just return a request for null
+                    return Glide.with(context).load(null as String?)
+                }
+
+                override fun cancel(target: Target<*>) {
+                    Glide.with(context).clear(target)
+                }
+            }))
 
     private val markwon = if (vectorPreferences.latexMathsIsEnabled()) {
         // If latex maths is enabled in app preferences, refomat it so Markwon recognises it
@@ -97,6 +127,12 @@ class EventHtmlRenderer @Inject constructor(
                     )
             )
             .usePlugin(object : AbstractMarkwonPlugin() {
+                override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) {
+                    builder.setFactory(
+                            Emphasis::class.java
+                    ) { _, _ -> CustomTypefaceSpan(Typeface.create(Typeface.DEFAULT, Typeface.ITALIC)) }
+                }
+
                 override fun configureParser(builder: Parser.Builder) {
                     /* Configuring the Markwon block formatting processor.
                      * Default settings are all Markdown blocks. Turn those off.
diff --git a/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt b/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
index 5f20b7278e..f6e10a6df9 100644
--- a/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
@@ -27,7 +27,7 @@ import im.vector.app.core.glide.GlideApp
 import im.vector.app.features.home.AvatarRenderer
 import io.noties.markwon.core.spans.LinkSpan
 import org.matrix.android.sdk.api.session.getRoomSummary
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -83,6 +83,20 @@ class PillsPostProcessor @AssistedInject constructor(
             val pillSpan = linkSpan.createPillSpan(roomId) ?: return@forEach
             val startSpan = renderedText.getSpanStart(linkSpan)
             val endSpan = renderedText.getSpanEnd(linkSpan)
+            // GlideImagesPlugin causes duplicated pills if we have a nested spans in the pill span,
+            // such as images or italic text.
+            // Accordingly, it's better to remove all spans that are contained in this span before rendering.
+            renderedText.getSpans(startSpan, endSpan, Any::class.java).forEach remove@{
+                if (it !is LinkSpan) {
+                    // Make sure to only remove spans that are contained in this link, and not are bigger than this link, e.g. like reply-blocks
+                    val start = renderedText.getSpanStart(it)
+                    if (start < startSpan) return@remove
+                    val end = renderedText.getSpanEnd(it)
+                    if (end > endSpan) return@remove
+
+                    renderedText.removeSpan(it)
+                }
+            }
             addPillSpan(renderedText, pillSpan, startSpan, endSpan)
         }
     }
@@ -101,7 +115,7 @@ class PillsPostProcessor @AssistedInject constructor(
 
     private fun PermalinkData.UserLink.toMatrixItem(roomId: String?): MatrixItem? =
             if (roomId == null) {
-                sessionHolder.getSafeActiveSession()?.getUser(userId)?.toMatrixItem()
+                sessionHolder.getSafeActiveSession()?.getUserOrDefault(userId)?.toMatrixItem()
             } else {
                 sessionHolder.getSafeActiveSession()?.roomService()?.getRoomMember(userId, roomId)?.toMatrixItem()
             }
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
index 883c879e90..7f514d2ad2 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
@@ -27,7 +27,6 @@ import com.airbnb.mvrx.viewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.platform.SimpleFragmentActivity
@@ -47,7 +46,6 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.failure.Failure
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
 @Parcelize
 data class InviteUsersToRoomArgs(val roomId: String) : Parcelable
@@ -57,7 +55,6 @@ class InviteUsersToRoomActivity : SimpleFragmentActivity() {
 
     private val viewModel: InviteUsersToRoomViewModel by viewModel()
     private lateinit var sharedActionViewModel: UserListSharedActionViewModel
-    @Inject lateinit var errorFormatter: ErrorFormatter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -68,6 +65,7 @@ class InviteUsersToRoomActivity : SimpleFragmentActivity() {
         sharedActionViewModel
                 .stream()
                 .onEach { sharedAction ->
+                    @Suppress("DEPRECATION")
                     when (sharedAction) {
                         UserListSharedAction.Close -> finish()
                         UserListSharedAction.GoBack -> onBackPressed()
diff --git a/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt b/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
index 32b4bf3f12..26024148f4 100644
--- a/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
+++ b/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.lifecycle
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.ActivityManager
 import android.app.Application
@@ -34,6 +33,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.util.getPackageInfoCompat
 import timber.log.Timber
 
 class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager: PopupAlertManager) : Application.ActivityLifecycleCallbacks {
@@ -59,6 +60,26 @@ class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager
     override fun onActivityStopped(activity: Activity) {}
 
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        if (activitiesInfo.isEmpty()) {
+            val context = activity.applicationContext
+            val packageManager: PackageManager = context.packageManager
+
+            // Get all activities from element android
+            activitiesInfo = packageManager.getPackageInfoCompat(context.packageName, PackageManager.GET_ACTIVITIES).activities
+
+            // Get all activities from PermissionController module
+            // See https://source.android.com/docs/core/architecture/modular-system/permissioncontroller#package-format
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) {
+                activitiesInfo += tryOrNull {
+                    packageManager.getPackageInfoCompat("com.google.android.permissioncontroller", PackageManager.GET_ACTIVITIES).activities
+                } ?: tryOrNull {
+                    packageManager.getModuleInfo("com.google.android.permission", 1).packageName?.let {
+                        packageManager.getPackageInfoCompat(it, PackageManager.GET_ACTIVITIES or PackageManager.MATCH_APEX).activities
+                    }
+                }.orEmpty()
+            }
+        }
+
         // restart the app if the task contains an unknown activity
         coroutineScope.launch {
             val isTaskCorrupted = try {
@@ -91,16 +112,8 @@ class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager
      *
      * @return true if an app task is corrupted by a potentially malicious activity
      */
-    @SuppressLint("NewApi")
-    @Suppress("DEPRECATION")
     private suspend fun isTaskCorrupted(activity: Activity): Boolean = withContext(Dispatchers.Default) {
         val context = activity.applicationContext
-        val packageManager: PackageManager = context.packageManager
-
-        // Get all activities from app manifest
-        if (activitiesInfo.isEmpty()) {
-            activitiesInfo = packageManager.getPackageInfo(context.packageName, PackageManager.GET_ACTIVITIES).activities
-        }
 
         // Get all running activities on app task
         // and compare to activities declared in manifest
@@ -120,11 +133,12 @@ class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager
             // This was present in ActivityManager.RunningTaskInfo class since API level 1!
             // and it is inherited from TaskInfo since Android Q (API level 29).
             // API 29 changes : https://developer.android.com/sdk/api_diff/29/changes/android.app.ActivityManager.RunningTaskInfo
+            @Suppress("DEPRECATION")
             manager.getRunningTasks(10).any { runningTaskInfo ->
                 runningTaskInfo.topActivity?.let {
                     // Check whether the activity task affinity matches with app task affinity.
                     // The activity is considered safe when its task affinity doesn't correspond to app task affinity.
-                    if (packageManager.getActivityInfo(it, 0).taskAffinity == context.applicationInfo.taskAffinity) {
+                    if (context.packageManager.getActivityInfo(it, 0).taskAffinity == context.applicationInfo.taskAffinity) {
                         isPotentialMaliciousActivity(it)
                     } else false
                 } ?: false
diff --git a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
index 0bdec53f60..1ca67e1fb7 100644
--- a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
@@ -24,8 +24,6 @@ import com.airbnb.mvrx.viewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.toast
@@ -46,8 +44,6 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class LinkHandlerActivity : VectorBaseActivity<ActivityProgressBinding>() {
 
-    @Inject lateinit var sessionHolder: ActiveSessionHolder
-    @Inject lateinit var errorFormatter: ErrorFormatter
     @Inject lateinit var permalinkHandler: PermalinkHandler
 
     private val startAppViewModel: StartAppViewModel by viewModel()
@@ -103,7 +99,7 @@ class LinkHandlerActivity : VectorBaseActivity<ActivityProgressBinding>() {
     }
 
     private fun handleConfigUrl(uri: Uri) {
-        if (sessionHolder.hasActiveSession()) {
+        if (activeSessionHolder.hasActiveSession()) {
             displayAlreadyLoginPopup(uri)
         } else {
             // user is not yet logged in, this is the nominal case
@@ -114,7 +110,7 @@ class LinkHandlerActivity : VectorBaseActivity<ActivityProgressBinding>() {
     private fun handleSupportedHostUrl() {
         // If we are not logged in, open login screen.
         // In the future, we might want to relaunch the process after login.
-        if (!sessionHolder.hasActiveSession()) {
+        if (!activeSessionHolder.hasActiveSession()) {
             startLoginActivity()
             return
         }
@@ -152,7 +148,7 @@ class LinkHandlerActivity : VectorBaseActivity<ActivityProgressBinding>() {
     }
 
     private fun safeSignout(uri: Uri) {
-        val session = sessionHolder.getSafeActiveSession()
+        val session = activeSessionHolder.getSafeActiveSession()
         if (session == null) {
             // Should not happen
             startLoginActivity(uri)
@@ -161,7 +157,7 @@ class LinkHandlerActivity : VectorBaseActivity<ActivityProgressBinding>() {
                 try {
                     session.signOutService().signOut(true)
                     Timber.d("## displayAlreadyLoginPopup(): logout succeeded")
-                    sessionHolder.clearActiveSession()
+                    activeSessionHolder.clearActiveSession()
                     startLoginActivity(uri)
                 } catch (failure: Throwable) {
                     displayError(failure)
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt
index 9eddcad649..b4d2a1a565 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt
@@ -24,6 +24,7 @@ import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityLocationSharingBinding
 import im.vector.app.features.location.preview.LocationPreviewFragment
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -40,7 +41,7 @@ class LocationSharingActivity : VectorBaseActivity<ActivityLocationSharingBindin
     override fun getBinding() = ActivityLocationSharingBinding.inflate(layoutInflater)
 
     override fun initUiAndData() {
-        val locationSharingArgs: LocationSharingArgs? = intent?.extras?.getParcelable(EXTRA_LOCATION_SHARING_ARGS)
+        val locationSharingArgs: LocationSharingArgs? = intent?.extras?.getParcelableCompat(EXTRA_LOCATION_SHARING_ARGS)
         if (locationSharingArgs == null) {
             finish()
             return
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index d96410010e..779818b3d6 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -31,6 +31,7 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mapbox.mapboxsdk.maps.MapView
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.core.platform.VectorBaseFragment
@@ -53,15 +54,17 @@ import javax.inject.Inject
 /**
  * We should consider using SupportMapFragment for a out of the box lifecycle handling.
  */
-class LocationSharingFragment @Inject constructor(
-        private val urlMapProvider: UrlMapProvider,
-        private val avatarRenderer: AvatarRenderer,
-        private val matrixItemColorProvider: MatrixItemColorProvider,
-        private val vectorPreferences: VectorPreferences,
-) : VectorBaseFragment<FragmentLocationSharingBinding>(),
+@AndroidEntryPoint
+class LocationSharingFragment :
+        VectorBaseFragment<FragmentLocationSharingBinding>(),
         LocationTargetChangeListener,
         VectorBaseBottomSheetDialogFragment.ResultListener {
 
+    @Inject lateinit var urlMapProvider: UrlMapProvider
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var matrixItemColorProvider: MatrixItemColorProvider
+    @Inject lateinit var vectorPreferences: VectorPreferences
+
     private val viewModel: LocationSharingViewModel by fragmentViewModel()
 
     private val locationSharingNavigator: LocationSharingNavigator by lazy { DefaultLocationSharingNavigator(activity) }
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
index 28e37a38eb..cdef7d3302 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
@@ -40,7 +40,7 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.getRoom
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
@@ -83,7 +83,7 @@ class LocationSharingViewModel @AssistedInject constructor(
                 .distinctUntilChanged()
                 .setOnEach {
                     val powerLevelsHelper = PowerLevelsHelper(it)
-                    val canShareLiveLocation = EventType.STATE_ROOM_BEACON_INFO
+                    val canShareLiveLocation = EventType.STATE_ROOM_BEACON_INFO.values
                             .all { beaconInfoType ->
                                 powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, beaconInfoType)
                             }
@@ -101,7 +101,7 @@ class LocationSharingViewModel @AssistedInject constructor(
     }
 
     private fun setUserItem() {
-        setState { copy(userItem = session.getUser(session.myUserId)?.toMatrixItem()) }
+        setState { copy(userItem = session.getUserOrDefault(session.myUserId).toMatrixItem()) }
     }
 
     private fun updatePin(isUserPin: Boolean? = true) {
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewActivity.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewActivity.kt
index 149e80d81a..b6304c0b5a 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewActivity.kt
@@ -25,6 +25,7 @@ import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityLocationSharingBinding
 import im.vector.app.features.MainActivity
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -38,7 +39,7 @@ class LiveLocationMapViewActivity : VectorBaseActivity<ActivityLocationSharingBi
     override fun getBinding() = ActivityLocationSharingBinding.inflate(layoutInflater)
 
     override fun initUiAndData() {
-        val mapViewArgs: LiveLocationMapViewArgs? = intent?.extras?.getParcelable(EXTRA_LIVE_LOCATION_MAP_VIEW_ARGS)
+        val mapViewArgs: LiveLocationMapViewArgs? = intent?.extras?.getParcelableCompat(EXTRA_LIVE_LOCATION_MAP_VIEW_ARGS)
         if (mapViewArgs == null) {
             finish()
             return
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
index 85095e7c9f..942021dd64 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
@@ -62,7 +62,8 @@ import javax.inject.Inject
  * Screen showing a map with all the current users sharing their live location in a room.
  */
 @AndroidEntryPoint
-class LiveLocationMapViewFragment @Inject constructor() : VectorBaseFragment<FragmentLiveLocationMapViewBinding>() {
+class LiveLocationMapViewFragment :
+        VectorBaseFragment<FragmentLiveLocationMapViewBinding>() {
 
     @Inject lateinit var urlMapProvider: UrlMapProvider
     @Inject lateinit var bottomSheetController: LiveLocationBottomSheetController
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
index bab7f4c7f9..c108e83e76 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
@@ -79,10 +79,8 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
             }
         }
 
-        holder.timer.tickListener = object : CountUpTimer.TickListener {
-            override fun onTick(milliseconds: Long) {
-                holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
-            }
+        holder.timer.tickListener = CountUpTimer.TickListener {
+            holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
         }
         holder.timer.resume()
 
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt b/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt
index 77f8c30fd3..f4f4a462ce 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt
@@ -20,7 +20,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
 import im.vector.app.features.location.toLocationData
 import kotlinx.coroutines.suspendCancellableCoroutine
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
@@ -45,19 +45,17 @@ class UserLiveLocationViewStateMapper @Inject constructor(
                     else -> {
                         locationPinProvider.create(userId) { pinDrawable ->
                             val session = activeSessionHolder.getActiveSession()
-                            session.getUser(userId)?.toMatrixItem()?.let { matrixItem ->
-                                val locationTimestampMillis = liveLocationShareAggregatedSummary.lastLocationDataContent?.getBestTimestampMillis()
-                                val viewState = UserLiveLocationViewState(
-                                        matrixItem = matrixItem,
-                                        pinDrawable = pinDrawable,
-                                        locationData = locationData,
-                                        endOfLiveTimestampMillis = liveLocationShareAggregatedSummary.endOfLiveTimestampMillis,
-                                        locationTimestampMillis = locationTimestampMillis,
-                                        showStopSharingButton = userId == session.myUserId
-                                )
-                                continuation.resume(viewState) {
-                                    // do nothing on cancellation
-                                }
+                            val locationTimestampMillis = liveLocationShareAggregatedSummary.lastLocationDataContent?.getBestTimestampMillis()
+                            val viewState = UserLiveLocationViewState(
+                                    matrixItem = session.getUserOrDefault(userId).toMatrixItem(),
+                                    pinDrawable = pinDrawable,
+                                    locationData = locationData,
+                                    endOfLiveTimestampMillis = liveLocationShareAggregatedSummary.endOfLiveTimestampMillis,
+                                    locationTimestampMillis = locationTimestampMillis,
+                                    showStopSharingButton = userId == session.myUserId
+                            )
+                            continuation.resume(viewState) {
+                                // do nothing on cancellation
                             }
                         }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidService.kt b/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidService.kt
index 819ec8634e..d77a87f756 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidService.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidService.kt
@@ -21,14 +21,15 @@ import android.os.IBinder
 import android.os.Parcelable
 import androidx.core.app.NotificationManagerCompat
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.startForegroundCompat
 import im.vector.app.core.services.VectorAndroidService
 import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.LocationTracker
 import im.vector.app.features.location.live.GetLiveLocationShareSummaryUseCase
 import im.vector.app.features.redaction.CheckIfEventIsRedactedUseCase
 import im.vector.app.features.session.coroutineScope
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -95,7 +96,7 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         startInProgress = true
 
-        val roomArgs = intent?.getParcelableExtra(EXTRA_ROOM_ARGS) as? RoomArgs
+        val roomArgs = intent?.getParcelableExtraCompat(EXTRA_ROOM_ARGS) as? RoomArgs
 
         Timber.i("onStartCommand. sessionId - roomId ${roomArgs?.sessionId} - ${roomArgs?.roomId}")
 
@@ -105,7 +106,7 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
             if (foregroundModeStarted) {
                 NotificationManagerCompat.from(this).notify(FOREGROUND_SERVICE_NOTIFICATION_ID, notification)
             } else {
-                startForeground(FOREGROUND_SERVICE_NOTIFICATION_ID, notification)
+                startForegroundCompat(FOREGROUND_SERVICE_NOTIFICATION_ID, notification)
                 foregroundModeStarted = true
             }
 
@@ -124,10 +125,7 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
         val updateLiveResult = session
                 .getRoom(roomArgs.roomId)
                 ?.locationSharingService()
-                ?.startLiveLocationShare(
-                        timeoutMillis = roomArgs.durationMillis,
-                        description = getString(R.string.live_location_description)
-                )
+                ?.startLiveLocationShare(roomArgs.durationMillis)
 
         updateLiveResult
                 ?.let { result ->
@@ -191,7 +189,7 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
     }
 
     override fun onNoLocationProviderAvailable() {
-        stopForeground(true)
+        stopForegroundCompat()
         stopSelf()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt
index 8285d0156b..082cee02f0 100644
--- a/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt
@@ -27,6 +27,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.mapbox.mapboxsdk.maps.MapView
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.platform.VectorMenuProvider
@@ -43,12 +44,14 @@ import javax.inject.Inject
 /*
  * TODO Move locationPinProvider to a ViewModel
  */
-class LocationPreviewFragment @Inject constructor(
-        private val urlMapProvider: UrlMapProvider,
-        private val locationPinProvider: LocationPinProvider
-) : VectorBaseFragment<FragmentLocationPreviewBinding>(),
+@AndroidEntryPoint
+class LocationPreviewFragment :
+        VectorBaseFragment<FragmentLocationPreviewBinding>(),
         VectorMenuProvider {
 
+    @Inject lateinit var urlMapProvider: UrlMapProvider
+    @Inject lateinit var locationPinProvider: LocationPinProvider
+
     private val args: LocationSharingArgs by args()
 
     private val viewModel: LocationPreviewViewModel by fragmentViewModel()
diff --git a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
index 9512a518e8..6ee276342c 100644
--- a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
@@ -133,6 +133,7 @@ abstract class AbstractLoginFragment<VB : ViewBinding> : VectorBaseFragment<VB>(
                         .setMessage(R.string.login_signup_cancel_confirmation_content)
                         .setPositiveButton(R.string.yes) { _, _ ->
                             displayCancelDialog = false
+                            @Suppress("DEPRECATION")
                             vectorBaseActivity.onBackPressed()
                         }
                         .setNegativeButton(R.string.no, null)
@@ -147,6 +148,7 @@ abstract class AbstractLoginFragment<VB : ViewBinding> : VectorBaseFragment<VB>(
                         .setMessage(R.string.login_reset_password_cancel_confirmation_content)
                         .setPositiveButton(R.string.yes) { _, _ ->
                             displayCancelDialog = false
+                            @Suppress("DEPRECATION")
                             vectorBaseActivity.onBackPressed()
                         }
                         .setNegativeButton(R.string.no, null)
diff --git a/vector/src/main/java/im/vector/app/features/login/AbstractSSOLoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/AbstractSSOLoginFragment.kt
index 5ba4513fbe..77bcaed3fb 100644
--- a/vector/src/main/java/im/vector/app/features/login/AbstractSSOLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/AbstractSSOLoginFragment.kt
@@ -86,7 +86,7 @@ abstract class AbstractSSOLoginFragment<VB : ViewBinding> : AbstractLoginFragmen
 
     private fun prefetchIfNeeded() {
         withState(loginViewModel) { state ->
-            if (state.loginMode.hasSso() && state.loginMode.ssoIdentityProviders().isNullOrEmpty()) {
+            if (state.loginMode.hasSso() && state.loginMode.ssoState().isFallback()) {
                 // in this case we can prefetch (not other cases for privacy concerns)
                 loginViewModel.getSsoUrl(
                         redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
diff --git a/vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt b/vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt
index 955c3f7290..253c514e5a 100644
--- a/vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt
@@ -17,12 +17,13 @@
 package im.vector.app.features.login
 
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.network.ssl.Fingerprint
 import timber.log.Timber
 import javax.inject.Inject
 
 class HomeServerConnectionConfigFactory @Inject constructor() {
 
-    fun create(url: String?): HomeServerConnectionConfig? {
+    fun create(url: String?, fingerprint: Fingerprint? = null): HomeServerConnectionConfig? {
         if (url == null) {
             return null
         }
@@ -30,6 +31,13 @@ class HomeServerConnectionConfigFactory @Inject constructor() {
         return try {
             HomeServerConnectionConfig.Builder()
                     .withHomeServerUri(url)
+                    .run {
+                        if (fingerprint == null) {
+                            this
+                        } else {
+                            withAllowedFingerPrints(listOf(fingerprint))
+                        }
+                    }
                     .build()
         } catch (t: Throwable) {
             Timber.e(t)
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
index d28495a57e..c70e503d81 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
@@ -46,6 +46,7 @@ import im.vector.app.features.login.terms.LoginTermsFragmentArgument
 import im.vector.app.features.onboarding.AuthenticationDescription
 import im.vector.app.features.pin.UnlockedActivity
 import org.matrix.android.sdk.api.auth.SSOAction
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import org.matrix.android.sdk.api.auth.registration.FlowResult
 import org.matrix.android.sdk.api.auth.registration.Stage
 import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms
@@ -97,7 +98,7 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
         loginViewModel.observeViewEvents { handleLoginViewEvents(it) }
 
         // Get config extra
-        val loginConfig = intent.getParcelableExtra<LoginConfig?>(EXTRA_CONFIG)
+        val loginConfig = intent.getParcelableExtraCompat<LoginConfig?>(EXTRA_CONFIG)
         if (isFirstCreation()) {
             loginViewModel.handle(LoginAction.InitWith(loginConfig))
         }
@@ -318,7 +319,10 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
     }
 
     override fun onBackPressed() {
-        validateBackPressed { super.onBackPressed() }
+        validateBackPressed {
+            @Suppress("DEPRECATION")
+            super.onBackPressed()
+        }
     }
 
     private fun onRegistrationStageNotSupported() {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt
index 1b49f9bfa1..b082e37933 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt
@@ -33,6 +33,7 @@ import android.webkit.WebViewClient
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.utils.AssetReader
 import im.vector.app.databinding.FragmentLoginCaptchaBinding
@@ -51,9 +52,11 @@ data class LoginCaptchaFragmentArgument(
 /**
  * In this screen, the user is asked to confirm he is not a robot.
  */
-class LoginCaptchaFragment @Inject constructor(
-        private val assetReader: AssetReader
-) : AbstractLoginFragment<FragmentLoginCaptchaBinding>() {
+@AndroidEntryPoint
+class LoginCaptchaFragment :
+        AbstractLoginFragment<FragmentLoginCaptchaBinding>() {
+
+    @Inject lateinit var assetReader: AssetReader
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginCaptchaBinding {
         return FragmentLoginCaptchaBinding.inflate(inflater, container, false)
@@ -141,7 +144,6 @@ class LoginCaptchaFragment @Inject constructor(
                 // runOnUiThread(Runnable { finish() })
             }
 
-            @SuppressLint("NewApi")
             override fun onReceivedHttpError(view: WebView, request: WebResourceRequest, errorResponse: WebResourceResponse) {
                 super.onReceivedHttpError(view, request, errorResponse)
 
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
index d27fbf7693..9bdf2f593f 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
@@ -28,6 +28,7 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
@@ -43,7 +44,6 @@ import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.failure.isInvalidPassword
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
 /**
  * In this screen:
@@ -53,7 +53,9 @@ import javax.inject.Inject
  * In signup mode:
  * - the user is asked for login and password
  */
-class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLoginBinding>() {
+@AndroidEntryPoint
+class LoginFragment :
+        AbstractSSOLoginFragment<FragmentLoginBinding>() {
 
     private var isSignupMode = false
 
@@ -101,13 +103,11 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
         }
     }
 
-    private fun setupSocialLoginButtons(state: LoginViewState) {
-        views.loginSocialLoginButtons.mode = when (state.signMode) {
-            SignMode.Unknown -> error("developer error")
-            SignMode.SignUp -> SocialLoginButtonsView.Mode.MODE_SIGN_UP
-            SignMode.SignIn,
-            SignMode.SignInWithMatrixId -> SocialLoginButtonsView.Mode.MODE_SIGN_IN
-        }
+    private fun ssoMode(state: LoginViewState) = when (state.signMode) {
+        SignMode.Unknown -> error("developer error")
+        SignMode.SignUp -> SocialLoginButtonsView.Mode.MODE_SIGN_UP
+        SignMode.SignIn,
+        SignMode.SignInWithMatrixId -> SocialLoginButtonsView.Mode.MODE_SIGN_IN
     }
 
     private fun submit() {
@@ -202,17 +202,14 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
 
             if (state.loginMode is LoginMode.SsoAndPassword) {
                 views.loginSocialLoginContainer.isVisible = true
-                views.loginSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders?.sorted()
-                views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                    override fun onProviderSelected(provider: SsoIdentityProvider?) {
-                        loginViewModel.getSsoUrl(
-                                redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
-                                deviceId = state.deviceId,
-                                providerId = provider?.id,
-                                action = if (state.signMode == SignMode.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
-                        )
-                                ?.let { openInCustomTab(it) }
-                    }
+                views.loginSocialLoginButtons.render(state.loginMode.ssoState, ssoMode(state)) { provider ->
+                    loginViewModel.getSsoUrl(
+                            redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
+                            deviceId = state.deviceId,
+                            providerId = provider?.id
+                            action = if (state.signMode == SignMode.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
+                    )
+                            ?.let { openInCustomTab(it) }
                 }
             } else {
                 views.loginSocialLoginContainer.isVisible = false
@@ -274,7 +271,6 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
 
         setupUi(state)
         setupAutoFill(state)
-        setupSocialLoginButtons(state)
         setupButtons(state)
 
         when (state.asyncLoginAction) {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
index 07253d80ec..2bc8419989 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
@@ -29,6 +29,7 @@ import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.args
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.isEmail
@@ -41,7 +42,6 @@ import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.is401
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
 enum class TextInputFormFragmentMode {
     SetEmail,
@@ -59,7 +59,9 @@ data class LoginGenericTextInputFormFragmentArgument(
 /**
  * In this screen, the user is asked for a text input.
  */
-class LoginGenericTextInputFormFragment @Inject constructor() : AbstractLoginFragment<FragmentLoginGenericTextInputFormBinding>() {
+@AndroidEntryPoint
+class LoginGenericTextInputFormFragment :
+        AbstractLoginFragment<FragmentLoginGenericTextInputFormBinding>() {
 
     private val params: LoginGenericTextInputFormFragmentArgument by args()
 
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginMode.kt b/vector/src/main/java/im/vector/app/features/login/LoginMode.kt
index dd479c89c5..944b159441 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginMode.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginMode.kt
@@ -18,22 +18,21 @@ package im.vector.app.features.login
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 
 sealed class LoginMode : Parcelable { // Parcelable because persist state
 
     @Parcelize object Unknown : LoginMode()
     @Parcelize object Password : LoginMode()
-    @Parcelize data class Sso(val ssoIdentityProviders: List<SsoIdentityProvider>?) : LoginMode()
-    @Parcelize data class SsoAndPassword(val ssoIdentityProviders: List<SsoIdentityProvider>?) : LoginMode()
+    @Parcelize data class Sso(val ssoState: SsoState) : LoginMode()
+    @Parcelize data class SsoAndPassword(val ssoState: SsoState) : LoginMode()
     @Parcelize object Unsupported : LoginMode()
 }
 
-fun LoginMode.ssoIdentityProviders(): List<SsoIdentityProvider>? {
+fun LoginMode.ssoState(): SsoState {
     return when (this) {
-        is LoginMode.Sso -> ssoIdentityProviders
-        is LoginMode.SsoAndPassword -> ssoIdentityProviders
-        else -> null
+        is LoginMode.Sso -> ssoState
+        is LoginMode.SsoAndPassword -> ssoState
+        else -> SsoState.Fallback
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
index 1ca0774f54..87df2d9483 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
@@ -24,6 +24,7 @@ import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
@@ -36,12 +37,13 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
 /**
  * In this screen, the user is asked for email and new password to reset his password.
  */
-class LoginResetPasswordFragment @Inject constructor() : AbstractLoginFragment<FragmentLoginResetPasswordBinding>() {
+@AndroidEntryPoint
+class LoginResetPasswordFragment :
+        AbstractLoginFragment<FragmentLoginResetPasswordBinding>() {
 
     // Show warning only once
     private var showWarning = true
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
index 689e8ef6b7..c95a778860 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
@@ -22,15 +22,17 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.Fail
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.databinding.FragmentLoginResetPasswordMailConfirmationBinding
 import org.matrix.android.sdk.api.failure.is401
-import javax.inject.Inject
 
 /**
  * In this screen, the user is asked to check their email and to click on a button once it's done.
  */
-class LoginResetPasswordMailConfirmationFragment @Inject constructor() : AbstractLoginFragment<FragmentLoginResetPasswordMailConfirmationBinding>() {
+@AndroidEntryPoint
+class LoginResetPasswordMailConfirmationFragment :
+        AbstractLoginFragment<FragmentLoginResetPasswordMailConfirmationBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginResetPasswordMailConfirmationBinding {
         return FragmentLoginResetPasswordMailConfirmationBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt
index d2f1f620bd..e601f0512d 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt
@@ -20,13 +20,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.databinding.FragmentLoginResetPasswordSuccessBinding
-import javax.inject.Inject
 
 /**
  * In this screen, we confirm to the user that his password has been reset.
  */
-class LoginResetPasswordSuccessFragment @Inject constructor() : AbstractLoginFragment<FragmentLoginResetPasswordSuccessBinding>() {
+@AndroidEntryPoint
+class LoginResetPasswordSuccessFragment :
+        AbstractLoginFragment<FragmentLoginResetPasswordSuccessBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginResetPasswordSuccessBinding {
         return FragmentLoginResetPasswordSuccessBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
index 6c49bafbba..0813957e99 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
@@ -20,16 +20,18 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.utils.openUrlInChromeCustomTab
 import im.vector.app.databinding.FragmentLoginServerSelectionBinding
 import me.gujun.android.span.span
-import javax.inject.Inject
 
 /**
  * In this screen, the user will choose between matrix.org, modular or other type of homeserver.
  */
-class LoginServerSelectionFragment @Inject constructor() : AbstractLoginFragment<FragmentLoginServerSelectionBinding>() {
+@AndroidEntryPoint
+class LoginServerSelectionFragment :
+        AbstractLoginFragment<FragmentLoginServerSelectionBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginServerSelectionBinding {
         return FragmentLoginServerSelectionBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
index 937e1bdf55..aabe0c2f2f 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
@@ -27,6 +27,7 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.resources.BuildMeta
@@ -43,9 +44,11 @@ import javax.inject.Inject
 /**
  * In this screen, the user is prompted to enter a homeserver url.
  */
-class LoginServerUrlFormFragment @Inject constructor(
-        private val buildMeta: BuildMeta,
-) : AbstractLoginFragment<FragmentLoginServerUrlFormBinding>() {
+@AndroidEntryPoint
+class LoginServerUrlFormFragment :
+        AbstractLoginFragment<FragmentLoginServerUrlFormBinding>() {
+
+    @Inject lateinit var buildMeta: BuildMeta
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginServerUrlFormBinding {
         return FragmentLoginServerUrlFormBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
index d7b63d53fb..b9e2e5fca4 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
@@ -22,17 +22,21 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentLoginSignupSigninSelectionBinding
 import org.matrix.android.sdk.api.auth.SSOAction
 import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import javax.inject.Inject
+import im.vector.app.features.login.SocialLoginButtonsView.Mode
 
 /**
  * In this screen, the user is asked to sign up or to sign in to the homeserver.
  */
-class LoginSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLoginSignupSigninSelectionBinding>() {
+@AndroidEntryPoint
+class LoginSignUpSignInSelectionFragment :
+        AbstractSSOLoginFragment<FragmentLoginSignupSigninSelectionBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSignupSigninSelectionBinding {
         return FragmentLoginSignupSigninSelectionBinding.inflate(inflater, container, false)
@@ -74,17 +78,14 @@ class LoginSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOLogi
         when (state.loginMode) {
             is LoginMode.SsoAndPassword -> {
                 views.loginSignupSigninSignInSocialLoginContainer.isVisible = true
-                views.loginSignupSigninSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders()?.sorted()
-                views.loginSignupSigninSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                    override fun onProviderSelected(provider: SsoIdentityProvider?) {
-                        loginViewModel.getSsoUrl(
-                                redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
-                                deviceId = state.deviceId,
-                                providerId = provider?.id,
-                                action = if (state.signMode == SignMode.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
-                        )
-                                ?.let { openInCustomTab(it) }
-                    }
+                views.loginSignupSigninSocialLoginButtons.render(state.loginMode.ssoState(), Mode.MODE_CONTINUE) { provider ->
+                    loginViewModel.getSsoUrl(
+                            redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
+                            deviceId = state.deviceId,
+                            providerId = provider?.id
+                            action = if (state.signMode == SignMode.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
+                    )
+                            ?.let { openInCustomTab(it) }
                 }
             }
             else -> {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
index 7f5e87967b..dd563483ec 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
@@ -23,6 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.databinding.FragmentLoginSplashBinding
@@ -35,10 +36,12 @@ import javax.inject.Inject
 /**
  * In this screen, the user is viewing an introduction to what he can do with this application.
  */
-class LoginSplashFragment @Inject constructor(
-        private val vectorPreferences: VectorPreferences,
-        private val buildMeta: BuildMeta,
-) : AbstractLoginFragment<FragmentLoginSplashBinding>() {
+@AndroidEntryPoint
+class LoginSplashFragment :
+        AbstractLoginFragment<FragmentLoginSplashBinding>() {
+
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var buildMeta: BuildMeta
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSplashBinding {
         return FragmentLoginSplashBinding.inflate(inflater, container, false)
@@ -62,8 +65,7 @@ class LoginSplashFragment @Inject constructor(
             views.loginSplashVersion.isVisible = true
             @SuppressLint("SetTextI18n")
             views.loginSplashVersion.text = "Version : ${buildMeta.versionName}\n" +
-                    "Branch: ${buildMeta.gitBranchName}\n" +
-                    "Build: ${buildMeta.buildNumber}"
+                    "Branch: ${buildMeta.gitBranchName} ${buildMeta.gitRevision}"
             views.loginSplashVersion.debouncedClicks { navigator.openDebug(requireContext()) }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index 65b388bf99..aefaeceae7 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -30,9 +30,9 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
-import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.session.ConfigureAndStartSessionUseCase
 import im.vector.app.core.utils.ensureTrailingSlash
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -65,7 +65,8 @@ class LoginViewModel @AssistedInject constructor(
         private val homeServerConnectionConfigFactory: HomeServerConnectionConfigFactory,
         private val reAuthHelper: ReAuthHelper,
         private val stringProvider: StringProvider,
-        private val homeServerHistoryService: HomeServerHistoryService
+        private val homeServerHistoryService: HomeServerHistoryService,
+        private val configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase,
 ) : VectorViewModel<LoginViewState, LoginAction, LoginViewEvents>(initialState) {
 
     @AssistedFactory
@@ -224,7 +225,7 @@ class LoginViewModel @AssistedInject constructor(
         setState {
             copy(
                     signMode = SignMode.SignIn,
-                    loginMode = LoginMode.Sso(action.ssoIdentityProviders),
+                    loginMode = LoginMode.Sso(action.ssoIdentityProviders.toSsoState()),
                     homeServerUrlFromUser = action.homeServerUrl,
                     homeServerUrl = action.homeServerUrl,
                     deviceId = action.deviceId
@@ -733,7 +734,7 @@ class LoginViewModel @AssistedInject constructor(
         activeSessionHolder.setActiveSession(session)
 
         authenticationService.reset()
-        session.configureAndStart(applicationContext)
+        configureAndStartSessionUseCase.execute(session)
         setState {
             copy(
                     asyncLoginAction = Success(Unit)
@@ -817,8 +818,8 @@ class LoginViewModel @AssistedInject constructor(
             val loginMode = when {
                 // SSO login is taken first
                 data.supportedLoginTypes.contains(LoginFlowTypes.SSO) &&
-                        data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
-                data.supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(data.ssoIdentityProviders)
+                        data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders.toSsoState())
+                data.supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(data.ssoIdentityProviders.toSsoState())
                 data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.Password
                 else -> LoginMode.Unsupported
             }
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt
index 07251f52a2..c13769e9e9 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt
@@ -22,11 +22,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.databinding.FragmentLoginWaitForEmailBinding
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.failure.is401
-import javax.inject.Inject
 
 @Parcelize
 data class LoginWaitForEmailFragmentArgument(
@@ -36,7 +36,9 @@ data class LoginWaitForEmailFragmentArgument(
 /**
  * In this screen, the user is asked to check their emails.
  */
-class LoginWaitForEmailFragment @Inject constructor() : AbstractLoginFragment<FragmentLoginWaitForEmailBinding>() {
+@AndroidEntryPoint
+class LoginWaitForEmailFragment :
+        AbstractLoginFragment<FragmentLoginWaitForEmailBinding>() {
 
     private val params: LoginWaitForEmailFragmentArgument by args()
 
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
index 0940eb50ee..b89018ccff 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
@@ -32,6 +32,7 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import com.airbnb.mvrx.activityViewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.utils.AssetReader
 import im.vector.app.databinding.FragmentLoginWebBinding
@@ -47,9 +48,11 @@ import javax.inject.Inject
  * This screen is displayed when the application does not support login flow or registration flow
  * of the homeserver, as a fallback to login or to create an account.
  */
-class LoginWebFragment @Inject constructor(
-        private val assetReader: AssetReader
-) : AbstractLoginFragment<FragmentLoginWebBinding>() {
+@AndroidEntryPoint
+class LoginWebFragment :
+        AbstractLoginFragment<FragmentLoginWebBinding>() {
+
+    @Inject lateinit var assetReader: AssetReader
 
     private val softLogoutViewModel: SoftLogoutViewModel by activityViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt b/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
index 4f3b1237f2..816050420e 100644
--- a/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
+++ b/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
@@ -160,8 +160,11 @@ class SocialLoginButtonsView @JvmOverloads constructor(context: Context, attrs:
     }
 }
 
-fun SocialLoginButtonsView.render(ssoProviders: List<SsoIdentityProvider>?, mode: SocialLoginButtonsView.Mode, listener: (SsoIdentityProvider?) -> Unit) {
+fun SocialLoginButtonsView.render(state: SsoState, mode: SocialLoginButtonsView.Mode, listener: (SsoIdentityProvider?) -> Unit) {
     this.mode = mode
-    this.ssoIdentityProviders = ssoProviders?.sorted()
+    this.ssoIdentityProviders = when (state) {
+        SsoState.Fallback -> null
+        is SsoState.IdentityProviders -> state.providers.sorted()
+    }
     this.listener = SocialLoginButtonsView.InteractionListener { listener(it) }
 }
diff --git a/vector/src/main/java/im/vector/app/features/login/SsoState.kt b/vector/src/main/java/im/vector/app/features/login/SsoState.kt
new file mode 100644
index 0000000000..5f57780bd7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/SsoState.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
+
+sealed interface SsoState : Parcelable {
+    @Parcelize
+    data class IdentityProviders(val providers: List<SsoIdentityProvider>) : SsoState
+
+    @Parcelize
+    object Fallback : SsoState
+
+    fun isFallback() = this == Fallback
+
+    fun providersOrNull() = when (this) {
+        Fallback -> null
+        is IdentityProviders -> providers.takeIf { it.isNotEmpty() }
+    }
+}
+
+fun List<SsoIdentityProvider>?.toSsoState() = this
+        ?.takeIf { it.isNotEmpty() }
+        ?.let { SsoState.IdentityProviders(it) }
+        ?: SsoState.Fallback
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginAction.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginAction.kt
new file mode 100644
index 0000000000..5ea46d3dcd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginAction.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class QrCodeLoginAction : VectorViewModelAction {
+    data class OnQrCodeScanned(val qrCode: String) : QrCodeLoginAction()
+    object GenerateQrCode : QrCodeLoginAction()
+    object ShowQrCode : QrCodeLoginAction()
+    object TryAgain : QrCodeLoginAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
new file mode 100644
index 0000000000..a0c113224d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import com.airbnb.mvrx.Mavericks
+import com.airbnb.mvrx.viewModel
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.features.home.HomeActivity
+import im.vector.lib.core.utils.compat.getParcelableCompat
+import timber.log.Timber
+
+@AndroidEntryPoint
+class QrCodeLoginActivity : SimpleFragmentActivity() {
+
+    private val viewModel: QrCodeLoginViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        views.toolbar.visibility = View.GONE
+
+        if (isFirstCreation()) {
+           navigateToInitialFragment()
+        }
+
+        observeViewEvents()
+    }
+
+    private fun navigateToInitialFragment() {
+        val qrCodeLoginArgs: QrCodeLoginArgs? = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG)
+        when (qrCodeLoginArgs?.loginType) {
+            QrCodeLoginType.LOGIN -> {
+                showInstructionsFragment(qrCodeLoginArgs)
+            }
+            QrCodeLoginType.LINK_A_DEVICE -> {
+                if (qrCodeLoginArgs.showQrCodeImmediately) {
+                    handleNavigateToShowQrCodeScreen()
+                } else {
+                    showInstructionsFragment(qrCodeLoginArgs)
+                }
+            }
+            null -> {
+                Timber.i("QrCodeLoginArgs is null. This is not expected.")
+                finish()
+            }
+        }
+    }
+
+    private fun showInstructionsFragment(qrCodeLoginArgs: QrCodeLoginArgs) {
+        replaceFragment(
+                views.container,
+                QrCodeLoginInstructionsFragment::class.java,
+                qrCodeLoginArgs,
+                tag = FRAGMENT_QR_CODE_INSTRUCTIONS_TAG
+        )
+    }
+
+    private fun observeViewEvents() {
+        viewModel.observeViewEvents {
+            when (it) {
+                QrCodeLoginViewEvents.NavigateToStatusScreen -> handleNavigateToStatusScreen()
+                QrCodeLoginViewEvents.NavigateToShowQrCodeScreen -> handleNavigateToShowQrCodeScreen()
+                QrCodeLoginViewEvents.NavigateToHomeScreen -> handleNavigateToHomeScreen()
+                QrCodeLoginViewEvents.NavigateToInitialScreen -> handleNavigateToInitialScreen()
+            }
+        }
+    }
+
+    private fun handleNavigateToInitialScreen() {
+        navigateToInitialFragment()
+    }
+
+    private fun handleNavigateToShowQrCodeScreen() {
+        addFragment(
+                views.container,
+                QrCodeLoginShowQrCodeFragment::class.java,
+                tag = FRAGMENT_SHOW_QR_CODE_TAG
+        )
+    }
+
+    private fun handleNavigateToStatusScreen() {
+        addFragment(
+                views.container,
+                QrCodeLoginStatusFragment::class.java,
+                tag = FRAGMENT_QR_CODE_STATUS_TAG
+        )
+    }
+
+    private fun handleNavigateToHomeScreen() {
+        val intent = HomeActivity.newIntent(this, firstStartMainActivity = false, existingSession = true)
+        startActivity(intent)
+    }
+
+    companion object {
+
+        private const val FRAGMENT_QR_CODE_INSTRUCTIONS_TAG = "FRAGMENT_QR_CODE_INSTRUCTIONS_TAG"
+        private const val FRAGMENT_SHOW_QR_CODE_TAG = "FRAGMENT_SHOW_QR_CODE_TAG"
+        private const val FRAGMENT_QR_CODE_STATUS_TAG = "FRAGMENT_QR_CODE_STATUS_TAG"
+
+        fun getIntent(context: Context, qrCodeLoginArgs: QrCodeLoginArgs): Intent {
+            return Intent(context, QrCodeLoginActivity::class.java).apply {
+                putExtra(Mavericks.KEY_ARG, qrCodeLoginArgs)
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginArgs.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginArgs.kt
new file mode 100644
index 0000000000..6c23d07c0f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginArgs.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class QrCodeLoginArgs(
+        val loginType: QrCodeLoginType,
+        val showQrCodeImmediately: Boolean,
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt
new file mode 100644
index 0000000000..4bef41b6c1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
+
+sealed class QrCodeLoginConnectionStatus {
+    object ConnectingToDevice : QrCodeLoginConnectionStatus()
+    data class Connected(val securityCode: String, val canConfirmSecurityCode: Boolean) : QrCodeLoginConnectionStatus()
+    object SigningIn : QrCodeLoginConnectionStatus()
+    data class Failed(val errorType: RendezvousFailureReason, val canTryAgain: Boolean) : QrCodeLoginConnectionStatus()
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginHeaderView.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginHeaderView.kt
new file mode 100644
index 0000000000..03478d2f50
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginHeaderView.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.databinding.ViewQrCodeLoginHeaderBinding
+
+class QrCodeLoginHeaderView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val binding = ViewQrCodeLoginHeaderBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+
+    init {
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.QrCodeLoginHeaderView,
+                0,
+                0
+        ).use {
+            setTitle(it)
+            setDescription(it)
+            setImage(it)
+        }
+    }
+
+    private fun setTitle(typedArray: TypedArray) {
+        val title = typedArray.getString(R.styleable.QrCodeLoginHeaderView_qrCodeLoginHeaderTitle)
+        setTitle(title)
+    }
+
+    private fun setDescription(typedArray: TypedArray) {
+        val description = typedArray.getString(R.styleable.QrCodeLoginHeaderView_qrCodeLoginHeaderDescription)
+        setDescription(description)
+    }
+
+    private fun setImage(typedArray: TypedArray) {
+        val imageResource = typedArray.getResourceId(R.styleable.QrCodeLoginHeaderView_qrCodeLoginHeaderImageResource, 0)
+        val backgroundTint = typedArray.getColor(R.styleable.QrCodeLoginHeaderView_qrCodeLoginHeaderImageBackgroundTint, 0)
+        setImage(imageResource, backgroundTint)
+    }
+
+    fun setTitle(title: String?) {
+        binding.qrCodeLoginHeaderTitleTextView.setTextOrHide(title)
+    }
+
+    fun setDescription(description: String?) {
+        binding.qrCodeLoginHeaderDescriptionTextView.setTextOrHide(description)
+    }
+
+    fun setImage(imageResource: Int, backgroundTintColor: Int) {
+        binding.qrCodeLoginHeaderImageView.setImageResource(imageResource)
+        binding.qrCodeLoginHeaderImageView.backgroundTintList = ColorStateList.valueOf(backgroundTintColor)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
new file mode 100644
index 0000000000..40fcbbbb85
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.registerStartForActivityResult
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentQrCodeLoginInstructionsBinding
+import im.vector.app.features.qrcode.QrCodeScannerActivity
+import timber.log.Timber
+
+@AndroidEntryPoint
+class QrCodeLoginInstructionsFragment : VectorBaseFragment<FragmentQrCodeLoginInstructionsBinding>() {
+
+    private val viewModel: QrCodeLoginViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQrCodeLoginInstructionsBinding {
+        return FragmentQrCodeLoginInstructionsBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initScanQrCodeButton()
+        initShowQrCodeButton()
+    }
+
+    private fun initShowQrCodeButton() {
+        views.qrCodeLoginInstructionsShowQrCodeButton.debouncedClicks {
+            viewModel.handle(QrCodeLoginAction.ShowQrCode)
+        }
+    }
+
+    private fun initScanQrCodeButton() {
+        views.qrCodeLoginInstructionsScanQrCodeButton.debouncedClicks {
+            QrCodeScannerActivity.startForResult(requireActivity(), scanActivityResultLauncher)
+        }
+    }
+
+    private val scanActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val scannedQrCode = QrCodeScannerActivity.getResultText(activityResult.data)
+            val wasQrCode = QrCodeScannerActivity.getResultIsQrCode(activityResult.data)
+
+            Timber.d("Scanned QR code: $scannedQrCode, was QR code: $wasQrCode")
+            if (wasQrCode && !scannedQrCode.isNullOrBlank()) {
+                onQrCodeScanned(scannedQrCode)
+            } else {
+                onQrCodeScannerFailed()
+            }
+        }
+    }
+
+    private fun onQrCodeScanned(scannedQrCode: String) {
+        viewModel.handle(QrCodeLoginAction.OnQrCodeScanned(scannedQrCode))
+    }
+
+    private fun onQrCodeScannerFailed() {
+        // The user scanned something unexpected, so we try scanning again.
+        // This seems to happen particularly with the large QRs needed for rendezvous
+        // especially when the QR is partially off the screen
+        Timber.d("QrCodeLoginInstructionsFragment.onQrCodeScannerFailed - showing scanner again")
+        QrCodeScannerActivity.startForResult(requireActivity(), scanActivityResultLauncher)
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        if (state.loginType == QrCodeLoginType.LOGIN) {
+            views.qrCodeLoginInstructionsView.setInstructions(
+                    listOf(
+                            getString(R.string.qr_code_login_new_device_instruction_1),
+                            getString(R.string.qr_code_login_new_device_instruction_2),
+                            getString(R.string.qr_code_login_new_device_instruction_3),
+                    )
+            )
+        } else {
+            views.qrCodeLoginInstructionsView.setInstructions(
+                    listOf(
+                            getString(R.string.qr_code_login_link_a_device_scan_qr_code_instruction_1),
+                            getString(R.string.qr_code_login_link_a_device_scan_qr_code_instruction_2),
+                    )
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsView.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsView.kt
new file mode 100644
index 0000000000..ed5c4de175
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsView.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import androidx.core.view.isVisible
+import im.vector.app.R
+import im.vector.app.databinding.ViewQrCodeLoginInstructionsBinding
+
+class QrCodeLoginInstructionsView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val binding = ViewQrCodeLoginInstructionsBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+
+    init {
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.QrCodeLoginInstructionsView,
+                0,
+                0
+        ).use {
+            setInstructions(it)
+        }
+    }
+
+    private fun setInstructions(typedArray: TypedArray) {
+        val instruction1 = typedArray.getString(R.styleable.QrCodeLoginInstructionsView_qrCodeLoginInstruction1)
+        val instruction2 = typedArray.getString(R.styleable.QrCodeLoginInstructionsView_qrCodeLoginInstruction2)
+        val instruction3 = typedArray.getString(R.styleable.QrCodeLoginInstructionsView_qrCodeLoginInstruction3)
+        setInstructions(
+                listOf(
+                        instruction1,
+                        instruction2,
+                        instruction3,
+                )
+        )
+    }
+
+    fun setInstructions(instructions: List<String?>?) {
+        setInstruction(binding.instructions1Layout, binding.instruction1TextView, instructions?.getOrNull(0))
+        setInstruction(binding.instructions2Layout, binding.instruction2TextView, instructions?.getOrNull(1))
+        setInstruction(binding.instructions3Layout, binding.instruction3TextView, instructions?.getOrNull(2))
+    }
+
+    private fun setInstruction(instructionLayout: LinearLayout, instructionTextView: TextView, instruction: String?) {
+        instruction?.let {
+            instructionLayout.isVisible = true
+            instructionTextView.text = instruction
+        } ?: run {
+            instructionLayout.isVisible = false
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginShowQrCodeFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginShowQrCodeFragment.kt
new file mode 100644
index 0000000000..d31f531a49
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginShowQrCodeFragment.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentQrCodeLoginShowQrCodeBinding
+
+@AndroidEntryPoint
+class QrCodeLoginShowQrCodeFragment : VectorBaseFragment<FragmentQrCodeLoginShowQrCodeBinding>() {
+
+    private val viewModel: QrCodeLoginViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQrCodeLoginShowQrCodeBinding {
+        return FragmentQrCodeLoginShowQrCodeBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initCancelButton()
+        viewModel.handle(QrCodeLoginAction.GenerateQrCode)
+    }
+
+    private fun initCancelButton() {
+        views.qrCodeLoginShowQrCodeCancelButton.debouncedClicks {
+            activity?.onBackPressedDispatcher?.onBackPressed()
+        }
+    }
+
+    private fun setInstructions(loginType: QrCodeLoginType) {
+        if (loginType == QrCodeLoginType.LOGIN) {
+            views.qrCodeLoginShowQrCodeHeaderView.setDescription(getString(R.string.qr_code_login_header_show_qr_code_new_device_description))
+            views.qrCodeLoginShowQrCodeInstructionsView.setInstructions(
+                    listOf(
+                            getString(R.string.qr_code_login_new_device_instruction_1),
+                            getString(R.string.qr_code_login_new_device_instruction_2),
+                            getString(R.string.qr_code_login_new_device_instruction_3),
+                    )
+            )
+        } else {
+            views.qrCodeLoginShowQrCodeHeaderView.setDescription(getString(R.string.qr_code_login_header_show_qr_code_link_a_device_description))
+            views.qrCodeLoginShowQrCodeInstructionsView.setInstructions(
+                    listOf(
+                            getString(R.string.qr_code_login_link_a_device_show_qr_code_instruction_1),
+                            getString(R.string.qr_code_login_link_a_device_show_qr_code_instruction_2),
+                    )
+            )
+        }
+    }
+
+    private fun showQrCode(qrCodeData: String) {
+        views.qrCodeLoginSHowQrCodeImageView.setData(qrCodeData)
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        state.generatedQrCodeData?.let { qrCodeData ->
+            showQrCode(qrCodeData)
+        }
+        setInstructions(state.loginType)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
new file mode 100644
index 0000000000..6ef261e6d9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentQrCodeLoginStatusBinding
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
+
+@AndroidEntryPoint
+class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBinding>() {
+
+    private val viewModel: QrCodeLoginViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQrCodeLoginStatusBinding {
+        return FragmentQrCodeLoginStatusBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initCancelButton()
+        initTryAgainButton()
+    }
+
+    private fun initTryAgainButton() {
+        views.qrCodeLoginStatusTryAgainButton.debouncedClicks {
+            viewModel.handle(QrCodeLoginAction.TryAgain)
+        }
+    }
+
+    private fun initCancelButton() {
+        views.qrCodeLoginStatusCancelButton.debouncedClicks {
+            activity?.onBackPressedDispatcher?.onBackPressed()
+        }
+    }
+
+    private fun handleFailed(connectionStatus: QrCodeLoginConnectionStatus.Failed) {
+        views.qrCodeLoginConfirmSecurityCodeLayout.isVisible = false
+        views.qrCodeLoginStatusLoadingLayout.isVisible = false
+        views.qrCodeLoginStatusHeaderView.isVisible = true
+        views.qrCodeLoginStatusSecurityCode.isVisible = false
+        views.qrCodeLoginStatusNoMatchLayout.isVisible = false
+        views.qrCodeLoginStatusCancelButton.isVisible = true
+        views.qrCodeLoginStatusTryAgainButton.isVisible = connectionStatus.canTryAgain
+        views.qrCodeLoginStatusHeaderView.setTitle(getString(R.string.qr_code_login_header_failed_title))
+        views.qrCodeLoginStatusHeaderView.setDescription(getErrorDescription(connectionStatus.errorType))
+        views.qrCodeLoginStatusHeaderView.setImage(
+                imageResource = R.drawable.ic_qr_code_login_failed,
+                backgroundTintColor = ThemeUtils.getColor(requireContext(), R.attr.colorError)
+        )
+    }
+
+    private fun getErrorDescription(reason: RendezvousFailureReason): String {
+        return when (reason) {
+            RendezvousFailureReason.UnsupportedAlgorithm,
+            RendezvousFailureReason.UnsupportedTransport -> getString(R.string.qr_code_login_header_failed_device_is_not_supported_description)
+            RendezvousFailureReason.UnsupportedHomeserver -> getString(R.string.qr_code_login_header_failed_homeserver_is_not_supported_description)
+            RendezvousFailureReason.Expired -> getString(R.string.qr_code_login_header_failed_timeout_description)
+            RendezvousFailureReason.UserDeclined -> getString(R.string.qr_code_login_header_failed_denied_description)
+            RendezvousFailureReason.E2EESecurityIssue -> getString(R.string.qr_code_login_header_failed_e2ee_security_issue_description)
+            RendezvousFailureReason.OtherDeviceAlreadySignedIn -> getString(R.string.qr_code_login_header_failed_other_device_already_signed_in_description)
+            RendezvousFailureReason.OtherDeviceNotSignedIn -> getString(R.string.qr_code_login_header_failed_other_device_not_signed_in_description)
+            RendezvousFailureReason.InvalidCode -> getString(R.string.qr_code_login_header_failed_invalid_qr_code_description)
+            RendezvousFailureReason.UserCancelled -> getString(R.string.qr_code_login_header_failed_user_cancelled_description)
+            else -> getString(R.string.qr_code_login_header_failed_other_description)
+        }
+    }
+
+    private fun handleConnectingToDevice() {
+        views.qrCodeLoginConfirmSecurityCodeLayout.isVisible = false
+        views.qrCodeLoginStatusLoadingLayout.isVisible = true
+        views.qrCodeLoginStatusHeaderView.isVisible = false
+        views.qrCodeLoginStatusSecurityCode.isVisible = false
+        views.qrCodeLoginStatusNoMatchLayout.isVisible = false
+        views.qrCodeLoginStatusCancelButton.isVisible = true
+        views.qrCodeLoginStatusTryAgainButton.isVisible = false
+        views.qrCodeLoginStatusLoadingTextView.setText(R.string.qr_code_login_connecting_to_device)
+    }
+
+    private fun handleSigningIn() {
+        views.qrCodeLoginConfirmSecurityCodeLayout.isVisible = false
+        views.qrCodeLoginStatusLoadingLayout.isVisible = true
+        views.qrCodeLoginStatusHeaderView.apply {
+            isVisible = true
+            setTitle(getString(R.string.dialog_title_success))
+            setDescription("")
+            setImage(R.drawable.ic_tick, ThemeUtils.getColor(requireContext(), R.attr.colorPrimary))
+        }
+        views.qrCodeLoginStatusSecurityCode.isVisible = false
+        views.qrCodeLoginStatusNoMatchLayout.isVisible = false
+        views.qrCodeLoginStatusCancelButton.isVisible = false
+        views.qrCodeLoginStatusTryAgainButton.isVisible = false
+        views.qrCodeLoginStatusLoadingTextView.setText(R.string.qr_code_login_signing_in)
+    }
+
+    private fun handleConnectionEstablished(connectionStatus: QrCodeLoginConnectionStatus.Connected, loginType: QrCodeLoginType) {
+        views.qrCodeLoginConfirmSecurityCodeLayout.isVisible = loginType == QrCodeLoginType.LINK_A_DEVICE
+        views.qrCodeLoginStatusLoadingLayout.isVisible = false
+        views.qrCodeLoginStatusHeaderView.isVisible = true
+        views.qrCodeLoginStatusSecurityCode.isVisible = true
+        views.qrCodeLoginStatusNoMatchLayout.isVisible = loginType == QrCodeLoginType.LOGIN
+        views.qrCodeLoginStatusCancelButton.isVisible = true
+        views.qrCodeLoginStatusTryAgainButton.isVisible = false
+        views.qrCodeLoginStatusSecurityCode.text = connectionStatus.securityCode
+        views.qrCodeLoginStatusHeaderView.setTitle(getString(R.string.qr_code_login_header_connected_title))
+        views.qrCodeLoginStatusHeaderView.setDescription(getString(R.string.qr_code_login_header_connected_description))
+        views.qrCodeLoginStatusHeaderView.setImage(
+                imageResource = R.drawable.ic_qr_code_login_connected,
+                backgroundTintColor = ThemeUtils.getColor(requireContext(), R.attr.colorPrimary)
+        )
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        when (state.connectionStatus) {
+            is QrCodeLoginConnectionStatus.Connected -> handleConnectionEstablished(state.connectionStatus, state.loginType)
+            QrCodeLoginConnectionStatus.ConnectingToDevice -> handleConnectingToDevice()
+            QrCodeLoginConnectionStatus.SigningIn -> handleSigningIn()
+            is QrCodeLoginConnectionStatus.Failed -> handleFailed(state.connectionStatus)
+            null -> { /* NOOP */ }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginType.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginType.kt
new file mode 100644
index 0000000000..b4bb5b667f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginType.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+enum class QrCodeLoginType {
+    LOGIN,
+    LINK_A_DEVICE,
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
new file mode 100644
index 0000000000..e20ea6b2e8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class QrCodeLoginViewEvents : VectorViewEvents {
+    object NavigateToStatusScreen : QrCodeLoginViewEvents()
+    object NavigateToShowQrCodeScreen : QrCodeLoginViewEvents()
+    object NavigateToHomeScreen : QrCodeLoginViewEvents()
+    object NavigateToInitialScreen : QrCodeLoginViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
new file mode 100644
index 0000000000..97cca9d791
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.session.ConfigureAndStartSessionUseCase
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.rendezvous.Rendezvous
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
+import timber.log.Timber
+
+class QrCodeLoginViewModel @AssistedInject constructor(
+        @Assisted private val initialState: QrCodeLoginViewState,
+        private val authenticationService: AuthenticationService,
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase,
+) : VectorViewModel<QrCodeLoginViewState, QrCodeLoginAction, QrCodeLoginViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<QrCodeLoginViewModel, QrCodeLoginViewState> {
+        override fun create(initialState: QrCodeLoginViewState): QrCodeLoginViewModel
+    }
+
+    companion object : MavericksViewModelFactory<QrCodeLoginViewModel, QrCodeLoginViewState> by hiltMavericksViewModelFactory() {
+        val TAG: String = QrCodeLoginViewModel::class.java.simpleName
+    }
+
+    override fun handle(action: QrCodeLoginAction) {
+        when (action) {
+            is QrCodeLoginAction.OnQrCodeScanned -> handleOnQrCodeScanned(action)
+            QrCodeLoginAction.GenerateQrCode -> handleQrCodeViewStarted()
+            QrCodeLoginAction.ShowQrCode -> handleShowQrCode()
+            QrCodeLoginAction.TryAgain -> handleTryAgain()
+        }
+    }
+
+    private fun handleTryAgain() {
+        setState {
+            copy(
+                    connectionStatus = null
+            )
+        }
+        _viewEvents.post(QrCodeLoginViewEvents.NavigateToInitialScreen)
+    }
+
+    private fun handleShowQrCode() {
+        _viewEvents.post(QrCodeLoginViewEvents.NavigateToShowQrCodeScreen)
+    }
+
+    private fun handleQrCodeViewStarted() {
+        val qrCodeData = generateQrCodeData()
+        setState {
+            copy(
+                    generatedQrCodeData = qrCodeData
+            )
+        }
+    }
+
+    private fun handleOnQrCodeScanned(action: QrCodeLoginAction.OnQrCodeScanned) {
+        Timber.tag(TAG).d("Scanned code of length ${action.qrCode.length}")
+
+        val rendezvous = try { Rendezvous.buildChannelFromCode(action.qrCode) } catch (t: Throwable) {
+            Timber.tag(TAG).e(t, "Error occurred during sign in")
+            if (t is RendezvousError) {
+                onFailed(t.reason)
+            } else {
+                onFailed(RendezvousFailureReason.Unknown)
+            }
+            return
+        }
+
+        setState {
+            copy(
+                    connectionStatus = QrCodeLoginConnectionStatus.ConnectingToDevice
+            )
+        }
+
+        _viewEvents.post(QrCodeLoginViewEvents.NavigateToStatusScreen)
+
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                val confirmationCode = rendezvous.startAfterScanningCode()
+                Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
+
+                onConnectionEstablished(confirmationCode)
+
+                val session = rendezvous.waitForLoginOnNewDevice(authenticationService)
+                onSigningIn()
+
+                activeSessionHolder.setActiveSession(session)
+                authenticationService.reset()
+                configureAndStartSessionUseCase.execute(session)
+
+                rendezvous.completeVerificationOnNewDevice(session)
+
+                _viewEvents.post(QrCodeLoginViewEvents.NavigateToHomeScreen)
+            } catch (t: Throwable) {
+                Timber.tag(TAG).e(t, "Error occurred during sign in")
+                if (t is RendezvousError) {
+                    onFailed(t.reason)
+                } else {
+                    onFailed(RendezvousFailureReason.Unknown)
+                }
+            }
+        }
+    }
+
+    private fun onFailed(reason: RendezvousFailureReason) {
+        _viewEvents.post(QrCodeLoginViewEvents.NavigateToStatusScreen)
+
+        setState {
+            copy(
+                    connectionStatus = QrCodeLoginConnectionStatus.Failed(reason, reason.canRetry)
+            )
+        }
+    }
+
+    private fun onConnectionEstablished(securityCode: String) {
+        val canConfirmSecurityCode = initialState.loginType == QrCodeLoginType.LINK_A_DEVICE
+        setState {
+            copy(
+                    connectionStatus = QrCodeLoginConnectionStatus.Connected(securityCode, canConfirmSecurityCode)
+            )
+        }
+    }
+
+    private fun onSigningIn() {
+        setState {
+            copy(
+                    connectionStatus = QrCodeLoginConnectionStatus.SigningIn
+            )
+        }
+    }
+
+    /**
+     * QR code generation is not currently supported and this is a placeholder for future
+     * functionality.
+     */
+    private fun generateQrCodeData(): String {
+        return "NOT SUPPORTED"
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewState.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewState.kt
new file mode 100644
index 0000000000..0c4457c12f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewState.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.login.qr
+
+import com.airbnb.mvrx.MavericksState
+
+data class QrCodeLoginViewState(
+    val loginType: QrCodeLoginType,
+    val connectionStatus: QrCodeLoginConnectionStatus? = null,
+    val generatedQrCodeData: String? = null,
+) : MavericksState {
+
+    constructor(args: QrCodeLoginArgs) : this(
+            loginType = args.loginType,
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
index ce499f290b..a7a4274876 100755
--- a/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
@@ -42,11 +42,12 @@ data class LoginTermsFragmentArgument(
 /**
  * LoginTermsFragment displays the list of policies the user has to accept.
  */
-class LoginTermsFragment @Inject constructor(
-        private val policyController: PolicyController
-) : AbstractLoginFragment<FragmentLoginTermsBinding>(),
+class LoginTermsFragment :
+        AbstractLoginFragment<FragmentLoginTermsBinding>(),
         PolicyController.PolicyControllerListener {
 
+    @Inject lateinit var policyController: PolicyController
+
     private val params: LoginTermsFragmentArgument by args()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginTermsBinding {
diff --git a/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
deleted file mode 100644
index aae51fa959..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Bundle
-import android.view.View
-import androidx.annotation.CallSuper
-import androidx.transition.TransitionInflater
-import androidx.viewbinding.ViewBinding
-import com.airbnb.mvrx.activityViewModel
-import com.airbnb.mvrx.withState
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.R
-import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
-import im.vector.app.core.platform.OnBackPressed
-import im.vector.app.core.platform.VectorBaseFragment
-import kotlinx.coroutines.CancellationException
-import org.matrix.android.sdk.api.failure.Failure
-
-/**
- * Parent Fragment for all the login/registration screens.
- */
-abstract class AbstractLoginFragment2<VB : ViewBinding> : VectorBaseFragment<VB>(), OnBackPressed {
-
-    protected val loginViewModel: LoginViewModel2 by activityViewModel()
-
-    private var isResetPasswordStarted = false
-
-    // Due to async, we keep a boolean to avoid displaying twice the cancellation dialog
-    private var displayCancelDialog = true
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        context?.let {
-            sharedElementEnterTransition = TransitionInflater.from(it).inflateTransition(android.R.transition.move)
-        }
-    }
-
-    @CallSuper
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        loginViewModel.observeViewEvents {
-            handleLoginViewEvents(it)
-        }
-    }
-
-    private fun handleLoginViewEvents(loginViewEvents: LoginViewEvents2) {
-        when (loginViewEvents) {
-            is LoginViewEvents2.Failure -> showFailure(loginViewEvents.throwable)
-            else ->
-                // This is handled by the Activity
-                Unit
-        }
-    }
-
-    override fun showFailure(throwable: Throwable) {
-        // Only the resumed Fragment can eventually show the error, to avoid multiple dialog display
-        if (!isResumed) {
-            return
-        }
-
-        when (throwable) {
-            is CancellationException ->
-                /* Ignore this error, user has cancelled the action */
-                Unit
-            is Failure.UnrecognizedCertificateFailure ->
-                showUnrecognizedCertificateFailure(throwable)
-            else ->
-                onError(throwable)
-        }
-    }
-
-    private fun showUnrecognizedCertificateFailure(failure: Failure.UnrecognizedCertificateFailure) {
-        // Ask the user to accept the certificate
-        unrecognizedCertificateDialog.show(requireActivity(),
-                failure.fingerprint,
-                failure.url,
-                object : UnrecognizedCertificateDialog.Callback {
-                    override fun onAccept() {
-                        // User accept the certificate
-                        loginViewModel.handle(LoginAction2.UserAcceptCertificate(failure.fingerprint))
-                    }
-
-                    override fun onIgnore() {
-                        // Cannot happen in this case
-                    }
-
-                    override fun onReject() {
-                        // Nothing to do in this case
-                    }
-                })
-    }
-
-    open fun onError(throwable: Throwable) {
-        super.showFailure(throwable)
-    }
-
-    override fun onBackPressed(toolbarButton: Boolean): Boolean {
-        return when {
-            displayCancelDialog && loginViewModel.isRegistrationStarted -> {
-                // Ask for confirmation before cancelling the registration
-                MaterialAlertDialogBuilder(requireActivity())
-                        .setTitle(R.string.login_signup_cancel_confirmation_title)
-                        .setMessage(R.string.login_signup_cancel_confirmation_content)
-                        .setPositiveButton(R.string.yes) { _, _ ->
-                            displayCancelDialog = false
-                            vectorBaseActivity.onBackPressed()
-                        }
-                        .setNegativeButton(R.string.no, null)
-                        .show()
-
-                true
-            }
-            displayCancelDialog && isResetPasswordStarted -> {
-                // Ask for confirmation before cancelling the reset password
-                MaterialAlertDialogBuilder(requireActivity())
-                        .setTitle(R.string.login_reset_password_cancel_confirmation_title)
-                        .setMessage(R.string.login_reset_password_cancel_confirmation_content)
-                        .setPositiveButton(R.string.yes) { _, _ ->
-                            displayCancelDialog = false
-                            vectorBaseActivity.onBackPressed()
-                        }
-                        .setNegativeButton(R.string.no, null)
-                        .show()
-
-                true
-            }
-            else -> {
-                resetViewModel()
-                // Do not consume the Back event
-                false
-            }
-        }
-    }
-
-    final override fun invalidate() = withState(loginViewModel) { state ->
-        // True when email is sent with success to the homeserver
-        isResetPasswordStarted = state.resetPasswordEmail.isNullOrBlank().not()
-
-        updateWithState(state)
-    }
-
-    open fun updateWithState(state: LoginViewState2) {
-        // No op by default
-    }
-
-    // Reset any modification on the loginViewModel by the current fragment
-    abstract fun resetViewModel()
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/AbstractSSOLoginFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/AbstractSSOLoginFragment2.kt
deleted file mode 100644
index ffd27a0c51..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/AbstractSSOLoginFragment2.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- */
-
-package im.vector.app.features.login2
-
-import android.content.ComponentName
-import android.net.Uri
-import androidx.browser.customtabs.CustomTabsClient
-import androidx.browser.customtabs.CustomTabsServiceConnection
-import androidx.browser.customtabs.CustomTabsSession
-import androidx.viewbinding.ViewBinding
-import com.airbnb.mvrx.withState
-import im.vector.app.core.utils.openUrlInChromeCustomTab
-import im.vector.app.features.login.SSORedirectRouterActivity
-import im.vector.app.features.login.hasSso
-import im.vector.app.features.login.ssoIdentityProviders
-import org.matrix.android.sdk.api.auth.SSOAction
-
-abstract class AbstractSSOLoginFragment2<VB : ViewBinding> : AbstractLoginFragment2<VB>() {
-
-    // For sso
-    private var customTabsServiceConnection: CustomTabsServiceConnection? = null
-    private var customTabsClient: CustomTabsClient? = null
-    private var customTabsSession: CustomTabsSession? = null
-
-    override fun onStart() {
-        super.onStart()
-        val hasSSO = withState(loginViewModel) { it.loginMode.hasSso() }
-        if (hasSSO) {
-            val packageName = CustomTabsClient.getPackageName(requireContext(), null)
-
-            // packageName can be null if there are 0 or several CustomTabs compatible browsers installed on the device
-            if (packageName != null) {
-                customTabsServiceConnection = object : CustomTabsServiceConnection() {
-                    override fun onCustomTabsServiceConnected(name: ComponentName, client: CustomTabsClient) {
-                        customTabsClient = client
-                                .also { it.warmup(0L) }
-                        prefetchIfNeeded()
-                    }
-
-                    override fun onServiceDisconnected(name: ComponentName?) {
-                    }
-                }
-                        .also {
-                            CustomTabsClient.bindCustomTabsService(
-                                    requireContext(),
-                                    // Despite the API, packageName cannot be null
-                                    packageName,
-                                    it
-                            )
-                        }
-            }
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        val hasSSO = withState(loginViewModel) { it.loginMode.hasSso() }
-        if (hasSSO) {
-            customTabsServiceConnection?.let { requireContext().unbindService(it) }
-            customTabsServiceConnection = null
-        }
-    }
-
-    private fun prefetchUrl(url: String) {
-        if (customTabsSession == null) {
-            customTabsSession = customTabsClient?.newSession(null)
-        }
-
-        customTabsSession?.mayLaunchUrl(Uri.parse(url), null, null)
-    }
-
-    protected fun openInCustomTab(ssoUrl: String) {
-        openUrlInChromeCustomTab(requireContext(), customTabsSession, ssoUrl)
-    }
-
-    private fun prefetchIfNeeded() {
-        withState(loginViewModel) { state ->
-            if (state.loginMode.hasSso() && state.loginMode.ssoIdentityProviders().isNullOrEmpty()) {
-                // in this case we can prefetch (not other cases for privacy concerns)
-                loginViewModel.getSsoUrl(
-                        redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
-                        deviceId = state.deviceId,
-                        providerId = null,
-                        action = if (state.signMode == SignMode2.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
-                )
-                        ?.let { prefetchUrl(it) }
-            }
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginAction2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginAction2.kt
deleted file mode 100644
index 37dafbfbe0..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginAction2.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import im.vector.app.core.platform.VectorViewModelAction
-import im.vector.app.features.login.LoginConfig
-import org.matrix.android.sdk.api.auth.data.Credentials
-import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
-import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
-import org.matrix.android.sdk.api.network.ssl.Fingerprint
-
-sealed class LoginAction2 : VectorViewModelAction {
-    // First action
-    data class UpdateSignMode(val signMode: SignMode2) : LoginAction2()
-
-    // Signin, but user wants to choose a server
-    object ChooseAServerForSignin : LoginAction2()
-
-    object EnterServerUrl : LoginAction2()
-    object ChooseDefaultHomeServer : LoginAction2()
-    data class UpdateHomeServer(val homeServerUrl: String) : LoginAction2()
-    data class LoginWithToken(val loginToken: String) : LoginAction2()
-    data class WebLoginSuccess(val credentials: Credentials) : LoginAction2()
-    data class InitWith(val loginConfig: LoginConfig?) : LoginAction2()
-    data class ResetPassword(val email: String, val newPassword: String) : LoginAction2()
-    object ResetPasswordMailConfirmed : LoginAction2()
-
-    // Username to Login or Register, depending on the signMode
-    data class SetUserName(val username: String) : LoginAction2()
-
-    // Password to Login or Register, depending on the signMode
-    data class SetUserPassword(val password: String) : LoginAction2()
-
-    // When user has selected a homeserver
-    data class LoginWith(val login: String, val password: String) : LoginAction2()
-
-    // Register actions
-    open class RegisterAction : LoginAction2()
-
-    data class AddThreePid(val threePid: RegisterThreePid) : RegisterAction()
-    object SendAgainThreePid : RegisterAction()
-
-    // TODO Confirm Email (from link in the email, open in the phone, intercepted by the app)
-    data class ValidateThreePid(val code: String) : RegisterAction()
-
-    data class CheckIfEmailHasBeenValidated(val delayMillis: Long) : RegisterAction()
-    object StopEmailValidationCheck : RegisterAction()
-
-    data class CaptchaDone(val captchaResponse: String) : RegisterAction()
-    object AcceptTerms : RegisterAction()
-    object RegisterDummy : RegisterAction()
-
-    // Reset actions
-    open class ResetAction : LoginAction2()
-
-    object ResetHomeServerUrl : ResetAction()
-    object ResetSignMode : ResetAction()
-    object ResetSignin : ResetAction()
-    object ResetSignup : ResetAction()
-    object ResetResetPassword : ResetAction()
-
-    // Homeserver history
-    object ClearHomeServerHistory : LoginAction2()
-
-    // For the soft logout case
-    data class SetupSsoForSessionRecovery(
-            val homeServerUrl: String,
-            val deviceId: String,
-            val ssoIdentityProviders: List<SsoIdentityProvider>?
-    ) : LoginAction2()
-
-    data class PostViewEvent(val viewEvent: LoginViewEvents2) : LoginAction2()
-
-    data class UserAcceptCertificate(val fingerprint: Fingerprint) : LoginAction2()
-
-    // Account customization is over
-    object Finish : LoginAction2()
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginCaptchaFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginCaptchaFragment2.kt
deleted file mode 100644
index 5fabe0ca32..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginCaptchaFragment2.kt
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.annotation.SuppressLint
-import android.content.DialogInterface
-import android.graphics.Bitmap
-import android.net.http.SslError
-import android.os.Build
-import android.view.KeyEvent
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.webkit.SslErrorHandler
-import android.webkit.WebResourceRequest
-import android.webkit.WebResourceResponse
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.core.view.isVisible
-import com.airbnb.mvrx.args
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.R
-import im.vector.app.core.utils.AssetReader
-import im.vector.app.databinding.FragmentLoginCaptchaBinding
-import im.vector.app.features.login.JavascriptResponse
-import im.vector.app.features.login.LoginCaptchaFragmentArgument
-import org.matrix.android.sdk.api.util.MatrixJsonParser
-import timber.log.Timber
-import java.net.URLDecoder
-import java.util.Formatter
-import javax.inject.Inject
-
-/**
- * In this screen, the user is asked to confirm he is not a robot.
- */
-class LoginCaptchaFragment2 @Inject constructor(
-        private val assetReader: AssetReader
-) : AbstractLoginFragment2<FragmentLoginCaptchaBinding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginCaptchaBinding {
-        return FragmentLoginCaptchaBinding.inflate(inflater, container, false)
-    }
-
-    private val params: LoginCaptchaFragmentArgument by args()
-
-    private var isWebViewLoaded = false
-
-    @SuppressLint("SetJavaScriptEnabled")
-    private fun setupWebView(state: LoginViewState2) {
-        views.loginCaptchaWevView.settings.javaScriptEnabled = true
-
-        val reCaptchaPage = assetReader.readAssetFile("reCaptchaPage.html") ?: error("missing asset reCaptchaPage.html")
-
-        val html = Formatter().format(reCaptchaPage, params.siteKey).toString()
-        val mime = "text/html"
-        val encoding = "utf-8"
-
-        val homeServerUrl = state.homeServerUrl ?: error("missing url of homeserver")
-        views.loginCaptchaWevView.loadDataWithBaseURL(homeServerUrl, html, mime, encoding, null)
-        views.loginCaptchaWevView.requestLayout()
-
-        views.loginCaptchaWevView.webViewClient = object : WebViewClient() {
-            override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
-                super.onPageStarted(view, url, favicon)
-
-                if (!isAdded) {
-                    return
-                }
-
-                // Show loader
-                views.loginCaptchaProgress.isVisible = true
-            }
-
-            override fun onPageFinished(view: WebView, url: String) {
-                super.onPageFinished(view, url)
-
-                if (!isAdded) {
-                    return
-                }
-
-                // Hide loader
-                views.loginCaptchaProgress.isVisible = false
-            }
-
-            override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) {
-                Timber.d("## onReceivedSslError() : ${error.certificate}")
-
-                if (!isAdded) {
-                    return
-                }
-
-                MaterialAlertDialogBuilder(requireActivity())
-                        .setMessage(R.string.ssl_could_not_verify)
-                        .setPositiveButton(R.string.ssl_trust) { _, _ ->
-                            Timber.d("## onReceivedSslError() : the user trusted")
-                            handler.proceed()
-                        }
-                        .setNegativeButton(R.string.ssl_do_not_trust) { _, _ ->
-                            Timber.d("## onReceivedSslError() : the user did not trust")
-                            handler.cancel()
-                        }
-                        .setOnKeyListener(DialogInterface.OnKeyListener { dialog, keyCode, event ->
-                            if (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
-                                handler.cancel()
-                                Timber.d("## onReceivedSslError() : the user dismisses the trust dialog.")
-                                dialog.dismiss()
-                                return@OnKeyListener true
-                            }
-                            false
-                        })
-                        .setCancelable(false)
-                        .show()
-            }
-
-            // common error message
-            private fun onError(errorMessage: String) {
-                Timber.e("## onError() : $errorMessage")
-
-                // TODO
-                // Toast.makeText(this@AccountCreationCaptchaActivity, errorMessage, Toast.LENGTH_LONG).show()
-
-                // on error case, close this activity
-                // runOnUiThread(Runnable { finish() })
-            }
-
-            @SuppressLint("NewApi")
-            override fun onReceivedHttpError(view: WebView, request: WebResourceRequest, errorResponse: WebResourceResponse) {
-                super.onReceivedHttpError(view, request, errorResponse)
-
-                if (request.url.toString().endsWith("favicon.ico")) {
-                    // Ignore this error
-                    return
-                }
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    onError(errorResponse.reasonPhrase)
-                } else {
-                    onError(errorResponse.toString())
-                }
-            }
-
-            @Deprecated("Deprecated in Java")
-            override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
-                @Suppress("DEPRECATION")
-                super.onReceivedError(view, errorCode, description, failingUrl)
-                onError(description)
-            }
-
-            @Deprecated("Deprecated in Java")
-            override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
-                if (url?.startsWith("js:") == true) {
-                    var json = url.substring(3)
-                    var javascriptResponse: JavascriptResponse? = null
-
-                    try {
-                        // URL decode
-                        json = URLDecoder.decode(json, "UTF-8")
-                        javascriptResponse = MatrixJsonParser.getMoshi().adapter(JavascriptResponse::class.java).fromJson(json)
-                    } catch (e: Exception) {
-                        Timber.e(e, "## shouldOverrideUrlLoading(): failed")
-                    }
-
-                    val response = javascriptResponse?.response
-                    if (javascriptResponse?.action == "verifyCallback" && response != null) {
-                        loginViewModel.handle(LoginAction2.CaptchaDone(response))
-                    }
-                }
-                return true
-            }
-        }
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetSignup)
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        if (!isWebViewLoaded) {
-            setupWebView(state)
-            isWebViewLoaded = true
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSigninPassword2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSigninPassword2.kt
deleted file mode 100644
index 34bebd655a..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSigninPassword2.kt
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import androidx.autofill.HintConstants
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import com.airbnb.mvrx.Fail
-import im.vector.app.R
-import im.vector.app.core.extensions.hideKeyboard
-import im.vector.app.core.extensions.hidePassword
-import im.vector.app.databinding.FragmentLoginSigninPassword2Binding
-import im.vector.app.features.home.AvatarRenderer
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import org.matrix.android.sdk.api.auth.login.LoginProfileInfo
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.api.failure.isInvalidPassword
-import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
-import javax.net.ssl.HttpsURLConnection
-
-/**
- * In this screen:
- * - the user is asked for password to sign in to a homeserver.
- * - He also can reset his password
- */
-class LoginFragmentSigninPassword2 @Inject constructor(
-        private val avatarRenderer: AvatarRenderer
-) : AbstractSSOLoginFragment2<FragmentLoginSigninPassword2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSigninPassword2Binding {
-        return FragmentLoginSigninPassword2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupSubmitButton()
-        setupForgottenPasswordButton()
-        setupAutoFill()
-
-        views.passwordField.setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                submit()
-                return@setOnEditorActionListener true
-            }
-            return@setOnEditorActionListener false
-        }
-    }
-
-    private fun setupForgottenPasswordButton() {
-        views.forgetPasswordButton.setOnClickListener { forgetPasswordClicked() }
-    }
-
-    private fun setupAutoFill() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            views.passwordField.setAutofillHints(HintConstants.AUTOFILL_HINT_PASSWORD)
-        }
-    }
-
-    private fun submit() {
-        cleanupUi()
-
-        val password = views.passwordField.text.toString()
-
-        // This can be called by the IME action, so deal with empty cases
-        var error = 0
-        if (password.isEmpty()) {
-            views.passwordFieldTil.error = getString(R.string.error_empty_field_your_password)
-            error++
-        }
-
-        if (error == 0) {
-            loginViewModel.handle(LoginAction2.SetUserPassword(password))
-        }
-    }
-
-    private fun cleanupUi() {
-        views.loginSubmit.hideKeyboard()
-        views.passwordFieldTil.error = null
-    }
-
-    private fun setupUi(state: LoginViewState2) {
-        // Name and avatar
-        views.loginWelcomeBack.text = getString(
-                R.string.login_welcome_back,
-                state.loginProfileInfo()?.displayName?.takeIf { it.isNotBlank() } ?: state.userIdentifier()
-        )
-
-        avatarRenderer.render(
-                profileInfo = state.loginProfileInfo() ?: LoginProfileInfo(state.userIdentifier(), null, null),
-                imageView = views.loginUserIcon
-        )
-
-        views.loginWelcomeBackWarning.isVisible = ((state.loginProfileInfo as? Fail)
-                ?.error as? Failure.ServerError)
-                ?.httpCode == HttpsURLConnection.HTTP_NOT_FOUND /* 404 */
-    }
-
-    private fun setupSubmitButton() {
-        views.loginSubmit.setOnClickListener { submit() }
-        views.passwordField
-                .textChanges()
-                .map { it.isNotEmpty() }
-                .onEach {
-                    views.passwordFieldTil.error = null
-                    views.loginSubmit.isEnabled = it
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
-    private fun forgetPasswordClicked() {
-        loginViewModel.handle(LoginAction2.PostViewEvent(LoginViewEvents2.OpenResetPasswordScreen))
-    }
-
-    override fun resetViewModel() {
-        // loginViewModel.handle(LoginAction2.ResetSignin)
-    }
-
-    override fun onError(throwable: Throwable) {
-        if (throwable.isInvalidPassword() && spaceInPassword()) {
-            views.passwordFieldTil.error = getString(R.string.auth_invalid_login_param_space_in_password)
-        } else {
-            views.passwordFieldTil.error = errorFormatter.toHumanReadable(throwable)
-        }
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        setupUi(state)
-
-        if (state.isLoading) {
-            // Ensure password is hidden
-            views.passwordField.hidePassword()
-        }
-    }
-
-    /**
-     * Detect if password ends or starts with spaces.
-     */
-    private fun spaceInPassword() = views.passwordField.text.toString().let { it.trim() != it }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSigninUsername2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSigninUsername2.kt
deleted file mode 100644
index cb346451de..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSigninUsername2.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.autofill.HintConstants
-import androidx.lifecycle.lifecycleScope
-import im.vector.app.R
-import im.vector.app.core.extensions.hideKeyboard
-import im.vector.app.databinding.FragmentLoginSigninUsername2Binding
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.api.failure.MatrixError
-import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
-
-/**
- * In this screen:
- * - the user is asked for its matrix ID, and have the possibility to open the screen to select a server.
- */
-class LoginFragmentSigninUsername2 @Inject constructor() : AbstractLoginFragment2<FragmentLoginSigninUsername2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSigninUsername2Binding {
-        return FragmentLoginSigninUsername2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupSubmitButton()
-        setupAutoFill()
-        views.loginChooseAServer.setOnClickListener {
-            loginViewModel.handle(LoginAction2.ChooseAServerForSignin)
-        }
-    }
-
-    private fun setupAutoFill() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            views.loginField.setAutofillHints(HintConstants.AUTOFILL_HINT_USERNAME)
-        }
-    }
-
-    private fun submit() {
-        cleanupUi()
-
-        val login = views.loginField.text.toString()
-
-        // This can be called by the IME action, so deal with empty cases
-        var error = 0
-        if (login.isEmpty()) {
-            views.loginFieldTil.error = getString(R.string.error_empty_field_enter_user_name)
-            error++
-        }
-
-        if (error == 0) {
-            loginViewModel.handle(LoginAction2.SetUserName(login))
-        }
-    }
-
-    private fun cleanupUi() {
-        views.loginSubmit.hideKeyboard()
-        views.loginFieldTil.error = null
-    }
-
-    private fun setupSubmitButton() {
-        views.loginSubmit.setOnClickListener { submit() }
-        views.loginField.textChanges()
-                .map { it.trim().isNotEmpty() }
-                .onEach {
-                    views.loginFieldTil.error = null
-                    views.loginSubmit.isEnabled = it
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetSignin)
-    }
-
-    override fun onError(throwable: Throwable) {
-        if (throwable is Failure.ServerError &&
-                throwable.error.code == MatrixError.M_FORBIDDEN &&
-                throwable.error.message.isEmpty()) {
-            // Login with email, but email unknown
-            views.loginFieldTil.error = getString(R.string.login_login_with_email_error)
-        } else {
-            views.loginFieldTil.error = errorFormatter.toHumanReadable(throwable)
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupPassword2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupPassword2.kt
deleted file mode 100644
index 806ff0524b..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupPassword2.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import androidx.autofill.HintConstants
-import androidx.lifecycle.lifecycleScope
-import im.vector.app.R
-import im.vector.app.core.extensions.hideKeyboard
-import im.vector.app.core.extensions.hidePassword
-import im.vector.app.databinding.FragmentLoginSignupPassword2Binding
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
-
-/**
- * In this screen:
- * - the user is asked to choose a password to sign up to a homeserver.
- */
-class LoginFragmentSignupPassword2 @Inject constructor() : AbstractLoginFragment2<FragmentLoginSignupPassword2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSignupPassword2Binding {
-        return FragmentLoginSignupPassword2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupSubmitButton()
-        setupAutoFill()
-
-        views.passwordField.setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                submit()
-                return@setOnEditorActionListener true
-            }
-            return@setOnEditorActionListener false
-        }
-    }
-
-    private fun setupAutoFill() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            views.passwordField.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_PASSWORD)
-        }
-    }
-
-    private fun submit() {
-        cleanupUi()
-
-        val password = views.passwordField.text.toString()
-
-        // This can be called by the IME action, so deal with empty cases
-        var error = 0
-        if (password.isEmpty()) {
-            views.passwordFieldTil.error = getString(R.string.error_empty_field_choose_password)
-            error++
-        }
-
-        if (error == 0) {
-            loginViewModel.handle(LoginAction2.SetUserPassword(password))
-        }
-    }
-
-    private fun cleanupUi() {
-        views.loginSubmit.hideKeyboard()
-        views.passwordFieldTil.error = null
-    }
-
-    private fun setupSubmitButton() {
-        views.loginSubmit.setOnClickListener { submit() }
-        views.passwordField.textChanges()
-                .onEach { password ->
-                    views.passwordFieldTil.error = null
-                    views.loginSubmit.isEnabled = password.isNotEmpty()
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
-    override fun resetViewModel() {
-        // loginViewModel.handle(LoginAction2.ResetSignup)
-    }
-
-    override fun onError(throwable: Throwable) {
-        views.passwordFieldTil.error = errorFormatter.toHumanReadable(throwable)
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        views.loginMatrixIdentifier.text = state.userIdentifier()
-
-        if (state.isLoading) {
-            // Ensure password is hidden
-            views.passwordField.hidePassword()
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupUsername2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupUsername2.kt
deleted file mode 100644
index 18645235f5..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupUsername2.kt
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.annotation.SuppressLint
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.autofill.HintConstants
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import im.vector.app.R
-import im.vector.app.core.extensions.hideKeyboard
-import im.vector.app.core.extensions.toReducedUrl
-import im.vector.app.databinding.FragmentLoginSignupUsername2Binding
-import im.vector.app.features.login.LoginMode
-import im.vector.app.features.login.SSORedirectRouterActivity
-import im.vector.app.features.login.SocialLoginButtonsView
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import org.matrix.android.sdk.api.auth.SSOAction
-import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
-import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
-
-/**
- * In this screen:
- * - the user is asked for an identifier to sign up to a homeserver.
- * - SSO option are displayed if available
- */
-class LoginFragmentSignupUsername2 @Inject constructor() : AbstractSSOLoginFragment2<FragmentLoginSignupUsername2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSignupUsername2Binding {
-        return FragmentLoginSignupUsername2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupSubmitButton()
-        setupAutoFill()
-        setupSocialLoginButtons()
-    }
-
-    private fun setupAutoFill() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            views.loginField.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_USERNAME)
-        }
-    }
-
-    private fun setupSocialLoginButtons() {
-        views.loginSocialLoginButtons.mode = SocialLoginButtonsView.Mode.MODE_SIGN_UP
-    }
-
-    private fun submit() {
-        cleanupUi()
-
-        val login = views.loginField.text.toString().trim()
-
-        // This can be called by the IME action, so deal with empty cases
-        var error = 0
-        if (login.isEmpty()) {
-            views.loginFieldTil.error = getString(R.string.error_empty_field_choose_user_name)
-            error++
-        }
-
-        if (error == 0) {
-            loginViewModel.handle(LoginAction2.SetUserName(login))
-        }
-    }
-
-    private fun cleanupUi() {
-        views.loginSubmit.hideKeyboard()
-        views.loginFieldTil.error = null
-    }
-
-    private fun setupUi(state: LoginViewState2) {
-        views.loginSubtitle.text = getString(R.string.login_signup_to, state.homeServerUrlFromUser.toReducedUrl())
-
-        if (state.loginMode is LoginMode.SsoAndPassword) {
-            views.loginSocialLoginContainer.isVisible = true
-            views.loginSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders?.sorted()
-            views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                override fun onProviderSelected(provider: SsoIdentityProvider?) {
-                    loginViewModel.getSsoUrl(
-                            redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
-                            deviceId = state.deviceId,
-                            providerId = provider?.id,
-                            action = if (state.signMode == SignMode2.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
-                    )
-                            ?.let { openInCustomTab(it) }
-                }
-            }
-        } else {
-            views.loginSocialLoginContainer.isVisible = false
-            views.loginSocialLoginButtons.ssoIdentityProviders = null
-        }
-    }
-
-    private fun setupSubmitButton() {
-        views.loginSubmit.setOnClickListener { submit() }
-        views.loginField.textChanges()
-                .map { it.trim() }
-                .onEach { text ->
-                    val isNotEmpty = text.isNotEmpty()
-                    views.loginFieldTil.error = null
-                    views.loginSubmit.isEnabled = isNotEmpty
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
-    override fun resetViewModel() {
-        // loginViewModel.handle(LoginAction2.ResetSignup)
-    }
-
-    override fun onError(throwable: Throwable) {
-        views.loginFieldTil.error = errorFormatter.toHumanReadable(throwable)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun updateWithState(state: LoginViewState2) {
-        setupUi(state)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentToAny2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginFragmentToAny2.kt
deleted file mode 100644
index 089822fc74..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentToAny2.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import androidx.autofill.HintConstants
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import im.vector.app.R
-import im.vector.app.core.extensions.hideKeyboard
-import im.vector.app.core.extensions.hidePassword
-import im.vector.app.core.extensions.toReducedUrl
-import im.vector.app.databinding.FragmentLoginSigninToAny2Binding
-import im.vector.app.features.login.LoginMode
-import im.vector.app.features.login.SSORedirectRouterActivity
-import im.vector.app.features.login.SocialLoginButtonsView
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import org.matrix.android.sdk.api.auth.SSOAction
-import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.api.failure.MatrixError
-import org.matrix.android.sdk.api.failure.isInvalidPassword
-import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
-
-/**
- * In this screen:
- * User want to sign in and has selected a server to do so
- * - the user is asked for login (or email) and password to sign in to a homeserver.
- * - He also can reset his password
- * - It also possible to use SSO if server support it in this screen
- */
-class LoginFragmentToAny2 @Inject constructor() : AbstractSSOLoginFragment2<FragmentLoginSigninToAny2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSigninToAny2Binding {
-        return FragmentLoginSigninToAny2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupSubmitButton()
-        setupForgottenPasswordButton()
-        setupAutoFill()
-        setupSocialLoginButtons()
-
-        views.passwordField.setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                submit()
-                return@setOnEditorActionListener true
-            }
-            return@setOnEditorActionListener false
-        }
-    }
-
-    private fun setupForgottenPasswordButton() {
-        views.forgetPasswordButton.setOnClickListener { forgetPasswordClicked() }
-    }
-
-    private fun setupAutoFill() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            views.loginField.setAutofillHints(HintConstants.AUTOFILL_HINT_USERNAME)
-            views.passwordField.setAutofillHints(HintConstants.AUTOFILL_HINT_PASSWORD)
-        }
-    }
-
-    private fun setupSocialLoginButtons() {
-        views.loginSocialLoginButtons.mode = SocialLoginButtonsView.Mode.MODE_SIGN_IN
-    }
-
-    private fun submit() {
-        cleanupUi()
-
-        val login = views.loginField.text.toString()
-        val password = views.passwordField.text.toString()
-
-        // This can be called by the IME action, so deal with empty cases
-        var error = 0
-        if (login.isEmpty()) {
-            views.loginFieldTil.error = getString(R.string.error_empty_field_enter_user_name)
-            error++
-        }
-        if (password.isEmpty()) {
-            views.passwordFieldTil.error = getString(R.string.error_empty_field_your_password)
-            error++
-        }
-
-        if (error == 0) {
-            loginViewModel.handle(LoginAction2.LoginWith(login, password))
-        }
-    }
-
-    private fun cleanupUi() {
-        views.loginSubmit.hideKeyboard()
-        views.loginFieldTil.error = null
-        views.passwordFieldTil.error = null
-    }
-
-    private fun setupUi(state: LoginViewState2) {
-        views.loginTitle.text = getString(R.string.login_connect_to, state.homeServerUrlFromUser.toReducedUrl())
-
-        if (state.loginMode is LoginMode.SsoAndPassword) {
-            views.loginSocialLoginContainer.isVisible = true
-            views.loginSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders?.sorted()
-            views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                override fun onProviderSelected(provider: SsoIdentityProvider?) {
-                    loginViewModel.getSsoUrl(
-                            redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
-                            deviceId = state.deviceId,
-                            providerId = provider?.id,
-                            action = if (state.signMode == SignMode2.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
-                    )
-                            ?.let { openInCustomTab(it) }
-                }
-            }
-        } else {
-            views.loginSocialLoginContainer.isVisible = false
-            views.loginSocialLoginButtons.ssoIdentityProviders = null
-        }
-    }
-
-    private fun setupSubmitButton() {
-        views.loginSubmit.setOnClickListener { submit() }
-        combine(
-                views.loginField.textChanges().map { it.trim().isNotEmpty() },
-                views.passwordField.textChanges().map { it.isNotEmpty() }
-        ) { isLoginNotEmpty, isPasswordNotEmpty ->
-            isLoginNotEmpty && isPasswordNotEmpty
-        }
-                .onEach {
-                    views.loginFieldTil.error = null
-                    views.passwordFieldTil.error = null
-                    views.loginSubmit.isEnabled = it
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
-    private fun forgetPasswordClicked() {
-        loginViewModel.handle(LoginAction2.PostViewEvent(LoginViewEvents2.OpenResetPasswordScreen))
-    }
-
-    override fun resetViewModel() {
-        // loginViewModel.handle(LoginAction2.ResetSignin)
-    }
-
-    override fun onError(throwable: Throwable) {
-        // Show M_WEAK_PASSWORD error in the password field
-        if (throwable is Failure.ServerError &&
-                throwable.error.code == MatrixError.M_WEAK_PASSWORD) {
-            views.passwordFieldTil.error = errorFormatter.toHumanReadable(throwable)
-        } else {
-            if (throwable is Failure.ServerError &&
-                    throwable.error.code == MatrixError.M_FORBIDDEN &&
-                    throwable.error.message.isEmpty()) {
-                // Login with email, but email unknown
-                views.loginFieldTil.error = getString(R.string.login_login_with_email_error)
-            } else {
-                // Trick to display the error without text.
-                views.loginFieldTil.error = " "
-                if (throwable.isInvalidPassword() && spaceInPassword()) {
-                    views.passwordFieldTil.error = getString(R.string.auth_invalid_login_param_space_in_password)
-                } else {
-                    views.passwordFieldTil.error = errorFormatter.toHumanReadable(throwable)
-                }
-            }
-        }
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        setupUi(state)
-
-        if (state.isLoading) {
-            // Ensure password is hidden
-            views.passwordField.hidePassword()
-        }
-    }
-
-    /**
-     * Detect if password ends or starts with spaces.
-     */
-    private fun spaceInPassword() = views.passwordField.text.toString().let { it.trim() != it }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginGenericTextInputFormFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginGenericTextInputFormFragment2.kt
deleted file mode 100644
index 91954f29e4..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginGenericTextInputFormFragment2.kt
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Build
-import android.os.Bundle
-import android.text.InputType
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.autofill.HintConstants
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import com.airbnb.mvrx.args
-import com.google.i18n.phonenumbers.NumberParseException
-import com.google.i18n.phonenumbers.PhoneNumberUtil
-import im.vector.app.R
-import im.vector.app.core.extensions.hideKeyboard
-import im.vector.app.core.extensions.isEmail
-import im.vector.app.core.extensions.setTextOrHide
-import im.vector.app.core.extensions.toReducedUrl
-import im.vector.app.databinding.FragmentLoginGenericTextInputForm2Binding
-import im.vector.app.features.login.LoginGenericTextInputFormFragmentArgument
-import im.vector.app.features.login.TextInputFormFragmentMode
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.api.failure.is401
-import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
-
-/**
- * In this screen, the user is asked for a text input.
- */
-class LoginGenericTextInputFormFragment2 @Inject constructor() : AbstractLoginFragment2<FragmentLoginGenericTextInputForm2Binding>() {
-
-    private val params: LoginGenericTextInputFormFragmentArgument by args()
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginGenericTextInputForm2Binding {
-        return FragmentLoginGenericTextInputForm2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupViews()
-        setupUi()
-        setupSubmitButton()
-        setupTil()
-        setupAutoFill()
-    }
-
-    private fun setupViews() {
-        views.loginGenericTextInputFormOtherButton.setOnClickListener { onOtherButtonClicked() }
-        views.loginGenericTextInputFormSubmit.setOnClickListener { submit() }
-        views.loginGenericTextInputFormLater.setOnClickListener { submit() }
-    }
-
-    private fun setupAutoFill() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            views.loginGenericTextInputFormTextInput.setAutofillHints(
-                    when (params.mode) {
-                        TextInputFormFragmentMode.SetEmail -> HintConstants.AUTOFILL_HINT_EMAIL_ADDRESS
-                        TextInputFormFragmentMode.SetMsisdn -> HintConstants.AUTOFILL_HINT_PHONE_NUMBER
-                        TextInputFormFragmentMode.ConfirmMsisdn -> HintConstants.AUTOFILL_HINT_SMS_OTP
-                    }
-            )
-        }
-    }
-
-    private fun setupTil() {
-        views.loginGenericTextInputFormTextInput.textChanges()
-                .onEach {
-                    views.loginGenericTextInputFormTil.error = null
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
-    private fun setupUi() {
-        when (params.mode) {
-            TextInputFormFragmentMode.SetEmail -> {
-                views.loginGenericTextInputFormTitle.text = getString(R.string.login_set_email_title_2)
-                views.loginGenericTextInputFormNotice.text = getString(R.string.login_set_email_notice_2)
-                // Text will be updated with the state
-                views.loginGenericTextInputFormMandatoryNotice.isVisible = params.mandatory
-                views.loginGenericTextInputFormNotice2.isVisible = false
-                views.loginGenericTextInputFormTil.hint =
-                        getString(if (params.mandatory) R.string.login_set_email_mandatory_hint else R.string.login_set_email_optional_hint)
-                views.loginGenericTextInputFormTextInput.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
-                views.loginGenericTextInputFormOtherButton.isVisible = false
-                views.loginGenericTextInputFormSubmit.text = getString(R.string.login_set_email_submit)
-            }
-            TextInputFormFragmentMode.SetMsisdn -> {
-                views.loginGenericTextInputFormTitle.text = getString(R.string.login_set_msisdn_title_2)
-                views.loginGenericTextInputFormNotice.text = getString(R.string.login_set_msisdn_notice_2)
-                // Text will be updated with the state
-                views.loginGenericTextInputFormMandatoryNotice.isVisible = params.mandatory
-                views.loginGenericTextInputFormNotice2.setTextOrHide(getString(R.string.login_set_msisdn_notice2))
-                views.loginGenericTextInputFormTil.hint =
-                        getString(if (params.mandatory) R.string.login_set_msisdn_mandatory_hint else R.string.login_set_msisdn_optional_hint)
-                views.loginGenericTextInputFormTextInput.inputType = InputType.TYPE_CLASS_PHONE
-                views.loginGenericTextInputFormOtherButton.isVisible = false
-                views.loginGenericTextInputFormSubmit.text = getString(R.string.login_set_msisdn_submit)
-            }
-            TextInputFormFragmentMode.ConfirmMsisdn -> {
-                views.loginGenericTextInputFormTitle.text = getString(R.string.login_msisdn_confirm_title)
-                views.loginGenericTextInputFormNotice.text = getString(R.string.login_msisdn_confirm_notice, params.extra)
-                views.loginGenericTextInputFormMandatoryNotice.isVisible = false
-                views.loginGenericTextInputFormNotice2.isVisible = false
-                views.loginGenericTextInputFormTil.hint =
-                        getString(R.string.login_msisdn_confirm_hint)
-                views.loginGenericTextInputFormTextInput.inputType = InputType.TYPE_CLASS_NUMBER
-                views.loginGenericTextInputFormOtherButton.isVisible = true
-                views.loginGenericTextInputFormOtherButton.text = getString(R.string.login_msisdn_confirm_send_again)
-                views.loginGenericTextInputFormSubmit.text = getString(R.string.login_msisdn_confirm_submit)
-            }
-        }
-    }
-
-    private fun onOtherButtonClicked() {
-        when (params.mode) {
-            TextInputFormFragmentMode.ConfirmMsisdn -> {
-                loginViewModel.handle(LoginAction2.SendAgainThreePid)
-            }
-            else -> {
-                // Should not happen, button is not displayed
-            }
-        }
-    }
-
-    private fun submit() {
-        cleanupUi()
-        val text = views.loginGenericTextInputFormTextInput.text.toString()
-
-        if (text.isEmpty()) {
-            // Perform dummy action
-            loginViewModel.handle(LoginAction2.RegisterDummy)
-        } else {
-            when (params.mode) {
-                TextInputFormFragmentMode.SetEmail -> {
-                    loginViewModel.handle(LoginAction2.AddThreePid(RegisterThreePid.Email(text)))
-                }
-                TextInputFormFragmentMode.SetMsisdn -> {
-                    getCountryCodeOrShowError(text)?.let { countryCode ->
-                        loginViewModel.handle(LoginAction2.AddThreePid(RegisterThreePid.Msisdn(text, countryCode)))
-                    }
-                }
-                TextInputFormFragmentMode.ConfirmMsisdn -> {
-                    loginViewModel.handle(LoginAction2.ValidateThreePid(text))
-                }
-            }
-        }
-    }
-
-    private fun cleanupUi() {
-        views.loginGenericTextInputFormSubmit.hideKeyboard()
-        views.loginGenericTextInputFormSubmit.error = null
-    }
-
-    private fun getCountryCodeOrShowError(text: String): String? {
-        // We expect an international format for the moment (see https://github.com/vector-im/riotX-android/issues/693)
-        if (text.startsWith("+")) {
-            try {
-                val phoneNumber = PhoneNumberUtil.getInstance().parse(text, null)
-                return PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(phoneNumber.countryCode)
-            } catch (e: NumberParseException) {
-                views.loginGenericTextInputFormTil.error = getString(R.string.login_msisdn_error_other)
-            }
-        } else {
-            views.loginGenericTextInputFormTil.error = getString(R.string.login_msisdn_error_not_international)
-        }
-
-        // Error
-        return null
-    }
-
-    private fun setupSubmitButton() {
-        views.loginGenericTextInputFormSubmit.isEnabled = false
-        views.loginGenericTextInputFormTextInput.textChanges()
-                .onEach { text ->
-                    views.loginGenericTextInputFormSubmit.isEnabled = isInputValid(text)
-                    updateSubmitButtons(text)
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
-    private fun updateSubmitButtons(text: CharSequence) {
-        if (params.mandatory) {
-            views.loginGenericTextInputFormSubmit.isVisible = true
-            views.loginGenericTextInputFormLater.isVisible = false
-        } else {
-            views.loginGenericTextInputFormSubmit.isVisible = text.isNotEmpty()
-            views.loginGenericTextInputFormLater.isVisible = text.isEmpty()
-        }
-    }
-
-    private fun isInputValid(input: CharSequence): Boolean {
-        return if (input.isEmpty() && !params.mandatory) {
-            true
-        } else {
-            when (params.mode) {
-                TextInputFormFragmentMode.SetEmail -> input.isEmail()
-                TextInputFormFragmentMode.SetMsisdn -> input.isNotBlank()
-                TextInputFormFragmentMode.ConfirmMsisdn -> input.isNotBlank()
-            }
-        }
-    }
-
-    override fun onError(throwable: Throwable) {
-        when (params.mode) {
-            TextInputFormFragmentMode.SetEmail -> {
-                if (throwable.is401()) {
-                    // This is normal use case, we go to the mail waiting screen
-                    loginViewModel.handle(LoginAction2.PostViewEvent(LoginViewEvents2.OnSendEmailSuccess(loginViewModel.currentThreePid ?: "")))
-                } else {
-                    views.loginGenericTextInputFormTil.error = errorFormatter.toHumanReadable(throwable)
-                }
-            }
-            TextInputFormFragmentMode.SetMsisdn -> {
-                if (throwable.is401()) {
-                    // This is normal use case, we go to the enter code screen
-                    loginViewModel.handle(LoginAction2.PostViewEvent(LoginViewEvents2.OnSendMsisdnSuccess(loginViewModel.currentThreePid ?: "")))
-                } else {
-                    views.loginGenericTextInputFormTil.error = errorFormatter.toHumanReadable(throwable)
-                }
-            }
-            TextInputFormFragmentMode.ConfirmMsisdn -> {
-                when {
-                    throwable is Failure.SuccessError ->
-                        // The entered code is not correct
-                        views.loginGenericTextInputFormTil.error = getString(R.string.login_validation_code_is_not_correct)
-                    throwable.is401() ->
-                        // It can happen if user request again the 3pid
-                        Unit
-                    else ->
-                        views.loginGenericTextInputFormTil.error = errorFormatter.toHumanReadable(throwable)
-                }
-            }
-        }
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetSignup)
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        views.loginGenericTextInputFormMandatoryNotice.text = when (params.mode) {
-            TextInputFormFragmentMode.SetEmail -> getString(R.string.login_set_email_mandatory_notice_2, state.homeServerUrlFromUser.toReducedUrl())
-            TextInputFormFragmentMode.SetMsisdn -> getString(R.string.login_set_msisdn_mandatory_notice_2, state.homeServerUrlFromUser.toReducedUrl())
-            TextInputFormFragmentMode.ConfirmMsisdn -> null
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt
deleted file mode 100644
index 7916d9bbf2..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import androidx.autofill.HintConstants
-import androidx.lifecycle.lifecycleScope
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.R
-import im.vector.app.core.extensions.hideKeyboard
-import im.vector.app.core.extensions.hidePassword
-import im.vector.app.core.extensions.isEmail
-import im.vector.app.core.extensions.toReducedUrl
-import im.vector.app.core.utils.autoResetTextInputLayoutErrors
-import im.vector.app.databinding.FragmentLoginResetPassword2Binding
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
-
-/**
- * In this screen, the user is asked for email and new password to reset his password.
- */
-class LoginResetPasswordFragment2 @Inject constructor() : AbstractLoginFragment2<FragmentLoginResetPassword2Binding>() {
-
-    // Show warning only once
-    private var showWarning = true
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginResetPassword2Binding {
-        return FragmentLoginResetPassword2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupSubmitButton()
-        setupAutoFill()
-
-        autoResetTextInputLayoutErrors(listOf(views.resetPasswordEmailTil, views.passwordFieldTil))
-
-        views.passwordField.setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                submit()
-                return@setOnEditorActionListener true
-            }
-            return@setOnEditorActionListener false
-        }
-    }
-
-    private fun setupAutoFill() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            views.resetPasswordEmail.setAutofillHints(HintConstants.AUTOFILL_HINT_EMAIL_ADDRESS)
-            views.passwordField.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_PASSWORD)
-        }
-    }
-
-    private fun setupUi(state: LoginViewState2) {
-        views.resetPasswordTitle.text = getString(R.string.login_reset_password_on, state.homeServerUrlFromUser.toReducedUrl())
-    }
-
-    private fun setupSubmitButton() {
-        views.resetPasswordSubmit.setOnClickListener { submit() }
-        combine(
-                views.resetPasswordEmail.textChanges().map { it.isEmail() },
-                views.passwordField.textChanges().map { it.isNotEmpty() }
-        ) { isEmail, isPasswordNotEmpty ->
-            isEmail && isPasswordNotEmpty
-        }
-                .onEach {
-                    views.resetPasswordSubmit.isEnabled = it
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
-    private fun submit() {
-        cleanupUi()
-
-        var error = 0
-
-        val email = views.resetPasswordEmail.text.toString()
-        val password = views.passwordField.text.toString()
-
-        if (email.isEmpty()) {
-            views.resetPasswordEmailTil.error = getString(R.string.auth_reset_password_missing_email)
-            error++
-        }
-
-        if (password.isEmpty()) {
-            views.passwordFieldTil.error = getString(R.string.login_please_choose_a_new_password)
-            error++
-        }
-
-        if (error > 0) {
-            return
-        }
-
-        if (showWarning) {
-            // Display a warning as Riot-Web does first
-            MaterialAlertDialogBuilder(requireActivity())
-                    .setTitle(R.string.login_reset_password_warning_title)
-                    .setMessage(R.string.login_reset_password_warning_content)
-                    .setPositiveButton(R.string.login_reset_password_warning_submit) { _, _ ->
-                        showWarning = false
-                        doSubmit()
-                    }
-                    .setNegativeButton(R.string.action_cancel, null)
-                    .show()
-        } else {
-            doSubmit()
-        }
-    }
-
-    private fun doSubmit() {
-        val email = views.resetPasswordEmail.text.toString()
-        val password = views.passwordField.text.toString()
-
-        loginViewModel.handle(LoginAction2.ResetPassword(email, password))
-    }
-
-    private fun cleanupUi() {
-        views.resetPasswordSubmit.hideKeyboard()
-        views.resetPasswordEmailTil.error = null
-        views.passwordFieldTil.error = null
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetResetPassword)
-    }
-
-    override fun onError(throwable: Throwable) {
-        views.resetPasswordEmailTil.error = errorFormatter.toHumanReadable(throwable)
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        setupUi(state)
-
-        if (state.isLoading) {
-            // Ensure new password is hidden
-            views.passwordField.hidePassword()
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordMailConfirmationFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordMailConfirmationFragment2.kt
deleted file mode 100644
index de1bcb8eea..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordMailConfirmationFragment2.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.R
-import im.vector.app.databinding.FragmentLoginResetPasswordMailConfirmation2Binding
-import org.matrix.android.sdk.api.failure.is401
-import javax.inject.Inject
-
-/**
- * In this screen, the user is asked to check their email and to click on a button once it's done.
- */
-class LoginResetPasswordMailConfirmationFragment2 @Inject constructor() : AbstractLoginFragment2<FragmentLoginResetPasswordMailConfirmation2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginResetPasswordMailConfirmation2Binding {
-        return FragmentLoginResetPasswordMailConfirmation2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        views.resetPasswordMailConfirmationSubmit.setOnClickListener { submit() }
-    }
-
-    private fun setupUi(state: LoginViewState2) {
-        views.resetPasswordMailConfirmationNotice.text = getString(R.string.login_reset_password_mail_confirmation_notice, state.resetPasswordEmail)
-    }
-
-    private fun submit() {
-        loginViewModel.handle(LoginAction2.ResetPasswordMailConfirmed)
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetResetPassword)
-    }
-
-    override fun onError(throwable: Throwable) {
-        // Link in email not yet clicked ?
-        val message = if (throwable.is401()) {
-            getString(R.string.auth_reset_password_error_unauthorized)
-        } else {
-            errorFormatter.toHumanReadable(throwable)
-        }
-
-        MaterialAlertDialogBuilder(requireActivity())
-                .setTitle(R.string.dialog_title_error)
-                .setMessage(message)
-                .setPositiveButton(R.string.ok, null)
-                .show()
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        setupUi(state)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordSuccessFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordSuccessFragment2.kt
deleted file mode 100644
index 33ebd13f2a..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordSuccessFragment2.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import im.vector.app.databinding.FragmentLoginResetPasswordSuccess2Binding
-import javax.inject.Inject
-
-/**
- * In this screen, we confirm to the user that his password has been reset.
- */
-class LoginResetPasswordSuccessFragment2 @Inject constructor() : AbstractLoginFragment2<FragmentLoginResetPasswordSuccess2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginResetPasswordSuccess2Binding {
-        return FragmentLoginResetPasswordSuccess2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        views.resetPasswordSuccessSubmit.setOnClickListener { submit() }
-    }
-
-    private fun submit() {
-        loginViewModel.handle(LoginAction2.PostViewEvent(LoginViewEvents2.OnResetPasswordMailConfirmationSuccessDone))
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetResetPassword)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginServerSelectionFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginServerSelectionFragment2.kt
deleted file mode 100644
index b338b96c5d..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginServerSelectionFragment2.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import im.vector.app.R
-import im.vector.app.core.extensions.setTextWithColoredPart
-import im.vector.app.core.utils.openUrlInChromeCustomTab
-import im.vector.app.databinding.FragmentLoginServerSelection2Binding
-import im.vector.app.features.login.EMS_LINK
-import javax.inject.Inject
-
-/**
- * In this screen, the user will choose between matrix.org, or other type of homeserver.
- */
-class LoginServerSelectionFragment2 @Inject constructor() : AbstractLoginFragment2<FragmentLoginServerSelection2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginServerSelection2Binding {
-        return FragmentLoginServerSelection2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        initViews()
-    }
-
-    private fun initViews() {
-        views.loginServerChoiceMatrixOrg.setOnClickListener { selectMatrixOrg() }
-        views.loginServerChoiceOther.setOnClickListener { selectOther() }
-
-        views.loginServerChoiceEmsLearnMore.setTextWithColoredPart(
-                fullTextRes = R.string.login_server_modular_learn_more_about_ems,
-                coloredTextRes = R.string.login_server_modular_learn_more,
-                underline = true
-        )
-        views.loginServerChoiceEmsLearnMore.setOnClickListener {
-            openUrlInChromeCustomTab(requireActivity(), null, EMS_LINK)
-        }
-    }
-
-    private fun updateUi(state: LoginViewState2) {
-        when (state.signMode) {
-            SignMode2.Unknown -> Unit
-            SignMode2.SignUp -> {
-                views.loginServerTitle.setText(R.string.login_please_choose_a_server)
-            }
-            SignMode2.SignIn -> {
-                views.loginServerTitle.setText(R.string.login_please_select_your_server)
-            }
-        }
-    }
-
-    private fun selectMatrixOrg() {
-        views.loginServerChoiceMatrixOrg.isChecked = true
-        loginViewModel.handle(LoginAction2.ChooseDefaultHomeServer)
-    }
-
-    private fun selectOther() {
-        views.loginServerChoiceOther.isChecked = true
-        loginViewModel.handle(LoginAction2.EnterServerUrl)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        views.loginServerChoiceMatrixOrg.isChecked = false
-        views.loginServerChoiceOther.isChecked = false
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetHomeServerUrl)
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        updateUi(state)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
deleted file mode 100644
index 50f8f38634..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import android.widget.ArrayAdapter
-import androidx.core.view.isInvisible
-import androidx.lifecycle.lifecycleScope
-import com.google.android.material.textfield.TextInputLayout
-import im.vector.app.R
-import im.vector.app.core.extensions.hideKeyboard
-import im.vector.app.core.resources.BuildMeta
-import im.vector.app.core.utils.ensureProtocol
-import im.vector.app.databinding.FragmentLoginServerUrlForm2Binding
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.api.failure.MatrixError
-import reactivecircus.flowbinding.android.widget.textChanges
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.net.ssl.HttpsURLConnection
-
-/**
- * In this screen, the user is prompted to enter a homeserver url.
- */
-class LoginServerUrlFormFragment2 @Inject constructor(
-        private val buildMeta: BuildMeta,
-) : AbstractLoginFragment2<FragmentLoginServerUrlForm2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginServerUrlForm2Binding {
-        return FragmentLoginServerUrlForm2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupViews()
-        setupHomeServerField()
-    }
-
-    private fun setupViews() {
-        views.loginServerUrlFormClearHistory.setOnClickListener { clearHistory() }
-        views.loginServerUrlFormSubmit.setOnClickListener { submit() }
-    }
-
-    private fun setupHomeServerField() {
-        views.loginServerUrlFormHomeServerUrl.textChanges()
-                .onEach {
-                    views.loginServerUrlFormHomeServerUrlTil.error = null
-                    views.loginServerUrlFormSubmit.isEnabled = it.isNotBlank()
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-
-        views.loginServerUrlFormHomeServerUrl.setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                views.loginServerUrlFormHomeServerUrl.dismissDropDown()
-                submit()
-                return@setOnEditorActionListener true
-            }
-            return@setOnEditorActionListener false
-        }
-    }
-
-    private fun setupUi(state: LoginViewState2) {
-        val completions = state.knownCustomHomeServersUrls + if (buildMeta.isDebug) listOf("http://10.0.2.2:8080") else emptyList()
-        views.loginServerUrlFormHomeServerUrl.setAdapter(
-                ArrayAdapter(
-                        requireContext(),
-                        R.layout.item_completion_homeserver,
-                        completions
-                )
-        )
-        views.loginServerUrlFormHomeServerUrlTil.endIconMode = TextInputLayout.END_ICON_DROPDOWN_MENU
-                .takeIf { completions.isNotEmpty() }
-                ?: TextInputLayout.END_ICON_NONE
-
-        views.loginServerUrlFormClearHistory.isInvisible = state.knownCustomHomeServersUrls.isEmpty()
-    }
-
-    private fun clearHistory() {
-        loginViewModel.handle(LoginAction2.ClearHomeServerHistory)
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetHomeServerUrl)
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun submit() {
-        cleanupUi()
-
-        // Static check of homeserver url, empty, malformed, etc.
-        val serverUrl = views.loginServerUrlFormHomeServerUrl.text.toString().trim().ensureProtocol()
-
-        when {
-            serverUrl.isBlank() -> {
-                views.loginServerUrlFormHomeServerUrlTil.error = getString(R.string.login_error_invalid_home_server)
-            }
-            else -> {
-                views.loginServerUrlFormHomeServerUrl.setText(serverUrl, false /* to avoid completion dialog flicker*/)
-                loginViewModel.handle(LoginAction2.UpdateHomeServer(serverUrl))
-            }
-        }
-    }
-
-    private fun cleanupUi() {
-        views.loginServerUrlFormSubmit.hideKeyboard()
-        views.loginServerUrlFormHomeServerUrlTil.error = null
-    }
-
-    override fun onError(throwable: Throwable) {
-        views.loginServerUrlFormHomeServerUrlTil.error = if (throwable is Failure.NetworkConnection &&
-                throwable.ioException is UnknownHostException) {
-            // Invalid homeserver?
-            getString(R.string.login_error_homeserver_not_found)
-        } else {
-            if (throwable is Failure.ServerError &&
-                    throwable.error.code == MatrixError.M_FORBIDDEN &&
-                    throwable.httpCode == HttpsURLConnection.HTTP_FORBIDDEN /* 403 */) {
-                getString(R.string.login_registration_disabled)
-            } else {
-                errorFormatter.toHumanReadable(throwable)
-            }
-        }
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        setupUi(state)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginSplashSignUpSignInSelectionFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginSplashSignUpSignInSelectionFragment2.kt
deleted file mode 100644
index 84af28f75e..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginSplashSignUpSignInSelectionFragment2.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import im.vector.app.core.resources.BuildMeta
-import im.vector.app.databinding.FragmentLoginSplash2Binding
-import im.vector.app.features.settings.VectorPreferences
-import javax.inject.Inject
-
-/**
- * In this screen, the user is asked to sign up or to sign in to the homeserver.
- * This is the new splash screen.
- */
-class LoginSplashSignUpSignInSelectionFragment2 @Inject constructor(
-        private val vectorPreferences: VectorPreferences,
-        private val buildMeta: BuildMeta,
-) : AbstractLoginFragment2<FragmentLoginSplash2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSplash2Binding {
-        return FragmentLoginSplash2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupViews()
-    }
-
-    private fun setupViews() {
-        views.loginSignupSigninSignUp.setOnClickListener { signUp() }
-        views.loginSignupSigninSignIn.setOnClickListener { signIn() }
-
-        if (buildMeta.isDebug || vectorPreferences.developerMode()) {
-            views.loginSplashVersion.isVisible = true
-            @SuppressLint("SetTextI18n")
-            views.loginSplashVersion.text = "Version : ${buildMeta.versionName}\n" +
-                    "Branch: ${buildMeta.gitBranchName}\n" +
-                    "Build: ${buildMeta.buildNumber}"
-            views.loginSplashVersion.debouncedClicks { navigator.openDebug(requireContext()) }
-        }
-    }
-
-    private fun signUp() {
-        loginViewModel.handle(LoginAction2.UpdateSignMode(SignMode2.SignUp))
-    }
-
-    private fun signIn() {
-        loginViewModel.handle(LoginAction2.UpdateSignMode(SignMode2.SignIn))
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetSignMode)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginSsoOnlyFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginSsoOnlyFragment2.kt
deleted file mode 100644
index e631aff7d1..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginSsoOnlyFragment2.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.airbnb.mvrx.withState
-import im.vector.app.R
-import im.vector.app.core.extensions.toReducedUrl
-import im.vector.app.databinding.FragmentLoginSsoOnly2Binding
-import im.vector.app.features.login.SSORedirectRouterActivity
-import org.matrix.android.sdk.api.auth.SSOAction
-import javax.inject.Inject
-
-/**
- * In this screen, the user is asked to sign up or to sign in to the homeserver.
- */
-class LoginSsoOnlyFragment2 @Inject constructor() : AbstractSSOLoginFragment2<FragmentLoginSsoOnly2Binding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSsoOnly2Binding {
-        return FragmentLoginSsoOnly2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupViews()
-    }
-
-    private fun setupViews() {
-        views.loginSignupSigninSubmit.setOnClickListener { submit() }
-    }
-
-    private fun setupUi(state: LoginViewState2) {
-        views.loginSignupSigninTitle.text = getString(R.string.login_connect_to, state.homeServerUrlFromUser.toReducedUrl())
-    }
-
-    private fun submit() = withState(loginViewModel) { state ->
-        loginViewModel.getSsoUrl(
-                redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
-                deviceId = state.deviceId,
-                providerId = null,
-                action = if (state.signMode == SignMode2.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
-        )
-                ?.let { openInCustomTab(it) }
-    }
-
-    override fun resetViewModel() {
-        // No op
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        setupUi(state)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginViewEvents2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginViewEvents2.kt
deleted file mode 100644
index 11a441923e..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginViewEvents2.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- *
- */
-
-package im.vector.app.features.login2
-
-import im.vector.app.core.platform.VectorViewEvents
-import org.matrix.android.sdk.api.auth.registration.FlowResult
-
-/**
- * Transient events for Login.
- */
-sealed class LoginViewEvents2 : VectorViewEvents {
-    data class Failure(val throwable: Throwable) : LoginViewEvents2()
-
-    data class RegistrationFlowResult(val flowResult: FlowResult, val isRegistrationStarted: Boolean) : LoginViewEvents2()
-    object OutdatedHomeserver : LoginViewEvents2()
-
-    // Navigation event
-    object OpenSigninPasswordScreen : LoginViewEvents2()
-    object OpenSignupPasswordScreen : LoginViewEvents2()
-
-    object OpenSignInEnterIdentifierScreen : LoginViewEvents2()
-
-    object OpenSignUpChooseUsernameScreen : LoginViewEvents2()
-    object OpenSignInWithAnythingScreen : LoginViewEvents2()
-
-    object OpenSsoOnlyScreen : LoginViewEvents2()
-
-    object OpenServerSelection : LoginViewEvents2()
-    object OpenHomeServerUrlFormScreen : LoginViewEvents2()
-
-    object OpenResetPasswordScreen : LoginViewEvents2()
-    object OnResetPasswordSendThreePidDone : LoginViewEvents2()
-    object OnResetPasswordMailConfirmationSuccess : LoginViewEvents2()
-    object OnResetPasswordMailConfirmationSuccessDone : LoginViewEvents2()
-
-    object CancelRegistration : LoginViewEvents2()
-
-    data class OnLoginModeNotSupported(val supportedTypes: List<String>) : LoginViewEvents2()
-
-    data class OnSendEmailSuccess(val email: String) : LoginViewEvents2()
-    data class OnSendMsisdnSuccess(val msisdn: String) : LoginViewEvents2()
-
-    data class OnWebLoginError(val errorCode: Int, val description: String, val failingUrl: String) : LoginViewEvents2()
-
-    data class OnSessionCreated(val newAccount: Boolean) : LoginViewEvents2()
-
-    object Finish : LoginViewEvents2()
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
deleted file mode 100644
index 71129f05e9..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
+++ /dev/null
@@ -1,830 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.content.Context
-import android.net.Uri
-import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MavericksViewModelFactory
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.di.MavericksAssistedViewModelFactory
-import im.vector.app.core.di.hiltMavericksViewModelFactory
-import im.vector.app.core.extensions.configureAndStart
-import im.vector.app.core.extensions.tryAsync
-import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.utils.ensureTrailingSlash
-import im.vector.app.features.login.HomeServerConnectionConfigFactory
-import im.vector.app.features.login.LoginConfig
-import im.vector.app.features.login.LoginMode
-import im.vector.app.features.login.ReAuthHelper
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixPatterns.getServerName
-import org.matrix.android.sdk.api.auth.AuthenticationService
-import org.matrix.android.sdk.api.auth.HomeServerHistoryService
-import org.matrix.android.sdk.api.auth.SSOAction
-import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
-import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
-import org.matrix.android.sdk.api.auth.login.LoginWizard
-import org.matrix.android.sdk.api.auth.registration.FlowResult
-import org.matrix.android.sdk.api.auth.registration.RegistrationAvailability
-import org.matrix.android.sdk.api.auth.registration.RegistrationResult
-import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
-import org.matrix.android.sdk.api.auth.registration.Stage
-import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
-import org.matrix.android.sdk.api.session.Session
-import timber.log.Timber
-import java.util.concurrent.CancellationException
-
-/**
- *
- */
-class LoginViewModel2 @AssistedInject constructor(
-        @Assisted initialState: LoginViewState2,
-        private val applicationContext: Context,
-        private val authenticationService: AuthenticationService,
-        private val activeSessionHolder: ActiveSessionHolder,
-        private val homeServerConnectionConfigFactory: HomeServerConnectionConfigFactory,
-        private val reAuthHelper: ReAuthHelper,
-        private val stringProvider: StringProvider,
-        private val homeServerHistoryService: HomeServerHistoryService
-) : VectorViewModel<LoginViewState2, LoginAction2, LoginViewEvents2>(initialState) {
-
-    @AssistedFactory
-    interface Factory : MavericksAssistedViewModelFactory<LoginViewModel2, LoginViewState2> {
-        override fun create(initialState: LoginViewState2): LoginViewModel2
-    }
-
-    companion object : MavericksViewModelFactory<LoginViewModel2, LoginViewState2> by hiltMavericksViewModelFactory()
-
-    init {
-        getKnownCustomHomeServersUrls()
-    }
-
-    private fun getKnownCustomHomeServersUrls() {
-        setState {
-            copy(knownCustomHomeServersUrls = homeServerHistoryService.getKnownServersUrls())
-        }
-    }
-
-    // Store the last action, to redo it after user has trusted the untrusted certificate
-    private var lastAction: LoginAction2? = null
-    private var currentHomeServerConnectionConfig: HomeServerConnectionConfig? = null
-
-    private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
-
-    val currentThreePid: String?
-        get() = registrationWizard?.getCurrentThreePid()
-
-    // True when login and password has been sent with success to the homeserver
-    val isRegistrationStarted: Boolean
-        get() = authenticationService.isRegistrationStarted()
-
-    private val registrationWizard: RegistrationWizard?
-        get() = authenticationService.getRegistrationWizard()
-
-    private val loginWizard: LoginWizard?
-        get() = authenticationService.getLoginWizard()
-
-    private var loginConfig: LoginConfig? = null
-
-    private var currentJob: Job? = null
-        set(value) {
-            // Cancel any previous Job
-            field?.cancel()
-            field = value
-        }
-
-    override fun handle(action: LoginAction2) {
-        when (action) {
-            is LoginAction2.EnterServerUrl -> handleEnterServerUrl()
-            is LoginAction2.ChooseAServerForSignin -> handleChooseAServerForSignin()
-            is LoginAction2.UpdateSignMode -> handleUpdateSignMode(action)
-            is LoginAction2.InitWith -> handleInitWith(action)
-            is LoginAction2.ChooseDefaultHomeServer -> handle(LoginAction2.UpdateHomeServer(matrixOrgUrl))
-            is LoginAction2.UpdateHomeServer -> handleUpdateHomeserver(action).also { lastAction = action }
-            is LoginAction2.SetUserName -> handleSetUserName(action).also { lastAction = action }
-            is LoginAction2.SetUserPassword -> handleSetUserPassword(action).also { lastAction = action }
-            is LoginAction2.LoginWith -> handleLoginWith(action).also { lastAction = action }
-            is LoginAction2.LoginWithToken -> handleLoginWithToken(action)
-            is LoginAction2.WebLoginSuccess -> handleWebLoginSuccess(action)
-            is LoginAction2.ResetPassword -> handleResetPassword(action)
-            is LoginAction2.ResetPasswordMailConfirmed -> handleResetPasswordMailConfirmed()
-            is LoginAction2.RegisterAction -> handleRegisterAction(action)
-            is LoginAction2.ResetAction -> handleResetAction(action)
-            is LoginAction2.SetupSsoForSessionRecovery -> handleSetupSsoForSessionRecovery(action)
-            is LoginAction2.UserAcceptCertificate -> handleUserAcceptCertificate(action)
-            LoginAction2.ClearHomeServerHistory -> handleClearHomeServerHistory()
-            is LoginAction2.PostViewEvent -> _viewEvents.post(action.viewEvent)
-            is LoginAction2.Finish -> handleFinish()
-        }
-    }
-
-    private fun handleFinish() {
-        // Just post a view Event
-        _viewEvents.post(LoginViewEvents2.Finish)
-    }
-
-    private fun handleChooseAServerForSignin() {
-        // Just post a view Event
-        _viewEvents.post(LoginViewEvents2.OpenServerSelection)
-    }
-
-    private fun handleUserAcceptCertificate(action: LoginAction2.UserAcceptCertificate) {
-        // It happens when we get the login flow, or during direct authentication.
-        // So alter the homeserver config and retrieve again the login flow
-        when (val finalLastAction = lastAction) {
-            is LoginAction2.UpdateHomeServer -> {
-                currentHomeServerConnectionConfig
-                        ?.let { it.copy(allowedFingerprints = it.allowedFingerprints + action.fingerprint) }
-                        ?.let { getLoginFlow(it) }
-            }
-            is LoginAction2.SetUserName ->
-                handleSetUserNameForSignIn(
-                        finalLastAction,
-                        HomeServerConnectionConfig.Builder()
-                                // Will be replaced by the task
-                                .withHomeServerUri("https://dummy.org")
-                                .withAllowedFingerPrints(listOf(action.fingerprint))
-                                .build()
-                )
-            is LoginAction2.SetUserPassword ->
-                handleSetUserPassword(finalLastAction)
-            is LoginAction2.LoginWith ->
-                handleLoginWith(finalLastAction)
-            else -> Unit
-        }
-    }
-
-    private fun rememberHomeServer(homeServerUrl: String) {
-        homeServerHistoryService.addHomeServerToHistory(homeServerUrl)
-        getKnownCustomHomeServersUrls()
-    }
-
-    private fun handleClearHomeServerHistory() {
-        homeServerHistoryService.clearHistory()
-        getKnownCustomHomeServersUrls()
-    }
-
-    private fun handleLoginWithToken(action: LoginAction2.LoginWithToken) {
-        val safeLoginWizard = loginWizard
-
-        if (safeLoginWizard == null) {
-            _viewEvents.post(LoginViewEvents2.Failure(Throwable("Bad configuration")))
-        } else {
-            setState { copy(isLoading = true) }
-
-            currentJob = viewModelScope.launch {
-                try {
-                    safeLoginWizard.loginWithToken(action.loginToken)
-                } catch (failure: Throwable) {
-                    _viewEvents.post(LoginViewEvents2.Failure(failure))
-                    null
-                }
-                        ?.let { onSessionCreated(it) }
-
-                setState { copy(isLoading = false) }
-            }
-        }
-    }
-
-    private fun handleSetupSsoForSessionRecovery(action: LoginAction2.SetupSsoForSessionRecovery) {
-        setState {
-            copy(
-                    signMode = SignMode2.SignIn,
-                    loginMode = LoginMode.Sso(action.ssoIdentityProviders),
-                    homeServerUrlFromUser = action.homeServerUrl,
-                    homeServerUrl = action.homeServerUrl,
-                    deviceId = action.deviceId
-            )
-        }
-    }
-
-    private fun handleRegisterAction(action: LoginAction2.RegisterAction) {
-        when (action) {
-            is LoginAction2.CaptchaDone -> handleCaptchaDone(action)
-            is LoginAction2.AcceptTerms -> handleAcceptTerms()
-            is LoginAction2.RegisterDummy -> handleRegisterDummy()
-            is LoginAction2.AddThreePid -> handleAddThreePid(action)
-            is LoginAction2.SendAgainThreePid -> handleSendAgainThreePid()
-            is LoginAction2.ValidateThreePid -> handleValidateThreePid(action)
-            is LoginAction2.CheckIfEmailHasBeenValidated -> handleCheckIfEmailHasBeenValidated(action)
-            is LoginAction2.StopEmailValidationCheck -> handleStopEmailValidationCheck()
-        }
-    }
-
-    private fun handleCheckIfEmailHasBeenValidated(action: LoginAction2.CheckIfEmailHasBeenValidated) {
-        // We do not want the common progress bar to be displayed, so we do not change asyncRegistration value in the state
-        currentJob = executeRegistrationStep(withLoading = false) {
-            it.checkIfEmailHasBeenValidated(action.delayMillis)
-        }
-    }
-
-    private fun handleStopEmailValidationCheck() {
-        currentJob = null
-    }
-
-    private fun handleValidateThreePid(action: LoginAction2.ValidateThreePid) {
-        currentJob = executeRegistrationStep {
-            it.handleValidateThreePid(action.code)
-        }
-    }
-
-    private fun executeRegistrationStep(
-            withLoading: Boolean = true,
-            block: suspend (RegistrationWizard) -> RegistrationResult
-    ): Job {
-        if (withLoading) {
-            setState { copy(isLoading = true) }
-        }
-        return viewModelScope.launch {
-            try {
-                registrationWizard?.let { block(it) }
-            } catch (failure: Throwable) {
-                if (failure !is CancellationException) {
-                    _viewEvents.post(LoginViewEvents2.Failure(failure))
-                }
-                null
-            }
-                    ?.let { data ->
-                        when (data) {
-                            is RegistrationResult.Success -> onSessionCreated(data.session)
-                            is RegistrationResult.FlowResponse -> onFlowResponse(data.flowResult)
-                        }
-                    }
-
-            setState { copy(isLoading = false) }
-        }
-    }
-
-    private fun handleAddThreePid(action: LoginAction2.AddThreePid) {
-        setState { copy(isLoading = true) }
-        currentJob = viewModelScope.launch {
-            try {
-                registrationWizard?.addThreePid(action.threePid)
-            } catch (failure: Throwable) {
-                _viewEvents.post(LoginViewEvents2.Failure(failure))
-            }
-            setState { copy(isLoading = false) }
-        }
-    }
-
-    private fun handleSendAgainThreePid() {
-        setState { copy(isLoading = true) }
-        currentJob = viewModelScope.launch {
-            try {
-                registrationWizard?.sendAgainThreePid()
-            } catch (failure: Throwable) {
-                _viewEvents.post(LoginViewEvents2.Failure(failure))
-            }
-            setState { copy(isLoading = false) }
-        }
-    }
-
-    private fun handleAcceptTerms() {
-        currentJob = executeRegistrationStep {
-            it.acceptTerms()
-        }
-    }
-
-    private fun handleRegisterDummy() {
-        currentJob = executeRegistrationStep {
-            it.dummy()
-        }
-    }
-
-    /**
-     * Check that the user name is available.
-     */
-    private fun handleSetUserNameForSignUp(action: LoginAction2.SetUserName) {
-        setState { copy(isLoading = true) }
-
-        val safeRegistrationWizard = registrationWizard ?: error("Invalid")
-
-        viewModelScope.launch {
-            val available = safeRegistrationWizard.registrationAvailable(action.username)
-
-            val event = when (available) {
-                RegistrationAvailability.Available -> {
-                    // Ask for a password
-                    LoginViewEvents2.OpenSignupPasswordScreen
-                }
-                is RegistrationAvailability.NotAvailable -> {
-                    LoginViewEvents2.Failure(available.failure)
-                }
-            }
-            _viewEvents.post(event)
-            setState { copy(isLoading = false) }
-        }
-    }
-
-    private fun handleCaptchaDone(action: LoginAction2.CaptchaDone) {
-        currentJob = executeRegistrationStep {
-            it.performReCaptcha(action.captchaResponse)
-        }
-    }
-
-    // TODO Update this
-    private fun handleResetAction(action: LoginAction2.ResetAction) {
-        // Cancel any request
-        currentJob = null
-
-        when (action) {
-            LoginAction2.ResetHomeServerUrl -> {
-                viewModelScope.launch {
-                    authenticationService.reset()
-                    setState {
-                        copy(
-                                homeServerUrlFromUser = null,
-                                homeServerUrl = null,
-                                loginMode = LoginMode.Unknown
-                        )
-                    }
-                }
-            }
-            LoginAction2.ResetSignMode -> {
-                setState {
-                    copy(
-                            signMode = SignMode2.Unknown,
-                            loginMode = LoginMode.Unknown
-                    )
-                }
-            }
-            LoginAction2.ResetSignin -> {
-                viewModelScope.launch {
-                    authenticationService.cancelPendingLoginOrRegistration()
-                    setState {
-                        copy(isLoading = false)
-                    }
-                }
-                _viewEvents.post(LoginViewEvents2.CancelRegistration)
-            }
-            LoginAction2.ResetSignup -> {
-                viewModelScope.launch {
-                    authenticationService.cancelPendingLoginOrRegistration()
-                    setState {
-                        // Always create a new state, to ensure the state is correctly reset
-                        LoginViewState2(
-                                knownCustomHomeServersUrls = knownCustomHomeServersUrls
-                        )
-                    }
-                }
-                _viewEvents.post(LoginViewEvents2.CancelRegistration)
-            }
-            LoginAction2.ResetResetPassword -> {
-                setState {
-                    copy(
-                            resetPasswordEmail = null,
-                            resetPasswordNewPassword = null
-                    )
-                }
-            }
-        }
-    }
-
-    private fun handleUpdateSignMode(action: LoginAction2.UpdateSignMode) {
-        setState {
-            copy(
-                    signMode = action.signMode
-            )
-        }
-
-        when (action.signMode) {
-            SignMode2.SignUp -> _viewEvents.post(LoginViewEvents2.OpenServerSelection)
-            SignMode2.SignIn -> _viewEvents.post(LoginViewEvents2.OpenSignInEnterIdentifierScreen)
-            SignMode2.Unknown -> Unit
-        }
-    }
-
-    private fun handleEnterServerUrl() {
-        _viewEvents.post(LoginViewEvents2.OpenHomeServerUrlFormScreen)
-    }
-
-    private fun handleInitWith(action: LoginAction2.InitWith) {
-        loginConfig = action.loginConfig
-
-        // If there is a pending email validation continue on this step
-        try {
-            if (registrationWizard?.isRegistrationStarted() == true) {
-                currentThreePid?.let {
-                    handle(LoginAction2.PostViewEvent(LoginViewEvents2.OnSendEmailSuccess(it)))
-                }
-            }
-        } catch (e: Throwable) {
-            // NOOP. API is designed to use wizards in a login/registration flow,
-            // but we need to check the state anyway.
-        }
-    }
-
-    private fun handleResetPassword(action: LoginAction2.ResetPassword) {
-        val safeLoginWizard = loginWizard
-
-        if (safeLoginWizard == null) {
-            _viewEvents.post(LoginViewEvents2.Failure(Throwable("Bad configuration")))
-        } else {
-            setState { copy(isLoading = true) }
-
-            currentJob = viewModelScope.launch {
-                try {
-                    safeLoginWizard.resetPassword(action.email)
-                } catch (failure: Throwable) {
-                    _viewEvents.post(LoginViewEvents2.Failure(failure))
-                    setState { copy(isLoading = false) }
-                    return@launch
-                }
-
-                setState {
-                    copy(
-                            isLoading = false,
-                            resetPasswordEmail = action.email,
-                            resetPasswordNewPassword = action.newPassword
-                    )
-                }
-
-                _viewEvents.post(LoginViewEvents2.OnResetPasswordSendThreePidDone)
-            }
-        }
-    }
-
-    private fun handleResetPasswordMailConfirmed() {
-        val safeLoginWizard = loginWizard
-
-        if (safeLoginWizard == null) {
-            _viewEvents.post(LoginViewEvents2.Failure(Throwable("Bad configuration")))
-        } else {
-            setState { copy(isLoading = true) }
-
-            currentJob = viewModelScope.launch {
-                try {
-                    val state = awaitState()
-                    safeLoginWizard.resetPasswordMailConfirmed(state.resetPasswordNewPassword!!)
-                } catch (failure: Throwable) {
-                    _viewEvents.post(LoginViewEvents2.Failure(failure))
-                    setState { copy(isLoading = false) }
-                    return@launch
-                }
-                setState {
-                    copy(
-                            isLoading = false,
-                            resetPasswordEmail = null,
-                            resetPasswordNewPassword = null
-                    )
-                }
-
-                _viewEvents.post(LoginViewEvents2.OnResetPasswordMailConfirmationSuccess)
-            }
-        }
-    }
-
-    private fun handleSetUserName(action: LoginAction2.SetUserName) = withState { state ->
-        setState {
-            copy(
-                    userName = action.username
-            )
-        }
-
-        when (state.signMode) {
-            SignMode2.Unknown -> error("Developer error, invalid sign mode")
-            SignMode2.SignIn -> handleSetUserNameForSignIn(action, null)
-            SignMode2.SignUp -> handleSetUserNameForSignUp(action)
-        }
-    }
-
-    private fun handleSetUserPassword(action: LoginAction2.SetUserPassword) = withState { state ->
-        when (state.signMode) {
-            SignMode2.Unknown -> error("Developer error, invalid sign mode")
-            SignMode2.SignIn -> handleSignInWithPassword(action)
-            SignMode2.SignUp -> handleRegisterWithPassword(action)
-        }
-    }
-
-    private fun handleRegisterWithPassword(action: LoginAction2.SetUserPassword) = withState { state ->
-        val username = state.userName ?: error("Developer error, username not set")
-
-        reAuthHelper.data = action.password
-        currentJob = executeRegistrationStep {
-            it.createAccount(
-                    userName = username,
-                    password = action.password,
-                    initialDeviceDisplayName = stringProvider.getString(R.string.login_default_session_public_name)
-            )
-        }
-    }
-
-    private fun handleSignInWithPassword(action: LoginAction2.SetUserPassword) = withState { state ->
-        val username = state.userName ?: error("Developer error, username not set")
-        setState { copy(isLoading = true) }
-        loginWith(username, action.password)
-    }
-
-    private fun handleLoginWith(action: LoginAction2.LoginWith) {
-        setState { copy(isLoading = true) }
-        loginWith(action.login, action.password)
-    }
-
-    private fun loginWith(login: String, password: String) {
-        val safeLoginWizard = loginWizard
-
-        if (safeLoginWizard == null) {
-            _viewEvents.post(LoginViewEvents2.Failure(Throwable("Bad configuration")))
-            setState { copy(isLoading = false) }
-        } else {
-            currentJob = viewModelScope.launch {
-                try {
-                    safeLoginWizard.login(
-                            login = login,
-                            password = password,
-                            initialDeviceName = stringProvider.getString(R.string.login_default_session_public_name)
-                    )
-                } catch (failure: Throwable) {
-                    _viewEvents.post(LoginViewEvents2.Failure(failure))
-                    null
-                }
-                        ?.let {
-                            reAuthHelper.data = password
-                            onSessionCreated(it)
-                        }
-                setState { copy(isLoading = false) }
-            }
-        }
-    }
-
-    /**
-     * Perform wellknown request.
-     */
-    private fun handleSetUserNameForSignIn(action: LoginAction2.SetUserName, homeServerConnectionConfig: HomeServerConnectionConfig?) {
-        setState { copy(isLoading = true) }
-
-        currentJob = viewModelScope.launch {
-            val data = try {
-                authenticationService.getWellKnownData(action.username, homeServerConnectionConfig)
-            } catch (failure: Throwable) {
-                onDirectLoginError(failure)
-                return@launch
-            }
-            when (data) {
-                is WellknownResult.Prompt ->
-                    onWellknownSuccess(action, data, homeServerConnectionConfig)
-                is WellknownResult.FailPrompt ->
-                    // Relax on IS discovery if homeserver is valid
-                    if (data.homeServerUrl != null && data.wellKnown != null) {
-                        onWellknownSuccess(action, WellknownResult.Prompt(data.homeServerUrl!!, null, data.wellKnown!!), homeServerConnectionConfig)
-                    } else {
-                        onWellKnownError()
-                    }
-                else -> {
-                    onWellKnownError()
-                }
-            }
-        }
-    }
-
-    private fun onWellKnownError() {
-        _viewEvents.post(LoginViewEvents2.Failure(Exception(stringProvider.getString(R.string.autodiscover_well_known_error))))
-        setState { copy(isLoading = false) }
-    }
-
-    private suspend fun onWellknownSuccess(
-            action: LoginAction2.SetUserName,
-            wellKnownPrompt: WellknownResult.Prompt,
-            homeServerConnectionConfig: HomeServerConnectionConfig?
-    ) {
-        val alteredHomeServerConnectionConfig = homeServerConnectionConfig
-                ?.copy(
-                        homeServerUriBase = Uri.parse(wellKnownPrompt.homeServerUrl),
-                        identityServerUri = wellKnownPrompt.identityServerUrl?.let { Uri.parse(it) }
-                )
-                ?: HomeServerConnectionConfig(
-                        homeServerUri = Uri.parse(wellKnownPrompt.homeServerUrl),
-                        identityServerUri = wellKnownPrompt.identityServerUrl?.let { Uri.parse(it) }
-                )
-
-        // Ensure login flow is retrieved, and this is not a SSO only server
-        val data = try {
-            authenticationService.getLoginFlow(alteredHomeServerConnectionConfig)
-        } catch (failure: Throwable) {
-            _viewEvents.post(LoginViewEvents2.Failure(failure))
-            null
-        } ?: return
-
-        val loginMode = when {
-            data.supportedLoginTypes.contains(LoginFlowTypes.SSO) &&
-                    data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
-            data.supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(data.ssoIdentityProviders)
-            data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.Password
-            else -> LoginMode.Unsupported
-        }
-
-        val viewEvent = when (loginMode) {
-            LoginMode.Password,
-            is LoginMode.SsoAndPassword -> {
-                retrieveProfileInfo(action.username)
-                // We can navigate to the password screen
-                LoginViewEvents2.OpenSigninPasswordScreen
-            }
-            is LoginMode.Sso -> {
-                LoginViewEvents2.OpenSsoOnlyScreen
-            }
-            LoginMode.Unsupported -> LoginViewEvents2.OnLoginModeNotSupported(data.supportedLoginTypes.toList())
-            LoginMode.Unknown -> null
-        }
-        viewEvent?.let { _viewEvents.post(it) }
-
-        val urlFromUser = action.username.getServerName()
-        setState {
-            copy(
-                    isLoading = false,
-                    homeServerUrlFromUser = urlFromUser,
-                    homeServerUrl = data.homeServerUrl,
-                    loginMode = loginMode
-            )
-        }
-
-        if ((loginMode == LoginMode.Password && !data.isLoginAndRegistrationSupported) ||
-                data.isOutdatedHomeserver) {
-            // Notify the UI
-            _viewEvents.post(LoginViewEvents2.OutdatedHomeserver)
-        }
-    }
-
-    private suspend fun retrieveProfileInfo(username: String) {
-        val safeLoginWizard = loginWizard
-
-        if (safeLoginWizard != null) {
-            setState { copy(loginProfileInfo = Loading()) }
-            val result = tryAsync {
-                safeLoginWizard.getProfileInfo(username)
-            }
-            setState { copy(loginProfileInfo = result) }
-        }
-    }
-
-    private fun onDirectLoginError(failure: Throwable) {
-        _viewEvents.post(LoginViewEvents2.Failure(failure))
-        setState { copy(isLoading = false) }
-    }
-
-    private fun onFlowResponse(flowResult: FlowResult) {
-        // If dummy stage is mandatory, and password is already sent, do the dummy stage now
-        if (isRegistrationStarted &&
-                flowResult.missingStages.any { it is Stage.Dummy && it.mandatory }) {
-            handleRegisterDummy()
-        } else {
-            // Notify the user
-            _viewEvents.post(LoginViewEvents2.RegistrationFlowResult(flowResult, isRegistrationStarted))
-        }
-    }
-
-    private suspend fun onSessionCreated(session: Session) {
-        activeSessionHolder.setActiveSession(session)
-
-        authenticationService.reset()
-        session.configureAndStart(applicationContext)
-        withState { state ->
-            _viewEvents.post(LoginViewEvents2.OnSessionCreated(state.signMode == SignMode2.SignUp))
-        }
-    }
-
-    private fun handleWebLoginSuccess(action: LoginAction2.WebLoginSuccess) = withState { state ->
-        val homeServerConnectionConfigFinal = homeServerConnectionConfigFactory.create(state.homeServerUrl)
-
-        if (homeServerConnectionConfigFinal == null) {
-            // Should not happen
-            Timber.w("homeServerConnectionConfig is null")
-        } else {
-            currentJob = viewModelScope.launch {
-                try {
-                    authenticationService.createSessionFromSso(homeServerConnectionConfigFinal, action.credentials)
-                } catch (failure: Throwable) {
-                    _viewEvents.post(LoginViewEvents2.Failure(failure))
-                    null
-                }
-                        ?.let { onSessionCreated(it) }
-            }
-        }
-    }
-
-    private fun handleUpdateHomeserver(action: LoginAction2.UpdateHomeServer) {
-        val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(action.homeServerUrl)
-        if (homeServerConnectionConfig == null) {
-            // This is invalid
-            _viewEvents.post(LoginViewEvents2.Failure(Throwable("Unable to create a HomeServerConnectionConfig")))
-        } else {
-            getLoginFlow(homeServerConnectionConfig)
-        }
-    }
-
-    private fun getLoginFlow(homeServerConnectionConfig: HomeServerConnectionConfig) = withState { state ->
-        currentHomeServerConnectionConfig = homeServerConnectionConfig
-
-        setState { copy(isLoading = true) }
-
-        currentJob = viewModelScope.launch {
-            authenticationService.cancelPendingLoginOrRegistration()
-
-            val data = try {
-                authenticationService.getLoginFlow(homeServerConnectionConfig)
-            } catch (failure: Throwable) {
-                _viewEvents.post(LoginViewEvents2.Failure(failure))
-                setState { copy(isLoading = false) }
-                null
-            } ?: return@launch
-
-            // Valid Homeserver, add it to the history.
-            // Note: we add what the user has input, data.homeServerUrlBase can be different
-            rememberHomeServer(homeServerConnectionConfig.homeServerUri.toString())
-
-            val loginMode = when {
-                data.supportedLoginTypes.contains(LoginFlowTypes.SSO) &&
-                        data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
-                data.supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(data.ssoIdentityProviders)
-                data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.Password
-                else -> LoginMode.Unsupported
-            }
-
-            val viewEvent = when (loginMode) {
-                LoginMode.Password,
-                is LoginMode.SsoAndPassword -> {
-                    when (state.signMode) {
-                        SignMode2.Unknown -> null
-                        SignMode2.SignUp -> {
-                            // Check that registration is possible on this server
-                            try {
-                                registrationWizard?.getRegistrationFlow()
-
-                                /*
-                                    // Simulate registration disabled
-                                    throw Failure.ServerError(
-                                            error = MatrixError(
-                                                    code = MatrixError.M_FORBIDDEN,
-                                                    message = "Registration is disabled"
-                                            ),
-                                            httpCode = 403
-                                    )
-                                 */
-
-                                LoginViewEvents2.OpenSignUpChooseUsernameScreen
-                            } catch (throwable: Throwable) {
-                                // Registration disabled?
-                                LoginViewEvents2.Failure(throwable)
-                            }
-                        }
-                        SignMode2.SignIn -> LoginViewEvents2.OpenSignInWithAnythingScreen
-                    }
-                }
-                is LoginMode.Sso -> {
-                    LoginViewEvents2.OpenSsoOnlyScreen
-                }
-                LoginMode.Unsupported -> LoginViewEvents2.OnLoginModeNotSupported(data.supportedLoginTypes.toList())
-                LoginMode.Unknown -> null
-            }
-            viewEvent?.let { _viewEvents.post(it) }
-
-            if ((loginMode == LoginMode.Password && !data.isLoginAndRegistrationSupported) ||
-                    data.isOutdatedHomeserver) {
-                // Notify the UI
-                _viewEvents.post(LoginViewEvents2.OutdatedHomeserver)
-            }
-
-            setState {
-                copy(
-                        isLoading = false,
-                        homeServerUrlFromUser = homeServerConnectionConfig.homeServerUri.toString(),
-                        homeServerUrl = data.homeServerUrl,
-                        loginMode = loginMode
-                )
-            }
-        }
-    }
-
-    fun getInitialHomeServerUrl(): String? {
-        return loginConfig?.homeServerUrl
-    }
-
-    fun getSsoUrl(redirectUrl: String, deviceId: String?, providerId: String?, action: SSOAction): String? {
-        return authenticationService.getSsoUrl(redirectUrl, deviceId, providerId, action)
-    }
-
-    fun getFallbackUrl(forSignIn: Boolean, deviceId: String?): String? {
-        return authenticationService.getFallbackUrl(forSignIn, deviceId)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginViewState2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginViewState2.kt
deleted file mode 100644
index 8405381c4f..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginViewState2.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import com.airbnb.mvrx.Async
-import com.airbnb.mvrx.MavericksState
-import com.airbnb.mvrx.PersistState
-import com.airbnb.mvrx.Uninitialized
-import im.vector.app.core.extensions.toReducedUrl
-import im.vector.app.features.login.LoginMode
-import org.matrix.android.sdk.api.MatrixPatterns
-import org.matrix.android.sdk.api.auth.login.LoginProfileInfo
-
-data class LoginViewState2(
-        val isLoading: Boolean = false,
-
-        // User choices
-        @PersistState
-        val signMode: SignMode2 = SignMode2.Unknown,
-        @PersistState
-        val userName: String? = null,
-        @PersistState
-        val resetPasswordEmail: String? = null,
-        @PersistState
-        val resetPasswordNewPassword: String? = null,
-        @PersistState
-        val homeServerUrlFromUser: String? = null,
-
-        // Can be modified after a Wellknown request
-        @PersistState
-        val homeServerUrl: String? = null,
-
-        // For SSO session recovery
-        @PersistState
-        val deviceId: String? = null,
-
-        // Network result
-        val loginProfileInfo: Async<LoginProfileInfo> = Uninitialized,
-
-        // Network result
-        @PersistState
-        val loginMode: LoginMode = LoginMode.Unknown,
-
-        // From database
-        val knownCustomHomeServersUrls: List<String> = emptyList()
-) : MavericksState {
-
-    // Pending user identifier
-    fun userIdentifier(): String {
-        return if (userName != null && MatrixPatterns.isUserId(userName)) {
-            userName
-        } else {
-            "@$userName:${homeServerUrlFromUser.toReducedUrl()}"
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginWaitForEmailFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginWaitForEmailFragment2.kt
deleted file mode 100644
index 772db7be5f..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginWaitForEmailFragment2.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- */
-
-package im.vector.app.features.login2
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.airbnb.mvrx.args
-import im.vector.app.R
-import im.vector.app.databinding.FragmentLoginWaitForEmail2Binding
-import im.vector.app.features.login.LoginWaitForEmailFragmentArgument
-import org.matrix.android.sdk.api.failure.is401
-import javax.inject.Inject
-
-/**
- * In this screen, the user is asked to check their emails.
- */
-class LoginWaitForEmailFragment2 @Inject constructor() : AbstractLoginFragment2<FragmentLoginWaitForEmail2Binding>() {
-
-    private val params: LoginWaitForEmailFragmentArgument by args()
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginWaitForEmail2Binding {
-        return FragmentLoginWaitForEmail2Binding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupUi()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        loginViewModel.handle(LoginAction2.CheckIfEmailHasBeenValidated(0))
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        loginViewModel.handle(LoginAction2.StopEmailValidationCheck)
-    }
-
-    private fun setupUi() {
-        views.loginWaitForEmailNotice.text = getString(R.string.login_wait_for_email_notice_2, params.email)
-    }
-
-    override fun onError(throwable: Throwable) {
-        if (throwable.is401()) {
-            // Try again, with a delay
-            loginViewModel.handle(LoginAction2.CheckIfEmailHasBeenValidated(10_000))
-        } else {
-            super.onError(throwable)
-        }
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetSignup)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt
deleted file mode 100644
index 708efd9d56..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * 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.
- */
-
-@file:Suppress("DEPRECATION")
-
-package im.vector.app.features.login2
-
-import android.annotation.SuppressLint
-import android.content.DialogInterface
-import android.graphics.Bitmap
-import android.net.http.SslError
-import android.os.Bundle
-import android.view.KeyEvent
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.SslErrorHandler
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import com.airbnb.mvrx.activityViewModel
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.R
-import im.vector.app.core.utils.AssetReader
-import im.vector.app.databinding.FragmentLoginWebBinding
-import im.vector.app.features.login.JavascriptResponse
-import im.vector.app.features.signout.soft.SoftLogoutAction
-import im.vector.app.features.signout.soft.SoftLogoutViewModel
-import org.matrix.android.sdk.api.auth.data.Credentials
-import org.matrix.android.sdk.api.util.MatrixJsonParser
-import timber.log.Timber
-import java.net.URLDecoder
-import javax.inject.Inject
-
-/**
- * This screen is displayed when the application does not support login flow or registration flow
- * of the homeserver, as a fallback to login or to create an account.
- */
-class LoginWebFragment2 @Inject constructor(
-        private val assetReader: AssetReader
-) : AbstractLoginFragment2<FragmentLoginWebBinding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginWebBinding {
-        return FragmentLoginWebBinding.inflate(inflater, container, false)
-    }
-
-    private val softLogoutViewModel: SoftLogoutViewModel by activityViewModel()
-
-    private var isWebViewLoaded = false
-    private var isForSessionRecovery = false
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupToolbar(views.loginWebToolbar)
-                .allowBack()
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        setupTitle(state)
-
-        isForSessionRecovery = state.deviceId?.isNotBlank() == true
-
-        if (!isWebViewLoaded) {
-            setupWebView(state)
-            isWebViewLoaded = true
-        }
-    }
-
-    private fun setupTitle(state: LoginViewState2) {
-        toolbar?.title = when (state.signMode) {
-            SignMode2.SignIn -> getString(R.string.login_signin)
-            else -> getString(R.string.login_signup)
-        }
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    private fun setupWebView(state: LoginViewState2) {
-        views.loginWebWebView.settings.javaScriptEnabled = true
-
-        // Enable local storage to support SSO with Firefox accounts
-        views.loginWebWebView.settings.domStorageEnabled = true
-        views.loginWebWebView.settings.databaseEnabled = true
-
-        // Due to https://developers.googleblog.com/2016/08/modernizing-oauth-interactions-in-native-apps.html, we hack
-        // the user agent to bypass the limitation of Google, as a quick fix (a proper solution will be to use the SSO SDK)
-        views.loginWebWebView.settings.userAgentString = "Mozilla/5.0 Google"
-
-        // AppRTC requires third party cookies to work
-        val cookieManager = android.webkit.CookieManager.getInstance()
-
-        // clear the cookies
-        if (cookieManager == null) {
-            launchWebView(state)
-        } else {
-            if (!cookieManager.hasCookies()) {
-                launchWebView(state)
-            } else {
-                try {
-                    cookieManager.removeAllCookies { launchWebView(state) }
-                } catch (e: Exception) {
-                    Timber.e(e, " cookieManager.removeAllCookie() fails")
-                    launchWebView(state)
-                }
-            }
-        }
-    }
-
-    private fun launchWebView(state: LoginViewState2) {
-        val url = loginViewModel.getFallbackUrl(state.signMode == SignMode2.SignIn, state.deviceId) ?: return
-
-        views.loginWebWebView.loadUrl(url)
-
-        views.loginWebWebView.webViewClient = object : WebViewClient() {
-            override fun onReceivedSslError(
-                    view: WebView,
-                    handler: SslErrorHandler,
-                    error: SslError
-            ) {
-                MaterialAlertDialogBuilder(requireActivity())
-                        .setMessage(R.string.ssl_could_not_verify)
-                        .setPositiveButton(R.string.ssl_trust) { _, _ -> handler.proceed() }
-                        .setNegativeButton(R.string.ssl_do_not_trust) { _, _ -> handler.cancel() }
-                        .setOnKeyListener(DialogInterface.OnKeyListener { dialog, keyCode, event ->
-                            if (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
-                                handler.cancel()
-                                dialog.dismiss()
-                                return@OnKeyListener true
-                            }
-                            false
-                        })
-                        .setCancelable(false)
-                        .show()
-            }
-
-            @Deprecated("Deprecated in Java")
-            override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
-                super.onReceivedError(view, errorCode, description, failingUrl)
-
-                loginViewModel.handle(LoginAction2.PostViewEvent(LoginViewEvents2.OnWebLoginError(errorCode, description, failingUrl)))
-            }
-
-            override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
-                super.onPageStarted(view, url, favicon)
-
-                toolbar?.subtitle = url
-            }
-
-            override fun onPageFinished(view: WebView, url: String) {
-                // avoid infinite onPageFinished call
-                if (url.startsWith("http")) {
-                    // Generic method to make a bridge between JS and the UIWebView
-                    assetReader.readAssetFile("sendObject.js")?.let { view.loadUrl(it) }
-
-                    if (state.signMode == SignMode2.SignIn) {
-                        // The function the fallback page calls when the login is complete
-                        assetReader.readAssetFile("onLogin.js")?.let { view.loadUrl(it) }
-                    } else {
-                        // MODE_REGISTER
-                        // The function the fallback page calls when the registration is complete
-                        assetReader.readAssetFile("onRegistered.js")?.let { view.loadUrl(it) }
-                    }
-                }
-            }
-
-            /**
-             * Example of (formatted) url for MODE_LOGIN:
-             *
-             * <pre>
-             * js:{
-             *     "action":"onLogin",
-             *     "credentials":{
-             *         "user_id":"@user:matrix.org",
-             *         "access_token":"[ACCESS_TOKEN]",
-             *         "home_server":"matrix.org",
-             *         "device_id":"[DEVICE_ID]",
-             *         "well_known":{
-             *             "m.homeserver":{
-             *                 "base_url":"https://matrix.org/"
-             *                 }
-             *             }
-             *         }
-             *    }
-             *    .
-             * </pre>
-             * @param view
-             * @param url
-             * @return
-             */
-            @Deprecated("Deprecated in Java")
-            override fun shouldOverrideUrlLoading(view: WebView, url: String?): Boolean {
-                if (url == null) return super.shouldOverrideUrlLoading(view, url as String?)
-
-                if (url.startsWith("js:")) {
-                    var json = url.substring(3)
-                    var javascriptResponse: JavascriptResponse? = null
-
-                    try {
-                        // URL decode
-                        json = URLDecoder.decode(json, "UTF-8")
-                        val adapter = MatrixJsonParser.getMoshi().adapter(JavascriptResponse::class.java)
-                        javascriptResponse = adapter.fromJson(json)
-                    } catch (e: Exception) {
-                        Timber.e(e, "## shouldOverrideUrlLoading() : fromJson failed")
-                    }
-
-                    // succeeds to parse parameters
-                    if (javascriptResponse != null) {
-                        val action = javascriptResponse.action
-
-                        if (state.signMode == SignMode2.SignIn) {
-                            if (action == "onLogin") {
-                                javascriptResponse.credentials?.let { notifyViewModel(it) }
-                            }
-                        } else {
-                            // MODE_REGISTER
-                            // check the required parameters
-                            if (action == "onRegistered") {
-                                javascriptResponse.credentials?.let { notifyViewModel(it) }
-                            }
-                        }
-                    }
-                    return true
-                }
-
-                return super.shouldOverrideUrlLoading(view, url)
-            }
-        }
-    }
-
-    private fun notifyViewModel(credentials: Credentials) {
-        if (isForSessionRecovery) {
-            softLogoutViewModel.handle(SoftLogoutAction.WebLoginSuccess(credentials))
-        } else {
-            loginViewModel.handle(LoginAction2.WebLoginSuccess(credentials))
-        }
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetSignin)
-    }
-
-    override fun onBackPressed(toolbarButton: Boolean): Boolean {
-        return when {
-            toolbarButton -> super.onBackPressed(toolbarButton)
-            views.loginWebWebView.canGoBack() -> views.loginWebWebView.goBack().run { true }
-            else -> super.onBackPressed(toolbarButton)
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
deleted file mode 100644
index d549c22028..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package im.vector.app.features.login2.created
-
-import android.net.Uri
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import com.airbnb.mvrx.fragmentViewModel
-import com.airbnb.mvrx.withState
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.R
-import im.vector.app.core.date.DateFormatKind
-import im.vector.app.core.date.VectorDateFormatter
-import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
-import im.vector.app.core.intent.getFilenameFromUri
-import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.time.Clock
-import im.vector.app.databinding.DialogBaseEditTextBinding
-import im.vector.app.databinding.FragmentLoginAccountCreatedBinding
-import im.vector.app.features.displayname.getBestName
-import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
-import im.vector.app.features.login2.AbstractLoginFragment2
-import im.vector.app.features.login2.LoginAction2
-import im.vector.app.features.login2.LoginViewState2
-import im.vector.app.features.onboarding.OnboardingActivity
-import org.matrix.android.sdk.api.util.MatrixItem
-import java.util.UUID
-import javax.inject.Inject
-
-/**
- * In this screen:
- * - the account has been created and we propose the user to set an avatar and a display name.
- */
-class AccountCreatedFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer,
-        private val dateFormatter: VectorDateFormatter,
-        private val matrixItemColorProvider: MatrixItemColorProvider,
-        private val clock: Clock,
-        colorProvider: ColorProvider
-) : AbstractLoginFragment2<FragmentLoginAccountCreatedBinding>(),
-        GalleryOrCameraDialogHelper.Listener {
-
-    private val viewModel: AccountCreatedViewModel by fragmentViewModel()
-
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginAccountCreatedBinding {
-        return FragmentLoginAccountCreatedBinding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupClickListener()
-        setupSubmitButton()
-        observeViewEvents()
-
-        viewModel.onEach { invalidateState(it) }
-
-        views.loginAccountCreatedTime.text = dateFormatter.format(clock.epochMillis(), DateFormatKind.MESSAGE_SIMPLE)
-    }
-
-    private fun observeViewEvents() {
-        viewModel.observeViewEvents {
-            when (it) {
-                is AccountCreatedViewEvents.Failure -> displayErrorDialog(it.throwable)
-            }
-        }
-    }
-
-    private fun setupClickListener() {
-        views.loginAccountCreatedMessage.debouncedClicks {
-            // Update display name
-            displayDialog()
-        }
-        views.loginAccountCreatedAvatar.debouncedClicks {
-            galleryOrCameraDialogHelper.show()
-        }
-    }
-
-    private fun displayDialog() = withState(viewModel) { state ->
-        val inflater = requireActivity().layoutInflater
-        val layout = inflater.inflate(R.layout.dialog_base_edit_text, null)
-        val views = DialogBaseEditTextBinding.bind(layout)
-        views.editText.setText(state.currentUser()?.getBestName().orEmpty())
-
-        MaterialAlertDialogBuilder(requireActivity())
-                .setTitle(R.string.settings_display_name)
-                .setView(layout)
-                .setPositiveButton(R.string.ok) { _, _ ->
-                    val newName = views.editText.text.toString()
-                    viewModel.handle(AccountCreatedAction.SetDisplayName(newName))
-                }
-                .setNegativeButton(R.string.action_cancel, null)
-                .show()
-    }
-
-    override fun onImageReady(uri: Uri?) {
-        uri ?: return
-        viewModel.handle(
-                AccountCreatedAction.SetAvatar(
-                        avatarUri = uri,
-                        filename = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString()
-                )
-        )
-    }
-
-    private fun setupSubmitButton() {
-        views.loginAccountCreatedLater.debouncedClicks { terminate() }
-        views.loginAccountCreatedDone.debouncedClicks { terminate() }
-    }
-
-    private fun terminate() {
-        loginViewModel.handle(LoginAction2.Finish)
-    }
-
-    private fun invalidateState(state: AccountCreatedViewState) {
-        // Ugly hack...
-        (activity as? OnboardingActivity)?.setIsLoading(state.isLoading)
-
-        views.loginAccountCreatedSubtitle.text = getString(R.string.login_account_created_subtitle, state.userId)
-
-        val user = state.currentUser()
-        if (user != null) {
-            avatarRenderer.render(user, views.loginAccountCreatedAvatar)
-            views.loginAccountCreatedMemberName.text = user.getBestName()
-        } else {
-            // Should not happen
-            views.loginAccountCreatedMemberName.text = state.userId
-        }
-
-        // User color
-        views.loginAccountCreatedMemberName
-                .setTextColor(matrixItemColorProvider.getColor(MatrixItem.UserItem(state.userId)))
-
-        views.loginAccountCreatedLater.isVisible = state.hasBeenModified.not()
-        views.loginAccountCreatedDone.isVisible = state.hasBeenModified
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        // No op
-    }
-
-    override fun resetViewModel() {
-        // No op
-    }
-
-    override fun onBackPressed(toolbarButton: Boolean): Boolean {
-        // Just start the next Activity
-        terminate()
-        return false
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt
deleted file mode 100644
index c3b7f2d3d3..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package im.vector.app.features.login2.created
-
-import com.airbnb.mvrx.MavericksViewModelFactory
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import im.vector.app.core.di.MavericksAssistedViewModelFactory
-import im.vector.app.core.di.hiltMavericksViewModelFactory
-import im.vector.app.core.platform.VectorViewModel
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixPatterns
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.util.MatrixItem
-import org.matrix.android.sdk.api.util.toMatrixItem
-import org.matrix.android.sdk.flow.flow
-import org.matrix.android.sdk.flow.unwrap
-import timber.log.Timber
-
-class AccountCreatedViewModel @AssistedInject constructor(
-        @Assisted initialState: AccountCreatedViewState,
-        private val session: Session
-) : VectorViewModel<AccountCreatedViewState, AccountCreatedAction, AccountCreatedViewEvents>(initialState) {
-
-    @AssistedFactory
-    interface Factory : MavericksAssistedViewModelFactory<AccountCreatedViewModel, AccountCreatedViewState> {
-        override fun create(initialState: AccountCreatedViewState): AccountCreatedViewModel
-    }
-
-    companion object : MavericksViewModelFactory<AccountCreatedViewModel, AccountCreatedViewState> by hiltMavericksViewModelFactory()
-
-    init {
-        setState {
-            copy(
-                    userId = session.myUserId
-            )
-        }
-        observeUser()
-    }
-
-    private fun observeUser() {
-        session.flow()
-                .liveUser(session.myUserId)
-                .unwrap()
-                .map {
-                    if (MatrixPatterns.isUserId(it.userId)) {
-                        it.toMatrixItem()
-                    } else {
-                        Timber.w("liveUser() has returned an invalid user: $it")
-                        MatrixItem.UserItem(session.myUserId, null, null)
-                    }
-                }
-                .execute {
-                    copy(currentUser = it)
-                }
-    }
-
-    override fun handle(action: AccountCreatedAction) {
-        when (action) {
-            is AccountCreatedAction.SetAvatar -> handleSetAvatar(action)
-            is AccountCreatedAction.SetDisplayName -> handleSetDisplayName(action)
-        }
-    }
-
-    private fun handleSetAvatar(action: AccountCreatedAction.SetAvatar) {
-        setState { copy(isLoading = true) }
-        viewModelScope.launch {
-            val result = runCatching { session.profileService().updateAvatar(session.myUserId, action.avatarUri, action.filename) }
-                    .onFailure { _viewEvents.post(AccountCreatedViewEvents.Failure(it)) }
-            setState {
-                copy(
-                        isLoading = false,
-                        hasBeenModified = hasBeenModified || result.isSuccess
-                )
-            }
-        }
-    }
-
-    private fun handleSetDisplayName(action: AccountCreatedAction.SetDisplayName) {
-        setState { copy(isLoading = true) }
-        viewModelScope.launch {
-            val result = runCatching { session.profileService().setDisplayName(session.myUserId, action.displayName) }
-                    .onFailure { _viewEvents.post(AccountCreatedViewEvents.Failure(it)) }
-            setState {
-                copy(
-                        isLoading = false,
-                        hasBeenModified = hasBeenModified || result.isSuccess
-                )
-            }
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/login2/terms/LoginTermsFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/terms/LoginTermsFragment2.kt
deleted file mode 100755
index a48996a16f..0000000000
--- a/vector/src/main/java/im/vector/app/features/login2/terms/LoginTermsFragment2.kt
+++ /dev/null
@@ -1,119 +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.
- */
-
-package im.vector.app.features.login2.terms
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.airbnb.mvrx.args
-import im.vector.app.core.extensions.cleanup
-import im.vector.app.core.extensions.configureWith
-import im.vector.app.core.extensions.toReducedUrl
-import im.vector.app.core.utils.openUrlInChromeCustomTab
-import im.vector.app.databinding.FragmentLoginTerms2Binding
-import im.vector.app.features.login.terms.LocalizedFlowDataLoginTermsChecked
-import im.vector.app.features.login.terms.LoginTermsFragmentArgument
-import im.vector.app.features.login.terms.LoginTermsViewState
-import im.vector.app.features.login.terms.PolicyController
-import im.vector.app.features.login2.AbstractLoginFragment2
-import im.vector.app.features.login2.LoginAction2
-import im.vector.app.features.login2.LoginViewState2
-import org.matrix.android.sdk.api.auth.data.LocalizedFlowDataLoginTerms
-import javax.inject.Inject
-
-/**
- * LoginTermsFragment displays the list of policies the user has to accept.
- */
-class LoginTermsFragment2 @Inject constructor(
-        private val policyController: PolicyController
-) : AbstractLoginFragment2<FragmentLoginTerms2Binding>(),
-        PolicyController.PolicyControllerListener {
-
-    private val params: LoginTermsFragmentArgument by args()
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginTerms2Binding {
-        return FragmentLoginTerms2Binding.inflate(inflater, container, false)
-    }
-
-    private var loginTermsViewState: LoginTermsViewState = LoginTermsViewState(emptyList())
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupViews()
-        views.loginTermsPolicyList.configureWith(policyController)
-        policyController.listener = this
-
-        val list = ArrayList<LocalizedFlowDataLoginTermsChecked>()
-
-        params.localizedFlowDataLoginTerms
-                .forEach {
-                    list.add(LocalizedFlowDataLoginTermsChecked(it))
-                }
-
-        loginTermsViewState = LoginTermsViewState(list)
-    }
-
-    private fun setupViews() {
-        views.loginTermsSubmit.setOnClickListener { submit() }
-    }
-
-    override fun onDestroyView() {
-        views.loginTermsPolicyList.cleanup()
-        policyController.listener = null
-        super.onDestroyView()
-    }
-
-    private fun renderState() {
-        policyController.setData(loginTermsViewState.localizedFlowDataLoginTermsChecked)
-
-        // Button is enabled only if all checkboxes are checked
-        views.loginTermsSubmit.isEnabled = loginTermsViewState.allChecked()
-    }
-
-    override fun setChecked(localizedFlowDataLoginTerms: LocalizedFlowDataLoginTerms, isChecked: Boolean) {
-        if (isChecked) {
-            loginTermsViewState.check(localizedFlowDataLoginTerms)
-        } else {
-            loginTermsViewState.uncheck(localizedFlowDataLoginTerms)
-        }
-
-        renderState()
-    }
-
-    override fun openPolicy(localizedFlowDataLoginTerms: LocalizedFlowDataLoginTerms) {
-        localizedFlowDataLoginTerms.localizedUrl
-                ?.takeIf { it.isNotBlank() }
-                ?.let {
-                    openUrlInChromeCustomTab(requireContext(), null, it)
-                }
-    }
-
-    private fun submit() {
-        loginViewModel.handle(LoginAction2.AcceptTerms)
-    }
-
-    override fun updateWithState(state: LoginViewState2) {
-        policyController.homeServer = state.homeServerUrlFromUser.toReducedUrl()
-        renderState()
-    }
-
-    override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetSignup)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 8dd9fd030a..f564802b57 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -28,6 +28,7 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.ButtonStateView
@@ -38,10 +39,12 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import javax.inject.Inject
 
-class MatrixToRoomSpaceFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer,
-        private val spaceCardRenderer: SpaceCardRenderer
-) : VectorBaseFragment<FragmentMatrixToRoomSpaceCardBinding>() {
+@AndroidEntryPoint
+class MatrixToRoomSpaceFragment :
+        VectorBaseFragment<FragmentMatrixToRoomSpaceCardBinding>() {
+
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var spaceCardRenderer: SpaceCardRenderer
 
     private val sharedViewModel: MatrixToBottomSheetViewModel by parentFragmentViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt
index 3792183bca..c8b18e327b 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt
@@ -28,15 +28,18 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentMatrixToUserCardBinding
 import im.vector.app.features.home.AvatarRenderer
 import javax.inject.Inject
 
-class MatrixToUserFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer
-) : VectorBaseFragment<FragmentMatrixToUserCardBinding>() {
+@AndroidEntryPoint
+class MatrixToUserFragment :
+        VectorBaseFragment<FragmentMatrixToUserCardBinding>() {
+
+    @Inject lateinit var avatarRenderer: AvatarRenderer
 
     private val sharedViewModel: MatrixToBottomSheetViewModel by parentFragmentViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
index 74c9b5c6b8..baad815df2 100644
--- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
@@ -38,7 +38,6 @@ import im.vector.app.core.glide.GlideRequest
 import im.vector.app.core.glide.GlideRequests
 import im.vector.app.core.ui.model.Size
 import im.vector.app.core.utils.DimensionConverter
-import im.vector.app.features.settings.VectorPreferences
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
@@ -65,7 +64,6 @@ class ImageContentRenderer @Inject constructor(
         private val localFilesHelper: LocalFilesHelper,
         private val activeSessionHolder: ActiveSessionHolder,
         private val dimensionConverter: DimensionConverter,
-        private val vectorPreferences: VectorPreferences
 ) {
 
     @Parcelize
@@ -85,6 +83,7 @@ class ImageContentRenderer @Inject constructor(
 
     enum class Mode {
         FULL_SIZE,
+        ANIMATED_THUMBNAIL,
         THUMBNAIL,
         STICKER
     }
@@ -133,7 +132,7 @@ class ImageContentRenderer @Inject constructor(
 
         createGlideRequest(data, mode, imageView, size)
                 .let {
-                    if (vectorPreferences.autoplayAnimatedImages()) it
+                    if (mode == Mode.ANIMATED_THUMBNAIL) it
                     else it.dontAnimate()
                 }
                 .transform(cornerTransformation)
@@ -231,6 +230,7 @@ class ImageContentRenderer @Inject constructor(
             val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
             val resolvedUrl = when (mode) {
                 Mode.FULL_SIZE,
+                Mode.ANIMATED_THUMBNAIL,
                 Mode.STICKER -> resolveUrl(data)
                 Mode.THUMBNAIL -> contentUrlResolver.resolveThumbnail(data.url, size.width, size.height, ContentUrlResolver.ThumbnailMethod.SCALE)
             }
@@ -269,14 +269,14 @@ class ImageContentRenderer @Inject constructor(
                     finalHeight = height
                     finalWidth = width
                 }
+                Mode.ANIMATED_THUMBNAIL,
                 Mode.THUMBNAIL -> {
                     finalHeight = min(maxImageWidth * height / width, maxImageHeight)
                     finalWidth = finalHeight * width / height
                 }
                 Mode.STICKER -> {
                     // limit on width
-                    val maxWidthDp = min(dimensionConverter.dpToPx(120), maxImageWidth / 2)
-                    finalWidth = min(dimensionConverter.dpToPx(width), maxWidthDp)
+                    finalWidth = min(dimensionConverter.dpToPx(width), maxImageWidth * 3 / 4)
                     finalHeight = finalWidth * height / width
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
index 08d87b528c..089fdcebd4 100644
--- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
@@ -47,6 +47,8 @@ import im.vector.app.features.themes.ActivityOtherThemes
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.lib.attachmentviewer.AttachmentCommands
 import im.vector.lib.attachmentviewer.AttachmentViewerActivity
+import im.vector.lib.core.utils.compat.getParcelableArrayListExtraCompat
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -67,14 +69,9 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), AttachmentInt
             val sharedTransitionName: String?
     ) : Parcelable
 
-    @Inject
-    lateinit var sessionHolder: ActiveSessionHolder
-
-    @Inject
-    lateinit var dataSourceFactory: AttachmentProviderFactory
-
-    @Inject
-    lateinit var imageContentRenderer: ImageContentRenderer
+    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
+    @Inject lateinit var dataSourceFactory: AttachmentProviderFactory
+    @Inject lateinit var imageContentRenderer: ImageContentRenderer
 
     private val viewModel: VectorAttachmentViewerViewModel by viewModel()
     private val errorFormatter by lazy(LazyThreadSafetyMode.NONE) { singletonEntryPoint().errorFormatter() }
@@ -105,7 +102,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), AttachmentInt
                 transitionImageContainer.isVisible = true
 
                 // Postpone transaction a bit until thumbnail is loaded
-                val mediaData: Parcelable? = intent.getParcelableExtra(EXTRA_IMAGE_DATA)
+                val mediaData: Parcelable? = intent.getParcelableExtraCompat(EXTRA_IMAGE_DATA)
                 if (mediaData is ImageContentRenderer.Data) {
                     // will be shown at end of transition
                     pager2.isInvisible = true
@@ -126,11 +123,11 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), AttachmentInt
             }
         }
 
-        val session = sessionHolder.getSafeActiveSession() ?: return Unit.also { finish() }
+        val session = activeSessionHolder.getSafeActiveSession() ?: return Unit.also { finish() }
 
         val room = args.roomId?.let { session.getRoom(it) }
 
-        val inMemoryData = intent.getParcelableArrayListExtra<AttachmentData>(EXTRA_IN_MEMORY_DATA)
+        val inMemoryData = intent.getParcelableArrayListExtraCompat<AttachmentData>(EXTRA_IN_MEMORY_DATA)
         val sourceProvider = if (inMemoryData != null) {
             initialIndex = inMemoryData.indexOfFirst { it.eventId == args.eventId }.coerceAtLeast(0)
             dataSourceFactory.createProvider(inMemoryData, room, lifecycleScope)
@@ -173,6 +170,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), AttachmentInt
             transitionImageContainer.isVisible = true
         }
         isAnimatingOut = true
+        @Suppress("DEPRECATION")
         super.onBackPressed()
     }
 
@@ -227,7 +225,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), AttachmentInt
         return false
     }
 
-    private fun args() = intent.getParcelableExtra<Args>(EXTRA_ARGS)
+    private fun args() = intent.getParcelableExtraCompat<Args>(EXTRA_ARGS)
 
     private fun scheduleStartPostponedTransition(sharedElement: View) {
         sharedElement.viewTreeObserver.addOnPreDrawListener(
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index e724084501..3970af385e 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -25,11 +25,11 @@ import android.view.View
 import android.view.Window
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
+import androidx.fragment.app.FragmentActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.SpaceStateHandler
@@ -70,6 +70,8 @@ import im.vector.app.features.location.live.map.LiveLocationMapViewActivity
 import im.vector.app.features.location.live.map.LiveLocationMapViewArgs
 import im.vector.app.features.login.LoginActivity
 import im.vector.app.features.login.LoginConfig
+import im.vector.app.features.login.qr.QrCodeLoginActivity
+import im.vector.app.features.login.qr.QrCodeLoginArgs
 import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.media.AttachmentData
@@ -130,7 +132,6 @@ class DefaultNavigator @Inject constructor(
     override fun openLogin(context: Context, loginConfig: LoginConfig?, flags: Int) {
         val intent = when (features.onboardingVariant()) {
             OnboardingVariant.LEGACY -> LoginActivity.newIntent(context, loginConfig)
-            OnboardingVariant.LOGIN_2,
             OnboardingVariant.FTUE_AUTH -> OnboardingActivity.newIntent(context, loginConfig)
         }
         intent.addFlags(flags)
@@ -140,7 +141,6 @@ class DefaultNavigator @Inject constructor(
     override fun loginSSORedirect(context: Context, data: Uri?) {
         val intent = when (features.onboardingVariant()) {
             OnboardingVariant.LEGACY -> LoginActivity.redirectIntent(context, data)
-            OnboardingVariant.LOGIN_2,
             OnboardingVariant.FTUE_AUTH -> OnboardingActivity.redirectIntent(context, data)
         }
         context.startActivity(intent)
@@ -178,13 +178,25 @@ class DefaultNavigator @Inject constructor(
         startActivity(context, intent, buildTask)
     }
 
-    override fun switchToSpace(context: Context, spaceId: String, postSwitchSpaceAction: Navigator.PostSwitchSpaceAction) {
+    override fun switchToSpace(
+            context: Context,
+            spaceId: String,
+            postSwitchSpaceAction: Navigator.PostSwitchSpaceAction,
+    ) {
         if (sessionHolder.getSafeActiveSession()?.getRoomSummary(spaceId) == null) {
             fatalError("Trying to open an unknown space $spaceId", vectorPreferences.failFast())
             return
         }
         spaceStateHandler.setCurrentSpace(spaceId)
-        when (postSwitchSpaceAction) {
+        handlePostSwitchAction(context, spaceId, postSwitchSpaceAction)
+    }
+
+    private fun handlePostSwitchAction(
+            context: Context,
+            spaceId: String,
+            action: Navigator.PostSwitchSpaceAction,
+    ) {
+        when (action) {
             Navigator.PostSwitchSpaceAction.None -> {
                 // go back to home if we are showing room details?
                 // This is a bit ugly, but the navigator is supposed to know about the activity stack
@@ -200,9 +212,9 @@ class DefaultNavigator @Inject constructor(
             }
             is Navigator.PostSwitchSpaceAction.OpenDefaultRoom -> {
                 val args = TimelineArgs(
-                        postSwitchSpaceAction.roomId,
+                        action.roomId,
                         eventId = null,
-                        openShareSpaceForId = spaceId.takeIf { postSwitchSpaceAction.showShareSheet }
+                        openShareSpaceForId = spaceId.takeIf { action.showShareSheet }
                 )
                 val intent = RoomDetailActivity.newIntent(context, args, false)
                 startActivity(context, intent, false)
@@ -214,75 +226,65 @@ class DefaultNavigator @Inject constructor(
         startActivity(context, SpacePreviewActivity.newIntent(context, spaceId), false)
     }
 
-    override fun performDeviceVerification(context: Context, otherUserId: String, sasTransactionId: String) {
+    override fun performDeviceVerification(fragmentActivity: FragmentActivity, otherUserId: String, sasTransactionId: String) {
         val session = sessionHolder.getSafeActiveSession() ?: return
         val tx = session.cryptoService().verificationService().getExistingTransaction(otherUserId, sasTransactionId)
                 ?: return
         (tx as? IncomingSasVerificationTransaction)?.performAccept()
-        if (context is AppCompatActivity) {
-            VerificationBottomSheet.withArgs(
-                    roomId = null,
-                    otherUserId = otherUserId,
-                    transactionId = sasTransactionId
-            ).show(context.supportFragmentManager, "REQPOP")
-        }
+        VerificationBottomSheet.withArgs(
+                roomId = null,
+                otherUserId = otherUserId,
+                transactionId = sasTransactionId
+        ).show(fragmentActivity.supportFragmentManager, "REQPOP")
     }
 
-    override fun requestSessionVerification(context: Context, otherSessionId: String) {
+    override fun requestSessionVerification(fragmentActivity: FragmentActivity, otherSessionId: String) {
         val session = sessionHolder.getSafeActiveSession() ?: return
         val pr = session.cryptoService().verificationService().requestKeyVerification(
                 supportedVerificationMethodsProvider.provide(),
                 session.myUserId,
                 listOf(otherSessionId)
         )
-        if (context is AppCompatActivity) {
-            VerificationBottomSheet.withArgs(
-                    roomId = null,
-                    otherUserId = session.myUserId,
-                    transactionId = pr.transactionId
-            ).show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
-        }
+        VerificationBottomSheet.withArgs(
+                roomId = null,
+                otherUserId = session.myUserId,
+                transactionId = pr.transactionId
+        ).show(fragmentActivity.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
     }
 
-    override fun requestSelfSessionVerification(context: Context) {
+    override fun requestSelfSessionVerification(fragmentActivity: FragmentActivity) {
         val session = sessionHolder.getSafeActiveSession() ?: return
         val otherSessions = session.cryptoService()
                 .getCryptoDeviceInfo(session.myUserId)
                 .filter { it.deviceId != session.sessionParams.deviceId }
                 .map { it.deviceId }
-        if (context is AppCompatActivity) {
-            if (otherSessions.isNotEmpty()) {
-                val pr = session.cryptoService().verificationService().requestKeyVerification(
-                        supportedVerificationMethodsProvider.provide(),
-                        session.myUserId,
-                        otherSessions
-                )
-                VerificationBottomSheet.forSelfVerification(session, pr.transactionId ?: pr.localId)
-                        .show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
-            } else {
-                VerificationBottomSheet.forSelfVerification(session)
-                        .show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
-            }
-        }
-    }
-
-    override fun waitSessionVerification(context: Context) {
-        val session = sessionHolder.getSafeActiveSession() ?: return
-        if (context is AppCompatActivity) {
-            VerificationBottomSheet.forSelfVerification(session)
-                    .show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
-        }
-    }
-
-    override fun upgradeSessionSecurity(context: Context, initCrossSigningOnly: Boolean) {
-        if (context is AppCompatActivity) {
-            BootstrapBottomSheet.show(
-                    context.supportFragmentManager,
-                    if (initCrossSigningOnly) SetupMode.CROSS_SIGNING_ONLY else SetupMode.NORMAL
+        if (otherSessions.isNotEmpty()) {
+            val pr = session.cryptoService().verificationService().requestKeyVerification(
+                    supportedVerificationMethodsProvider.provide(),
+                    session.myUserId,
+                    otherSessions
             )
+            VerificationBottomSheet.forSelfVerification(session, pr.transactionId ?: pr.localId)
+                    .show(fragmentActivity.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
+        } else {
+            VerificationBottomSheet.forSelfVerification(session)
+                    .show(fragmentActivity.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
         }
     }
 
+    override fun waitSessionVerification(fragmentActivity: FragmentActivity) {
+        val session = sessionHolder.getSafeActiveSession() ?: return
+        VerificationBottomSheet.forSelfVerification(session)
+                .show(fragmentActivity.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
+    }
+
+    override fun upgradeSessionSecurity(fragmentActivity: FragmentActivity, initCrossSigningOnly: Boolean) {
+        BootstrapBottomSheet.show(
+                fragmentActivity.supportFragmentManager,
+                if (initCrossSigningOnly) SetupMode.CROSS_SIGNING_ONLY else SetupMode.NORMAL
+        )
+    }
+
     override fun openRoomMemberProfile(userId: String, roomId: String?, context: Context, buildTask: Boolean) {
         val args = RoomMemberProfileArgs(userId = userId, roomId = roomId)
         val intent = RoomMemberProfileActivity.newIntent(context, args)
@@ -306,16 +308,14 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
-    override fun openMatrixToBottomSheet(context: Context, link: String, origin: OriginOfMatrixTo) {
-        if (context is AppCompatActivity) {
-            if (context !is MatrixToBottomSheet.InteractionListener) {
-                fatalError("Caller context should implement MatrixToBottomSheet.InteractionListener", vectorPreferences.failFast())
-                return
-            }
-            // TODO check if there is already one??
-            MatrixToBottomSheet.withLink(link, origin)
-                    .show(context.supportFragmentManager, "HA#MatrixToBottomSheet")
+    override fun openMatrixToBottomSheet(fragmentActivity: FragmentActivity, link: String, origin: OriginOfMatrixTo) {
+        if (fragmentActivity !is MatrixToBottomSheet.InteractionListener) {
+            fatalError("Caller context should implement MatrixToBottomSheet.InteractionListener", vectorPreferences.failFast())
+            return
         }
+        // TODO check if there is already one??
+        MatrixToBottomSheet.withLink(link, origin)
+                .show(fragmentActivity.supportFragmentManager, "HA#MatrixToBottomSheet")
     }
 
     override fun openRoomDirectory(context: Context, initialFilter: String) {
@@ -337,18 +337,16 @@ class DefaultNavigator @Inject constructor(
         }.start(context)
     }
 
-    override fun openInviteUsersToRoom(context: Context, roomId: String) {
+    override fun openInviteUsersToRoom(fragmentActivity: FragmentActivity, roomId: String) {
         when (val currentSpace = spaceStateHandler.getCurrentSpace()) {
-            null -> InviteUsersToRoomActivity.getIntent(context, roomId).start(context)
-            else -> showInviteToDialog(context, currentSpace, roomId)
+            null -> InviteUsersToRoomActivity.getIntent(fragmentActivity, roomId).start(fragmentActivity)
+            else -> showInviteToDialog(fragmentActivity, currentSpace, roomId)
         }
     }
 
-    private fun showInviteToDialog(context: Context, currentSpace: RoomSummary, roomId: String) {
-        (context as? AppCompatActivity)?.supportFragmentManager?.let { fragmentManager ->
-            InviteRoomSpaceChooserBottomSheet.showInstance(fragmentManager, currentSpace.roomId, roomId) { itemId ->
-                InviteUsersToRoomActivity.getIntent(context, itemId).start(context)
-            }
+    private fun showInviteToDialog(fragmentActivity: FragmentActivity, currentSpace: RoomSummary, roomId: String) {
+        InviteRoomSpaceChooserBottomSheet.showInstance(fragmentActivity.supportFragmentManager, currentSpace.roomId, roomId) { itemId ->
+            InviteUsersToRoomActivity.getIntent(fragmentActivity, itemId).start(fragmentActivity)
         }
     }
 
@@ -371,24 +369,20 @@ class DefaultNavigator @Inject constructor(
         debugNavigator.openDebugMenu(context)
     }
 
-    override fun openKeysBackupSetup(context: Context, showManualExport: Boolean) {
+    override fun openKeysBackupSetup(fragmentActivity: FragmentActivity, showManualExport: Boolean) {
         // if cross signing is enabled and trusted or not set up at all we should propose full 4S
         sessionHolder.getSafeActiveSession()?.let { session ->
             if (session.cryptoService().crossSigningService().getMyCrossSigningKeys() == null ||
                     session.cryptoService().crossSigningService().canCrossSign()) {
-                (context as? AppCompatActivity)?.let {
-                    BootstrapBottomSheet.show(it.supportFragmentManager, SetupMode.NORMAL)
-                }
+                BootstrapBottomSheet.show(fragmentActivity.supportFragmentManager, SetupMode.NORMAL)
             } else {
-                context.startActivity(KeysBackupSetupActivity.intent(context, showManualExport))
+                fragmentActivity.startActivity(KeysBackupSetupActivity.intent(fragmentActivity, showManualExport))
             }
         }
     }
 
-    override fun open4SSetup(context: Context, setupMode: SetupMode) {
-        if (context is AppCompatActivity) {
-            BootstrapBottomSheet.show(context.supportFragmentManager, setupMode)
-        }
+    override fun open4SSetup(fragmentActivity: FragmentActivity, setupMode: SetupMode) {
+        BootstrapBottomSheet.show(fragmentActivity.supportFragmentManager, setupMode)
     }
 
     override fun openKeysBackupManager(context: Context) {
@@ -612,6 +606,14 @@ class DefaultNavigator @Inject constructor(
         activityResultLauncher.launch(screenCaptureIntent)
     }
 
+    override fun openLoginWithQrCode(context: Context, qrCodeLoginArgs: QrCodeLoginArgs) {
+        QrCodeLoginActivity
+                .getIntent(context, qrCodeLoginArgs)
+                .also {
+                    context.startActivity(it)
+                }
+    }
+
     private fun Intent.start(context: Context) {
         context.startActivity(this)
     }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 8e01b3ed50..1d67f883a3 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -23,6 +23,7 @@ import android.net.Uri
 import android.view.View
 import androidx.activity.result.ActivityResultLauncher
 import androidx.core.util.Pair
+import androidx.fragment.app.FragmentActivity
 import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.displayname.getBestName
@@ -30,6 +31,7 @@ import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
 import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.LocationSharingMode
 import im.vector.app.features.login.LoginConfig
+import im.vector.app.features.login.qr.QrCodeLoginArgs
 import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.media.AttachmentData
 import im.vector.app.features.pin.PinMode
@@ -68,19 +70,23 @@ interface Navigator {
         data class OpenDefaultRoom(val roomId: String, val showShareSheet: Boolean) : PostSwitchSpaceAction()
     }
 
-    fun switchToSpace(context: Context, spaceId: String, postSwitchSpaceAction: PostSwitchSpaceAction)
+    fun switchToSpace(
+            context: Context,
+            spaceId: String,
+            postSwitchSpaceAction: PostSwitchSpaceAction,
+    )
 
     fun openSpacePreview(context: Context, spaceId: String)
 
-    fun performDeviceVerification(context: Context, otherUserId: String, sasTransactionId: String)
+    fun performDeviceVerification(fragmentActivity: FragmentActivity, otherUserId: String, sasTransactionId: String)
 
-    fun requestSessionVerification(context: Context, otherSessionId: String)
+    fun requestSessionVerification(fragmentActivity: FragmentActivity, otherSessionId: String)
 
-    fun requestSelfSessionVerification(context: Context)
+    fun requestSelfSessionVerification(fragmentActivity: FragmentActivity)
 
-    fun waitSessionVerification(context: Context)
+    fun waitSessionVerification(fragmentActivity: FragmentActivity)
 
-    fun upgradeSessionSecurity(context: Context, initCrossSigningOnly: Boolean)
+    fun upgradeSessionSecurity(fragmentActivity: FragmentActivity, initCrossSigningOnly: Boolean)
 
     fun openRoomForSharingAndFinish(activity: Activity, roomId: String, sharedData: SharedData)
 
@@ -88,13 +94,13 @@ interface Navigator {
 
     fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData, fromEmailInviteLink: PermalinkData.RoomEmailInviteLink? = null)
 
-    fun openMatrixToBottomSheet(context: Context, link: String, origin: OriginOfMatrixTo)
+    fun openMatrixToBottomSheet(fragmentActivity: FragmentActivity, link: String, origin: OriginOfMatrixTo)
 
     fun openCreateRoom(context: Context, initialName: String = "", openAfterCreate: Boolean = true)
 
     fun openCreateDirectRoom(context: Context)
 
-    fun openInviteUsersToRoom(context: Context, roomId: String)
+    fun openInviteUsersToRoom(fragmentActivity: FragmentActivity, roomId: String)
 
     fun openRoomDirectory(context: Context, initialFilter: String = "")
 
@@ -106,9 +112,9 @@ interface Navigator {
 
     fun openDebug(context: Context)
 
-    fun openKeysBackupSetup(context: Context, showManualExport: Boolean)
+    fun openKeysBackupSetup(fragmentActivity: FragmentActivity, showManualExport: Boolean)
 
-    fun open4SSetup(context: Context, setupMode: SetupMode)
+    fun open4SSetup(fragmentActivity: FragmentActivity, setupMode: SetupMode)
 
     fun openKeysBackupManager(context: Context)
 
@@ -196,4 +202,9 @@ interface Navigator {
             screenCaptureIntent: Intent,
             activityResultLauncher: ActivityResultLauncher<Intent>
     )
+
+    fun openLoginWithQrCode(
+            context: Context,
+            qrCodeLoginArgs: QrCodeLoginArgs,
+    )
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/CircularCache.kt b/vector/src/main/java/im/vector/app/features/notifications/CircularCache.kt
index 5c751e0d55..6c9b8b2e6c 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/CircularCache.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/CircularCache.kt
@@ -29,13 +29,13 @@ class CircularCache<T : Any>(cacheSize: Int, factory: (Int) -> Array<T?>) {
     private val cache = factory(cacheSize)
     private var writeIndex = 0
 
-    fun contains(key: T): Boolean = cache.contains(key)
+    fun contains(value: T): Boolean = cache.contains(value)
 
-    fun put(key: T) {
+    fun put(value: T) {
         if (writeIndex == cache.size) {
             writeIndex = 0
         }
-        cache[writeIndex] = key
+        cache[writeIndex] = value
         writeIndex++
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventProcessor.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventProcessor.kt
index 6bdd2ab511..81b9844e36 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventProcessor.kt
@@ -30,13 +30,13 @@ class NotifiableEventProcessor @Inject constructor(
         private val autoAcceptInvites: AutoAcceptInvites
 ) {
 
-    fun process(queuedEvents: List<NotifiableEvent>, currentRoomId: String?, renderedEvents: ProcessedEvents): ProcessedEvents {
+    fun process(queuedEvents: List<NotifiableEvent>, currentRoomId: String?, currentThreadId: String?, renderedEvents: ProcessedEvents): ProcessedEvents {
         val processedEvents = queuedEvents.map {
             val type = when (it) {
                 is InviteNotifiableEvent -> if (autoAcceptInvites.hideInvites) REMOVE else KEEP
                 is NotifiableMessageEvent -> when {
-                    shouldIgnoreMessageEventInRoom(currentRoomId, it.roomId) -> REMOVE
-                            .also { Timber.d("notification message removed due to currently viewing the same room") }
+                    it.shouldIgnoreMessageEventInRoom(currentRoomId, currentThreadId) -> REMOVE
+                            .also { Timber.d("notification message removed due to currently viewing the same room or thread") }
                     outdatedDetector.isMessageOutdated(it) -> REMOVE
                             .also { Timber.d("notification message removed due to being read") }
                     else -> KEEP
@@ -55,8 +55,4 @@ class NotifiableEventProcessor @Inject constructor(
 
         return removedEventsDiff + processedEvents
     }
-
-    private fun shouldIgnoreMessageEventInRoom(currentRoomId: String?, roomId: String?): Boolean {
-        return currentRoomId != null && roomId == currentRoomId
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index ae5a8aec7d..988ab01ef8 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -17,6 +17,7 @@ package im.vector.app.features.notifications
 
 import android.net.Uri
 import im.vector.app.R
+import im.vector.app.core.extensions.getVectorLastMessageContent
 import im.vector.app.core.extensions.takeAs
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.StringProvider
@@ -31,13 +32,14 @@ import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.getRootThreadEventId
 import org.matrix.android.sdk.api.session.events.model.isEdition
 import org.matrix.android.sdk.api.session.events.model.isImageMessage
 import org.matrix.android.sdk.api.session.events.model.supportsNotification
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.getRoomSummary
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
@@ -45,7 +47,6 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachme
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getEditedEventId
-import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
 import java.util.UUID
@@ -66,7 +67,7 @@ class NotifiableEventResolver @Inject constructor(
 ) {
 
     private val nonEncryptedNotifiableEventTypes: List<String> =
-            listOf(EventType.MESSAGE) + EventType.POLL_START + EventType.STATE_ROOM_BEACON_INFO
+            listOf(EventType.MESSAGE) + EventType.POLL_START.values + EventType.STATE_ROOM_BEACON_INFO.values
 
     suspend fun resolveEvent(event: Event, session: Session, isNoisy: Boolean): NotifiableEvent? {
         val roomID = event.roomId ?: return null
@@ -112,7 +113,7 @@ class NotifiableEventResolver @Inject constructor(
         val notificationAction = actions.toNotificationAction()
 
         return if (notificationAction.shouldNotify) {
-            val user = session.getUser(event.senderId!!) ?: return null
+            val user = session.getUserOrDefault(event.senderId!!)
 
             val timelineEvent = TimelineEvent(
                     root = event,
@@ -133,7 +134,7 @@ class NotifiableEventResolver @Inject constructor(
         }
     }
 
-    private suspend fun resolveMessageEvent(event: TimelineEvent, session: Session, canBeReplaced: Boolean, isNoisy: Boolean): NotifiableEvent? {
+    private suspend fun resolveMessageEvent(event: TimelineEvent, session: Session, canBeReplaced: Boolean, isNoisy: Boolean): NotifiableMessageEvent? {
         // The event only contains an eventId, and roomId (type is m.room.*) , we need to get the displayable content (names, avatar, text, etc...)
         val room = session.getRoom(event.root.roomId!! /*roomID cannot be null*/)
 
@@ -155,6 +156,7 @@ class NotifiableEventResolver @Inject constructor(
                     body = body.toString(),
                     imageUriString = event.fetchImageIfPresent(session)?.toString(),
                     roomId = event.root.roomId!!,
+                    threadId = event.root.getRootThreadEventId(),
                     roomName = roomName,
                     matrixID = session.myUserId
             )
@@ -178,6 +180,7 @@ class NotifiableEventResolver @Inject constructor(
                             body = body,
                             imageUriString = event.fetchImageIfPresent(session)?.toString(),
                             roomId = event.root.roomId!!,
+                            threadId = event.root.getRootThreadEventId(),
                             roomName = roomName,
                             roomIsDirect = room.roomSummary()?.isDirect ?: false,
                             roomAvatarPath = session.contentUrlResolver()
@@ -213,7 +216,8 @@ class NotifiableEventResolver @Inject constructor(
                         payload = result.clearEvent,
                         senderKey = result.senderCurve25519Key,
                         keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
-                        forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                        forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
+                        isSafe = result.isSafe
                 )
             } catch (ignore: MXCryptoError) {
             }
@@ -230,7 +234,7 @@ class NotifiableEventResolver @Inject constructor(
 
     private suspend fun TimelineEvent.downloadAndExportImage(session: Session): Uri? {
         return kotlin.runCatching {
-            getLastMessageContent()?.takeAs<MessageWithAttachmentContent>()?.let { imageMessage ->
+            getVectorLastMessageContent()?.takeAs<MessageWithAttachmentContent>()?.let { imageMessage ->
                 val fileService = session.fileService()
                 fileService.downloadFile(imageMessage)
                 fileService.getTemporarySharableURI(imageMessage)
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
index 68268739a0..bbd8c6638c 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
@@ -31,6 +31,7 @@ data class NotifiableMessageEvent(
         // NotSerializableException when persisting this to storage
         val imageUriString: String?,
         val roomId: String,
+        val threadId: String?,
         val roomName: String?,
         val roomIsDirect: Boolean = false,
         val roomAvatarPath: String? = null,
@@ -51,3 +52,10 @@ data class NotifiableMessageEvent(
     val imageUri: Uri?
         get() = imageUriString?.let { Uri.parse(it) }
 }
+
+fun NotifiableMessageEvent.shouldIgnoreMessageEventInRoom(currentRoomId: String?, currentThreadId: String?): Boolean {
+    return when (currentRoomId) {
+        null -> false
+        else -> roomId == currentRoomId && threadId == currentThreadId
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index 3fe0898eb4..e231686c27 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -109,7 +109,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
             val room = session.getRoom(roomId)
             if (room != null) {
                 session.coroutineScope.launch {
-                    tryOrNull { room.readService().markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
+                    tryOrNull { room.readService().markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT, mainTimeLineOnly = false) }
                 }
             }
         }
@@ -118,6 +118,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
     private fun handleSmartReply(intent: Intent, context: Context) {
         val message = getReplyMessage(intent)
         val roomId = intent.getStringExtra(KEY_ROOM_ID)
+        val threadId = intent.getStringExtra(KEY_THREAD_ID)
 
         if (message.isNullOrBlank() || roomId.isNullOrBlank()) {
             // ignore this event
@@ -126,13 +127,20 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         }
         activeSessionHolder.getActiveSession().let { session ->
             session.getRoom(roomId)?.let { room ->
-                sendMatrixEvent(message, session, room, context)
+                sendMatrixEvent(message, threadId, session, room, context)
             }
         }
     }
 
-    private fun sendMatrixEvent(message: String, session: Session, room: Room, context: Context?) {
-        room.sendService().sendTextMessage(message)
+    private fun sendMatrixEvent(message: String, threadId: String?, session: Session, room: Room, context: Context?) {
+        if (threadId != null) {
+            room.relationService().replyInThread(
+                    rootThreadEventId = threadId,
+                    replyInThreadText = message,
+            )
+        } else {
+            room.sendService().sendTextMessage(message)
+        }
 
         // Create a new event to be displayed in the notification drawer, right now
 
@@ -148,6 +156,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
                 body = message,
                 imageUriString = null,
                 roomId = room.roomId,
+                threadId = threadId,
                 roomName = room.roomSummary()?.displayName ?: room.roomId,
                 roomIsDirect = room.roomSummary()?.isDirect == true,
                 outGoingMessage = true,
@@ -222,6 +231,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
 
     companion object {
         const val KEY_ROOM_ID = "roomID"
+        const val KEY_THREAD_ID = "threadID"
         const val KEY_TEXT_REPLY = "key_text_reply"
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 5f43ff6b90..4f05e83bd4 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -27,7 +27,7 @@ import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
 import javax.inject.Inject
@@ -63,6 +63,7 @@ class NotificationDrawerManager @Inject constructor(
     private val notificationState by lazy { createInitialNotificationState() }
     private val avatarSize = context.resources.getDimensionPixelSize(R.dimen.profile_avatar_size)
     private var currentRoomId: String? = null
+    private var currentThreadId: String? = null
     private val firstThrottler = FirstThrottler(200)
 
     private var useCompleteNotificationFormat = vectorPreferences.useCompleteNotificationFormat()
@@ -123,6 +124,22 @@ class NotificationDrawerManager @Inject constructor(
         }
     }
 
+    /**
+     * Should be called when the application is currently opened and showing timeline for the given threadId.
+     * Used to ignore events related to that thread (no need to display notification) and clean any existing notification on this room.
+     */
+    fun setCurrentThread(threadId: String?) {
+        updateEvents {
+            val hasChanged = threadId != currentThreadId
+            currentThreadId = threadId
+            currentRoomId?.let { roomId ->
+                if (hasChanged && threadId != null) {
+                    it.clearMessagesForThread(roomId, threadId)
+                }
+            }
+        }
+    }
+
     fun notificationStyleChanged() {
         updateEvents {
             val newSettings = vectorPreferences.useCompleteNotificationFormat()
@@ -164,7 +181,7 @@ class NotificationDrawerManager @Inject constructor(
     private fun refreshNotificationDrawerBg() {
         Timber.v("refreshNotificationDrawerBg()")
         val eventsToRender = notificationState.updateQueuedEvents(this) { queuedEvents, renderedEvents ->
-            notifiableEventProcessor.process(queuedEvents.rawEvents(), currentRoomId, renderedEvents).also {
+            notifiableEventProcessor.process(queuedEvents.rawEvents(), currentRoomId, currentThreadId, renderedEvents).also {
                 queuedEvents.clearAndAdd(it.onlyKeptEvents())
             }
         }
@@ -186,11 +203,11 @@ class NotificationDrawerManager @Inject constructor(
     }
 
     private fun renderEvents(session: Session, eventsToRender: List<ProcessedEvent<NotifiableEvent>>) {
-        val user = session.getUser(session.myUserId)
+        val user = session.getUserOrDefault(session.myUserId)
         // myUserDisplayName cannot be empty else NotificationCompat.MessagingStyle() will crash
-        val myUserDisplayName = user?.toMatrixItem()?.getBestName() ?: session.myUserId
+        val myUserDisplayName = user.toMatrixItem().getBestName()
         val myUserAvatarUrl = session.contentUrlResolver().resolveThumbnail(
-                contentUrl = user?.avatarUrl,
+                contentUrl = user.avatarUrl,
                 width = avatarSize,
                 height = avatarSize,
                 method = ContentUrlResolver.ThumbnailMethod.SCALE
@@ -198,8 +215,8 @@ class NotificationDrawerManager @Inject constructor(
         notificationRenderer.render(session.myUserId, myUserDisplayName, myUserAvatarUrl, useCompleteNotificationFormat, eventsToRender)
     }
 
-    fun shouldIgnoreMessageEventInRoom(roomId: String?): Boolean {
-        return currentRoomId != null && roomId == currentRoomId
+    fun shouldIgnoreMessageEventInRoom(resolvedEvent: NotifiableMessageEvent): Boolean {
+        return resolvedEvent.shouldIgnoreMessageEventInRoom(currentRoomId, currentThreadId)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
index f02424803a..8aff9c3bf2 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
@@ -122,15 +122,20 @@ data class NotificationEventQueue(
     }
 
     fun clearMemberShipNotificationForRoom(roomId: String) {
-        Timber.v("clearMemberShipOfRoom $roomId")
+        Timber.d("clearMemberShipOfRoom $roomId")
         queue.removeAll { it is InviteNotifiableEvent && it.roomId == roomId }
     }
 
     fun clearMessagesForRoom(roomId: String) {
-        Timber.v("clearMessageEventOfRoom $roomId")
+        Timber.d("clearMessageEventOfRoom $roomId")
         queue.removeAll { it is NotifiableMessageEvent && it.roomId == roomId }
     }
 
+    fun clearMessagesForThread(roomId: String, threadId: String) {
+        Timber.d("clearMessageEventOfThread $roomId, $threadId")
+        queue.removeAll { it is NotifiableMessageEvent && it.roomId == roomId && it.threadId == threadId }
+    }
+
     fun rawEvents(): List<NotifiableEvent> = queue
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index 8f05819fc4..5b3a244137 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -19,7 +19,6 @@
 package im.vector.app.features.notifications
 
 import android.annotation.SuppressLint
-import android.annotation.TargetApi
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -34,6 +33,7 @@ import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
 import androidx.annotation.AttrRes
+import androidx.annotation.ChecksSdkIntAtLeast
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.app.NotificationCompat
@@ -60,6 +60,8 @@ import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
+import im.vector.app.features.home.room.threads.ThreadsActivity
+import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.troubleshoot.TestNotificationReceiver
 import im.vector.app.features.themes.ThemeUtils
@@ -102,6 +104,7 @@ class NotificationUtils @Inject constructor(
         const val SILENT_NOTIFICATION_CHANNEL_ID = "DEFAULT_SILENT_NOTIFICATION_CHANNEL_ID_V2"
         private const val CALL_NOTIFICATION_CHANNEL_ID = "CALL_NOTIFICATION_CHANNEL_ID_V2"
 
+        @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.O)
         fun supportNotificationChannels() = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
 
         fun openSystemSettingsForSilentCategory(fragment: Fragment) {
@@ -126,7 +129,6 @@ class NotificationUtils @Inject constructor(
     /**
      * Create notification channels.
      */
-    @TargetApi(Build.VERSION_CODES.O)
     fun createNotificationChannels() {
         if (!supportNotificationChannels()) {
             return
@@ -218,7 +220,6 @@ class NotificationUtils @Inject constructor(
      * @param withProgress true to show indeterminate progress on the notification
      * @return the polling thread listener notification
      */
-    @SuppressLint("NewApi")
     fun buildForegroundServiceNotification(@StringRes subTitleResId: Int, withProgress: Boolean = true): Notification {
         // build the pending intent go to the home screen if this is clicked.
         val i = HomeActivity.newIntent(context, firstStartMainActivity = false)
@@ -287,7 +288,6 @@ class NotificationUtils @Inject constructor(
      * @param fromBg true if the app is in background when posting the notification
      * @return the call notification.
      */
-    @SuppressLint("NewApi")
     fun buildIncomingCallNotification(
             call: WebRtcCall,
             title: String,
@@ -420,7 +420,6 @@ class NotificationUtils @Inject constructor(
      * @param title title of the notification
      * @return the call notification.
      */
-    @SuppressLint("NewApi")
     fun buildPendingCallNotification(
             call: WebRtcCall,
             title: String
@@ -577,6 +576,7 @@ class NotificationUtils @Inject constructor(
     fun buildMessagesListNotification(
             messageStyle: NotificationCompat.MessagingStyle,
             roomInfo: RoomEventGroupInfo,
+            threadId: String?,
             largeIcon: Bitmap?,
             lastMessageTimestamp: Long,
             senderDisplayNameForReplyCompat: String?,
@@ -584,8 +584,12 @@ class NotificationUtils @Inject constructor(
     ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
-        val openRoomIntent = buildOpenRoomIntent(roomInfo.roomId)
-        val smallIcon = R.drawable.ic_status_bar
+        val openIntent = when {
+            threadId != null && vectorPreferences.areThreadMessagesEnabled() -> buildOpenThreadIntent(roomInfo, threadId)
+            else -> buildOpenRoomIntent(roomInfo.roomId)
+        }
+
+        val smallIcon = R.drawable.ic_notification
 
         val channelID = if (roomInfo.shouldBing) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
         return NotificationCompat.Builder(context, channelID)
@@ -653,7 +657,7 @@ class NotificationUtils @Inject constructor(
 
                     // Quick reply
                     if (!roomInfo.hasSmartReplyError) {
-                        buildQuickReplyIntent(roomInfo.roomId, senderDisplayNameForReplyCompat)?.let { replyPendingIntent ->
+                        buildQuickReplyIntent(roomInfo.roomId, threadId, senderDisplayNameForReplyCompat)?.let { replyPendingIntent ->
                             val remoteInput = RemoteInput.Builder(NotificationBroadcastReceiver.KEY_TEXT_REPLY)
                                     .setLabel(stringProvider.getString(R.string.action_quick_reply))
                                     .build()
@@ -669,8 +673,8 @@ class NotificationUtils @Inject constructor(
                         }
                     }
 
-                    if (openRoomIntent != null) {
-                        setContentIntent(openRoomIntent)
+                    if (openIntent != null) {
+                        setContentIntent(openIntent)
                     }
 
                     if (largeIcon != null) {
@@ -698,7 +702,7 @@ class NotificationUtils @Inject constructor(
     ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_notification
 
         val channelID = if (inviteNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
 
@@ -778,7 +782,7 @@ class NotificationUtils @Inject constructor(
     ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_notification
 
         val channelID = if (simpleNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
 
@@ -829,6 +833,45 @@ class NotificationUtils @Inject constructor(
                 )
     }
 
+    private fun buildOpenThreadIntent(roomInfo: RoomEventGroupInfo, threadId: String?): PendingIntent? {
+        val threadTimelineArgs = ThreadTimelineArgs(
+                startsThread = false,
+                roomId = roomInfo.roomId,
+                rootThreadEventId = threadId,
+                showKeyboard = false,
+                displayName = roomInfo.roomDisplayName,
+                avatarUrl = null,
+                roomEncryptionTrustLevel = null,
+        )
+        val threadIntentTap = ThreadsActivity.newIntent(
+                context = context,
+                threadTimelineArgs = threadTimelineArgs,
+                threadListArgs = null,
+                firstStartMainActivity = true,
+        )
+        threadIntentTap.action = actionIds.tapToView
+        // pending intent get reused by system, this will mess up the extra params, so put unique info to avoid that
+        threadIntentTap.data = createIgnoredUri("openThread?$threadId")
+
+        val roomIntent = RoomDetailActivity.newIntent(
+                context = context,
+                timelineArgs = TimelineArgs(
+                        roomId = roomInfo.roomId,
+                        switchToParentSpace = true
+                ),
+                firstStartMainActivity = false
+        )
+        // Recreate the back stack
+        return TaskStackBuilder.create(context)
+                .addNextIntentWithParentStack(HomeActivity.newIntent(context, firstStartMainActivity = false))
+                .addNextIntentWithParentStack(roomIntent)
+                .addNextIntent(threadIntentTap)
+                .getPendingIntent(
+                        clock.epochMillis().toInt(),
+                        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+                )
+    }
+
     private fun buildOpenHomePendingIntentForSummary(): PendingIntent {
         val intent = HomeActivity.newIntent(context, firstStartMainActivity = false, clearNotification = true)
         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
@@ -849,13 +892,17 @@ class NotificationUtils @Inject constructor(
         However, for Android devices running Marshmallow and below (API level 23 and below),
         it will be more appropriate to use an activity. Since you have to provide your own UI.
      */
-    private fun buildQuickReplyIntent(roomId: String, senderName: String?): PendingIntent? {
+    private fun buildQuickReplyIntent(roomId: String, threadId: String?, senderName: String?): PendingIntent? {
         val intent: Intent
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             intent = Intent(context, NotificationBroadcastReceiver::class.java)
             intent.action = actionIds.smartReply
             intent.data = createIgnoredUri(roomId)
             intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
+            threadId?.let {
+                intent.putExtra(NotificationBroadcastReceiver.KEY_THREAD_ID, it)
+            }
+
             return PendingIntent.getBroadcast(
                     context,
                     clock.epochMillis().toInt(),
@@ -893,7 +940,7 @@ class NotificationUtils @Inject constructor(
             lastMessageTimestamp: Long
     ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_notification
 
         return NotificationCompat.Builder(context, if (noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID)
                 .setOnlyAlertOnce(true)
@@ -966,6 +1013,7 @@ class NotificationUtils @Inject constructor(
         }
     }
 
+    @SuppressLint("LaunchActivityFromNotification")
     fun displayDiagnosticNotification() {
         val testActionIntent = Intent(context, TestNotificationReceiver::class.java)
         testActionIntent.action = actionIds.diagnostic
@@ -982,7 +1030,7 @@ class NotificationUtils @Inject constructor(
                 NotificationCompat.Builder(context, NOISY_NOTIFICATION_CHANNEL_ID)
                         .setContentTitle(stringProvider.getString(R.string.app_name))
                         .setContentText(stringProvider.getString(R.string.settings_troubleshoot_test_push_notification_content))
-                        .setSmallIcon(R.drawable.ic_status_bar)
+                        .setSmallIcon(R.drawable.ic_notification)
                         .setLargeIcon(getBitmap(context, R.drawable.element_logo_green))
                         .setColor(ContextCompat.getColor(context, R.color.notification_accent_color))
                         .setPriority(NotificationCompat.PRIORITY_MAX)
diff --git a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
index 7fdfa3535e..767f427f39 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
@@ -33,14 +33,14 @@ class RoomGroupMessageCreator @Inject constructor(
 ) {
 
     fun createRoomMessage(events: List<NotifiableMessageEvent>, roomId: String, userDisplayName: String, userAvatarUrl: String?): RoomNotification.Message {
-        val firstKnownRoomEvent = events[0]
-        val roomName = firstKnownRoomEvent.roomName ?: firstKnownRoomEvent.senderName ?: ""
-        val roomIsGroup = !firstKnownRoomEvent.roomIsDirect
+        val lastKnownRoomEvent = events.last()
+        val roomName = lastKnownRoomEvent.roomName ?: lastKnownRoomEvent.senderName ?: ""
+        val roomIsGroup = !lastKnownRoomEvent.roomIsDirect
         val style = NotificationCompat.MessagingStyle(
                 Person.Builder()
                         .setName(userDisplayName)
                         .setIcon(bitmapLoader.getUserIcon(userAvatarUrl))
-                        .setKey(firstKnownRoomEvent.matrixID)
+                        .setKey(lastKnownRoomEvent.matrixID)
                         .build()
         ).also {
             it.conversationTitle = roomName.takeIf { roomIsGroup }
@@ -75,6 +75,7 @@ class RoomGroupMessageCreator @Inject constructor(
                             it.customSound = events.last().soundName
                             it.isUpdated = events.last().isUpdated
                         },
+                        threadId = lastKnownRoomEvent.threadId,
                         largeIcon = largeBitmap,
                         lastMessageTimestamp,
                         userDisplayName,
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt b/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
deleted file mode 100644
index 7def6d62f0..0000000000
--- a/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package im.vector.app.features.onboarding
-
-import android.content.Intent
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.children
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentTransaction
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.R
-import im.vector.app.core.extensions.POP_BACK_STACK_EXCLUSIVE
-import im.vector.app.core.extensions.addFragment
-import im.vector.app.core.extensions.addFragmentToBackstack
-import im.vector.app.core.extensions.resetBackstack
-import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.databinding.ActivityLoginBinding
-import im.vector.app.features.home.HomeActivity
-import im.vector.app.features.login.LoginCaptchaFragmentArgument
-import im.vector.app.features.login.LoginConfig
-import im.vector.app.features.login.LoginGenericTextInputFormFragmentArgument
-import im.vector.app.features.login.LoginWaitForEmailFragmentArgument
-import im.vector.app.features.login.TextInputFormFragmentMode
-import im.vector.app.features.login.isSupported
-import im.vector.app.features.login.terms.LoginTermsFragmentArgument
-import im.vector.app.features.login2.LoginAction2
-import im.vector.app.features.login2.LoginCaptchaFragment2
-import im.vector.app.features.login2.LoginFragmentSigninPassword2
-import im.vector.app.features.login2.LoginFragmentSigninUsername2
-import im.vector.app.features.login2.LoginFragmentSignupPassword2
-import im.vector.app.features.login2.LoginFragmentSignupUsername2
-import im.vector.app.features.login2.LoginFragmentToAny2
-import im.vector.app.features.login2.LoginGenericTextInputFormFragment2
-import im.vector.app.features.login2.LoginResetPasswordFragment2
-import im.vector.app.features.login2.LoginResetPasswordMailConfirmationFragment2
-import im.vector.app.features.login2.LoginResetPasswordSuccessFragment2
-import im.vector.app.features.login2.LoginServerSelectionFragment2
-import im.vector.app.features.login2.LoginServerUrlFormFragment2
-import im.vector.app.features.login2.LoginSplashSignUpSignInSelectionFragment2
-import im.vector.app.features.login2.LoginSsoOnlyFragment2
-import im.vector.app.features.login2.LoginViewEvents2
-import im.vector.app.features.login2.LoginViewModel2
-import im.vector.app.features.login2.LoginViewState2
-import im.vector.app.features.login2.LoginWaitForEmailFragment2
-import im.vector.app.features.login2.LoginWebFragment2
-import im.vector.app.features.login2.created.AccountCreatedFragment
-import im.vector.app.features.login2.terms.LoginTermsFragment2
-import org.matrix.android.sdk.api.auth.registration.FlowResult
-import org.matrix.android.sdk.api.auth.registration.Stage
-import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms
-import org.matrix.android.sdk.api.extensions.tryOrNull
-
-private const val FRAGMENT_REGISTRATION_STAGE_TAG = "FRAGMENT_REGISTRATION_STAGE_TAG"
-private const val FRAGMENT_LOGIN_TAG = "FRAGMENT_LOGIN_TAG"
-
-class Login2Variant(
-        private val views: ActivityLoginBinding,
-        private val loginViewModel: LoginViewModel2,
-        private val activity: VectorBaseActivity<ActivityLoginBinding>,
-        private val supportFragmentManager: FragmentManager
-) : OnboardingVariant {
-
-    private val enterAnim = R.anim.enter_fade_in
-    private val exitAnim = R.anim.exit_fade_out
-
-    private val popEnterAnim = R.anim.no_anim
-    private val popExitAnim = R.anim.exit_fade_out
-
-    private val topFragment: Fragment?
-        get() = supportFragmentManager.findFragmentById(views.loginFragmentContainer.id)
-
-    private val commonOption: (FragmentTransaction) -> Unit = { ft ->
-        // Find the loginLogo on the current Fragment, this should not return null
-        (topFragment?.view as? ViewGroup)
-                // Find activity.findViewById does not work, I do not know why
-                // activity.findViewById<View?>(views.loginLogo)
-                ?.children
-                ?.firstOrNull { it.id == R.id.loginLogo }
-                ?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
-        ft.setCustomAnimations(enterAnim, exitAnim, popEnterAnim, popExitAnim)
-    }
-
-    override fun initUiAndData(isFirstCreation: Boolean) {
-        if (isFirstCreation) {
-            addFirstFragment()
-        }
-
-        with(activity) {
-            loginViewModel.onEach {
-                updateWithState(it)
-            }
-            loginViewModel.observeViewEvents { handleLoginViewEvents(it) }
-        }
-
-        // Get config extra
-        val loginConfig = activity.intent.getParcelableExtra<LoginConfig?>(OnboardingActivity.EXTRA_CONFIG)
-        if (isFirstCreation) {
-            // TODO Check this
-            loginViewModel.handle(LoginAction2.InitWith(loginConfig))
-        }
-    }
-
-    private fun addFirstFragment() {
-        activity.addFragment(views.loginFragmentContainer, LoginSplashSignUpSignInSelectionFragment2::class.java)
-    }
-
-    private fun handleLoginViewEvents(event: LoginViewEvents2) {
-        when (event) {
-            is LoginViewEvents2.RegistrationFlowResult -> {
-                // Check that all flows are supported by the application
-                if (event.flowResult.missingStages.any { !it.isSupported() }) {
-                    // Display a popup to propose use web fallback
-                    onRegistrationStageNotSupported()
-                } else {
-                    if (event.isRegistrationStarted) {
-                        // Go on with registration flow
-                        handleRegistrationNavigation(event.flowResult)
-                    } else {
-                        /*
-                        // First ask for login and password
-                        // I add a tag to indicate that this fragment is a registration stage.
-                        // This way it will be automatically popped in when starting the next registration stage
-                        activity.addFragmentToBackstack(views.loginFragmentContainer,
-                                LoginFragment2::class.java,
-                                tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                                option = commonOption
-                        )
-
-                         */
-                    }
-                }
-            }
-            is LoginViewEvents2.OutdatedHomeserver -> {
-                MaterialAlertDialogBuilder(activity)
-                        .setTitle(R.string.login_error_outdated_homeserver_title)
-                        .setMessage(R.string.login_error_outdated_homeserver_warning_content)
-                        .setPositiveButton(R.string.ok, null)
-                        .show()
-                Unit
-            }
-            is LoginViewEvents2.OpenServerSelection ->
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
-                        LoginServerSelectionFragment2::class.java,
-                        option = { ft ->
-                            activity.findViewById<View?>(R.id.loginSplashLogo)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
-                            // Disable transition of text
-                            // activity.findViewById<View?>(views.loginSplashTitle)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
-                            // No transition here now actually
-                            // activity.findViewById<View?>(views.loginSplashSubmit)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
-                            // TODO Disabled because it provokes a flickering
-                            // ft.setCustomAnimations(enterAnim, exitAnim, popEnterAnim, popExitAnim)
-                        })
-            is LoginViewEvents2.OpenHomeServerUrlFormScreen -> {
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginServerUrlFormFragment2::class.java,
-                        option = commonOption
-                )
-            }
-            is LoginViewEvents2.OpenSignInEnterIdentifierScreen -> {
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
-                        LoginFragmentSigninUsername2::class.java,
-                        option = { ft ->
-                            activity.findViewById<View?>(R.id.loginSplashLogo)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
-                            // Disable transition of text
-                            // activity.findViewById<View?>(views.loginSplashTitle)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
-                            // No transition here now actually
-                            // activity.findViewById<View?>(views.loginSplashSubmit)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
-                            // TODO Disabled because it provokes a flickering
-                            // ft.setCustomAnimations(enterAnim, exitAnim, popEnterAnim, popExitAnim)
-                        })
-            }
-            is LoginViewEvents2.OpenSsoOnlyScreen -> {
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginSsoOnlyFragment2::class.java,
-                        option = commonOption
-                )
-            }
-            is LoginViewEvents2.OnWebLoginError -> onWebLoginError(event)
-            is LoginViewEvents2.OpenResetPasswordScreen ->
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginResetPasswordFragment2::class.java,
-                        option = commonOption
-                )
-            is LoginViewEvents2.OnResetPasswordSendThreePidDone -> {
-                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginResetPasswordMailConfirmationFragment2::class.java,
-                        option = commonOption
-                )
-            }
-            is LoginViewEvents2.OnResetPasswordMailConfirmationSuccess -> {
-                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginResetPasswordSuccessFragment2::class.java,
-                        option = commonOption
-                )
-            }
-            is LoginViewEvents2.OnResetPasswordMailConfirmationSuccessDone -> {
-                // Go back to the login fragment
-                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-            }
-            is LoginViewEvents2.OnSendEmailSuccess ->
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginWaitForEmailFragment2::class.java,
-                        LoginWaitForEmailFragmentArgument(event.email),
-                        tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption
-                )
-            is LoginViewEvents2.OpenSigninPasswordScreen -> {
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginFragmentSigninPassword2::class.java,
-                        tag = FRAGMENT_LOGIN_TAG,
-                        option = commonOption
-                )
-            }
-            is LoginViewEvents2.OpenSignupPasswordScreen -> {
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginFragmentSignupPassword2::class.java,
-                        tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption
-                )
-            }
-            is LoginViewEvents2.OpenSignUpChooseUsernameScreen -> {
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginFragmentSignupUsername2::class.java,
-                        tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption
-                )
-            }
-            is LoginViewEvents2.OpenSignInWithAnythingScreen -> {
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginFragmentToAny2::class.java,
-                        tag = FRAGMENT_LOGIN_TAG,
-                        option = commonOption
-                )
-            }
-            is LoginViewEvents2.OnSendMsisdnSuccess ->
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        LoginGenericTextInputFormFragment2::class.java,
-                        LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.ConfirmMsisdn, true, event.msisdn),
-                        tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption
-                )
-            is LoginViewEvents2.Failure ->
-                // This is handled by the Fragments
-                Unit
-            is LoginViewEvents2.OnLoginModeNotSupported ->
-                onLoginModeNotSupported(event.supportedTypes)
-            is LoginViewEvents2.OnSessionCreated -> handleOnSessionCreated(event)
-            is LoginViewEvents2.Finish -> terminate()
-            is LoginViewEvents2.CancelRegistration -> handleCancelRegistration()
-        }
-    }
-
-    private fun handleCancelRegistration() {
-        // Cleanup the back stack
-        activity.resetBackstack()
-    }
-
-    private fun handleOnSessionCreated(event: LoginViewEvents2.OnSessionCreated) {
-        if (event.newAccount) {
-            // Propose to set avatar and display name
-            // Back on this Fragment will finish the Activity
-            activity.addFragmentToBackstack(
-                    views.loginFragmentContainer,
-                    AccountCreatedFragment::class.java,
-                    option = commonOption
-            )
-        } else {
-            terminate()
-        }
-    }
-
-    private fun terminate() {
-        val intent = HomeActivity.newIntent(
-                activity,
-                firstStartMainActivity = false,
-        )
-        activity.startActivity(intent)
-        activity.finish()
-    }
-
-    private fun updateWithState(loginViewState2: LoginViewState2) {
-        // Loading
-        setIsLoading(loginViewState2.isLoading)
-    }
-
-    // Hack for AccountCreatedFragment
-    override fun setIsLoading(isLoading: Boolean) {
-        views.loginLoading.isVisible = isLoading
-    }
-
-    private fun onWebLoginError(onWebLoginError: LoginViewEvents2.OnWebLoginError) {
-        // Pop the backstack
-        supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
-
-        // And inform the user
-        MaterialAlertDialogBuilder(activity)
-                .setTitle(R.string.dialog_title_error)
-                .setMessage(activity.getString(R.string.login_sso_error_message, onWebLoginError.description, onWebLoginError.errorCode))
-                .setPositiveButton(R.string.ok, null)
-                .show()
-    }
-
-    /**
-     * Handle the SSO redirection here.
-     */
-    override fun onNewIntent(intent: Intent?) {
-        intent?.data
-                ?.let { tryOrNull { it.getQueryParameter("loginToken") } }
-                ?.let { loginViewModel.handle(LoginAction2.LoginWithToken(it)) }
-    }
-
-    private fun onRegistrationStageNotSupported() {
-        MaterialAlertDialogBuilder(activity)
-                .setTitle(R.string.app_name)
-                .setMessage(activity.getString(R.string.login_registration_not_supported))
-                .setPositiveButton(R.string.yes) { _, _ ->
-                    activity.addFragmentToBackstack(
-                            views.loginFragmentContainer,
-                            LoginWebFragment2::class.java,
-                            option = commonOption
-                    )
-                }
-                .setNegativeButton(R.string.no, null)
-                .show()
-    }
-
-    private fun onLoginModeNotSupported(supportedTypes: List<String>) {
-        MaterialAlertDialogBuilder(activity)
-                .setTitle(R.string.app_name)
-                .setMessage(activity.getString(R.string.login_mode_not_supported, supportedTypes.joinToString { "'$it'" }))
-                .setPositiveButton(R.string.yes) { _, _ ->
-                    activity.addFragmentToBackstack(
-                            views.loginFragmentContainer,
-                            LoginWebFragment2::class.java,
-                            option = commonOption
-                    )
-                }
-                .setNegativeButton(R.string.no, null)
-                .show()
-    }
-
-    private fun handleRegistrationNavigation(flowResult: FlowResult) {
-        // Complete all mandatory stages first
-        val mandatoryStage = flowResult.missingStages.firstOrNull { it.mandatory }
-
-        if (mandatoryStage != null) {
-            doStage(mandatoryStage)
-        } else {
-            // Consider optional stages
-            val optionalStage = flowResult.missingStages.firstOrNull { !it.mandatory && it !is Stage.Dummy }
-            if (optionalStage == null) {
-                // Should not happen...
-            } else {
-                doStage(optionalStage)
-            }
-        }
-    }
-
-    private fun doStage(stage: Stage) {
-        // Ensure there is no fragment for registration stage in the backstack
-        supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
-
-        when (stage) {
-            is Stage.ReCaptcha -> activity.addFragmentToBackstack(
-                    views.loginFragmentContainer,
-                    LoginCaptchaFragment2::class.java,
-                    LoginCaptchaFragmentArgument(stage.publicKey),
-                    tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption
-            )
-            is Stage.Email -> activity.addFragmentToBackstack(
-                    views.loginFragmentContainer,
-                    LoginGenericTextInputFormFragment2::class.java,
-                    LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetEmail, stage.mandatory),
-                    tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption
-            )
-            is Stage.Msisdn -> activity.addFragmentToBackstack(
-                    views.loginFragmentContainer,
-                    LoginGenericTextInputFormFragment2::class.java,
-                    LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetMsisdn, stage.mandatory),
-                    tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption
-            )
-            is Stage.Terms -> activity.addFragmentToBackstack(
-                    views.loginFragmentContainer,
-                    LoginTermsFragment2::class.java,
-                    LoginTermsFragmentArgument(stage.policies.toLocalizedLoginTerms(activity.getString(R.string.resources_language))),
-                    tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption
-            )
-            else -> Unit // Should not happen
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
index d07ac46b85..f1617b660b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
@@ -82,7 +82,7 @@ sealed interface OnboardingAction : VectorViewModelAction {
 
     data class PostViewEvent(val viewEvent: OnboardingViewEvents) : OnboardingAction
 
-    data class UserAcceptCertificate(val fingerprint: Fingerprint) : OnboardingAction
+    data class UserAcceptCertificate(val fingerprint: Fingerprint, val retryAction: OnboardingAction) : OnboardingAction
 
     object PersonalizeProfile : OnboardingAction
     data class UpdateDisplayName(val displayName: String) : OnboardingAction
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt
index 5a19732341..e79250d39d 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt
@@ -33,7 +33,7 @@ import javax.inject.Inject
 class OnboardingActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedActivity {
 
     private val onboardingVariant by lifecycleAwareLazy {
-        onboardingVariantFactory.create(this, views = views, onboardingViewModel = lazyViewModel(), loginViewModel2 = lazyViewModel())
+        onboardingVariantFactory.create(this, views = views, onboardingViewModel = lazyViewModel())
     }
 
     @Inject lateinit var onboardingVariantFactory: OnboardingVariantFactory
@@ -48,7 +48,10 @@ class OnboardingActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
     }
 
     override fun onBackPressed() {
-        validateBackPressed { super.onBackPressed() }
+        validateBackPressed {
+            @Suppress("DEPRECATION")
+            super.onBackPressed()
+        }
     }
 
     override fun initUiAndData() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
index 9837db8e91..fec0374afb 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
@@ -20,7 +20,6 @@ import im.vector.app.config.OnboardingVariant
 import im.vector.app.core.platform.ScreenOrientationLocker
 import im.vector.app.databinding.ActivityLoginBinding
 import im.vector.app.features.VectorFeatures
-import im.vector.app.features.login2.LoginViewModel2
 import im.vector.app.features.onboarding.ftueauth.FtueAuthVariant
 import javax.inject.Inject
 
@@ -33,7 +32,6 @@ class OnboardingVariantFactory @Inject constructor(
             activity: OnboardingActivity,
             views: ActivityLoginBinding,
             onboardingViewModel: Lazy<OnboardingViewModel>,
-            loginViewModel2: Lazy<LoginViewModel2>
     ) = when (vectorFeatures.onboardingVariant()) {
         OnboardingVariant.LEGACY -> error("Legacy is not supported by the FTUE")
         OnboardingVariant.FTUE_AUTH -> FtueAuthVariant(
@@ -44,11 +42,5 @@ class OnboardingVariantFactory @Inject constructor(
                 vectorFeatures = vectorFeatures,
                 orientationLocker = orientationLocker
         )
-        OnboardingVariant.LOGIN_2 -> Login2Variant(
-                views = views,
-                loginViewModel = loginViewModel2.value,
-                activity = activity,
-                supportFragmentManager = activity.supportFragmentManager
-        )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
index bbbf13fba9..dcf6521499 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
@@ -21,6 +21,7 @@ import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.features.login.ServerType
 import im.vector.app.features.login.SignMode
 import org.matrix.android.sdk.api.auth.registration.Stage
+import org.matrix.android.sdk.api.failure.Failure as SdkFailure
 
 /**
  * Transient events for Login.
@@ -28,7 +29,7 @@ import org.matrix.android.sdk.api.auth.registration.Stage
 sealed class OnboardingViewEvents : VectorViewEvents {
     data class Loading(val message: CharSequence? = null) : OnboardingViewEvents()
     data class Failure(val throwable: Throwable) : OnboardingViewEvents()
-    data class DeeplinkAuthenticationFailure(val retryAction: OnboardingAction) : OnboardingViewEvents()
+    data class UnrecognisedCertificateFailure(val retryAction: OnboardingAction, val cause: SdkFailure.UnrecognizedCertificateFailure) : OnboardingViewEvents()
 
     object DisplayRegistrationFallback : OnboardingViewEvents()
     data class DisplayRegistrationStage(val stage: Stage) : OnboardingViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index daad6c1c1c..9c64b5ed87 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -26,13 +26,13 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.extensions.cancelCurrentOnSet
-import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.extensions.inferNoConnectivity
 import im.vector.app.core.extensions.isMatrixId
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.core.extensions.vectorStore
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.session.ConfigureAndStartSessionUseCase
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.core.utils.ensureTrailingSlash
 import im.vector.app.features.VectorFeatures
@@ -61,7 +61,11 @@ import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import org.matrix.android.sdk.api.auth.login.LoginWizard
 import org.matrix.android.sdk.api.auth.registration.RegistrationAvailability
 import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.isHomeserverConnectionError
 import org.matrix.android.sdk.api.failure.isHomeserverUnavailable
+import org.matrix.android.sdk.api.failure.isUnrecognisedCertificate
+import org.matrix.android.sdk.api.network.ssl.Fingerprint
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 import timber.log.Timber
@@ -88,6 +92,7 @@ class OnboardingViewModel @AssistedInject constructor(
         private val vectorOverrides: VectorOverrides,
         private val registrationActionHandler: RegistrationActionHandler,
         private val sdkIntProvider: BuildVersionSdkIntProvider,
+        private val configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase,
 ) : VectorViewModel<OnboardingViewState, OnboardingAction, OnboardingViewEvents>(initialState) {
 
     @AssistedFactory
@@ -114,9 +119,28 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
-    // Store the last action, to redo it after user has trusted the untrusted certificate
-    private var lastAction: OnboardingAction? = null
-    private var currentHomeServerConnectionConfig: HomeServerConnectionConfig? = null
+    private fun checkQrCodeLoginCapability() {
+        if (!vectorFeatures.isQrCodeLoginEnabled()) {
+            setState {
+                copy(
+                        canLoginWithQrCode = false
+                )
+            }
+        } else if (vectorFeatures.isQrCodeLoginForAllServers()) {
+            // allow for all servers
+            setState {
+                copy(
+                        canLoginWithQrCode = true
+                )
+            }
+        } else {
+            setState {
+                copy(
+                        canLoginWithQrCode = selectedHomeserver.isLoginWithQrSupported
+                )
+            }
+        }
+    }
 
     private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
     private val defaultHomeserverUrl = matrixOrgUrl
@@ -124,9 +148,6 @@ class OnboardingViewModel @AssistedInject constructor(
     private val registrationWizard: RegistrationWizard
         get() = authenticationService.getRegistrationWizard()
 
-    val currentThreePid: String?
-        get() = registrationWizard.getCurrentThreePid()
-
     // True when login and password has been sent with success to the homeserver
     val isRegistrationStarted: Boolean
         get() = authenticationService.isRegistrationStarted()
@@ -147,9 +168,9 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.UpdateServerType -> handleUpdateServerType(action)
             is OnboardingAction.UpdateSignMode -> handleUpdateSignMode(action)
             is OnboardingAction.InitWith -> handleInitWith(action)
-            is OnboardingAction.HomeServerChange -> withAction(action) { handleHomeserverChange(action) }
+            is OnboardingAction.HomeServerChange -> handleHomeserverChange(action)
             is OnboardingAction.UserNameEnteredAction -> handleUserNameEntered(action)
-            is AuthenticateAction -> withAction(action) { handleAuthenticateAction(action) }
+            is AuthenticateAction -> handleAuthenticateAction(action)
             is OnboardingAction.LoginWithToken -> handleLoginWithToken(action)
             is OnboardingAction.WebLoginSuccess -> handleWebLoginSuccess(action)
             is OnboardingAction.ResetPassword -> handleResetPassword(action)
@@ -222,11 +243,6 @@ class OnboardingViewModel @AssistedInject constructor(
         )
     }
 
-    private fun withAction(action: OnboardingAction, block: (OnboardingAction) -> Unit) {
-        lastAction = action
-        block(action)
-    }
-
     private fun handleAuthenticateAction(action: AuthenticateAction) {
         when (action) {
             is AuthenticateAction.Register -> handleRegisterWith(action.username, action.password, action.initialDeviceName)
@@ -277,20 +293,13 @@ class OnboardingViewModel @AssistedInject constructor(
     private fun handleUserAcceptCertificate(action: OnboardingAction.UserAcceptCertificate) {
         // It happens when we get the login flow, or during direct authentication.
         // So alter the homeserver config and retrieve again the login flow
-        when (val finalLastAction = lastAction) {
-            is OnboardingAction.HomeServerChange.SelectHomeServer -> {
-                currentHomeServerConnectionConfig
-                        ?.let { it.copy(allowedFingerprints = it.allowedFingerprints + action.fingerprint) }
-                        ?.let { startAuthenticationFlow(finalLastAction, it, serverTypeOverride = null) }
-            }
+        when (action.retryAction) {
+            is OnboardingAction.HomeServerChange -> handleHomeserverChange(action.retryAction, fingerprint = action.fingerprint)
             is AuthenticateAction.LoginDirect ->
                 handleDirectLogin(
-                        finalLastAction,
-                        HomeServerConnectionConfig.Builder()
-                                // Will be replaced by the task
-                                .withHomeServerUri("https://dummy.org")
-                                .withAllowedFingerPrints(listOf(action.fingerprint))
-                                .build()
+                        action.retryAction,
+                        // Will be replaced by the task
+                        homeServerConnectionConfigFactory.create("https://dummy.org", action.fingerprint)
                 )
             else -> Unit
         }
@@ -493,17 +502,6 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun handleInitWith(action: OnboardingAction.InitWith) {
         loginConfig = action.loginConfig
-        // If there is a pending email validation continue on this step
-        try {
-            if (registrationWizard.isRegistrationStarted()) {
-                currentThreePid?.let {
-                    handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnSendEmailSuccess(it, isRestoredSession = true)))
-                }
-            }
-        } catch (e: Throwable) {
-            // NOOP. API is designed to use wizards in a login/registration flow,
-            // but we need to check the state anyway.
-        }
     }
 
     private fun handleResetPassword(action: OnboardingAction.ResetPassword) {
@@ -590,9 +588,19 @@ class OnboardingViewModel @AssistedInject constructor(
         currentJob = viewModelScope.launch {
             directLoginUseCase.execute(action, homeServerConnectionConfig).fold(
                     onSuccess = { onSessionCreated(it, authenticationDescription = AuthenticationDescription.Login) },
-                    onFailure = {
+                    onFailure = { error ->
                         setState { copy(isLoading = false) }
-                        _viewEvents.post(OnboardingViewEvents.Failure(it))
+                        when {
+                            error.isUnrecognisedCertificate() -> {
+                                _viewEvents.post(
+                                        OnboardingViewEvents.UnrecognisedCertificateFailure(
+                                                retryAction = action,
+                                                cause = error as Failure.UnrecognizedCertificateFailure
+                                        )
+                                )
+                            }
+                            else -> _viewEvents.post(OnboardingViewEvents.Failure(error))
+                        }
                     }
             )
         }
@@ -633,7 +641,7 @@ class OnboardingViewModel @AssistedInject constructor(
         activeSessionHolder.setActiveSession(session)
 
         authenticationService.reset()
-        session.configureAndStart(applicationContext)
+        configureAndStartSessionUseCase.execute(session)
 
         when (authenticationDescription) {
             is AuthenticationDescription.Register -> {
@@ -644,7 +652,8 @@ class OnboardingViewModel @AssistedInject constructor(
                 _viewEvents.post(OnboardingViewEvents.OnAccountCreated)
             }
             AuthenticationDescription.Login -> {
-                setState { copy(isLoading = false) }
+                setState { copy(isLoading = false, selectedAuthenticationState = SelectedAuthenticationState(authenticationDescription)) }
+                awaitState()
                 _viewEvents.post(OnboardingViewEvents.OnAccountSignedIn)
             }
         }
@@ -656,6 +665,7 @@ class OnboardingViewModel @AssistedInject constructor(
                 val homeServerCapabilities = session.homeServerCapabilitiesService().getHomeServerCapabilities()
                 val capabilityOverrides = vectorOverrides.forceHomeserverCapabilities?.firstOrNull()
                 state.personalizationState.copy(
+                        userId = session.myUserId,
                         displayName = state.registrationState.selectedMatrixId?.let { MatrixPatterns.extractUserNameFromId(it) },
                         supportsChangingDisplayName = capabilityOverrides?.canChangeDisplayName ?: homeServerCapabilities.canChangeDisplayName,
                         supportsChangingProfilePicture = capabilityOverrides?.canChangeAvatar ?: homeServerCapabilities.canChangeAvatar
@@ -683,13 +693,21 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleHomeserverChange(action: OnboardingAction.HomeServerChange, serverTypeOverride: ServerType? = null, postAction: suspend () -> Unit = {}) {
-        val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(action.homeServerUrl)
+    private fun handleHomeserverChange(
+            action: OnboardingAction.HomeServerChange,
+            serverTypeOverride: ServerType? = null,
+            fingerprint: Fingerprint? = null,
+            postAction: suspend () -> Unit = {},
+    ) {
+        val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(action.homeServerUrl, fingerprint)
         if (homeServerConnectionConfig == null) {
             // This is invalid
             _viewEvents.post(OnboardingViewEvents.Failure(Throwable("Unable to create a HomeServerConnectionConfig")))
         } else {
-            startAuthenticationFlow(action, homeServerConnectionConfig, serverTypeOverride, postAction)
+            startAuthenticationFlow(action, homeServerConnectionConfig, serverTypeOverride, suspend {
+                checkQrCodeLoginCapability()
+                postAction()
+            })
         }
     }
 
@@ -699,8 +717,6 @@ class OnboardingViewModel @AssistedInject constructor(
             serverTypeOverride: ServerType?,
             postAction: suspend () -> Unit = {},
     ) {
-        currentHomeServerConnectionConfig = homeServerConnectionConfig
-
         currentJob = viewModelScope.launch {
             setState { copy(isLoading = true) }
             runCatching { startAuthenticationFlowUseCase.execute(homeServerConnectionConfig) }.fold(
@@ -716,25 +732,28 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun onAuthenticationStartError(error: Throwable, trigger: OnboardingAction.HomeServerChange) {
         when {
-            error.isHomeserverUnavailable() && applicationContext.inferNoConnectivity(sdkIntProvider) -> _viewEvents.post(
-                    OnboardingViewEvents.Failure(error)
-            )
-            deeplinkUrlIsUnavailable(error, trigger) -> _viewEvents.post(
-                    OnboardingViewEvents.DeeplinkAuthenticationFailure(
-                            retryAction = (trigger as OnboardingAction.HomeServerChange.SelectHomeServer).resetToDefaultUrl()
-                    )
-            )
-            else -> _viewEvents.post(
-                    OnboardingViewEvents.Failure(error)
-            )
+            error.isHomeserverUnavailable() && applicationContext.inferNoConnectivity(sdkIntProvider) -> _viewEvents.post(OnboardingViewEvents.Failure(error))
+            isUnableToSelectServer(error, trigger) -> {
+                withState { state ->
+                    when {
+                        canEditServerSelectionError(state) -> handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.EditServerSelection))
+                        else -> _viewEvents.post(OnboardingViewEvents.Failure(error))
+                    }
+                }
+            }
+            error.isUnrecognisedCertificate() -> {
+                _viewEvents.post(OnboardingViewEvents.UnrecognisedCertificateFailure(trigger, error as Failure.UnrecognizedCertificateFailure))
+            }
+            else -> _viewEvents.post(OnboardingViewEvents.Failure(error))
         }
     }
 
-    private fun deeplinkUrlIsUnavailable(error: Throwable, trigger: OnboardingAction.HomeServerChange) = error.isHomeserverUnavailable() &&
-            loginConfig != null &&
-            trigger is OnboardingAction.HomeServerChange.SelectHomeServer
+    private fun canEditServerSelectionError(state: OnboardingViewState) =
+            (state.onboardingFlow == OnboardingFlow.SignIn && vectorFeatures.isOnboardingCombinedLoginEnabled()) ||
+                    (state.onboardingFlow == OnboardingFlow.SignUp && vectorFeatures.isOnboardingCombinedRegisterEnabled())
 
-    private fun OnboardingAction.HomeServerChange.SelectHomeServer.resetToDefaultUrl() = copy(homeServerUrl = defaultHomeserverUrl)
+    private fun isUnableToSelectServer(error: Throwable, trigger: OnboardingAction.HomeServerChange) =
+            trigger is OnboardingAction.HomeServerChange.SelectHomeServer && error.isHomeserverConnectionError()
 
     private suspend fun onAuthenticationStartedSuccess(
             trigger: OnboardingAction.HomeServerChange,
@@ -821,6 +840,8 @@ class OnboardingViewModel @AssistedInject constructor(
         return loginConfig?.homeServerUrl
     }
 
+    fun getDefaultHomeserverUrl() = defaultHomeserverUrl
+
     fun fetchSsoUrl(redirectUrl: String, deviceId: String?, provider: SsoIdentityProvider?, action: SSOAction): String? {
         setState {
             val authDescription = AuthenticationDescription.Register(provider.toAuthenticationType())
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
index 1e6c97a993..58b28ac4e4 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
@@ -58,7 +58,9 @@ data class OnboardingViewState(
         val selectedAuthenticationState: SelectedAuthenticationState = SelectedAuthenticationState(),
 
         @PersistState
-        val personalizationState: PersonalizationState = PersonalizationState()
+        val personalizationState: PersonalizationState = PersonalizationState(),
+
+        val canLoginWithQrCode: Boolean = false,
 ) : MavericksState
 
 enum class OnboardingFlow {
@@ -75,14 +77,16 @@ data class SelectedHomeserverState(
         val supportedLoginTypes: List<String> = emptyList(),
         val hasOidcCompatibilityFlow: Boolean = false,
         val isLogoutDevicesSupported: Boolean = false,
+        val isLoginWithQrSupported: Boolean = false,
 ) : Parcelable
 
 @Parcelize
 data class PersonalizationState(
+        val userId: String = "",
         val supportsChangingDisplayName: Boolean = false,
         val supportsChangingProfilePicture: Boolean = false,
         val displayName: String? = null,
-        val selectedPictureUri: Uri? = null
+        val selectedPictureUri: Uri? = null,
 ) : Parcelable {
 
     fun supportsPersonalization() = supportsChangingDisplayName || supportsChangingProfilePicture
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
index b23d21ff46..15f3aeca47 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.onboarding
 
 import im.vector.app.core.extensions.containsAllItems
 import im.vector.app.features.login.LoginMode
+import im.vector.app.features.login.toSsoState
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.data.LoginFlowResult
@@ -48,11 +49,12 @@ class StartAuthenticationFlowUseCase @Inject constructor(
             supportedLoginTypes = authFlow.supportedLoginTypes,
             hasOidcCompatibilityFlow = authFlow.hasOidcCompatibilityFlow,
             isLogoutDevicesSupported = authFlow.isLogoutDevicesSupported
+            isLoginWithQrSupported = authFlow.isLoginWithQrSupported,
     )
 
     private fun LoginFlowResult.findPreferredLoginMode() = when {
-        supportedLoginTypes.containsAllItems(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders)
-        supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(ssoIdentityProviders)
+        supportedLoginTypes.containsAllItems(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders.toSsoState())
+        supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(ssoIdentityProviders.toSsoState())
         supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.Password
         else -> LoginMode.Unsupported
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
index 072e94bc30..9fd0bd08ed 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
@@ -33,7 +33,6 @@ import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewModel
 import im.vector.app.features.onboarding.OnboardingViewState
 import kotlinx.coroutines.CancellationException
-import org.matrix.android.sdk.api.failure.Failure
 
 /**
  * Parent Fragment for all the login/registration screens.
@@ -68,6 +67,7 @@ abstract class AbstractFtueAuthFragment<VB : ViewBinding> : VectorBaseFragment<V
     private fun handleOnboardingViewEvents(viewEvents: OnboardingViewEvents) {
         when (viewEvents) {
             is OnboardingViewEvents.Failure -> showFailure(viewEvents.throwable)
+            is OnboardingViewEvents.UnrecognisedCertificateFailure -> showUnrecognizedCertificateFailure(viewEvents)
             else ->
                 // This is handled by the Activity
                 Unit
@@ -84,20 +84,20 @@ abstract class AbstractFtueAuthFragment<VB : ViewBinding> : VectorBaseFragment<V
             is CancellationException ->
                 /* Ignore this error, user has cancelled the action */
                 Unit
-            is Failure.UnrecognizedCertificateFailure -> showUnrecognizedCertificateFailure(throwable)
             else -> onError(throwable)
         }
     }
 
-    private fun showUnrecognizedCertificateFailure(failure: Failure.UnrecognizedCertificateFailure) {
+    private fun showUnrecognizedCertificateFailure(event: OnboardingViewEvents.UnrecognisedCertificateFailure) {
         // Ask the user to accept the certificate
+        val cause = event.cause
         unrecognizedCertificateDialog.show(requireActivity(),
-                failure.fingerprint,
-                failure.url,
+                cause.fingerprint,
+                cause.url,
                 object : UnrecognizedCertificateDialog.Callback {
                     override fun onAccept() {
                         // User accept the certificate
-                        viewModel.handle(OnboardingAction.UserAcceptCertificate(failure.fingerprint))
+                        viewModel.handle(OnboardingAction.UserAcceptCertificate(cause.fingerprint, event.retryAction))
                     }
 
                     override fun onIgnore() {
@@ -123,6 +123,7 @@ abstract class AbstractFtueAuthFragment<VB : ViewBinding> : VectorBaseFragment<V
                         .setMessage(R.string.login_signup_cancel_confirmation_content)
                         .setPositiveButton(R.string.yes) { _, _ ->
                             displayCancelDialog = false
+                            @Suppress("DEPRECATION")
                             vectorBaseActivity.onBackPressed()
                         }
                         .setNegativeButton(R.string.no, null)
@@ -137,6 +138,7 @@ abstract class AbstractFtueAuthFragment<VB : ViewBinding> : VectorBaseFragment<V
                         .setMessage(R.string.login_reset_password_cancel_confirmation_content)
                         .setPositiveButton(R.string.yes) { _, _ ->
                             displayCancelDialog = false
+                            @Suppress("DEPRECATION")
                             vectorBaseActivity.onBackPressed()
                         }
                         .setNegativeButton(R.string.no, null)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt
index 4ded4dbfb7..7257a21434 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt
@@ -29,6 +29,7 @@ import im.vector.app.features.login.hasSso
 import im.vector.app.features.login.ssoIdentityProviders
 import im.vector.app.features.onboarding.OnboardingFlow
 import org.matrix.android.sdk.api.auth.SSOAction
+import im.vector.app.features.login.ssoState
 
 abstract class AbstractSSOFtueAuthFragment<VB : ViewBinding> : AbstractFtueAuthFragment<VB>() {
 
@@ -90,7 +91,7 @@ abstract class AbstractSSOFtueAuthFragment<VB : ViewBinding> : AbstractFtueAuthF
 
     private fun prefetchIfNeeded() {
         withState(viewModel) { state ->
-            if (state.selectedHomeserver.preferredLoginMode.hasSso() && state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders().isNullOrEmpty()) {
+            if (state.selectedHomeserver.preferredLoginMode.hasSso() && state.selectedHomeserver.preferredLoginMode.ssoState().isFallback()) {
                 // in this case we can prefetch (not other cases for privacy concerns)
                 viewModel.fetchSsoUrl(
                         redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/CaptchaWebview.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/CaptchaWebview.kt
index 23c6c13b5e..11f257c4e8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/CaptchaWebview.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/CaptchaWebview.kt
@@ -92,7 +92,6 @@ class CaptchaWebview @Inject constructor(
                 Timber.e("## onError() : $errorMessage")
             }
 
-            @SuppressLint("NewApi")
             override fun onReceivedHttpError(view: WebView, request: WebResourceRequest, errorResponse: WebResourceResponse) {
                 super.onReceivedHttpError(view, request, errorResponse)
                 when {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt
index 9f2aadef5c..2089dc5ad0 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt
@@ -23,20 +23,19 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.text.toSpannable
 import androidx.core.view.isVisible
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.animations.play
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.isAnimationEnabled
 import im.vector.app.core.utils.styleMatchingText
 import im.vector.app.databinding.FragmentFtueAccountCreatedBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewState
-import javax.inject.Inject
 
-class FtueAuthAccountCreatedFragment @Inject constructor(
-        private val activeSessionHolder: ActiveSessionHolder
-) : AbstractFtueAuthFragment<FragmentFtueAccountCreatedBinding>() {
+@AndroidEntryPoint
+class FtueAuthAccountCreatedFragment :
+        AbstractFtueAuthFragment<FragmentFtueAccountCreatedBinding>() {
 
     private var hasPlayedConfetti = false
 
@@ -50,15 +49,15 @@ class FtueAuthAccountCreatedFragment @Inject constructor(
     }
 
     private fun setupViews() {
-        val userId = activeSessionHolder.getActiveSession().myUserId
-        val subtitle = getString(R.string.ftue_account_created_subtitle, userId).toSpannable().styleMatchingText(userId, Typeface.BOLD)
-        views.accountCreatedSubtitle.text = subtitle
         views.accountCreatedPersonalize.debouncedClicks { viewModel.handle(OnboardingAction.PersonalizeProfile) }
         views.accountCreatedTakeMeHome.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnTakeMeHome)) }
         views.accountCreatedTakeMeHomeCta.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnTakeMeHome)) }
     }
 
     override fun updateWithState(state: OnboardingViewState) {
+        val userId = state.personalizationState.userId
+        val subtitle = getString(R.string.ftue_account_created_subtitle, userId).toSpannable().styleMatchingText(userId, Typeface.BOLD)
+        views.accountCreatedSubtitle.text = subtitle
         val canPersonalize = state.personalizationState.supportsPersonalization()
         views.personalizeButtonGroup.isVisible = canPersonalize
         views.takeMeHomeButtonGroup.isVisible = !canPersonalize
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
index 3720a41455..f170868307 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
@@ -16,15 +16,24 @@
 
 package im.vector.app.features.onboarding.ftueauth
 
+import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import android.view.ViewStub
 import com.airbnb.mvrx.args
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.crawlCausesFor
 import im.vector.app.databinding.FragmentFtueLoginCaptchaBinding
+import im.vector.app.databinding.ViewStubWebviewBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewState
 import im.vector.app.features.onboarding.RegisterAction
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.extensions.orFalse
 import javax.inject.Inject
 
 @Parcelize
@@ -35,15 +44,39 @@ data class FtueAuthCaptchaFragmentArgument(
 /**
  * In this screen, the user is asked to confirm they are not a robot.
  */
-class FtueAuthCaptchaFragment @Inject constructor(
-        private val captchaWebview: CaptchaWebview
-) : AbstractFtueAuthFragment<FragmentFtueLoginCaptchaBinding>() {
+@AndroidEntryPoint
+class FtueAuthCaptchaFragment :
+        AbstractFtueAuthFragment<FragmentFtueLoginCaptchaBinding>() {
+
+    @Inject lateinit var captchaWebview: CaptchaWebview
 
     private val params: FtueAuthCaptchaFragmentArgument by args()
+    private var webViewBinding: ViewStubWebviewBinding? = null
     private var isWebViewLoaded = false
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueLoginCaptchaBinding {
-        return FragmentFtueLoginCaptchaBinding.inflate(inflater, container, false)
+        return FragmentFtueLoginCaptchaBinding.inflate(inflater, container, false).also {
+            it.loginCaptchaWebViewStub.setOnInflateListener { _, inflated ->
+                webViewBinding = ViewStubWebviewBinding.bind(inflated)
+            }
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        inflateWebViewOrShowError()
+    }
+
+    private fun inflateWebViewOrShowError() {
+        views.loginCaptchaWebViewStub.inflateWebView(onError = {
+            MaterialAlertDialogBuilder(requireActivity())
+                    .setTitle(R.string.dialog_title_error)
+                    .setMessage(it.localizedMessage)
+                    .setPositiveButton(R.string.ok) { _, _ ->
+                        requireActivity().recreate()
+                    }
+                    .show()
+        })
     }
 
     override fun resetViewModel() {
@@ -51,11 +84,26 @@ class FtueAuthCaptchaFragment @Inject constructor(
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        if (!isWebViewLoaded) {
-            captchaWebview.setupWebView(this, views.loginCaptchaWevView, views.loginCaptchaProgress, params.siteKey, state) {
+        if (!isWebViewLoaded && webViewBinding != null) {
+            captchaWebview.setupWebView(this, webViewBinding!!.root, views.loginCaptchaProgress, params.siteKey, state) {
                 viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.CaptchaDone(it)))
             }
             isWebViewLoaded = true
         }
     }
 }
+
+private fun ViewStub.inflateWebView(onError: (Throwable) -> Unit) {
+    try {
+        inflate()
+    } catch (e: Exception) {
+        val isMissingWebView = e.crawlCausesFor { it.message?.contains("MissingWebViewPackageException").orFalse() }
+        if (isMissingWebView) {
+            onError(MissingWebViewException(e))
+        } else {
+            onError(e)
+        }
+    }
+}
+
+private class MissingWebViewException(cause: Throwable) : IllegalStateException("Failed to load WebView provider: No WebView installed", cause)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseDisplayNameFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseDisplayNameFragment.kt
index c4b4e807ac..234a5789c1 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseDisplayNameFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseDisplayNameFragment.kt
@@ -22,15 +22,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.hasContent
 import im.vector.app.core.platform.SimpleTextWatcher
 import im.vector.app.databinding.FragmentFtueDisplayNameBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewState
-import javax.inject.Inject
 
-class FtueAuthChooseDisplayNameFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentFtueDisplayNameBinding>() {
+@AndroidEntryPoint
+class FtueAuthChooseDisplayNameFragment :
+        AbstractFtueAuthFragment<FragmentFtueDisplayNameBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueDisplayNameBinding {
         return FragmentFtueDisplayNameBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseProfilePictureFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseProfilePictureFragment.kt
index 1a673b156a..5450c74095 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseProfilePictureFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseProfilePictureFragment.kt
@@ -24,12 +24,10 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.view.isInvisible
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
-import im.vector.app.core.extensions.singletonEntryPoint
-import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.time.Clock
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelperFactory
 import im.vector.app.databinding.FragmentFtueProfilePictureBinding
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.onboarding.OnboardingAction
@@ -38,19 +36,25 @@ import im.vector.app.features.onboarding.OnboardingViewState
 import org.matrix.android.sdk.api.util.MatrixItem
 import javax.inject.Inject
 
-class FtueAuthChooseProfilePictureFragment @Inject constructor(
-        private val activeSessionHolder: ActiveSessionHolder,
-        colorProvider: ColorProvider,
-        clock: Clock,
-) : AbstractFtueAuthFragment<FragmentFtueProfilePictureBinding>(), GalleryOrCameraDialogHelper.Listener {
+@AndroidEntryPoint
+class FtueAuthChooseProfilePictureFragment :
+        AbstractFtueAuthFragment<FragmentFtueProfilePictureBinding>(),
+        GalleryOrCameraDialogHelper.Listener {
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
-    private val avatarRenderer: AvatarRenderer by lazy { requireContext().singletonEntryPoint().avatarRenderer() }
+    @Inject lateinit var galleryOrCameraDialogHelperFactory: GalleryOrCameraDialogHelperFactory
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+
+    private lateinit var galleryOrCameraDialogHelper: GalleryOrCameraDialogHelper
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueProfilePictureBinding {
         return FragmentFtueProfilePictureBinding.inflate(inflater, container, false)
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        galleryOrCameraDialogHelper = galleryOrCameraDialogHelperFactory.create(this)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupViews()
@@ -79,10 +83,9 @@ class FtueAuthChooseProfilePictureFragment @Inject constructor(
         views.profilePictureSubmit.isEnabled = hasSetPicture
         views.changeProfilePictureIcon.setImageResource(if (hasSetPicture) R.drawable.ic_edit else R.drawable.ic_camera_plain)
 
-        val session = activeSessionHolder.getActiveSession()
         val matrixItem = MatrixItem.UserItem(
-                id = session.myUserId,
-                displayName = state.personalizationState.displayName ?: ""
+                id = state.personalizationState.userId,
+                displayName = state.personalizationState.displayName.orEmpty()
         )
         avatarRenderer.render(matrixItem, localUri = state.personalizationState.selectedPictureUri, imageView = views.profilePictureView)
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
index 7a38a539bb..f05af3cc7b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
@@ -24,6 +24,7 @@ import android.view.ViewGroup
 import androidx.autofill.HintConstants
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.clearErrorOnChange
 import im.vector.app.core.extensions.content
@@ -35,9 +36,13 @@ import im.vector.app.core.extensions.setOnFocusLostListener
 import im.vector.app.core.extensions.setOnImeDoneListener
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentFtueCombinedLoginBinding
+import im.vector.app.features.VectorFeatures
 import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.SSORedirectRouterActivity
 import im.vector.app.features.login.SocialLoginButtonsView
+import im.vector.app.features.login.SsoState
+import im.vector.app.features.login.qr.QrCodeLoginArgs
+import im.vector.app.features.login.qr.QrCodeLoginType
 import im.vector.app.features.login.render
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
@@ -49,10 +54,13 @@ import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
-class FtueAuthCombinedLoginFragment @Inject constructor(
-        private val loginFieldsValidation: LoginFieldsValidation,
-        private val loginErrorParser: LoginErrorParser
-) : AbstractSSOFtueAuthFragment<FragmentFtueCombinedLoginBinding>() {
+@AndroidEntryPoint
+class FtueAuthCombinedLoginFragment :
+        AbstractSSOFtueAuthFragment<FragmentFtueCombinedLoginBinding>() {
+
+    @Inject lateinit var loginFieldsValidation: LoginFieldsValidation
+    @Inject lateinit var loginErrorParser: LoginErrorParser
+    @Inject lateinit var vectorFeatures: VectorFeatures
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueCombinedLoginBinding {
         return FragmentFtueCombinedLoginBinding.inflate(inflater, container, false)
@@ -68,6 +76,26 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
             viewModel.handle(OnboardingAction.UserNameEnteredAction.Login(views.loginInput.content()))
         }
         views.loginForgotPassword.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnForgetPasswordClicked)) }
+
+        viewModel.onEach(OnboardingViewState::canLoginWithQrCode) {
+            configureQrCodeLoginButtonVisibility(it)
+        }
+    }
+
+    private fun configureQrCodeLoginButtonVisibility(canLoginWithQrCode: Boolean) {
+        views.loginWithQrCode.isVisible = canLoginWithQrCode
+        if (canLoginWithQrCode) {
+            views.loginWithQrCode.debouncedClicks {
+                navigator
+                        .openLoginWithQrCode(
+                                requireActivity(),
+                                QrCodeLoginArgs(
+                                        loginType = QrCodeLoginType.LOGIN,
+                                        showQrCodeImmediately = false,
+                                )
+                        )
+            }
+        }
     }
 
     private fun setupSubmitButton() {
@@ -126,11 +154,11 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
         when (state.selectedHomeserver.preferredLoginMode) {
             is LoginMode.SsoAndPassword -> {
                 showUsernamePassword()
-                renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders)
+                renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoState)
             }
             is LoginMode.Sso -> {
                 hideUsernamePassword()
-                renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders)
+                renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoState)
             }
             else -> {
                 showUsernamePassword()
@@ -139,10 +167,10 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
         }
     }
 
-    private fun renderSsoProviders(deviceId: String?, ssoProviders: List<SsoIdentityProvider>?) {
-        views.ssoGroup.isVisible = ssoProviders?.isNotEmpty() == true
-        views.ssoButtonsHeader.isVisible = views.ssoGroup.isVisible && views.loginEntryGroup.isVisible
-        views.ssoButtons.render(ssoProviders, SocialLoginButtonsView.Mode.MODE_CONTINUE) { id ->
+    private fun renderSsoProviders(deviceId: String?, ssoState: SsoState) {
+        views.ssoGroup.isVisible = true
+        views.ssoButtonsHeader.isVisible = isUsernameAndPasswordVisible()
+        views.ssoButtons.render(ssoState, SocialLoginButtonsView.Mode.MODE_CONTINUE) { id ->
             viewModel.fetchSsoUrl(
                     redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                     deviceId = deviceId,
@@ -165,6 +193,8 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
         views.loginEntryGroup.isVisible = true
     }
 
+    private fun isUsernameAndPasswordVisible() = views.loginEntryGroup.isVisible
+
     private fun setupAutoFill() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             views.loginInput.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_USERNAME)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
index 7c052baddf..479e8da77b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
@@ -27,6 +27,7 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.clearErrorOnChange
 import im.vector.app.core.extensions.content
@@ -44,6 +45,7 @@ import im.vector.app.databinding.FragmentFtueCombinedRegisterBinding
 import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.SSORedirectRouterActivity
 import im.vector.app.features.login.SocialLoginButtonsView
+import im.vector.app.features.login.SsoState
 import im.vector.app.features.login.render
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingAction.AuthenticateAction
@@ -61,11 +63,12 @@ import org.matrix.android.sdk.api.failure.isRegistrationDisabled
 import org.matrix.android.sdk.api.failure.isUsernameInUse
 import org.matrix.android.sdk.api.failure.isWeakPassword
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
 private const val MINIMUM_PASSWORD_LENGTH = 8
 
-class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAuthFragment<FragmentFtueCombinedRegisterBinding>() {
+@AndroidEntryPoint
+class FtueAuthCombinedRegisterFragment :
+        AbstractSSOFtueAuthFragment<FragmentFtueCombinedRegisterBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueCombinedRegisterBinding {
         return FragmentFtueCombinedRegisterBinding.inflate(inflater, container, false)
@@ -206,14 +209,14 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
         }
 
         when (state.selectedHomeserver.preferredLoginMode) {
-            is LoginMode.SsoAndPassword -> renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders)
+            is LoginMode.SsoAndPassword -> renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoState)
             else -> hideSsoProviders()
         }
     }
 
-    private fun renderSsoProviders(deviceId: String?, ssoProviders: List<SsoIdentityProvider>?) {
-        views.ssoGroup.isVisible = ssoProviders?.isNotEmpty() == true
-        views.ssoButtons.render(ssoProviders, SocialLoginButtonsView.Mode.MODE_CONTINUE) { provider ->
+    private fun renderSsoProviders(deviceId: String?, ssoState: SsoState) {
+        views.ssoGroup.isVisible = true
+        views.ssoButtons.render(ssoState, SocialLoginButtonsView.Mode.MODE_CONTINUE) { provider ->
             viewModel.fetchSsoUrl(
                     redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                     deviceId = deviceId,
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index 749aac2898..f39946a1d0 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.associateContentStateWith
 import im.vector.app.core.extensions.clearErrorOnChange
@@ -27,6 +28,7 @@ import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.realignPercentagesToParent
 import im.vector.app.core.extensions.setOnImeDoneListener
+import im.vector.app.core.extensions.showKeyboard
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.core.utils.ensureTrailingSlash
@@ -37,9 +39,10 @@ import im.vector.app.features.onboarding.OnboardingFlow
 import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewState
 import org.matrix.android.sdk.api.failure.isHomeserverUnavailable
-import javax.inject.Inject
 
-class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentFtueServerSelectionCombinedBinding>() {
+@AndroidEntryPoint
+class FtueAuthCombinedServerSelectionFragment :
+        AbstractFtueAuthFragment<FragmentFtueServerSelectionCombinedBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueServerSelectionCombinedBinding {
         return FragmentFtueServerSelectionCombinedBinding.inflate(inflater, container, false)
@@ -86,9 +89,12 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
         )
 
         if (views.chooseServerInput.content().isEmpty()) {
-            val userUrlInput = state.selectedHomeserver.userFacingUrl?.toReducedUrlKeepingSchemaIfInsecure()
+            val userUrlInput = state.selectedHomeserver.userFacingUrl?.toReducedUrlKeepingSchemaIfInsecure() ?: viewModel.getDefaultHomeserverUrl()
             views.chooseServerInput.editText().setText(userUrlInput)
         }
+
+        views.chooseServerInput.editText().selectAll()
+        views.chooseServerInput.editText().showKeyboard(true)
     }
 
     override fun onError(throwable: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt
index 5de8fce82f..e315f191c1 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt
@@ -17,9 +17,12 @@
 package im.vector.app.features.onboarding.ftueauth
 
 import android.os.Bundle
+import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.associateContentStateWith
 import im.vector.app.core.extensions.autofillEmail
@@ -34,10 +37,18 @@ import im.vector.app.databinding.FragmentFtueEmailInputBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewState
 import im.vector.app.features.onboarding.RegisterAction
+import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
-import javax.inject.Inject
 
-class FtueAuthEmailEntryFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentFtueEmailInputBinding>() {
+@Parcelize
+data class FtueAuthEmailEntryFragmentArgument(
+        val mandatory: Boolean,
+) : Parcelable
+
+@AndroidEntryPoint
+class FtueAuthEmailEntryFragment : AbstractFtueAuthFragment<FragmentFtueEmailInputBinding>() {
+
+    private val params: FtueAuthEmailEntryFragmentArgument by args()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueEmailInputBinding {
         return FragmentFtueEmailInputBinding.inflate(inflater, container, false)
@@ -49,7 +60,11 @@ class FtueAuthEmailEntryFragment @Inject constructor() : AbstractFtueAuthFragmen
     }
 
     private fun setupViews() {
-        views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit, enabledPredicate = { it.isEmail() })
+        views.emailEntryInput.hint = getString(if (params.mandatory) R.string.ftue_auth_email_entry_title else R.string.login_set_email_optional_hint)
+        views.emailEntryInput.associateContentStateWith(
+                button = views.emailEntrySubmit,
+                enabledPredicate = { it.isEmail() || it.isEmptyAndOptional() },
+        )
         views.emailEntryInput.setOnImeDoneListener { updateEmail() }
         views.emailEntryInput.clearErrorOnChange(viewLifecycleOwner)
         views.emailEntrySubmit.debouncedClicks { updateEmail() }
@@ -58,9 +73,14 @@ class FtueAuthEmailEntryFragment @Inject constructor() : AbstractFtueAuthFragmen
 
     private fun updateEmail() {
         val email = views.emailEntryInput.content()
-        viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.AddThreePid(RegisterThreePid.Email(email))))
+        when {
+            email.isEmptyAndOptional() -> viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.RegisterDummy))
+            else -> viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.AddThreePid(RegisterThreePid.Email(email))))
+        }
     }
 
+    private fun String.isEmptyAndOptional() = isEmpty() && !params.mandatory
+
     override fun updateWithState(state: OnboardingViewState) {
         views.emailEntryHeaderSubtitle.text = getString(R.string.ftue_auth_email_subtitle, state.selectedHomeserver.userFacingUrl.toReducedUrl())
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthGenericTextInputFormFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthGenericTextInputFormFragment.kt
index edfbcd89b6..02d0c25cfd 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthGenericTextInputFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthGenericTextInputFormFragment.kt
@@ -29,6 +29,7 @@ import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.args
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.isEmail
@@ -44,7 +45,6 @@ import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.is401
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
 @Parcelize
 data class FtueAuthGenericTextInputFormFragmentArgument(
@@ -56,7 +56,9 @@ data class FtueAuthGenericTextInputFormFragmentArgument(
 /**
  * In this screen, the user is asked for a text input.
  */
-class FtueAuthGenericTextInputFormFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentLoginGenericTextInputFormBinding>() {
+@AndroidEntryPoint
+class FtueAuthGenericTextInputFormFragment :
+        AbstractFtueAuthFragment<FragmentLoginGenericTextInputFormBinding>() {
 
     private val params: FtueAuthGenericTextInputFormFragmentArgument by args()
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLegacyStyleCaptchaFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLegacyStyleCaptchaFragment.kt
index b8b30529a6..0efd8390ba 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLegacyStyleCaptchaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLegacyStyleCaptchaFragment.kt
@@ -20,6 +20,7 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.databinding.FragmentLoginCaptchaBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewState
@@ -35,9 +36,11 @@ data class FtueAuthLegacyStyleCaptchaFragmentArgument(
 /**
  * In this screen, the user is asked to confirm they are not a robot.
  */
-class FtueAuthLegacyStyleCaptchaFragment @Inject constructor(
-        private val captchaWebview: CaptchaWebview
-) : AbstractFtueAuthFragment<FragmentLoginCaptchaBinding>() {
+@AndroidEntryPoint
+class FtueAuthLegacyStyleCaptchaFragment :
+        AbstractFtueAuthFragment<FragmentLoginCaptchaBinding>() {
+
+    @Inject lateinit var captchaWebview: CaptchaWebview
 
     private val params: FtueAuthLegacyStyleCaptchaFragmentArgument by args()
     private var isWebViewLoaded = false
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLegacyWaitForEmailFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLegacyWaitForEmailFragment.kt
index c815f354f0..fb468ddeb2 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLegacyWaitForEmailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLegacyWaitForEmailFragment.kt
@@ -21,16 +21,18 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.databinding.FragmentLoginWaitForEmailBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.RegisterAction
-import javax.inject.Inject
 
 /**
  * In this screen, the user is asked to check their emails.
  */
-class FtueAuthLegacyWaitForEmailFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentLoginWaitForEmailBinding>() {
+@AndroidEntryPoint
+class FtueAuthLegacyWaitForEmailFragment :
+        AbstractFtueAuthFragment<FragmentLoginWaitForEmailBinding>() {
 
     private val params: FtueAuthWaitForEmailFragmentArgument by args()
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
index 3774a9de74..5d17924504 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
@@ -28,6 +28,7 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
@@ -37,7 +38,8 @@ import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.SSORedirectRouterActivity
 import im.vector.app.features.login.ServerType
 import im.vector.app.features.login.SignMode
-import im.vector.app.features.login.SocialLoginButtonsView
+import im.vector.app.features.login.SocialLoginButtonsView.Mode
+import im.vector.app.features.login.render
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewState
@@ -54,7 +56,6 @@ import org.matrix.android.sdk.api.failure.isRegistrationDisabled
 import org.matrix.android.sdk.api.failure.isUsernameInUse
 import org.matrix.android.sdk.api.failure.isWeakPassword
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
 /**
  * In this screen:
@@ -64,7 +65,9 @@ import javax.inject.Inject
  * In signup mode:
  * - the user is asked for login and password
  */
-class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<FragmentLoginBinding>() {
+@AndroidEntryPoint
+class FtueAuthLoginFragment :
+        AbstractSSOFtueAuthFragment<FragmentLoginBinding>() {
 
     private var isSignupMode = false
 
@@ -112,13 +115,11 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
         }
     }
 
-    private fun setupSocialLoginButtons(state: OnboardingViewState) {
-        views.loginSocialLoginButtons.mode = when (state.signMode) {
-            SignMode.Unknown -> error("developer error")
-            SignMode.SignUp -> SocialLoginButtonsView.Mode.MODE_SIGN_UP
-            SignMode.SignIn,
-            SignMode.SignInWithMatrixId -> SocialLoginButtonsView.Mode.MODE_SIGN_IN
-        }
+    private fun ssoMode(state: OnboardingViewState) = when (state.signMode) {
+        SignMode.Unknown -> error("developer error")
+        SignMode.SignUp -> Mode.MODE_SIGN_UP
+        SignMode.SignIn,
+        SignMode.SignInWithMatrixId -> Mode.MODE_SIGN_IN
     }
 
     private fun submit() {
@@ -216,17 +217,14 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
 
             if (state.selectedHomeserver.preferredLoginMode is LoginMode.SsoAndPassword) {
                 views.loginSocialLoginContainer.isVisible = true
-                views.loginSocialLoginButtons.ssoIdentityProviders = state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders?.sorted()
-                views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                    override fun onProviderSelected(provider: SsoIdentityProvider?) {
-                        viewModel.fetchSsoUrl(
-                                redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
-                                deviceId = state.deviceId,
-                                provider = provider,
-                                action = if (state.signMode == SignMode.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
-                        )
-                                ?.let { openInCustomTab(it) }
-                    }
+                views.loginSocialLoginButtons.render(state.selectedHomeserver.preferredLoginMode.ssoState, ssoMode(state)) { provider ->
+                    viewModel.fetchSsoUrl(
+                            redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
+                            deviceId = state.deviceId,
+                            provider = provider
+                            action = if (state.signMode == SignMode.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
+                    )
+                            ?.let { openInCustomTab(it) }
                 }
             } else {
                 views.loginSocialLoginContainer.isVisible = false
@@ -307,7 +305,6 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
 
         setupUi(state)
         setupAutoFill(state)
-        setupSocialLoginButtons(state)
         setupButtons(state)
 
         if (state.isLoading) {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPersonalizationCompleteFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPersonalizationCompleteFragment.kt
index 8e88a6ed46..96cc1c3b45 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPersonalizationCompleteFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPersonalizationCompleteFragment.kt
@@ -20,12 +20,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.databinding.FragmentFtuePersonalizationCompleteBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
-import javax.inject.Inject
 
-class FtueAuthPersonalizationCompleteFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentFtuePersonalizationCompleteBinding>() {
+@AndroidEntryPoint
+class FtueAuthPersonalizationCompleteFragment :
+        AbstractFtueAuthFragment<FragmentFtuePersonalizationCompleteBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtuePersonalizationCompleteBinding {
         return FragmentFtuePersonalizationCompleteBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPhoneConfirmationFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPhoneConfirmationFragment.kt
index 39577efa19..af6c33c028 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPhoneConfirmationFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPhoneConfirmationFragment.kt
@@ -22,6 +22,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.associateContentStateWith
 import im.vector.app.core.extensions.clearErrorOnChange
@@ -32,14 +33,15 @@ import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.RegisterAction
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.failure.Failure
-import javax.inject.Inject
 
 @Parcelize
 data class FtueAuthPhoneConfirmationFragmentArgument(
         val msisdn: String
 ) : Parcelable
 
-class FtueAuthPhoneConfirmationFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentFtuePhoneConfirmationBinding>() {
+@AndroidEntryPoint
+class FtueAuthPhoneConfirmationFragment :
+        AbstractFtueAuthFragment<FragmentFtuePhoneConfirmationBinding>() {
 
     private val params: FtueAuthPhoneConfirmationFragmentArgument by args()
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPhoneEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPhoneEntryFragment.kt
index 32291ecb6e..620dd1293c 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPhoneEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPhoneEntryFragment.kt
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.associateContentStateWith
 import im.vector.app.core.extensions.autofillPhoneNumber
@@ -38,9 +39,11 @@ import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
-class FtueAuthPhoneEntryFragment @Inject constructor(
-        private val phoneNumberParser: PhoneNumberParser
-) : AbstractFtueAuthFragment<FragmentFtuePhoneInputBinding>() {
+@AndroidEntryPoint
+class FtueAuthPhoneEntryFragment :
+        AbstractFtueAuthFragment<FragmentFtuePhoneInputBinding>() {
+
+    @Inject lateinit var phoneNumberParser: PhoneNumberParser
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtuePhoneInputBinding {
         return FragmentFtuePhoneInputBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
index 721423ecdf..0daf1b3c6f 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
@@ -39,7 +39,8 @@ data class FtueAuthResetPasswordBreakerArgument(
 ) : Parcelable
 
 @AndroidEntryPoint
-class FtueAuthResetPasswordBreakerFragment : AbstractFtueAuthFragment<FragmentFtueResetPasswordBreakerBinding>() {
+class FtueAuthResetPasswordBreakerFragment :
+        AbstractFtueAuthFragment<FragmentFtueResetPasswordBreakerBinding>() {
 
     @Inject lateinit var themeProvider: ThemeProvider
     private val params: FtueAuthResetPasswordBreakerArgument by args()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
index 5fa1a8ed82..51c73a40e3 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
@@ -33,7 +33,8 @@ import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewState
 
 @AndroidEntryPoint
-class FtueAuthResetPasswordEmailEntryFragment : AbstractFtueAuthFragment<FragmentFtueResetPasswordEmailInputBinding>() {
+class FtueAuthResetPasswordEmailEntryFragment :
+        AbstractFtueAuthFragment<FragmentFtueResetPasswordEmailInputBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueResetPasswordEmailInputBinding {
         return FragmentFtueResetPasswordEmailInputBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
index 61826352bf..0b0e06a0b0 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
@@ -34,7 +34,8 @@ import im.vector.app.features.onboarding.OnboardingViewState
 import org.matrix.android.sdk.api.failure.isMissingEmailVerification
 
 @AndroidEntryPoint
-class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtueResetPasswordInputBinding>() {
+class FtueAuthResetPasswordEntryFragment :
+        AbstractFtueAuthFragment<FragmentFtueResetPasswordInputBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueResetPasswordInputBinding {
         return FragmentFtueResetPasswordInputBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
index 9bef084750..376218d474 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
@@ -35,12 +36,13 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.widget.textChanges
-import javax.inject.Inject
 
 /**
  * In this screen, the user is asked for email and new password to reset his password.
  */
-class FtueAuthResetPasswordFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentLoginResetPasswordBinding>() {
+@AndroidEntryPoint
+class FtueAuthResetPasswordFragment :
+        AbstractFtueAuthFragment<FragmentLoginResetPasswordBinding>() {
 
     // Show warning only once
     private var showWarning = true
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordMailConfirmationFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordMailConfirmationFragment.kt
index 76fbae6f40..301ed4fd8b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordMailConfirmationFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordMailConfirmationFragment.kt
@@ -21,17 +21,19 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.databinding.FragmentLoginResetPasswordMailConfirmationBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewState
 import org.matrix.android.sdk.api.failure.is401
-import javax.inject.Inject
 
 /**
  * In this screen, the user is asked to check their email and to click on a button once it's done.
  */
-class FtueAuthResetPasswordMailConfirmationFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentLoginResetPasswordMailConfirmationBinding>() {
+@AndroidEntryPoint
+class FtueAuthResetPasswordMailConfirmationFragment :
+        AbstractFtueAuthFragment<FragmentLoginResetPasswordMailConfirmationBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginResetPasswordMailConfirmationBinding {
         return FragmentLoginResetPasswordMailConfirmationBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordSuccessFragment.kt
index 956566a587..3e9881ec56 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordSuccessFragment.kt
@@ -20,15 +20,17 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.databinding.FragmentLoginResetPasswordSuccessBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
-import javax.inject.Inject
 
 /**
  * In this screen, we confirm to the user that his password has been reset.
  */
-class FtueAuthResetPasswordSuccessFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentLoginResetPasswordSuccessBinding>() {
+@AndroidEntryPoint
+class FtueAuthResetPasswordSuccessFragment :
+        AbstractFtueAuthFragment<FragmentLoginResetPasswordSuccessBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginResetPasswordSuccessBinding {
         return FragmentLoginResetPasswordSuccessBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerSelectionFragment.kt
index d4396d81d2..9977152b5a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerSelectionFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.utils.openUrlInChromeCustomTab
 import im.vector.app.databinding.FragmentLoginServerSelectionBinding
@@ -29,12 +30,13 @@ import im.vector.app.features.login.SignMode
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewState
 import me.gujun.android.span.span
-import javax.inject.Inject
 
 /**
  * In this screen, the user will choose between matrix.org, modular or other type of homeserver.
  */
-class FtueAuthServerSelectionFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentLoginServerSelectionBinding>() {
+@AndroidEntryPoint
+class FtueAuthServerSelectionFragment :
+        AbstractFtueAuthFragment<FragmentLoginServerSelectionBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginServerSelectionBinding {
         return FragmentLoginServerSelectionBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
index b16ad3ee93..91f176edf5 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
@@ -27,6 +27,7 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.resources.BuildMeta
@@ -47,9 +48,11 @@ import javax.inject.Inject
 /**
  * In this screen, the user is prompted to enter a homeserver url.
  */
-class FtueAuthServerUrlFormFragment @Inject constructor(
-        private val buildMeta: BuildMeta,
-) : AbstractFtueAuthFragment<FragmentLoginServerUrlFormBinding>() {
+@AndroidEntryPoint
+class FtueAuthServerUrlFormFragment :
+        AbstractFtueAuthFragment<FragmentLoginServerUrlFormBinding>() {
+
+    @Inject lateinit var buildMeta: BuildMeta
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginServerUrlFormBinding {
         return FragmentLoginServerUrlFormBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
index 3a4a4d8098..cbdf8603c7 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import androidx.annotation.DrawableRes
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentLoginSignupSigninSelectionBinding
@@ -30,8 +31,8 @@ import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.SSORedirectRouterActivity
 import im.vector.app.features.login.ServerType
 import im.vector.app.features.login.SignMode
-import im.vector.app.features.login.SocialLoginButtonsView
-import im.vector.app.features.login.ssoIdentityProviders
+import im.vector.app.features.login.SocialLoginButtonsView.Mode
+import im.vector.app.features.login.render
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingFlow
 import im.vector.app.features.onboarding.OnboardingViewState
@@ -42,7 +43,9 @@ import javax.inject.Inject
 /**
  * In this screen, the user is asked to sign up or to sign in to the homeserver.
  */
-class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOFtueAuthFragment<FragmentLoginSignupSigninSelectionBinding>() {
+@AndroidEntryPoint
+class FtueAuthSignUpSignInSelectionFragment :
+        AbstractSSOFtueAuthFragment<FragmentLoginSignupSigninSelectionBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSignupSigninSelectionBinding {
         return FragmentLoginSignupSigninSelectionBinding.inflate(inflater, container, false)
@@ -82,17 +85,14 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
         when (state.selectedHomeserver.preferredLoginMode) {
             is LoginMode.SsoAndPassword -> {
                 views.loginSignupSigninSignInSocialLoginContainer.isVisible = true
-                views.loginSignupSigninSocialLoginButtons.ssoIdentityProviders = state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders()?.sorted()
-                views.loginSignupSigninSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                    override fun onProviderSelected(provider: SsoIdentityProvider?) {
-                        viewModel.fetchSsoUrl(
-                                redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
-                                deviceId = state.deviceId,
-                                provider = provider,
-                                action = if (state.signMode == SignMode.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
-                        )
-                                ?.let { openInCustomTab(it) }
-                    }
+                views.loginSignupSigninSocialLoginButtons.render(state.selectedHomeserver.preferredLoginMode.ssoState, Mode.MODE_CONTINUE) { provider ->
+                    viewModel.fetchSsoUrl(
+                            redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
+                            deviceId = state.deviceId,
+                            provider = provider
+                            action = if (state.signMode == SignMode.SignUp) SSOAction.REGISTER else SSOAction.LOGIN
+                    )
+                            ?.let { openInCustomTab(it) }
                 }
             }
             else -> {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
index 0333f6047b..3d23d2b4c3 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
@@ -27,6 +27,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.incrementByOneAndWrap
 import im.vector.app.core.extensions.setCurrentItem
@@ -44,13 +45,15 @@ import javax.inject.Inject
 private const val CAROUSEL_ROTATION_DELAY_MS = 5000L
 private const val CAROUSEL_TRANSITION_TIME_MS = 500L
 
-class FtueAuthSplashCarouselFragment @Inject constructor(
-        private val vectorPreferences: VectorPreferences,
-        private val vectorFeatures: VectorFeatures,
-        private val carouselController: SplashCarouselController,
-        private val carouselStateFactory: SplashCarouselStateFactory,
-        private val buildMeta: BuildMeta,
-) : AbstractFtueAuthFragment<FragmentFtueSplashCarouselBinding>() {
+@AndroidEntryPoint
+class FtueAuthSplashCarouselFragment :
+        AbstractFtueAuthFragment<FragmentFtueSplashCarouselBinding>() {
+
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var vectorFeatures: VectorFeatures
+    @Inject lateinit var carouselController: SplashCarouselController
+    @Inject lateinit var carouselStateFactory: SplashCarouselStateFactory
+    @Inject lateinit var buildMeta: BuildMeta
 
     private var tabLayoutMediator: TabLayoutMediator? = null
 
@@ -91,8 +94,8 @@ class FtueAuthSplashCarouselFragment @Inject constructor(
         if (buildMeta.isDebug || vectorPreferences.developerMode()) {
             views.loginSplashVersion.isVisible = true
             @SuppressLint("SetTextI18n")
-            views.loginSplashVersion.text = "Version : ${buildMeta.versionName}#${buildMeta.buildNumber}\n" +
-                    "Branch: ${buildMeta.gitBranchName}"
+            views.loginSplashVersion.text = "Version : ${buildMeta.versionName}\n" +
+                    "Branch: ${buildMeta.gitBranchName} ${buildMeta.gitRevision}"
             views.loginSplashVersion.debouncedClicks { navigator.openDebug(requireContext()) }
         }
         views.splashCarousel.registerAutomaticUntilInteractionTransitions()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
index a04e8a5c01..3c8f3c25d9 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
@@ -22,6 +22,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.databinding.FragmentFtueAuthSplashBinding
@@ -34,11 +35,13 @@ import javax.inject.Inject
 /**
  * In this screen, the user is viewing an introduction to what he can do with this application.
  */
-class FtueAuthSplashFragment @Inject constructor(
-        private val vectorPreferences: VectorPreferences,
-        private val vectorFeatures: VectorFeatures,
-        private val buildMeta: BuildMeta,
-) : AbstractFtueAuthFragment<FragmentFtueAuthSplashBinding>() {
+@AndroidEntryPoint
+class FtueAuthSplashFragment :
+        AbstractFtueAuthFragment<FragmentFtueAuthSplashBinding>() {
+
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var vectorFeatures: VectorFeatures
+    @Inject lateinit var buildMeta: BuildMeta
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueAuthSplashBinding {
         return FragmentFtueAuthSplashBinding.inflate(inflater, container, false)
@@ -64,8 +67,7 @@ class FtueAuthSplashFragment @Inject constructor(
             views.loginSplashVersion.isVisible = true
             @SuppressLint("SetTextI18n")
             views.loginSplashVersion.text = "Version : ${buildMeta.versionName}\n" +
-                    "Branch: ${buildMeta.gitBranchName}\n" +
-                    "Build: ${buildMeta.buildNumber}"
+                    "Branch: ${buildMeta.gitBranchName} ${buildMeta.gitRevision}"
             views.loginSplashVersion.debouncedClicks { navigator.openDebug(requireContext()) }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
index 289aa811d6..da8aac1d54 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
@@ -29,6 +29,7 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.getResTintedDrawable
 import im.vector.app.core.extensions.getTintedDrawable
@@ -45,10 +46,12 @@ import javax.inject.Inject
 private const val DARK_MODE_ICON_BACKGROUND_ALPHA = 0.30f
 private const val LIGHT_MODE_ICON_BACKGROUND_ALPHA = 0.15f
 
-class FtueAuthUseCaseFragment @Inject constructor(
-        private val themeProvider: ThemeProvider,
-        private val vectorFeatures: VectorFeatures,
-) : AbstractFtueAuthFragment<FragmentFtueAuthUseCaseBinding>() {
+@AndroidEntryPoint
+class FtueAuthUseCaseFragment :
+        AbstractFtueAuthFragment<FragmentFtueAuthUseCaseBinding>() {
+
+    @Inject lateinit var themeProvider: ThemeProvider
+    @Inject lateinit var vectorFeatures: VectorFeatures
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueAuthUseCaseBinding {
         return FragmentFtueAuthUseCaseBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index 150ab74ec2..7467104da1 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -46,6 +46,7 @@ import im.vector.app.features.login.SignMode
 import im.vector.app.features.login.TextInputFormFragmentMode
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingActivity
+import im.vector.app.features.onboarding.OnboardingFlow
 import im.vector.app.features.onboarding.OnboardingVariant
 import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewModel
@@ -53,6 +54,7 @@ import im.vector.app.features.onboarding.OnboardingViewState
 import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthLegacyStyleTermsFragment
 import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthTermsFragment
 import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthTermsLegacyStyleFragmentArgument
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import org.matrix.android.sdk.api.auth.registration.Stage
 import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms
 import org.matrix.android.sdk.api.extensions.tryOrNull
@@ -106,7 +108,7 @@ class FtueAuthVariant(
         }
 
         // Get config extra
-        val loginConfig = activity.intent.getParcelableExtra<LoginConfig?>(OnboardingActivity.EXTRA_CONFIG)
+        val loginConfig = activity.intent.getParcelableExtraCompat<LoginConfig?>(OnboardingActivity.EXTRA_CONFIG)
         if (isFirstCreation) {
             onboardingViewModel.handle(OnboardingAction.InitWith(loginConfig))
         }
@@ -202,6 +204,7 @@ class FtueAuthVariant(
                 openMsisdnConfirmation(viewEvents.msisdn)
             }
             is OnboardingViewEvents.Failure,
+            is OnboardingViewEvents.UnrecognisedCertificateFailure,
             is OnboardingViewEvents.Loading ->
                 // This is handled by the Fragments
                 Unit
@@ -212,7 +215,7 @@ class FtueAuthVariant(
                         option = commonOption
                 )
             }
-            OnboardingViewEvents.OpenCombinedRegister -> openStartCombinedRegister()
+            OnboardingViewEvents.OpenCombinedRegister -> onStartCombinedRegister()
             is OnboardingViewEvents.OnAccountCreated -> onAccountCreated()
             OnboardingViewEvents.OnAccountSignedIn -> onAccountSignedIn()
             OnboardingViewEvents.OnChooseDisplayName -> onChooseDisplayName()
@@ -228,43 +231,48 @@ class FtueAuthVariant(
                         tag = FRAGMENT_EDIT_HOMESERVER_TAG
                 )
             }
-            OnboardingViewEvents.OnHomeserverEdited -> supportFragmentManager.popBackStack(
-                    FRAGMENT_EDIT_HOMESERVER_TAG,
-                    FragmentManager.POP_BACK_STACK_INCLUSIVE
-            )
+            OnboardingViewEvents.OnHomeserverEdited -> {
+                supportFragmentManager.popBackStack(
+                        FRAGMENT_EDIT_HOMESERVER_TAG,
+                        FragmentManager.POP_BACK_STACK_INCLUSIVE
+                )
+                ensureEditServerBackstack()
+            }
             OnboardingViewEvents.OpenCombinedLogin -> onStartCombinedLogin()
-            is OnboardingViewEvents.DeeplinkAuthenticationFailure -> onDeeplinkedHomeserverUnavailable(viewEvents)
             OnboardingViewEvents.DisplayRegistrationFallback -> displayFallbackWebDialog()
             is OnboardingViewEvents.DisplayRegistrationStage -> doStage(viewEvents.stage)
             OnboardingViewEvents.DisplayStartRegistration -> when {
-                vectorFeatures.isOnboardingCombinedRegisterEnabled() -> openStartCombinedRegister()
+                vectorFeatures.isOnboardingCombinedRegisterEnabled() -> onStartCombinedRegister()
                 else -> openAuthLoginFragmentWithTag(FRAGMENT_REGISTRATION_STAGE_TAG)
             }
         }
     }
 
-    private fun onDeeplinkedHomeserverUnavailable(viewEvents: OnboardingViewEvents.DeeplinkAuthenticationFailure) {
-        showHomeserverUnavailableDialog(onboardingViewModel.getInitialHomeServerUrl().orEmpty()) {
-            onboardingViewModel.handle(OnboardingAction.ResetDeeplinkConfig)
-            onboardingViewModel.handle(viewEvents.retryAction)
+    private fun ensureEditServerBackstack() {
+        when (activity.supportFragmentManager.findFragmentById(views.loginFragmentContainer.id)) {
+            is FtueAuthCombinedLoginFragment,
+            is FtueAuthCombinedRegisterFragment -> {
+                // do nothing
+            }
+            else -> {
+                withState(onboardingViewModel) { state ->
+                    when (state.onboardingFlow) {
+                        OnboardingFlow.SignIn -> onStartCombinedLogin()
+                        OnboardingFlow.SignUp -> onStartCombinedRegister()
+                        OnboardingFlow.SignInSignUp,
+                        null -> error("${state.onboardingFlow} does not support editing server url")
+                    }
+                }
+            }
         }
     }
 
-    private fun showHomeserverUnavailableDialog(url: String, action: () -> Unit) {
-        MaterialAlertDialogBuilder(activity)
-                .setTitle(R.string.dialog_title_error)
-                .setMessage(activity.getString(R.string.login_error_homeserver_from_url_not_found, url))
-                .setPositiveButton(R.string.login_error_homeserver_from_url_not_found_enter_manual) { _, _ -> action() }
-                .setNegativeButton(R.string.action_cancel, null)
-                .show()
-    }
-
     private fun onStartCombinedLogin() {
-        addRegistrationStageFragmentToBackstack(FtueAuthCombinedLoginFragment::class.java)
+        addRegistrationStageFragmentToBackstack(FtueAuthCombinedLoginFragment::class.java, allowStateLoss = true)
     }
 
-    private fun openStartCombinedRegister() {
-        addRegistrationStageFragmentToBackstack(FtueAuthCombinedRegisterFragment::class.java)
+    private fun onStartCombinedRegister() {
+        addRegistrationStageFragmentToBackstack(FtueAuthCombinedRegisterFragment::class.java, allowStateLoss = true)
     }
 
     private fun displayFallbackWebDialog() {
@@ -404,7 +412,8 @@ class FtueAuthVariant(
     private fun onEmail(stage: Stage) {
         when {
             vectorFeatures.isOnboardingCombinedRegisterEnabled() -> addRegistrationStageFragmentToBackstack(
-                    FtueAuthEmailEntryFragment::class.java
+                    FtueAuthEmailEntryFragment::class.java,
+                    FtueAuthEmailEntryFragmentArgument(mandatory = stage.mandatory)
             )
             else -> addRegistrationStageFragmentToBackstack(
                     FtueAuthGenericTextInputFormFragment::class.java,
@@ -519,13 +528,14 @@ class FtueAuthVariant(
         )
     }
 
-    private fun addRegistrationStageFragmentToBackstack(fragmentClass: Class<out Fragment>, params: Parcelable? = null) {
+    private fun addRegistrationStageFragmentToBackstack(fragmentClass: Class<out Fragment>, params: Parcelable? = null, allowStateLoss: Boolean = false) {
         activity.addFragmentToBackstack(
                 views.loginFragmentContainer,
                 fragmentClass,
                 params,
                 tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                option = commonOption
+                option = commonOption,
+                allowStateLoss = allowStateLoss,
         )
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt
index eb00dc3e21..ddd662be86 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt
@@ -23,6 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isInvisible
 import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.utils.colorTerminatingFullStop
 import im.vector.app.databinding.FragmentFtueWaitForEmailVerificationBinding
@@ -42,9 +43,11 @@ data class FtueAuthWaitForEmailFragmentArgument(
 /**
  * In this screen, the user is asked to check their emails.
  */
-class FtueAuthWaitForEmailFragment @Inject constructor(
-        private val themeProvider: ThemeProvider
-) : AbstractFtueAuthFragment<FragmentFtueWaitForEmailVerificationBinding>() {
+@AndroidEntryPoint
+class FtueAuthWaitForEmailFragment :
+        AbstractFtueAuthFragment<FragmentFtueWaitForEmailVerificationBinding>() {
+
+    @Inject lateinit var themeProvider: ThemeProvider
 
     private val params: FtueAuthWaitForEmailFragmentArgument by args()
     private var inferHasLeftAndReturnedToScreen = false
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWebFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWebFragment.kt
index 9e32ec263c..62a89e437b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWebFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWebFragment.kt
@@ -31,6 +31,7 @@ import android.webkit.SslErrorHandler
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.utils.AssetReader
 import im.vector.app.databinding.FragmentLoginWebBinding
@@ -49,9 +50,11 @@ import javax.inject.Inject
  * This screen is displayed when the application does not support login flow or registration flow
  * of the homeserver, as a fallback to login or to create an account.
  */
-class FtueAuthWebFragment @Inject constructor(
-        private val assetReader: AssetReader
-) : AbstractFtueAuthFragment<FragmentLoginWebBinding>() {
+@AndroidEntryPoint
+class FtueAuthWebFragment :
+        AbstractFtueAuthFragment<FragmentLoginWebBinding>() {
+
+    @Inject lateinit var assetReader: AssetReader
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginWebBinding {
         return FragmentLoginWebBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthLegacyStyleTermsFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthLegacyStyleTermsFragment.kt
index af38062663..1b5c1adc74 100755
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthLegacyStyleTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthLegacyStyleTermsFragment.kt
@@ -22,6 +22,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.toReducedUrl
@@ -46,11 +47,13 @@ data class FtueAuthTermsLegacyStyleFragmentArgument(
 /**
  * LoginTermsFragment displays the list of policies the user has to accept.
  */
-class FtueAuthLegacyStyleTermsFragment @Inject constructor(
-        private val policyController: PolicyController
-) : AbstractFtueAuthFragment<FragmentLoginTermsBinding>(),
+@AndroidEntryPoint
+class FtueAuthLegacyStyleTermsFragment :
+        AbstractFtueAuthFragment<FragmentLoginTermsBinding>(),
         PolicyController.PolicyControllerListener {
 
+    @Inject lateinit var policyController: PolicyController
+
     private val params: FtueAuthTermsLegacyStyleFragmentArgument by args()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginTermsBinding {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
index 371c618d54..e9b32a1c7f 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.doOnLayout
 import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -43,11 +44,13 @@ import kotlin.math.roundToInt
 /**
  * LoginTermsFragment displays the list of policies the user has to accept.
  */
-class FtueAuthTermsFragment @Inject constructor(
-        private val policyController: PolicyController
-) : AbstractFtueAuthFragment<FragmentFtueLoginTermsBinding>(),
+@AndroidEntryPoint
+class FtueAuthTermsFragment :
+        AbstractFtueAuthFragment<FragmentFtueLoginTermsBinding>(),
         PolicyController.PolicyControllerListener {
 
+    @Inject lateinit var policyController: PolicyController
+
     private val params: FtueAuthTermsLegacyStyleFragmentArgument by args()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueLoginTermsBinding {
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkFactory.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkFactory.kt
new file mode 100644
index 0000000000..378ffc4569
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkFactory.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package im.vector.app.features.permalink
+
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+
+/**
+ * Contains synchronous methods to create permalinks from the Session.
+ */
+class PermalinkFactory @Inject constructor(
+        private val session: Session,
+) {
+    fun createPermalinkOfCurrentUser(): String? {
+        return createPermalink(session.myUserId)
+    }
+
+    fun createPermalink(id: String): String? {
+        return session.permalinkService().createPermalink(id)
+    }
+
+    fun createPermalink(roomId: String, eventId: String): String {
+        return session.permalinkService().createPermalink(roomId, eventId)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index fc56891b72..18b9f03444 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.permalink
 import android.content.Context
 import android.net.Uri
 import androidx.core.net.toUri
+import androidx.fragment.app.FragmentActivity
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.isIgnored
@@ -52,17 +53,17 @@ class PermalinkHandler @Inject constructor(
 ) {
 
     suspend fun launch(
-            context: Context,
+            fragmentActivity: FragmentActivity,
             deepLink: String?,
             navigationInterceptor: NavigationInterceptor? = null,
             buildTask: Boolean = false
     ): Boolean {
         val uri = deepLink?.let { Uri.parse(it) }
-        return launch(context, uri, navigationInterceptor, buildTask)
+        return launch(fragmentActivity, uri, navigationInterceptor, buildTask)
     }
 
     suspend fun launch(
-            context: Context,
+            fragmentActivity: FragmentActivity,
             deepLink: Uri?,
             navigationInterceptor: NavigationInterceptor? = null,
             buildTask: Boolean = false
@@ -70,12 +71,12 @@ class PermalinkHandler @Inject constructor(
         return when {
             deepLink == null -> false
             deepLink.isIgnored() -> true
-            !isPermalinkSupported(context, deepLink.toString()) -> false
+            !isPermalinkSupported(fragmentActivity, deepLink.toString()) -> false
             else -> {
                 tryOrNull {
                     withContext(Dispatchers.Default) {
                         val permalinkData = PermalinkParser.parse(deepLink)
-                        handlePermalink(permalinkData, deepLink, context, navigationInterceptor, buildTask)
+                        handlePermalink(permalinkData, deepLink, fragmentActivity, navigationInterceptor, buildTask)
                     }
                 } ?: false
             }
@@ -85,22 +86,22 @@ class PermalinkHandler @Inject constructor(
     private suspend fun handlePermalink(
             permalinkData: PermalinkData,
             rawLink: Uri,
-            context: Context,
+            fragmentActivity: FragmentActivity,
             navigationInterceptor: NavigationInterceptor?,
             buildTask: Boolean
     ): Boolean {
         return when (permalinkData) {
-            is PermalinkData.RoomLink -> handleRoomLink(permalinkData, rawLink, context, navigationInterceptor, buildTask)
-            is PermalinkData.UserLink -> handleUserLink(permalinkData, rawLink, context, navigationInterceptor, buildTask)
-            is PermalinkData.FallbackLink -> handleFallbackLink(permalinkData, context)
-            is PermalinkData.RoomEmailInviteLink -> handleRoomInviteLink(permalinkData, context)
+            is PermalinkData.RoomLink -> handleRoomLink(permalinkData, rawLink, fragmentActivity, navigationInterceptor, buildTask)
+            is PermalinkData.UserLink -> handleUserLink(permalinkData, rawLink, fragmentActivity, navigationInterceptor, buildTask)
+            is PermalinkData.FallbackLink -> handleFallbackLink(permalinkData, fragmentActivity)
+            is PermalinkData.RoomEmailInviteLink -> handleRoomInviteLink(permalinkData, fragmentActivity)
         }
     }
 
     private suspend fun handleRoomLink(
             permalinkData: PermalinkData.RoomLink,
             rawLink: Uri,
-            context: Context,
+            fragmentActivity: FragmentActivity,
             navigationInterceptor: NavigationInterceptor?,
             buildTask: Boolean
     ): Boolean {
@@ -119,7 +120,7 @@ class PermalinkHandler @Inject constructor(
         }
         openRoom(
                 navigationInterceptor,
-                context = context,
+                fragmentActivity = fragmentActivity,
                 roomId = roomId,
                 permalinkData = permalinkData,
                 rawLink = rawLink,
@@ -200,7 +201,7 @@ class PermalinkHandler @Inject constructor(
      */
     private fun openRoom(
             navigationInterceptor: NavigationInterceptor?,
-            context: Context,
+            fragmentActivity: FragmentActivity,
             roomId: String?,
             permalinkData: PermalinkData.RoomLink,
             rawLink: Uri,
@@ -209,7 +210,7 @@ class PermalinkHandler @Inject constructor(
     ) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         if (roomId == null) {
-            context.toast(R.string.room_error_not_found)
+            fragmentActivity.toast(R.string.room_error_not_found)
             return
         }
         val roomSummary = session.getRoomSummary(roomId)
@@ -218,19 +219,19 @@ class PermalinkHandler @Inject constructor(
 //        val roomAlias = permalinkData.getRoomAliasOrNull()
         val isSpace = roomSummary?.roomType == RoomType.SPACE
         return when {
-            membership == Membership.BAN -> context.toast(R.string.error_opening_banned_room)
+            membership == Membership.BAN -> fragmentActivity.toast(R.string.error_opening_banned_room)
             membership?.isActive().orFalse() -> {
                 if (!isSpace && membership == Membership.JOIN) {
                     // If it's a room you're in, let's just open it, you can tap back if needed
-                    navigationInterceptor.openJoinedRoomScreen(buildTask, roomId, eventId, rawLink, context, rootThreadEventId, roomSummary)
+                    navigationInterceptor.openJoinedRoomScreen(buildTask, roomId, eventId, rawLink, fragmentActivity, rootThreadEventId, roomSummary)
                 } else {
-                    // maybe open space preview navigator.openSpacePreview(context, roomId)? if already joined?
-                    navigator.openMatrixToBottomSheet(context, rawLink.toString(), OriginOfMatrixTo.LINK)
+                    // maybe open space preview navigator.openSpacePreview(fragmentActivity, roomId)? if already joined?
+                    navigator.openMatrixToBottomSheet(fragmentActivity, rawLink.toString(), OriginOfMatrixTo.LINK)
                 }
             }
             else -> {
                 // XXX this could trigger another server load
-                navigator.openMatrixToBottomSheet(context, rawLink.toString(), OriginOfMatrixTo.LINK)
+                navigator.openMatrixToBottomSheet(fragmentActivity, rawLink.toString(), OriginOfMatrixTo.LINK)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
index faf15d8006..cef0064fd0 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
@@ -23,6 +23,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.lib.core.utils.compat.getParcelableCompat
 
 @AndroidEntryPoint
 class PinActivity : VectorBaseActivity<ActivitySimpleBinding>(), UnlockedActivity {
@@ -41,7 +42,7 @@ class PinActivity : VectorBaseActivity<ActivitySimpleBinding>(), UnlockedActivit
 
     override fun initUiAndData() {
         if (isFirstCreation()) {
-            val fragmentArgs: PinArgs = intent?.extras?.getParcelable(Mavericks.KEY_ARG) ?: return
+            val fragmentArgs: PinArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return
             addFragment(views.simpleFragmentContainer, PinFragment::class.java, fragmentArgs)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
index 1688452167..3a3a0e66fd 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
@@ -26,6 +26,7 @@ import android.widget.Toast
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.asMavericksArgs
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseFragment
@@ -49,11 +50,13 @@ data class PinArgs(
         val pinMode: PinMode
 ) : Parcelable
 
-class PinFragment @Inject constructor(
-        private val pinCodeStore: PinCodeStore,
-        private val vectorPreferences: VectorPreferences,
-        private val defaultConfiguration: LockScreenConfiguration,
-) : VectorBaseFragment<FragmentPinBinding>() {
+@AndroidEntryPoint
+class PinFragment :
+        VectorBaseFragment<FragmentPinBinding>() {
+
+    @Inject lateinit var pinCodeStore: PinCodeStore
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var defaultConfiguration: LockScreenConfiguration
 
     private val fragmentArgs: PinArgs by args()
 
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt
index 9bcf6e4264..bf2075d3a8 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt
@@ -16,12 +16,11 @@
 
 package im.vector.app.features.pin.lockscreen.biometrics
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Build
 import androidx.annotation.MainThread
 import androidx.annotation.VisibleForTesting
-import androidx.annotation.VisibleForTesting.PRIVATE
+import androidx.annotation.VisibleForTesting.Companion.PRIVATE
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
 import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK
@@ -156,7 +155,6 @@ class BiometricHelper @AssistedInject constructor(
         return authenticate(activity)
     }
 
-    @SuppressLint("NewApi")
     @OptIn(ExperimentalCoroutinesApi::class)
     private fun authenticateInternal(
         activity: FragmentActivity,
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCrypto.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCrypto.kt
index a42ce3a9b7..fd676f1662 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCrypto.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCrypto.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.pin.lockscreen.crypto
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Build
 import android.security.keystore.KeyPermanentlyInvalidatedException
@@ -55,7 +54,6 @@ class KeyStoreCrypto @AssistedInject constructor(
      * Ensures a [Key] for the [alias] exists and validates it.
      * @throws KeyPermanentlyInvalidatedException if key is not valid.
      */
-    @SuppressLint("NewApi")
     @Throws(KeyPermanentlyInvalidatedException::class)
     fun ensureKey() = secretStoringUtils.ensureKey(alias).also {
         // Check validity of Key by initializing an encryption Cipher
@@ -109,10 +107,9 @@ class KeyStoreCrypto @AssistedInject constructor(
     /**
      * Check if the key associated with the [alias] is valid.
      */
-    @SuppressLint("NewApi")
     fun hasValidKey(): Boolean {
         val keyExists = hasKey()
-        return if (buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M && keyExists) {
+        return if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.M) && keyExists) {
             val initializedKey = tryOrNull("Error validating lockscreen system key.") { ensureKey() }
             initializedKey != null
         } else {
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt
index bb55ceb1b7..c2d70a3734 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.pin.lockscreen.crypto
 
-import android.annotation.SuppressLint
 import android.os.Build
 import im.vector.app.features.pin.lockscreen.crypto.migrations.LegacyPinCodeMigrator
 import im.vector.app.features.pin.lockscreen.crypto.migrations.MissingSystemKeyMigrator
@@ -36,14 +35,13 @@ class LockScreenKeysMigrator @Inject constructor(
     /**
      * Performs any needed migrations in order.
      */
-    @SuppressLint("NewApi")
     suspend fun migrateIfNeeded() {
         if (legacyPinCodeMigrator.isMigrationNeeded()) {
             legacyPinCodeMigrator.migrate()
             missingSystemKeyMigrator.migrateIfNeeded()
         }
 
-        if (systemKeyV1Migrator.isMigrationNeeded() && versionProvider.get() >= Build.VERSION_CODES.M) {
+        if (systemKeyV1Migrator.isMigrationNeeded() && versionProvider.isAtLeast(Build.VERSION_CODES.M)) {
             systemKeyV1Migrator.migrate()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigrator.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigrator.kt
index 4c33c14954..7593aa6de3 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigrator.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigrator.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.pin.lockscreen.crypto.migrations
 
-import android.annotation.SuppressLint
 import android.os.Build
 import im.vector.app.features.pin.lockscreen.crypto.KeyStoreCrypto
 import im.vector.app.features.pin.lockscreen.di.BiometricKeyAlias
@@ -38,9 +37,9 @@ class MissingSystemKeyMigrator @Inject constructor(
     /**
      * If user had biometric auth enabled, ensure system key exists, creating one if needed.
      */
-    @SuppressLint("NewApi")
     fun migrateIfNeeded() {
-        if (buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M && vectorPreferences.useBiometricsToUnlock()) {
+        if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.M) &&
+                vectorPreferences.useBiometricsToUnlock()) {
             val systemKeyStoreCrypto = keystoreCryptoFactory.provide(systemKeyAlias, true)
             runCatching {
                 systemKeyStoreCrypto.ensureKey()
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt
index a7a228a105..8e9fdf4fae 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt
@@ -35,7 +35,8 @@ import im.vector.app.features.pin.lockscreen.configuration.LockScreenMode
 import im.vector.app.features.pin.lockscreen.views.LockScreenCodeView
 
 @AndroidEntryPoint
-class LockScreenFragment : VectorBaseFragment<FragmentLockScreenBinding>() {
+class LockScreenFragment :
+        VectorBaseFragment<FragmentLockScreenBinding>() {
 
     var lockScreenListener: LockScreenListener? = null
     var onLeftButtonClickedListener: View.OnClickListener? = null
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt
index 33ea590f1d..87d3f93f9b 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.pin.lockscreen.ui
 
-import android.annotation.SuppressLint
 import android.app.KeyguardManager
 import android.os.Build
 import android.security.keystore.KeyPermanentlyInvalidatedException
@@ -139,12 +138,12 @@ class LockScreenViewModel @AssistedInject constructor(
         }
     }.launchIn(viewModelScope)
 
-    @SuppressLint("NewApi")
     private fun showBiometricPrompt(activity: FragmentActivity) = flow {
         emitAll(biometricHelper.authenticate(activity))
     }.catch { error ->
         when {
-            versionProvider.get() >= Build.VERSION_CODES.M && error is KeyPermanentlyInvalidatedException -> {
+            versionProvider.isAtLeast(Build.VERSION_CODES.M) &&
+                    error is KeyPermanentlyInvalidatedException -> {
                 onBiometricKeyInvalidated()
             }
             else -> {
@@ -168,15 +167,14 @@ class LockScreenViewModel @AssistedInject constructor(
         _viewEvents.post(LockScreenViewEvent.ShowBiometricKeyInvalidatedMessage)
     }
 
-    @SuppressLint("NewApi")
     private suspend fun updateStateWithBiometricInfo() {
         // This is a terrible hack, but I found no other way to ensure this would be called only after the device is considered unlocked on Android 12+
         waitUntilKeyguardIsUnlocked()
         setState {
             val isBiometricKeyInvalidated = biometricHelper.hasSystemKey && !biometricHelper.isSystemKeyValid
             val canUseBiometricAuth = lockScreenConfiguration.mode == LockScreenMode.VERIFY &&
-                !isSystemAuthTemporarilyDisabledByBiometricPrompt &&
-                biometricHelper.isSystemAuthEnabledAndValid
+                    !isSystemAuthTemporarilyDisabledByBiometricPrompt &&
+                    biometricHelper.isSystemAuthEnabledAndValid
             val showBiometricPromptAutomatically = canUseBiometricAuth && lockScreenConfiguration.autoStartBiometric
             copy(
                     canUseBiometricAuth = canUseBiometricAuth,
@@ -191,12 +189,12 @@ class LockScreenViewModel @AssistedInject constructor(
      * after an Activity's `onResume` method. If we mix that with the system keys needing the device to be unlocked before they're used, we get crashes.
      * See issue [#6768](https://github.com/vector-im/element-android/issues/6768).
      */
-    @SuppressLint("NewApi")
     private suspend fun waitUntilKeyguardIsUnlocked() {
-        if (versionProvider.get() < Build.VERSION_CODES.S) return
-        withTimeoutOrNull(5.seconds) {
-            while (keyguardManager.isDeviceLocked) {
-                delay(50.milliseconds)
+        if (versionProvider.isAtLeast(Build.VERSION_CODES.S)) {
+            withTimeoutOrNull(5.seconds) {
+                while (keyguardManager.isDeviceLocked) {
+                    delay(50.milliseconds)
+                }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/fallbackprompt/FallbackBiometricDialogFragment.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/fallbackprompt/FallbackBiometricDialogFragment.kt
index d50ff791ed..c778e880b2 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/fallbackprompt/FallbackBiometricDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/fallbackprompt/FallbackBiometricDialogFragment.kt
@@ -50,10 +50,10 @@ class FallbackBiometricDialogFragment : DialogFragment(R.layout.fragment_biometr
 
     private val parsedArgs by args<Args>()
 
-    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        @Suppress("DEPRECATION")
         retainInstance = true
 
         setStyle(STYLE_NORMAL, android.R.style.Theme_Material_Light_Dialog)
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/views/LockScreenCodeView.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/views/LockScreenCodeView.kt
index eb72d86bf4..d9d6d56737 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/views/LockScreenCodeView.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/views/LockScreenCodeView.kt
@@ -142,7 +142,8 @@ class LockScreenCodeView @JvmOverloads constructor(
         var codeLength: Int = 0
 
         constructor(source: Parcel) : super(source) {
-            source.readList(code, null)
+            val codeStr = source.readString().orEmpty()
+            code = codeStr.toMutableList()
             codeLength = source.readInt()
         }
 
@@ -150,7 +151,7 @@ class LockScreenCodeView @JvmOverloads constructor(
 
         override fun writeToParcel(out: Parcel, flags: Int) {
             super.writeToParcel(out, flags)
-            out.writeList(code)
+            out.writeString(String(code.toCharArray()))
             out.writeInt(codeLength)
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollActivity.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollActivity.kt
index 5a93e19b1a..3dfec3c255 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollActivity.kt
@@ -23,6 +23,7 @@ import android.view.View
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.lib.core.utils.compat.getParcelableCompat
 
 @AndroidEntryPoint
 class CreatePollActivity : SimpleFragmentActivity() {
@@ -31,7 +32,7 @@ class CreatePollActivity : SimpleFragmentActivity() {
         super.onCreate(savedInstanceState)
         views.toolbar.visibility = View.GONE
 
-        val createPollArgs: CreatePollArgs? = intent?.extras?.getParcelable(EXTRA_CREATE_POLL_ARGS)
+        val createPollArgs: CreatePollArgs? = intent?.extras?.getParcelableCompat(EXTRA_CREATE_POLL_ARGS)
 
         if (isFirstCreation()) {
             addFragment(
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollFragment.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollFragment.kt
index 0feef3b5e5..848b27009b 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollFragment.kt
@@ -25,6 +25,7 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -42,9 +43,12 @@ data class CreatePollArgs(
         val mode: PollMode
 ) : Parcelable
 
-class CreatePollFragment @Inject constructor(
-        private val controller: CreatePollController
-) : VectorBaseFragment<FragmentCreatePollBinding>(), CreatePollController.Callback {
+@AndroidEntryPoint
+class CreatePollFragment :
+        VectorBaseFragment<FragmentCreatePollBinding>(),
+        CreatePollController.Callback {
+
+    @Inject lateinit var controller: CreatePollController
 
     private val viewModel: CreatePollViewModel by activityViewModel()
     private val args: CreatePollArgs by args()
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewModel.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewModel.kt
index ec064877a9..1b2f0d7d08 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewModel.kt
@@ -22,6 +22,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.extensions.getVectorLastMessageContent
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.poll.PollMode
 import org.matrix.android.sdk.api.session.Session
@@ -29,7 +30,6 @@ import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.PollType
-import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 
 class CreatePollViewModel @AssistedInject constructor(
         @Assisted private val initialState: CreatePollViewState,
@@ -72,7 +72,7 @@ class CreatePollViewModel @AssistedInject constructor(
 
     private fun initializeEditedPoll(eventId: String) {
         val event = room.getTimelineEvent(eventId) ?: return
-        val content = event.getLastMessageContent() as? MessagePollContent ?: return
+        val content = event.getVectorLastMessageContent() as? MessagePollContent ?: return
 
         val pollCreationInfo = content.getBestPollCreationInfo()
         val pollType = pollCreationInfo?.kind ?: PollType.DISCLOSED_UNSTABLE
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 40ef6d819e..e0310b340e 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -28,6 +28,7 @@ import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.isAnimationEnabled
 import im.vector.app.features.MainActivity
 import im.vector.app.features.analytics.ui.consent.AnalyticsOptInActivity
+import im.vector.app.features.home.room.list.home.release.ReleaseNotesActivity
 import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.signout.hard.SignedOutActivity
 import im.vector.app.features.themes.ThemeUtils
@@ -49,6 +50,12 @@ class PopupAlertManager @Inject constructor(
 
     companion object {
         const val INCOMING_CALL_PRIORITY = Int.MAX_VALUE
+        const val INCOMING_VERIFICATION_REQUEST_PRIORITY = 1
+        const val DEFAULT_PRIORITY = 0
+        const val REVIEW_LOGIN_UID = "review_login"
+        const val UPGRADE_SECURITY_UID = "upgrade_security"
+        const val VERIFY_SESSION_UID = "verify_session"
+        const val ENABLE_PUSH_UID = "enable_push"
     }
 
     private var weakCurrentActivity: WeakReference<Activity>? = null
@@ -144,7 +151,7 @@ class PopupAlertManager @Inject constructor(
 
     private fun displayNextIfPossible() {
         val currentActivity = weakCurrentActivity?.get()
-        if (Alerter.isShowing || currentActivity == null || currentActivity.isDestroyed) {
+        if (currentActivity == null || currentActivity.isDestroyed) {
             // will retry later
             return
         }
@@ -307,6 +314,7 @@ class PopupAlertManager @Inject constructor(
                 activity !is PinActivity &&
                 activity !is SignedOutActivity &&
                 activity !is AnalyticsOptInActivity &&
+                activity !is ReleaseNotesActivity &&
                 activity is VectorBaseActivity<*> &&
                 alert.shouldBeDisplayedIn.invoke(activity)
     }
diff --git a/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt b/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt
index ffdba8e04d..1597d927d8 100644
--- a/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt
@@ -98,7 +98,7 @@ open class DefaultVectorAlert(
 
     override val dismissOnClick: Boolean = true
 
-    override val priority: Int = 0
+    override val priority: Int = PopupAlertManager.DEFAULT_PRIORITY
 
     override val isLight: Boolean = false
 
diff --git a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
index 6848bbb1f3..818659872f 100644
--- a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
@@ -30,6 +30,7 @@ class VerificationVectorAlert(
         title: String,
         override val description: String,
         @DrawableRes override val iconId: Int?,
+        override val priority: Int = PopupAlertManager.DEFAULT_PRIORITY,
         /**
          * Alert are displayed by default, but let this lambda return false to prevent displaying.
          */
@@ -38,13 +39,13 @@ class VerificationVectorAlert(
     override val layoutRes = R.layout.alerter_verification_layout
 
     class ViewBinder(
-            private val matrixItem: MatrixItem?,
+            private val matrixItem: MatrixItem,
             private val avatarRenderer: AvatarRenderer
     ) : VectorAlert.ViewBinder {
 
         override fun bind(view: View) {
             val views = AlerterVerificationLayoutBinding.bind(view)
-            matrixItem?.let { avatarRenderer.render(it, views.ivUserAvatar, GlideApp.with(view.context.applicationContext)) }
+            avatarRenderer.render(matrixItem, views.ivUserAvatar, GlideApp.with(view.context.applicationContext))
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt
index 9dc7fa6548..c2b81abf12 100644
--- a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt
@@ -30,6 +30,7 @@ import com.airbnb.mvrx.args
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.Result
 import com.google.zxing.ResultMetadataType
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.registerStartForActivityResult
@@ -45,7 +46,6 @@ import im.vector.lib.multipicker.utils.ImageUtils
 import kotlinx.parcelize.Parcelize
 import me.dm7.barcodescanner.zxing.ZXingScannerView
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import javax.inject.Inject
 
 @Parcelize
 data class QrScannerArgs(
@@ -53,7 +53,10 @@ data class QrScannerArgs(
         @StringRes val titleRes: Int
 ) : Parcelable
 
-class QrCodeScannerFragment @Inject constructor() : VectorBaseFragment<FragmentQrCodeScannerBinding>(), ZXingScannerView.ResultHandler {
+@AndroidEntryPoint
+class QrCodeScannerFragment :
+        VectorBaseFragment<FragmentQrCodeScannerBinding>(),
+        ZXingScannerView.ResultHandler {
 
     private val qrViewModel: QrCodeScannerViewModel by activityViewModel()
     private val scannerArgs: QrScannerArgs by args()
diff --git a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerViewModel.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerViewModel.kt
index e24c57c6de..3167eebc9f 100644
--- a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerViewModel.kt
@@ -24,11 +24,9 @@ import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorDummyViewState
 import im.vector.app.core.platform.VectorViewModel
-import org.matrix.android.sdk.api.session.Session
 
 class QrCodeScannerViewModel @AssistedInject constructor(
         @Assisted initialState: VectorDummyViewState,
-        val session: Session
 ) : VectorViewModel<VectorDummyViewState, QrCodeScannerAction, QrCodeScannerEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index c7f549c5cb..78d3347cbe 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -128,7 +128,7 @@ class BugReportActivity :
             val isValid = !views.bugReportMaskView.isVisible
 
             it.isEnabled = isValid
-            it.icon.alpha = if (isValid) 255 else 100
+            it.icon?.alpha = if (isValid) 255 else 100
         }
     }
 
@@ -267,6 +267,7 @@ class BugReportActivity :
         // Ensure there is no crash status remaining, which will be sent later on by mistake
         bugReporter.deleteCrashFile()
 
+        @Suppress("DEPRECATION")
         super.onBackPressed()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index ad09593ebd..a9ff47bfb1 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -31,7 +31,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.getAllChildFragments
 import im.vector.app.core.extensions.toOnOff
 import im.vector.app.core.resources.BuildMeta
-import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorLocaleProvider
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.devtools.GossipingEventsSerializer
 import im.vector.app.features.settings.locale.SystemLocaleProvider
@@ -78,7 +78,9 @@ class BugReporter @Inject constructor(
         private val systemLocaleProvider: SystemLocaleProvider,
         private val matrix: Matrix,
         private val buildMeta: BuildMeta,
+        private val processInfo: ProcessInfo,
         private val sdkIntProvider: BuildVersionSdkIntProvider,
+        private val vectorLocale: VectorLocaleProvider,
 ) {
     var inMultiWindowMode = false
 
@@ -281,7 +283,7 @@ class BugReporter @Inject constructor(
                             .addFormDataPart("user_id", userId)
                             .addFormDataPart("can_contact", canContact.toString())
                             .addFormDataPart("device_id", deviceId)
-                            .addFormDataPart("version", versionProvider.getVersion(longFormat = true, useBuildNumber = false))
+                            .addFormDataPart("version", versionProvider.getVersion(longFormat = true))
                             .addFormDataPart("branch_name", buildMeta.gitBranchName)
                             .addFormDataPart("matrix_sdk_version", Matrix.getSdkVersion())
                             .addFormDataPart("olm_version", olmVersion)
@@ -293,7 +295,7 @@ class BugReporter @Inject constructor(
                                     Build.VERSION.INCREMENTAL + "-" + Build.VERSION.CODENAME
                             )
                             .addFormDataPart("locale", Locale.getDefault().toString())
-                            .addFormDataPart("app_language", VectorLocale.applicationLocale.toString())
+                            .addFormDataPart("app_language", vectorLocale.applicationLocale.toString())
                             .addFormDataPart("default_app_language", systemLocaleProvider.getSystemLocale().toString())
                             .addFormDataPart("theme", ThemeUtils.getApplicationTheme(context))
                             .addFormDataPart("server_version", serverVersion)
@@ -303,11 +305,6 @@ class BugReporter @Inject constructor(
                                 }
                             }
 
-                    val buildNumber = buildMeta.buildNumber
-                    if (buildNumber.isNotEmpty() && buildNumber != "0") {
-                        builder.addFormDataPart("build_number", buildNumber)
-                    }
-
                     // add the gzipped files
                     for (file in gzippedFiles) {
                         builder.addFormDataPart("compressed-log", file.name, file.asRequestBody(MimeTypes.OctetStream.toMediaTypeOrNull()))
@@ -499,10 +496,26 @@ class BugReporter @Inject constructor(
      */
     fun openBugReportScreen(activity: FragmentActivity, reportType: ReportType = ReportType.BUG_REPORT) {
         screenshot = takeScreenshot(activity)
-        matrix.debugService().logDbUsageInfo()
+        logDbInfo()
+        logProcessInfo()
+        logOtherInfo()
         activity.startActivity(BugReportActivity.intent(activity, reportType))
     }
 
+    private fun logOtherInfo() {
+        Timber.i("SyncThread state: " + activeSessionHolder.getSafeActiveSession()?.syncService()?.getSyncState())
+    }
+
+    private fun logDbInfo() {
+        val dbInfo = matrix.debugService().getDbUsageInfo()
+        Timber.i(dbInfo)
+    }
+
+    private fun logProcessInfo() {
+        val pInfo = processInfo.getInfo()
+        Timber.i(pInfo)
+    }
+
     private fun rageShakeAppNameForReport(reportType: ReportType): String {
         // As per https://github.com/matrix-org/rageshake
         // app: Identifier for the application (eg 'riot-web').
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/ProcessInfo.kt b/vector/src/main/java/im/vector/app/features/rageshake/ProcessInfo.kt
new file mode 100644
index 0000000000..78e49a2e65
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/rageshake/ProcessInfo.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.rageshake
+
+import android.annotation.SuppressLint
+import android.app.Application
+import android.os.Build
+import android.os.Process
+import java.lang.reflect.Method
+import javax.inject.Inject
+
+class ProcessInfo @Inject constructor() {
+    fun getInfo() = buildString {
+        append("===========================================\n")
+        append("*              PROCESS INFO               *\n")
+        append("===========================================\n")
+        val processId = Process.myPid()
+        append("ProcessId: $processId\n")
+        append("ProcessName: ${getProcessName()}\n")
+        append(getThreadInfo())
+        append("===========================================\n")
+    }
+
+    @SuppressLint("PrivateApi")
+    private fun getProcessName(): String? {
+        return if (Build.VERSION.SDK_INT >= 28) {
+            Application.getProcessName()
+        } else {
+            try {
+                val activityThread = Class.forName("android.app.ActivityThread")
+                val getProcessName: Method = activityThread.getDeclaredMethod("currentProcessName")
+                getProcessName.invoke(null) as? String
+            } catch (t: Throwable) {
+                null
+            }
+        }
+    }
+
+    private fun getThreadInfo() = buildString {
+        append("Thread activeCount: ${Thread.activeCount()}\n")
+        Thread.getAllStackTraces().keys
+                .sortedBy { it.name }
+                .forEach { thread -> append(thread.getInfo()) }
+    }
+}
+
+private fun Thread.getInfo() = buildString {
+    append("Thread '$name':")
+    append(" id: $id")
+    append(" priority: $priority")
+    append(" group name: ${threadGroup?.name ?: "null"}")
+    append(" state: $state")
+    append(" isAlive: $isAlive")
+    append(" isDaemon: $isDaemon")
+    append(" isInterrupted: $isInterrupted")
+    append("\n")
+}
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
index f16db4a66d..a8023d2313 100644
--- a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
@@ -74,7 +74,7 @@ class VectorFileLogger @Inject constructor(
         }
 
         for (i in 0..15) {
-            val file = File(cacheDirectory, "elementLogs.$i.txt")
+            val file = File(cacheDirectory, "elementLogs.${i}.txt")
             tryOrNull { file.delete() }
         }
 
@@ -121,7 +121,7 @@ class VectorFileLogger @Inject constructor(
                     ?.flush()
                     ?.let { 0 until logRotationCount }
                     ?.mapNotNull { index ->
-                        File(cacheDirectory, "$fileNamePrefix.$index.txt")
+                        File(cacheDirectory, "$fileNamePrefix.${index}.txt")
                                 .takeIf { it.exists() }
                     }
         }
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt
index 5496ff4a94..d3174631e8 100644
--- a/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt
@@ -16,10 +16,10 @@
 
 package im.vector.app.features.rageshake
 
-import android.content.Context
+import android.content.SharedPreferences
 import android.os.Build
 import androidx.core.content.edit
-import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.di.DefaultPreferences
 import im.vector.app.core.resources.VersionCodeProvider
 import im.vector.app.features.version.VersionProvider
 import org.matrix.android.sdk.api.Matrix
@@ -31,10 +31,11 @@ import javax.inject.Singleton
 
 @Singleton
 class VectorUncaughtExceptionHandler @Inject constructor(
-        context: Context,
+        @DefaultPreferences
+        private val preferences: SharedPreferences,
         private val bugReporter: BugReporter,
         private val versionProvider: VersionProvider,
-        private val versionCodeProvider: VersionCodeProvider
+        private val versionCodeProvider: VersionCodeProvider,
 ) : Thread.UncaughtExceptionHandler {
 
     // key to save the crash status
@@ -44,8 +45,6 @@ class VectorUncaughtExceptionHandler @Inject constructor(
 
     private var previousHandler: Thread.UncaughtExceptionHandler? = null
 
-    private val preferences = DefaultSharedPreferences.getInstance(context)
-
     /**
      * Activate this handler.
      */
@@ -71,7 +70,7 @@ class VectorUncaughtExceptionHandler @Inject constructor(
         val appName = "Element" // TODO Matrix.getApplicationName()
 
         b.append(appName + " Build : " + versionCodeProvider.getVersionCode() + "\n")
-        b.append("$appName Version : ${versionProvider.getVersion(longFormat = true, useBuildNumber = true)}\n")
+        b.append("$appName Version : ${versionProvider.getVersion(longFormat = true)}\n")
         b.append("SDK Version : ${Matrix.getSdkVersion()}\n")
         b.append("Phone : " + Build.MODEL.trim() + " (" + Build.VERSION.INCREMENTAL + " " + Build.VERSION.RELEASE + " " + Build.VERSION.CODENAME + ")\n")
 
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
index bcc18a995a..24065645ea 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
@@ -20,17 +20,20 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.EmojiChooserFragmentBinding
 import javax.inject.Inject
 
-class EmojiChooserFragment @Inject constructor(
-        private val emojiRecyclerAdapter: EmojiRecyclerAdapter
-) : VectorBaseFragment<EmojiChooserFragmentBinding>(),
+@AndroidEntryPoint
+class EmojiChooserFragment :
+        VectorBaseFragment<EmojiChooserFragmentBinding>(),
         EmojiRecyclerAdapter.InteractionListener,
         ReactionClickListener {
 
+    @Inject lateinit var emojiRecyclerAdapter: EmojiRecyclerAdapter
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): EmojiChooserFragmentBinding {
         return EmojiChooserFragmentBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
index f9be57b13f..24a45872d5 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
@@ -146,7 +146,7 @@ class EmojiReactionPickerActivity :
         val searchItem = menu.findItem(R.id.search)
         (searchItem.actionView as? SearchView)?.let { searchView ->
             searchItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
-                override fun onMenuItemActionExpand(p0: MenuItem?): Boolean {
+                override fun onMenuItemActionExpand(p0: MenuItem): Boolean {
                     searchView.isIconified = false
                     searchView.requestFocusFromTouch()
                     // we want to force the tool bar as visible even if hidden with scroll flags
@@ -154,7 +154,7 @@ class EmojiReactionPickerActivity :
                     return true
                 }
 
-                override fun onMenuItemActionCollapse(p0: MenuItem?): Boolean {
+                override fun onMenuItemActionCollapse(p0: MenuItem): Boolean {
                     // when back, clear all search
                     views.emojiPickerToolbar.minimumHeight = 0
                     searchView.setQuery("", true)
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt
index 9292ad8fc6..3a448185ac 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt
@@ -21,6 +21,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -29,9 +30,12 @@ import im.vector.app.core.utils.LiveEvent
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import javax.inject.Inject
 
-class EmojiSearchResultFragment @Inject constructor(
-        private val epoxyController: EmojiSearchResultController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(), ReactionClickListener {
+@AndroidEntryPoint
+class EmojiSearchResultFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+        ReactionClickListener {
+
+    @Inject lateinit var epoxyController: EmojiSearchResultController
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
index 118017861c..cfbc2748ad 100644
--- a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
@@ -18,7 +18,7 @@ package im.vector.app.features.room
 
 import android.content.Context
 import im.vector.app.R
-import org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider
+import org.matrix.android.sdk.api.provider.RoomDisplayNameFallbackProvider
 import javax.inject.Inject
 
 class VectorRoomDisplayNameFallbackProvider @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
index e16e1ec313..e541e7f879 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
@@ -25,6 +25,7 @@ import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -36,12 +37,12 @@ import im.vector.app.core.utils.toast
 import im.vector.app.databinding.FragmentPublicRoomsBinding
 import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.permalink.NavigationInterceptor
+import im.vector.app.features.permalink.PermalinkFactory
 import im.vector.app.features.permalink.PermalinkHandler
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import reactivecircus.flowbinding.appcompat.queryTextChanges
 import timber.log.Timber
@@ -51,14 +52,16 @@ import javax.inject.Inject
  * What can be improved:
  * - When filtering more (when entering new chars), we could filter on result we already have, during the new server request, to avoid empty screen effect.
  */
-class PublicRoomsFragment @Inject constructor(
-        private val publicRoomsController: PublicRoomsController,
-        private val permalinkHandler: PermalinkHandler,
-        private val session: Session
-) : VectorBaseFragment<FragmentPublicRoomsBinding>(),
+@AndroidEntryPoint
+class PublicRoomsFragment :
+        VectorBaseFragment<FragmentPublicRoomsBinding>(),
         PublicRoomsController.Callback,
         VectorMenuProvider {
 
+    @Inject lateinit var publicRoomsController: PublicRoomsController
+    @Inject lateinit var permalinkHandler: PermalinkHandler
+    @Inject lateinit var permalinkFactory: PermalinkFactory
+
     private val viewModel: RoomDirectoryViewModel by activityViewModel()
     private lateinit var sharedActionViewModel: RoomDirectorySharedActionViewModel
 
@@ -125,9 +128,9 @@ class PublicRoomsFragment @Inject constructor(
 
     override fun onUnknownRoomClicked(roomIdOrAlias: String) {
         viewLifecycleOwner.lifecycleScope.launch {
-            val permalink = session.permalinkService().createPermalink(roomIdOrAlias)
+            val permalink = permalinkFactory.createPermalink(roomIdOrAlias)
             val isHandled = permalinkHandler
-                    .launch(requireContext(), permalink, object : NavigationInterceptor {
+                    .launch(requireActivity(), permalink, object : NavigationInterceptor {
                         override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?, rootThreadEventId: String?): Boolean {
                             requireActivity().finish()
                             return false
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
index d2b9b16086..171d51e811 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
@@ -29,6 +29,7 @@ import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
 import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
@@ -46,7 +47,7 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
     override fun initUiAndData() {
         if (isFirstCreation()) {
-            val fragmentArgs: CreateRoomArgs = intent?.extras?.getParcelable(Mavericks.KEY_ARG) ?: return
+            val fragmentArgs: CreateRoomArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return
             addFragment(
                     views.simpleFragmentContainer,
                     CreateRoomFragment::class.java,
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
index 71c83946d0..56d04aeaa1 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
@@ -67,6 +67,7 @@ class CreateRoomController @Inject constructor(
             enabled(enableFormElement)
             value(viewState.roomName)
             hint(host.stringProvider.getString(R.string.create_room_name_hint))
+            autoCapitalize(true)
 
             onTextChange { text ->
                 host.listener?.onNameChange(text)
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
index 649ba8fd13..59657aae35 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -30,14 +30,14 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelperFactory
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.time.Clock
 import im.vector.app.databinding.FragmentCreateRoomBinding
 import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.navigation.Navigator
@@ -61,28 +61,34 @@ data class CreateRoomArgs(
         val openAfterCreate: Boolean = true
 ) : Parcelable
 
-class CreateRoomFragment @Inject constructor(
-        private val createRoomController: CreateRoomController,
-        private val createSpaceController: CreateSubSpaceController,
-        colorProvider: ColorProvider,
-        clock: Clock,
-) : VectorBaseFragment<FragmentCreateRoomBinding>(),
+@AndroidEntryPoint
+class CreateRoomFragment :
+        VectorBaseFragment<FragmentCreateRoomBinding>(),
         CreateRoomController.Listener,
         GalleryOrCameraDialogHelper.Listener,
         OnBackPressed {
 
+    @Inject lateinit var createRoomController: CreateRoomController
+    @Inject lateinit var createSpaceController: CreateSubSpaceController
+    @Inject lateinit var galleryOrCameraDialogHelperFactory: GalleryOrCameraDialogHelperFactory
+
     private lateinit var sharedActionViewModel: RoomDirectorySharedActionViewModel
     private val viewModel: CreateRoomViewModel by fragmentViewModel()
     private val args: CreateRoomArgs by args()
 
     private lateinit var roomJoinRuleSharedActionViewModel: RoomJoinRuleSharedActionViewModel
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
+    private lateinit var galleryOrCameraDialogHelper: GalleryOrCameraDialogHelper
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentCreateRoomBinding {
         return FragmentCreateRoomBinding.inflate(inflater, container, false)
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        galleryOrCameraDialogHelper = galleryOrCameraDialogHelperFactory.create(this)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(RoomDirectorySharedActionViewModel::class.java)
@@ -94,7 +100,10 @@ class CreateRoomFragment @Inject constructor(
                 .allowBack(useCross = true)
         viewModel.observeViewEvents {
             when (it) {
-                CreateRoomViewEvents.Quit -> vectorBaseActivity.onBackPressed()
+                CreateRoomViewEvents.Quit -> {
+                    @Suppress("DEPRECATION")
+                    vectorBaseActivity.onBackPressed()
+                }
                 is CreateRoomViewEvents.Failure -> showFailure(it.throwable)
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
index 66e09bb2d4..32be4e076f 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -39,12 +40,14 @@ import im.vector.app.features.roomdirectory.RoomDirectoryViewModel
 import timber.log.Timber
 import javax.inject.Inject
 
-class RoomDirectoryPickerFragment @Inject constructor(
-        private val roomDirectoryPickerController: RoomDirectoryPickerController
-) : VectorBaseFragment<FragmentRoomDirectoryPickerBinding>(),
+@AndroidEntryPoint
+class RoomDirectoryPickerFragment :
+        VectorBaseFragment<FragmentRoomDirectoryPickerBinding>(),
         OnBackPressed,
         RoomDirectoryPickerController.Callback {
 
+    @Inject lateinit var roomDirectoryPickerController: RoomDirectoryPickerController
+
     private val viewModel: RoomDirectoryViewModel by activityViewModel()
     private lateinit var sharedActionViewModel: RoomDirectorySharedActionViewModel
     private val pickerViewModel: RoomDirectoryPickerViewModel by fragmentViewModel()
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
index b69788b1ed..a70fd5ef23 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
@@ -24,6 +24,7 @@ import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.roomdirectory.RoomDirectoryData
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
@@ -83,7 +84,7 @@ class RoomPreviewActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
     override fun initUiAndData() {
         if (isFirstCreation()) {
-            val args = intent.getParcelableExtra<RoomPreviewData>(ARG)
+            val args = intent.getParcelableExtraCompat<RoomPreviewData>(ARG)
 
             if (args?.worldReadable == true) {
                 // TODO Room preview: Note: M does not recommend to use /events anymore, so for now we just display the room preview
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
index 826dea0c3b..7c639dde99 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
@@ -30,6 +30,7 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.ButtonStateView
@@ -52,9 +53,11 @@ import javax.inject.Inject
 /**
  * Note: this Fragment is also used for world readable room for the moment.
  */
-class RoomPreviewNoPreviewFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer
-) : VectorBaseFragment<FragmentRoomPreviewNoPreviewBinding>() {
+@AndroidEntryPoint
+class RoomPreviewNoPreviewFragment :
+        VectorBaseFragment<FragmentRoomPreviewNoPreviewBinding>() {
+
+    @Inject lateinit var avatarRenderer: AvatarRenderer
 
     private val roomPreviewViewModel: RoomPreviewViewModel by fragmentViewModel()
     private val roomPreviewData: RoomPreviewData by args()
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
index 1b55207743..26a2a7de22 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
@@ -28,6 +28,7 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.room.RequireActiveMembershipViewEvents
 import im.vector.app.features.room.RequireActiveMembershipViewModel
+import im.vector.lib.core.utils.compat.getParcelableCompat
 
 @AndroidEntryPoint
 class RoomMemberProfileActivity : VectorBaseActivity<ActivitySimpleBinding>() {
@@ -48,7 +49,7 @@ class RoomMemberProfileActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
     override fun initUiAndData() {
         if (isFirstCreation()) {
-            val fragmentArgs: RoomMemberProfileArgs = intent?.extras?.getParcelable(Mavericks.KEY_ARG) ?: return
+            val fragmentArgs: RoomMemberProfileArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return
             addFragment(views.simpleFragmentContainer, RoomMemberProfileFragment::class.java, fragmentArgs)
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index 686c87a18c..65d28a5ceb 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -32,6 +32,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.animations.AppBarStateChangeListener
 import im.vector.app.core.animations.MatrixItemAppBarStateChangeListener
@@ -58,7 +59,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorPr
 import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
 import im.vector.app.features.roommemberprofile.powerlevel.EditPowerLevelDialogs
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import org.matrix.android.sdk.api.util.MatrixItem
 import javax.inject.Inject
@@ -69,15 +70,17 @@ data class RoomMemberProfileArgs(
         val roomId: String? = null
 ) : Parcelable
 
-class RoomMemberProfileFragment @Inject constructor(
-        private val roomMemberProfileController: RoomMemberProfileController,
-        private val avatarRenderer: AvatarRenderer,
-        private val roomDetailPendingActionStore: RoomDetailPendingActionStore,
-        private val matrixItemColorProvider: MatrixItemColorProvider
-) : VectorBaseFragment<FragmentMatrixProfileBinding>(),
+@AndroidEntryPoint
+class RoomMemberProfileFragment :
+        VectorBaseFragment<FragmentMatrixProfileBinding>(),
         RoomMemberProfileController.Callback,
         VectorMenuProvider {
 
+    @Inject lateinit var roomMemberProfileController: RoomMemberProfileController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var roomDetailPendingActionStore: RoomDetailPendingActionStore
+    @Inject lateinit var matrixItemColorProvider: MatrixItemColorProvider
+
     private lateinit var headerViews: ViewStubRoomMemberProfileHeaderBinding
 
     private val fragmentArgs: RoomMemberProfileArgs by args()
@@ -232,23 +235,27 @@ class RoomMemberProfileFragment @Inject constructor(
                         if (state.userMXCrossSigningInfo.isTrusted()) {
                             // User is trusted
                             if (state.allDevicesAreCrossSignedTrusted) {
-                                RoomEncryptionTrustLevel.Trusted
+                                UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED
                             } else {
-                                RoomEncryptionTrustLevel.Warning
+                                UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED
                             }
                         } else {
-                            RoomEncryptionTrustLevel.Default
+                            if (state.userMXCrossSigningInfo.wasTrustedOnce) {
+                                UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY
+                            } else {
+                                UserVerificationLevel.WAS_NEVER_VERIFIED
+                            }
                         }
                     } else {
                         // Legacy
                         if (state.allDevicesAreTrusted) {
-                            RoomEncryptionTrustLevel.Trusted
+                            UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED
                         } else {
-                            RoomEncryptionTrustLevel.Warning
+                            UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED
                         }
                     }
-                    headerViews.memberProfileDecorationImageView.render(trustLevel)
-                    views.matrixProfileDecorationToolbarAvatarImageView.render(trustLevel)
+                    headerViews.memberProfileDecorationImageView.renderUser(trustLevel)
+                    views.matrixProfileDecorationToolbarAvatarImageView.renderUser(trustLevel)
                 } else {
                     headerViews.memberProfileDecorationImageView.isVisible = false
                 }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
index 92687e1a37..eb23c5654e 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
@@ -29,11 +29,13 @@ import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.SingletonEntryPoint
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.flow.flow
@@ -42,7 +44,6 @@ data class DeviceListViewState(
         val userId: String,
         val allowDeviceAction: Boolean,
         val userItem: MatrixItem? = null,
-        val isMine: Boolean = false,
         val memberCrossSigningKey: MXCrossSigningInfo? = null,
         val cryptoDevices: Async<List<CryptoDeviceInfo>> = Loading(),
         val selectedDevice: CryptoDeviceInfo? = null
@@ -61,23 +62,19 @@ class DeviceListBottomSheetViewModel @AssistedInject constructor(
 
     companion object : MavericksViewModelFactory<DeviceListBottomSheetViewModel, DeviceListViewState> by hiltMavericksViewModelFactory() {
 
-        override fun initialState(viewModelContext: ViewModelContext): DeviceListViewState? {
+        override fun initialState(viewModelContext: ViewModelContext): DeviceListViewState {
             val args = viewModelContext.args<DeviceListBottomSheet.Args>()
             val userId = args.userId
             val session = EntryPoints.get(viewModelContext.app(), SingletonEntryPoint::class.java).activeSessionHolder().getActiveSession()
-            return session.getUser(userId)?.toMatrixItem()?.let {
-                DeviceListViewState(
-                        userId = userId,
-                        allowDeviceAction = args.allowDeviceAction,
-                        userItem = it,
-                        isMine = userId == session.myUserId
-                )
-            } ?: return super.initialState(viewModelContext)
+            return DeviceListViewState(
+                    userId = userId,
+                    allowDeviceAction = args.allowDeviceAction,
+                    userItem = session.getUserOrDefault(userId).toMatrixItem(),
+            )
         }
     }
 
     init {
-
         session.flow().liveUserCryptoDevices(initialState.userId)
                 .execute {
                     copy(cryptoDevices = it).also {
@@ -89,6 +86,16 @@ class DeviceListBottomSheetViewModel @AssistedInject constructor(
                 .execute {
                     copy(memberCrossSigningKey = it.invoke()?.getOrNull())
                 }
+
+        updateMatrixItem()
+    }
+
+    private fun updateMatrixItem() {
+        viewModelScope.launch {
+            tryOrNull { session.userService().resolveUser(initialState.userId) }
+                    ?.toMatrixItem()
+                    ?.let { setState { copy(userItem = it) } }
+        }
     }
 
     override fun handle(action: DeviceListAction) {
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt
index 48a8a819bc..7ca32bb49b 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -30,12 +31,14 @@ import im.vector.app.databinding.BottomSheetGenericListBinding
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import javax.inject.Inject
 
-class DeviceListFragment @Inject constructor(
-        val dimensionConverter: DimensionConverter,
-        val epoxyController: DeviceListEpoxyController
-) : VectorBaseFragment<BottomSheetGenericListBinding>(),
+@AndroidEntryPoint
+class DeviceListFragment :
+        VectorBaseFragment<BottomSheetGenericListBinding>(),
         DeviceListEpoxyController.InteractionListener {
 
+    @Inject lateinit var dimensionConverter: DimensionConverter
+    @Inject lateinit var epoxyController: DeviceListEpoxyController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetGenericListBinding {
         return BottomSheetGenericListBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
index a733197372..d8abd91091 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
@@ -30,12 +31,14 @@ import im.vector.app.databinding.BottomSheetGenericListBinding
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import javax.inject.Inject
 
-class DeviceTrustInfoActionFragment @Inject constructor(
-        val dimensionConverter: DimensionConverter,
-        val epoxyController: DeviceTrustInfoEpoxyController
-) : VectorBaseFragment<BottomSheetGenericListBinding>(),
+@AndroidEntryPoint
+class DeviceTrustInfoActionFragment :
+        VectorBaseFragment<BottomSheetGenericListBinding>(),
         DeviceTrustInfoEpoxyController.InteractionListener {
 
+    @Inject lateinit var dimensionConverter: DimensionConverter
+    @Inject lateinit var epoxyController: DeviceTrustInfoEpoxyController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetGenericListBinding {
         return BottomSheetGenericListBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
index 22b040b4c0..44bac1c8a0 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
@@ -27,4 +27,5 @@ sealed class RoomProfileAction : VectorViewModelAction {
     object ShareRoomProfile : RoomProfileAction()
     object CreateShortcut : RoomProfileAction()
     object RestoreEncryptionState : RoomProfileAction()
+    data class SetEncryptToVerifiedDeviceOnly(val enabled: Boolean) : RoomProfileAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
index 12f1db1366..526d676dee 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
@@ -38,6 +38,7 @@ import im.vector.app.features.roomprofile.notifications.RoomNotificationSettings
 import im.vector.app.features.roomprofile.permissions.RoomPermissionsFragment
 import im.vector.app.features.roomprofile.settings.RoomSettingsFragment
 import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
@@ -68,8 +69,7 @@ class RoomProfileActivity :
 
     private val requireActiveMembershipViewModel: RequireActiveMembershipViewModel by viewModel()
 
-    @Inject
-    lateinit var roomDetailPendingActionStore: RoomDetailPendingActionStore
+    @Inject lateinit var roomDetailPendingActionStore: RoomDetailPendingActionStore
 
     override fun getBinding(): ActivitySimpleBinding {
         return ActivitySimpleBinding.inflate(layoutInflater)
@@ -77,7 +77,7 @@ class RoomProfileActivity :
 
     override fun initUiAndData() {
         sharedActionViewModel = viewModelProvider.get(RoomProfileSharedActionViewModel::class.java)
-        roomProfileArgs = intent?.extras?.getParcelable(Mavericks.KEY_ARG) ?: return
+        roomProfileArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return
         if (isFirstCreation()) {
             when (intent?.extras?.getInt(EXTRA_DIRECT_ACCESS, EXTRA_DIRECT_ACCESS_ROOM_ROOT)) {
                 EXTRA_DIRECT_ACCESS_ROOM_SETTINGS -> {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 06f56bff89..eb43a345f2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -27,6 +27,7 @@ import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericPositiveButtonItem
+import im.vector.app.features.form.formSwitchItem
 import im.vector.app.features.home.ShortcutCreator
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
@@ -66,6 +67,8 @@ class RoomProfileController @Inject constructor(
         fun onUrlInTopicLongClicked(url: String)
         fun doMigrateToVersion(newVersion: String)
         fun restoreEncryptionState()
+        fun setEncryptedToVerifiedDevicesOnly(enabled: Boolean)
+        fun openGlobalBlockSettings()
     }
 
     override fun buildModels(data: RoomProfileViewState?) {
@@ -175,6 +178,53 @@ class RoomProfileController @Inject constructor(
         }
         buildEncryptionAction(data.actionPermissions, roomSummary)
 
+        if (roomSummary.isEncrypted && !encryptionMisconfigured) {
+            data.globalCryptoConfig.invoke()?.let { globalConfig ->
+                if (globalConfig.globalBlockUnverifiedDevices) {
+                    genericFooterItem {
+                        id("globalConfig")
+                        centered(false)
+                        text(
+                                span {
+                                    +host.stringProvider.getString(R.string.room_settings_global_block_unverified_info_text)
+                                    apply {
+                                        if (data.unverifiedDevicesInTheRoom.invoke() == true) {
+                                            +"\n"
+                                            +host.stringProvider.getString(R.string.some_devices_will_not_be_able_to_decrypt)
+                                        }
+                                    }
+                                }.toEpoxyCharSequence()
+                        )
+                        itemClickAction {
+                            host.callback?.openGlobalBlockSettings()
+                        }
+                    }
+                } else {
+                    // per room setting is available
+                    val shouldBlockUnverified = data.encryptToVerifiedDeviceOnly.invoke()
+                    formSwitchItem {
+                        id("send_to_unverified")
+                        enabled(shouldBlockUnverified != null)
+                        title(host.stringProvider.getString(R.string.encryption_never_send_to_unverified_devices_in_room))
+
+                        switchChecked(shouldBlockUnverified ?: false)
+
+                        apply {
+                            if (shouldBlockUnverified == true && data.unverifiedDevicesInTheRoom.invoke() == true) {
+                                summary(
+                                        host.stringProvider.getString(R.string.some_devices_will_not_be_able_to_decrypt)
+                                )
+                            } else {
+                                summary(null)
+                            }
+                        }
+                        listener { value ->
+                            host.callback?.setEncryptedToVerifiedDevicesOnly(value)
+                        }
+                    }
+                }
+            }
+        }
         // More
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
         buildProfileAction(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 1830cc04e8..f4394111ab 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -31,6 +31,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.animations.AppBarStateChangeListener
 import im.vector.app.core.animations.MatrixItemAppBarStateChangeListener
@@ -52,6 +53,7 @@ import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.home.room.detail.upgrade.MigrateRoomBottomSheet
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
+import im.vector.app.features.navigation.SettingsActivityPayload
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.parcelize.Parcelize
@@ -65,15 +67,16 @@ data class RoomProfileArgs(
         val roomId: String
 ) : Parcelable
 
-class RoomProfileFragment @Inject constructor(
-        private val roomProfileController: RoomProfileController,
-        private val avatarRenderer: AvatarRenderer,
-        private val roomDetailPendingActionStore: RoomDetailPendingActionStore,
-) :
+@AndroidEntryPoint
+class RoomProfileFragment :
         VectorBaseFragment<FragmentMatrixProfileBinding>(),
         RoomProfileController.Callback,
         VectorMenuProvider {
 
+    @Inject lateinit var roomProfileController: RoomProfileController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var roomDetailPendingActionStore: RoomDetailPendingActionStore
+
     private lateinit var headerViews: ViewStubRoomProfileHeaderBinding
 
     private val roomProfileArgs: RoomProfileArgs by args()
@@ -344,6 +347,14 @@ class RoomProfileFragment @Inject constructor(
         )
     }
 
+    override fun setEncryptedToVerifiedDevicesOnly(enabled: Boolean) {
+        roomProfileViewModel.handle(RoomProfileAction.SetEncryptToVerifiedDeviceOnly(enabled))
+    }
+
+    override fun openGlobalBlockSettings() {
+        navigator.openSettings(requireContext(), SettingsActivityPayload.SecurityPrivacy)
+    }
+
     private fun onAvatarClicked(view: View) = withState(roomProfileViewModel) { state ->
         state.roomSummary()?.toMatrixItem()?.let { matrixItem ->
             navigator.openBigImageViewer(requireActivity(), view, matrixItem)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
index 30664c5618..215a1e1e9c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
@@ -17,6 +17,7 @@
 
 package im.vector.app.features.roomprofile
 
+import androidx.lifecycle.asFlow
 import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -32,7 +33,11 @@ import im.vector.app.features.home.ShortcutCreator
 import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
 import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.QueryStringValue
@@ -76,6 +81,45 @@ class RoomProfileViewModel @AssistedInject constructor(
         observeBannedRoomMembers(flowRoom)
         observePermissions()
         observePowerLevels()
+        observeCryptoSettings(flowRoom)
+    }
+
+    private fun observeCryptoSettings(flowRoom: FlowRoom) {
+        val perRoomBlockStatus = session.cryptoService().getLiveBlockUnverifiedDevices(initialState.roomId)
+                .asFlow()
+
+        perRoomBlockStatus
+                .execute {
+                    copy(encryptToVerifiedDeviceOnly = it)
+                }
+
+        val globalBlockStatus = session.cryptoService().getLiveGlobalCryptoConfig()
+                .asFlow()
+
+        globalBlockStatus
+                .execute {
+                    copy(globalCryptoConfig = it)
+                }
+
+        perRoomBlockStatus.combine(globalBlockStatus) { perRoom, global ->
+            perRoom || global.globalBlockUnverifiedDevices
+        }.flatMapLatest {
+            if (it) {
+                flowRoom.liveRoomMembers(roomMemberQueryParams { memberships = Membership.activeMemberships() })
+                        .map { it.map { it.userId } }
+                        .flatMapLatest {
+                            session.cryptoService().getLiveCryptoDeviceInfo(it).asFlow()
+                        }
+            } else {
+                flowOf(emptyList())
+            }
+        }.map {
+            it.isNotEmpty()
+        }.execute {
+            copy(
+                    unverifiedDevicesInTheRoom = it
+            )
+        }
     }
 
     private fun observePowerLevels() {
@@ -141,6 +185,7 @@ class RoomProfileViewModel @AssistedInject constructor(
             is RoomProfileAction.ShareRoomProfile -> handleShareRoomProfile()
             RoomProfileAction.CreateShortcut -> handleCreateShortcut()
             RoomProfileAction.RestoreEncryptionState -> restoreEncryptionState()
+            is RoomProfileAction.SetEncryptToVerifiedDeviceOnly -> setEncryptToVerifiedDeviceOnly(action.enabled)
         }
     }
 
@@ -212,6 +257,12 @@ class RoomProfileViewModel @AssistedInject constructor(
                 }
     }
 
+    private fun setEncryptToVerifiedDeviceOnly(enabled: Boolean) {
+        session.coroutineScope.launch {
+            session.cryptoService().setRoomBlockUnverifiedDevices(room.roomId, enabled)
+        }
+    }
+
     private fun restoreEncryptionState() {
         _viewEvents.post(RoomProfileViewEvents.Loading())
         session.coroutineScope.launch {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
index 87db15ea3b..5393ceb152 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
@@ -20,6 +20,7 @@ package im.vector.app.features.roomprofile
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.crypto.GlobalCryptoConfig
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
@@ -35,7 +36,10 @@ data class RoomProfileViewState(
         val recommendedRoomVersion: String? = null,
         val canUpgradeRoom: Boolean = false,
         val isTombstoned: Boolean = false,
-        val canUpdateRoomState: Boolean = false
+        val canUpdateRoomState: Boolean = false,
+        val encryptToVerifiedDeviceOnly: Async<Boolean> = Uninitialized,
+        val globalCryptoConfig: Async<GlobalCryptoConfig> = Uninitialized,
+        val unverifiedDevicesInTheRoom: Async<Boolean> = Uninitialized,
 ) : MavericksState {
 
     constructor(args: RoomProfileArgs) : this(roomId = args.roomId)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
index 49f658861b..b9b0f604c7 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
@@ -26,6 +26,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -46,13 +47,14 @@ import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class RoomAliasFragment @Inject constructor(
-        private val controller: RoomAliasController,
-        private val avatarRenderer: AvatarRenderer
-) :
+@AndroidEntryPoint
+class RoomAliasFragment :
         VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         RoomAliasController.Callback {
 
+    @Inject lateinit var controller: RoomAliasController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+
     private val viewModel: RoomAliasViewModel by fragmentViewModel()
     private lateinit var sharedActionViewModel: RoomAliasBottomSheetSharedActionViewModel
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
index 8063212ba1..a8e34d0117 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
@@ -26,6 +26,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -38,12 +39,14 @@ import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class RoomBannedMemberListFragment @Inject constructor(
-        private val roomMemberListController: RoomBannedMemberListController,
-        private val avatarRenderer: AvatarRenderer
-) : VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
+@AndroidEntryPoint
+class RoomBannedMemberListFragment :
+        VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         RoomBannedMemberListController.Callback {
 
+    @Inject lateinit var roomMemberListController: RoomBannedMemberListController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+
     private val viewModel: RoomBannedMemberListViewModel by fragmentViewModel()
     private val roomProfileArgs: RoomProfileArgs by args()
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index 8f310a6a89..9adfeb2a0e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -129,7 +129,7 @@ class RoomMemberListController @Inject constructor(
             id(roomMember.userId)
             matrixItem(roomMember.toMatrixItem())
             avatarRenderer(host.avatarRenderer)
-            userEncryptionTrustLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
+            userVerificationLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
             clickListener {
                 host.callback?.onRoomMemberClicked(roomMember)
             }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 52a2339f13..8ed8db8c6b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -28,6 +28,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -43,12 +44,14 @@ import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class RoomMemberListFragment @Inject constructor(
-        private val roomMemberListController: RoomMemberListController,
-        private val avatarRenderer: AvatarRenderer
-) : VectorBaseFragment<FragmentRoomMemberListBinding>(),
+@AndroidEntryPoint
+class RoomMemberListFragment :
+        VectorBaseFragment<FragmentRoomMemberListBinding>(),
         RoomMemberListController.Callback {
 
+    @Inject lateinit var roomMemberListController: RoomMemberListController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+
     private val viewModel: RoomMemberListViewModel by fragmentViewModel()
     private val roomProfileArgs: RoomProfileArgs by args()
 
@@ -73,7 +76,7 @@ class RoomMemberListFragment @Inject constructor(
 
     private fun setupInviteUsersButton() {
         views.inviteUsersButton.debouncedClicks {
-            navigator.openInviteUsersToRoom(requireContext(), roomProfileArgs.roomId)
+            navigator.openInviteUsersToRoom(requireActivity(), roomProfileArgs.roomId)
         }
         // Hide FAB when list is scrolling
         views.roomSettingGeneric.roomSettingsRecyclerView.addOnScrollListener(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index 915ce51d91..9ddcde7e4a 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -37,7 +37,8 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
@@ -116,14 +117,7 @@ class RoomMemberListViewModel @AssistedInject constructor(
                                 .map { deviceList ->
                                     // If any key change, emit the userIds list
                                     deviceList.groupBy { it.userId }.mapValues {
-                                        val allDeviceTrusted = it.value.fold(it.value.isNotEmpty()) { prev, next ->
-                                            prev && next.trustLevel?.isCrossSigningVerified().orFalse()
-                                        }
-                                        if (session.cryptoService().crossSigningService().getUserCrossSigningKeys(it.key)?.isTrusted().orFalse()) {
-                                            if (allDeviceTrusted) RoomEncryptionTrustLevel.Trusted else RoomEncryptionTrustLevel.Warning
-                                        } else {
-                                            RoomEncryptionTrustLevel.Default
-                                        }
+                                        getUserTrustLevel(it.key, it.value)
                                     }
                                 }
                     }
@@ -133,6 +127,29 @@ class RoomMemberListViewModel @AssistedInject constructor(
         }
     }
 
+    private fun getUserTrustLevel(userId: String, devices: List<CryptoDeviceInfo>): UserVerificationLevel {
+        val allDeviceTrusted = devices.fold(devices.isNotEmpty()) { prev, next ->
+            prev && next.trustLevel?.isCrossSigningVerified().orFalse()
+        }
+        val mxCrossSigningInfo = session.cryptoService().crossSigningService().getUserCrossSigningKeys(userId)
+        return when {
+            mxCrossSigningInfo == null -> {
+                UserVerificationLevel.WAS_NEVER_VERIFIED
+            }
+            mxCrossSigningInfo.isTrusted() -> {
+                if (allDeviceTrusted) UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED
+                else UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED
+            }
+            else -> {
+                if (mxCrossSigningInfo.wasTrustedOnce) {
+                    UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY
+                } else {
+                    UserVerificationLevel.WAS_NEVER_VERIFIED
+                }
+            }
+        }
+    }
+
     private fun observePowerLevel() {
         PowerLevelsFlowFactory(room).createFlow()
                 .onEach {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
index 3cea47e60d..7861970c28 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
@@ -23,7 +23,7 @@ import com.airbnb.mvrx.Uninitialized
 import im.vector.app.R
 import im.vector.app.core.platform.GenericIdArgs
 import im.vector.app.features.roomprofile.RoomProfileArgs
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -36,7 +36,7 @@ data class RoomMemberListViewState(
         val ignoredUserIds: List<String> = emptyList(),
         val filter: String = "",
         val threePidInvites: Async<List<Event>> = Uninitialized,
-        val trustLevelMap: Async<Map<String, RoomEncryptionTrustLevel?>> = Uninitialized,
+        val trustLevelMap: Async<Map<String, UserVerificationLevel>> = Uninitialized,
         val actionsPermissions: ActionPermissions = ActionPermissions()
 ) : MavericksState {
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt
index 1bf392d9f8..7afd696332 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -35,13 +36,15 @@ import org.matrix.android.sdk.api.session.room.notification.RoomNotificationStat
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class RoomNotificationSettingsFragment @Inject constructor(
-        val viewModelFactory: RoomNotificationSettingsViewModel.Factory,
-        private val roomNotificationSettingsController: RoomNotificationSettingsController,
-        private val avatarRenderer: AvatarRenderer
-) : VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
+@AndroidEntryPoint
+class RoomNotificationSettingsFragment :
+        VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         RoomNotificationSettingsController.Callback {
 
+    @Inject lateinit var viewModelFactory: RoomNotificationSettingsViewModel.Factory
+    @Inject lateinit var roomNotificationSettingsController: RoomNotificationSettingsController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+
     private val viewModel: RoomNotificationSettingsViewModel by fragmentViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRoomSettingGenericBinding {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt
index dc42310c16..06b9343dbf 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt
@@ -24,6 +24,7 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -38,13 +39,14 @@ import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class RoomPermissionsFragment @Inject constructor(
-        private val controller: RoomPermissionsController,
-        private val avatarRenderer: AvatarRenderer
-) :
+@AndroidEntryPoint
+class RoomPermissionsFragment :
         VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         RoomPermissionsController.Callback {
 
+    @Inject lateinit var controller: RoomPermissionsController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+
     private val viewModel: RoomPermissionsViewModel by fragmentViewModel()
 
     private val roomProfileArgs: RoomProfileArgs by args()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index 31c3e86671..f8efe73ebf 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -91,6 +91,7 @@ class RoomSettingsController @Inject constructor(
             enabled(data.actionPermissions.canChangeName)
             value(data.newName ?: roomSummary.displayName)
             hint(host.stringProvider.getString(R.string.room_settings_name_hint))
+            autoCapitalize(true)
 
             onTextChange { text ->
                 host.callback?.onNameChanged(text)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index 45c8461fa7..26da1a45d2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -29,16 +29,16 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelperFactory
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.platform.VectorMenuProvider
-import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.FragmentRoomSettingGenericBinding
 import im.vector.app.features.analytics.plan.MobileScreen
@@ -56,25 +56,25 @@ import org.matrix.android.sdk.api.util.toMatrixItem
 import java.util.UUID
 import javax.inject.Inject
 
-class RoomSettingsFragment @Inject constructor(
-        private val controller: RoomSettingsController,
-        colorProvider: ColorProvider,
-        private val avatarRenderer: AvatarRenderer,
-        clock: Clock,
-) :
+@AndroidEntryPoint
+class RoomSettingsFragment :
         VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         RoomSettingsController.Callback,
         OnBackPressed,
         GalleryOrCameraDialogHelper.Listener,
         VectorMenuProvider {
 
+    @Inject lateinit var controller: RoomSettingsController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var galleryOrCameraDialogHelperFactory: GalleryOrCameraDialogHelperFactory
+
     private val viewModel: RoomSettingsViewModel by fragmentViewModel()
     private lateinit var roomProfileSharedActionViewModel: RoomProfileSharedActionViewModel
     private lateinit var roomHistoryVisibilitySharedActionViewModel: RoomHistoryVisibilitySharedActionViewModel
     private lateinit var roomJoinRuleSharedActionViewModel: RoomJoinRuleSharedActionViewModel
 
     private val roomProfileArgs: RoomProfileArgs by args()
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
+    private lateinit var galleryOrCameraDialogHelper: GalleryOrCameraDialogHelper
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRoomSettingGenericBinding {
         return FragmentRoomSettingGenericBinding.inflate(inflater, container, false)
@@ -85,6 +85,7 @@ class RoomSettingsFragment @Inject constructor(
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         analyticsScreenName = MobileScreen.ScreenName.RoomSettings
+        galleryOrCameraDialogHelper = galleryOrCameraDialogHelperFactory.create(this)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -105,6 +106,7 @@ class RoomSettingsFragment @Inject constructor(
                 RoomSettingsViewEvents.Success -> showSuccess()
                 RoomSettingsViewEvents.GoBack -> {
                     ignoreChanges = true
+                    @Suppress("DEPRECATION")
                     vectorBaseActivity.onBackPressed()
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index 81e98335c0..10465b03ea 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -45,7 +45,7 @@ data class RoomSettingsViewState(
         val showSaveAction: Boolean = false,
         val actionPermissions: ActionPermissions = ActionPermissions(),
         val supportsRestricted: Boolean = false,
-        val canUpgradeToRestricted: Boolean = false
+        val canUpgradeToRestricted: Boolean = false,
 ) : MavericksState {
 
     constructor(args: RoomProfileArgs) : this(roomId = args.roomId)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt
index e7b0087755..818300ac72 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt
@@ -29,7 +29,6 @@ import com.airbnb.mvrx.viewModel
 import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.toMvRxBundle
@@ -43,7 +42,7 @@ import im.vector.app.features.roomprofile.settings.joinrule.advanced.RoomJoinRul
 import im.vector.app.features.roomprofile.settings.joinrule.advanced.RoomJoinRuleChooseRestrictedFragment
 import im.vector.app.features.roomprofile.settings.joinrule.advanced.RoomJoinRuleChooseRestrictedState
 import im.vector.app.features.roomprofile.settings.joinrule.advanced.RoomJoinRuleChooseRestrictedViewModel
-import javax.inject.Inject
+import im.vector.lib.core.utils.compat.getParcelableCompat
 
 @AndroidEntryPoint
 class RoomJoinRuleActivity : VectorBaseActivity<ActivitySimpleBinding>() {
@@ -52,13 +51,10 @@ class RoomJoinRuleActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
     private lateinit var roomProfileArgs: RoomProfileArgs
 
-    @Inject
-    lateinit var errorFormatter: ErrorFormatter
-
     val viewModel: RoomJoinRuleChooseRestrictedViewModel by viewModel()
 
     override fun initUiAndData() {
-        roomProfileArgs = intent?.extras?.getParcelable(Mavericks.KEY_ARG) ?: return
+        roomProfileArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return
         if (isFirstCreation()) {
             addFragment(
                     views.simpleFragmentContainer,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt
index 4e42cce3ee..1c4f93f49a 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt
@@ -25,6 +25,7 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -37,11 +38,14 @@ import im.vector.app.features.roomprofile.settings.joinrule.advanced.RoomJoinRul
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import javax.inject.Inject
 
-class RoomJoinRuleFragment @Inject constructor(
-        val controller: RoomJoinRuleAdvancedController,
-        val avatarRenderer: AvatarRenderer
-) : VectorBaseFragment<FragmentJoinRulesRecyclerBinding>(),
-        OnBackPressed, RoomJoinRuleAdvancedController.InteractionListener {
+@AndroidEntryPoint
+class RoomJoinRuleFragment :
+        VectorBaseFragment<FragmentJoinRulesRecyclerBinding>(),
+        OnBackPressed,
+        RoomJoinRuleAdvancedController.InteractionListener {
+
+    @Inject lateinit var controller: RoomJoinRuleAdvancedController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
 
     private val viewModel: RoomJoinRuleChooseRestrictedViewModel by activityViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedFragment.kt
index b65e90aeed..462f3be1c3 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.OnBackPressed
@@ -36,13 +37,15 @@ import org.matrix.android.sdk.api.util.MatrixItem
 import reactivecircus.flowbinding.appcompat.queryTextChanges
 import javax.inject.Inject
 
-class RoomJoinRuleChooseRestrictedFragment @Inject constructor(
-        val controller: ChooseRestrictedController,
-        val avatarRenderer: AvatarRenderer
-) : VectorBaseFragment<FragmentSpaceRestrictedSelectBinding>(),
+@AndroidEntryPoint
+class RoomJoinRuleChooseRestrictedFragment :
+        VectorBaseFragment<FragmentSpaceRestrictedSelectBinding>(),
         ChooseRestrictedController.Listener,
         OnBackPressed {
 
+    @Inject lateinit var controller: ChooseRestrictedController
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+
     private val viewModel: RoomJoinRuleChooseRestrictedViewModel by activityViewModel(RoomJoinRuleChooseRestrictedViewModel::class)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
index 3ecbcb5e00..d982ab3e32 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
@@ -27,6 +27,7 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.tabs.TabLayoutMediator
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.platform.VectorBaseFragment
@@ -42,11 +43,13 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class RoomUploadsFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer,
-        private val notificationUtils: NotificationUtils,
-        private val clock: Clock,
-) : VectorBaseFragment<FragmentRoomUploadsBinding>() {
+@AndroidEntryPoint
+class RoomUploadsFragment :
+        VectorBaseFragment<FragmentRoomUploadsBinding>() {
+
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var notificationUtils: NotificationUtils
+    @Inject lateinit var clock: Clock
 
     private val roomProfileArgs: RoomProfileArgs by args()
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
index 87dff2f00b..a71490f4a7 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
@@ -26,10 +26,12 @@ import dagger.assisted.AssistedInject
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.voicebroadcast.isVoiceBroadcast
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
 import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.unwrap
 
@@ -78,6 +80,8 @@ class RoomUploadsViewModel @AssistedInject constructor(
                 token = result.nextToken
 
                 val groupedUploadEvents = result.uploadEvents
+                        // Remove voice broadcast chunks from the attachments
+                        .filterNot { it.root.asMessageAudioEvent().isVoiceBroadcast() }
                         .groupBy {
                             it.contentWithAttachmentContent.msgType == MessageType.MSGTYPE_IMAGE ||
                                     it.contentWithAttachmentContent.msgType == MessageType.MSGTYPE_VIDEO
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
index 5bb81424cf..e7ee47020a 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
@@ -26,6 +26,7 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -38,12 +39,14 @@ import im.vector.app.features.roomprofile.uploads.RoomUploadsViewModel
 import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
 import javax.inject.Inject
 
-class RoomUploadsFilesFragment @Inject constructor(
-        private val controller: UploadsFileController
-) : VectorBaseFragment<FragmentGenericStateViewRecyclerBinding>(),
+@AndroidEntryPoint
+class RoomUploadsFilesFragment :
+        VectorBaseFragment<FragmentGenericStateViewRecyclerBinding>(),
         UploadsFileController.Listener,
         StateView.EventCallback {
 
+    @Inject lateinit var controller: UploadsFileController
+
     private val uploadsViewModel by parentFragmentViewModel(RoomUploadsViewModel::class)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericStateViewRecyclerBinding {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
index c6dd3c63c1..98a28557ae 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
@@ -32,6 +32,7 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.appbar.AppBarLayout
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.trackItemsVisibilityChange
@@ -53,13 +54,15 @@ import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
 import org.matrix.android.sdk.api.session.room.model.message.getThumbnailUrl
 import javax.inject.Inject
 
-class RoomUploadsMediaFragment @Inject constructor(
-        private val controller: UploadsMediaController,
-        private val dimensionConverter: DimensionConverter
-) : VectorBaseFragment<FragmentGenericStateViewRecyclerBinding>(),
+@AndroidEntryPoint
+class RoomUploadsMediaFragment :
+        VectorBaseFragment<FragmentGenericStateViewRecyclerBinding>(),
         UploadsMediaController.Listener,
         StateView.EventCallback {
 
+    @Inject lateinit var controller: UploadsMediaController
+    @Inject lateinit var dimensionConverter: DimensionConverter
+
     private val uploadsViewModel by parentFragmentViewModel(RoomUploadsViewModel::class)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericStateViewRecyclerBinding {
@@ -79,15 +82,18 @@ class RoomUploadsMediaFragment @Inject constructor(
         controller.listener = this
     }
 
-    @Suppress("DEPRECATION")
     private fun getNumberOfColumns(): Int {
-        val displayMetrics = DisplayMetrics()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            requireContext().display?.getMetrics(displayMetrics)
+        val screenWidthInPx = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val a = requireActivity().windowManager.currentWindowMetrics
+            a.bounds.width()
         } else {
+            val displayMetrics = DisplayMetrics()
+            @Suppress("DEPRECATION")
             requireActivity().windowManager.defaultDisplay.getMetrics(displayMetrics)
+            displayMetrics.widthPixels
         }
-        return dimensionConverter.pxToDp(displayMetrics.widthPixels) / IMAGE_SIZE_DP
+        val screenWidthInDp = dimensionConverter.pxToDp(screenWidthInPx)
+        return screenWidthInDp / IMAGE_SIZE_DP
     }
 
     override fun onDestroyView() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/FontScalePreferences.kt b/vector/src/main/java/im/vector/app/features/settings/FontScalePreferences.kt
index 292d0107ba..34862adc4f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/FontScalePreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/FontScalePreferences.kt
@@ -57,6 +57,16 @@ interface FontScalePreferences {
      * @return list of values
      */
     fun getAvailableScales(): List<FontScaleValue>
+
+    companion object {
+        const val SCALE_TINY = 0.70f
+        const val SCALE_SMALL = 0.85f
+        const val SCALE_NORMAL = 1.00f
+        const val SCALE_LARGE = 1.15f
+        const val SCALE_LARGER = 1.30f
+        const val SCALE_LARGEST = 1.45f
+        const val SCALE_HUGE = 1.60f
+    }
 }
 
 /**
@@ -73,13 +83,13 @@ class FontScalePreferencesImpl @Inject constructor(
     }
 
     private val fontScaleValues = listOf(
-            FontScaleValue(0, "FONT_SCALE_TINY", 0.70f, R.string.tiny),
-            FontScaleValue(1, "FONT_SCALE_SMALL", 0.85f, R.string.small),
-            FontScaleValue(2, "FONT_SCALE_NORMAL", 1.00f, R.string.normal),
-            FontScaleValue(3, "FONT_SCALE_LARGE", 1.15f, R.string.large),
-            FontScaleValue(4, "FONT_SCALE_LARGER", 1.30f, R.string.larger),
-            FontScaleValue(5, "FONT_SCALE_LARGEST", 1.45f, R.string.largest),
-            FontScaleValue(6, "FONT_SCALE_HUGE", 1.60f, R.string.huge)
+            FontScaleValue(0, "FONT_SCALE_TINY", FontScalePreferences.SCALE_TINY, R.string.tiny),
+            FontScaleValue(1, "FONT_SCALE_SMALL", FontScalePreferences.SCALE_SMALL, R.string.small),
+            FontScaleValue(2, "FONT_SCALE_NORMAL", FontScalePreferences.SCALE_NORMAL, R.string.normal),
+            FontScaleValue(3, "FONT_SCALE_LARGE", FontScalePreferences.SCALE_LARGE, R.string.large),
+            FontScaleValue(4, "FONT_SCALE_LARGER", FontScalePreferences.SCALE_LARGER, R.string.larger),
+            FontScaleValue(5, "FONT_SCALE_LARGEST", FontScalePreferences.SCALE_LARGEST, R.string.largest),
+            FontScaleValue(6, "FONT_SCALE_HUGE", FontScalePreferences.SCALE_HUGE, R.string.huge)
     )
 
     private val normalFontScaleValue = fontScaleValues[2]
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
index 4666d586d3..b1a3fa9566 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
@@ -17,30 +17,40 @@
 package im.vector.app.features.settings
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.content.res.Configuration
 import androidx.core.content.edit
 import im.vector.app.R
-import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.di.DefaultPreferences
 import im.vector.app.core.resources.BuildMeta
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.util.IllformedLocaleException
 import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
 
 /**
  * Object to manage the Locale choice of the user.
  */
-object VectorLocale {
-    private const val APPLICATION_LOCALE_COUNTRY_KEY = "APPLICATION_LOCALE_COUNTRY_KEY"
-    private const val APPLICATION_LOCALE_VARIANT_KEY = "APPLICATION_LOCALE_VARIANT_KEY"
-    private const val APPLICATION_LOCALE_LANGUAGE_KEY = "APPLICATION_LOCALE_LANGUAGE_KEY"
-    private const val APPLICATION_LOCALE_SCRIPT_KEY = "APPLICATION_LOCALE_SCRIPT_KEY"
+@Singleton
+class VectorLocale @Inject constructor(
+        private val context: Context,
+        private val buildMeta: BuildMeta,
+        @DefaultPreferences
+        private val preferences: SharedPreferences,
+) {
+    companion object {
+        const val APPLICATION_LOCALE_COUNTRY_KEY = "APPLICATION_LOCALE_COUNTRY_KEY"
+        const val APPLICATION_LOCALE_VARIANT_KEY = "APPLICATION_LOCALE_VARIANT_KEY"
+        const val APPLICATION_LOCALE_LANGUAGE_KEY = "APPLICATION_LOCALE_LANGUAGE_KEY"
+        private const val APPLICATION_LOCALE_SCRIPT_KEY = "APPLICATION_LOCALE_SCRIPT_KEY"
+        private const val ISO_15924_LATN = "Latn"
+    }
 
     private val defaultLocale = Locale("en", "US")
 
-    private const val ISO_15924_LATN = "Latn"
-
     /**
      * The cache of supported application languages.
      */
@@ -52,17 +62,10 @@ object VectorLocale {
     var applicationLocale = defaultLocale
         private set
 
-    private lateinit var context: Context
-    private lateinit var buildMeta: BuildMeta
-
     /**
-     * Init this object.
+     * Init this singleton.
      */
-    fun init(context: Context, buildMeta: BuildMeta) {
-        this.context = context
-        this.buildMeta = buildMeta
-        val preferences = DefaultSharedPreferences.getInstance(context)
-
+    fun init() {
         if (preferences.contains(APPLICATION_LOCALE_LANGUAGE_KEY)) {
             applicationLocale = Locale(
                     preferences.getString(APPLICATION_LOCALE_LANGUAGE_KEY, "")!!,
@@ -88,7 +91,7 @@ object VectorLocale {
     fun saveApplicationLocale(locale: Locale) {
         applicationLocale = locale
 
-        DefaultSharedPreferences.getInstance(context).edit {
+        preferences.edit {
             val language = locale.language
             if (language.isEmpty()) {
                 remove(APPLICATION_LOCALE_LANGUAGE_KEY)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorLocaleProvider.kt b/vector/src/main/java/im/vector/app/features/settings/VectorLocaleProvider.kt
new file mode 100644
index 0000000000..cbfa92d048
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorLocaleProvider.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings
+
+import android.content.SharedPreferences
+import im.vector.app.core.di.DefaultPreferences
+import java.util.Locale
+import javax.inject.Inject
+
+/**
+ * Class to provide the Locale choice of the user.
+ */
+class VectorLocaleProvider @Inject constructor(
+        @DefaultPreferences
+        private val preferences: SharedPreferences,
+) {
+    /**
+     * Get the current local.
+     * SharedPref values has been initialized in [VectorLocale.init]
+     */
+    val applicationLocale: Locale
+        get() = Locale(
+                preferences.getString(VectorLocale.APPLICATION_LOCALE_LANGUAGE_KEY, "")!!,
+                preferences.getString(VectorLocale.APPLICATION_LOCALE_COUNTRY_KEY, "")!!,
+                preferences.getString(VectorLocale.APPLICATION_LOCALE_VARIANT_KEY, "")!!
+        )
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index fc6586eeab..2d5fb351f9 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -24,9 +24,11 @@ import androidx.annotation.BoolRes
 import androidx.core.content.edit
 import com.squareup.seismic.ShakeDetector
 import im.vector.app.R
-import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.di.DefaultPreferences
 import im.vector.app.core.resources.BuildMeta
+import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.time.Clock
+import im.vector.app.features.VectorFeatures
 import im.vector.app.features.disclaimer.SHARED_PREF_KEY
 import im.vector.app.features.home.ShortcutsHandler
 import im.vector.app.features.homeserver.ServerUrlsRepository
@@ -39,6 +41,10 @@ class VectorPreferences @Inject constructor(
         private val context: Context,
         private val clock: Clock,
         private val buildMeta: BuildMeta,
+        private val vectorFeatures: VectorFeatures,
+        @DefaultPreferences
+        private val defaultPrefs: SharedPreferences,
+        private val stringProvider: StringProvider,
 ) {
 
     companion object {
@@ -63,6 +69,12 @@ class VectorPreferences @Inject constructor(
         const val SETTINGS_BACKGROUND_SYNC_PREFERENCE_KEY = "SETTINGS_BACKGROUND_SYNC_PREFERENCE_KEY"
         const val SETTINGS_BACKGROUND_SYNC_DIVIDER_PREFERENCE_KEY = "SETTINGS_BACKGROUND_SYNC_DIVIDER_PREFERENCE_KEY"
         const val SETTINGS_LABS_PREFERENCE_KEY = "SETTINGS_LABS_PREFERENCE_KEY"
+        const val SETTINGS_LABS_NEW_APP_LAYOUT_KEY = "SETTINGS_LABS_NEW_APP_LAYOUT_KEY"
+        const val SETTINGS_LABS_DEFERRED_DM_KEY = "SETTINGS_LABS_DEFERRED_DM_KEY"
+        const val SETTINGS_LABS_RICH_TEXT_EDITOR_KEY = "SETTINGS_LABS_RICH_TEXT_EDITOR_KEY"
+        const val SETTINGS_LABS_NEW_SESSION_MANAGER_KEY = "SETTINGS_LABS_NEW_SESSION_MANAGER_KEY"
+        const val SETTINGS_LABS_CLIENT_INFO_RECORDING_KEY = "SETTINGS_LABS_CLIENT_INFO_RECORDING_KEY"
+        const val SETTINGS_LABS_VOICE_BROADCAST_KEY = "SETTINGS_LABS_VOICE_BROADCAST_KEY"
         const val SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY = "SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY"
         const val SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY = "SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY"
         const val SETTINGS_CRYPTOGRAPHY_MANAGE_PREFERENCE_KEY = "SETTINGS_CRYPTOGRAPHY_MANAGE_PREFERENCE_KEY"
@@ -78,6 +90,8 @@ class VectorPreferences @Inject constructor(
         const val SETTINGS_ALLOW_INTEGRATIONS_KEY = "SETTINGS_ALLOW_INTEGRATIONS_KEY"
         const val SETTINGS_INTEGRATION_MANAGER_UI_URL_KEY = "SETTINGS_INTEGRATION_MANAGER_UI_URL_KEY"
         const val SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY = "SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY"
+        const val SETTINGS_PERSISTED_SPACE_BACKSTACK = "SETTINGS_PERSISTED_SPACE_BACKSTACK"
+        const val SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY = "SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY"
 
         const val SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT = "SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT"
 //        const val SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY = "SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY"
@@ -95,6 +109,7 @@ class VectorPreferences @Inject constructor(
         const val SETTINGS_SHOW_URL_PREVIEW_KEY = "SETTINGS_SHOW_URL_PREVIEW_KEY"
         private const val SETTINGS_SEND_TYPING_NOTIF_KEY = "SETTINGS_SEND_TYPING_NOTIF_KEY"
         private const val SETTINGS_ENABLE_MARKDOWN_KEY = "SETTINGS_ENABLE_MARKDOWN_KEY"
+        private const val SETTINGS_ENABLE_RICH_TEXT_FORMATTING_KEY = "SETTINGS_ENABLE_RICH_TEXT_FORMATTING_KEY"
         private const val SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY = "SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY"
         private const val SETTINGS_12_24_TIMESTAMPS_KEY = "SETTINGS_12_24_TIMESTAMPS_KEY"
         private const val SETTINGS_SHOW_READ_RECEIPTS_KEY = "SETTINGS_SHOW_READ_RECEIPTS_KEY"
@@ -109,6 +124,7 @@ class VectorPreferences @Inject constructor(
         private const val SETTINGS_LABS_ENABLE_LATEX_MATHS = "SETTINGS_LABS_ENABLE_LATEX_MATHS"
         const val SETTINGS_PRESENCE_USER_ALWAYS_APPEARS_OFFLINE = "SETTINGS_PRESENCE_USER_ALWAYS_APPEARS_OFFLINE"
         const val SETTINGS_AUTOPLAY_ANIMATED_IMAGES = "SETTINGS_AUTOPLAY_ANIMATED_IMAGES"
+        private const val SETTINGS_ENABLE_DIRECT_SHARE = "SETTINGS_ENABLE_DIRECT_SHARE"
 
         // Room directory
         private const val SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS = "SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS"
@@ -164,6 +180,11 @@ class VectorPreferences @Inject constructor(
         const val SETTINGS_LABS_AUTO_REPORT_UISI = "SETTINGS_LABS_AUTO_REPORT_UISI"
         const val SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME = "SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME"
 
+        /**
+         * This is not preference, but category on preferences screen which contains [SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME].
+         * Needed to show/hide this category, depending on visibility of [SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME]. */
+        const val SETTINGS_PREF_SPACE_CATEGORY = "SETTINGS_PREF_SPACE_CATEGORY"
+
         private const val SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         private const val SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY = "SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
         private const val SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY = "SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
@@ -189,6 +210,9 @@ class VectorPreferences @Inject constructor(
         private const val SETTINGS_SECURITY_USE_GRACE_PERIOD_FLAG = "SETTINGS_SECURITY_USE_GRACE_PERIOD_FLAG"
         const val SETTINGS_SECURITY_USE_COMPLETE_NOTIFICATIONS_FLAG = "SETTINGS_SECURITY_USE_COMPLETE_NOTIFICATIONS_FLAG"
 
+        // New Session Manager
+        const val SETTINGS_SESSION_MANAGER_SHOW_IP_ADDRESS = "SETTINGS_SESSION_MANAGER_SHOW_IP_ADDRESS"
+
         // other
         const val SETTINGS_MEDIA_SAVING_PERIOD_KEY = "SETTINGS_MEDIA_SAVING_PERIOD_KEY"
         private const val SETTINGS_MEDIA_SAVING_PERIOD_SELECTED_KEY = "SETTINGS_MEDIA_SAVING_PERIOD_SELECTED_KEY"
@@ -204,8 +228,6 @@ class VectorPreferences @Inject constructor(
         private const val MEDIA_SAVING_1_MONTH = 2
         private const val MEDIA_SAVING_FOREVER = 3
 
-        private const val SETTINGS_UNKNOWN_DEVICE_DISMISSED_LIST = "SETTINGS_UNKNWON_DEVICE_DISMISSED_LIST"
-
         private const val TAKE_PHOTO_VIDEO_MODE = "TAKE_PHOTO_VIDEO_MODE"
 
         private const val SETTINGS_LABS_ENABLE_LIVE_LOCATION = "SETTINGS_LABS_ENABLE_LIVE_LOCATION"
@@ -217,11 +239,15 @@ class VectorPreferences @Inject constructor(
 
         // This key will be used to identify clients with the new thread support enabled m.thread
         const val SETTINGS_LABS_ENABLE_THREAD_MESSAGES = "SETTINGS_LABS_ENABLE_THREAD_MESSAGES_FINAL"
+        const val SETTINGS_LABS_THREAD_MESSAGES_CHANGED_BY_USER = "SETTINGS_LABS_THREAD_MESSAGES_CHANGED_BY_USER"
         const val SETTINGS_THREAD_MESSAGES_SYNCED = "SETTINGS_THREAD_MESSAGES_SYNCED"
 
         // This key will be used to enable user for displaying live user info or not.
         const val SETTINGS_TIMELINE_SHOW_LIVE_SENDER_INFO = "SETTINGS_TIMELINE_SHOW_LIVE_SENDER_INFO"
 
+        const val SETTINGS_UNVERIFIED_SESSIONS_ALERT_LAST_SHOWN_MILLIS = "SETTINGS_UNVERIFIED_SESSIONS_ALERT_LAST_SHOWN_MILLIS_"
+        const val SETTINGS_NEW_LOGIN_ALERT_SHOWN_FOR_DEVICE = "SETTINGS_NEW_LOGIN_ALERT_SHOWN_FOR_DEVICE_"
+
         // Possible values for TAKE_PHOTO_VIDEO_MODE
         const val TAKE_PHOTO_VIDEO_MODE_ALWAYS_ASK = 0
         const val TAKE_PHOTO_VIDEO_MODE_PHOTO = 1
@@ -274,13 +300,12 @@ class VectorPreferences @Inject constructor(
 
                 SETTINGS_USE_RAGE_SHAKE_KEY,
                 SETTINGS_SECURITY_USE_FLAG_SECURE,
+                SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY,
 
                 ShortcutsHandler.SHARED_PREF_KEY,
         )
     }
 
-    private val defaultPrefs = DefaultSharedPreferences.getInstance(context)
-
     /**
      * Allow subscribing and unsubscribing to configuration changes. This is
      * particularly useful when you need to be notified of a configuration change
@@ -498,18 +523,6 @@ class VectorPreferences @Inject constructor(
         return defaultPrefs.getBoolean(SETTINGS_PLAY_SHUTTER_SOUND_KEY, true)
     }
 
-    fun storeUnknownDeviceDismissedList(deviceIds: List<String>) {
-        defaultPrefs.edit(true) {
-            putStringSet(SETTINGS_UNKNOWN_DEVICE_DISMISSED_LIST, deviceIds.toSet())
-        }
-    }
-
-    fun getUnknownDeviceDismissedList(): List<String> {
-        return tryOrNull {
-            defaultPrefs.getStringSet(SETTINGS_UNKNOWN_DEVICE_DISMISSED_LIST, null)?.toList()
-        }.orEmpty()
-    }
-
     /**
      * Update the notification ringtone.
      *
@@ -706,10 +719,10 @@ class VectorPreferences @Inject constructor(
      */
     fun getSelectedMediasSavingPeriodString(): String {
         return when (getSelectedMediasSavingPeriod()) {
-            MEDIA_SAVING_3_DAYS -> context.getString(R.string.media_saving_period_3_days)
-            MEDIA_SAVING_1_WEEK -> context.getString(R.string.media_saving_period_1_week)
-            MEDIA_SAVING_1_MONTH -> context.getString(R.string.media_saving_period_1_month)
-            MEDIA_SAVING_FOREVER -> context.getString(R.string.media_saving_period_forever)
+            MEDIA_SAVING_3_DAYS -> stringProvider.getString(R.string.media_saving_period_3_days)
+            MEDIA_SAVING_1_WEEK -> stringProvider.getString(R.string.media_saving_period_1_week)
+            MEDIA_SAVING_1_MONTH -> stringProvider.getString(R.string.media_saving_period_1_month)
+            MEDIA_SAVING_FOREVER -> stringProvider.getString(R.string.media_saving_period_forever)
             else -> "?"
         }
     }
@@ -741,6 +754,24 @@ class VectorPreferences @Inject constructor(
         }
     }
 
+    /**
+     * Tells if text formatting is enabled within the rich text editor.
+     *
+     * @return true if the text formatting is enabled
+     */
+    fun isTextFormattingEnabled(): Boolean =
+        defaultPrefs.getBoolean(SETTINGS_ENABLE_RICH_TEXT_FORMATTING_KEY, true)
+
+    /**
+     * Update whether text formatting is enabled within the rich text editor.
+     *
+     * @param isEnabled true to enable the text formatting
+     */
+    fun setTextFormattingEnabled(isEnabled: Boolean) =
+        defaultPrefs.edit {
+            putBoolean(SETTINGS_ENABLE_RICH_TEXT_FORMATTING_KEY, isEnabled)
+        }
+
     /**
      * Tells if a confirmation dialog should be displayed before staring a call.
      */
@@ -957,6 +988,11 @@ class VectorPreferences @Inject constructor(
         return defaultPrefs.getBoolean(SETTINGS_SECURITY_USE_FLAG_SECURE, false)
     }
 
+    /** Whether the keyboard should disable personalized learning. */
+    fun useIncognitoKeyboard(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY, false)
+    }
+
     /**
      * The user enable protecting app access with pin code.
      * Currently we use the pin code store to know if the pin is enabled, so this is not used
@@ -981,6 +1017,10 @@ class VectorPreferences @Inject constructor(
         return defaultPrefs.getBoolean(SETTINGS_ENABLE_CHAT_EFFECTS, true)
     }
 
+    fun directShareEnabled(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_ENABLE_DIRECT_SHARE, true)
+    }
+
     /**
      * Return true if Pin code is disabled, or if user set the settings to see full notification content.
      */
@@ -1090,6 +1130,24 @@ class VectorPreferences @Inject constructor(
                 .apply()
     }
 
+    /**
+     * Indicates whether or not user changed threads flag manually. We need this to not force flag to be enabled on app start.
+     * Should be removed when Threads flag will be removed
+     */
+    fun wasThreadFlagChangedManually(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_THREAD_MESSAGES_CHANGED_BY_USER, false)
+    }
+
+    /**
+     * Sets the flag to indicate that user changed threads flag (e.g. disabled them).
+     */
+    fun setThreadFlagChangedManually() {
+        defaultPrefs
+                .edit()
+                .putBoolean(SETTINGS_LABS_THREAD_MESSAGES_CHANGED_BY_USER, true)
+                .apply()
+    }
+
     /**
      * Indicates whether or not the user will be notified about the new thread support.
      * We should notify the user only if he had old thread support enabled.
@@ -1126,7 +1184,94 @@ class VectorPreferences @Inject constructor(
                 .apply()
     }
 
+    /**
+     * Sets the space backstack that is used for up navigation.
+     * This needs to be persisted because navigating up through spaces should work across sessions.
+     *
+     * Only the IDs of the spaces are stored.
+     */
+    fun setSpaceBackstack(spaceBackstack: List<String?>) {
+        val spaceIdsJoined = spaceBackstack.takeIf { it.isNotEmpty() }?.joinToString(",")
+        defaultPrefs.edit().putString(SETTINGS_PERSISTED_SPACE_BACKSTACK, spaceIdsJoined).apply()
+    }
+
+    /**
+     * Gets the space backstack used for up navigation.
+     */
+    fun getSpaceBackstack(): List<String?> {
+        val spaceIdsJoined = defaultPrefs.getString(SETTINGS_PERSISTED_SPACE_BACKSTACK, null)
+        return spaceIdsJoined?.takeIf { it.isNotEmpty() }?.split(",").orEmpty()
+    }
+
+    /**
+     * Indicates whether or not new app layout is enabled.
+     */
+    fun isNewAppLayoutEnabled(): Boolean {
+        return vectorFeatures.isNewAppLayoutFeatureEnabled() &&
+                defaultPrefs.getBoolean(SETTINGS_LABS_NEW_APP_LAYOUT_KEY, getDefault(R.bool.settings_labs_new_app_layout_default))
+    }
+
+    /**
+     * Indicates whether or not deferred DMs are enabled.
+     */
+    fun isDeferredDmEnabled(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_DEFERRED_DM_KEY, getDefault(R.bool.settings_labs_deferred_dm_default))
+    }
+
+    /**
+     * Indicates whether or not new session manager screens are enabled.
+     */
+    fun isNewSessionManagerEnabled(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_NEW_SESSION_MANAGER_KEY, getDefault(R.bool.settings_labs_new_session_manager_default))
+    }
+
+    /**
+     * Indicates whether or not client info recording is enabled.
+     */
+    fun isClientInfoRecordingEnabled(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_CLIENT_INFO_RECORDING_KEY, getDefault(R.bool.settings_labs_client_info_recording_default))
+    }
+
     fun showLiveSenderInfo(): Boolean {
         return defaultPrefs.getBoolean(SETTINGS_TIMELINE_SHOW_LIVE_SENDER_INFO, getDefault(R.bool.settings_timeline_show_live_sender_info_default))
     }
+
+    fun isRichTextEditorEnabled(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_RICH_TEXT_EDITOR_KEY, getDefault(R.bool.settings_labs_rich_text_editor_default))
+    }
+
+    fun isVoiceBroadcastEnabled(): Boolean {
+        return vectorFeatures.isVoiceBroadcastEnabled() &&
+                defaultPrefs.getBoolean(SETTINGS_LABS_VOICE_BROADCAST_KEY, getDefault(R.bool.settings_labs_enable_voice_broadcast_default))
+    }
+
+    fun showIpAddressInSessionManagerScreens(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_SESSION_MANAGER_SHOW_IP_ADDRESS, getDefault(R.bool.settings_session_manager_show_ip_address))
+    }
+
+    fun setIpAddressVisibilityInDeviceManagerScreens(isVisible: Boolean) {
+        defaultPrefs.edit {
+            putBoolean(SETTINGS_SESSION_MANAGER_SHOW_IP_ADDRESS, isVisible)
+        }
+    }
+
+    fun getUnverifiedSessionsAlertLastShownMillis(deviceId: String): Long {
+        return defaultPrefs.getLong(SETTINGS_UNVERIFIED_SESSIONS_ALERT_LAST_SHOWN_MILLIS + deviceId, 0)
+    }
+
+    fun setUnverifiedSessionsAlertLastShownMillis(deviceId: String, lastShownMillis: Long) {
+        defaultPrefs.edit {
+            putLong(SETTINGS_UNVERIFIED_SESSIONS_ALERT_LAST_SHOWN_MILLIS + deviceId, lastShownMillis)
+        }
+    }
+
+    fun isNewLoginAlertShownForDevice(deviceId: String): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_NEW_LOGIN_ALERT_SHOWN_FOR_DEVICE + deviceId, false)
+    }
+
+    fun setNewLoginAlertShownForDevice(deviceId: String) {
+        defaultPrefs.edit {
+            putBoolean(SETTINGS_NEW_LOGIN_ALERT_SHOWN_FOR_DEVICE + deviceId, true)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
index 261f30ebe3..4a9db49c67 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
@@ -34,6 +34,7 @@ import im.vector.app.features.navigation.SettingsActivityPayload
 import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment
 import im.vector.app.features.settings.notifications.VectorSettingsNotificationPreferenceFragment
 import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
@@ -76,13 +77,19 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
                     replaceFragment(views.vectorSettingsPage, VectorSettingsAdvancedSettingsFragment::class.java, null, FRAGMENT_TAG)
                 SettingsActivityPayload.SecurityPrivacy ->
                     replaceFragment(views.vectorSettingsPage, VectorSettingsSecurityPrivacyFragment::class.java, null, FRAGMENT_TAG)
-                SettingsActivityPayload.SecurityPrivacyManageSessions ->
+                SettingsActivityPayload.SecurityPrivacyManageSessions -> {
+                    val fragmentClass = if (vectorPreferences.isNewSessionManagerEnabled()) {
+                        im.vector.app.features.settings.devices.v2.VectorSettingsDevicesFragment::class.java
+                    } else {
+                        VectorSettingsDevicesFragment::class.java
+                    }
                     replaceFragment(
                             views.vectorSettingsPage,
-                            VectorSettingsDevicesFragment::class.java,
+                            fragmentClass,
                             null,
                             FRAGMENT_TAG
                     )
+                }
                 SettingsActivityPayload.Notifications -> {
                     requestHighlightPreferenceKeyOnResume(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
                     replaceFragment(views.vectorSettingsPage, VectorSettingsNotificationPreferenceFragment::class.java, null, FRAGMENT_TAG)
@@ -194,8 +201,8 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
     }
 }
 
-private fun <T : Parcelable> Activity.readPayload(default: T): T {
-    return intent.getParcelableExtra(KEY_ACTIVITY_PAYLOAD) ?: default
+private inline fun <reified T : Parcelable> Activity.readPayload(default: T): T {
+    return intent.getParcelableExtraCompat<T>(KEY_ACTIVITY_PAYLOAD) ?: default
 }
 
 private fun <T : Parcelable> Intent.applyPayload(payload: T): Intent {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
index e54bc4e624..b6fa997f41 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
@@ -19,19 +19,26 @@ package im.vector.app.features.settings
 import android.os.Bundle
 import androidx.preference.Preference
 import androidx.preference.SeekBarPreference
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.preference.VectorPreferenceCategory
 import im.vector.app.core.preference.VectorSwitchPreference
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.home.NightlyProxy
 import im.vector.app.features.rageshake.RageShake
 import javax.inject.Inject
 
-class VectorSettingsAdvancedSettingsFragment @Inject constructor() : VectorSettingsBaseFragment() {
+@AndroidEntryPoint
+class VectorSettingsAdvancedSettingsFragment :
+        VectorSettingsBaseFragment() {
 
     override var titleRes = R.string.settings_advanced_settings
     override val preferenceXmlRes = R.xml.vector_settings_advanced_settings
 
+    @Inject lateinit var nightlyProxy: NightlyProxy
+
     private var rageshake: RageShake? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -55,6 +62,11 @@ class VectorSettingsAdvancedSettingsFragment @Inject constructor() : VectorSetti
     }
 
     override fun bindPref() {
+        setupRageShakeSection()
+        setupNightlySection()
+    }
+
+    private fun setupRageShakeSection() {
         val isRageShakeAvailable = RageShake.isAvailable(requireContext())
 
         if (isRageShakeAvailable) {
@@ -84,4 +96,12 @@ class VectorSettingsAdvancedSettingsFragment @Inject constructor() : VectorSetti
             findPreference<VectorPreferenceCategory>("SETTINGS_RAGE_SHAKE_CATEGORY_KEY")!!.isVisible = false
         }
     }
+
+    private fun setupNightlySection() {
+        findPreference<VectorPreferenceCategory>("SETTINGS_NIGHTLY_BUILD_PREFERENCE_KEY")?.isVisible = nightlyProxy.isNightlyBuild()
+        findPreference<VectorPreference>("SETTINGS_NIGHTLY_BUILD_UPDATE_PREFERENCE_KEY")?.setOnPreferenceClickListener {
+            nightlyProxy.updateApplication()
+            true
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
index 176909b48d..38ba949a49 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
@@ -28,6 +28,8 @@ import im.vector.app.R
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.singletonEntryPoint
 import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.utils.toast
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.plan.MobileScreen
@@ -60,6 +62,19 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), Maverick
     protected lateinit var session: Session
     protected lateinit var errorFormatter: ErrorFormatter
 
+    /* ==========================================================================================
+     * ViewEvents
+     * ========================================================================================== */
+
+    protected fun <T : VectorViewEvents> VectorViewModel<*, *, T>.observeViewEvents(observer: (T) -> Unit) {
+        viewEvents
+                .stream()
+                .onEach {
+                    observer(it)
+                }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+
     /* ==========================================================================================
      * Views
      * ========================================================================================== */
@@ -148,7 +163,7 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), Maverick
         }
     }
 
-    protected fun displayErrorDialog(throwable: Throwable) {
+    protected fun displayErrorDialog(throwable: Throwable?) {
         displayErrorDialog(errorFormatter.toHumanReadable(throwable))
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index 7906de3796..548a7be180 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -34,8 +34,10 @@ import androidx.preference.SwitchPreference
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.cache.DiskCache
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelperFactory
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
 import im.vector.app.core.extensions.toMvRxBundle
@@ -44,8 +46,6 @@ import im.vector.app.core.platform.SimpleTextWatcher
 import im.vector.app.core.preference.UserAvatarPreference
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.preference.VectorSwitchPreference
-import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.TextUtils
 import im.vector.app.core.utils.getSizeOfFiles
 import im.vector.app.core.utils.toast
@@ -74,17 +74,17 @@ import java.io.File
 import java.util.UUID
 import javax.inject.Inject
 
-class VectorSettingsGeneralFragment @Inject constructor(
-        colorProvider: ColorProvider,
-        clock: Clock,
-) :
+@AndroidEntryPoint
+class VectorSettingsGeneralFragment :
         VectorSettingsBaseFragment(),
         GalleryOrCameraDialogHelper.Listener {
 
+    @Inject lateinit var galleryOrCameraDialogHelperFactory: GalleryOrCameraDialogHelperFactory
+
     override var titleRes = R.string.settings_general_title
     override val preferenceXmlRes = R.xml.vector_settings_general
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
+    private lateinit var galleryOrCameraDialogHelper: GalleryOrCameraDialogHelper
 
     private val mUserSettingsCategory by lazy {
         findPreference<PreferenceCategory>(VectorPreferences.SETTINGS_USER_SETTINGS_PREFERENCE_KEY)!!
@@ -124,6 +124,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         analyticsScreenName = MobileScreen.ScreenName.SettingsGeneral
+        galleryOrCameraDialogHelper = galleryOrCameraDialogHelperFactory.create(this)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
index df7baa7397..f1a9b724e2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.settings
 
 import android.os.Bundle
 import androidx.preference.Preference
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.orEmpty
 import im.vector.app.core.preference.VectorPreference
@@ -31,10 +32,12 @@ import im.vector.app.features.version.VersionProvider
 import org.matrix.android.sdk.api.Matrix
 import javax.inject.Inject
 
-class VectorSettingsHelpAboutFragment @Inject constructor(
-        private val versionProvider: VersionProvider,
-        private val buildMeta: BuildMeta,
-) : VectorSettingsBaseFragment() {
+@AndroidEntryPoint
+class VectorSettingsHelpAboutFragment :
+        VectorSettingsBaseFragment() {
+
+    @Inject lateinit var versionProvider: VersionProvider
+    @Inject lateinit var buildMeta: BuildMeta
 
     override var titleRes = R.string.preference_root_help_about
     override val preferenceXmlRes = R.xml.vector_settings_help_about
@@ -66,10 +69,12 @@ class VectorSettingsHelpAboutFragment @Inject constructor(
         // application version
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_VERSION_PREFERENCE_KEY)!!.let {
             it.summary = buildString {
-                append(versionProvider.getVersion(longFormat = false, useBuildNumber = true))
+                append(versionProvider.getVersion(longFormat = false))
                 if (buildMeta.isDebug) {
                     append(" ")
                     append(buildMeta.gitBranchName)
+                    append(" ")
+                    append(buildMeta.gitRevision)
                 }
             }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
index db402758f1..0cd93f4ab1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.settings
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.preference.VectorPreference
@@ -36,18 +37,22 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import timber.log.Timber
 import javax.inject.Inject
 
-class VectorSettingsPinFragment @Inject constructor(
-        private val pinCodeStore: PinCodeStore,
-        private val navigator: Navigator,
-        private val notificationDrawerManager: NotificationDrawerManager,
-        biometricHelperFactory: BiometricHelper.BiometricHelperFactory,
-        defaultLockScreenConfiguration: LockScreenConfiguration,
-) : VectorSettingsBaseFragment() {
+@AndroidEntryPoint
+class VectorSettingsPinFragment :
+        VectorSettingsBaseFragment() {
+
+    @Inject lateinit var pinCodeStore: PinCodeStore
+    @Inject lateinit var navigator: Navigator
+    @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
+    @Inject lateinit var biometricHelperFactory: BiometricHelper.BiometricHelperFactory
+    @Inject lateinit var defaultLockScreenConfiguration: LockScreenConfiguration
 
     override var titleRes = R.string.settings_security_application_protection_screen_title
     override val preferenceXmlRes = R.xml.vector_settings_pin
 
-    private val biometricHelper = biometricHelperFactory.create(defaultLockScreenConfiguration.copy(mode = LockScreenMode.CREATE))
+    private val biometricHelper by lazy {
+        biometricHelperFactory.create(defaultLockScreenConfiguration.copy(mode = LockScreenMode.CREATE))
+    }
 
     private val usePinCodePref by lazy {
         findPreference<SwitchPreference>(VectorPreferences.SETTINGS_SECURITY_USE_PIN_CODE_FLAG)!!
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index ac7d29ab7a..073d5f7468 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -22,6 +22,7 @@ import android.os.Bundle
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.dialogs.PhotoOrVideoDialog
 import im.vector.app.core.extensions.restart
@@ -30,6 +31,7 @@ import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.preference.VectorSwitchPreference
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
+import im.vector.app.features.VectorFeatures
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.settings.font.FontScaleSettingActivity
 import im.vector.app.features.themes.ThemeUtils
@@ -37,10 +39,14 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.presence.model.PresenceEnum
 import javax.inject.Inject
 
-class VectorSettingsPreferencesFragment @Inject constructor(
-        private val vectorPreferences: VectorPreferences,
-        private val fontScalePreferences: FontScalePreferences,
-) : VectorSettingsBaseFragment() {
+@AndroidEntryPoint
+class VectorSettingsPreferencesFragment :
+        VectorSettingsBaseFragment() {
+
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var fontScalePreferences: FontScalePreferences
+    @Inject lateinit var vectorFeatures: VectorFeatures
+    @Inject lateinit var vectorLocale: VectorLocale
 
     override var titleRes = R.string.settings_preferences
     override val preferenceXmlRes = R.xml.vector_settings_preferences
@@ -96,6 +102,11 @@ class VectorSettingsPreferencesFragment @Inject constructor(
             }
         }
 
+        findPreference<Preference>(VectorPreferences.SETTINGS_PREF_SPACE_CATEGORY)!!.let { pref ->
+            pref.isVisible = !vectorFeatures.isNewAppLayoutFeatureEnabled()
+            pref.isEnabled = !vectorPreferences.isNewAppLayoutEnabled()
+        }
+
         // Url preview
         /*
         TODO Note: we keep the setting client side for now
@@ -188,7 +199,7 @@ class VectorSettingsPreferencesFragment @Inject constructor(
 
     private fun setUserInterfacePreferences() {
         // Selected language
-        selectedLanguagePreference.summary = VectorLocale.localeToLocalisedString(VectorLocale.applicationLocale)
+        selectedLanguagePreference.summary = vectorLocale.localeToLocalisedString(vectorLocale.applicationLocale)
 
         // Text size
         textSizePreference.summary = getString(fontScalePreferences.getResolvedFontScaleValue().nameResId)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
index 51011e29a2..0b3dcfa2ac 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
@@ -17,12 +17,14 @@
 package im.vector.app.features.settings
 
 import android.os.Bundle
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.features.analytics.plan.MobileScreen
-import javax.inject.Inject
 
-class VectorSettingsRootFragment @Inject constructor() : VectorSettingsBaseFragment() {
+@AndroidEntryPoint
+class VectorSettingsRootFragment :
+        VectorSettingsBaseFragment() {
 
     override var titleRes: Int = R.string.title_activity_settings
     override val preferenceXmlRes = R.xml.vector_settings_root
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index b0222b6e08..d940132b5e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -17,10 +17,10 @@
 
 package im.vector.app.features.settings
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -34,6 +34,7 @@ import androidx.preference.SwitchPreference
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.mvrx.fragmentViewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.dialogs.ExportKeysDialog
@@ -50,7 +51,6 @@ import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.openFileSelection
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.DialogImportE2eKeysBinding
-import im.vector.app.features.VectorFeatures
 import im.vector.app.features.analytics.AnalyticsConfig
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewActions
@@ -79,16 +79,18 @@ import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.DevicesListResponse
 import javax.inject.Inject
 
-class VectorSettingsSecurityPrivacyFragment @Inject constructor(
-        private val activeSessionHolder: ActiveSessionHolder,
-        private val pinCodeStore: PinCodeStore,
-        private val keysExporter: KeysExporter,
-        private val keysImporter: KeysImporter,
-        private val rawService: RawService,
-        private val navigator: Navigator,
-        private val analyticsConfig: AnalyticsConfig,
-        private val vectorFeatures: VectorFeatures,
-) : VectorSettingsBaseFragment() {
+@AndroidEntryPoint
+class VectorSettingsSecurityPrivacyFragment :
+        VectorSettingsBaseFragment() {
+
+    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
+    @Inject lateinit var pinCodeStore: PinCodeStore
+    @Inject lateinit var keysExporter: KeysExporter
+    @Inject lateinit var keysImporter: KeysImporter
+    @Inject lateinit var rawService: RawService
+    @Inject lateinit var navigator: Navigator
+    @Inject lateinit var analyticsConfig: AnalyticsConfig
+    @Inject lateinit var vectorPreferences: VectorPreferences
 
     override var titleRes = R.string.settings_security_and_privacy
     override val preferenceXmlRes = R.xml.vector_settings_security_privacy
@@ -158,6 +160,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         findPreference<VectorSwitchPreference>("SETTINGS_USER_ANALYTICS_CONSENT_KEY")!!
     }
 
+    private val incognitoKeyboardPref by lazy {
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY)!!
+    }
+
     override fun onCreateRecyclerView(inflater: LayoutInflater, parent: ViewGroup, savedInstanceState: Bundle?): RecyclerView {
         return super.onCreateRecyclerView(inflater, parent, savedInstanceState).also {
             // Insert animation are really annoying the first time the list is shown
@@ -273,6 +279,9 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         // Analytics
         setUpAnalytics()
 
+        // Incognito Keyboard
+        setUpIncognitoKeyboard()
+
         // Pin code
         openPinCodeSettingsPref.setOnPreferenceClickListener {
             openPinCodePreferenceScreen()
@@ -335,6 +344,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         }
     }
 
+    private fun setUpIncognitoKeyboard() {
+        incognitoKeyboardPref.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+    }
+
     // Todo this should be refactored and use same state as 4S section
     private fun refreshXSigningStatus() {
         val crossSigningKeys = session.cryptoService().crossSigningService().getMyCrossSigningKeys()
@@ -445,7 +458,6 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
     /**
      * Manage the e2e keys import.
      */
-    @SuppressLint("NewApi")
     private fun importKeys() {
         openFileSelection(
                 requireActivity(),
@@ -549,11 +561,12 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
      * Build the cryptography preference section.
      */
     private fun refreshCryptographyPreference(devices: List<DeviceInfo>) {
+        showDeviceListPref.isVisible = !vectorPreferences.isNewSessionManagerEnabled()
         showDeviceListPref.isEnabled = devices.isNotEmpty()
         showDeviceListPref.summary = resources.getQuantityString(R.plurals.settings_active_sessions_count, devices.size, devices.size)
 
-        showDevicesListV2Pref.isVisible = vectorFeatures.isNewDeviceManagementEnabled()
-        showDevicesListV2Pref.title = showDevicesListV2Pref.title.toString() + " (V2, WIP)"
+        showDevicesListV2Pref.isVisible = vectorPreferences.isNewSessionManagerEnabled()
+        showDevicesListV2Pref.isEnabled = devices.isNotEmpty()
         showDevicesListV2Pref.summary = resources.getQuantityString(R.plurals.settings_active_sessions_count, devices.size, devices.size)
 
         val userId = session.myUserId
@@ -582,7 +595,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         }
 
         // crypto section: device key (fingerprint)
-        val deviceInfo = session.cryptoService().getDeviceInfo(userId, deviceId)
+        val deviceInfo = session.cryptoService().getCryptoDeviceInfo(userId, deviceId)
 
         val fingerprint = deviceInfo?.fingerprint()
         if (fingerprint?.isNotEmpty() == true) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt
index fbf54479fc..1cb7dcbf28 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt
@@ -23,17 +23,20 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.preference.VectorPreference
-import im.vector.app.core.utils.getCallRingtoneName
-import im.vector.app.core.utils.getCallRingtoneUri
-import im.vector.app.core.utils.setCallRingtoneUri
-import im.vector.app.core.utils.setUseRiotDefaultRingtone
+import im.vector.app.core.utils.RingtoneUtils
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() {
 
+    @Inject lateinit var ringtoneUtils: RingtoneUtils
+
     override var titleRes = R.string.preference_voice_and_video
     override val preferenceXmlRes = R.xml.vector_settings_voice_video
 
@@ -52,12 +55,12 @@ class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() {
     override fun bindPref() {
         // Incoming call sounds
         mUseRiotCallRingtonePreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            activity?.let { setUseRiotDefaultRingtone(it, mUseRiotCallRingtonePreference.isChecked) }
+            ringtoneUtils.setUseRiotDefaultRingtone(mUseRiotCallRingtonePreference.isChecked)
             false
         }
 
         mCallRingtonePreference.let {
-            activity?.let { activity -> it.summary = getCallRingtoneName(activity) }
+            it.summary = ringtoneUtils.getCallRingtoneName()
             it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
                 displayRingtonePicker()
                 false
@@ -67,11 +70,10 @@ class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() {
 
     private val ringtoneStartForActivityResult = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
-            val callRingtoneUri: Uri? = activityResult.data?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
-            val thisActivity = activity
-            if (callRingtoneUri != null && thisActivity != null) {
-                setCallRingtoneUri(thisActivity, callRingtoneUri)
-                mCallRingtonePreference.summary = getCallRingtoneName(thisActivity)
+            val callRingtoneUri: Uri? = activityResult.data?.getParcelableExtraCompat(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
+            if (callRingtoneUri != null) {
+                ringtoneUtils.setCallRingtoneUri(callRingtoneUri)
+                mCallRingtonePreference.summary = ringtoneUtils.getCallRingtoneName()
             }
         }
     }
@@ -82,7 +84,7 @@ class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() {
             putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, false)
             putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
             putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_RINGTONE)
-            activity?.let { putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, getCallRingtoneUri(it)) }
+            putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, ringtoneUtils.getCallRingtoneUri())
         }
         ringtoneStartForActivityResult.launch(intent)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
index 7ccae3665d..c9a43c5e31 100644
--- a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
@@ -24,6 +24,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.airbnb.mvrx.fragmentViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
@@ -35,9 +36,10 @@ import im.vector.app.features.auth.ReAuthActivity
 import im.vector.app.features.settings.VectorSettingsActivity
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
-import javax.inject.Inject
 
-class DeactivateAccountFragment @Inject constructor() : VectorBaseFragment<FragmentDeactivateAccountBinding>() {
+@AndroidEntryPoint
+class DeactivateAccountFragment :
+        VectorBaseFragment<FragmentDeactivateAccountBinding>() {
 
     private val viewModel: DeactivateAccountViewModel by fragmentViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
index a652a62a6c..dcc584e6c3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
@@ -23,22 +23,15 @@ import dagger.assisted.AssistedInject
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.auth.ReAuthActivity
+import im.vector.app.features.auth.PendingAuthHandler
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
-import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.failure.isInvalidUIAAuth
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
-import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
-import org.matrix.android.sdk.api.util.fromBase64
-import timber.log.Timber
 import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 data class DeactivateAccountViewState(
         val dummy: Boolean = false
@@ -47,7 +40,7 @@ data class DeactivateAccountViewState(
 class DeactivateAccountViewModel @AssistedInject constructor(
         @Assisted private val initialState: DeactivateAccountViewState,
         private val session: Session,
-        private val matrix: Matrix,
+        private val pendingAuthHandler: PendingAuthHandler,
 ) :
         VectorViewModel<DeactivateAccountViewState, DeactivateAccountAction, DeactivateAccountViewEvents>(initialState) {
 
@@ -56,39 +49,18 @@ class DeactivateAccountViewModel @AssistedInject constructor(
         override fun create(initialState: DeactivateAccountViewState): DeactivateAccountViewModel
     }
 
-    var uiaContinuation: Continuation<UIABaseAuth>? = null
-    var pendingAuth: UIABaseAuth? = null
-
     override fun handle(action: DeactivateAccountAction) {
         when (action) {
             is DeactivateAccountAction.DeactivateAccount -> handleDeactivateAccount(action)
             DeactivateAccountAction.SsoAuthDone -> {
-                Timber.d("## UIA - FallBack success")
                 _viewEvents.post(DeactivateAccountViewEvents.Loading())
-                if (pendingAuth != null) {
-                    uiaContinuation?.resume(pendingAuth!!)
-                } else {
-                    uiaContinuation?.resumeWithException(IllegalArgumentException())
-                }
+                pendingAuthHandler.ssoAuthDone()
             }
             is DeactivateAccountAction.PasswordAuthDone -> {
                 _viewEvents.post(DeactivateAccountViewEvents.Loading())
-                val decryptedPass = matrix.secureStorageService()
-                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
-                uiaContinuation?.resume(
-                        UserPasswordAuth(
-                                session = pendingAuth?.session,
-                                password = decryptedPass,
-                                user = session.myUserId
-                        )
-                )
-            }
-            DeactivateAccountAction.ReAuthCancelled -> {
-                Timber.d("## UIA - Reauth cancelled")
-                uiaContinuation?.resumeWithException(UiaCancelledException())
-                uiaContinuation = null
-                pendingAuth = null
+                pendingAuthHandler.passwordAuthDone(action.password)
             }
+            DeactivateAccountAction.ReAuthCancelled -> pendingAuthHandler.reAuthCancelled()
         }
     }
 
@@ -102,8 +74,8 @@ class DeactivateAccountViewModel @AssistedInject constructor(
                         object : UserInteractiveAuthInterceptor {
                             override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                                 _viewEvents.post(DeactivateAccountViewEvents.RequestReAuth(flowResponse, errCode))
-                                pendingAuth = DefaultBaseAuth(session = flowResponse.session)
-                                uiaContinuation = promise
+                                pendingAuthHandler.pendingAuth = DefaultBaseAuth(session = flowResponse.session)
+                                pendingAuthHandler.uiaContinuation = promise
                             }
                         }
                 )
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
index 8fcda3219e..c0cefc9bcf 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
@@ -25,6 +25,7 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -39,11 +40,13 @@ import javax.inject.Inject
 /**
  * This Fragment is only used when user activates developer mode from the settings.
  */
-class CrossSigningSettingsFragment @Inject constructor(
-        private val controller: CrossSigningSettingsController,
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class CrossSigningSettingsFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         CrossSigningSettingsController.InteractionListener {
 
+    @Inject lateinit var controller: CrossSigningSettingsController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
index 87eaa01e2b..20b96e0029 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
@@ -24,12 +24,11 @@ import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.auth.ReAuthActivity
+import im.vector.app.features.auth.PendingAuthHandler
 import im.vector.app.features.login.ReAuthHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.auth.UserPasswordAuth
@@ -40,19 +39,17 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.isVerified
 import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
 import org.matrix.android.sdk.api.util.awaitCallback
-import org.matrix.android.sdk.api.util.fromBase64
 import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 class CrossSigningSettingsViewModel @AssistedInject constructor(
         @Assisted private val initialState: CrossSigningSettingsViewState,
         private val session: Session,
         private val reAuthHelper: ReAuthHelper,
         private val stringProvider: StringProvider,
-        private val matrix: Matrix,
+        private val pendingAuthHandler: PendingAuthHandler,
 ) : VectorViewModel<CrossSigningSettingsViewState, CrossSigningSettingsAction, CrossSigningSettingsViewEvents>(initialState) {
 
     init {
@@ -77,9 +74,6 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(
                 }
     }
 
-    var uiaContinuation: Continuation<UIABaseAuth>? = null
-    var pendingAuth: UIABaseAuth? = null
-
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<CrossSigningSettingsViewModel, CrossSigningSettingsViewState> {
         override fun create(initialState: CrossSigningSettingsViewState): CrossSigningSettingsViewModel
@@ -110,8 +104,8 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(
                                             } else {
                                                 Timber.d("## UIA : initializeCrossSigning UIA > start reauth activity")
                                                 _viewEvents.post(CrossSigningSettingsViewEvents.RequestReAuth(flowResponse, errCode))
-                                                pendingAuth = DefaultBaseAuth(session = flowResponse.session)
-                                                uiaContinuation = promise
+                                                pendingAuthHandler.pendingAuth = DefaultBaseAuth(session = flowResponse.session)
+                                                pendingAuthHandler.uiaContinuation = promise
                                             }
                                         }
                                     }, it
@@ -125,31 +119,11 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(
                 }
                 Unit
             }
-            is CrossSigningSettingsAction.SsoAuthDone -> {
-                Timber.d("## UIA - FallBack success")
-                if (pendingAuth != null) {
-                    uiaContinuation?.resume(pendingAuth!!)
-                } else {
-                    uiaContinuation?.resumeWithException(IllegalArgumentException())
-                }
-            }
-            is CrossSigningSettingsAction.PasswordAuthDone -> {
-                val decryptedPass = matrix.secureStorageService()
-                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
-                uiaContinuation?.resume(
-                        UserPasswordAuth(
-                                session = pendingAuth?.session,
-                                password = decryptedPass,
-                                user = session.myUserId
-                        )
-                )
-            }
+            is CrossSigningSettingsAction.SsoAuthDone -> pendingAuthHandler.ssoAuthDone()
+            is CrossSigningSettingsAction.PasswordAuthDone -> pendingAuthHandler.passwordAuthDone(action.password)
             CrossSigningSettingsAction.ReAuthCancelled -> {
-                Timber.d("## UIA - Reauth cancelled")
                 _viewEvents.post(CrossSigningSettingsViewEvents.HideModalWaitingView)
-                uiaContinuation?.resumeWithException(Exception())
-                uiaContinuation = null
-                pendingAuth = null
+                pendingAuthHandler.reAuthCancelled()
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt
index 6486b8a3ca..5924742c26 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt
@@ -85,9 +85,9 @@ abstract class DeviceItem : VectorEpoxyModel<DeviceItem.Holder>(R.layout.item_de
                     trusted
             )
 
-            holder.trustIcon.render(shield)
+            holder.trustIcon.renderDeviceShield(shield)
         } else {
-            holder.trustIcon.render(null)
+            holder.trustIcon.renderDeviceShield(null)
         }
 
         val detailedModeLabels = listOf(
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 1840a97098..cbc02ba0f0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -32,8 +32,10 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.PublishDataSource
-import im.vector.app.features.auth.ReAuthActivity
+import im.vector.app.features.auth.PendingAuthHandler
 import im.vector.app.features.login.ReAuthHelper
+import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase
+import im.vector.app.features.settings.devices.v2.verification.GetEncryptionTrustLevelForDeviceUseCase
 import im.vector.lib.core.utils.flow.throttleFirst
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
@@ -43,7 +45,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.auth.UIABaseAuth
@@ -52,24 +53,24 @@ import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
 import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
 import org.matrix.android.sdk.api.util.awaitCallback
-import org.matrix.android.sdk.api.util.fromBase64
 import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
 import javax.net.ssl.HttpsURLConnection
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 data class DevicesViewState(
         val myDeviceId: String = "",
@@ -79,12 +80,16 @@ data class DevicesViewState(
         // TODO Replace by isLoading boolean
         val request: Async<Unit> = Uninitialized,
         val hasAccountCrossSigning: Boolean = false,
-        val accountCrossSigningIsTrusted: Boolean = false
+        val accountCrossSigningIsTrusted: Boolean = false,
+        val unverifiedSessionsCount: Int = 0,
+        val inactiveSessionsCount: Int = 0,
 ) : MavericksState
 
 data class DeviceFullInfo(
         val deviceInfo: DeviceInfo,
-        val cryptoDeviceInfo: CryptoDeviceInfo?
+        val cryptoDeviceInfo: CryptoDeviceInfo?,
+        val trustLevelForShield: RoomEncryptionTrustLevel?,
+        val isInactive: Boolean,
 )
 
 class DevicesViewModel @AssistedInject constructor(
@@ -92,12 +97,12 @@ class DevicesViewModel @AssistedInject constructor(
         private val session: Session,
         private val reAuthHelper: ReAuthHelper,
         private val stringProvider: StringProvider,
-        private val matrix: Matrix,
+        private val pendingAuthHandler: PendingAuthHandler,
+        private val checkIfSessionIsInactiveUseCase: CheckIfSessionIsInactiveUseCase,
+        getCurrentSessionCrossSigningInfoUseCase: GetCurrentSessionCrossSigningInfoUseCase,
+        private val getEncryptionTrustLevelForDeviceUseCase: GetEncryptionTrustLevelForDeviceUseCase,
 ) : VectorViewModel<DevicesViewState, DevicesAction, DevicesViewEvents>(initialState), VerificationService.Listener {
 
-    var uiaContinuation: Continuation<UIABaseAuth>? = null
-    var pendingAuth: UIABaseAuth? = null
-
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<DevicesViewModel, DevicesViewState> {
         override fun create(initialState: DevicesViewState): DevicesViewModel
@@ -108,11 +113,14 @@ class DevicesViewModel @AssistedInject constructor(
     private val refreshSource = PublishDataSource<Unit>()
 
     init {
+        val currentSessionCrossSigningInfo = getCurrentSessionCrossSigningInfoUseCase.execute()
+        val hasAccountCrossSigning = currentSessionCrossSigningInfo.isCrossSigningInitialized
+        val accountCrossSigningIsTrusted = currentSessionCrossSigningInfo.isCrossSigningVerified
 
         setState {
             copy(
-                    hasAccountCrossSigning = session.cryptoService().crossSigningService().isCrossSigningInitialized(),
-                    accountCrossSigningIsTrusted = session.cryptoService().crossSigningService().isCrossSigningVerified(),
+                    hasAccountCrossSigning = hasAccountCrossSigning,
+                    accountCrossSigningIsTrusted = accountCrossSigningIsTrusted,
                     myDeviceId = session.sessionParams.deviceId ?: ""
             )
         }
@@ -121,11 +129,21 @@ class DevicesViewModel @AssistedInject constructor(
                 session.flow().liveUserCryptoDevices(session.myUserId),
                 session.flow().liveMyDevicesInfo()
         ) { cryptoList, infoList ->
+            val unverifiedSessionsCount = cryptoList.count { !it.trustLevel?.isVerified().orFalse() }
+            val inactiveSessionsCount = infoList.count { checkIfSessionIsInactiveUseCase.execute(it.date) }
+            setState {
+                copy(
+                        unverifiedSessionsCount = unverifiedSessionsCount,
+                        inactiveSessionsCount = inactiveSessionsCount
+                )
+            }
             infoList
                     .sortedByDescending { it.lastSeenTs }
                     .map { deviceInfo ->
                         val cryptoDeviceInfo = cryptoList.firstOrNull { it.deviceId == deviceInfo.deviceId }
-                        DeviceFullInfo(deviceInfo, cryptoDeviceInfo)
+                        val trustLevelForShield = getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo)
+                        val isInactive = checkIfSessionIsInactiveUseCase.execute(deviceInfo.lastSeenTs)
+                        DeviceFullInfo(deviceInfo, cryptoDeviceInfo, trustLevelForShield, isInactive)
                     }
         }
                 .distinctUntilChanged()
@@ -208,37 +226,9 @@ class DevicesViewModel @AssistedInject constructor(
             is DevicesAction.CompleteSecurity -> handleCompleteSecurity()
             is DevicesAction.MarkAsManuallyVerified -> handleVerifyManually(action)
             is DevicesAction.VerifyMyDeviceManually -> handleShowDeviceCryptoInfo(action)
-            is DevicesAction.SsoAuthDone -> {
-                // we should use token based auth
-                // _viewEvents.post(CrossSigningSettingsViewEvents.ShowModalWaitingView(null))
-                // will release the interactive auth interceptor
-                Timber.d("## UIA - FallBack success $pendingAuth , continuation: $uiaContinuation")
-                if (pendingAuth != null) {
-                    uiaContinuation?.resume(pendingAuth!!)
-                } else {
-                    uiaContinuation?.resumeWithException(IllegalArgumentException())
-                }
-                Unit
-            }
-            is DevicesAction.PasswordAuthDone -> {
-                val decryptedPass = matrix.secureStorageService()
-                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
-                uiaContinuation?.resume(
-                        UserPasswordAuth(
-                                session = pendingAuth?.session,
-                                password = decryptedPass,
-                                user = session.myUserId
-                        )
-                )
-                Unit
-            }
-            DevicesAction.ReAuthCancelled -> {
-                Timber.d("## UIA - Reauth cancelled")
-//                _viewEvents.post(DevicesViewEvents.Loading)
-                uiaContinuation?.resumeWithException(Exception())
-                uiaContinuation = null
-                pendingAuth = null
-            }
+            is DevicesAction.SsoAuthDone -> pendingAuthHandler.ssoAuthDone()
+            is DevicesAction.PasswordAuthDone -> pendingAuthHandler.passwordAuthDone(action.password)
+            DevicesAction.ReAuthCancelled -> pendingAuthHandler.reAuthCancelled()
             DevicesAction.ResetSecurity -> _viewEvents.post(DevicesViewEvents.PromptResetSecrets)
         }
     }
@@ -347,8 +337,8 @@ class DevicesViewModel @AssistedInject constructor(
                             } else {
                                 Timber.d("## UIA : deleteDevice UIA > start reauth activity")
                                 _viewEvents.post(DevicesViewEvents.RequestReAuth(flowResponse, errCode))
-                                pendingAuth = DefaultBaseAuth(session = flowResponse.session)
-                                uiaContinuation = promise
+                                pendingAuthHandler.pendingAuth = DefaultBaseAuth(session = flowResponse.session)
+                                pendingAuthHandler.uiaContinuation = promise
                             }
                         }
                     }, it)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/GetCurrentSessionCrossSigningInfoUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/GetCurrentSessionCrossSigningInfoUseCase.kt
new file mode 100644
index 0000000000..a27c30379b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/GetCurrentSessionCrossSigningInfoUseCase.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices
+
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
+import javax.inject.Inject
+
+class GetCurrentSessionCrossSigningInfoUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+
+    fun execute(): CurrentSessionCrossSigningInfo {
+        val session = activeSessionHolder.getActiveSession()
+        val isCrossSigningInitialized = session.cryptoService().crossSigningService().isCrossSigningInitialized()
+        val isCrossSigningVerified = session.cryptoService().crossSigningService().isCrossSigningVerified()
+        return CurrentSessionCrossSigningInfo(
+                deviceId = session.sessionParams.deviceId.orEmpty(),
+                isCrossSigningInitialized = isCrossSigningInitialized,
+                isCrossSigningVerified = isCrossSigningVerified
+        )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
index da18154ea1..7709a63344 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.settings.devices
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 
+// TODO Replace usage by the use case GetEncryptionTrustLevelForDeviceUseCase
 object TrustUtils {
 
     fun shieldForTrust(
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
index a132dc1f49..135c684e76 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
@@ -28,6 +28,7 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.dialogs.ManuallyVerifyDialog
 import im.vector.app.core.extensions.cleanup
@@ -46,11 +47,13 @@ import javax.inject.Inject
 /**
  * Display the list of the user's device.
  */
-class VectorSettingsDevicesFragment @Inject constructor(
-        private val devicesController: DevicesController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class VectorSettingsDevicesFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         DevicesController.Callback {
 
+    @Inject lateinit var devicesController: DevicesController
+
     // used to avoid requesting to enter the password for each deletion
     // Note: Sonar does not like to use password for member name.
 //    private var mAccountPass: String = ""
@@ -82,8 +85,7 @@ class VectorSettingsDevicesFragment @Inject constructor(
                     ).show(childFragmentManager, "REQPOP")
                 }
                 is DevicesViewEvents.SelfVerification -> {
-                    VerificationBottomSheet.forSelfVerification(it.session)
-                            .show(childFragmentManager, "REQPOP")
+                    navigator.requestSelfSessionVerification(requireActivity())
                 }
                 is DevicesViewEvents.ShowManuallyVerify -> {
                     ManuallyVerifyDialog.show(requireActivity(), it.cryptoDeviceInfo) {
@@ -91,7 +93,7 @@ class VectorSettingsDevicesFragment @Inject constructor(
                     }
                 }
                 is DevicesViewEvents.PromptResetSecrets -> {
-                    navigator.open4SSetup(requireContext(), SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET)
+                    navigator.open4SSetup(requireActivity(), SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET)
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceFullInfo.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceFullInfo.kt
new file mode 100644
index 0000000000..186a6ebe69
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceFullInfo.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.core.session.clientinfo.MatrixClientInfoContent
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+data class DeviceFullInfo(
+        val deviceInfo: DeviceInfo,
+        val cryptoDeviceInfo: CryptoDeviceInfo?,
+        val roomEncryptionTrustLevel: RoomEncryptionTrustLevel?,
+        val isInactive: Boolean,
+        val isCurrentDevice: Boolean,
+        val deviceExtendedInfo: DeviceExtendedInfo,
+        val matrixClientInfo: MatrixClientInfoContent?,
+        val isSelected: Boolean = false,
+)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
new file mode 100644
index 0000000000..6f002359c8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+
+sealed class DevicesAction : VectorViewModelAction {
+    // ReAuth
+    object SsoAuthDone : DevicesAction()
+    data class PasswordAuthDone(val password: String) : DevicesAction()
+    object ReAuthCancelled : DevicesAction()
+
+    // Others
+    object VerifyCurrentSession : DevicesAction()
+    data class MarkAsManuallyVerified(val cryptoDeviceInfo: CryptoDeviceInfo) : DevicesAction()
+    object MultiSignoutOtherSessions : DevicesAction()
+    object ToggleIpAddressVisibility : DevicesAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewEvent.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewEvent.kt
new file mode 100644
index 0000000000..9f5257693e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewEvent.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+
+sealed class DevicesViewEvent : VectorViewEvents {
+    data class RequestReAuth(
+            val registrationFlowResponse: RegistrationFlowResponse,
+            val lastErrorCode: String?
+    ) : DevicesViewEvent()
+
+    data class ShowVerifyDevice(val userId: String, val transactionId: String?) : DevicesViewEvent()
+    object SelfVerification : DevicesViewEvent()
+    data class ShowManuallyVerify(val cryptoDeviceInfo: CryptoDeviceInfo) : DevicesViewEvent()
+    object PromptResetSecrets : DevicesViewEvent()
+    object SignoutSuccess : DevicesViewEvent()
+    data class SignoutError(val error: Throwable) : DevicesViewEvent()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
new file mode 100644
index 0000000000..f2e6b25f32
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import android.content.SharedPreferences
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.features.auth.PendingAuthHandler
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.signout.SignoutSessionsReAuthNeeded
+import im.vector.app.features.settings.devices.v2.signout.SignoutSessionsUseCase
+import im.vector.app.features.settings.devices.v2.verification.CheckIfCurrentSessionCanBeVerifiedUseCase
+import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
+import timber.log.Timber
+
+class DevicesViewModel @AssistedInject constructor(
+        @Assisted initialState: DevicesViewState,
+        activeSessionHolder: ActiveSessionHolder,
+        private val getCurrentSessionCrossSigningInfoUseCase: GetCurrentSessionCrossSigningInfoUseCase,
+        private val getDeviceFullInfoListUseCase: GetDeviceFullInfoListUseCase,
+        private val refreshDevicesOnCryptoDevicesChangeUseCase: RefreshDevicesOnCryptoDevicesChangeUseCase,
+        private val checkIfCurrentSessionCanBeVerifiedUseCase: CheckIfCurrentSessionCanBeVerifiedUseCase,
+        private val signoutSessionsUseCase: SignoutSessionsUseCase,
+        private val pendingAuthHandler: PendingAuthHandler,
+        refreshDevicesUseCase: RefreshDevicesUseCase,
+        private val vectorPreferences: VectorPreferences,
+        private val toggleIpAddressVisibilityUseCase: ToggleIpAddressVisibilityUseCase,
+) : VectorSessionsListViewModel<DevicesViewState,
+        DevicesAction,
+        DevicesViewEvent>(initialState, activeSessionHolder, refreshDevicesUseCase),
+        SharedPreferences.OnSharedPreferenceChangeListener {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<DevicesViewModel, DevicesViewState> {
+        override fun create(initialState: DevicesViewState): DevicesViewModel
+    }
+
+    companion object : MavericksViewModelFactory<DevicesViewModel, DevicesViewState> by hiltMavericksViewModelFactory()
+
+    init {
+        observeCurrentSessionCrossSigningInfo()
+        observeDevices()
+        refreshDevicesOnCryptoDevicesChange()
+        refreshDeviceList()
+        refreshIpAddressVisibility()
+        observePreferences()
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        refreshIpAddressVisibility()
+    }
+
+    private fun observePreferences() {
+        vectorPreferences.subscribeToChanges(this)
+    }
+
+    override fun onCleared() {
+        vectorPreferences.unsubscribeToChanges(this)
+        super.onCleared()
+    }
+
+    private fun refreshIpAddressVisibility() {
+        val shouldShowIpAddress = vectorPreferences.showIpAddressInSessionManagerScreens()
+        setState {
+            copy(isShowingIpAddress = shouldShowIpAddress)
+        }
+    }
+
+    private fun observeCurrentSessionCrossSigningInfo() {
+        getCurrentSessionCrossSigningInfoUseCase.execute()
+                .onEach { crossSigningInfo ->
+                    setState {
+                        copy(currentSessionCrossSigningInfo = crossSigningInfo)
+                    }
+                }
+                .launchIn(viewModelScope)
+    }
+
+    private fun observeDevices() {
+        val allSessionsFlow = getDeviceFullInfoListUseCase.execute(
+                filterType = DeviceManagerFilterType.ALL_SESSIONS,
+                excludeCurrentDevice = false,
+        )
+        val unverifiedSessionsFlow = getDeviceFullInfoListUseCase.execute(
+                filterType = DeviceManagerFilterType.UNVERIFIED,
+                excludeCurrentDevice = true,
+        )
+        val inactiveSessionsFlow = getDeviceFullInfoListUseCase.execute(
+                filterType = DeviceManagerFilterType.INACTIVE,
+                excludeCurrentDevice = true,
+        )
+
+        combine(allSessionsFlow, unverifiedSessionsFlow, inactiveSessionsFlow) { allSessions, unverifiedSessions, inactiveSessions ->
+            DeviceFullInfoList(
+                    allSessions = allSessions,
+                    unverifiedSessionsCount = unverifiedSessions.size,
+                    inactiveSessionsCount = inactiveSessions.size,
+            )
+        }
+                .execute { async -> copy(devices = async) }
+    }
+
+    private fun refreshDevicesOnCryptoDevicesChange() {
+        viewModelScope.launch {
+            refreshDevicesOnCryptoDevicesChangeUseCase.execute()
+        }
+    }
+
+    override fun handle(action: DevicesAction) {
+        when (action) {
+            is DevicesAction.PasswordAuthDone -> handlePasswordAuthDone(action)
+            DevicesAction.ReAuthCancelled -> handleReAuthCancelled()
+            DevicesAction.SsoAuthDone -> handleSsoAuthDone()
+            is DevicesAction.VerifyCurrentSession -> handleVerifyCurrentSessionAction()
+            is DevicesAction.MarkAsManuallyVerified -> handleMarkAsManuallyVerifiedAction()
+            DevicesAction.MultiSignoutOtherSessions -> handleMultiSignoutOtherSessions()
+            DevicesAction.ToggleIpAddressVisibility -> handleToggleIpAddressVisibility()
+        }
+    }
+
+    private fun handleToggleIpAddressVisibility() {
+        toggleIpAddressVisibilityUseCase.execute()
+    }
+
+    private fun handleVerifyCurrentSessionAction() {
+        viewModelScope.launch {
+            val currentSessionCanBeVerified = checkIfCurrentSessionCanBeVerifiedUseCase.execute()
+            if (currentSessionCanBeVerified) {
+                _viewEvents.post(DevicesViewEvent.SelfVerification)
+            } else {
+                _viewEvents.post(DevicesViewEvent.PromptResetSecrets)
+            }
+        }
+    }
+
+    private fun handleMarkAsManuallyVerifiedAction() {
+        // TODO implement when needed
+    }
+
+    private fun handleMultiSignoutOtherSessions() = withState { state ->
+        viewModelScope.launch {
+            setLoading(true)
+            val deviceIds = getDeviceIdsOfOtherSessions(state)
+            if (deviceIds.isEmpty()) {
+                return@launch
+            }
+            val result = signout(deviceIds)
+            setLoading(false)
+
+            val error = result.exceptionOrNull()
+            if (error == null) {
+                onSignoutSuccess()
+            } else {
+                onSignoutFailure(error)
+            }
+        }
+    }
+
+    private fun getDeviceIdsOfOtherSessions(state: DevicesViewState): List<String> {
+        val currentDeviceId = state.currentSessionCrossSigningInfo.deviceId
+        return state.devices()
+                ?.allSessions
+                ?.mapNotNull { fullInfo -> fullInfo.deviceInfo.deviceId.takeUnless { it == currentDeviceId } }
+                .orEmpty()
+    }
+
+    private suspend fun signout(deviceIds: List<String>) = signoutSessionsUseCase.execute(deviceIds, this::onReAuthNeeded)
+
+    private fun onReAuthNeeded(reAuthNeeded: SignoutSessionsReAuthNeeded) {
+        Timber.d("onReAuthNeeded")
+        pendingAuthHandler.pendingAuth = DefaultBaseAuth(session = reAuthNeeded.flowResponse.session)
+        pendingAuthHandler.uiaContinuation = reAuthNeeded.uiaContinuation
+        _viewEvents.post(DevicesViewEvent.RequestReAuth(reAuthNeeded.flowResponse, reAuthNeeded.errCode))
+    }
+
+    private fun setLoading(isLoading: Boolean) {
+        setState { copy(isLoading = isLoading) }
+    }
+
+    private fun onSignoutSuccess() {
+        Timber.d("signout success")
+        refreshDeviceList()
+        _viewEvents.post(DevicesViewEvent.SignoutSuccess)
+    }
+
+    private fun onSignoutFailure(failure: Throwable) {
+        Timber.e("signout failure", failure)
+        _viewEvents.post(DevicesViewEvent.SignoutError(failure))
+    }
+
+    private fun handleSsoAuthDone() {
+        pendingAuthHandler.ssoAuthDone()
+    }
+
+    private fun handlePasswordAuthDone(action: DevicesAction.PasswordAuthDone) {
+        pendingAuthHandler.passwordAuthDone(action.password)
+    }
+
+    private fun handleReAuthCancelled() {
+        pendingAuthHandler.reAuthCancelled()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
new file mode 100644
index 0000000000..75d0f132bb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.Uninitialized
+import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
+
+data class DevicesViewState(
+        val currentSessionCrossSigningInfo: CurrentSessionCrossSigningInfo = CurrentSessionCrossSigningInfo(),
+        val devices: Async<DeviceFullInfoList> = Uninitialized,
+        val isLoading: Boolean = false,
+        val isShowingIpAddress: Boolean = false,
+) : MavericksState
+
+data class DeviceFullInfoList(
+        val allSessions: List<DeviceFullInfo>,
+        val unverifiedSessionsCount: Int,
+        val inactiveSessionsCount: Int,
+)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCase.kt
new file mode 100644
index 0000000000..1ae7d8836f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCase.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.session.clientinfo.GetMatrixClientInfoUseCase
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.filter.FilterDevicesUseCase
+import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase
+import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
+import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
+import im.vector.app.features.settings.devices.v2.verification.GetEncryptionTrustLevelForDeviceUseCase
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emptyFlow
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.flow.flow
+import javax.inject.Inject
+
+class GetDeviceFullInfoListUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val checkIfSessionIsInactiveUseCase: CheckIfSessionIsInactiveUseCase,
+        private val getEncryptionTrustLevelForDeviceUseCase: GetEncryptionTrustLevelForDeviceUseCase,
+        private val getCurrentSessionCrossSigningInfoUseCase: GetCurrentSessionCrossSigningInfoUseCase,
+        private val filterDevicesUseCase: FilterDevicesUseCase,
+        private val parseDeviceUserAgentUseCase: ParseDeviceUserAgentUseCase,
+        private val getMatrixClientInfoUseCase: GetMatrixClientInfoUseCase,
+) {
+
+    fun execute(filterType: DeviceManagerFilterType, excludeCurrentDevice: Boolean = false): Flow<List<DeviceFullInfo>> {
+        return activeSessionHolder.getSafeActiveSession()?.let { session ->
+            val deviceFullInfoFlow = combine(
+                    getCurrentSessionCrossSigningInfoUseCase.execute(),
+                    session.flow().liveUserCryptoDevices(session.myUserId),
+                    session.flow().liveMyDevicesInfo()
+            ) { currentSessionCrossSigningInfo, cryptoList, infoList ->
+                val deviceFullInfoList = convertToDeviceFullInfoList(session, currentSessionCrossSigningInfo, cryptoList, infoList)
+                val excludedDeviceIds = if (excludeCurrentDevice) {
+                    listOf(currentSessionCrossSigningInfo.deviceId)
+                } else {
+                    emptyList()
+                }
+                filterDevicesUseCase.execute(currentSessionCrossSigningInfo, deviceFullInfoList, filterType, excludedDeviceIds)
+            }
+
+            deviceFullInfoFlow.distinctUntilChanged()
+        } ?: emptyFlow()
+    }
+
+    private fun convertToDeviceFullInfoList(
+            session: Session,
+            currentSessionCrossSigningInfo: CurrentSessionCrossSigningInfo,
+            cryptoList: List<CryptoDeviceInfo>,
+            infoList: List<DeviceInfo>,
+    ): List<DeviceFullInfo> {
+        return infoList
+                .sortedByDescending { it.lastSeenTs }
+                .map { deviceInfo ->
+                    val cryptoDeviceInfo = cryptoList.firstOrNull { it.deviceId == deviceInfo.deviceId }
+                    val roomEncryptionTrustLevel = getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo)
+                    val isInactive = checkIfSessionIsInactiveUseCase.execute(deviceInfo.lastSeenTs)
+                    val isCurrentDevice = currentSessionCrossSigningInfo.deviceId == cryptoDeviceInfo?.deviceId
+                    val deviceExtendedInfo = parseDeviceUserAgentUseCase.execute(deviceInfo.getBestLastSeenUserAgent())
+                    val matrixClientInfo = deviceInfo.deviceId
+                            ?.takeIf { it.isNotEmpty() }
+                            ?.let { getMatrixClientInfoUseCase.execute(session, it) }
+
+                    DeviceFullInfo(
+                            deviceInfo = deviceInfo,
+                            cryptoDeviceInfo = cryptoDeviceInfo,
+                            roomEncryptionTrustLevel = roomEncryptionTrustLevel,
+                            isInactive = isInactive,
+                            isCurrentDevice = isCurrentDevice,
+                            deviceExtendedInfo = deviceExtendedInfo,
+                            matrixClientInfo = matrixClientInfo
+                    )
+                }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCase.kt
new file mode 100644
index 0000000000..a25c4d39cb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCase.kt
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import org.matrix.android.sdk.api.extensions.orFalse
+import javax.inject.Inject
+
+class ParseDeviceUserAgentUseCase @Inject constructor() {
+
+    fun execute(userAgent: String?): DeviceExtendedInfo {
+        if (userAgent == null) return createUnknownUserAgent()
+
+        return when {
+            userAgent.contains(ANDROID_KEYWORD) -> parseAndroidUserAgent(userAgent)
+            userAgent.contains(IOS_KEYWORD) -> parseIosUserAgent(userAgent)
+            userAgent.contains(DESKTOP_KEYWORD) -> parseDesktopUserAgent(userAgent)
+            userAgent.contains(WEB_KEYWORD) -> parseWebUserAgent(userAgent)
+            else -> createUnknownUserAgent()
+        }
+    }
+
+    private fun parseAndroidUserAgent(userAgent: String): DeviceExtendedInfo {
+        val appName = userAgent.substringBefore("/")
+        val appVersion = userAgent.substringAfter("/").substringBefore(" (")
+        val deviceInfoSegments = userAgent.substringAfter("(").substringBeforeLast(")").split("; ")
+        val deviceModel: String?
+        val deviceOperatingSystem: String?
+        if (deviceInfoSegments.firstOrNull() == "Linux") {
+            val deviceOperatingSystemIndex = deviceInfoSegments.indexOfFirst { it.startsWith("Android") }
+            deviceOperatingSystem = deviceInfoSegments.getOrNull(deviceOperatingSystemIndex)
+            deviceModel = deviceInfoSegments.getOrNull(deviceOperatingSystemIndex + 1)
+        } else {
+            deviceModel = deviceInfoSegments.getOrNull(0)
+            deviceOperatingSystem = deviceInfoSegments.getOrNull(1)
+        }
+        return DeviceExtendedInfo(
+                deviceType = DeviceType.MOBILE,
+                deviceModel = deviceModel,
+                deviceOperatingSystem = deviceOperatingSystem,
+                clientName = appName,
+                clientVersion = appVersion
+        )
+    }
+
+    private fun parseIosUserAgent(userAgent: String): DeviceExtendedInfo {
+        val appName = userAgent.substringBefore("/")
+        val appVersion = userAgent.substringAfter("/").substringBefore(" (")
+        val deviceInfoSegments = userAgent.substringAfter("(").substringBeforeLast(")").split("; ")
+        val deviceModel = deviceInfoSegments.getOrNull(0)
+        val deviceOperatingSystem = deviceInfoSegments.getOrNull(1)
+        return DeviceExtendedInfo(
+                deviceType = DeviceType.MOBILE,
+                deviceModel = deviceModel,
+                deviceOperatingSystem = deviceOperatingSystem,
+                clientName = appName,
+                clientVersion = appVersion
+        )
+    }
+
+    private fun parseDesktopUserAgent(userAgent: String): DeviceExtendedInfo {
+        val browserInfo = parseBrowserInfoFromDesktopUserAgent(userAgent)
+        val operatingSystem = parseOperatingSystemFromDesktopUserAgent(userAgent)
+
+        return DeviceExtendedInfo(
+                deviceType = DeviceType.DESKTOP,
+                deviceModel = null,
+                deviceOperatingSystem = operatingSystem,
+                clientName = browserInfo.name,
+                clientVersion = browserInfo.version,
+        )
+    }
+
+    private data class BrowserInfo(val name: String? = null, val version: String? = null)
+
+    private fun parseBrowserInfoFromDesktopUserAgent(userAgent: String): BrowserInfo {
+        val browserSegments = userAgent.split(" ")
+        return when {
+            isFirefox(browserSegments) -> {
+                BrowserInfo(BROWSER_FIREFOX, getBrowserVersion(browserSegments, BROWSER_FIREFOX))
+            }
+            isEdge(browserSegments) -> {
+                BrowserInfo(BROWSER_EDGE, getBrowserVersion(browserSegments, BROWSER_EDGE))
+            }
+            isMobile(browserSegments) -> {
+                when (val name = getMobileBrowserName(browserSegments)) {
+                    null -> {
+                        BrowserInfo()
+                    }
+                    BROWSER_SAFARI -> {
+                        BrowserInfo(name, getBrowserVersion(browserSegments, "Version"))
+                    }
+                    else -> {
+                        BrowserInfo(name, getBrowserVersion(browserSegments, name))
+                    }
+                }
+            }
+            isSafari(browserSegments) -> {
+                BrowserInfo(BROWSER_SAFARI, getBrowserVersion(browserSegments, "Version"))
+            }
+            else -> {
+                when (val name = getRegularBrowserName(browserSegments)) {
+                    null -> {
+                        BrowserInfo()
+                    }
+                    else -> {
+                        BrowserInfo(name, getBrowserVersion(browserSegments, name))
+                    }
+                }
+            }
+        }
+    }
+
+    private fun parseOperatingSystemFromDesktopUserAgent(userAgent: String): String? {
+        val deviceOperatingSystemSegments = userAgent
+                .substringAfter("(")
+                .substringBefore(")")
+                .split("; ")
+        val firstSegment = deviceOperatingSystemSegments.getOrNull(0).orEmpty()
+        val secondSegment = deviceOperatingSystemSegments.getOrNull(1).orEmpty()
+
+        return when {
+            // e.g. (Macintosh; Intel Mac OS X 10_15_7) => macOS
+            firstSegment.startsWith(OPERATING_SYSTEM_MAC_KEYWORD) -> OPERATING_SYSTEM_MAC
+            // e.g. (Windows NT 10.0; Win64; x64) => Windows
+            firstSegment.startsWith(OPERATING_SYSTEM_WINDOWS_KEYWORD) -> OPERATING_SYSTEM_WINDOWS_KEYWORD
+            // e.g. (iPad; CPU OS 8_4_1 like Mac OS X) => iOS
+            firstSegment.startsWith(DEVICE_IPAD_KEYWORD) || firstSegment.startsWith(DEVICE_IPHONE_KEYWORD) -> OPERATING_SYSTEM_IOS
+            // e.g. (Linux; Android 9; SM-G973U Build/PPR1.180610.011) => Android
+            secondSegment.startsWith(OPERATING_SYSTEM_ANDROID_KEYWORD) -> OPERATING_SYSTEM_ANDROID_KEYWORD
+            else -> null
+        }
+    }
+
+    private fun parseWebUserAgent(userAgent: String): DeviceExtendedInfo {
+        return parseDesktopUserAgent(userAgent).copy(
+                deviceType = DeviceType.WEB
+        )
+    }
+
+    private fun createUnknownUserAgent(): DeviceExtendedInfo {
+        return DeviceExtendedInfo(DeviceType.UNKNOWN)
+    }
+
+    private fun isFirefox(browserSegments: List<String>): Boolean {
+        return browserSegments.lastOrNull()?.startsWith(BROWSER_FIREFOX).orFalse()
+    }
+
+    private fun getBrowserVersion(browserSegments: List<String>, browserName: String): String? {
+        // e.g Chrome/104.0.3497.100 -> 104.0.3497.100
+        return browserSegments
+                .find { it.startsWith(browserName) }
+                ?.split("/")
+                ?.getOrNull(1)
+    }
+
+    private fun isEdge(browserSegments: List<String>): Boolean {
+        return browserSegments.lastOrNull()?.startsWith(BROWSER_EDGE).orFalse()
+    }
+
+    private fun isSafari(browserSegments: List<String>): Boolean {
+        return browserSegments.lastOrNull()?.startsWith(BROWSER_SAFARI).orFalse() &&
+                browserSegments.getOrNull(browserSegments.size - 2)?.startsWith("Version").orFalse()
+    }
+
+    private fun isMobile(browserSegments: List<String>): Boolean {
+        return browserSegments.getOrNull(browserSegments.size - 2)?.startsWith("Mobile").orFalse()
+    }
+
+    private fun getMobileBrowserName(browserSegments: List<String>): String? {
+        val possibleBrowserName = browserSegments.getOrNull(browserSegments.size - 3)?.split("/")?.firstOrNull()
+        return if (possibleBrowserName == "Version") {
+            BROWSER_SAFARI
+        } else {
+            possibleBrowserName
+        }
+    }
+
+    private fun getRegularBrowserName(browserSegments: List<String>): String? {
+        return browserSegments.getOrNull(browserSegments.size - 2)?.split("/")?.firstOrNull()
+    }
+
+    companion object {
+        // Element dbg/1.5.0-dev (Xiaomi; Mi 9T; Android 11; RKQ1.200826.002 test-keys; Flavour GooglePlay; MatrixAndroidSdk2 1.5.0)
+        // Legacy : Element/1.0.0 (Linux; U; Android 6.0.1; SM-A510F Build/MMB29; Flavour GPlay; MatrixAndroidSdk2 1.0)
+        private const val ANDROID_KEYWORD = "; MatrixAndroidSdk2"
+
+        // Element/1.8.21 (iPhone XS Max; iOS 15.2; Scale/3.00)
+        private const val IOS_KEYWORD = "; iOS "
+
+        // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) ElementNightly/2022091301
+        // Chrome/104.0.5112.102 Electron/20.1.1 Safari/537.36
+        private const val DESKTOP_KEYWORD = " Electron/"
+
+        // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36
+        private const val WEB_KEYWORD = "Mozilla/"
+
+        private const val OPERATING_SYSTEM_MAC_KEYWORD = "Macintosh"
+        private const val OPERATING_SYSTEM_MAC = "macOS"
+        private const val OPERATING_SYSTEM_IOS = "iOS"
+        private const val OPERATING_SYSTEM_WINDOWS_KEYWORD = "Windows"
+        private const val OPERATING_SYSTEM_ANDROID_KEYWORD = "Android"
+        private const val DEVICE_IPAD_KEYWORD = "iPad"
+        private const val DEVICE_IPHONE_KEYWORD = "iPhone"
+
+        private const val BROWSER_FIREFOX = "Firefox"
+        private const val BROWSER_SAFARI = "Safari"
+        private const val BROWSER_EDGE = "Edge"
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/RefreshDevicesOnCryptoDevicesChangeUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/RefreshDevicesOnCryptoDevicesChangeUseCase.kt
new file mode 100644
index 0000000000..7d0a96eb0d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/RefreshDevicesOnCryptoDevicesChangeUseCase.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.core.di.ActiveSessionHolder
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.sample
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.flow.flow
+import javax.inject.Inject
+import kotlin.time.Duration.Companion.seconds
+
+class RefreshDevicesOnCryptoDevicesChangeUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+    private val samplingPeriodMs = 5.seconds.inWholeMilliseconds
+
+    suspend fun execute() {
+        activeSessionHolder.getSafeActiveSession()
+                ?.let { session ->
+                    session.flow().liveUserCryptoDevices(session.myUserId)
+                            .map { it.size }
+                            .distinctUntilChanged()
+                            .sample(samplingPeriodMs)
+                            .onEach {
+                                // If we have a new crypto device change, we might want to trigger refresh of device info
+                                session.cryptoService().fetchDevicesList(NoOpMatrixCallback())
+                            }
+                            .collect()
+                }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/RefreshDevicesUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/RefreshDevicesUseCase.kt
new file mode 100644
index 0000000000..a53ab1d2b3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/RefreshDevicesUseCase.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.core.di.ActiveSessionHolder
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import javax.inject.Inject
+
+class RefreshDevicesUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+    fun execute() {
+        activeSessionHolder.getSafeActiveSession()?.let { session ->
+            session.cryptoService().fetchDevicesList(NoOpMatrixCallback())
+            session.cryptoService().downloadKeys(listOf(session.myUserId), true, NoOpMatrixCallback())
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/SessionWarningInfoView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/SessionWarningInfoView.kt
new file mode 100644
index 0000000000..938c6c99ab
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/SessionWarningInfoView.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextWithColoredPart
+import im.vector.app.databinding.ViewSessionWarningInfoBinding
+
+class SessionWarningInfoView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val binding = ViewSessionWarningInfoBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+
+    var onLearnMoreClickListener: (() -> Unit)? = null
+
+    init {
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.SessionWarningInfoView,
+                0,
+                0
+        ).use {
+            setDescription(it)
+        }
+    }
+
+    private fun setDescription(typedArray: TypedArray) {
+        val description = typedArray.getString(R.styleable.SessionWarningInfoView_sessionsWarningInfoDescription)
+        val hasLearnMore = typedArray.getBoolean(R.styleable.SessionWarningInfoView_sessionsWarningInfoHasLearnMore, false)
+        if (hasLearnMore) {
+            val learnMore = context.getString(R.string.action_learn_more)
+            val fullDescription = buildString {
+                append(description)
+                append(" ")
+                append(learnMore)
+            }
+
+            binding.sessionWarningInfoDescription.setTextWithColoredPart(
+                    fullText = fullDescription,
+                    coloredPart = learnMore,
+                    underline = false
+            ) {
+                onLearnMoreClickListener?.invoke()
+            }
+        } else {
+            binding.sessionWarningInfoDescription.text = description
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/ToggleIpAddressVisibilityUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/ToggleIpAddressVisibilityUseCase.kt
new file mode 100644
index 0000000000..1e1dc19c96
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/ToggleIpAddressVisibilityUseCase.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.features.settings.VectorPreferences
+import javax.inject.Inject
+
+class ToggleIpAddressVisibilityUseCase @Inject constructor(
+        private val vectorPreferences: VectorPreferences,
+) {
+
+    fun execute() {
+        val currentVisibility = vectorPreferences.showIpAddressInSessionManagerScreens()
+        vectorPreferences.setIpAddressVisibilityInDeviceManagerScreens(!currentVisibility)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSessionsListViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSessionsListViewModel.kt
new file mode 100644
index 0000000000..8cb69a31ed
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSessionsListViewModel.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import com.airbnb.mvrx.MavericksState
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.core.utils.PublishDataSource
+import im.vector.lib.core.utils.flow.throttleFirst
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import kotlin.time.Duration.Companion.seconds
+
+abstract class VectorSessionsListViewModel<S : MavericksState, VA : VectorViewModelAction, VE : VectorViewEvents>(
+        initialState: S,
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val refreshDevicesUseCase: RefreshDevicesUseCase,
+) : VectorViewModel<S, VA, VE>(initialState), VerificationService.Listener {
+
+    private val refreshSource = PublishDataSource<Unit>()
+    private val refreshThrottleDelayMs = 4.seconds.inWholeMilliseconds
+
+    init {
+        addVerificationListener()
+        observeRefreshSource()
+    }
+
+    override fun onCleared() {
+        removeVerificationListener()
+        super.onCleared()
+    }
+
+    private fun addVerificationListener() {
+        activeSessionHolder.getSafeActiveSession()
+                ?.cryptoService()
+                ?.verificationService()
+                ?.addListener(this)
+    }
+
+    private fun removeVerificationListener() {
+        activeSessionHolder.getSafeActiveSession()
+                ?.cryptoService()
+                ?.verificationService()
+                ?.removeListener(this)
+    }
+
+    private fun observeRefreshSource() {
+        refreshSource.stream()
+                .throttleFirst(refreshThrottleDelayMs)
+                .onEach { refreshDevicesUseCase.execute() }
+                .launchIn(viewModelScope)
+    }
+
+    override fun transactionUpdated(tx: VerificationTransaction) {
+        if (tx.state == VerificationTxState.Verified) {
+            refreshDeviceList()
+        }
+    }
+
+    /**
+     * Force the refresh of the devices list.
+     * The devices list is the list of the devices where the user is logged in.
+     * It can be any mobile devices, and any browsers.
+     */
+    fun refreshDeviceList() {
+        refreshSource.post(Unit)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index 0d5dedacc9..f83b00a75e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -16,21 +16,70 @@
 
 package im.vector.app.features.settings.devices.v2
 
+import android.app.Activity
 import android.content.Context
+import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.dialogs.ManuallyVerifyDialog
+import im.vector.app.core.extensions.registerStartForActivityResult
+import im.vector.app.core.extensions.setTextColor
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.resources.StringProvider
 import im.vector.app.databinding.FragmentSettingsDevicesBinding
+import im.vector.app.features.VectorFeatures
+import im.vector.app.features.auth.ReAuthActivity
+import im.vector.app.features.crypto.recover.SetupMode
+import im.vector.app.features.crypto.verification.VerificationBottomSheet
+import im.vector.app.features.login.qr.QrCodeLoginArgs
+import im.vector.app.features.login.qr.QrCodeLoginType
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.list.NUMBER_OF_OTHER_DEVICES_TO_RENDER
+import im.vector.app.features.settings.devices.v2.list.OtherSessionsView
+import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+import im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
+import im.vector.app.features.settings.devices.v2.list.SecurityRecommendationViewState
+import im.vector.app.features.settings.devices.v2.list.SessionInfoViewState
+import im.vector.app.features.settings.devices.v2.signout.BuildConfirmSignoutDialogUseCase
+import im.vector.app.features.workers.signout.SignOutUiWorker
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.extensions.orFalse
 import javax.inject.Inject
 
 /**
  * Display the list of the user's devices and sessions.
  */
 @AndroidEntryPoint
-class VectorSettingsDevicesFragment @Inject constructor() : VectorBaseFragment<FragmentSettingsDevicesBinding>() {
+class VectorSettingsDevicesFragment :
+        VectorBaseFragment<FragmentSettingsDevicesBinding>(),
+        OtherSessionsView.Callback {
+
+    @Inject lateinit var viewNavigator: VectorSettingsDevicesViewNavigator
+
+    @Inject lateinit var dateFormatter: VectorDateFormatter
+
+    @Inject lateinit var drawableProvider: DrawableProvider
+
+    @Inject lateinit var colorProvider: ColorProvider
+
+    @Inject lateinit var vectorFeatures: VectorFeatures
+
+    @Inject lateinit var stringProvider: StringProvider
+
+    @Inject lateinit var buildConfirmSignoutDialogUseCase: BuildConfirmSignoutDialogUseCase
+
+    private val viewModel: DevicesViewModel by fragmentViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSettingsDevicesBinding {
         return FragmentSettingsDevicesBinding.inflate(inflater, container, false)
@@ -46,4 +95,391 @@ class VectorSettingsDevicesFragment @Inject constructor() : VectorBaseFragment<F
                 ?.supportActionBar
                 ?.setTitle(R.string.settings_sessions_list)
     }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initWaitingView()
+        initCurrentSessionHeaderView()
+        initCurrentSessionView()
+        initOtherSessionsHeaderView()
+        initOtherSessionsView()
+        initSecurityRecommendationsView()
+        initQrLoginView()
+        observeViewEvents()
+    }
+
+    private fun observeViewEvents() {
+        viewModel.observeViewEvents {
+            when (it) {
+                is DevicesViewEvent.RequestReAuth -> askForReAuthentication(it)
+                is DevicesViewEvent.ShowVerifyDevice -> {
+                    VerificationBottomSheet.withArgs(
+                            roomId = null,
+                            otherUserId = it.userId,
+                            transactionId = it.transactionId
+                    ).show(childFragmentManager, "REQPOP")
+                }
+                is DevicesViewEvent.SelfVerification -> {
+                    navigator.requestSelfSessionVerification(requireActivity())
+                }
+                is DevicesViewEvent.ShowManuallyVerify -> {
+                    ManuallyVerifyDialog.show(requireActivity(), it.cryptoDeviceInfo) {
+                        viewModel.handle(DevicesAction.MarkAsManuallyVerified(it.cryptoDeviceInfo))
+                    }
+                }
+                is DevicesViewEvent.PromptResetSecrets -> {
+                    navigator.open4SSetup(requireActivity(), SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET)
+                }
+                is DevicesViewEvent.SignoutError -> showFailure(it.error)
+                is DevicesViewEvent.SignoutSuccess -> Unit // do nothing
+            }
+        }
+    }
+
+    private fun initWaitingView() {
+        views.waitingView.waitingStatusText.setText(R.string.please_wait)
+        views.waitingView.waitingStatusText.isVisible = true
+    }
+
+    private fun initCurrentSessionHeaderView() {
+        views.deviceListHeaderCurrentSession.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.currentSessionHeaderRename -> {
+                    navigateToRenameCurrentSession()
+                    true
+                }
+                R.id.currentSessionHeaderSignout -> {
+                    confirmSignoutCurrentSession()
+                    true
+                }
+                R.id.currentSessionHeaderSignoutOtherSessions -> {
+                    confirmMultiSignoutOtherSessions()
+                    true
+                }
+                else -> false
+            }
+        }
+    }
+
+    private fun navigateToRenameCurrentSession() = withState(viewModel) { state ->
+        val currentDeviceId = state.currentSessionCrossSigningInfo.deviceId
+        if (currentDeviceId.isNotEmpty()) {
+            viewNavigator.navigateToRenameSession(
+                    context = requireActivity(),
+                    deviceId = currentDeviceId,
+            )
+        }
+    }
+
+    private fun confirmSignoutCurrentSession() {
+        activity?.let { SignOutUiWorker(it).perform() }
+    }
+
+    private fun initCurrentSessionView() {
+        views.deviceListCurrentSession.viewVerifyButton.debouncedClicks {
+            viewModel.handle(DevicesAction.VerifyCurrentSession)
+        }
+    }
+
+    private fun initOtherSessionsHeaderView() {
+        views.deviceListHeaderOtherSessions.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.otherSessionsHeaderMultiSignout -> {
+                    confirmMultiSignoutOtherSessions()
+                    true
+                }
+                R.id.otherSessionsHeaderToggleIpAddress -> {
+                    handleToggleIpAddressVisibility()
+                    true
+                }
+                else -> false
+            }
+        }
+    }
+
+    private fun handleToggleIpAddressVisibility() {
+        viewModel.handle(DevicesAction.ToggleIpAddressVisibility)
+    }
+
+    private fun confirmMultiSignoutOtherSessions() {
+        activity?.let {
+            buildConfirmSignoutDialogUseCase.execute(it, this::multiSignoutOtherSessions)
+                    .show()
+        }
+    }
+
+    private fun multiSignoutOtherSessions() {
+        viewModel.handle(DevicesAction.MultiSignoutOtherSessions)
+    }
+
+    private fun initOtherSessionsView() {
+        views.deviceListOtherSessions.callback = this
+    }
+
+    private fun initSecurityRecommendationsView() {
+        views.deviceListUnverifiedSessionsRecommendation.callback = object : SecurityRecommendationView.Callback {
+            override fun onViewAllClicked() {
+                viewNavigator.navigateToOtherSessions(
+                        requireActivity(),
+                        DeviceManagerFilterType.UNVERIFIED,
+                        excludeCurrentDevice = true
+                )
+            }
+        }
+        views.deviceListInactiveSessionsRecommendation.callback = object : SecurityRecommendationView.Callback {
+            override fun onViewAllClicked() {
+                viewNavigator.navigateToOtherSessions(
+                        requireActivity(),
+                        DeviceManagerFilterType.INACTIVE,
+                        excludeCurrentDevice = true
+                )
+            }
+        }
+    }
+
+    private fun initQrLoginView() {
+        if (!vectorFeatures.isReciprocateQrCodeLogin()) {
+            views.deviceListHeaderSignInWithQrCode.isVisible = false
+            views.deviceListHeaderScanQrCodeButton.isVisible = false
+            views.deviceListHeaderShowQrCodeButton.isVisible = false
+            return
+        }
+
+        views.deviceListHeaderSignInWithQrCode.isVisible = true
+        views.deviceListHeaderScanQrCodeButton.isVisible = true
+        views.deviceListHeaderShowQrCodeButton.isVisible = true
+
+        views.deviceListHeaderScanQrCodeButton.debouncedClicks {
+            navigateToQrCodeScreen(showQrCodeImmediately = false)
+        }
+
+        views.deviceListHeaderShowQrCodeButton.debouncedClicks {
+            navigateToQrCodeScreen(showQrCodeImmediately = true)
+        }
+    }
+
+    private fun navigateToQrCodeScreen(showQrCodeImmediately: Boolean) {
+        navigator
+                .openLoginWithQrCode(
+                        requireActivity(),
+                        QrCodeLoginArgs(
+                                loginType = QrCodeLoginType.LINK_A_DEVICE,
+                                showQrCodeImmediately = showQrCodeImmediately,
+                        )
+                )
+    }
+
+    override fun onDestroyView() {
+        cleanUpLearnMoreButtonsListeners()
+        super.onDestroyView()
+    }
+
+    private fun cleanUpLearnMoreButtonsListeners() {
+        views.deviceListHeaderOtherSessions.onLearnMoreClickListener = null
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        if (state.devices is Success) {
+            val deviceFullInfoList = state.devices()
+            val devices = deviceFullInfoList?.allSessions
+            val currentDeviceId = state.currentSessionCrossSigningInfo.deviceId
+            val currentDeviceInfo = devices?.firstOrNull { it.deviceInfo.deviceId == currentDeviceId }
+            val otherDevices = devices?.filter { it.deviceInfo.deviceId != currentDeviceId }
+            val inactiveSessionsCount = deviceFullInfoList?.inactiveSessionsCount ?: 0
+            val unverifiedSessionsCount = deviceFullInfoList?.unverifiedSessionsCount ?: 0
+
+            renderSecurityRecommendations(inactiveSessionsCount, unverifiedSessionsCount)
+            renderCurrentSessionView(currentDeviceInfo, hasOtherDevices = otherDevices?.isNotEmpty().orFalse())
+            renderOtherSessionsView(otherDevices, state.isShowingIpAddress)
+        } else {
+            hideSecurityRecommendations()
+            hideCurrentSessionView()
+            hideOtherSessionsView()
+        }
+
+        handleLoadingStatus(state.isLoading)
+    }
+
+    private fun renderSecurityRecommendations(
+            inactiveSessionsCount: Int,
+            unverifiedSessionsCount: Int,
+    ) {
+        val isUnverifiedSectionVisible = unverifiedSessionsCount > 0
+        val isInactiveSectionVisible = inactiveSessionsCount > 0
+        if (isUnverifiedSectionVisible.not() && isInactiveSectionVisible.not()) {
+            hideSecurityRecommendations()
+        } else {
+            views.deviceListHeaderSectionSecurityRecommendations.isVisible = true
+            views.deviceListSecurityRecommendationsDivider.isVisible = true
+
+            views.deviceListUnverifiedSessionsRecommendation.isVisible = isUnverifiedSectionVisible
+            views.deviceListInactiveSessionsRecommendation.isVisible = isInactiveSectionVisible
+            val unverifiedSessionsViewState = SecurityRecommendationViewState(
+                    description = getString(R.string.device_manager_unverified_sessions_description),
+                    sessionsCount = unverifiedSessionsCount,
+            )
+            views.deviceListUnverifiedSessionsRecommendation.render(unverifiedSessionsViewState)
+            val inactiveSessionsViewState = SecurityRecommendationViewState(
+                    description = resources.getQuantityString(
+                            R.plurals.device_manager_inactive_sessions_description,
+                            SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
+                            SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+                    ),
+                    sessionsCount = inactiveSessionsCount,
+            )
+            views.deviceListInactiveSessionsRecommendation.render(inactiveSessionsViewState)
+        }
+    }
+
+    private fun hideUnverifiedSessionsRecommendation() {
+        views.deviceListUnverifiedSessionsRecommendation.isVisible = false
+    }
+
+    private fun hideInactiveSessionsRecommendation() {
+        views.deviceListInactiveSessionsRecommendation.isVisible = false
+    }
+
+    private fun hideSecurityRecommendations() {
+        views.deviceListHeaderSectionSecurityRecommendations.isVisible = false
+        views.deviceListSecurityRecommendationsDivider.isVisible = false
+        hideUnverifiedSessionsRecommendation()
+        hideInactiveSessionsRecommendation()
+    }
+
+    private fun renderOtherSessionsView(otherDevices: List<DeviceFullInfo>?, isShowingIpAddress: Boolean) {
+        if (otherDevices.isNullOrEmpty()) {
+            hideOtherSessionsView()
+        } else {
+            views.deviceListHeaderOtherSessions.isVisible = true
+            val colorDestructive = colorProvider.getColorFromAttribute(R.attr.colorError)
+            val multiSignoutItem = views.deviceListHeaderOtherSessions.menu.findItem(R.id.otherSessionsHeaderMultiSignout)
+            val nbDevices = otherDevices.size
+            multiSignoutItem.title = stringProvider.getQuantityString(R.plurals.device_manager_other_sessions_multi_signout_all, nbDevices, nbDevices)
+            multiSignoutItem.setTextColor(colorDestructive)
+            views.deviceListOtherSessions.isVisible = true
+            val devices = if (isShowingIpAddress) otherDevices else otherDevices.map { it.copy(deviceInfo = it.deviceInfo.copy(lastSeenIp = null)) }
+            views.deviceListOtherSessions.render(
+                    devices = devices.take(NUMBER_OF_OTHER_DEVICES_TO_RENDER),
+                    totalNumberOfDevices = devices.size,
+                    showViewAll = devices.size > NUMBER_OF_OTHER_DEVICES_TO_RENDER
+            )
+            views.deviceListHeaderOtherSessions.menu.findItem(R.id.otherSessionsHeaderToggleIpAddress).title = if (isShowingIpAddress) {
+                stringProvider.getString(R.string.device_manager_other_sessions_hide_ip_address)
+            } else {
+                stringProvider.getString(R.string.device_manager_other_sessions_show_ip_address)
+            }
+        }
+    }
+
+    private fun hideOtherSessionsView() {
+        views.deviceListHeaderOtherSessions.isVisible = false
+        views.deviceListOtherSessions.isVisible = false
+    }
+
+    private fun renderCurrentSessionView(currentDeviceInfo: DeviceFullInfo?, hasOtherDevices: Boolean) {
+        currentDeviceInfo?.let {
+            renderCurrentSessionHeaderView(hasOtherDevices)
+            renderCurrentSessionListView(it)
+        } ?: run {
+            hideCurrentSessionView()
+        }
+    }
+
+    private fun renderCurrentSessionHeaderView(hasOtherDevices: Boolean) {
+        views.deviceListHeaderCurrentSession.isVisible = true
+        val colorDestructive = colorProvider.getColorFromAttribute(R.attr.colorError)
+        val signoutSessionItem = views.deviceListHeaderCurrentSession.menu.findItem(R.id.currentSessionHeaderSignout)
+        signoutSessionItem.setTextColor(colorDestructive)
+        val signoutOtherSessionsItem = views.deviceListHeaderCurrentSession.menu.findItem(R.id.currentSessionHeaderSignoutOtherSessions)
+        signoutOtherSessionsItem.setTextColor(colorDestructive)
+        signoutOtherSessionsItem.isVisible = hasOtherDevices
+    }
+
+    private fun renderCurrentSessionListView(currentDeviceInfo: DeviceFullInfo) {
+        views.deviceListCurrentSession.isVisible = true
+        val viewState = SessionInfoViewState(
+                isCurrentSession = true,
+                deviceFullInfo = currentDeviceInfo
+        )
+        views.deviceListCurrentSession.render(viewState, dateFormatter, drawableProvider, colorProvider, stringProvider)
+        views.deviceListCurrentSession.debouncedClicks {
+            currentDeviceInfo.deviceInfo.deviceId?.let { deviceId -> navigateToSessionOverview(deviceId) }
+        }
+        views.deviceListCurrentSession.viewDetailsButton.debouncedClicks {
+            currentDeviceInfo.deviceInfo.deviceId?.let { deviceId -> navigateToSessionOverview(deviceId) }
+        }
+    }
+
+    private fun navigateToSessionOverview(deviceId: String) {
+        viewNavigator.navigateToSessionOverview(
+                context = requireActivity(),
+                deviceId = deviceId
+        )
+    }
+
+    private fun hideCurrentSessionView() {
+        views.deviceListHeaderCurrentSession.isVisible = false
+        views.deviceListCurrentSession.isVisible = false
+        views.deviceListDividerCurrentSession.isVisible = false
+        views.deviceListCurrentSession.debouncedClicks {
+            // do nothing
+        }
+        views.deviceListCurrentSession.viewDetailsButton.debouncedClicks {
+            // do nothing
+        }
+    }
+
+    private fun handleLoadingStatus(isLoading: Boolean) {
+        views.waitingView.root.isVisible = isLoading
+    }
+
+    override fun onOtherSessionLongClicked(deviceId: String) {
+        // do nothing
+    }
+
+    override fun onOtherSessionClicked(deviceId: String) {
+        navigateToSessionOverview(deviceId)
+    }
+
+    override fun onViewAllOtherSessionsClicked() {
+        viewNavigator.navigateToOtherSessions(
+                context = requireActivity(),
+                defaultFilter = DeviceManagerFilterType.ALL_SESSIONS,
+                excludeCurrentDevice = true
+        )
+    }
+
+    private val reAuthActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            when (activityResult.data?.extras?.getString(ReAuthActivity.RESULT_FLOW_TYPE)) {
+                LoginFlowTypes.SSO -> {
+                    viewModel.handle(DevicesAction.SsoAuthDone)
+                }
+                LoginFlowTypes.PASSWORD -> {
+                    val password = activityResult.data?.extras?.getString(ReAuthActivity.RESULT_VALUE) ?: ""
+                    viewModel.handle(DevicesAction.PasswordAuthDone(password))
+                }
+                else -> {
+                    viewModel.handle(DevicesAction.ReAuthCancelled)
+                }
+            }
+        } else {
+            viewModel.handle(DevicesAction.ReAuthCancelled)
+        }
+    }
+
+    /**
+     * Launch the re auth activity to get credentials.
+     */
+    private fun askForReAuthentication(reAuthReq: DevicesViewEvent.RequestReAuth) {
+        ReAuthActivity.newIntent(
+                requireContext(),
+                reAuthReq.registrationFlowResponse,
+                reAuthReq.lastErrorCode,
+                getString(R.string.devices_delete_dialog_title)
+        ).let { intent ->
+            reAuthActivityResultLauncher.launch(intent)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigator.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigator.kt
new file mode 100644
index 0000000000..bcfa1c30db
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigator.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import android.content.Context
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.othersessions.OtherSessionsActivity
+import im.vector.app.features.settings.devices.v2.overview.SessionOverviewActivity
+import im.vector.app.features.settings.devices.v2.rename.RenameSessionActivity
+import javax.inject.Inject
+
+class VectorSettingsDevicesViewNavigator @Inject constructor() {
+
+    fun navigateToSessionOverview(context: Context, deviceId: String) {
+        context.startActivity(SessionOverviewActivity.newIntent(context, deviceId))
+    }
+
+    fun navigateToOtherSessions(
+            context: Context,
+            defaultFilter: DeviceManagerFilterType,
+            excludeCurrentDevice: Boolean,
+    ) {
+        context.startActivity(
+                OtherSessionsActivity.newIntent(context, defaultFilter, excludeCurrentDevice)
+        )
+    }
+
+    fun navigateToRenameSession(context: Context, deviceId: String) {
+        context.startActivity(RenameSessionActivity.newIntent(context, deviceId))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionApplicationIsVisibleUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionApplicationIsVisibleUseCase.kt
new file mode 100644
index 0000000000..0c790c2ef0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionApplicationIsVisibleUseCase.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import im.vector.app.core.session.clientinfo.MatrixClientInfoContent
+import org.matrix.android.sdk.api.extensions.orFalse
+import javax.inject.Inject
+
+class CheckIfSectionApplicationIsVisibleUseCase @Inject constructor() {
+
+    fun execute(matrixClientInfoContent: MatrixClientInfoContent?): Boolean {
+        return matrixClientInfoContent?.name?.isNotEmpty().orFalse() ||
+                matrixClientInfoContent?.version?.isNotEmpty().orFalse() ||
+                matrixClientInfoContent?.url?.isNotEmpty().orFalse()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionDeviceIsVisibleUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionDeviceIsVisibleUseCase.kt
new file mode 100644
index 0000000000..471ef05c8d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionDeviceIsVisibleUseCase.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import org.matrix.android.sdk.api.extensions.orFalse
+import javax.inject.Inject
+
+class CheckIfSectionDeviceIsVisibleUseCase @Inject constructor() {
+
+    fun execute(deviceFullInfo: DeviceFullInfo): Boolean {
+        val hasExtendedInfo = when (deviceFullInfo.deviceExtendedInfo.deviceType) {
+            DeviceType.MOBILE -> hasAnyDeviceExtendedInfoMobile(deviceFullInfo.deviceExtendedInfo)
+            DeviceType.WEB -> hasAnyDeviceExtendedInfoWeb(deviceFullInfo.deviceExtendedInfo)
+            DeviceType.DESKTOP -> hasAnyDeviceExtendedInfoDesktop(deviceFullInfo.deviceExtendedInfo)
+            DeviceType.UNKNOWN -> false
+        }
+
+        return hasExtendedInfo || deviceFullInfo.deviceInfo.lastSeenIp?.isNotEmpty().orFalse()
+    }
+
+    private fun hasAnyDeviceExtendedInfoMobile(deviceExtendedInfo: DeviceExtendedInfo): Boolean {
+        return deviceExtendedInfo.deviceModel?.isNotEmpty().orFalse() ||
+                deviceExtendedInfo.deviceOperatingSystem?.isNotEmpty().orFalse()
+    }
+
+    private fun hasAnyDeviceExtendedInfoWeb(deviceExtendedInfo: DeviceExtendedInfo): Boolean {
+        return deviceExtendedInfo.clientName?.isNotEmpty().orFalse() ||
+                deviceExtendedInfo.deviceOperatingSystem?.isNotEmpty().orFalse()
+    }
+
+    private fun hasAnyDeviceExtendedInfoDesktop(deviceExtendedInfo: DeviceExtendedInfo): Boolean {
+        return deviceExtendedInfo.deviceOperatingSystem?.isNotEmpty().orFalse()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionSessionIsVisibleUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionSessionIsVisibleUseCase.kt
new file mode 100644
index 0000000000..4998b4b5d3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionSessionIsVisibleUseCase.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import javax.inject.Inject
+
+class CheckIfSectionSessionIsVisibleUseCase @Inject constructor() {
+
+    fun execute(deviceInfo: DeviceInfo): Boolean {
+        return deviceInfo.displayName?.isNotEmpty().orFalse() ||
+                deviceInfo.deviceId?.isNotEmpty().orFalse() ||
+                (deviceInfo.lastSeenTs ?: 0) > 0
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsAction.kt
similarity index 60%
rename from vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedAction.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsAction.kt
index f108bfa886..0fa524dab4 100644
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsAction.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2020 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.login2.created
+package im.vector.app.features.settings.devices.v2.details
 
-import android.net.Uri
 import im.vector.app.core.platform.VectorViewModelAction
 
-sealed class AccountCreatedAction : VectorViewModelAction {
-    data class SetDisplayName(val displayName: String) : AccountCreatedAction()
-    data class SetAvatar(val avatarUri: Uri, val filename: String) : AccountCreatedAction()
+sealed class SessionDetailsAction : VectorViewModelAction {
+    data class CopyToClipboard(val content: String) : SessionDetailsAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsActivity.kt
new file mode 100644
index 0000000000..fb4e94b630
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsActivity.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.airbnb.mvrx.Mavericks
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
+
+/**
+ * Display the details info about a Session.
+ */
+@AndroidEntryPoint
+class SessionDetailsActivity : SimpleFragmentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (isFirstCreation()) {
+            addFragment(
+                    container = views.container,
+                    fragmentClass = SessionDetailsFragment::class.java,
+                    params = intent.getParcelableExtraCompat(Mavericks.KEY_ARG)
+            )
+        }
+    }
+
+    companion object {
+        fun newIntent(context: Context, deviceId: String): Intent {
+            return Intent(context, SessionDetailsActivity::class.java).apply {
+                putExtra(Mavericks.KEY_ARG, SessionDetailsArgs(deviceId))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsArgs.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsArgs.kt
new file mode 100644
index 0000000000..97716d7c47
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsArgs.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class SessionDetailsArgs(
+        val deviceId: String
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsContentItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsContentItem.kt
new file mode 100644
index 0000000000..665ba5126c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsContentItem.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import android.view.View
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+
+@EpoxyModelClass
+abstract class SessionDetailsContentItem : VectorEpoxyModel<SessionDetailsContentItem.Holder>(R.layout.item_session_details_content) {
+
+    @EpoxyAttribute
+    var title: String? = null
+
+    @EpoxyAttribute
+    var description: String? = null
+
+    @EpoxyAttribute
+    var hasDivider: Boolean = true
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var onLongClickListener: View.OnLongClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.sessionDetailsContentTitle.text = title
+        holder.sessionDetailsContentDescription.text = description
+        holder.view.isClickable = onLongClickListener != null
+        holder.view.setOnLongClickListener(onLongClickListener)
+        holder.sessionDetailsContentDivider.isVisible = hasDivider
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val sessionDetailsContentTitle by bind<TextView>(R.id.sessionDetailsContentTitle)
+        val sessionDetailsContentDescription by bind<TextView>(R.id.sessionDetailsContentDescription)
+        val sessionDetailsContentDivider by bind<View>(R.id.sessionDetailsContentDivider)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsController.kt
new file mode 100644
index 0000000000..8d780925df
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsController.kt
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import android.view.View
+import androidx.annotation.StringRes
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.date.DateFormatKind
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.session.clientinfo.MatrixClientInfoContent
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import javax.inject.Inject
+
+class SessionDetailsController @Inject constructor(
+        private val checkIfSectionSessionIsVisibleUseCase: CheckIfSectionSessionIsVisibleUseCase,
+        private val checkIfSectionDeviceIsVisibleUseCase: CheckIfSectionDeviceIsVisibleUseCase,
+        private val checkIfSectionApplicationIsVisibleUseCase: CheckIfSectionApplicationIsVisibleUseCase,
+        private val stringProvider: StringProvider,
+        private val dateFormatter: VectorDateFormatter,
+        private val dimensionConverter: DimensionConverter,
+) : TypedEpoxyController<DeviceFullInfo>() {
+
+    var callback: Callback? = null
+
+    interface Callback {
+        fun onItemLongClicked(content: String)
+    }
+
+    override fun buildModels(data: DeviceFullInfo?) {
+        data?.let { fullInfo ->
+            val deviceInfo = fullInfo.deviceInfo
+            val matrixClientInfo = fullInfo.matrixClientInfo
+            val hasSectionSession = hasSectionSession(deviceInfo)
+            if (hasSectionSession) {
+                buildSectionSession(deviceInfo)
+            }
+
+            val hasApplicationSection = hasSectionApplication(matrixClientInfo)
+            if (hasApplicationSection && matrixClientInfo != null) {
+                buildSectionApplication(matrixClientInfo, addExtraTopMargin = hasSectionSession)
+            }
+
+            if (hasSectionDevice(fullInfo)) {
+                buildSectionDevice(fullInfo, addExtraTopMargin = hasSectionSession || hasApplicationSection)
+            }
+        }
+    }
+
+    private fun buildHeaderItem(@StringRes titleResId: Int, addExtraTopMargin: Boolean = false) {
+        val host = this
+        sessionDetailsHeaderItem {
+            id(titleResId)
+            title(host.stringProvider.getString(titleResId))
+            addExtraTopMargin(addExtraTopMargin)
+            dimensionConverter(host.dimensionConverter)
+        }
+    }
+
+    private fun buildContentItem(@StringRes titleResId: Int, value: String, hasDivider: Boolean) {
+        val host = this
+        sessionDetailsContentItem {
+            id(titleResId)
+            title(host.stringProvider.getString(titleResId))
+            description(value)
+            hasDivider(hasDivider)
+            onLongClickListener(View.OnLongClickListener {
+                host.callback?.onItemLongClicked(value)
+                true
+            })
+        }
+    }
+
+    private fun hasSectionSession(data: DeviceInfo): Boolean {
+        return checkIfSectionSessionIsVisibleUseCase.execute(data)
+    }
+
+    private fun buildSectionSession(data: DeviceInfo) {
+        val sessionName = data.displayName.orEmpty()
+        val sessionId = data.deviceId.orEmpty()
+        val sessionLastSeenTs = data.lastSeenTs ?: -1
+
+        buildHeaderItem(R.string.device_manager_session_title)
+
+        if (sessionName.isNotEmpty()) {
+            val hasDivider = sessionId.isNotEmpty() || sessionLastSeenTs > 0
+            buildContentItem(R.string.device_manager_session_details_session_name, sessionName, hasDivider)
+        }
+        if (sessionId.isNotEmpty()) {
+            val hasDivider = sessionLastSeenTs > 0
+            buildContentItem(R.string.device_manager_session_details_session_id, sessionId, hasDivider)
+        }
+        if (sessionLastSeenTs > 0) {
+            val formattedDate = dateFormatter.format(sessionLastSeenTs, DateFormatKind.MESSAGE_DETAIL)
+            val hasDivider = false
+            buildContentItem(R.string.device_manager_session_details_session_last_activity, formattedDate, hasDivider)
+        }
+    }
+
+    private fun hasSectionApplication(matrixClientInfoContent: MatrixClientInfoContent?): Boolean {
+        return checkIfSectionApplicationIsVisibleUseCase.execute(matrixClientInfoContent)
+    }
+
+    private fun buildSectionApplication(matrixClientInfoContent: MatrixClientInfoContent, addExtraTopMargin: Boolean) {
+        val name = matrixClientInfoContent.name.orEmpty()
+        val version = matrixClientInfoContent.version.orEmpty()
+        val url = matrixClientInfoContent.url.orEmpty()
+
+        buildHeaderItem(R.string.device_manager_session_details_application, addExtraTopMargin)
+
+        if (name.isNotEmpty()) {
+            val hasDivider = version.isNotEmpty() || url.isNotEmpty()
+            buildContentItem(R.string.device_manager_session_details_application_name, name, hasDivider)
+        }
+        if (version.isNotEmpty()) {
+            val hasDivider = url.isNotEmpty()
+            buildContentItem(R.string.device_manager_session_details_application_version, version, hasDivider)
+        }
+        if (url.isNotEmpty()) {
+            val hasDivider = false
+            buildContentItem(R.string.device_manager_session_details_application_url, url, hasDivider)
+        }
+    }
+
+    private fun hasSectionDevice(data: DeviceFullInfo): Boolean {
+        return checkIfSectionDeviceIsVisibleUseCase.execute(data)
+    }
+
+    private fun buildSectionDevice(data: DeviceFullInfo, addExtraTopMargin: Boolean) {
+        buildHeaderItem(R.string.device_manager_device_title, addExtraTopMargin)
+
+        when (data.deviceExtendedInfo.deviceType) {
+            DeviceType.MOBILE -> buildSectionDeviceMobile(data)
+            DeviceType.WEB -> buildSectionDeviceWeb(data)
+            DeviceType.DESKTOP -> buildSectionDeviceDesktop(data)
+            DeviceType.UNKNOWN -> buildSectionDeviceUnknown(data)
+        }
+    }
+
+    private fun buildSectionDeviceWeb(data: DeviceFullInfo) {
+        val browserName = data.deviceExtendedInfo.clientName.orEmpty()
+        val browserVersion = data.deviceExtendedInfo.clientVersion.orEmpty()
+        val browser = "$browserName $browserVersion"
+        val operatingSystem = data.deviceExtendedInfo.deviceOperatingSystem.orEmpty()
+        val lastSeenIp = data.deviceInfo.lastSeenIp.orEmpty()
+
+        if (browser.isNotEmpty()) {
+            val hasDivider = operatingSystem.isNotEmpty() || lastSeenIp.isNotEmpty()
+            buildContentItem(R.string.device_manager_session_details_device_browser, browser, hasDivider)
+        }
+
+        if (operatingSystem.isNotEmpty()) {
+            val hasDivider = lastSeenIp.isNotEmpty()
+            buildContentItem(R.string.device_manager_session_details_device_operating_system, operatingSystem, hasDivider)
+        }
+
+        buildIpAddressContentItem(lastSeenIp)
+    }
+
+    private fun buildSectionDeviceDesktop(data: DeviceFullInfo) {
+        val operatingSystem = data.deviceExtendedInfo.deviceOperatingSystem.orEmpty()
+        val lastSeenIp = data.deviceInfo.lastSeenIp.orEmpty()
+
+        if (operatingSystem.isNotEmpty()) {
+            val hasDivider = lastSeenIp.isNotEmpty()
+            buildContentItem(R.string.device_manager_session_details_device_operating_system, operatingSystem, hasDivider)
+        }
+
+        buildIpAddressContentItem(lastSeenIp)
+    }
+
+    private fun buildSectionDeviceMobile(data: DeviceFullInfo) {
+        val model = data.deviceExtendedInfo.deviceModel.orEmpty()
+        val operatingSystem = data.deviceExtendedInfo.deviceOperatingSystem.orEmpty()
+        val lastSeenIp = data.deviceInfo.lastSeenIp.orEmpty()
+
+        if (model.isNotEmpty()) {
+            val hasDivider = operatingSystem.isNotEmpty() || lastSeenIp.isNotEmpty()
+            buildContentItem(R.string.device_manager_session_details_device_model, model, hasDivider)
+        }
+
+        if (operatingSystem.isNotEmpty()) {
+            val hasDivider = lastSeenIp.isNotEmpty()
+            buildContentItem(R.string.device_manager_session_details_device_operating_system, operatingSystem, hasDivider)
+        }
+
+        buildIpAddressContentItem(lastSeenIp)
+    }
+
+    private fun buildSectionDeviceUnknown(data: DeviceFullInfo) {
+        val lastSeenIp = data.deviceInfo.lastSeenIp.orEmpty()
+        buildIpAddressContentItem(lastSeenIp)
+    }
+
+    private fun buildIpAddressContentItem(lastSeenIp: String) {
+        if (lastSeenIp.isNotEmpty()) {
+            val hasDivider = false
+            buildContentItem(R.string.device_manager_session_details_device_ip_address, lastSeenIp, hasDivider)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsFragment.kt
new file mode 100644
index 0000000000..c5296929a6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsFragment.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.platform.showOptimizedSnackbar
+import im.vector.app.databinding.FragmentSessionDetailsBinding
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import javax.inject.Inject
+
+/**
+ * Display the details info about a Session.
+ */
+@AndroidEntryPoint
+class SessionDetailsFragment :
+        VectorBaseFragment<FragmentSessionDetailsBinding>() {
+
+    @Inject lateinit var sessionDetailsController: SessionDetailsController
+
+    private val viewModel: SessionDetailsViewModel by fragmentViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSessionDetailsBinding {
+        return FragmentSessionDetailsBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initToolbar()
+        initSessionDetails()
+        observeViewEvents()
+    }
+
+    private fun initToolbar() {
+        (activity as? AppCompatActivity)
+                ?.supportActionBar
+                ?.setTitle(R.string.device_manager_session_details_title)
+    }
+
+    private fun initSessionDetails() {
+        sessionDetailsController.callback = object : SessionDetailsController.Callback {
+            override fun onItemLongClicked(content: String) {
+                viewModel.handle(SessionDetailsAction.CopyToClipboard(content))
+            }
+        }
+        views.sessionDetails.configureWith(sessionDetailsController)
+    }
+
+    private fun observeViewEvents() {
+        viewModel.observeViewEvents { viewEvent ->
+            when (viewEvent) {
+                SessionDetailsViewEvent.ContentCopiedToClipboard -> view?.showOptimizedSnackbar(getString(R.string.copied_to_clipboard))
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        cleanUpSessionDetails()
+        super.onDestroyView()
+    }
+
+    private fun cleanUpSessionDetails() {
+        sessionDetailsController.callback = null
+        views.sessionDetails.cleanup()
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        if (state.deviceFullInfo is Success) {
+            renderSessionDetails(state.deviceFullInfo.invoke())
+        } else {
+            hideSessionDetails()
+        }
+    }
+
+    private fun renderSessionDetails(deviceFullInfo: DeviceFullInfo) {
+        views.sessionDetails.isVisible = true
+        sessionDetailsController.setData(deviceFullInfo)
+    }
+
+    private fun hideSessionDetails() {
+        views.sessionDetails.isGone = true
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsHeaderItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsHeaderItem.kt
new file mode 100644
index 0000000000..f76c21da8e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsHeaderItem.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updateMargins
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.utils.DimensionConverter
+
+private const val EXTRA_TOP_MARGIN_DP = 32
+
+@EpoxyModelClass
+abstract class SessionDetailsHeaderItem : VectorEpoxyModel<SessionDetailsHeaderItem.Holder>(R.layout.item_session_details_header) {
+
+    @EpoxyAttribute
+    var title: String? = null
+
+    @EpoxyAttribute
+    var addExtraTopMargin: Boolean = false
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var dimensionConverter: DimensionConverter? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.sessionDetailsHeaderTitle.text = title
+        val topMargin = if (addExtraTopMargin) {
+            dimensionConverter?.dpToPx(EXTRA_TOP_MARGIN_DP) ?: 0
+        } else {
+            0
+        }
+        holder.sessionDetailsHeaderTitle.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+            updateMargins(top = topMargin)
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val sessionDetailsHeaderTitle by bind<TextView>(R.id.sessionDetailsHeaderTitle)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewEvent.kt
similarity index 64%
rename from vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewEvent.kt
index 6a23409f5c..02b313319e 100644
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewEvent.kt
@@ -1,27 +1,23 @@
 /*
- * Copyright 2021 New Vector Ltd
+ * Copyright (c) 2022 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-package im.vector.app.features.login2.created
+package im.vector.app.features.settings.devices.v2.details
 
 import im.vector.app.core.platform.VectorViewEvents
 
-/**
- * Transient events for Account Created.
- */
-sealed class AccountCreatedViewEvents : VectorViewEvents {
-    data class Failure(val throwable: Throwable) : AccountCreatedViewEvents()
+sealed class SessionDetailsViewEvent : VectorViewEvents {
+    object ContentCopiedToClipboard : SessionDetailsViewEvent()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewModel.kt
new file mode 100644
index 0000000000..44e10701a0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewModel.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import com.airbnb.mvrx.Success
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.utils.CopyToClipboardUseCase
+import im.vector.app.features.settings.devices.v2.overview.GetDeviceFullInfoUseCase
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+
+class SessionDetailsViewModel @AssistedInject constructor(
+        @Assisted val initialState: SessionDetailsViewState,
+        private val getDeviceFullInfoUseCase: GetDeviceFullInfoUseCase,
+        private val copyToClipboardUseCase: CopyToClipboardUseCase,
+) : VectorViewModel<SessionDetailsViewState, SessionDetailsAction, SessionDetailsViewEvent>(initialState) {
+
+    companion object : MavericksViewModelFactory<SessionDetailsViewModel, SessionDetailsViewState> by hiltMavericksViewModelFactory()
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<SessionDetailsViewModel, SessionDetailsViewState> {
+        override fun create(initialState: SessionDetailsViewState): SessionDetailsViewModel
+    }
+
+    init {
+        observeSessionInfo(initialState.deviceId)
+    }
+
+    private fun observeSessionInfo(deviceId: String) {
+        getDeviceFullInfoUseCase.execute(deviceId)
+                .onEach { setState { copy(deviceFullInfo = Success(it)) } }
+                .launchIn(viewModelScope)
+    }
+
+    override fun handle(action: SessionDetailsAction) {
+        return when (action) {
+            is SessionDetailsAction.CopyToClipboard -> handleCopyToClipboard(action)
+        }
+    }
+
+    private fun handleCopyToClipboard(copyToClipboard: SessionDetailsAction.CopyToClipboard) {
+        copyToClipboardUseCase.execute(copyToClipboard.content)
+        _viewEvents.post(SessionDetailsViewEvent.ContentCopiedToClipboard)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewState.kt
similarity index 62%
rename from vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewState.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewState.kt
index 0ae60e910c..d216bbda51 100644
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewState.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2022 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.
@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.login2.created
+package im.vector.app.features.settings.devices.v2.details
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.util.MatrixItem
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
 
-data class AccountCreatedViewState(
-        val userId: String = "",
-        val isLoading: Boolean = false,
-        val currentUser: Async<MatrixItem.UserItem> = Uninitialized,
-        val hasBeenModified: Boolean = false
-) : MavericksState
+data class SessionDetailsViewState(
+        val deviceId: String,
+        val deviceFullInfo: Async<DeviceFullInfo> = Uninitialized,
+) : MavericksState {
+    constructor(args: SessionDetailsArgs) : this(
+            deviceId = args.deviceId
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/DeviceExtendedInfo.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/DeviceExtendedInfo.kt
new file mode 100644
index 0000000000..5158ffbb8a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/extended/DeviceExtendedInfo.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details.extended
+
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+
+data class DeviceExtendedInfo(
+        /**
+         * One of MOBILE, WEB, DESKTOP or UNKNOWN.
+         */
+        val deviceType: DeviceType,
+        /**
+         * i.e. Google Pixel 6.
+         */
+        val deviceModel: String? = null,
+        /**
+         * i.e. Android 11.
+         */
+        val deviceOperatingSystem: String? = null,
+        /**
+         * i.e. Element Nightly.
+         */
+        val clientName: String? = null,
+        /**
+         * i.e. 1.5.0.
+         */
+        val clientVersion: String? = null,
+)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterBottomSheet.kt
new file mode 100644
index 0000000000..28c7045a82
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterBottomSheet.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.filter
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment.ResultListener.Companion.RESULT_OK
+import im.vector.app.databinding.BottomSheetDeviceManagerFilterBinding
+import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class DeviceManagerFilterBottomSheetArgs(
+        val initialFilterType: DeviceManagerFilterType,
+) : Parcelable
+
+@AndroidEntryPoint
+class DeviceManagerFilterBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetDeviceManagerFilterBinding>() {
+
+    private val args: DeviceManagerFilterBottomSheetArgs by args()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetDeviceManagerFilterBinding {
+        return BottomSheetDeviceManagerFilterBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initFilterRadioGroup()
+    }
+
+    private fun initFilterRadioGroup() {
+        views.filterOptionInactiveTextView.text = resources.getQuantityString(
+                R.plurals.device_manager_filter_option_inactive_description,
+                SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
+                SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+        )
+
+        val radioButtonId = when (args.initialFilterType) {
+            DeviceManagerFilterType.ALL_SESSIONS -> R.id.filterOptionAllSessionsRadioButton
+            DeviceManagerFilterType.VERIFIED -> R.id.filterOptionVerifiedRadioButton
+            DeviceManagerFilterType.UNVERIFIED -> R.id.filterOptionUnverifiedRadioButton
+            DeviceManagerFilterType.INACTIVE -> R.id.filterOptionInactiveRadioButton
+        }
+        views.filterOptionsRadioGroup.check(radioButtonId)
+
+        views.filterOptionVerifiedTextView.debouncedClicks {
+            views.filterOptionsRadioGroup.check(R.id.filterOptionVerifiedRadioButton)
+        }
+        views.filterOptionUnverifiedTextView.debouncedClicks {
+            views.filterOptionsRadioGroup.check(R.id.filterOptionUnverifiedRadioButton)
+        }
+        views.filterOptionInactiveTextView.debouncedClicks {
+            views.filterOptionsRadioGroup.check(R.id.filterOptionInactiveRadioButton)
+        }
+
+        views.filterOptionsRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+            onFilterTypeChanged(checkedId)
+        }
+    }
+
+    private fun onFilterTypeChanged(checkedId: Int) {
+        val filterType = when (checkedId) {
+            R.id.filterOptionAllSessionsRadioButton -> DeviceManagerFilterType.ALL_SESSIONS
+            R.id.filterOptionVerifiedRadioButton -> DeviceManagerFilterType.VERIFIED
+            R.id.filterOptionUnverifiedRadioButton -> DeviceManagerFilterType.UNVERIFIED
+            R.id.filterOptionInactiveRadioButton -> DeviceManagerFilterType.INACTIVE
+            else -> DeviceManagerFilterType.ALL_SESSIONS
+        }
+        resultListener?.onBottomSheetResult(RESULT_OK, filterType)
+        dismiss()
+    }
+
+    companion object {
+        fun newInstance(initialFilterType: DeviceManagerFilterType, resultListener: ResultListener): DeviceManagerFilterBottomSheet {
+            return DeviceManagerFilterBottomSheet().apply {
+                this.resultListener = resultListener
+                setArguments(DeviceManagerFilterBottomSheetArgs(initialFilterType))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterType.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterType.kt
new file mode 100644
index 0000000000..a1ef08f7df
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterType.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.filter
+
+enum class DeviceManagerFilterType {
+    ALL_SESSIONS,
+    VERIFIED,
+    UNVERIFIED,
+    INACTIVE,
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCase.kt
new file mode 100644
index 0000000000..b1f23eb510
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCase.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.filter
+
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
+import org.matrix.android.sdk.api.extensions.orFalse
+import javax.inject.Inject
+
+class FilterDevicesUseCase @Inject constructor() {
+
+    fun execute(
+            currentSessionCrossSigningInfo: CurrentSessionCrossSigningInfo,
+            devices: List<DeviceFullInfo>,
+            filterType: DeviceManagerFilterType,
+            excludedDeviceIds: List<String> = emptyList(),
+    ): List<DeviceFullInfo> {
+        val isCurrentSessionVerified = currentSessionCrossSigningInfo.isCrossSigningVerified.orFalse()
+        return devices
+                .filter {
+                    when (filterType) {
+                        DeviceManagerFilterType.ALL_SESSIONS -> true
+                        // when current session is not verified, other session status cannot be trusted
+                        DeviceManagerFilterType.VERIFIED -> isCurrentSessionVerified && it.cryptoDeviceInfo?.trustLevel?.isCrossSigningVerified().orFalse()
+                        // when current session is not verified, other session status cannot be trusted
+                        DeviceManagerFilterType.UNVERIFIED ->
+                            (isCurrentSessionVerified && !it.cryptoDeviceInfo?.trustLevel?.isCrossSigningVerified().orFalse()) ||
+                                    it.cryptoDeviceInfo == null
+                        DeviceManagerFilterType.INACTIVE -> it.isInactive
+                    }
+                }
+                .filter { it.deviceInfo.deviceId !in excludedDeviceIds }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt
new file mode 100644
index 0000000000..f3670793bd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import im.vector.app.core.time.Clock
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class CheckIfSessionIsInactiveUseCase @Inject constructor(
+        private val clock: Clock,
+) {
+
+    fun execute(lastSeenTsMillis: Long?): Boolean {
+        return if (lastSeenTsMillis == null || lastSeenTsMillis <= 0) {
+            // in these situations we cannot say anything about the inactivity of the session
+            false
+        } else {
+            val diffMilliseconds = clock.epochMillis() - lastSeenTsMillis
+            diffMilliseconds >= TimeUnit.DAYS.toMillis(SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS.toLong())
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/DeviceType.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/DeviceType.kt
new file mode 100644
index 0000000000..3082901375
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/DeviceType.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+enum class DeviceType {
+    MOBILE,
+    WEB,
+    DESKTOP,
+    UNKNOWN,
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
new file mode 100644
index 0000000000..68cae344cd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import android.view.View.OnLongClickListener
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.ColorInt
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.views.ShieldImageView
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+@EpoxyModelClass
+abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.layout.item_other_session) {
+
+    @EpoxyAttribute
+    var deviceType: DeviceType = DeviceType.UNKNOWN
+
+    @EpoxyAttribute
+    var roomEncryptionTrustLevel: RoomEncryptionTrustLevel? = null
+
+    @EpoxyAttribute
+    var sessionName: String? = null
+
+    @EpoxyAttribute
+    var sessionDescription: String? = null
+
+    @EpoxyAttribute
+    @ColorInt
+    var sessionDescriptionColor: Int? = null
+
+    @EpoxyAttribute
+    var sessionDescriptionDrawable: Drawable? = null
+
+    @EpoxyAttribute
+    lateinit var stringProvider: StringProvider
+
+    @EpoxyAttribute
+    lateinit var colorProvider: ColorProvider
+
+    @EpoxyAttribute
+    lateinit var drawableProvider: DrawableProvider
+
+    @EpoxyAttribute
+    var selected: Boolean = false
+
+    @EpoxyAttribute
+    var ipAddress: String? = null
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var clickListener: ClickListener? = null
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var onLongClickListener: OnLongClickListener? = null
+
+    private val setDeviceTypeIconUseCase = SetDeviceTypeIconUseCase()
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.view.onClick(clickListener)
+        holder.view.setOnLongClickListener(onLongClickListener)
+        if (clickListener == null && onLongClickListener == null) {
+            holder.view.isClickable = false
+        }
+
+        holder.otherSessionDeviceTypeImageView.isSelected = selected
+        if (selected) {
+            val drawableColor = colorProvider.getColorFromAttribute(android.R.attr.colorBackground)
+            val drawable = drawableProvider.getDrawable(R.drawable.ic_check_on, drawableColor)
+            holder.otherSessionDeviceTypeImageView.setImageDrawable(drawable)
+        } else {
+            setDeviceTypeIconUseCase.execute(deviceType, holder.otherSessionDeviceTypeImageView, stringProvider)
+        }
+        holder.otherSessionVerificationStatusImageView.renderDeviceShield(roomEncryptionTrustLevel)
+        holder.otherSessionNameTextView.text = sessionName
+        holder.otherSessionDescriptionTextView.text = sessionDescription
+        sessionDescriptionColor?.let {
+            holder.otherSessionDescriptionTextView.setTextColor(it)
+        }
+        holder.otherSessionDescriptionTextView.setCompoundDrawablesWithIntrinsicBounds(sessionDescriptionDrawable, null, null, null)
+        holder.otherSessionIpAddressTextView.setTextOrHide(ipAddress)
+        holder.otherSessionItemBackgroundView.isSelected = selected
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val otherSessionDeviceTypeImageView by bind<ImageView>(R.id.otherSessionDeviceTypeImageView)
+        val otherSessionVerificationStatusImageView by bind<ShieldImageView>(R.id.otherSessionVerificationStatusImageView)
+        val otherSessionNameTextView by bind<TextView>(R.id.otherSessionNameTextView)
+        val otherSessionDescriptionTextView by bind<TextView>(R.id.otherSessionDescriptionTextView)
+        val otherSessionIpAddressTextView by bind<TextView>(R.id.otherSessionIpAddressTextView)
+        val otherSessionItemBackgroundView by bind<View>(R.id.otherSessionItemBackground)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
new file mode 100644
index 0000000000..e85e394681
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import android.view.View
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.date.DateFormatKind
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import javax.inject.Inject
+
+class OtherSessionsController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val dateFormatter: VectorDateFormatter,
+        private val drawableProvider: DrawableProvider,
+        private val colorProvider: ColorProvider,
+) : TypedEpoxyController<List<DeviceFullInfo>>() {
+
+    var callback: Callback? = null
+
+    interface Callback {
+        fun onItemLongClicked(deviceId: String)
+        fun onItemClicked(deviceId: String)
+    }
+
+    override fun buildModels(data: List<DeviceFullInfo>?) {
+        val host = this
+
+        if (data.isNullOrEmpty()) {
+            noResultItem {
+                id("empty")
+                text(host.stringProvider.getString(R.string.no_result_placeholder))
+            }
+        } else {
+            data.forEach { device ->
+                val dateFormatKind = if (device.isInactive) DateFormatKind.TIMELINE_DAY_DIVIDER else DateFormatKind.DEFAULT_DATE_AND_TIME
+                val formattedLastActivityDate = host.dateFormatter.format(device.deviceInfo.lastSeenTs, dateFormatKind)
+                val description = buildDescription(device, formattedLastActivityDate)
+                val descriptionColor = if (device.isCurrentDevice) {
+                    host.colorProvider.getColorFromAttribute(R.attr.colorError)
+                } else {
+                    host.colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary)
+                }
+                val drawableColor = host.colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary)
+                val descriptionDrawable = if (device.isInactive) host.drawableProvider.getDrawable(R.drawable.ic_inactive_sessions, drawableColor) else null
+                val sessionName = device.deviceInfo.displayName ?: device.deviceInfo.deviceId
+
+                otherSessionItem {
+                    id(device.deviceInfo.deviceId)
+                    deviceType(device.deviceExtendedInfo.deviceType)
+                    roomEncryptionTrustLevel(device.roomEncryptionTrustLevel)
+                    sessionName(sessionName)
+                    sessionDescription(description)
+                    sessionDescriptionDrawable(descriptionDrawable)
+                    sessionDescriptionColor(descriptionColor)
+                    ipAddress(device.deviceInfo.lastSeenIp)
+                    stringProvider(host.stringProvider)
+                    colorProvider(host.colorProvider)
+                    drawableProvider(host.drawableProvider)
+                    selected(device.isSelected)
+                    clickListener { device.deviceInfo.deviceId?.let { host.callback?.onItemClicked(it) } }
+                    onLongClickListener(View.OnLongClickListener {
+                        device.deviceInfo.deviceId?.let { host.callback?.onItemLongClicked(it) }
+                        true
+                    })
+                }
+            }
+        }
+    }
+
+    private fun buildDescription(device: DeviceFullInfo, formattedLastActivityDate: String): String {
+        return when {
+            device.isInactive -> {
+                stringProvider.getQuantityString(
+                        R.plurals.device_manager_other_sessions_description_inactive,
+                        SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
+                        SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
+                        formattedLastActivityDate
+                )
+            }
+            device.roomEncryptionTrustLevel == RoomEncryptionTrustLevel.Trusted -> {
+                stringProvider.getString(R.string.device_manager_other_sessions_description_verified, formattedLastActivityDate)
+            }
+            device.isCurrentDevice -> {
+                stringProvider.getString(R.string.device_manager_other_sessions_description_unverified_current_session)
+            }
+            device.roomEncryptionTrustLevel == RoomEncryptionTrustLevel.Default -> {
+                stringProvider.getString(R.string.device_manager_session_last_activity, formattedLastActivityDate)
+            }
+            else -> {
+                stringProvider.getString(R.string.device_manager_other_sessions_description_unverified, formattedLastActivityDate)
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsView.kt
new file mode 100644
index 0000000000..a4f8bb64db
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsView.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.airbnb.epoxy.OnModelBuildFinishedListener
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.epoxy.LayoutManagerStateRestorer
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.databinding.ViewOtherSessionsBinding
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class OtherSessionsView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), OtherSessionsController.Callback {
+
+    interface Callback {
+        fun onOtherSessionLongClicked(deviceId: String)
+        fun onOtherSessionClicked(deviceId: String)
+        fun onViewAllOtherSessionsClicked()
+    }
+
+    @Inject lateinit var otherSessionsController: OtherSessionsController
+
+    private val views: ViewOtherSessionsBinding
+    private lateinit var recyclerViewDataObserver: RecyclerView.AdapterDataObserver
+    private lateinit var stateRestorer: LayoutManagerStateRestorer
+    private var modelBuildListener: OnModelBuildFinishedListener? = null
+
+    var callback: Callback? = null
+
+    init {
+        inflate(context, R.layout.view_other_sessions, this)
+        views = ViewOtherSessionsBinding.bind(this)
+
+        configureOtherSessionsRecyclerView()
+
+        views.otherSessionsViewAllButton.setOnClickListener {
+            callback?.onViewAllOtherSessionsClicked()
+        }
+    }
+
+    private fun configureOtherSessionsRecyclerView() {
+        views.otherSessionsRecyclerView.configureWith(otherSessionsController, hasFixedSize = false)
+
+        val layoutManager = LinearLayoutManager(context)
+        stateRestorer = LayoutManagerStateRestorer(layoutManager)
+        views.otherSessionsRecyclerView.layoutManager = layoutManager
+        layoutManager.recycleChildrenOnDetach = true
+        modelBuildListener = OnModelBuildFinishedListener { it.dispatchTo(stateRestorer) }
+        otherSessionsController.addModelBuildListener(modelBuildListener)
+
+        recyclerViewDataObserver = object : RecyclerView.AdapterDataObserver() {
+            override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+                super.onItemRangeInserted(positionStart, itemCount)
+                views.otherSessionsRecyclerView.scrollToPosition(0)
+            }
+        }
+        otherSessionsController.adapter.registerAdapterDataObserver(recyclerViewDataObserver)
+
+        otherSessionsController.callback = this
+    }
+
+    fun render(devices: List<DeviceFullInfo>, totalNumberOfDevices: Int, showViewAll: Boolean) {
+        if (showViewAll) {
+            views.otherSessionsViewAllButton.isVisible = true
+            views.otherSessionsViewAllButton.text = context.getString(R.string.device_manager_other_sessions_view_all, totalNumberOfDevices)
+        } else {
+            views.otherSessionsViewAllButton.isVisible = false
+        }
+        otherSessionsController.setData(devices)
+    }
+
+    override fun onDetachedFromWindow() {
+        otherSessionsController.removeModelBuildListener(modelBuildListener)
+        modelBuildListener = null
+        otherSessionsController.callback = null
+        otherSessionsController.adapter.unregisterAdapterDataObserver(recyclerViewDataObserver)
+        views.otherSessionsRecyclerView.cleanup()
+        super.onDetachedFromWindow()
+    }
+
+    override fun onItemClicked(deviceId: String) {
+        callback?.onOtherSessionClicked(deviceId)
+    }
+
+    override fun onItemLongClicked(deviceId: String) {
+        callback?.onOtherSessionLongClicked(deviceId)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
new file mode 100644
index 0000000000..2a43a9aade
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import im.vector.app.R
+import im.vector.app.databinding.ViewSecurityRecommendationBinding
+
+class SecurityRecommendationView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    interface Callback {
+        fun onViewAllClicked()
+    }
+
+    private val views: ViewSecurityRecommendationBinding
+    var callback: Callback? = null
+
+    init {
+        inflate(context, R.layout.view_security_recommendation, this)
+        views = ViewSecurityRecommendationBinding.bind(this)
+
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.SecurityRecommendationView,
+                0,
+                0
+        ).use {
+            setTitle(it)
+            setDescription(it)
+            setImage(it)
+        }
+
+        setOnClickListener {
+            callback?.onViewAllClicked()
+        }
+        views.recommendationViewAllButton.setOnClickListener {
+            callback?.onViewAllClicked()
+        }
+    }
+
+    private fun setTitle(typedArray: TypedArray) {
+        val title = typedArray.getString(R.styleable.SecurityRecommendationView_recommendationTitle)
+        views.recommendationTitleTextView.text = title
+    }
+
+    private fun setDescription(typedArray: TypedArray) {
+        val description = typedArray.getString(R.styleable.SecurityRecommendationView_recommendationDescription)
+        setDescription(description)
+    }
+
+    private fun setImage(typedArray: TypedArray) {
+        val imageResource = typedArray.getResourceId(R.styleable.SecurityRecommendationView_recommendationImageResource, 0)
+        val backgroundTint = typedArray.getColor(R.styleable.SecurityRecommendationView_recommendationImageBackgroundTint, 0)
+        views.recommendationShieldImageView.setImageResource(imageResource)
+        views.recommendationShieldImageView.backgroundTintList = ColorStateList.valueOf(backgroundTint)
+    }
+
+    private fun setDescription(description: String?) {
+        views.recommendationDescriptionTextView.text = description
+    }
+
+    private fun setCount(sessionsCount: Int) {
+        views.recommendationViewAllButton.text = context.getString(R.string.device_manager_other_sessions_view_all, sessionsCount)
+    }
+
+    fun render(viewState: SecurityRecommendationViewState) {
+        setDescription(viewState.description)
+        setCount(viewState.sessionsCount)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        callback = null
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationViewState.kt
new file mode 100644
index 0000000000..a5b30ea13b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationViewState.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+data class SecurityRecommendationViewState(
+        val description: String,
+        val sessionsCount: Int,
+)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoView.kt
new file mode 100644
index 0000000000..81a8aae666
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoView.kt
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import im.vector.app.R
+import im.vector.app.core.date.DateFormatKind
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.extensions.setTextWithColoredPart
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.databinding.ViewSessionInfoBinding
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+class SessionInfoView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val views: ViewSessionInfoBinding
+
+    var onLearnMoreClickListener: (() -> Unit)? = null
+
+    init {
+        inflate(context, R.layout.view_session_info, this)
+        views = ViewSessionInfoBinding.bind(this)
+    }
+
+    val viewDetailsButton = views.sessionInfoViewDetailsButton
+    val viewVerifyButton = views.sessionInfoVerifySessionButton
+
+    private val setDeviceTypeIconUseCase = SetDeviceTypeIconUseCase()
+
+    fun render(
+            sessionInfoViewState: SessionInfoViewState,
+            dateFormatter: VectorDateFormatter,
+            drawableProvider: DrawableProvider,
+            colorProvider: ColorProvider,
+            stringProvider: StringProvider,
+    ) {
+        renderDeviceInfo(
+                sessionName = sessionInfoViewState.deviceFullInfo.deviceInfo.displayName
+                        ?: sessionInfoViewState.deviceFullInfo.deviceInfo.deviceId.orEmpty(),
+                deviceType = sessionInfoViewState.deviceFullInfo.deviceExtendedInfo.deviceType,
+                stringProvider = stringProvider,
+        )
+        renderVerificationStatus(
+                sessionInfoViewState.deviceFullInfo.roomEncryptionTrustLevel,
+                sessionInfoViewState.isCurrentSession,
+                sessionInfoViewState.isLearnMoreLinkVisible,
+                sessionInfoViewState.isVerifyButtonVisible,
+        )
+        renderDeviceLastSeenDetails(
+                sessionInfoViewState.deviceFullInfo.isInactive,
+                sessionInfoViewState.deviceFullInfo.deviceInfo,
+                sessionInfoViewState.isLastActivityVisible,
+                sessionInfoViewState.isShowingIpAddress,
+                dateFormatter,
+                drawableProvider,
+                colorProvider,
+        )
+        renderDetailsButton(sessionInfoViewState.isDetailsButtonVisible)
+    }
+
+    private fun renderVerificationStatus(
+            encryptionTrustLevel: RoomEncryptionTrustLevel?,
+            isCurrentSession: Boolean,
+            hasLearnMoreLink: Boolean,
+            isVerifyButtonVisible: Boolean,
+    ) {
+        views.sessionInfoVerificationStatusImageView.renderDeviceShield(encryptionTrustLevel)
+        when {
+            encryptionTrustLevel == null -> renderCrossSigningEncryptionNotSupported()
+            encryptionTrustLevel == RoomEncryptionTrustLevel.Trusted -> renderCrossSigningVerified(isCurrentSession)
+            encryptionTrustLevel == RoomEncryptionTrustLevel.Default && !isCurrentSession -> renderCrossSigningUnknown()
+            else -> renderCrossSigningUnverified(isCurrentSession, isVerifyButtonVisible)
+        }
+        if (hasLearnMoreLink) {
+            appendLearnMoreToVerificationStatus()
+        }
+    }
+
+    private fun appendLearnMoreToVerificationStatus() {
+        val status = views.sessionInfoVerificationStatusDetailTextView.text
+        val learnMore = context.getString(R.string.action_learn_more)
+        val statusText = buildString {
+            append(status)
+            append(" ")
+            append(learnMore)
+        }
+
+        views.sessionInfoVerificationStatusDetailTextView.setTextWithColoredPart(
+                fullText = statusText,
+                coloredPart = learnMore,
+                underline = false
+        ) {
+            onLearnMoreClickListener?.invoke()
+        }
+    }
+
+    private fun renderCrossSigningVerified(isCurrentSession: Boolean) {
+        views.sessionInfoVerificationStatusTextView.text = context.getString(R.string.device_manager_verification_status_verified)
+        views.sessionInfoVerificationStatusTextView.setTextColor(ThemeUtils.getColor(context, R.attr.colorPrimary))
+        val statusResId = if (isCurrentSession) {
+            R.string.device_manager_verification_status_detail_current_session_verified
+        } else {
+            R.string.device_manager_verification_status_detail_other_session_verified
+        }
+        views.sessionInfoVerificationStatusDetailTextView.text = context.getString(statusResId)
+        views.sessionInfoVerifySessionButton.isVisible = false
+    }
+
+    private fun renderCrossSigningUnverified(isCurrentSession: Boolean, isVerifyButtonVisible: Boolean) {
+        views.sessionInfoVerificationStatusTextView.text = context.getString(R.string.device_manager_verification_status_unverified)
+        views.sessionInfoVerificationStatusTextView.setTextColor(ThemeUtils.getColor(context, R.attr.colorError))
+        val statusResId = if (isCurrentSession) {
+            R.string.device_manager_verification_status_detail_current_session_unverified
+        } else {
+            R.string.device_manager_verification_status_detail_other_session_unverified
+        }
+        views.sessionInfoVerificationStatusDetailTextView.text = context.getString(statusResId)
+        views.sessionInfoVerifySessionButton.isVisible = isVerifyButtonVisible
+    }
+
+    private fun renderCrossSigningUnknown() {
+        views.sessionInfoVerificationStatusTextView.text = context.getString(R.string.device_manager_verification_status_unknown)
+        views.sessionInfoVerificationStatusDetailTextView.text = context.getString(R.string.device_manager_verification_status_detail_other_session_unknown)
+        views.sessionInfoVerifySessionButton.isVisible = false
+    }
+
+    private fun renderCrossSigningEncryptionNotSupported() {
+        views.sessionInfoVerificationStatusTextView.text = context.getString(R.string.device_manager_verification_status_unverified)
+        views.sessionInfoVerificationStatusTextView.setTextColor(ThemeUtils.getColor(context, R.attr.colorError))
+        views.sessionInfoVerificationStatusDetailTextView.text =
+                context.getString(R.string.device_manager_verification_status_detail_session_encryption_not_supported)
+        views.sessionInfoVerifySessionButton.isVisible = false
+    }
+
+    private fun renderDeviceInfo(sessionName: String, deviceType: DeviceType, stringProvider: StringProvider) {
+        setDeviceTypeIconUseCase.execute(deviceType, views.sessionInfoDeviceTypeImageView, stringProvider)
+        views.sessionInfoNameTextView.text = sessionName
+    }
+
+    private fun renderDeviceLastSeenDetails(
+            isInactive: Boolean,
+            deviceInfo: DeviceInfo,
+            isLastSeenDetailsVisible: Boolean,
+            isShowingIpAddress: Boolean,
+            dateFormatter: VectorDateFormatter,
+            drawableProvider: DrawableProvider,
+            colorProvider: ColorProvider,
+    ) {
+        if (deviceInfo.lastSeenTs != null && isLastSeenDetailsVisible) {
+            val timestamp = deviceInfo.lastSeenTs
+            views.sessionInfoLastActivityTextView.isVisible = true
+            views.sessionInfoLastActivityTextView.text = if (isInactive) {
+                val formattedTs = dateFormatter.format(timestamp, DateFormatKind.TIMELINE_DAY_DIVIDER)
+                context.resources.getQuantityString(
+                        R.plurals.device_manager_other_sessions_description_inactive,
+                        SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
+                        SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
+                        formattedTs
+                )
+            } else {
+                val formattedTs = dateFormatter.format(timestamp, DateFormatKind.DEFAULT_DATE_AND_TIME)
+                context.getString(R.string.device_manager_session_last_activity, formattedTs)
+            }
+            val drawable = if (isInactive) {
+                val drawableColor = colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary)
+                drawableProvider.getDrawable(R.drawable.ic_inactive_sessions, drawableColor)
+            } else {
+                null
+            }
+            views.sessionInfoLastActivityTextView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+        } else {
+            views.sessionInfoLastActivityTextView.isGone = true
+        }
+        views.sessionInfoLastIPAddressTextView.setTextOrHide(deviceInfo.lastSeenIp?.takeIf { isShowingIpAddress })
+    }
+
+    private fun renderDetailsButton(isDetailsButtonVisible: Boolean) {
+        views.sessionInfoViewDetailsButton.isVisible = isDetailsButtonVisible
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoViewState.kt
new file mode 100644
index 0000000000..6c7ca809ea
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoViewState.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+
+data class SessionInfoViewState(
+        val isCurrentSession: Boolean,
+        val deviceFullInfo: DeviceFullInfo,
+        val isVerifyButtonVisible: Boolean = true,
+        val isDetailsButtonVisible: Boolean = true,
+        val isLearnMoreLinkVisible: Boolean = false,
+        val isLastActivityVisible: Boolean = false,
+        val isShowingIpAddress: Boolean = false,
+)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionListConstants.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionListConstants.kt
new file mode 100644
index 0000000000..662ce536e7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionListConstants.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+internal const val NUMBER_OF_OTHER_DEVICES_TO_RENDER = 5
+internal const val SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS = 90
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
new file mode 100644
index 0000000000..f74d88790c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import androidx.appcompat.view.menu.MenuBuilder
+import androidx.appcompat.widget.ActionMenuView.OnMenuItemClickListener
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import androidx.core.view.isVisible
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.extensions.setTextWithColoredPart
+import im.vector.app.databinding.ViewSessionsListHeaderBinding
+
+class SessionsListHeaderView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val binding = ViewSessionsListHeaderBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+
+    val menu: Menu = binding.sessionsListHeaderMenu.menu
+    var onLearnMoreClickListener: (() -> Unit)? = null
+
+    init {
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.SessionsListHeaderView,
+                0,
+                0
+        ).use {
+            setTitle(it)
+            setDescription(it)
+            setMenu(it)
+        }
+    }
+
+    private fun setTitle(typedArray: TypedArray) {
+        val title = typedArray.getString(R.styleable.SessionsListHeaderView_sessionsListHeaderTitle)
+        binding.sessionsListHeaderTitle.setTextOrHide(title)
+    }
+
+    private fun setDescription(typedArray: TypedArray) {
+        val description = typedArray.getString(R.styleable.SessionsListHeaderView_sessionsListHeaderDescription)
+        if (description.isNullOrEmpty()) {
+            binding.sessionsListHeaderDescription.isVisible = false
+            return
+        }
+
+        val hasLearnMoreLink = typedArray.getBoolean(R.styleable.SessionsListHeaderView_sessionsListHeaderHasLearnMoreLink, true)
+        if (hasLearnMoreLink) {
+            setDescriptionWithLearnMore(description)
+        } else {
+            binding.sessionsListHeaderDescription.text = description
+        }
+
+        binding.sessionsListHeaderDescription.isVisible = true
+    }
+
+    private fun setDescriptionWithLearnMore(description: String) {
+        val learnMore = context.getString(R.string.action_learn_more)
+        val fullDescription = buildString {
+            append(description)
+            append(" ")
+            append(learnMore)
+        }
+        binding.sessionsListHeaderDescription.setTextWithColoredPart(
+                fullText = fullDescription,
+                coloredPart = learnMore,
+                underline = false
+        ) {
+            onLearnMoreClickListener?.invoke()
+        }
+    }
+
+    private fun setMenu(typedArray: TypedArray) {
+        val menuResId = typedArray.getResourceId(R.styleable.SessionsListHeaderView_sessionsListHeaderMenu, -1)
+        if (menuResId == -1) {
+            binding.sessionsListHeaderMenu.isVisible = false
+        } else {
+            binding.sessionsListHeaderMenu.showOverflowMenu()
+            val menuBuilder = binding.sessionsListHeaderMenu.menu as? MenuBuilder
+            menuBuilder?.let { MenuInflater(context).inflate(menuResId, it) }
+        }
+    }
+
+    fun setOnMenuItemClickListener(listener: OnMenuItemClickListener) {
+        binding.sessionsListHeaderMenu.setOnMenuItemClickListener(listener)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SetDeviceTypeIconUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SetDeviceTypeIconUseCase.kt
new file mode 100644
index 0000000000..49ff46779e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SetDeviceTypeIconUseCase.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import android.widget.ImageView
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+
+class SetDeviceTypeIconUseCase {
+
+    fun execute(deviceType: DeviceType, imageView: ImageView, stringProvider: StringProvider) {
+        when (deviceType) {
+            DeviceType.MOBILE -> {
+                imageView.setImageResource(R.drawable.ic_device_type_mobile)
+                imageView.contentDescription = stringProvider.getString(R.string.a11y_device_manager_device_type_mobile)
+            }
+            DeviceType.WEB -> {
+                imageView.setImageResource(R.drawable.ic_device_type_web)
+                imageView.contentDescription = stringProvider.getString(R.string.a11y_device_manager_device_type_web)
+            }
+            DeviceType.DESKTOP -> {
+                imageView.setImageResource(R.drawable.ic_device_type_desktop)
+                imageView.contentDescription = stringProvider.getString(R.string.a11y_device_manager_device_type_desktop)
+            }
+            DeviceType.UNKNOWN -> {
+                imageView.setImageResource(R.drawable.ic_device_type_unknown)
+                imageView.contentDescription = stringProvider.getString(R.string.a11y_device_manager_device_type_unknown)
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt
new file mode 100644
index 0000000000..502d9abca3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.more
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.FragmentManager
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetSessionLearnMoreBinding
+import kotlinx.parcelize.Parcelize
+
+@AndroidEntryPoint
+class SessionLearnMoreBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSessionLearnMoreBinding>() {
+
+    @Parcelize
+    data class Args(
+            val title: String,
+            val description: String,
+    ) : Parcelable
+
+    private val viewModel: SessionLearnMoreViewModel by fragmentViewModel()
+
+    override val showExpanded = true
+
+    var onDismiss: (() -> Unit)? = null
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSessionLearnMoreBinding {
+        return BottomSheetSessionLearnMoreBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initCloseButton()
+    }
+
+    private fun initCloseButton() {
+        views.bottomSheetSessionLearnMoreCloseButton.debouncedClicks {
+            dismiss()
+        }
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        onDismiss?.invoke()
+    }
+
+    override fun invalidate() = withState(viewModel) { viewState ->
+        super.invalidate()
+        views.bottomSheetSessionLearnMoreTitle.text = viewState.title
+        views.bottomSheetSessionLearnMoreDescription.text = viewState.description
+    }
+
+    companion object {
+
+        fun show(fragmentManager: FragmentManager, args: Args): SessionLearnMoreBottomSheet {
+            val bottomSheet = SessionLearnMoreBottomSheet()
+            bottomSheet.isCancelable = true
+            bottomSheet.setArguments(args)
+            bottomSheet.show(fragmentManager, "SessionLearnMoreBottomSheet")
+            return bottomSheet
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewModel.kt
new file mode 100644
index 0000000000..09ca2df15d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewModel.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.more
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+
+class SessionLearnMoreViewModel @AssistedInject constructor(
+        @Assisted initialState: SessionLearnMoreViewState,
+) : VectorViewModel<SessionLearnMoreViewState, EmptyAction, EmptyViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<SessionLearnMoreViewModel, SessionLearnMoreViewState> {
+        override fun create(initialState: SessionLearnMoreViewState): SessionLearnMoreViewModel
+    }
+
+    companion object : MavericksViewModelFactory<SessionLearnMoreViewModel, SessionLearnMoreViewState> by hiltMavericksViewModelFactory()
+
+    override fun handle(action: EmptyAction) {
+        // do nothing
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewState.kt
new file mode 100644
index 0000000000..cade2ce861
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreViewState.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.more
+
+import com.airbnb.mvrx.MavericksState
+
+data class SessionLearnMoreViewState(
+        val title: String,
+        val description: String,
+) : MavericksState {
+    constructor(args: SessionLearnMoreBottomSheet.Args) : this(
+            title = args.title,
+            description = args.description,
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaAccountDataUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaAccountDataUseCase.kt
new file mode 100644
index 0000000000..18ee9ad937
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaAccountDataUseCase.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+
+class CanToggleNotificationsViaAccountDataUseCase @Inject constructor(
+        private val getNotificationSettingsAccountDataUpdatesUseCase: GetNotificationSettingsAccountDataUpdatesUseCase,
+) {
+
+    fun execute(session: Session, deviceId: String): Flow<Boolean> {
+        return getNotificationSettingsAccountDataUpdatesUseCase.execute(session, deviceId)
+                .map { it?.isSilenced != null }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaPusherUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaPusherUseCase.kt
new file mode 100644
index 0000000000..96521ec78c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaPusherUseCase.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import androidx.lifecycle.asFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.flow.unwrap
+import javax.inject.Inject
+
+class CanToggleNotificationsViaPusherUseCase @Inject constructor() {
+
+    fun execute(session: Session): Flow<Boolean> {
+        return session
+                .homeServerCapabilitiesService()
+                .getHomeServerCapabilitiesLive()
+                .asFlow()
+                .unwrap()
+                .map { it.canRemotelyTogglePushNotificationsOfDevices }
+                .distinctUntilChanged()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaAccountDataUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaAccountDataUseCase.kt
new file mode 100644
index 0000000000..58289495a4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaAccountDataUseCase.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+
+class CheckIfCanToggleNotificationsViaAccountDataUseCase @Inject constructor(
+        private val getNotificationSettingsAccountDataUseCase: GetNotificationSettingsAccountDataUseCase,
+) {
+
+    fun execute(session: Session, deviceId: String): Boolean {
+        return getNotificationSettingsAccountDataUseCase.execute(session, deviceId)?.isSilenced != null
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaPusherUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaPusherUseCase.kt
new file mode 100644
index 0000000000..1dc186be7c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaPusherUseCase.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+
+class CheckIfCanToggleNotificationsViaPusherUseCase @Inject constructor() {
+
+    fun execute(session: Session): Boolean {
+        return session
+                .homeServerCapabilitiesService()
+                .getHomeServerCapabilities()
+                .canRemotelyTogglePushNotificationsOfDevices
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/DeleteNotificationSettingsAccountDataUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/DeleteNotificationSettingsAccountDataUseCase.kt
new file mode 100644
index 0000000000..3c086fe111
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/DeleteNotificationSettingsAccountDataUseCase.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+
+/**
+ * Delete the content of any associated notification settings to the current session.
+ */
+class DeleteNotificationSettingsAccountDataUseCase @Inject constructor(
+        private val getNotificationSettingsAccountDataUseCase: GetNotificationSettingsAccountDataUseCase,
+        private val setNotificationSettingsAccountDataUseCase: SetNotificationSettingsAccountDataUseCase,
+) {
+
+    suspend fun execute(session: Session) {
+        val deviceId = session.sessionParams.deviceId ?: return
+        if (getNotificationSettingsAccountDataUseCase.execute(session, deviceId)?.isSilenced != null) {
+            val emptyNotificationSettingsContent = LocalNotificationSettingsContent(
+                    isSilenced = null
+            )
+            setNotificationSettingsAccountDataUseCase.execute(session, deviceId, emptyNotificationSettingsContent)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUpdatesUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUpdatesUseCase.kt
new file mode 100644
index 0000000000..308aeec5f2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUpdatesUseCase.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import androidx.lifecycle.asFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.toModel
+import javax.inject.Inject
+
+class GetNotificationSettingsAccountDataUpdatesUseCase @Inject constructor() {
+
+    fun execute(session: Session, deviceId: String): Flow<LocalNotificationSettingsContent?> {
+        return session
+                .accountDataService()
+                .getLiveUserAccountDataEvent(UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + deviceId)
+                .asFlow()
+                .map { it.getOrNull()?.content?.toModel<LocalNotificationSettingsContent>() }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUseCase.kt
new file mode 100644
index 0000000000..5517fa0978
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUseCase.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.toModel
+import javax.inject.Inject
+
+class GetNotificationSettingsAccountDataUseCase @Inject constructor() {
+
+    fun execute(session: Session, deviceId: String): LocalNotificationSettingsContent? {
+        return session
+                .accountDataService()
+                .getUserAccountDataEvent(UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + deviceId)
+                ?.content
+                .toModel<LocalNotificationSettingsContent>()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCase.kt
new file mode 100644
index 0000000000..8cf684975e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCase.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.flow.flow
+import org.matrix.android.sdk.flow.unwrap
+import javax.inject.Inject
+
+class GetNotificationsStatusUseCase @Inject constructor(
+        private val canToggleNotificationsViaPusherUseCase: CanToggleNotificationsViaPusherUseCase,
+        private val canToggleNotificationsViaAccountDataUseCase: CanToggleNotificationsViaAccountDataUseCase,
+) {
+
+    fun execute(session: Session, deviceId: String): Flow<NotificationsStatus> {
+        return canToggleNotificationsViaAccountDataUseCase.execute(session, deviceId)
+                .flatMapLatest { canToggle ->
+                    if (canToggle) {
+                        notificationStatusFromAccountData(session, deviceId)
+                    } else {
+                        notificationStatusFromPusher(session, deviceId)
+                    }
+                }
+                .distinctUntilChanged()
+    }
+
+    private fun notificationStatusFromAccountData(session: Session, deviceId: String) =
+            session.flow()
+                    .liveUserAccountData(UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + deviceId)
+                    .unwrap()
+                    .map { it.content.toModel<LocalNotificationSettingsContent>()?.isSilenced?.not() }
+                    .map { if (it == true) NotificationsStatus.ENABLED else NotificationsStatus.DISABLED }
+
+    private fun notificationStatusFromPusher(session: Session, deviceId: String) =
+            canToggleNotificationsViaPusherUseCase.execute(session)
+                    .flatMapLatest { canToggle ->
+                        if (canToggle) {
+                            session.flow()
+                                    .livePushers()
+                                    .map { it.filter { pusher -> pusher.deviceId == deviceId } }
+                                    .map { it.takeIf { it.isNotEmpty() }?.any { pusher -> pusher.enabled } }
+                                    .map {
+                                        when (it) {
+                                            true -> NotificationsStatus.ENABLED
+                                            false -> NotificationsStatus.DISABLED
+                                            else -> NotificationsStatus.NOT_SUPPORTED
+                                        }
+                                    }
+                                    .distinctUntilChanged()
+                        } else {
+                            flowOf(NotificationsStatus.NOT_SUPPORTED)
+                        }
+                    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/NotificationsStatus.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/NotificationsStatus.kt
new file mode 100644
index 0000000000..7ff1f04381
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/NotificationsStatus.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+enum class NotificationsStatus {
+    ENABLED,
+    DISABLED,
+    NOT_SUPPORTED,
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/SetNotificationSettingsAccountDataUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/SetNotificationSettingsAccountDataUseCase.kt
new file mode 100644
index 0000000000..7306794f16
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/SetNotificationSettingsAccountDataUseCase.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.toContent
+import javax.inject.Inject
+
+class SetNotificationSettingsAccountDataUseCase @Inject constructor() {
+
+    suspend fun execute(session: Session, deviceId: String, localNotificationSettingsContent: LocalNotificationSettingsContent) {
+        session.accountDataService().updateUserAccountData(
+                UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + deviceId,
+                localNotificationSettingsContent.toContent(),
+        )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/ToggleNotificationsUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/ToggleNotificationsUseCase.kt
new file mode 100644
index 0000000000..77195ea950
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/ToggleNotificationsUseCase.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.core.di.ActiveSessionHolder
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import javax.inject.Inject
+
+class ToggleNotificationsUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val checkIfCanToggleNotificationsViaPusherUseCase: CheckIfCanToggleNotificationsViaPusherUseCase,
+        private val checkIfCanToggleNotificationsViaAccountDataUseCase: CheckIfCanToggleNotificationsViaAccountDataUseCase,
+        private val setNotificationSettingsAccountDataUseCase: SetNotificationSettingsAccountDataUseCase,
+) {
+
+    suspend fun execute(deviceId: String, enabled: Boolean) {
+        val session = activeSessionHolder.getSafeActiveSession() ?: return
+
+        if (checkIfCanToggleNotificationsViaPusherUseCase.execute(session)) {
+            val devicePusher = session.pushersService().getPushers().firstOrNull { it.deviceId == deviceId }
+            devicePusher?.let { pusher ->
+                session.pushersService().togglePusher(pusher, enabled)
+            }
+        }
+
+        if (checkIfCanToggleNotificationsViaAccountDataUseCase.execute(session, deviceId)) {
+            val newNotificationSettingsContent = LocalNotificationSettingsContent(isSilenced = !enabled)
+            setNotificationSettingsAccountDataUseCase.execute(session, deviceId, newNotificationSettingsContent)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/UpdateNotificationSettingsAccountDataUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/UpdateNotificationSettingsAccountDataUseCase.kt
new file mode 100644
index 0000000000..9296bcd912
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/notification/UpdateNotificationSettingsAccountDataUseCase.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.core.pushers.UnifiedPushHelper
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+
+/**
+ * Update the notification settings account data for the current session depending on whether
+ * the background sync is enabled or not.
+ */
+class UpdateNotificationSettingsAccountDataUseCase @Inject constructor(
+        private val vectorPreferences: VectorPreferences,
+        private val unifiedPushHelper: UnifiedPushHelper,
+        private val getNotificationSettingsAccountDataUseCase: GetNotificationSettingsAccountDataUseCase,
+        private val setNotificationSettingsAccountDataUseCase: SetNotificationSettingsAccountDataUseCase,
+        private val deleteNotificationSettingsAccountDataUseCase: DeleteNotificationSettingsAccountDataUseCase,
+) {
+
+    suspend fun execute(session: Session) {
+        if (unifiedPushHelper.isBackgroundSync()) {
+            setCurrentNotificationStatus(session)
+        } else {
+            deleteCurrentNotificationStatus(session)
+        }
+    }
+
+    private suspend fun setCurrentNotificationStatus(session: Session) {
+        val deviceId = session.sessionParams.deviceId ?: return
+        val areNotificationsSilenced = !vectorPreferences.areNotificationEnabledForDevice()
+        val isSilencedAccountData = getNotificationSettingsAccountDataUseCase.execute(session, deviceId)?.isSilenced
+        if (areNotificationsSilenced != isSilencedAccountData) {
+            val notificationSettingsContent = LocalNotificationSettingsContent(
+                    isSilenced = areNotificationsSilenced
+            )
+            setNotificationSettingsAccountDataUseCase.execute(session, deviceId, notificationSettingsContent)
+        }
+    }
+
+    private suspend fun deleteCurrentNotificationStatus(session: Session) {
+        deleteNotificationSettingsAccountDataUseCase.execute(session)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
new file mode 100644
index 0000000000..bdad65ca43
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+
+sealed class OtherSessionsAction : VectorViewModelAction {
+    // ReAuth
+    object SsoAuthDone : OtherSessionsAction()
+    data class PasswordAuthDone(val password: String) : OtherSessionsAction()
+    object ReAuthCancelled : OtherSessionsAction()
+
+    // Others
+    data class FilterDevices(val filterType: DeviceManagerFilterType) : OtherSessionsAction()
+    data class EnableSelectMode(val deviceId: String?) : OtherSessionsAction()
+    object DisableSelectMode : OtherSessionsAction()
+    data class ToggleSelectionForDevice(val deviceId: String) : OtherSessionsAction()
+    object SelectAll : OtherSessionsAction()
+    object DeselectAll : OtherSessionsAction()
+    object MultiSignout : OtherSessionsAction()
+    object ToggleIpAddressVisibility : OtherSessionsAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsActivity.kt
new file mode 100644
index 0000000000..75c5752e35
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsActivity.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import com.airbnb.mvrx.Mavericks
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
+
+@AndroidEntryPoint
+class OtherSessionsActivity : SimpleFragmentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        views.toolbar.visibility = View.GONE
+
+        if (isFirstCreation()) {
+            addFragment(
+                    container = views.container,
+                    fragmentClass = OtherSessionsFragment::class.java,
+                    params = intent.getParcelableExtraCompat(Mavericks.KEY_ARG)
+            )
+        }
+    }
+
+    companion object {
+        fun newIntent(
+                context: Context,
+                defaultFilter: DeviceManagerFilterType,
+                excludeCurrentDevice: Boolean,
+        ): Intent {
+            return Intent(context, OtherSessionsActivity::class.java).apply {
+                putExtra(Mavericks.KEY_ARG, OtherSessionsArgs(defaultFilter, excludeCurrentDevice))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsArgs.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsArgs.kt
new file mode 100644
index 0000000000..e478959153
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsArgs.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import android.os.Parcelable
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class OtherSessionsArgs(
+        val defaultFilter: DeviceManagerFilterType,
+        val excludeCurrentDevice: Boolean,
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
new file mode 100644
index 0000000000..cee90986cd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
@@ -0,0 +1,403 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
+import androidx.annotation.StringRes
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.args
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.registerStartForActivityResult
+import im.vector.app.core.extensions.setTextColor
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment.ResultListener.Companion.RESULT_OK
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.platform.VectorMenuProvider
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.databinding.FragmentOtherSessionsBinding
+import im.vector.app.features.auth.ReAuthActivity
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterBottomSheet
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.list.OtherSessionsView
+import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+import im.vector.app.features.settings.devices.v2.more.SessionLearnMoreBottomSheet
+import im.vector.app.features.settings.devices.v2.signout.BuildConfirmSignoutDialogUseCase
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.extensions.orFalse
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class OtherSessionsFragment :
+        VectorBaseFragment<FragmentOtherSessionsBinding>(),
+        VectorBaseBottomSheetDialogFragment.ResultListener,
+        OtherSessionsView.Callback,
+        VectorMenuProvider {
+
+    private val viewModel: OtherSessionsViewModel by fragmentViewModel()
+    private val args: OtherSessionsArgs by args()
+
+    @Inject lateinit var colorProvider: ColorProvider
+
+    @Inject lateinit var stringProvider: StringProvider
+
+    @Inject lateinit var viewNavigator: OtherSessionsViewNavigator
+
+    @Inject lateinit var buildConfirmSignoutDialogUseCase: BuildConfirmSignoutDialogUseCase
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentOtherSessionsBinding {
+        return FragmentOtherSessionsBinding.inflate(layoutInflater, container, false)
+    }
+
+    override fun getMenuRes() = R.menu.menu_other_sessions
+
+    override fun handlePrepareMenu(menu: Menu) {
+        withState(viewModel) { state ->
+            val isSelectModeEnabled = state.isSelectModeEnabled
+            menu.findItem(R.id.otherSessionsSelectAll).isVisible = isSelectModeEnabled
+            menu.findItem(R.id.otherSessionsDeselectAll).isVisible = isSelectModeEnabled
+            menu.findItem(R.id.otherSessionsSelect).isVisible = !isSelectModeEnabled && state.devices()?.isNotEmpty().orFalse()
+            menu.findItem(R.id.otherSessionsToggleIpAddress).isVisible = !isSelectModeEnabled
+            menu.findItem(R.id.otherSessionsToggleIpAddress).title = if (state.isShowingIpAddress) {
+                getString(R.string.device_manager_other_sessions_hide_ip_address)
+            } else {
+                getString(R.string.device_manager_other_sessions_show_ip_address)
+            }
+            updateMultiSignoutMenuItem(menu, state)
+        }
+    }
+
+    private fun updateMultiSignoutMenuItem(menu: Menu, viewState: OtherSessionsViewState) {
+        val multiSignoutItem = menu.findItem(R.id.otherSessionsMultiSignout)
+        multiSignoutItem.title = if (viewState.isSelectModeEnabled) {
+            getString(R.string.device_manager_other_sessions_multi_signout_selection).uppercase()
+        } else {
+            val nbDevices = viewState.devices()?.size ?: 0
+            stringProvider.getQuantityString(R.plurals.device_manager_other_sessions_multi_signout_all, nbDevices, nbDevices)
+        }
+        multiSignoutItem.isVisible = if (viewState.isSelectModeEnabled) {
+            viewState.devices.invoke()?.any { it.isSelected }.orFalse()
+        } else {
+            viewState.devices.invoke()?.isNotEmpty().orFalse()
+        }
+        val showAsActionFlag = if (viewState.isSelectModeEnabled) MenuItem.SHOW_AS_ACTION_IF_ROOM else MenuItem.SHOW_AS_ACTION_NEVER
+        multiSignoutItem.setShowAsAction(showAsActionFlag or MenuItem.SHOW_AS_ACTION_WITH_TEXT)
+        changeTextColorOfDestructiveAction(multiSignoutItem)
+    }
+
+    private fun changeTextColorOfDestructiveAction(menuItem: MenuItem) {
+        val titleColor = colorProvider.getColorFromAttribute(R.attr.colorError)
+        menuItem.setTextColor(titleColor)
+    }
+
+    override fun handleMenuItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.otherSessionsSelect -> {
+                enableSelectMode(true)
+                true
+            }
+            R.id.otherSessionsSelectAll -> {
+                viewModel.handle(OtherSessionsAction.SelectAll)
+                true
+            }
+            R.id.otherSessionsDeselectAll -> {
+                viewModel.handle(OtherSessionsAction.DeselectAll)
+                true
+            }
+            R.id.otherSessionsMultiSignout -> {
+                confirmMultiSignout()
+                true
+            }
+            R.id.otherSessionsToggleIpAddress -> {
+                toggleIpAddressVisibility()
+                true
+            }
+            else -> false
+        }
+    }
+
+    private fun toggleIpAddressVisibility() {
+        viewModel.handle(OtherSessionsAction.ToggleIpAddressVisibility)
+    }
+
+    private fun confirmMultiSignout() {
+        activity?.let {
+            buildConfirmSignoutDialogUseCase.execute(it, this::multiSignout)
+                    .show()
+        }
+    }
+
+    private fun multiSignout() {
+        viewModel.handle(OtherSessionsAction.MultiSignout)
+    }
+
+    private fun enableSelectMode(isEnabled: Boolean, deviceId: String? = null) {
+        val action = if (isEnabled) OtherSessionsAction.EnableSelectMode(deviceId) else OtherSessionsAction.DisableSelectMode
+        viewModel.handle(action)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        activity?.onBackPressedDispatcher?.addCallback(owner = this) {
+            handleBackPress(this)
+        }
+    }
+
+    private fun handleBackPress(onBackPressedCallback: OnBackPressedCallback) = withState(viewModel) { state ->
+        if (state.isSelectModeEnabled) {
+            enableSelectMode(false)
+        } else {
+            onBackPressedCallback.isEnabled = false
+            activity?.onBackPressedDispatcher?.onBackPressed()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar(views.otherSessionsToolbar)
+                .setTitle(R.string.device_manager_sessions_other_title)
+                .allowBack()
+        observeViewEvents()
+        initFilterView()
+    }
+
+    private fun observeViewEvents() {
+        viewModel.observeViewEvents {
+            when (it) {
+                is OtherSessionsViewEvents.SignoutError -> showFailure(it.error)
+                is OtherSessionsViewEvents.RequestReAuth -> askForReAuthentication(it)
+                OtherSessionsViewEvents.SignoutSuccess -> enableSelectMode(false)
+            }
+        }
+    }
+
+    private fun initFilterView() {
+        views.otherSessionsFilterFrameLayout.debouncedClicks {
+            withState(viewModel) { state ->
+                DeviceManagerFilterBottomSheet
+                        .newInstance(state.currentFilter, this)
+                        .show(requireActivity().supportFragmentManager, "SHOW_DEVICE_MANAGER_FILTER_BOTTOM_SHEET")
+            }
+        }
+
+        views.otherSessionsClearFilterButton.debouncedClicks {
+            viewModel.handle(OtherSessionsAction.FilterDevices(DeviceManagerFilterType.ALL_SESSIONS))
+        }
+
+        views.deviceListOtherSessions.callback = this
+
+        if (args.defaultFilter != DeviceManagerFilterType.ALL_SESSIONS) {
+            viewModel.handle(OtherSessionsAction.FilterDevices(args.defaultFilter))
+        }
+    }
+
+    override fun onBottomSheetResult(resultCode: Int, data: Any?) {
+        if (resultCode == RESULT_OK && data != null && data is DeviceManagerFilterType) {
+            viewModel.handle(OtherSessionsAction.FilterDevices(data))
+        }
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        updateLoading(state.isLoading)
+        updateFilterView(state.isSelectModeEnabled)
+        if (state.devices is Success) {
+            val devices = state.devices.invoke()
+            renderDevices(devices, state.currentFilter, state.isShowingIpAddress)
+            updateToolbar(devices, state.isSelectModeEnabled)
+        }
+    }
+
+    private fun updateLoading(isLoading: Boolean) {
+        if (isLoading) {
+            showLoading(null)
+        } else {
+            dismissLoadingDialog()
+        }
+    }
+
+    private fun updateFilterView(isSelectModeEnabled: Boolean) {
+        views.otherSessionsFilterFrameLayout.isVisible = isSelectModeEnabled.not()
+    }
+
+    private fun updateToolbar(devices: List<DeviceFullInfo>, isSelectModeEnabled: Boolean) {
+        invalidateOptionsMenu()
+        val title = if (isSelectModeEnabled) {
+            val selection = devices.count { it.isSelected }
+            stringProvider.getQuantityString(R.plurals.x_selected, selection, selection)
+        } else {
+            getString(R.string.device_manager_sessions_other_title)
+        }
+        toolbar?.title = title
+    }
+
+    private fun renderDevices(devices: List<DeviceFullInfo>, currentFilter: DeviceManagerFilterType, isShowingIpAddress: Boolean) {
+        views.otherSessionsFilterBadgeImageView.isVisible = currentFilter != DeviceManagerFilterType.ALL_SESSIONS
+        views.otherSessionsSecurityRecommendationView.isVisible = currentFilter != DeviceManagerFilterType.ALL_SESSIONS
+        views.deviceListHeaderOtherSessions.isVisible = currentFilter == DeviceManagerFilterType.ALL_SESSIONS
+
+        when (currentFilter) {
+            DeviceManagerFilterType.VERIFIED -> {
+                views.otherSessionsSecurityRecommendationView.render(
+                        OtherSessionsSecurityRecommendationViewState(
+                                title = getString(R.string.device_manager_other_sessions_recommendation_title_verified),
+                                description = getString(R.string.device_manager_other_sessions_recommendation_description_verified),
+                                imageResourceId = R.drawable.ic_shield_trusted_no_border,
+                                imageTintColorResourceId = colorProvider.getColor(R.color.shield_color_trust_background)
+                        )
+                )
+                views.otherSessionsNotFoundTextView.text = getString(R.string.device_manager_other_sessions_no_verified_sessions_found)
+                updateSecurityLearnMoreButton(
+                        R.string.device_manager_learn_more_sessions_verified_title,
+                        R.string.device_manager_learn_more_sessions_verified_description
+                )
+            }
+            DeviceManagerFilterType.UNVERIFIED -> {
+                views.otherSessionsSecurityRecommendationView.render(
+                        OtherSessionsSecurityRecommendationViewState(
+                                title = getString(R.string.device_manager_other_sessions_recommendation_title_unverified),
+                                description = getString(R.string.device_manager_other_sessions_recommendation_description_unverified),
+                                imageResourceId = R.drawable.ic_shield_warning_no_border,
+                                imageTintColorResourceId = colorProvider.getColor(R.color.shield_color_warning_background)
+                        )
+                )
+                views.otherSessionsNotFoundTextView.text = getString(R.string.device_manager_other_sessions_no_unverified_sessions_found)
+                updateSecurityLearnMoreButton(
+                        R.string.device_manager_learn_more_sessions_unverified_title,
+                        R.string.device_manager_learn_more_sessions_unverified
+                )
+            }
+            DeviceManagerFilterType.INACTIVE -> {
+                views.otherSessionsSecurityRecommendationView.render(
+                        OtherSessionsSecurityRecommendationViewState(
+                                title = getString(R.string.device_manager_other_sessions_recommendation_title_inactive),
+                                description = resources.getQuantityString(
+                                        R.plurals.device_manager_other_sessions_recommendation_description_inactive,
+                                        SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
+                                        SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
+                                ),
+                                imageResourceId = R.drawable.ic_inactive_sessions,
+                                imageTintColorResourceId = ThemeUtils.getColor(requireContext(), R.attr.vctr_system)
+                        )
+                )
+                views.otherSessionsNotFoundTextView.text = getString(R.string.device_manager_other_sessions_no_inactive_sessions_found)
+                updateSecurityLearnMoreButton(R.string.device_manager_learn_more_sessions_inactive_title, R.string.device_manager_learn_more_sessions_inactive)
+            }
+            DeviceManagerFilterType.ALL_SESSIONS -> { /* NOOP. View is not visible */
+            }
+        }
+
+        if (devices.isEmpty()) {
+            views.deviceListOtherSessions.isVisible = false
+            views.otherSessionsNotFoundLayout.isVisible = true
+        } else {
+            views.deviceListOtherSessions.isVisible = true
+            views.otherSessionsNotFoundLayout.isVisible = false
+            val mappedDevices = if (isShowingIpAddress) devices else devices.map { it.copy(deviceInfo = it.deviceInfo.copy(lastSeenIp = null)) }
+            views.deviceListOtherSessions.render(devices = mappedDevices, totalNumberOfDevices = mappedDevices.size, showViewAll = false)
+        }
+    }
+
+    private fun updateSecurityLearnMoreButton(
+            @StringRes titleResId: Int,
+            @StringRes descriptionResId: Int,
+    ) {
+        views.otherSessionsSecurityRecommendationView.onLearnMoreClickListener = {
+            showLearnMoreInfo(titleResId, getString(descriptionResId))
+        }
+    }
+
+    private fun showLearnMoreInfo(
+            @StringRes titleResId: Int,
+            description: String,
+    ) {
+        val args = SessionLearnMoreBottomSheet.Args(
+                title = getString(titleResId),
+                description = description,
+        )
+        SessionLearnMoreBottomSheet.show(childFragmentManager, args)
+    }
+
+    override fun onOtherSessionLongClicked(deviceId: String) = withState(viewModel) { state ->
+        if (!state.isSelectModeEnabled) {
+            enableSelectMode(true, deviceId)
+        } else {
+            viewModel.handle(OtherSessionsAction.ToggleSelectionForDevice(deviceId))
+        }
+    }
+
+    override fun onOtherSessionClicked(deviceId: String) = withState(viewModel) { state ->
+        if (state.isSelectModeEnabled) {
+            viewModel.handle(OtherSessionsAction.ToggleSelectionForDevice(deviceId))
+        } else {
+            viewNavigator.navigateToSessionOverview(
+                    context = requireActivity(),
+                    deviceId = deviceId
+            )
+        }
+    }
+
+    override fun onViewAllOtherSessionsClicked() {
+        // NOOP. We don't have this button in this screen
+    }
+
+    private val reAuthActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            when (activityResult.data?.extras?.getString(ReAuthActivity.RESULT_FLOW_TYPE)) {
+                LoginFlowTypes.SSO -> {
+                    viewModel.handle(OtherSessionsAction.SsoAuthDone)
+                }
+                LoginFlowTypes.PASSWORD -> {
+                    val password = activityResult.data?.extras?.getString(ReAuthActivity.RESULT_VALUE) ?: ""
+                    viewModel.handle(OtherSessionsAction.PasswordAuthDone(password))
+                }
+                else -> {
+                    viewModel.handle(OtherSessionsAction.ReAuthCancelled)
+                }
+            }
+        } else {
+            viewModel.handle(OtherSessionsAction.ReAuthCancelled)
+        }
+    }
+
+    /**
+     * Launch the re auth activity to get credentials.
+     */
+    private fun askForReAuthentication(reAuthReq: OtherSessionsViewEvents.RequestReAuth) {
+        ReAuthActivity.newIntent(
+                requireContext(),
+                reAuthReq.registrationFlowResponse,
+                reAuthReq.lastErrorCode,
+                getString(R.string.devices_delete_dialog_title)
+        ).let { intent ->
+            reAuthActivityResultLauncher.launch(intent)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsSecurityRecommendationView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsSecurityRecommendationView.kt
new file mode 100644
index 0000000000..5a7d1fa910
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsSecurityRecommendationView.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextWithColoredPart
+import im.vector.app.databinding.ViewOtherSessionSecurityRecommendationBinding
+
+@AndroidEntryPoint
+class OtherSessionsSecurityRecommendationView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val views: ViewOtherSessionSecurityRecommendationBinding
+    var onLearnMoreClickListener: (() -> Unit)? = null
+
+    init {
+        inflate(context, R.layout.view_other_session_security_recommendation, this)
+        views = ViewOtherSessionSecurityRecommendationBinding.bind(this)
+
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.OtherSessionsSecurityRecommendationView,
+                0,
+                0
+        ).use {
+            setTitle(it)
+            setDescription(it)
+            setImage(it)
+        }
+    }
+
+    private fun setTitle(typedArray: TypedArray) {
+        val title = typedArray.getString(R.styleable.OtherSessionsSecurityRecommendationView_otherSessionsRecommendationTitle)
+        setTitle(title)
+    }
+
+    private fun setTitle(title: String?) {
+        views.recommendationTitleTextView.text = title
+    }
+
+    private fun setDescription(typedArray: TypedArray) {
+        val description = typedArray.getString(R.styleable.OtherSessionsSecurityRecommendationView_otherSessionsRecommendationDescription)
+        setDescription(description)
+    }
+
+    private fun setImage(typedArray: TypedArray) {
+        val imageResource = typedArray.getResourceId(R.styleable.OtherSessionsSecurityRecommendationView_otherSessionsRecommendationImageResource, 0)
+        val backgroundTint = typedArray.getColor(R.styleable.OtherSessionsSecurityRecommendationView_otherSessionsRecommendationImageBackgroundTint, 0)
+        setImageResource(imageResource)
+        setImageBackgroundTint(backgroundTint)
+    }
+
+    private fun setImageResource(resourceId: Int) {
+        views.recommendationShieldImageView.setImageResource(resourceId)
+    }
+
+    private fun setImageBackgroundTint(backgroundTintColor: Int) {
+        views.recommendationShieldImageView.backgroundTintList = ColorStateList.valueOf(backgroundTintColor)
+    }
+
+    private fun setDescription(description: String?) {
+        val learnMore = context.getString(R.string.action_learn_more)
+        val formattedDescription = buildString {
+            append(description)
+            append(" ")
+            append(learnMore)
+        }
+
+        views.recommendationDescriptionTextView.setTextWithColoredPart(
+                fullText = formattedDescription,
+                coloredPart = learnMore,
+                underline = false
+        ) {
+            onLearnMoreClickListener?.invoke()
+        }
+    }
+
+    fun render(viewState: OtherSessionsSecurityRecommendationViewState) {
+        setTitle(viewState.title)
+        setDescription(viewState.description)
+        setImageResource(viewState.imageResourceId)
+        setImageBackgroundTint(viewState.imageTintColorResourceId)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsSecurityRecommendationViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsSecurityRecommendationViewState.kt
new file mode 100644
index 0000000000..2b17cb26b3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsSecurityRecommendationViewState.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+data class OtherSessionsSecurityRecommendationViewState(
+        val title: String,
+        val description: String,
+        val imageResourceId: Int,
+        val imageTintColorResourceId: Int,
+)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewEvents.kt
new file mode 100644
index 0000000000..55753e35be
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewEvents.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import im.vector.app.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+
+sealed class OtherSessionsViewEvents : VectorViewEvents {
+    data class RequestReAuth(
+            val registrationFlowResponse: RegistrationFlowResponse,
+            val lastErrorCode: String?
+    ) : OtherSessionsViewEvents()
+
+    object SignoutSuccess : OtherSessionsViewEvents()
+    data class SignoutError(val error: Throwable) : OtherSessionsViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
new file mode 100644
index 0000000000..a5282e7ba2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import android.content.SharedPreferences
+import com.airbnb.mvrx.MavericksViewModelFactory
+import com.airbnb.mvrx.Success
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.features.auth.PendingAuthHandler
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.devices.v2.GetDeviceFullInfoListUseCase
+import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
+import im.vector.app.features.settings.devices.v2.ToggleIpAddressVisibilityUseCase
+import im.vector.app.features.settings.devices.v2.VectorSessionsListViewModel
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.signout.SignoutSessionsReAuthNeeded
+import im.vector.app.features.settings.devices.v2.signout.SignoutSessionsUseCase
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
+import timber.log.Timber
+
+class OtherSessionsViewModel @AssistedInject constructor(
+        @Assisted private val initialState: OtherSessionsViewState,
+        activeSessionHolder: ActiveSessionHolder,
+        private val getDeviceFullInfoListUseCase: GetDeviceFullInfoListUseCase,
+        private val signoutSessionsUseCase: SignoutSessionsUseCase,
+        private val pendingAuthHandler: PendingAuthHandler,
+        refreshDevicesUseCase: RefreshDevicesUseCase,
+        private val vectorPreferences: VectorPreferences,
+        private val toggleIpAddressVisibilityUseCase: ToggleIpAddressVisibilityUseCase,
+) : VectorSessionsListViewModel<OtherSessionsViewState, OtherSessionsAction, OtherSessionsViewEvents>(
+        initialState, activeSessionHolder, refreshDevicesUseCase
+), SharedPreferences.OnSharedPreferenceChangeListener {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<OtherSessionsViewModel, OtherSessionsViewState> {
+        override fun create(initialState: OtherSessionsViewState): OtherSessionsViewModel
+    }
+
+    companion object : MavericksViewModelFactory<OtherSessionsViewModel, OtherSessionsViewState> by hiltMavericksViewModelFactory()
+
+    private var observeDevicesJob: Job? = null
+
+    init {
+        observeDevices(initialState.currentFilter)
+        refreshIpAddressVisibility()
+        observePreferences()
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        refreshIpAddressVisibility()
+    }
+
+    private fun observePreferences() {
+        vectorPreferences.subscribeToChanges(this)
+    }
+
+    override fun onCleared() {
+        vectorPreferences.unsubscribeToChanges(this)
+        super.onCleared()
+    }
+
+    private fun refreshIpAddressVisibility() {
+        val shouldShowIpAddress = vectorPreferences.showIpAddressInSessionManagerScreens()
+        setState {
+            copy(isShowingIpAddress = shouldShowIpAddress)
+        }
+    }
+
+    private fun observeDevices(currentFilter: DeviceManagerFilterType) {
+        observeDevicesJob?.cancel()
+        observeDevicesJob = getDeviceFullInfoListUseCase.execute(
+                filterType = currentFilter,
+                excludeCurrentDevice = initialState.excludeCurrentDevice
+        )
+                .execute { async ->
+                    copy(
+                            devices = async,
+                    )
+                }
+    }
+
+    override fun handle(action: OtherSessionsAction) {
+        when (action) {
+            is OtherSessionsAction.PasswordAuthDone -> handlePasswordAuthDone(action)
+            OtherSessionsAction.ReAuthCancelled -> handleReAuthCancelled()
+            OtherSessionsAction.SsoAuthDone -> handleSsoAuthDone()
+            is OtherSessionsAction.FilterDevices -> handleFilterDevices(action)
+            OtherSessionsAction.DisableSelectMode -> handleDisableSelectMode()
+            is OtherSessionsAction.EnableSelectMode -> handleEnableSelectMode(action.deviceId)
+            is OtherSessionsAction.ToggleSelectionForDevice -> handleToggleSelectionForDevice(action.deviceId)
+            OtherSessionsAction.DeselectAll -> handleDeselectAll()
+            OtherSessionsAction.SelectAll -> handleSelectAll()
+            OtherSessionsAction.MultiSignout -> handleMultiSignout()
+            OtherSessionsAction.ToggleIpAddressVisibility -> handleToggleIpAddressVisibility()
+        }
+    }
+
+    private fun handleToggleIpAddressVisibility() {
+        toggleIpAddressVisibilityUseCase.execute()
+    }
+
+    private fun handleFilterDevices(action: OtherSessionsAction.FilterDevices) {
+        setState {
+            copy(
+                    currentFilter = action.filterType
+            )
+        }
+        observeDevices(action.filterType)
+    }
+
+    private fun handleDisableSelectMode() {
+        setSelectionForAllDevices(isSelected = false, enableSelectMode = false)
+    }
+
+    private fun handleEnableSelectMode(deviceId: String?) {
+        toggleSelectionForDevice(deviceId, enableSelectMode = true)
+    }
+
+    private fun handleToggleSelectionForDevice(deviceId: String) = withState { state ->
+        toggleSelectionForDevice(deviceId, enableSelectMode = state.isSelectModeEnabled)
+    }
+
+    private fun toggleSelectionForDevice(deviceId: String?, enableSelectMode: Boolean) = withState { state ->
+        val updatedDevices = if (state.devices is Success) {
+            val devices = state.devices.invoke().toMutableList()
+            val indexToUpdate = devices.indexOfFirst { it.deviceInfo.deviceId == deviceId }
+            if (indexToUpdate >= 0) {
+                val currentInfo = devices[indexToUpdate]
+                val updatedInfo = currentInfo.copy(isSelected = !currentInfo.isSelected)
+                devices[indexToUpdate] = updatedInfo
+            }
+            Success(devices)
+        } else {
+            state.devices
+        }
+
+        setState {
+            copy(
+                    devices = updatedDevices,
+                    isSelectModeEnabled = enableSelectMode
+            )
+        }
+    }
+
+    private fun handleSelectAll() = withState { state ->
+        setSelectionForAllDevices(isSelected = true, enableSelectMode = state.isSelectModeEnabled)
+    }
+
+    private fun handleDeselectAll() = withState { state ->
+        setSelectionForAllDevices(isSelected = false, enableSelectMode = state.isSelectModeEnabled)
+    }
+
+    private fun setSelectionForAllDevices(isSelected: Boolean, enableSelectMode: Boolean) = withState { state ->
+        val updatedDevices = if (state.devices is Success) {
+            val updatedDevices = state.devices.invoke().map { it.copy(isSelected = isSelected) }
+            Success(updatedDevices)
+        } else {
+            state.devices
+        }
+
+        setState {
+            copy(
+                    devices = updatedDevices,
+                    isSelectModeEnabled = enableSelectMode
+            )
+        }
+    }
+
+    private fun handleMultiSignout() = withState { state ->
+        viewModelScope.launch {
+            setLoading(true)
+            val deviceIds = getDeviceIdsToSignout(state)
+            if (deviceIds.isEmpty()) {
+                return@launch
+            }
+            val result = signout(deviceIds)
+            setLoading(false)
+
+            val error = result.exceptionOrNull()
+            if (error == null) {
+                onSignoutSuccess()
+            } else {
+                onSignoutFailure(error)
+            }
+        }
+    }
+
+    private fun getDeviceIdsToSignout(state: OtherSessionsViewState): List<String> {
+        return if (state.isSelectModeEnabled) {
+            state.devices()?.filter { it.isSelected }.orEmpty()
+        } else {
+            state.devices().orEmpty()
+        }.mapNotNull { it.deviceInfo.deviceId }
+    }
+
+    private suspend fun signout(deviceIds: List<String>) = signoutSessionsUseCase.execute(deviceIds, this::onReAuthNeeded)
+
+    private fun onReAuthNeeded(reAuthNeeded: SignoutSessionsReAuthNeeded) {
+        Timber.d("onReAuthNeeded")
+        pendingAuthHandler.pendingAuth = DefaultBaseAuth(session = reAuthNeeded.flowResponse.session)
+        pendingAuthHandler.uiaContinuation = reAuthNeeded.uiaContinuation
+        _viewEvents.post(OtherSessionsViewEvents.RequestReAuth(reAuthNeeded.flowResponse, reAuthNeeded.errCode))
+    }
+
+    private fun setLoading(isLoading: Boolean) {
+        setState { copy(isLoading = isLoading) }
+    }
+
+    private fun onSignoutSuccess() {
+        Timber.d("signout success")
+        refreshDeviceList()
+        _viewEvents.post(OtherSessionsViewEvents.SignoutSuccess)
+    }
+
+    private fun onSignoutFailure(failure: Throwable) {
+        Timber.e("signout failure", failure)
+        _viewEvents.post(OtherSessionsViewEvents.SignoutError(failure))
+    }
+
+    private fun handleSsoAuthDone() {
+        pendingAuthHandler.ssoAuthDone()
+    }
+
+    private fun handlePasswordAuthDone(action: OtherSessionsAction.PasswordAuthDone) {
+        pendingAuthHandler.passwordAuthDone(action.password)
+    }
+
+    private fun handleReAuthCancelled() {
+        pendingAuthHandler.reAuthCancelled()
+    }
+}
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedFCMDistributor.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewNavigator.kt
similarity index 62%
rename from vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedFCMDistributor.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewNavigator.kt
index 14600ccbb3..ef1895d0ae 100644
--- a/vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedFCMDistributor.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewNavigator.kt
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.app.push.fcm
+package im.vector.app.features.settings.devices.v2.othersessions
 
 import android.content.Context
-import org.unifiedpush.android.embedded_fcm_distributor.EmbeddedDistributorReceiver
+import im.vector.app.features.settings.devices.v2.overview.SessionOverviewActivity
+import javax.inject.Inject
 
-class EmbeddedFCMDistributor : EmbeddedDistributorReceiver() {
-    override fun getEndpoint(context: Context, token: String, instance: String): String {
-        // Here token is the FCM Token, used by the gateway (sygnal)
-        return token
+class OtherSessionsViewNavigator @Inject constructor() {
+
+    fun navigateToSessionOverview(context: Context, deviceId: String) {
+        context.startActivity(SessionOverviewActivity.newIntent(context, deviceId))
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewState.kt
new file mode 100644
index 0000000000..f4dd3640ee
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewState.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.Uninitialized
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+
+data class OtherSessionsViewState(
+        val devices: Async<List<DeviceFullInfo>> = Uninitialized,
+        val currentFilter: DeviceManagerFilterType = DeviceManagerFilterType.ALL_SESSIONS,
+        val excludeCurrentDevice: Boolean = false,
+        val isSelectModeEnabled: Boolean = false,
+        val isLoading: Boolean = false,
+        val isShowingIpAddress: Boolean = false,
+) : MavericksState {
+
+    constructor(args: OtherSessionsArgs) : this(excludeCurrentDevice = args.excludeCurrentDevice)
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCase.kt
new file mode 100644
index 0000000000..445d2309a4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCase.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import androidx.lifecycle.asFlow
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.session.clientinfo.GetMatrixClientInfoUseCase
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.ParseDeviceUserAgentUseCase
+import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase
+import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
+import im.vector.app.features.settings.devices.v2.verification.GetEncryptionTrustLevelForDeviceUseCase
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.emptyFlow
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.flow.unwrap
+import javax.inject.Inject
+
+class GetDeviceFullInfoUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val getCurrentSessionCrossSigningInfoUseCase: GetCurrentSessionCrossSigningInfoUseCase,
+        private val getEncryptionTrustLevelForDeviceUseCase: GetEncryptionTrustLevelForDeviceUseCase,
+        private val checkIfSessionIsInactiveUseCase: CheckIfSessionIsInactiveUseCase,
+        private val parseDeviceUserAgentUseCase: ParseDeviceUserAgentUseCase,
+        private val getMatrixClientInfoUseCase: GetMatrixClientInfoUseCase,
+) {
+
+    fun execute(deviceId: String): Flow<DeviceFullInfo> {
+        return activeSessionHolder.getSafeActiveSession()?.let { session ->
+            combine(
+                    getCurrentSessionCrossSigningInfoUseCase.execute(),
+                    session.cryptoService().getMyDevicesInfoLive(deviceId).asFlow(),
+                    session.cryptoService().getLiveCryptoDeviceInfoWithId(deviceId).asFlow()
+            ) { currentSessionCrossSigningInfo, deviceInfo, cryptoDeviceInfo ->
+                val info = deviceInfo.getOrNull()
+                val cryptoInfo = cryptoDeviceInfo.getOrNull()
+                val fullInfo = if (info != null) {
+                    val roomEncryptionTrustLevel = getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoInfo)
+                    val isInactive = checkIfSessionIsInactiveUseCase.execute(info.lastSeenTs)
+                    val isCurrentDevice = currentSessionCrossSigningInfo.deviceId == info.deviceId
+                    val deviceUserAgent = parseDeviceUserAgentUseCase.execute(info.getBestLastSeenUserAgent())
+                    val matrixClientInfo = info.deviceId
+                            ?.takeIf { it.isNotEmpty() }
+                            ?.let { getMatrixClientInfoUseCase.execute(session, it) }
+
+                    DeviceFullInfo(
+                            deviceInfo = info,
+                            cryptoDeviceInfo = cryptoInfo,
+                            roomEncryptionTrustLevel = roomEncryptionTrustLevel,
+                            isInactive = isInactive,
+                            isCurrentDevice = isCurrentDevice,
+                            deviceExtendedInfo = deviceUserAgent,
+                            matrixClientInfo = matrixClientInfo
+                    )
+                } else {
+                    null
+                }
+                fullInfo.toOptional()
+            }.unwrap()
+        } ?: emptyFlow()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewAction.kt
new file mode 100644
index 0000000000..2b6c40eead
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewAction.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class SessionOverviewAction : VectorViewModelAction {
+
+    object VerifySession : SessionOverviewAction()
+    object SignoutOtherSession : SessionOverviewAction()
+    object SsoAuthDone : SessionOverviewAction()
+    data class PasswordAuthDone(val password: String) : SessionOverviewAction()
+    object ReAuthCancelled : SessionOverviewAction()
+    data class TogglePushNotifications(
+            val deviceId: String,
+            val enabled: Boolean,
+    ) : SessionOverviewAction()
+    object ToggleIpAddressVisibility : SessionOverviewAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewActivity.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewActivity.kt
new file mode 100644
index 0000000000..5695d02ae9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewActivity.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.airbnb.mvrx.Mavericks
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
+
+/**
+ * Display the overview info about a Session.
+ */
+@AndroidEntryPoint
+class SessionOverviewActivity : SimpleFragmentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (isFirstCreation()) {
+            addFragment(
+                    container = views.container,
+                    fragmentClass = SessionOverviewFragment::class.java,
+                    params = intent.getParcelableExtraCompat(Mavericks.KEY_ARG)
+            )
+        }
+    }
+
+    companion object {
+        fun newIntent(context: Context, deviceId: String): Intent {
+            return Intent(context, SessionOverviewActivity::class.java).apply {
+                putExtra(Mavericks.KEY_ARG, SessionOverviewArgs(deviceId))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewArgs.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewArgs.kt
new file mode 100644
index 0000000000..27c8d6fb2e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewArgs.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class SessionOverviewArgs(
+        val deviceId: String
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewEntrySwitchView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewEntrySwitchView.kt
new file mode 100644
index 0000000000..24c7725f29
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewEntrySwitchView.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.CompoundButton
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import im.vector.app.R
+import im.vector.app.core.extensions.setAttributeBackground
+import im.vector.app.databinding.ViewSessionOverviewEntrySwitchBinding
+
+class SessionOverviewEntrySwitchView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val binding = ViewSessionOverviewEntrySwitchBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+
+    init {
+        initBackground()
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.SessionOverviewEntrySwitchView,
+                0,
+                0
+        ).use {
+            setTitle(it)
+            setDescription(it)
+            setSwitchedEnabled(it)
+            setClickListener()
+        }
+    }
+
+    private fun initBackground() {
+        binding.root.setAttributeBackground(android.R.attr.selectableItemBackground)
+    }
+
+    private fun setTitle(typedArray: TypedArray) {
+        val title = typedArray.getString(R.styleable.SessionOverviewEntrySwitchView_sessionOverviewEntrySwitchTitle)
+        binding.sessionsOverviewEntryTitle.text = title
+    }
+
+    private fun setDescription(typedArray: TypedArray) {
+        val description = typedArray.getString(R.styleable.SessionOverviewEntrySwitchView_sessionOverviewEntrySwitchDescription)
+        binding.sessionsOverviewEntryDescription.text = description
+    }
+
+    private fun setSwitchedEnabled(typedArray: TypedArray) {
+        val enabled = typedArray.getBoolean(R.styleable.SessionOverviewEntrySwitchView_sessionOverviewEntrySwitchEnabled, false)
+        binding.sessionsOverviewEntrySwitch.isChecked = enabled
+    }
+
+    private fun setClickListener() {
+        binding.root.setOnClickListener {
+            setChecked(!binding.sessionsOverviewEntrySwitch.isChecked)
+        }
+    }
+
+    fun setChecked(checked: Boolean) {
+        binding.sessionsOverviewEntrySwitch.isChecked = checked
+    }
+
+    fun setOnCheckedChangeListener(listener: CompoundButton.OnCheckedChangeListener?) {
+        binding.sessionsOverviewEntrySwitch.setOnCheckedChangeListener(listener)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        binding.sessionsOverviewEntrySwitch.setOnCheckedChangeListener(null)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewEntryView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewEntryView.kt
new file mode 100644
index 0000000000..5c4f0047ce
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewEntryView.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import im.vector.app.R
+import im.vector.app.core.extensions.setAttributeBackground
+import im.vector.app.databinding.ViewSessionOverviewEntryBinding
+
+class SessionOverviewEntryView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val binding = ViewSessionOverviewEntryBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+
+    init {
+        initBackground()
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.SessionOverviewEntryView,
+                0,
+                0
+        ).use {
+            setTitle(it)
+            setDescription(it)
+        }
+    }
+
+    private fun initBackground() {
+        binding.root.setAttributeBackground(android.R.attr.selectableItemBackground)
+    }
+
+    private fun setTitle(typedArray: TypedArray) {
+        val title = typedArray.getString(R.styleable.SessionOverviewEntryView_sessionOverviewEntryTitle)
+        binding.sessionsOverviewEntryTitle.text = title
+    }
+
+    private fun setDescription(typedArray: TypedArray) {
+        val description = typedArray.getString(R.styleable.SessionOverviewEntryView_sessionOverviewEntryDescription)
+        binding.sessionsOverviewEntryDescription.text = description
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt
new file mode 100644
index 0000000000..399f99201b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewFragment.kt
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.extensions.registerStartForActivityResult
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.platform.VectorMenuProvider
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.databinding.FragmentSessionOverviewBinding
+import im.vector.app.features.auth.ReAuthActivity
+import im.vector.app.features.crypto.recover.SetupMode
+import im.vector.app.features.settings.devices.v2.list.SessionInfoViewState
+import im.vector.app.features.settings.devices.v2.more.SessionLearnMoreBottomSheet
+import im.vector.app.features.settings.devices.v2.notification.NotificationsStatus
+import im.vector.app.features.settings.devices.v2.signout.BuildConfirmSignoutDialogUseCase
+import im.vector.app.features.workers.signout.SignOutUiWorker
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import javax.inject.Inject
+
+/**
+ * Display the overview info about a Session.
+ */
+@AndroidEntryPoint
+class SessionOverviewFragment :
+        VectorBaseFragment<FragmentSessionOverviewBinding>(),
+        VectorMenuProvider {
+
+    @Inject lateinit var viewNavigator: SessionOverviewViewNavigator
+
+    @Inject lateinit var dateFormatter: VectorDateFormatter
+
+    @Inject lateinit var drawableProvider: DrawableProvider
+
+    @Inject lateinit var colorProvider: ColorProvider
+
+    @Inject lateinit var stringProvider: StringProvider
+
+    @Inject lateinit var buildConfirmSignoutDialogUseCase: BuildConfirmSignoutDialogUseCase
+
+    private val viewModel: SessionOverviewViewModel by fragmentViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSessionOverviewBinding {
+        return FragmentSessionOverviewBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        observeViewEvents()
+        initSessionInfoView()
+        initVerifyButton()
+        initSignoutButton()
+    }
+
+    private fun observeViewEvents() {
+        viewModel.observeViewEvents {
+            when (it) {
+                is SessionOverviewViewEvent.ShowVerifyCurrentSession -> {
+                    navigator.requestSelfSessionVerification(requireActivity())
+                }
+                is SessionOverviewViewEvent.ShowVerifyOtherSession -> {
+                    navigator.requestSessionVerification(requireActivity(), it.deviceId)
+                }
+                is SessionOverviewViewEvent.PromptResetSecrets -> {
+                    navigator.open4SSetup(requireActivity(), SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET)
+                }
+                is SessionOverviewViewEvent.RequestReAuth -> askForReAuthentication(it)
+                SessionOverviewViewEvent.SignoutSuccess -> viewNavigator.goBack(requireActivity())
+                is SessionOverviewViewEvent.SignoutError -> showFailure(it.error)
+            }
+        }
+    }
+
+    private fun initSessionInfoView() {
+        views.sessionOverviewInfo.onLearnMoreClickListener = {
+            Toast.makeText(context, "Learn more verification status", Toast.LENGTH_LONG).show()
+        }
+    }
+
+    private fun initVerifyButton() {
+        views.sessionOverviewInfo.viewVerifyButton.debouncedClicks {
+            viewModel.handle(SessionOverviewAction.VerifySession)
+        }
+    }
+
+    private fun initSignoutButton() {
+        views.sessionOverviewSignout.debouncedClicks {
+            confirmSignoutSession()
+        }
+    }
+
+    private fun confirmSignoutSession() = withState(viewModel) { state ->
+        if (state.deviceInfo.invoke()?.isCurrentDevice.orFalse()) {
+            confirmSignoutCurrentSession()
+        } else {
+            confirmSignoutOtherSession()
+        }
+    }
+
+    private fun confirmSignoutCurrentSession() {
+        activity?.let { SignOutUiWorker(it).perform() }
+    }
+
+    private fun confirmSignoutOtherSession() {
+        activity?.let {
+            buildConfirmSignoutDialogUseCase.execute(it, this::signoutSession)
+                    .show()
+        }
+    }
+
+    private fun signoutSession() {
+        viewModel.handle(SessionOverviewAction.SignoutOtherSession)
+    }
+
+    override fun onDestroyView() {
+        cleanUpSessionInfoView()
+        super.onDestroyView()
+    }
+
+    private fun cleanUpSessionInfoView() {
+        views.sessionOverviewInfo.onLearnMoreClickListener = null
+    }
+
+    override fun getMenuRes() = R.menu.menu_session_overview
+
+    override fun handlePrepareMenu(menu: Menu) {
+        withState(viewModel) { state ->
+            menu.findItem(R.id.sessionOverviewToggleIpAddress).title = if (state.isShowingIpAddress) {
+                getString(R.string.device_manager_other_sessions_hide_ip_address)
+            } else {
+                getString(R.string.device_manager_other_sessions_show_ip_address)
+            }
+        }
+    }
+
+    override fun handleMenuItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.sessionOverviewRename -> {
+                goToRenameSession()
+                true
+            }
+            R.id.sessionOverviewToggleIpAddress -> {
+                toggleIpAddressVisibility()
+                true
+            }
+            else -> false
+        }
+    }
+
+    private fun toggleIpAddressVisibility() {
+        viewModel.handle(SessionOverviewAction.ToggleIpAddressVisibility)
+    }
+
+    private fun goToRenameSession() = withState(viewModel) { state ->
+        viewNavigator.goToRenameSession(requireContext(), state.deviceId)
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        updateToolbar(state)
+        updateEntryDetails(state.deviceId)
+        updateSessionInfo(state)
+        updateLoading(state.isLoading)
+        updatePushNotificationToggle(state.deviceId, state.notificationsStatus)
+    }
+
+    private fun updateToolbar(viewState: SessionOverviewViewState) {
+        if (viewState.deviceInfo is Success) {
+            val titleResId =
+                    if (viewState.deviceInfo.invoke().isCurrentDevice) R.string.device_manager_current_session_title else R.string.device_manager_session_title
+            (activity as? AppCompatActivity)
+                    ?.supportActionBar
+                    ?.setTitle(titleResId)
+        }
+    }
+
+    private fun updateEntryDetails(deviceId: String) {
+        views.sessionOverviewEntryDetails.setOnClickListener {
+            viewNavigator.goToSessionDetails(requireContext(), deviceId)
+        }
+    }
+
+    private fun updateSessionInfo(viewState: SessionOverviewViewState) {
+        if (viewState.deviceInfo is Success) {
+            views.sessionOverviewInfo.isVisible = true
+            val deviceInfo = viewState.deviceInfo.invoke()
+            val isCurrentSession = deviceInfo.isCurrentDevice
+            val infoViewState = SessionInfoViewState(
+                    isCurrentSession = isCurrentSession,
+                    deviceFullInfo = deviceInfo,
+                    isVerifyButtonVisible = isCurrentSession || viewState.isCurrentSessionTrusted,
+                    isDetailsButtonVisible = false,
+                    isLearnMoreLinkVisible = deviceInfo.roomEncryptionTrustLevel != RoomEncryptionTrustLevel.Default,
+                    isLastActivityVisible = !isCurrentSession,
+                    isShowingIpAddress = viewState.isShowingIpAddress,
+            )
+            views.sessionOverviewInfo.render(infoViewState, dateFormatter, drawableProvider, colorProvider, stringProvider)
+            views.sessionOverviewInfo.onLearnMoreClickListener = {
+                showLearnMoreInfoVerificationStatus(deviceInfo.roomEncryptionTrustLevel)
+            }
+        } else {
+            views.sessionOverviewInfo.isVisible = false
+        }
+    }
+
+    private fun updatePushNotificationToggle(deviceId: String, notificationsStatus: NotificationsStatus) {
+        views.sessionOverviewPushNotifications.isGone = notificationsStatus == NotificationsStatus.NOT_SUPPORTED
+        when (notificationsStatus) {
+            NotificationsStatus.ENABLED, NotificationsStatus.DISABLED -> {
+                views.sessionOverviewPushNotifications.setOnCheckedChangeListener(null)
+                views.sessionOverviewPushNotifications.setChecked(notificationsStatus == NotificationsStatus.ENABLED)
+                views.sessionOverviewPushNotifications.post {
+                    views.sessionOverviewPushNotifications.setOnCheckedChangeListener { _, isChecked ->
+                        viewModel.handle(SessionOverviewAction.TogglePushNotifications(deviceId, isChecked))
+                    }
+                }
+            }
+            else -> Unit
+        }
+    }
+
+    private fun updateLoading(isLoading: Boolean) {
+        if (isLoading) {
+            showLoading(null)
+        } else {
+            dismissLoadingDialog()
+        }
+    }
+
+    private val reAuthActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            when (activityResult.data?.extras?.getString(ReAuthActivity.RESULT_FLOW_TYPE)) {
+                LoginFlowTypes.SSO -> {
+                    viewModel.handle(SessionOverviewAction.SsoAuthDone)
+                }
+                LoginFlowTypes.PASSWORD -> {
+                    val password = activityResult.data?.extras?.getString(ReAuthActivity.RESULT_VALUE) ?: ""
+                    viewModel.handle(SessionOverviewAction.PasswordAuthDone(password))
+                }
+                else -> {
+                    viewModel.handle(SessionOverviewAction.ReAuthCancelled)
+                }
+            }
+        } else {
+            viewModel.handle(SessionOverviewAction.ReAuthCancelled)
+        }
+    }
+
+    /**
+     * Launch the re auth activity to get credentials.
+     */
+    private fun askForReAuthentication(reAuthReq: SessionOverviewViewEvent.RequestReAuth) {
+        ReAuthActivity.newIntent(
+                requireContext(),
+                reAuthReq.registrationFlowResponse,
+                reAuthReq.lastErrorCode,
+                getString(R.string.devices_delete_dialog_title)
+        ).let { intent ->
+            reAuthActivityResultLauncher.launch(intent)
+        }
+    }
+
+    private fun showLearnMoreInfoVerificationStatus(roomEncryptionTrustLevel: RoomEncryptionTrustLevel?) {
+        val args = when (roomEncryptionTrustLevel) {
+            null -> {
+                // encryption not supported
+                SessionLearnMoreBottomSheet.Args(
+                        title = getString(R.string.device_manager_verification_status_unverified),
+                        description = getString(R.string.device_manager_learn_more_sessions_encryption_not_supported),
+                )
+            }
+            RoomEncryptionTrustLevel.Trusted -> {
+                SessionLearnMoreBottomSheet.Args(
+                        title = getString(R.string.device_manager_verification_status_verified),
+                        description = getString(R.string.device_manager_learn_more_sessions_verified_description),
+                )
+            }
+            else -> {
+                SessionLearnMoreBottomSheet.Args(
+                        title = getString(R.string.device_manager_verification_status_unverified),
+                        description = getString(R.string.device_manager_learn_more_sessions_unverified),
+                )
+            }
+        }
+        SessionLearnMoreBottomSheet.show(childFragmentManager, args)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewEvent.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewEvent.kt
new file mode 100644
index 0000000000..4ff31d1a81
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewEvent.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import im.vector.app.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+
+sealed class SessionOverviewViewEvent : VectorViewEvents {
+    object ShowVerifyCurrentSession : SessionOverviewViewEvent()
+    data class ShowVerifyOtherSession(val deviceId: String) : SessionOverviewViewEvent()
+    object PromptResetSecrets : SessionOverviewViewEvent()
+    data class RequestReAuth(
+            val registrationFlowResponse: RegistrationFlowResponse,
+            val lastErrorCode: String?
+    ) : SessionOverviewViewEvent()
+
+    object SignoutSuccess : SessionOverviewViewEvent()
+    data class SignoutError(val error: Throwable) : SessionOverviewViewEvent()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModel.kt
new file mode 100644
index 0000000000..55866cb8c4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModel.kt
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import android.content.SharedPreferences
+import com.airbnb.mvrx.MavericksViewModelFactory
+import com.airbnb.mvrx.Success
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.features.auth.PendingAuthHandler
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
+import im.vector.app.features.settings.devices.v2.ToggleIpAddressVisibilityUseCase
+import im.vector.app.features.settings.devices.v2.VectorSessionsListViewModel
+import im.vector.app.features.settings.devices.v2.notification.GetNotificationsStatusUseCase
+import im.vector.app.features.settings.devices.v2.notification.ToggleNotificationsUseCase
+import im.vector.app.features.settings.devices.v2.signout.SignoutSessionsReAuthNeeded
+import im.vector.app.features.settings.devices.v2.signout.SignoutSessionsUseCase
+import im.vector.app.features.settings.devices.v2.verification.CheckIfCurrentSessionCanBeVerifiedUseCase
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
+import timber.log.Timber
+
+class SessionOverviewViewModel @AssistedInject constructor(
+        @Assisted val initialState: SessionOverviewViewState,
+        private val getDeviceFullInfoUseCase: GetDeviceFullInfoUseCase,
+        private val checkIfCurrentSessionCanBeVerifiedUseCase: CheckIfCurrentSessionCanBeVerifiedUseCase,
+        private val signoutSessionsUseCase: SignoutSessionsUseCase,
+        private val pendingAuthHandler: PendingAuthHandler,
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val toggleNotificationsUseCase: ToggleNotificationsUseCase,
+        private val getNotificationsStatusUseCase: GetNotificationsStatusUseCase,
+        refreshDevicesUseCase: RefreshDevicesUseCase,
+        private val vectorPreferences: VectorPreferences,
+        private val toggleIpAddressVisibilityUseCase: ToggleIpAddressVisibilityUseCase,
+) : VectorSessionsListViewModel<SessionOverviewViewState, SessionOverviewAction, SessionOverviewViewEvent>(
+        initialState, activeSessionHolder, refreshDevicesUseCase
+), SharedPreferences.OnSharedPreferenceChangeListener {
+
+    companion object : MavericksViewModelFactory<SessionOverviewViewModel, SessionOverviewViewState> by hiltMavericksViewModelFactory()
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<SessionOverviewViewModel, SessionOverviewViewState> {
+        override fun create(initialState: SessionOverviewViewState): SessionOverviewViewModel
+    }
+
+    init {
+        refreshPushers()
+        observeSessionInfo(initialState.deviceId)
+        observeCurrentSessionInfo()
+        observeNotificationsStatus(initialState.deviceId)
+        refreshIpAddressVisibility()
+        observePreferences()
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        refreshIpAddressVisibility()
+    }
+
+    private fun observePreferences() {
+        vectorPreferences.subscribeToChanges(this)
+    }
+
+    override fun onCleared() {
+        vectorPreferences.unsubscribeToChanges(this)
+        super.onCleared()
+    }
+    private fun refreshIpAddressVisibility() {
+        val shouldShowIpAddress = vectorPreferences.showIpAddressInSessionManagerScreens()
+        setState {
+            copy(isShowingIpAddress = shouldShowIpAddress)
+        }
+    }
+
+    private fun refreshPushers() {
+        activeSessionHolder.getSafeActiveSession()?.pushersService()?.refreshPushers()
+    }
+
+    private fun observeSessionInfo(deviceId: String) {
+        getDeviceFullInfoUseCase.execute(deviceId)
+                .onEach { setState { copy(deviceInfo = Success(it)) } }
+                .launchIn(viewModelScope)
+    }
+
+    private fun observeCurrentSessionInfo() {
+        activeSessionHolder.getSafeActiveSession()
+                ?.sessionParams
+                ?.deviceId
+                ?.let { deviceId ->
+                    getDeviceFullInfoUseCase.execute(deviceId)
+                            .map { it.roomEncryptionTrustLevel == RoomEncryptionTrustLevel.Trusted }
+                            .distinctUntilChanged()
+                            .onEach { setState { copy(isCurrentSessionTrusted = it) } }
+                            .launchIn(viewModelScope)
+                }
+    }
+
+    private fun observeNotificationsStatus(deviceId: String) {
+        activeSessionHolder.getSafeActiveSession()?.let { session ->
+            getNotificationsStatusUseCase.execute(session, deviceId)
+                    .onEach { setState { copy(notificationsStatus = it) } }
+                    .launchIn(viewModelScope)
+        }
+    }
+
+    override fun handle(action: SessionOverviewAction) {
+        when (action) {
+            is SessionOverviewAction.VerifySession -> handleVerifySessionAction()
+            SessionOverviewAction.SignoutOtherSession -> handleSignoutOtherSession()
+            SessionOverviewAction.SsoAuthDone -> handleSsoAuthDone()
+            is SessionOverviewAction.PasswordAuthDone -> handlePasswordAuthDone(action)
+            SessionOverviewAction.ReAuthCancelled -> handleReAuthCancelled()
+            is SessionOverviewAction.TogglePushNotifications -> handleTogglePusherAction(action)
+            SessionOverviewAction.ToggleIpAddressVisibility -> handleToggleIpAddressVisibility()
+        }
+    }
+
+    private fun handleToggleIpAddressVisibility() {
+        toggleIpAddressVisibilityUseCase.execute()
+    }
+
+    private fun handleVerifySessionAction() = withState { viewState ->
+        if (viewState.deviceInfo.invoke()?.isCurrentDevice.orFalse()) {
+            handleVerifyCurrentSession()
+        } else {
+            handleVerifyOtherSession(viewState.deviceId)
+        }
+    }
+
+    private fun handleVerifyCurrentSession() {
+        viewModelScope.launch {
+            val currentSessionCanBeVerified = checkIfCurrentSessionCanBeVerifiedUseCase.execute()
+            if (currentSessionCanBeVerified) {
+                _viewEvents.post(SessionOverviewViewEvent.ShowVerifyCurrentSession)
+            } else {
+                _viewEvents.post(SessionOverviewViewEvent.PromptResetSecrets)
+            }
+        }
+    }
+
+    private fun handleVerifyOtherSession(deviceId: String) {
+        _viewEvents.post(SessionOverviewViewEvent.ShowVerifyOtherSession(deviceId))
+    }
+
+    private fun handleSignoutOtherSession() = withState { state ->
+        // signout process for current session is not handled here
+        if (!state.deviceInfo.invoke()?.isCurrentDevice.orFalse()) {
+            handleSignoutOtherSession(state.deviceId)
+        }
+    }
+
+    private fun handleSignoutOtherSession(deviceId: String) {
+        viewModelScope.launch {
+            setLoading(true)
+            val result = signout(deviceId)
+            setLoading(false)
+
+            val error = result.exceptionOrNull()
+            if (error == null) {
+                onSignoutSuccess()
+            } else {
+                onSignoutFailure(error)
+            }
+        }
+    }
+
+    private suspend fun signout(deviceId: String) = signoutSessionsUseCase.execute(listOf(deviceId), this::onReAuthNeeded)
+
+    private fun onReAuthNeeded(reAuthNeeded: SignoutSessionsReAuthNeeded) {
+        Timber.d("onReAuthNeeded")
+        pendingAuthHandler.pendingAuth = DefaultBaseAuth(session = reAuthNeeded.flowResponse.session)
+        pendingAuthHandler.uiaContinuation = reAuthNeeded.uiaContinuation
+        _viewEvents.post(SessionOverviewViewEvent.RequestReAuth(reAuthNeeded.flowResponse, reAuthNeeded.errCode))
+    }
+
+    private fun setLoading(isLoading: Boolean) {
+        setState { copy(isLoading = isLoading) }
+    }
+
+    private fun onSignoutSuccess() {
+        Timber.d("signout success")
+        refreshDeviceList()
+        _viewEvents.post(SessionOverviewViewEvent.SignoutSuccess)
+    }
+
+    private fun onSignoutFailure(failure: Throwable) {
+        Timber.e("signout failure", failure)
+        _viewEvents.post(SessionOverviewViewEvent.SignoutError(failure))
+    }
+
+    private fun handleSsoAuthDone() {
+        pendingAuthHandler.ssoAuthDone()
+    }
+
+    private fun handlePasswordAuthDone(action: SessionOverviewAction.PasswordAuthDone) {
+        pendingAuthHandler.passwordAuthDone(action.password)
+    }
+
+    private fun handleReAuthCancelled() {
+        pendingAuthHandler.reAuthCancelled()
+    }
+
+    private fun handleTogglePusherAction(action: SessionOverviewAction.TogglePushNotifications) {
+        viewModelScope.launch {
+            toggleNotificationsUseCase.execute(action.deviceId, action.enabled)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewNavigator.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewNavigator.kt
new file mode 100644
index 0000000000..0cb95bae7d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewNavigator.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import android.content.Context
+import androidx.fragment.app.FragmentActivity
+import im.vector.app.features.settings.devices.v2.details.SessionDetailsActivity
+import im.vector.app.features.settings.devices.v2.rename.RenameSessionActivity
+import javax.inject.Inject
+
+class SessionOverviewViewNavigator @Inject constructor() {
+
+    fun goToSessionDetails(context: Context, deviceId: String) {
+        context.startActivity(SessionDetailsActivity.newIntent(context, deviceId))
+    }
+
+    fun goToRenameSession(context: Context, deviceId: String) {
+        context.startActivity(RenameSessionActivity.newIntent(context, deviceId))
+    }
+
+    fun goBack(fragmentActivity: FragmentActivity) {
+        fragmentActivity.finish()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewState.kt
new file mode 100644
index 0000000000..0f66605f98
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewState.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.Uninitialized
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.notification.NotificationsStatus
+
+data class SessionOverviewViewState(
+        val deviceId: String,
+        val isCurrentSessionTrusted: Boolean = false,
+        val deviceInfo: Async<DeviceFullInfo> = Uninitialized,
+        val isLoading: Boolean = false,
+        val notificationsStatus: NotificationsStatus = NotificationsStatus.NOT_SUPPORTED,
+        val isShowingIpAddress: Boolean = false,
+) : MavericksState {
+    constructor(args: SessionOverviewArgs) : this(
+            deviceId = args.deviceId
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionAction.kt
new file mode 100644
index 0000000000..c60bc7df14
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionAction.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class RenameSessionAction : VectorViewModelAction {
+    object InitWithLastEditedName : RenameSessionAction()
+    object SaveModifications : RenameSessionAction()
+    data class EditLocally(val editedName: String) : RenameSessionAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt
new file mode 100644
index 0000000000..44bc251382
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.WindowManager
+import com.airbnb.mvrx.Mavericks
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
+
+/**
+ * Display the screen to rename a Session.
+ */
+@AndroidEntryPoint
+class RenameSessionActivity : VectorBaseActivity<ActivitySimpleBinding>() {
+
+    override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (isFirstCreation()) {
+            window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE)
+            addFragment(
+                    container = views.simpleFragmentContainer,
+                    fragmentClass = RenameSessionFragment::class.java,
+                    params = intent.getParcelableExtraCompat(Mavericks.KEY_ARG)
+            )
+        }
+    }
+
+    companion object {
+        fun newIntent(context: Context, deviceId: String): Intent {
+            return Intent(context, RenameSessionActivity::class.java).apply {
+                putExtra(Mavericks.KEY_ARG, RenameSessionArgs(deviceId))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionArgs.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionArgs.kt
new file mode 100644
index 0000000000..d43d472946
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionArgs.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class RenameSessionArgs(
+        val deviceId: String
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
new file mode 100644
index 0000000000..d2cbbbdee5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
+import androidx.core.widget.doOnTextChanged
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.showKeyboard
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentSessionRenameBinding
+import im.vector.app.features.settings.devices.v2.more.SessionLearnMoreBottomSheet
+import javax.inject.Inject
+
+/**
+ * Display the screen to rename a Session.
+ */
+@AndroidEntryPoint
+class RenameSessionFragment :
+        VectorBaseFragment<FragmentSessionRenameBinding>() {
+
+    private val viewModel: RenameSessionViewModel by fragmentViewModel()
+
+    @Inject lateinit var viewNavigator: RenameSessionViewNavigator
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSessionRenameBinding {
+        return FragmentSessionRenameBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        observeViewEvents()
+        initToolbar()
+        initEditText()
+        initSaveButton()
+        initWithLastEditedName()
+        initInfoView()
+    }
+
+    private fun initToolbar() {
+        setupToolbar(views.renameSessionToolbar)
+                .allowBack(useCross = true)
+    }
+
+    private fun initEditText() {
+        showKeyboard()
+        views.renameSessionEditText.doOnTextChanged { text, _, _, _ ->
+            viewModel.handle(RenameSessionAction.EditLocally(text.toString()))
+        }
+    }
+
+    private fun showKeyboard() {
+        val focusChangeListener = object : ViewTreeObserver.OnWindowFocusChangeListener {
+            override fun onWindowFocusChanged(hasFocus: Boolean) {
+                if (hasFocus) {
+                    views.renameSessionEditText.showKeyboard(andRequestFocus = true)
+                }
+                views.renameSessionEditText.viewTreeObserver.removeOnWindowFocusChangeListener(this)
+            }
+        }
+        views.renameSessionEditText.viewTreeObserver.addOnWindowFocusChangeListener(focusChangeListener)
+    }
+
+    private fun initSaveButton() {
+        views.renameSessionSave.debouncedClicks {
+            viewModel.handle(RenameSessionAction.SaveModifications)
+        }
+    }
+
+    private fun initWithLastEditedName() {
+        viewModel.handle(RenameSessionAction.InitWithLastEditedName)
+    }
+
+    private fun initInfoView() {
+        views.renameSessionInfo.onLearnMoreClickListener = {
+            showLearnMoreInfo()
+        }
+    }
+
+    private fun showLearnMoreInfo() {
+        val args = SessionLearnMoreBottomSheet.Args(
+                title = getString(R.string.device_manager_learn_more_session_rename_title),
+                description = getString(R.string.device_manager_learn_more_session_rename),
+        )
+        SessionLearnMoreBottomSheet
+                .show(childFragmentManager, args)
+                .onDismiss = { showKeyboard() }
+    }
+
+    private fun observeViewEvents() {
+        viewModel.observeViewEvents {
+            when (it) {
+                is RenameSessionViewEvent.Initialized -> {
+                    views.renameSessionEditText.setText(it.deviceName)
+                    views.renameSessionEditText.setSelection(views.renameSessionEditText.length())
+                }
+                is RenameSessionViewEvent.SessionRenamed -> {
+                    viewNavigator.goBack(requireActivity())
+                }
+                is RenameSessionViewEvent.Failure -> {
+                    showFailure(it.throwable)
+                }
+            }
+        }
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        views.renameSessionSave.isEnabled = state.editedDeviceName.isNotEmpty()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionUseCase.kt
new file mode 100644
index 0000000000..2e44bb33d6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionUseCase.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.andThen
+import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
+import org.matrix.android.sdk.api.util.awaitCallback
+import javax.inject.Inject
+
+class RenameSessionUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val refreshDevicesUseCase: RefreshDevicesUseCase,
+) {
+
+    suspend fun execute(deviceId: String, newName: String): Result<Unit> {
+        return renameDevice(deviceId, newName)
+                .andThen { refreshDevices() }
+    }
+
+    private suspend fun renameDevice(deviceId: String, newName: String) = runCatching {
+        awaitCallback<Unit> { matrixCallback ->
+            activeSessionHolder.getActiveSession()
+                    .cryptoService()
+                    .setDeviceName(deviceId, newName, matrixCallback)
+        }
+    }
+
+    private fun refreshDevices() = runCatching { refreshDevicesUseCase.execute() }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewEvent.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewEvent.kt
new file mode 100644
index 0000000000..fd40412547
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewEvent.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class RenameSessionViewEvent : VectorViewEvents {
+    data class Initialized(val deviceName: String) : RenameSessionViewEvent()
+    object SessionRenamed : RenameSessionViewEvent()
+    data class Failure(val throwable: Throwable) : RenameSessionViewEvent()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewModel.kt
new file mode 100644
index 0000000000..22170fc702
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewModel.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import androidx.annotation.VisibleForTesting
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.settings.devices.v2.overview.GetDeviceFullInfoUseCase
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+
+class RenameSessionViewModel @AssistedInject constructor(
+        @Assisted val initialState: RenameSessionViewState,
+        private val getDeviceFullInfoUseCase: GetDeviceFullInfoUseCase,
+        private val renameSessionUseCase: RenameSessionUseCase,
+) : VectorViewModel<RenameSessionViewState, RenameSessionAction, RenameSessionViewEvent>(initialState) {
+
+    companion object : MavericksViewModelFactory<RenameSessionViewModel, RenameSessionViewState> by hiltMavericksViewModelFactory()
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<RenameSessionViewModel, RenameSessionViewState> {
+        override fun create(initialState: RenameSessionViewState): RenameSessionViewModel
+    }
+
+    @VisibleForTesting
+    var hasRetrievedOriginalDeviceName = false
+
+    override fun handle(action: RenameSessionAction) {
+        when (action) {
+            is RenameSessionAction.InitWithLastEditedName -> handleInitWithLastEditedName()
+            is RenameSessionAction.EditLocally -> handleEditLocally(action.editedName)
+            is RenameSessionAction.SaveModifications -> handleSaveModifications()
+        }
+    }
+
+    private fun handleInitWithLastEditedName() = withState { state ->
+        if (hasRetrievedOriginalDeviceName) {
+            postInitEvent()
+        } else {
+            hasRetrievedOriginalDeviceName = true
+            viewModelScope.launch {
+                setStateWithOriginalDeviceName(state.deviceId)
+                postInitEvent()
+            }
+        }
+    }
+
+    private suspend fun setStateWithOriginalDeviceName(deviceId: String) {
+        getDeviceFullInfoUseCase.execute(deviceId)
+                .firstOrNull()
+                ?.let { deviceFullInfo ->
+                    setState { copy(editedDeviceName = deviceFullInfo.deviceInfo.displayName.orEmpty()) }
+                }
+    }
+
+    private fun postInitEvent() = withState { state ->
+        _viewEvents.post(RenameSessionViewEvent.Initialized(state.editedDeviceName))
+    }
+
+    private fun handleEditLocally(editedName: String) {
+        setState { copy(editedDeviceName = editedName) }
+    }
+
+    private fun handleSaveModifications() = withState { viewState ->
+        viewModelScope.launch {
+            val result = renameSessionUseCase.execute(
+                    deviceId = viewState.deviceId,
+                    newName = viewState.editedDeviceName,
+            )
+            val viewEvent = if (result.isSuccess) {
+                RenameSessionViewEvent.SessionRenamed
+            } else {
+                RenameSessionViewEvent.Failure(result.exceptionOrNull() ?: Exception())
+            }
+            _viewEvents.post(viewEvent)
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewNavigator.kt
similarity index 61%
rename from matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewNavigator.kt
index a815cec353..e00d7b25ff 100644
--- a/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewNavigator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 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.
@@ -14,17 +14,14 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.network.interceptors
+package im.vector.app.features.settings.devices.v2.rename
 
-import androidx.annotation.NonNull
-import okhttp3.logging.HttpLoggingInterceptor
+import androidx.fragment.app.FragmentActivity
+import javax.inject.Inject
 
-/**
- * No op logger
- */
-internal class FormattedJsonHttpLogger : HttpLoggingInterceptor.Logger {
+class RenameSessionViewNavigator @Inject constructor() {
 
-    @Synchronized
-    override fun log(@NonNull message: String) {
+    fun goBack(activity: FragmentActivity) {
+        activity.finish()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewState.kt
new file mode 100644
index 0000000000..70e11327ca
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewState.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import com.airbnb.mvrx.MavericksState
+
+data class RenameSessionViewState(
+        val deviceId: String,
+        val editedDeviceName: String = "",
+) : MavericksState {
+    constructor(args: RenameSessionArgs) : this(
+            deviceId = args.deviceId
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/BuildConfirmSignoutDialogUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/BuildConfirmSignoutDialogUseCase.kt
new file mode 100644
index 0000000000..4edfc2febe
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/BuildConfirmSignoutDialogUseCase.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.signout
+
+import android.content.Context
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import im.vector.app.R
+import javax.inject.Inject
+
+class BuildConfirmSignoutDialogUseCase @Inject constructor() {
+
+    fun execute(context: Context, onConfirm: () -> Unit) =
+            MaterialAlertDialogBuilder(context)
+                    .setTitle(R.string.action_sign_out)
+                    .setMessage(R.string.action_sign_out_confirmation_simple)
+                    .setPositiveButton(R.string.action_sign_out) { _, _ ->
+                        onConfirm()
+                    }
+                    .setNegativeButton(R.string.action_cancel, null)
+                    .create()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/InterceptSignoutFlowResponseUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/InterceptSignoutFlowResponseUseCase.kt
new file mode 100644
index 0000000000..42ebd7782e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/InterceptSignoutFlowResponseUseCase.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.signout
+
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.login.ReAuthHelper
+import org.matrix.android.sdk.api.auth.UIABaseAuth
+import org.matrix.android.sdk.api.auth.UserPasswordAuth
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
+import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
+import javax.inject.Inject
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+
+class InterceptSignoutFlowResponseUseCase @Inject constructor(
+        private val reAuthHelper: ReAuthHelper,
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+
+    fun execute(
+            flowResponse: RegistrationFlowResponse,
+            errCode: String?,
+            promise: Continuation<UIABaseAuth>
+    ): SignoutSessionsReAuthNeeded? {
+        return if (flowResponse.nextUncompletedStage() == LoginFlowTypes.PASSWORD && reAuthHelper.data != null && errCode == null) {
+            UserPasswordAuth(
+                    session = null,
+                    user = activeSessionHolder.getActiveSession().myUserId,
+                    password = reAuthHelper.data
+            ).let { promise.resume(it) }
+            null
+        } else {
+            SignoutSessionsReAuthNeeded(
+                    pendingAuth = DefaultBaseAuth(session = flowResponse.session),
+                    uiaContinuation = promise,
+                    flowResponse = flowResponse,
+                    errCode = errCode
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsReAuthNeeded.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsReAuthNeeded.kt
new file mode 100644
index 0000000000..56e3d17686
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsReAuthNeeded.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.signout
+
+import org.matrix.android.sdk.api.auth.UIABaseAuth
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+import kotlin.coroutines.Continuation
+
+data class SignoutSessionsReAuthNeeded(
+        val pendingAuth: UIABaseAuth,
+        val uiaContinuation: Continuation<UIABaseAuth>,
+        val flowResponse: RegistrationFlowResponse,
+        val errCode: String?
+)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsUseCase.kt
new file mode 100644
index 0000000000..1cf713a711
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsUseCase.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.signout
+
+import androidx.annotation.Size
+import im.vector.app.core.di.ActiveSessionHolder
+import org.matrix.android.sdk.api.auth.UIABaseAuth
+import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+import org.matrix.android.sdk.api.util.awaitCallback
+import timber.log.Timber
+import javax.inject.Inject
+import kotlin.coroutines.Continuation
+
+class SignoutSessionsUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val interceptSignoutFlowResponseUseCase: InterceptSignoutFlowResponseUseCase,
+) {
+
+    suspend fun execute(
+            @Size(min = 1) deviceIds: List<String>,
+            onReAuthNeeded: (SignoutSessionsReAuthNeeded) -> Unit,
+    ): Result<Unit> = runCatching {
+        Timber.d("start execute with ${deviceIds.size} deviceIds")
+
+        val authInterceptor = object : UserInteractiveAuthInterceptor {
+            override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                val result = interceptSignoutFlowResponseUseCase.execute(flowResponse, errCode, promise)
+                result?.let(onReAuthNeeded)
+            }
+        }
+
+        deleteDevices(deviceIds, authInterceptor)
+        Timber.d("end execute")
+    }
+
+    private suspend fun deleteDevices(deviceIds: List<String>, userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor) =
+            awaitCallback { matrixCallback ->
+                activeSessionHolder.getActiveSession()
+                        .cryptoService()
+                        .deleteDevices(deviceIds, userInteractiveAuthInterceptor, matrixCallback)
+            }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/CheckIfCurrentSessionCanBeVerifiedUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/CheckIfCurrentSessionCanBeVerifiedUseCase.kt
new file mode 100644
index 0000000000..3fdef1a98f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/CheckIfCurrentSessionCanBeVerifiedUseCase.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import im.vector.app.core.di.ActiveSessionHolder
+import kotlinx.coroutines.flow.firstOrNull
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.flow.flow
+import timber.log.Timber
+import javax.inject.Inject
+
+class CheckIfCurrentSessionCanBeVerifiedUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+
+    suspend fun execute(): Boolean {
+        val session = activeSessionHolder.getSafeActiveSession()
+        val cryptoSessionsCount = session?.flow()
+                ?.liveUserCryptoDevices(session.myUserId)
+                ?.firstOrNull()
+                ?.size
+                ?: 0
+        val hasOtherSessions = cryptoSessionsCount > 1
+
+        val isRecoverySetup = session
+                ?.sharedSecretStorageService()
+                ?.isRecoverySetup()
+                .orFalse()
+
+        Timber.d("hasOtherSessions=$hasOtherSessions (otherSessionsCount=$cryptoSessionsCount), isRecoverySetup=$isRecoverySetup")
+        return hasOtherSessions || isRecoverySetup
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/CurrentSessionCrossSigningInfo.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/CurrentSessionCrossSigningInfo.kt
new file mode 100644
index 0000000000..1dfab06b1d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/CurrentSessionCrossSigningInfo.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+/**
+ * Used to hold some info about the cross signing of the current Session.
+ */
+data class CurrentSessionCrossSigningInfo(
+        val deviceId: String = "",
+        val isCrossSigningInitialized: Boolean = false,
+        val isCrossSigningVerified: Boolean = false,
+)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetCurrentSessionCrossSigningInfoUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetCurrentSessionCrossSigningInfoUseCase.kt
new file mode 100644
index 0000000000..182e493213
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetCurrentSessionCrossSigningInfoUseCase.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import im.vector.app.core.di.ActiveSessionHolder
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.map
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.flow.flow
+import javax.inject.Inject
+
+class GetCurrentSessionCrossSigningInfoUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+
+    fun execute(): Flow<CurrentSessionCrossSigningInfo> {
+        return activeSessionHolder.getSafeActiveSession()
+                ?.let { session ->
+                    session.flow().liveCrossSigningInfo(session.myUserId)
+                            .map { convertToSigningInfo(session.sessionParams.deviceId.orEmpty(), it) }
+                } ?: emptyFlow()
+    }
+
+    private fun convertToSigningInfo(deviceId: String, mxCrossSigningInfo: Optional<MXCrossSigningInfo>): CurrentSessionCrossSigningInfo {
+        return CurrentSessionCrossSigningInfo(
+                deviceId = deviceId,
+                isCrossSigningInitialized = mxCrossSigningInfo.getOrNull() != null,
+                isCrossSigningVerified = mxCrossSigningInfo.getOrNull()?.isTrusted().orFalse()
+        )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForCurrentDeviceUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForCurrentDeviceUseCase.kt
new file mode 100644
index 0000000000..2243471a23
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForCurrentDeviceUseCase.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import javax.inject.Inject
+
+class GetEncryptionTrustLevelForCurrentDeviceUseCase @Inject constructor() {
+
+    fun execute(trustMSK: Boolean, legacyMode: Boolean): RoomEncryptionTrustLevel {
+        return if (legacyMode) {
+            // In legacy, current session is always trusted
+            RoomEncryptionTrustLevel.Trusted
+        } else {
+            // If current session doesn't trust MSK, show red shield for current device
+            if (trustMSK) {
+                RoomEncryptionTrustLevel.Trusted
+            } else {
+                RoomEncryptionTrustLevel.Warning
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCase.kt
new file mode 100644
index 0000000000..268ae86601
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCase.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import javax.inject.Inject
+
+class GetEncryptionTrustLevelForDeviceUseCase @Inject constructor(
+        private val getEncryptionTrustLevelForCurrentDeviceUseCase: GetEncryptionTrustLevelForCurrentDeviceUseCase,
+        private val getEncryptionTrustLevelForOtherDeviceUseCase: GetEncryptionTrustLevelForOtherDeviceUseCase,
+) {
+
+    fun execute(currentSessionCrossSigningInfo: CurrentSessionCrossSigningInfo, cryptoDeviceInfo: CryptoDeviceInfo?): RoomEncryptionTrustLevel? {
+        if (cryptoDeviceInfo == null) {
+            return null
+        }
+
+        val legacyMode = !currentSessionCrossSigningInfo.isCrossSigningInitialized
+        val trustMSK = currentSessionCrossSigningInfo.isCrossSigningVerified
+        val isCurrentDevice = !cryptoDeviceInfo.deviceId.isNullOrEmpty() && cryptoDeviceInfo.deviceId == currentSessionCrossSigningInfo.deviceId
+        val deviceTrustLevel = cryptoDeviceInfo.trustLevel
+
+        return when {
+            isCurrentDevice -> getEncryptionTrustLevelForCurrentDeviceUseCase.execute(trustMSK, legacyMode)
+            else -> getEncryptionTrustLevelForOtherDeviceUseCase.execute(trustMSK, legacyMode, deviceTrustLevel)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForOtherDeviceUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForOtherDeviceUseCase.kt
new file mode 100644
index 0000000000..e674ccd8c5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForOtherDeviceUseCase.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import javax.inject.Inject
+
+class GetEncryptionTrustLevelForOtherDeviceUseCase @Inject constructor() {
+
+    fun execute(trustMSK: Boolean, legacyMode: Boolean, deviceTrustLevel: DeviceTrustLevel?): RoomEncryptionTrustLevel {
+        return if (legacyMode) {
+            // use local trust
+            if (deviceTrustLevel?.locallyVerified == true) {
+                RoomEncryptionTrustLevel.Trusted
+            } else {
+                RoomEncryptionTrustLevel.Warning
+            }
+        } else {
+            if (trustMSK) {
+                // use cross sign trust, put locally trusted in black
+                when {
+                    deviceTrustLevel?.crossSigningVerified == true -> RoomEncryptionTrustLevel.Trusted
+                    deviceTrustLevel?.locallyVerified == true -> RoomEncryptionTrustLevel.Default
+                    else -> RoomEncryptionTrustLevel.Warning
+                }
+            } else {
+                // The current session is untrusted, so displays others in black
+                // as we can't know the cross-signing state
+                RoomEncryptionTrustLevel.Default
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
index 740ef3996a..2f8dd84ddd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
@@ -24,6 +24,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -36,12 +37,14 @@ import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import org.matrix.android.sdk.api.util.MatrixJsonParser
 import javax.inject.Inject
 
-class AccountDataFragment @Inject constructor(
-        private val epoxyController: AccountDataEpoxyController,
-        private val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class AccountDataFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         AccountDataEpoxyController.InteractionListener {
 
+    @Inject lateinit var epoxyController: AccountDataEpoxyController
+    @Inject lateinit var colorProvider: ColorProvider
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
index ec4ef26001..9dfcd1b15c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
@@ -22,21 +22,22 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.ColorProvider
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import org.matrix.android.sdk.api.session.crypto.model.AuditTrail
 import javax.inject.Inject
 
-class GossipingEventsPaperTrailFragment @Inject constructor(
-        private val epoxyController: GossipingTrailPagedEpoxyController,
-        private val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class GossipingEventsPaperTrailFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         GossipingTrailPagedEpoxyController.InteractionListener {
 
+    @Inject lateinit var epoxyController: GossipingTrailPagedEpoxyController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt
index ac4bef9c94..b276acb1d6 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -29,9 +30,11 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import javax.inject.Inject
 
-class IncomingKeyRequestListFragment @Inject constructor(
-        private val epoxyController: IncomingKeyRequestPagedController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>() {
+@AndroidEntryPoint
+class IncomingKeyRequestListFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>() {
+
+    @Inject lateinit var epoxyController: IncomingKeyRequestPagedController
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt
index 5684e941f1..f7e4a12793 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt
@@ -30,6 +30,7 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.tabs.TabLayoutMediator
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.safeOpenOutputStream
@@ -41,11 +42,13 @@ import im.vector.app.databinding.FragmentDevtoolKeyrequestsBinding
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import javax.inject.Inject
 
-class KeyRequestsFragment @Inject constructor(
-        private val clock: Clock,
-) : VectorBaseFragment<FragmentDevtoolKeyrequestsBinding>(),
+@AndroidEntryPoint
+class KeyRequestsFragment :
+        VectorBaseFragment<FragmentDevtoolKeyrequestsBinding>(),
         VectorMenuProvider {
 
+    @Inject lateinit var clock: Clock
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentDevtoolKeyrequestsBinding {
         return FragmentDevtoolKeyrequestsBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt
index ca1f36dbb2..1963045de3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -29,9 +30,11 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import javax.inject.Inject
 
-class OutgoingKeyRequestListFragment @Inject constructor(
-        private val epoxyController: OutgoingKeyRequestPagedController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>() {
+@AndroidEntryPoint
+class OutgoingKeyRequestListFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>() {
+
+    @Inject lateinit var epoxyController: OutgoingKeyRequestPagedController
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingFragment.kt b/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingFragment.kt
index 78c06d5969..005797b5c1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.restart
 import im.vector.app.core.platform.VectorBaseFragment
@@ -29,9 +30,12 @@ import im.vector.app.databinding.FragmentSettingsFontScalingBinding
 import im.vector.app.features.settings.FontScaleValue
 import javax.inject.Inject
 
-class FontScaleSettingFragment @Inject constructor(
-        private val fontListController: FontScaleSettingController
-) : VectorBaseFragment<FragmentSettingsFontScalingBinding>(), FontScaleSettingController.Callback {
+@AndroidEntryPoint
+class FontScaleSettingFragment :
+        VectorBaseFragment<FragmentSettingsFontScalingBinding>(),
+        FontScaleSettingController.Callback {
+
+    @Inject lateinit var fontListController: FontScaleSettingController
 
     private val viewModel: FontScaleSettingViewModel by fragmentViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsFragment.kt
index 09fd848c99..eb342209bf 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -33,11 +34,13 @@ import javax.inject.Inject
 /**
  * Display some information about the homeserver.
  */
-class HomeserverSettingsFragment @Inject constructor(
-        private val homeserverSettingsController: HomeserverSettingsController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class HomeserverSettingsFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         HomeserverSettingsController.Callback {
 
+    @Inject lateinit var homeserverSettingsController: HomeserverSettingsController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
index 6ab3d365eb..4cf8982085 100644
--- a/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
@@ -25,6 +25,7 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -33,11 +34,13 @@ import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import im.vector.app.features.analytics.plan.MobileScreen
 import javax.inject.Inject
 
-class VectorSettingsIgnoredUsersFragment @Inject constructor(
-        private val ignoredUsersController: IgnoredUsersController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class VectorSettingsIgnoredUsersFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         IgnoredUsersController.Callback {
 
+    @Inject lateinit var ignoredUsersController: IgnoredUsersController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsAction.kt b/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsAction.kt
new file mode 100644
index 0000000000..db48c3400b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsAction.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.labs
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class VectorSettingsLabsAction : VectorViewModelAction {
+    object UpdateClientInfo : VectorSettingsLabsAction()
+    object DeleteRecordedClientInfo : VectorSettingsLabsAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
similarity index 61%
rename from vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
index 70908d7560..189d55d990 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 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.
@@ -14,28 +14,40 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.settings
+package im.vector.app.features.settings.labs
 
+import android.os.Build
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.widget.TextView
 import androidx.preference.Preference
+import androidx.preference.Preference.OnPreferenceChangeListener
 import androidx.preference.SwitchPreference
+import com.airbnb.mvrx.fragmentViewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.preference.VectorSwitchPreference
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
+import im.vector.app.features.VectorFeatures
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.home.room.threads.ThreadsManager
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorSettingsBaseFragment
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import javax.inject.Inject
 
-class VectorSettingsLabsFragment @Inject constructor(
-        private val vectorPreferences: VectorPreferences,
-        private val lightweightSettingsStorage: LightweightSettingsStorage,
-        private val threadsManager: ThreadsManager
-) : VectorSettingsBaseFragment() {
+@AndroidEntryPoint
+class VectorSettingsLabsFragment :
+        VectorSettingsBaseFragment() {
+
+    private val viewModel: VectorSettingsLabsViewModel by fragmentViewModel()
+
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var lightweightSettingsStorage: LightweightSettingsStorage
+    @Inject lateinit var threadsManager: ThreadsManager
+    @Inject lateinit var vectorFeatures: VectorFeatures
 
     override var titleRes = R.string.room_settings_labs_pref_title
     override val preferenceXmlRes = R.xml.vector_settings_labs
@@ -69,6 +81,30 @@ class VectorSettingsLabsFragment @Inject constructor(
                 true
             }
         }
+
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_NEW_APP_LAYOUT_KEY)?.let { pref ->
+            pref.isVisible = vectorFeatures.isNewAppLayoutFeatureEnabled()
+
+            pref.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                onNewLayoutPreferenceClicked()
+                true
+            }
+        }
+
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_VOICE_BROADCAST_KEY)?.let { pref ->
+            // Voice Broadcast recording is not available on Android < 10
+            pref.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && vectorFeatures.isVoiceBroadcastEnabled()
+        }
+
+        configureUnreadNotificationsAsTabPreference()
+        configureEnableClientInfoRecordingPreference()
+    }
+
+    private fun configureUnreadNotificationsAsTabPreference() {
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB)?.let { pref ->
+            pref.isVisible = !vectorFeatures.isNewAppLayoutFeatureEnabled()
+            pref.isEnabled = !vectorPreferences.isNewAppLayoutEnabled()
+        }
     }
 
     /**
@@ -105,9 +141,29 @@ class VectorSettingsLabsFragment @Inject constructor(
      */
     private fun onThreadsPreferenceClicked() {
         // We should migrate threads only if threads are disabled
+        vectorPreferences.setThreadFlagChangedManually()
         vectorPreferences.setShouldMigrateThreads(!vectorPreferences.areThreadMessagesEnabled())
         lightweightSettingsStorage.setThreadMessagesEnabled(vectorPreferences.areThreadMessagesEnabled())
         displayLoadingView()
         MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = true))
     }
+
+    /**
+     * Action when new layout preference switch is actually clicked.
+     */
+    private fun onNewLayoutPreferenceClicked() {
+        configureUnreadNotificationsAsTabPreference()
+    }
+
+    private fun configureEnableClientInfoRecordingPreference() {
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_CLIENT_INFO_RECORDING_KEY)?.onPreferenceChangeListener =
+                OnPreferenceChangeListener { _, newValue ->
+                    when (newValue as? Boolean) {
+                        false -> viewModel.handle(VectorSettingsLabsAction.DeleteRecordedClientInfo)
+                        true -> viewModel.handle(VectorSettingsLabsAction.UpdateClientInfo)
+                        else -> Unit
+                    }
+                    true
+                }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsViewModel.kt
new file mode 100644
index 0000000000..38686b06be
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsViewModel.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.labs
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.session.clientinfo.DeleteMatrixClientInfoUseCase
+import im.vector.app.core.session.clientinfo.UpdateMatrixClientInfoUseCase
+import kotlinx.coroutines.launch
+
+class VectorSettingsLabsViewModel @AssistedInject constructor(
+        @Assisted initialState: VectorSettingsLabsViewState,
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val updateMatrixClientInfoUseCase: UpdateMatrixClientInfoUseCase,
+        private val deleteMatrixClientInfoUseCase: DeleteMatrixClientInfoUseCase,
+) : VectorViewModel<VectorSettingsLabsViewState, VectorSettingsLabsAction, EmptyViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<VectorSettingsLabsViewModel, VectorSettingsLabsViewState> {
+        override fun create(initialState: VectorSettingsLabsViewState): VectorSettingsLabsViewModel
+    }
+
+    companion object : MavericksViewModelFactory<VectorSettingsLabsViewModel, VectorSettingsLabsViewState> by hiltMavericksViewModelFactory()
+
+    override fun handle(action: VectorSettingsLabsAction) {
+        when (action) {
+            VectorSettingsLabsAction.UpdateClientInfo -> handleUpdateClientInfo()
+            VectorSettingsLabsAction.DeleteRecordedClientInfo -> handleDeleteRecordedClientInfo()
+        }
+    }
+
+    private fun handleUpdateClientInfo() {
+        viewModelScope.launch {
+            activeSessionHolder.getSafeActiveSession()
+                    ?.let { session ->
+                        updateMatrixClientInfoUseCase.execute(session)
+                    }
+        }
+    }
+
+    private fun handleDeleteRecordedClientInfo() {
+        viewModelScope.launch {
+            deleteMatrixClientInfoUseCase.execute()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsViewState.kt
new file mode 100644
index 0000000000..c246d30994
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsViewState.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.labs
+
+import com.airbnb.mvrx.MavericksState
+
+class VectorSettingsLabsViewState : MavericksState
diff --git a/vector/src/main/java/im/vector/app/features/settings/legals/LegalsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/legals/LegalsFragment.kt
index aef1c69baa..6ed3cd9156 100644
--- a/vector/src/main/java/im/vector/app/features/settings/legals/LegalsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/legals/LegalsFragment.kt
@@ -22,6 +22,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -35,12 +36,14 @@ import im.vector.app.features.discovery.ServerPolicy
 import im.vector.app.features.settings.VectorSettingsUrls
 import javax.inject.Inject
 
-class LegalsFragment @Inject constructor(
-        private val controller: LegalsController,
-        private val flavorLegals: FlavorLegals,
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class LegalsFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         LegalsController.Listener {
 
+    @Inject lateinit var controller: LegalsController
+    @Inject lateinit var flavorLegals: FlavorLegals
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
index 9853b28aae..0cbfef7495 100644
--- a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
@@ -37,13 +37,15 @@ import javax.inject.Inject
 class LocalePickerController @Inject constructor(
         private val vectorPreferences: VectorPreferences,
         private val stringProvider: StringProvider,
-        private val errorFormatter: ErrorFormatter
+        private val errorFormatter: ErrorFormatter,
+        private val vectorLocale: VectorLocale,
 ) : TypedEpoxyController<LocalePickerViewState>() {
 
     var listener: Listener? = null
 
     override fun buildModels(data: LocalePickerViewState?) {
         val list = data?.locales ?: return
+        val currentLocale = data.currentLocale ?: return
         val host = this
 
         profileSectionItem {
@@ -51,10 +53,10 @@ class LocalePickerController @Inject constructor(
             title(host.stringProvider.getString(R.string.choose_locale_current_locale_title))
         }
         localeItem {
-            id(data.currentLocale.toString())
-            title(VectorLocale.localeToLocalisedString(data.currentLocale).safeCapitalize(data.currentLocale))
+            id(currentLocale.toString())
+            title(host.vectorLocale.localeToLocalisedString(currentLocale).safeCapitalize(currentLocale))
             if (host.vectorPreferences.developerMode()) {
-                subtitle(VectorLocale.localeToLocalisedStringInfo(data.currentLocale))
+                subtitle(host.vectorLocale.localeToLocalisedStringInfo(currentLocale))
             }
             clickListener { host.listener?.onUseCurrentClicked() }
         }
@@ -78,13 +80,13 @@ class LocalePickerController @Inject constructor(
                     }
                 } else {
                     list()
-                            .filter { it.toString() != data.currentLocale.toString() }
+                            .filter { it.toString() != currentLocale.toString() }
                             .forEach { locale ->
                                 localeItem {
                                     id(locale.toString())
-                                    title(VectorLocale.localeToLocalisedString(locale).safeCapitalize(locale))
+                                    title(host.vectorLocale.localeToLocalisedString(locale).safeCapitalize(locale))
                                     if (host.vectorPreferences.developerMode()) {
-                                        subtitle(VectorLocale.localeToLocalisedStringInfo(locale))
+                                        subtitle(host.vectorLocale.localeToLocalisedStringInfo(locale))
                                     }
                                     clickListener { host.listener?.onLocaleClicked(locale) }
                                 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt
index d46b66dd87..39d41f9cfc 100644
--- a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -32,11 +33,13 @@ import im.vector.app.databinding.FragmentLocalePickerBinding
 import java.util.Locale
 import javax.inject.Inject
 
-class LocalePickerFragment @Inject constructor(
-        private val controller: LocalePickerController
-) : VectorBaseFragment<FragmentLocalePickerBinding>(),
+@AndroidEntryPoint
+class LocalePickerFragment :
+        VectorBaseFragment<FragmentLocalePickerBinding>(),
         LocalePickerController.Listener {
 
+    @Inject lateinit var controller: LocalePickerController
+
     private val viewModel: LocalePickerViewModel by fragmentViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLocalePickerBinding {
diff --git a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt
index 0bbbc323e0..c38f9b5b87 100644
--- a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt
@@ -30,7 +30,8 @@ import kotlinx.coroutines.launch
 
 class LocalePickerViewModel @AssistedInject constructor(
         @Assisted initialState: LocalePickerViewState,
-        private val vectorConfiguration: VectorConfiguration
+        private val vectorConfiguration: VectorConfiguration,
+        private val vectorLocale: VectorLocale,
 ) : VectorViewModel<LocalePickerViewState, LocalePickerAction, LocalePickerViewEvents>(initialState) {
 
     @AssistedFactory
@@ -39,8 +40,13 @@ class LocalePickerViewModel @AssistedInject constructor(
     }
 
     init {
+        setState {
+            copy(
+                    currentLocale = vectorLocale.applicationLocale
+            )
+        }
         viewModelScope.launch {
-            val result = VectorLocale.getSupportedLocales()
+            val result = vectorLocale.getSupportedLocales()
 
             setState {
                 copy(
@@ -59,7 +65,7 @@ class LocalePickerViewModel @AssistedInject constructor(
     }
 
     private fun handleSelectLocale(action: LocalePickerAction.SelectLocale) {
-        VectorLocale.saveApplicationLocale(action.locale)
+        vectorLocale.saveApplicationLocale(action.locale)
         vectorConfiguration.applyToApplicationContext()
         _viewEvents.post(LocalePickerViewEvents.RestartActivity)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt
index 8cb5978393..f981e7a444 100644
--- a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt
@@ -19,10 +19,9 @@ package im.vector.app.features.settings.locale
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.app.features.settings.VectorLocale
 import java.util.Locale
 
 data class LocalePickerViewState(
-        val currentLocale: Locale = VectorLocale.applicationLocale,
+        val currentLocale: Locale? = null,
         val locales: Async<List<Locale>> = Uninitialized
 ) : MavericksState
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/DisableNotificationsForCurrentSessionUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/DisableNotificationsForCurrentSessionUseCase.kt
new file mode 100644
index 0000000000..0c50a296f3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/DisableNotificationsForCurrentSessionUseCase.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.pushers.UnregisterUnifiedPushUseCase
+import javax.inject.Inject
+
+class DisableNotificationsForCurrentSessionUseCase @Inject constructor(
+        private val pushersManager: PushersManager,
+        private val toggleNotificationsForCurrentSessionUseCase: ToggleNotificationsForCurrentSessionUseCase,
+        private val unregisterUnifiedPushUseCase: UnregisterUnifiedPushUseCase,
+) {
+
+    suspend fun execute() {
+        toggleNotificationsForCurrentSessionUseCase.execute(enabled = false)
+        unregisterUnifiedPushUseCase.execute(pushersManager)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/EnableNotificationsForCurrentSessionUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/EnableNotificationsForCurrentSessionUseCase.kt
new file mode 100644
index 0000000000..daf3890e33
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/EnableNotificationsForCurrentSessionUseCase.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import im.vector.app.core.pushers.EnsureFcmTokenIsRetrievedUseCase
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.pushers.RegisterUnifiedPushUseCase
+import javax.inject.Inject
+
+class EnableNotificationsForCurrentSessionUseCase @Inject constructor(
+        private val pushersManager: PushersManager,
+        private val toggleNotificationsForCurrentSessionUseCase: ToggleNotificationsForCurrentSessionUseCase,
+        private val registerUnifiedPushUseCase: RegisterUnifiedPushUseCase,
+        private val ensureFcmTokenIsRetrievedUseCase: EnsureFcmTokenIsRetrievedUseCase,
+) {
+
+    sealed interface EnableNotificationsResult {
+        object Success : EnableNotificationsResult
+        object NeedToAskUserForDistributor : EnableNotificationsResult
+    }
+
+    suspend fun execute(distributor: String = ""): EnableNotificationsResult {
+        val pusherForCurrentSession = pushersManager.getPusherForCurrentSession()
+        if (pusherForCurrentSession == null) {
+            when (registerUnifiedPushUseCase.execute(distributor)) {
+                is RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.NeedToAskUserForDistributor -> {
+                    return EnableNotificationsResult.NeedToAskUserForDistributor
+                }
+                RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success -> {
+                    ensureFcmTokenIsRetrievedUseCase.execute(pushersManager, registerPusher = true)
+                }
+            }
+        }
+
+        toggleNotificationsForCurrentSessionUseCase.execute(enabled = true)
+
+        return EnableNotificationsResult.Success
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/ToggleNotificationsForCurrentSessionUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/ToggleNotificationsForCurrentSessionUseCase.kt
new file mode 100644
index 0000000000..3dc73f0a31
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/ToggleNotificationsForCurrentSessionUseCase.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.pushers.UnifiedPushHelper
+import im.vector.app.features.settings.devices.v2.notification.CheckIfCanToggleNotificationsViaPusherUseCase
+import im.vector.app.features.settings.devices.v2.notification.DeleteNotificationSettingsAccountDataUseCase
+import im.vector.app.features.settings.devices.v2.notification.SetNotificationSettingsAccountDataUseCase
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import timber.log.Timber
+import javax.inject.Inject
+
+class ToggleNotificationsForCurrentSessionUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val unifiedPushHelper: UnifiedPushHelper,
+        private val checkIfCanToggleNotificationsViaPusherUseCase: CheckIfCanToggleNotificationsViaPusherUseCase,
+        private val setNotificationSettingsAccountDataUseCase: SetNotificationSettingsAccountDataUseCase,
+        private val deleteNotificationSettingsAccountDataUseCase: DeleteNotificationSettingsAccountDataUseCase,
+) {
+
+    suspend fun execute(enabled: Boolean) {
+        val session = activeSessionHolder.getSafeActiveSession() ?: return
+        val deviceId = session.sessionParams.deviceId ?: return
+
+        if (unifiedPushHelper.isBackgroundSync()) {
+            Timber.d("background sync is enabled, setting account data event")
+            val newNotificationSettingsContent = LocalNotificationSettingsContent(isSilenced = !enabled)
+            setNotificationSettingsAccountDataUseCase.execute(session, deviceId, newNotificationSettingsContent)
+        } else {
+            Timber.d("push notif is enabled, deleting any account data and updating pusher")
+            deleteNotificationSettingsAccountDataUseCase.execute(session)
+
+            if (checkIfCanToggleNotificationsViaPusherUseCase.execute(session)) {
+                val devicePusher = session.pushersService().getPushers().firstOrNull { it.deviceId == deviceId }
+                devicePusher?.let { pusher ->
+                    session.pushersService().togglePusher(pusher, enabled)
+                }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
index 8eccc8c593..183d997ffb 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
@@ -17,6 +17,7 @@ package im.vector.app.features.settings.notifications
 
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.preference.PushRulePreference
 import im.vector.app.core.preference.VectorPreference
@@ -25,9 +26,9 @@ import im.vector.app.features.settings.VectorSettingsBaseFragment
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.pushrules.RuleIds
 import org.matrix.android.sdk.api.session.pushrules.rest.PushRuleAndKind
-import javax.inject.Inject
 
-class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor() :
+@AndroidEntryPoint
+class VectorSettingsAdvancedNotificationPreferenceFragment :
         VectorSettingsBaseFragment() {
 
     override var titleRes: Int = R.string.settings_notification_advanced
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
index 62f5823b65..490a47ef61 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
@@ -22,7 +22,7 @@ import android.content.Intent
 import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Bundle
-import android.os.Parcelable
+import android.view.View
 import android.widget.Toast
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.distinctUntilChanged
@@ -30,6 +30,8 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.map
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
+import com.airbnb.mvrx.fragmentViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.registerStartForActivityResult
@@ -37,20 +39,26 @@ import im.vector.app.core.preference.VectorEditTextPreference
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.preference.VectorPreferenceCategory
 import im.vector.app.core.preference.VectorSwitchPreference
+import im.vector.app.core.pushers.EnsureFcmTokenIsRetrievedUseCase
+import im.vector.app.core.pushers.FcmHelper
 import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.pushers.UnifiedPushHelper
 import im.vector.app.core.services.GuardServiceStarter
 import im.vector.app.core.utils.combineLatest
 import im.vector.app.core.utils.isIgnoringBatteryOptimizations
+import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.requestDisablingBatteryOptimization
+import im.vector.app.core.utils.startNotificationSettingsIntent
 import im.vector.app.features.VectorFeatures
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.home.NotificationPermissionManager
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.settings.BackgroundSyncMode
 import im.vector.app.features.settings.BackgroundSyncModeChooserDialog
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsBaseFragment
 import im.vector.app.features.settings.VectorSettingsFragmentInteractionListener
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
@@ -62,26 +70,60 @@ import org.matrix.android.sdk.api.session.pushrules.RuleKind
 import javax.inject.Inject
 
 // Referenced in vector_settings_preferences_root.xml
-class VectorSettingsNotificationPreferenceFragment @Inject constructor(
-        private val unifiedPushHelper: UnifiedPushHelper,
-        private val pushersManager: PushersManager,
-        private val activeSessionHolder: ActiveSessionHolder,
-        private val vectorPreferences: VectorPreferences,
-        private val guardServiceStarter: GuardServiceStarter,
-        private val vectorFeatures: VectorFeatures,
-) : VectorSettingsBaseFragment(),
+@AndroidEntryPoint
+class VectorSettingsNotificationPreferenceFragment :
+        VectorSettingsBaseFragment(),
         BackgroundSyncModeChooserDialog.InteractionListener {
 
+    @Inject lateinit var unifiedPushHelper: UnifiedPushHelper
+    @Inject lateinit var pushersManager: PushersManager
+    @Inject lateinit var fcmHelper: FcmHelper
+    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
+    @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var guardServiceStarter: GuardServiceStarter
+    @Inject lateinit var vectorFeatures: VectorFeatures
+    @Inject lateinit var notificationPermissionManager: NotificationPermissionManager
+    @Inject lateinit var ensureFcmTokenIsRetrievedUseCase: EnsureFcmTokenIsRetrievedUseCase
+
     override var titleRes: Int = R.string.settings_notifications
     override val preferenceXmlRes = R.xml.vector_settings_notifications
 
     private var interactionListener: VectorSettingsFragmentInteractionListener? = null
 
+    private val viewModel: VectorSettingsNotificationPreferenceViewModel by fragmentViewModel()
+
+    private val notificationStartForActivityResult = registerStartForActivityResult { _ ->
+        // No op
+    }
+
+    private val postPermissionLauncher = registerForPermissionsResult { _, deniedPermanently ->
+        if (deniedPermanently) {
+            // Open System setting, to give a chance to the user to enable notification. Sometimes the permission dialog is not displayed
+            startNotificationSettingsIntent(requireContext(), notificationStartForActivityResult)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         analyticsScreenName = MobileScreen.ScreenName.SettingsNotifications
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        observeViewEvents()
+    }
+
+    private fun observeViewEvents() {
+        viewModel.observeViewEvents {
+            when (it) {
+                VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceEnabled -> onNotificationsForDeviceEnabled()
+                VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceDisabled -> onNotificationsForDeviceDisabled()
+                is VectorSettingsNotificationPreferenceViewEvent.AskUserForPushDistributor -> askUserToSelectPushDistributor()
+                VectorSettingsNotificationPreferenceViewEvent.NotificationMethodChanged -> onNotificationMethodChanged()
+            }
+        }
+    }
+
     override fun bindPref() {
         findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY)!!.let { pref ->
             val pushRuleService = session.pushRuleService()
@@ -98,20 +140,17 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
             (pref as SwitchPreference).isChecked = areNotifEnabledAtAccountLevel
         }
 
-        findPreference<SwitchPreference>(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)?.let {
-            it.setTransactionalSwitchChangeListener(lifecycleScope) { isChecked ->
-                if (isChecked) {
-                    unifiedPushHelper.register(requireActivity()) {
-                        // Update the summary
-                        findPreference<VectorPreference>(VectorPreferences.SETTINGS_NOTIFICATION_METHOD_KEY)
-                                ?.summary = unifiedPushHelper.getCurrentDistributorName()
+        findPreference<SwitchPreference>(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
+                ?.setOnPreferenceChangeListener { _, isChecked ->
+                    val action = if (isChecked as Boolean) {
+                        VectorSettingsNotificationPreferenceViewAction.EnableNotificationsForDevice(pushDistributor = "")
+                    } else {
+                        VectorSettingsNotificationPreferenceViewAction.DisableNotificationsForDevice
                     }
-                } else {
-                    unifiedPushHelper.unregister(pushersManager)
-                    session.pushersService().refreshPushers()
+                    viewModel.handle(action)
+                    // preference will be updated on ViewEvent reception
+                    false
                 }
-            }
-        }
 
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_FDROID_BACKGROUND_SYNC_MODE)?.let {
             it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
@@ -155,11 +194,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
             if (vectorFeatures.allowExternalUnifiedPushDistributors()) {
                 it.summary = unifiedPushHelper.getCurrentDistributorName()
                 it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    unifiedPushHelper.openDistributorDialog(requireActivity(), pushersManager) {
-                        it.summary = unifiedPushHelper.getCurrentDistributorName()
-                        session.pushersService().refreshPushers()
-                        refreshBackgroundSyncPrefs()
-                    }
+                    askUserToSelectPushDistributor(withUnregister = true)
                     true
                 }
             } else {
@@ -173,6 +208,42 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
         handleSystemPreference()
     }
 
+    private fun onNotificationsForDeviceEnabled() {
+        findPreference<SwitchPreference>(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
+                ?.isChecked = true
+        findPreference<VectorPreference>(VectorPreferences.SETTINGS_NOTIFICATION_METHOD_KEY)
+                ?.summary = unifiedPushHelper.getCurrentDistributorName()
+
+        notificationPermissionManager.eventuallyRequestPermission(
+                requireActivity(),
+                postPermissionLauncher,
+                showRationale = false,
+                ignorePreference = true
+        )
+    }
+
+    private fun onNotificationsForDeviceDisabled() {
+        findPreference<SwitchPreference>(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
+                ?.isChecked = false
+        notificationPermissionManager.eventuallyRevokePermission(requireActivity())
+    }
+
+    private fun askUserToSelectPushDistributor(withUnregister: Boolean = false) {
+        unifiedPushHelper.showSelectDistributorDialog(requireContext()) { selection ->
+            if (withUnregister) {
+                viewModel.handle(VectorSettingsNotificationPreferenceViewAction.RegisterPushDistributor(selection))
+            } else {
+                viewModel.handle(VectorSettingsNotificationPreferenceViewAction.EnableNotificationsForDevice(selection))
+            }
+        }
+    }
+
+    private fun onNotificationMethodChanged() {
+        findPreference<VectorPreference>(VectorPreferences.SETTINGS_NOTIFICATION_METHOD_KEY)?.summary = unifiedPushHelper.getCurrentDistributorName()
+        session.pushersService().refreshPushers()
+        refreshBackgroundSyncPrefs()
+    }
+
     private fun bindEmailNotifications() {
         val initialEmails = session.getEmailsWithPushInformation()
         bindEmailNotificationCategory(initialEmails)
@@ -323,7 +394,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
 
     private val ringtoneStartForActivityResult = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
-            vectorPreferences.setNotificationRingTone(activityResult.data?.getParcelableExtra<Parcelable>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) as Uri?)
+            vectorPreferences.setNotificationRingTone(activityResult.data?.getParcelableExtraCompat<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI))
 
             // test if the selected ring tone can be played
             val notificationRingToneName = vectorPreferences.getNotificationRingToneName()
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewAction.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewAction.kt
new file mode 100644
index 0000000000..949dc99993
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewAction.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed interface VectorSettingsNotificationPreferenceViewAction : VectorViewModelAction {
+    data class EnableNotificationsForDevice(val pushDistributor: String) : VectorSettingsNotificationPreferenceViewAction
+    object DisableNotificationsForDevice : VectorSettingsNotificationPreferenceViewAction
+    data class RegisterPushDistributor(val pushDistributor: String) : VectorSettingsNotificationPreferenceViewAction
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewEvent.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewEvent.kt
new file mode 100644
index 0000000000..b0ee107769
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewEvent.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed interface VectorSettingsNotificationPreferenceViewEvent : VectorViewEvents {
+    object NotificationsForDeviceEnabled : VectorSettingsNotificationPreferenceViewEvent
+    object NotificationsForDeviceDisabled : VectorSettingsNotificationPreferenceViewEvent
+    object AskUserForPushDistributor : VectorSettingsNotificationPreferenceViewEvent
+    object NotificationMethodChanged : VectorSettingsNotificationPreferenceViewEvent
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewModel.kt
new file mode 100644
index 0000000000..9530be599e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewModel.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import android.content.SharedPreferences
+import androidx.annotation.VisibleForTesting
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.VectorDummyViewState
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.pushers.EnsureFcmTokenIsRetrievedUseCase
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.pushers.RegisterUnifiedPushUseCase
+import im.vector.app.core.pushers.UnregisterUnifiedPushUseCase
+import im.vector.app.features.settings.VectorPreferences
+import kotlinx.coroutines.launch
+
+class VectorSettingsNotificationPreferenceViewModel @AssistedInject constructor(
+        @Assisted initialState: VectorDummyViewState,
+        private val pushersManager: PushersManager,
+        private val vectorPreferences: VectorPreferences,
+        private val enableNotificationsForCurrentSessionUseCase: EnableNotificationsForCurrentSessionUseCase,
+        private val disableNotificationsForCurrentSessionUseCase: DisableNotificationsForCurrentSessionUseCase,
+        private val unregisterUnifiedPushUseCase: UnregisterUnifiedPushUseCase,
+        private val registerUnifiedPushUseCase: RegisterUnifiedPushUseCase,
+        private val ensureFcmTokenIsRetrievedUseCase: EnsureFcmTokenIsRetrievedUseCase,
+        private val toggleNotificationsForCurrentSessionUseCase: ToggleNotificationsForCurrentSessionUseCase,
+) : VectorViewModel<VectorDummyViewState, VectorSettingsNotificationPreferenceViewAction, VectorSettingsNotificationPreferenceViewEvent>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<VectorSettingsNotificationPreferenceViewModel, VectorDummyViewState> {
+        override fun create(initialState: VectorDummyViewState): VectorSettingsNotificationPreferenceViewModel
+    }
+
+    companion object : MavericksViewModelFactory<VectorSettingsNotificationPreferenceViewModel, VectorDummyViewState> by hiltMavericksViewModelFactory()
+
+    @VisibleForTesting
+    val notificationsPreferenceListener: SharedPreferences.OnSharedPreferenceChangeListener =
+            SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
+                if (key == VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY) {
+                    if (vectorPreferences.areNotificationEnabledForDevice()) {
+                        _viewEvents.post(VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceEnabled)
+                    } else {
+                        _viewEvents.post(VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceDisabled)
+                    }
+                }
+            }
+
+    init {
+        observeNotificationsEnabledPreference()
+    }
+
+    private fun observeNotificationsEnabledPreference() {
+        vectorPreferences.subscribeToChanges(notificationsPreferenceListener)
+    }
+
+    override fun onCleared() {
+        vectorPreferences.unsubscribeToChanges(notificationsPreferenceListener)
+        super.onCleared()
+    }
+
+    override fun handle(action: VectorSettingsNotificationPreferenceViewAction) {
+        when (action) {
+            VectorSettingsNotificationPreferenceViewAction.DisableNotificationsForDevice -> handleDisableNotificationsForDevice()
+            is VectorSettingsNotificationPreferenceViewAction.EnableNotificationsForDevice -> handleEnableNotificationsForDevice(action.pushDistributor)
+            is VectorSettingsNotificationPreferenceViewAction.RegisterPushDistributor -> handleRegisterPushDistributor(action.pushDistributor)
+        }
+    }
+
+    private fun handleDisableNotificationsForDevice() {
+        viewModelScope.launch {
+            disableNotificationsForCurrentSessionUseCase.execute()
+            _viewEvents.post(VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceDisabled)
+        }
+    }
+
+    private fun handleEnableNotificationsForDevice(distributor: String) {
+        viewModelScope.launch {
+            when (enableNotificationsForCurrentSessionUseCase.execute(distributor)) {
+                is EnableNotificationsForCurrentSessionUseCase.EnableNotificationsResult.NeedToAskUserForDistributor -> {
+                    _viewEvents.post(VectorSettingsNotificationPreferenceViewEvent.AskUserForPushDistributor)
+                }
+                EnableNotificationsForCurrentSessionUseCase.EnableNotificationsResult.Success -> {
+                    _viewEvents.post(VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceEnabled)
+                }
+            }
+        }
+    }
+
+    private fun handleRegisterPushDistributor(distributor: String) {
+        viewModelScope.launch {
+            unregisterUnifiedPushUseCase.execute(pushersManager)
+            when (registerUnifiedPushUseCase.execute(distributor)) {
+                RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.NeedToAskUserForDistributor -> {
+                    _viewEvents.post(VectorSettingsNotificationPreferenceViewEvent.AskUserForPushDistributor)
+                }
+                RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success -> {
+                    val areNotificationsEnabled = vectorPreferences.areNotificationEnabledForDevice()
+                    ensureFcmTokenIsRetrievedUseCase.execute(pushersManager, registerPusher = areNotificationsEnabled)
+                    toggleNotificationsForCurrentSessionUseCase.execute(enabled = areNotificationsEnabled)
+                    _viewEvents.post(VectorSettingsNotificationPreferenceViewEvent.NotificationMethodChanged)
+                }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt
index e75824195e..c5d15e54e5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -29,10 +29,13 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.transition.TransitionManager
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.registerForPermissionsResult
+import im.vector.app.core.utils.startNotificationSettingsIntent
 import im.vector.app.databinding.FragmentSettingsNotificationsTroubleshootBinding
 import im.vector.app.features.notifications.NotificationActionIds
 import im.vector.app.features.push.NotificationTroubleshootTestManagerFactory
@@ -44,11 +47,13 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import javax.inject.Inject
 
-class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
-        private val bugReporter: BugReporter,
-        private val testManagerFactory: NotificationTroubleshootTestManagerFactory,
-        private val actionIds: NotificationActionIds,
-) : VectorBaseFragment<FragmentSettingsNotificationsTroubleshootBinding>() {
+@AndroidEntryPoint
+class VectorSettingsNotificationsTroubleshootFragment :
+        VectorBaseFragment<FragmentSettingsNotificationsTroubleshootBinding>() {
+
+    @Inject lateinit var bugReporter: BugReporter
+    @Inject lateinit var testManagerFactory: NotificationTroubleshootTestManagerFactory
+    @Inject lateinit var actionIds: NotificationActionIds
 
     private var testManager: NotificationTroubleshootTestManager? = null
     // members
@@ -62,7 +67,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val layoutManager = LinearLayoutManager(context)
+        val layoutManager = LinearLayoutManager(requireContext())
         views.troubleshootTestRecyclerView.layoutManager = layoutManager
 
         val dividerItemDecoration = DividerItemDecoration(view.context, layoutManager.orientation)
@@ -73,7 +78,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
         }
 
         views.troubleshootRunButton.debouncedClicks {
-            testManager?.retry(testStartForActivityResult)
+            testManager?.retry(TroubleshootTest.TestParameters(testStartForActivityResult, testStartForPermissionResult))
         }
         startUI()
     }
@@ -122,7 +127,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
             }
         }
         views.troubleshootTestRecyclerView.adapter = testManager?.adapter
-        testManager?.runDiagnostic(testStartForActivityResult)
+        testManager?.runDiagnostic(TroubleshootTest.TestParameters(testStartForActivityResult, testStartForPermissionResult))
     }
 
     override fun onDestroyView() {
@@ -136,8 +141,17 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
         }
     }
 
+    private val testStartForPermissionResult = registerForPermissionsResult { allGranted, deniedPermanently ->
+        if (allGranted) {
+            retry()
+        } else if (deniedPermanently) {
+            // Open System setting
+            startNotificationSettingsIntent(requireContext(), testStartForActivityResult)
+        }
+    }
+
     private fun retry() {
-        testManager?.retry(testStartForActivityResult)
+        testManager?.retry(TroubleshootTest.TestParameters(testStartForActivityResult, testStartForPermissionResult))
     }
 
     override fun onDetach() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
index 5ef6e02330..4fa1e422a1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
@@ -50,6 +50,8 @@ abstract class PushGatewayItem : VectorEpoxyModel<PushGatewayItem.Holder>(R.layo
         holder.format.setTextOrHide(pusher.data.format, hideWhenBlank = true, holder.formatTitle)
         holder.profileTag.setTextOrHide(pusher.profileTag, hideWhenBlank = true, holder.profileTagTitle)
         holder.deviceName.text = pusher.deviceDisplayName
+        holder.deviceId.text = pusher.deviceId ?: "null"
+        holder.enabled.text = pusher.enabled.toString()
         holder.removeButton.setOnClickListener {
             interactions.onRemovePushTapped(pusher)
         }
@@ -59,10 +61,12 @@ abstract class PushGatewayItem : VectorEpoxyModel<PushGatewayItem.Holder>(R.layo
         val kind by bind<TextView>(R.id.pushGatewayKind)
         val pushKey by bind<TextView>(R.id.pushGatewayKeyValue)
         val deviceName by bind<TextView>(R.id.pushGatewayDeviceNameValue)
+        val deviceId by bind<TextView>(R.id.pushGatewayDeviceIdValue)
         val formatTitle by bind<View>(R.id.pushGatewayFormat)
         val format by bind<TextView>(R.id.pushGatewayFormatValue)
         val profileTagTitle by bind<TextView>(R.id.pushGatewayProfileTag)
         val profileTag by bind<TextView>(R.id.pushGatewayProfileTagValue)
+        val enabled by bind<TextView>(R.id.pushGatewayEnabledValue)
         val urlTitle by bind<View>(R.id.pushGatewayURL)
         val url by bind<TextView>(R.id.pushGatewayURLValue)
         val appName by bind<TextView>(R.id.pushGatewayAppNameValue)
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
index da06f067c6..2bbb93e63c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
@@ -25,6 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -35,11 +36,13 @@ import org.matrix.android.sdk.api.session.pushers.Pusher
 import javax.inject.Inject
 
 // Referenced in vector_settings_notifications.xml
-class PushGatewaysFragment @Inject constructor(
-        private val epoxyController: PushGateWayController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class PushGatewaysFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         VectorMenuProvider {
 
+    @Inject lateinit var epoxyController: PushGateWayController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt
index 666f27272b..6e4c049202 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt
@@ -22,6 +22,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -30,9 +31,11 @@ import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import javax.inject.Inject
 
 // Referenced in vector_settings_notifications.xml
-class PushRulesFragment @Inject constructor(
-        private val epoxyController: PushRulesController
-) : VectorBaseFragment<FragmentGenericRecyclerBinding>() {
+@AndroidEntryPoint
+class PushRulesFragment :
+        VectorBaseFragment<FragmentGenericRecyclerBinding>() {
+
+    @Inject lateinit var epoxyController: PushRulesController
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
         return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 0d6e639168..ae3cbcc9ca 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -25,6 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -41,13 +42,14 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import javax.inject.Inject
 
-class ThreePidsSettingsFragment @Inject constructor(
-        private val epoxyController: ThreePidsSettingsController
-) :
+@AndroidEntryPoint
+class ThreePidsSettingsFragment :
         VectorBaseFragment<FragmentGenericRecyclerBinding>(),
         OnBackPressed,
         ThreePidsSettingsController.InteractionListener {
 
+    @Inject lateinit var epoxyController: ThreePidsSettingsController
+
     private val viewModel: ThreePidsSettingsViewModel by fragmentViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index d80553b0ed..249df0007f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -28,33 +28,26 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.ReadOnceTrue
-import im.vector.app.features.auth.ReAuthActivity
+import im.vector.app.features.auth.PendingAuthHandler
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
-import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
-import org.matrix.android.sdk.api.util.fromBase64
 import org.matrix.android.sdk.flow.flow
-import timber.log.Timber
 import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 class ThreePidsSettingsViewModel @AssistedInject constructor(
         @Assisted initialState: ThreePidsSettingsViewState,
         private val session: Session,
         private val stringProvider: StringProvider,
-        private val matrix: Matrix,
+        private val pendingAuthHandler: PendingAuthHandler,
 ) : VectorViewModel<ThreePidsSettingsViewState, ThreePidsSettingsAction, ThreePidsSettingsViewEvents>(initialState) {
 
     // UIA session
     private var pendingThreePid: ThreePid? = null
-//    private var pendingSession: String? = null
 
     private suspend fun loadingSuspendable(block: suspend () -> Unit) {
         runCatching { block() }
@@ -126,42 +119,17 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
             is ThreePidsSettingsAction.CancelThreePid -> handleCancelThreePid(action)
             is ThreePidsSettingsAction.DeleteThreePid -> handleDeleteThreePid(action)
             is ThreePidsSettingsAction.ChangeUiState -> handleChangeUiState(action)
-            ThreePidsSettingsAction.SsoAuthDone -> {
-                Timber.d("## UIA - FallBack success")
-                if (pendingAuth != null) {
-                    uiaContinuation?.resume(pendingAuth!!)
-                } else {
-                    uiaContinuation?.resumeWithException(IllegalArgumentException())
-                }
-            }
-            is ThreePidsSettingsAction.PasswordAuthDone -> {
-                val decryptedPass = matrix.secureStorageService()
-                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
-                uiaContinuation?.resume(
-                        UserPasswordAuth(
-                                session = pendingAuth?.session,
-                                password = decryptedPass,
-                                user = session.myUserId
-                        )
-                )
-            }
-            ThreePidsSettingsAction.ReAuthCancelled -> {
-                Timber.d("## UIA - Reauth cancelled")
-                uiaContinuation?.resumeWithException(Exception())
-                uiaContinuation = null
-                pendingAuth = null
-            }
+            ThreePidsSettingsAction.SsoAuthDone -> pendingAuthHandler.ssoAuthDone()
+            is ThreePidsSettingsAction.PasswordAuthDone -> pendingAuthHandler.passwordAuthDone(action.password)
+            ThreePidsSettingsAction.ReAuthCancelled -> pendingAuthHandler.reAuthCancelled()
         }
     }
 
-    var uiaContinuation: Continuation<UIABaseAuth>? = null
-    var pendingAuth: UIABaseAuth? = null
-
     private val uiaInterceptor = object : UserInteractiveAuthInterceptor {
         override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
             _viewEvents.post(ThreePidsSettingsViewEvents.RequestReAuth(flowResponse, errCode))
-            pendingAuth = DefaultBaseAuth(session = flowResponse.session)
-            uiaContinuation = promise
+            pendingAuthHandler.pendingAuth = DefaultBaseAuth(session = flowResponse.session)
+            pendingAuthHandler.uiaContinuation = promise
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
index 7e7ca57243..3419241c39 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
@@ -15,10 +15,8 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
 import android.os.Handler
 import android.os.Looper
-import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.Fragment
 import kotlin.properties.Delegates
 
@@ -50,7 +48,7 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
         test.manager = this
     }
 
-    fun runDiagnostic(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    fun runDiagnostic(testParameters: TroubleshootTest.TestParameters) {
         if (isCancelled) return
         currentTestIndex = 0
         val handler = Handler(Looper.getMainLooper())
@@ -69,7 +67,7 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
                             // Cosmetic: Start with a small delay for UI/UX reason (better animation effect) for non async tests
                             handler.postDelayed({
                                 if (fragment.isAdded) {
-                                    troubleshootTest.perform(activityResultLauncher)
+                                    troubleshootTest.perform(testParameters)
                                 }
                             }, 600)
                         } else {
@@ -81,18 +79,18 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
             }
         }
         if (fragment.isAdded) {
-            testList.firstOrNull()?.perform(activityResultLauncher)
+            testList.firstOrNull()?.perform(testParameters)
         }
     }
 
-    fun retry(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    fun retry(testParameters: TroubleshootTest.TestParameters) {
         testList.forEach {
             it.cancel()
             it.description = null
             it.quickFix = null
             it.status = TroubleshootTest.TestStatus.NOT_STARTED
         }
-        runDiagnostic(activityResultLauncher)
+        runDiagnostic(testParameters)
     }
 
     fun hasQuickFix(): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
index e8a92c9e3f..5032c97935 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
@@ -15,8 +15,6 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.StringProvider
@@ -38,7 +36,7 @@ class TestAccountSettings @Inject constructor(
 ) :
         TroubleshootTest(R.string.settings_troubleshoot_test_account_settings_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         val defaultRule = session.pushRuleService().getPushRules().getAllRules()
                 .find { it.ruleId == RuleIds.RULE_ID_DISABLE_ALL }
@@ -59,7 +57,7 @@ class TestAccountSettings @Inject constructor(
                                 session.pushRuleService().updatePushRuleEnableStatus(RuleKind.OVERRIDE, defaultRule, !defaultRule.enabled)
                             }
                             withContext(Dispatchers.Main) {
-                                manager?.retry(activityResultLauncher)
+                                manager?.retry(testParameters)
                             }
                         }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAvailableUnifiedPushDistributors.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAvailableUnifiedPushDistributors.kt
index 89e7d8c204..e6fa59f597 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAvailableUnifiedPushDistributors.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAvailableUnifiedPushDistributors.kt
@@ -16,8 +16,6 @@
 
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.pushers.FcmHelper
 import im.vector.app.core.pushers.UnifiedPushHelper
@@ -30,7 +28,7 @@ class TestAvailableUnifiedPushDistributors @Inject constructor(
         private val fcmHelper: FcmHelper,
 ) : TroubleshootTest(R.string.settings_troubleshoot_test_distributors_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         val distributors = unifiedPushHelper.getExternalDistributors()
         description = if (distributors.isEmpty()) {
             stringProvider.getString(
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestCurrentUnifiedPushDistributor.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestCurrentUnifiedPushDistributor.kt
index d43fb1bfe3..bc291725fd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestCurrentUnifiedPushDistributor.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestCurrentUnifiedPushDistributor.kt
@@ -16,8 +16,6 @@
 
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.pushers.UnifiedPushHelper
 import im.vector.app.core.resources.StringProvider
@@ -28,7 +26,7 @@ class TestCurrentUnifiedPushDistributor @Inject constructor(
         private val stringProvider: StringProvider,
 ) : TroubleshootTest(R.string.settings_troubleshoot_test_current_distributor_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         description = stringProvider.getString(
                 R.string.settings_troubleshoot_test_current_distributor,
                 unifiedPushHelper.getCurrentDistributorName()
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
index e18c6ce4e1..a0be2a7077 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
@@ -15,8 +15,6 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.VectorPreferences
@@ -31,7 +29,7 @@ class TestDeviceSettings @Inject constructor(
 ) :
         TroubleshootTest(R.string.settings_troubleshoot_test_device_settings_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         if (vectorPreferences.areNotificationEnabledForDevice()) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_device_settings_success)
             quickFix = null
@@ -40,7 +38,7 @@ class TestDeviceSettings @Inject constructor(
             quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_device_settings_quickfix) {
                 override fun doFix() {
                     vectorPreferences.setNotificationEnabledForDevice(true)
-                    manager?.retry(activityResultLauncher)
+                    manager?.retry(testParameters)
                 }
             }
             description = stringProvider.getString(R.string.settings_troubleshoot_test_device_settings_failed)
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestEndpointAsTokenRegistration.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestEndpointAsTokenRegistration.kt
index 66222f759e..b355b55903 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestEndpointAsTokenRegistration.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestEndpointAsTokenRegistration.kt
@@ -16,18 +16,18 @@
 
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Observer
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.pushers.RegisterUnifiedPushUseCase
 import im.vector.app.core.pushers.UnifiedPushHelper
-import im.vector.app.core.pushers.UnifiedPushStore
+import im.vector.app.core.pushers.UnregisterUnifiedPushUseCase
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.session.coroutineScope
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.pushers.PusherState
 import javax.inject.Inject
 
@@ -37,12 +37,13 @@ class TestEndpointAsTokenRegistration @Inject constructor(
         private val pushersManager: PushersManager,
         private val activeSessionHolder: ActiveSessionHolder,
         private val unifiedPushHelper: UnifiedPushHelper,
-        private val unifiedPushStore: UnifiedPushStore,
+        private val registerUnifiedPushUseCase: RegisterUnifiedPushUseCase,
+        private val unregisterUnifiedPushUseCase: UnregisterUnifiedPushUseCase,
 ) : TroubleshootTest(R.string.settings_troubleshoot_test_endpoint_registration_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         // Check if we have a registered pusher for this token
-        val endpoint = unifiedPushStore.getEndpointOrToken() ?: run {
+        val endpoint = unifiedPushHelper.getEndpointOrToken() ?: run {
             status = TestStatus.FAILED
             return
         }
@@ -60,27 +61,52 @@ class TestEndpointAsTokenRegistration @Inject constructor(
             )
             quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_endpoint_registration_quick_fix) {
                 override fun doFix() {
-                    unifiedPushHelper.reRegister(
-                            context,
-                            pushersManager
-                    )
-                    val workId = pushersManager.enqueueRegisterPusherWithFcmKey(endpoint)
-                    WorkManager.getInstance(context).getWorkInfoByIdLiveData(workId).observe(context, Observer { workInfo ->
-                        if (workInfo != null) {
-                            if (workInfo.state == WorkInfo.State.SUCCEEDED) {
-                                manager?.retry(activityResultLauncher)
-                            } else if (workInfo.state == WorkInfo.State.FAILED) {
-                                manager?.retry(activityResultLauncher)
-                            }
-                        }
-                    })
+                    unregisterThenRegister(testParameters, endpoint)
                 }
             }
-
             status = TestStatus.FAILED
         } else {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_endpoint_registration_success)
             status = TestStatus.SUCCESS
         }
     }
+
+    private fun unregisterThenRegister(testParameters: TestParameters, pushKey: String) {
+        activeSessionHolder.getSafeActiveSession()?.coroutineScope?.launch {
+            unregisterUnifiedPushUseCase.execute(pushersManager)
+            registerUnifiedPush(distributor = "", testParameters, pushKey)
+        }
+    }
+
+    private fun registerUnifiedPush(
+            distributor: String,
+            testParameters: TestParameters,
+            pushKey: String,
+    ) {
+        when (registerUnifiedPushUseCase.execute(distributor)) {
+            is RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.NeedToAskUserForDistributor ->
+                askUserForDistributor(testParameters, pushKey)
+            RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success -> {
+                val workId = pushersManager.enqueueRegisterPusherWithFcmKey(pushKey)
+                WorkManager.getInstance(context).getWorkInfoByIdLiveData(workId).observe(context) { workInfo ->
+                    if (workInfo != null) {
+                        if (workInfo.state == WorkInfo.State.SUCCEEDED) {
+                            manager?.retry(testParameters)
+                        } else if (workInfo.state == WorkInfo.State.FAILED) {
+                            manager?.retry(testParameters)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun askUserForDistributor(
+            testParameters: TestParameters,
+            pushKey: String,
+    ) {
+        unifiedPushHelper.showSelectDistributorDialog(context) { selection ->
+            registerUnifiedPush(distributor = selection, testParameters, pushKey)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
index 22fab0cad4..403c4a02c9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
@@ -16,8 +16,6 @@
 package im.vector.app.features.settings.troubleshoot
 
 import android.content.Context
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.startNotificationSettingsIntent
@@ -34,14 +32,14 @@ class TestNotification @Inject constructor(
 ) :
         TroubleshootTest(R.string.settings_troubleshoot_test_notification_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         // Display the notification right now
         notificationUtils.displayDiagnosticNotification()
         description = stringProvider.getString(R.string.settings_troubleshoot_test_notification_notice)
 
         quickFix = object : TroubleshootQuickFix(R.string.open_settings) {
             override fun doFix() {
-                startNotificationSettingsIntent(context, activityResultLauncher)
+                startNotificationSettingsIntent(context, testParameters.activityResultLauncher)
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
index cf2bf3d5f1..1fec8691d7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -15,8 +15,6 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.ErrorFormatter
@@ -43,7 +41,7 @@ class TestPushFromPushGateway @Inject constructor(
     private var action: Job? = null
     private var pushReceived: Boolean = false
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         pushReceived = false
         action = activeSessionHolder.getActiveSession().coroutineScope.launch {
             val result = runCatching { pushersManager.testPush() }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
index 837b4952f0..0fe6ed3ad0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
@@ -15,8 +15,6 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.StringProvider
@@ -39,7 +37,7 @@ class TestPushRulesSettings @Inject constructor(
                     RuleIds.RULE_ID_ALL_OTHER_MESSAGES_ROOMS
             )
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         val pushRules = session.pushRuleService().getPushRules().getAllRules()
         var oneOrMoreRuleIsOff = false
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
index 2c73bef701..589edecad9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
@@ -15,34 +15,47 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
+import android.os.Build
 import androidx.core.app.NotificationManagerCompat
 import androidx.fragment.app.FragmentActivity
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.startNotificationSettingsIntent
+import im.vector.app.features.home.NotificationPermissionManager
+import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 import javax.inject.Inject
 
 /**
  * Checks if notifications are enable in the system settings for this app.
+ * On Android 13, it will check for the notification permission.
  */
 class TestSystemSettings @Inject constructor(
         private val context: FragmentActivity,
-        private val stringProvider: StringProvider
-) :
-        TroubleshootTest(R.string.settings_troubleshoot_test_system_settings_title) {
+        private val stringProvider: StringProvider,
+        private val sdkIntProvider: BuildVersionSdkIntProvider,
+        private val notificationPermissionManager: NotificationPermissionManager,
+) : TroubleshootTest(R.string.settings_troubleshoot_test_system_settings_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         if (NotificationManagerCompat.from(context).areNotificationsEnabled()) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_system_settings_success)
             quickFix = null
             status = TestStatus.SUCCESS
         } else {
-            description = stringProvider.getString(R.string.settings_troubleshoot_test_system_settings_failed)
-            quickFix = object : TroubleshootQuickFix(R.string.open_settings) {
-                override fun doFix() {
-                    startNotificationSettingsIntent(context, activityResultLauncher)
+            if (sdkIntProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU) && notificationPermissionManager.isPermissionGranted(context).not()) {
+                // In this case, we can ask for user permission
+                description = stringProvider.getString(R.string.settings_troubleshoot_test_system_settings_permission_failed)
+                quickFix = object : TroubleshootQuickFix(R.string.grant_permission) {
+                    override fun doFix() {
+                        notificationPermissionManager.askPermission(testParameters.permissionResultLauncher)
+                    }
+                }
+            } else {
+                description = stringProvider.getString(R.string.settings_troubleshoot_test_system_settings_failed)
+                quickFix = object : TroubleshootQuickFix(R.string.open_settings) {
+                    override fun doFix() {
+                        startNotificationSettingsIntent(context, testParameters.activityResultLauncher)
+                    }
                 }
             }
             status = TestStatus.FAILED
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestUnifiedPushEndpoint.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestUnifiedPushEndpoint.kt
index a29d1ad812..632f145c01 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestUnifiedPushEndpoint.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestUnifiedPushEndpoint.kt
@@ -16,8 +16,6 @@
 
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.pushers.UnifiedPushHelper
 import im.vector.app.core.resources.StringProvider
@@ -28,7 +26,7 @@ class TestUnifiedPushEndpoint @Inject constructor(
         private val unifiedPushHelper: UnifiedPushHelper,
 ) : TroubleshootTest(R.string.settings_troubleshoot_test_current_endpoint_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         val endpoint = unifiedPushHelper.getPrivacyFriendlyUpEndpoint()
         if (endpoint != null) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_current_endpoint_success, endpoint)
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestUnifiedPushGateway.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestUnifiedPushGateway.kt
index 38f14951b4..52d5ad35a3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestUnifiedPushGateway.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestUnifiedPushGateway.kt
@@ -16,22 +16,20 @@
 
 package im.vector.app.features.settings.troubleshoot
 
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
-import im.vector.app.core.pushers.UnifiedPushStore
+import im.vector.app.core.pushers.UnifiedPushHelper
 import im.vector.app.core.resources.StringProvider
 import javax.inject.Inject
 
 class TestUnifiedPushGateway @Inject constructor(
-        private val unifiedPushStore: UnifiedPushStore,
+        private val unifiedPushHelper: UnifiedPushHelper,
         private val stringProvider: StringProvider
 ) : TroubleshootTest(R.string.settings_troubleshoot_test_current_gateway_title) {
 
-    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun perform(testParameters: TestParameters) {
         description = stringProvider.getString(
                 R.string.settings_troubleshoot_test_current_gateway,
-                unifiedPushStore.getPushGateway()
+                unifiedPushHelper.getPushGateway()
         )
         status = TestStatus.SUCCESS
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
index 76ba2378a0..1e12f2e314 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
@@ -22,6 +22,11 @@ import kotlin.properties.Delegates
 
 abstract class TroubleshootTest(@StringRes val titleResId: Int) {
 
+    data class TestParameters(
+            val activityResultLauncher: ActivityResultLauncher<Intent>,
+            val permissionResultLauncher: ActivityResultLauncher<Array<String>>
+    )
+
     enum class TestStatus {
         NOT_STARTED,
         RUNNING,
@@ -40,7 +45,7 @@ abstract class TroubleshootTest(@StringRes val titleResId: Int) {
 
     var manager: NotificationTroubleshootTestManager? = null
 
-    abstract fun perform(activityResultLauncher: ActivityResultLauncher<Intent>)
+    abstract fun perform(testParameters: TestParameters)
 
     fun isFinished(): Boolean = (status == TestStatus.FAILED || status == TestStatus.SUCCESS)
 
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
index 3d603e3f6a..a78e6c95c0 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
@@ -20,22 +20,18 @@ import android.content.Intent
 import android.os.Bundle
 import com.airbnb.mvrx.viewModel
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.MainActivity
 import im.vector.app.features.start.StartAppViewModel
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class IncomingShareActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
     private val startAppViewModel: StartAppViewModel by viewModel()
 
-    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
-
     private val launcher = registerStartForActivityResult {
         if (it.resultCode == RESULT_OK) {
             handleAppStarted()
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
index 6eede93143..0c556192ac 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
@@ -60,6 +60,7 @@ class IncomingShareController @Inject constructor(
                                 roomSummary,
                                 data.selectedRoomIds,
                                 RoomListDisplayMode.FILTERED,
+                                singleLineLastEvent = false,
                                 callback?.let { it::onRoomClicked },
                                 callback?.let { it::onRoomLongClicked }
                         )
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
index 3e2ddc469c..a80d058197 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@@ -29,6 +29,7 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -46,13 +47,14 @@ import javax.inject.Inject
  * Display the list of rooms.
  * The user can select multiple rooms to send the data to.
  */
-class IncomingShareFragment @Inject constructor(
-        private val incomingShareController: IncomingShareController,
-        private val shareIntentHandler: ShareIntentHandler,
-) :
+@AndroidEntryPoint
+class IncomingShareFragment :
         VectorBaseFragment<FragmentIncomingShareBinding>(),
         IncomingShareController.Callback {
 
+    @Inject lateinit var incomingShareController: IncomingShareController
+    @Inject lateinit var shareIntentHandler: ShareIntentHandler
+
     private val viewModel: IncomingShareViewModel by fragmentViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentIncomingShareBinding {
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
index 729bd2541e..15a86c869b 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
@@ -25,7 +25,6 @@ import com.airbnb.mvrx.viewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
@@ -45,7 +44,6 @@ class SoftLogoutActivity : LoginActivity() {
     private val softLogoutViewModel: SoftLogoutViewModel by viewModel()
 
     @Inject lateinit var session: Session
-    @Inject lateinit var errorFormatter: ErrorFormatter
 
     override fun initUiAndData() {
         super.initUiAndData()
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
index b1a240e942..a1ed27df1d 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
@@ -152,6 +152,7 @@ class SoftLogoutController @Inject constructor(
             LoginType.SSO -> buildLoginSSOForm()
             LoginType.DIRECT,
             LoginType.CUSTOM,
+            LoginType.QR,
             LoginType.UNSUPPORTED -> buildLoginUnsupportedForm()
             LoginType.UNKNOWN -> Unit
         }
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
index 5b369d4b49..47670b486a 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -39,11 +40,13 @@ import javax.inject.Inject
  * - the user is asked to enter a password to sign in again to a homeserver.
  * - or to cleanup all the data
  */
-class SoftLogoutFragment @Inject constructor(
-        private val softLogoutController: SoftLogoutController
-) : AbstractLoginFragment<FragmentGenericRecyclerBinding>(),
+@AndroidEntryPoint
+class SoftLogoutFragment :
+        AbstractLoginFragment<FragmentGenericRecyclerBinding>(),
         SoftLogoutController.Listener {
 
+    @Inject lateinit var softLogoutController: SoftLogoutController
+
     private val softLogoutViewModel: SoftLogoutViewModel by activityViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
@@ -63,7 +66,7 @@ class SoftLogoutFragment @Inject constructor(
                             LoginAction.SetupSsoForSessionRecovery(
                                     softLogoutViewState.homeServerUrl,
                                     softLogoutViewState.deviceId,
-                                    mode.ssoIdentityProviders
+                                    mode.ssoState.providersOrNull()
                             )
                     )
                 }
@@ -72,7 +75,7 @@ class SoftLogoutFragment @Inject constructor(
                             LoginAction.SetupSsoForSessionRecovery(
                                     softLogoutViewState.homeServerUrl,
                                     softLogoutViewState.deviceId,
-                                    mode.ssoIdentityProviders
+                                    mode.ssoState.providersOrNull()
                             )
                     )
                 }
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
index 9d0580638b..117c298878 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
@@ -32,13 +32,16 @@ import im.vector.app.core.di.SingletonEntryPoint
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.extensions.hasUnsavedKeys
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.login.LoginMode
+import im.vector.app.features.login.toSsoState
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.LoginType
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
+import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
 
 class SoftLogoutViewModel @AssistedInject constructor(
@@ -67,7 +70,7 @@ class SoftLogoutViewModel @AssistedInject constructor(
                         homeServerUrl = session.sessionParams.homeServerUrl,
                         userId = userId,
                         deviceId = session.sessionParams.deviceId.orEmpty(),
-                        userDisplayName = session.getUser(userId)?.displayName ?: userId,
+                        userDisplayName = session.getUserOrDefault(userId).toMatrixItem().getBestName(),
                         hasUnsavedKeys = session.hasUnsavedKeys(),
                         loginType = session.sessionParams.loginType,
                 )
@@ -115,8 +118,8 @@ class SoftLogoutViewModel @AssistedInject constructor(
             val loginMode = when {
                 // SSO login is taken first
                 data.supportedLoginTypes.contains(LoginFlowTypes.SSO) &&
-                        data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
-                data.supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(data.ssoIdentityProviders)
+                        data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders.toSsoState())
+                data.supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(data.ssoIdentityProviders.toSsoState())
                 data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.Password
                 else -> LoginMode.Unsupported
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/NewSpaceAddItem.kt b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceAddItem.kt
new file mode 100644
index 0000000000..60816df9c0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceAddItem.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.spaces
+
+import android.content.res.ColorStateList
+import android.widget.ImageView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.features.themes.ThemeUtils
+
+@EpoxyModelClass
+abstract class NewSpaceAddItem : VectorEpoxyModel<NewSpaceAddItem.Holder>(R.layout.item_new_space_add) {
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: ClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.view.onClick(listener)
+
+        holder.plus.imageTintList = ColorStateList.valueOf(ThemeUtils.getColor(holder.view.context, R.attr.vctr_content_primary))
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val plus by bind<ImageView>(R.id.plus)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemPlaceHolder.kt b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceListHeaderItem.kt
similarity index 74%
rename from vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemPlaceHolder.kt
rename to vector/src/main/java/im/vector/app/features/spaces/NewSpaceListHeaderItem.kt
index d4683f78a5..33bc547faa 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemPlaceHolder.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceListHeaderItem.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2021 New Vector Ltd
+ * Copyright (c) 2022 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.home.room.list
+package im.vector.app.features.spaces
 
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
@@ -22,6 +22,6 @@ import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass
-abstract class RoomSummaryItemPlaceHolder : VectorEpoxyModel<RoomSummaryItemPlaceHolder.Holder>(R.layout.item_room_placeholder) {
+abstract class NewSpaceListHeaderItem : VectorEpoxyModel<NewSpaceListHeaderItem.Holder>(R.layout.item_new_space_list_header) {
     class Holder : VectorEpoxyHolder()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
new file mode 100644
index 0000000000..199169484c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.spaces
+
+import com.airbnb.epoxy.EpoxyController
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.grouplist.newHomeSpaceSummaryItem
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class NewSpaceSummaryController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val stringProvider: StringProvider,
+) : EpoxyController() {
+
+    var callback: Callback? = null
+    private var viewState: SpaceListViewState? = null
+
+    private val subSpaceComparator: Comparator<SpaceChildInfo> = compareBy<SpaceChildInfo> { it.order }.thenBy { it.childRoomId }
+
+    fun update(viewState: SpaceListViewState) {
+        this.viewState = viewState
+        requestModelBuild()
+    }
+
+    override fun buildModels() {
+        val nonNullViewState = viewState ?: return
+        buildGroupModels(nonNullViewState)
+    }
+
+    private fun buildGroupModels(viewState: SpaceListViewState) = with(viewState) {
+        addHeaderItem()
+        addHomeItem(selectedSpace == null, homeAggregateCount)
+        addSpaces(spaces, selectedSpace, rootSpacesOrdered, expandedStates)
+        addInvites(selectedSpace, rootSpacesOrdered, inviters)
+        addCreateItem()
+    }
+
+    private fun addHeaderItem() {
+        newSpaceListHeaderItem {
+            id("space_list_header")
+        }
+    }
+
+    private fun addHomeItem(selected: Boolean, homeCount: RoomAggregateNotificationCount) {
+        val host = this
+        newHomeSpaceSummaryItem {
+            id("space_home")
+            text(host.stringProvider.getString(R.string.all_chats))
+            selected(selected)
+            countState(UnreadCounterBadgeView.State.Count(homeCount.totalCount, homeCount.isHighlight))
+            listener { host.callback?.onSpaceSelected(null, isSubSpace = false) }
+        }
+    }
+
+    private fun addSpaces(
+            spaceSummaries: List<RoomSummary>?,
+            selectedSpace: RoomSummary?,
+            rootSpaces: List<RoomSummary>?,
+            expandedStates: Map<String, Boolean>,
+    ) {
+        val host = this
+
+        rootSpaces?.filterNot { it.membership == Membership.INVITE }
+                ?.forEach { spaceSummary ->
+                    val subSpaces = spaceSummary.spaceChildren?.filter { spaceChild -> spaceSummaries.containsSpaceId(spaceChild.childRoomId) }
+                    val hasChildren = (subSpaces?.size ?: 0) > 0
+                    val isSelected = spaceSummary.roomId == selectedSpace?.roomId
+                    val expanded = expandedStates[spaceSummary.roomId] == true
+
+                    newSpaceSummaryItem {
+                        id(spaceSummary.roomId)
+                        avatarRenderer(host.avatarRenderer)
+                        countState(UnreadCounterBadgeView.State.Count(spaceSummary.notificationCount, spaceSummary.highlightCount > 0))
+                        expanded(expanded)
+                        hasChildren(hasChildren)
+                        matrixItem(spaceSummary.toMatrixItem())
+                        onLongClickListener { host.callback?.onSpaceSettings(spaceSummary) }
+                        onSpaceSelectedListener { host.callback?.onSpaceSelected(spaceSummary, isSubSpace = false) }
+                        onToggleExpandListener { host.callback?.onToggleExpand(spaceSummary) }
+                        selected(isSelected)
+                    }
+
+                    if (hasChildren && expanded) {
+                        subSpaces?.forEach { child ->
+                            addSubSpace(spaceSummary.roomId, spaceSummaries, expandedStates, selectedSpace, child, 1)
+                        }
+                    }
+                }
+    }
+
+    private fun List<RoomSummary>?.containsSpaceId(spaceId: String) = this?.any { it.roomId == spaceId }.orFalse()
+
+    private fun addSubSpace(
+            idPrefix: String,
+            spaceSummaries: List<RoomSummary>?,
+            expandedStates: Map<String, Boolean>,
+            selectedSpace: RoomSummary?,
+            info: SpaceChildInfo,
+            depth: Int,
+    ) {
+        val host = this
+        val childSummary = spaceSummaries?.firstOrNull { it.roomId == info.childRoomId } ?: return
+        val id = "$idPrefix:${childSummary.roomId}"
+        val countState = UnreadCounterBadgeView.State.Count(childSummary.notificationCount, childSummary.highlightCount > 0)
+        val expanded = expandedStates[childSummary.roomId] == true
+        val isSelected = childSummary.roomId == selectedSpace?.roomId
+        val subSpaces = childSummary.spaceChildren?.filter { childSpace -> spaceSummaries.containsSpaceId(childSpace.childRoomId) }
+                ?.sortedWith(subSpaceComparator)
+
+        newSubSpaceSummaryItem {
+            id(id)
+            avatarRenderer(host.avatarRenderer)
+            countState(countState)
+            expanded(expanded)
+            hasChildren(!subSpaces.isNullOrEmpty())
+            indent(depth)
+            matrixItem(childSummary.toMatrixItem())
+            onLongClickListener { host.callback?.onSpaceSettings(childSummary) }
+            onSubSpaceSelectedListener { host.callback?.onSpaceSelected(childSummary, isSubSpace = true) }
+            onToggleExpandListener { host.callback?.onToggleExpand(childSummary) }
+            selected(isSelected)
+        }
+
+        if (expanded) {
+            subSpaces?.forEach {
+                addSubSpace(id, spaceSummaries, expandedStates, selectedSpace, it, depth + 1)
+            }
+        }
+    }
+
+    private fun addInvites(
+            selectedSpace: RoomSummary?,
+            rootSpaces: List<RoomSummary>?,
+            inviters: List<User>,
+    ) {
+        val host = this
+
+        rootSpaces?.filter { it.membership == Membership.INVITE }
+                ?.forEach { spaceSummary ->
+                    val isSelected = spaceSummary.roomId == selectedSpace?.roomId
+                    val inviter = inviters.find { it.userId == spaceSummary.inviterId }
+
+                    spaceInviteItem {
+                        id(spaceSummary.roomId)
+                        avatarRenderer(host.avatarRenderer)
+                        inviter(inviter?.displayName.orEmpty())
+                        matrixItem(spaceSummary.toMatrixItem())
+                        onLongClickListener { host.callback?.onSpaceSettings(spaceSummary) }
+                        onInviteSelectedListener { host.callback?.onSpaceInviteSelected(spaceSummary) }
+                        selected(isSelected)
+                    }
+                }
+    }
+
+    private fun addCreateItem() {
+        val host = this
+        newSpaceAddItem {
+            id("create")
+            listener { host.callback?.onAddSpaceSelected() }
+        }
+    }
+
+    /**
+     * This is a full duplicate of [SpaceSummaryController.Callback]. We need to merge them ASAP*/
+    interface Callback {
+        fun onSpaceSelected(spaceSummary: RoomSummary?, isSubSpace: Boolean)
+        fun onSpaceInviteSelected(spaceSummary: RoomSummary)
+        fun onSpaceSettings(spaceSummary: RoomSummary)
+        fun onToggleExpand(spaceSummary: RoomSummary)
+        fun onAddSpaceSelected()
+        fun sendFeedBack()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
new file mode 100644
index 0000000000..d59de6ac99
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.spaces
+
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass
+abstract class NewSpaceSummaryItem : VectorEpoxyModel<NewSpaceSummaryItem.Holder>(R.layout.item_new_space) {
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State.Count(0, false)
+    @EpoxyAttribute var expanded: Boolean = false
+    @EpoxyAttribute var hasChildren: Boolean = false
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onLongClickListener: ClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onSpaceSelectedListener: ClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onToggleExpandListener: ClickListener? = null
+    @EpoxyAttribute var selected: Boolean = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        val context = holder.root.context
+        holder.root.onClick(onSpaceSelectedListener)
+        holder.root.setOnLongClickListener {
+            onLongClickListener?.invoke(holder.root)
+            true
+        }
+        holder.name.text = matrixItem.displayName
+        holder.root.isChecked = selected
+
+        holder.chevron.setOnClickListener(onToggleExpandListener)
+        holder.chevron.isVisible = hasChildren
+        holder.chevron.setImageResource(if (expanded) R.drawable.ic_expand_more else R.drawable.ic_arrow_right)
+        holder.chevron.contentDescription = context.getString(
+                if (expanded) R.string.a11y_collapse_space_children else R.string.a11y_expand_space_children,
+                matrixItem.displayName,
+        )
+
+        avatarRenderer.render(matrixItem, holder.avatar)
+        holder.unreadCounter.render(countState)
+    }
+
+    override fun unbind(holder: Holder) {
+        avatarRenderer.clear(holder.avatar)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val root by bind<CheckableConstraintLayout>(R.id.root)
+        val avatar by bind<ImageView>(R.id.avatar)
+        val name by bind<TextView>(R.id.name)
+        val unreadCounter by bind<UnreadCounterBadgeView>(R.id.unread_counter)
+        val chevron by bind<ImageView>(R.id.chevron)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/NewSubSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/NewSubSpaceSummaryItem.kt
new file mode 100644
index 0000000000..638cc09474
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/NewSubSpaceSummaryItem.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.spaces
+
+import android.widget.ImageView
+import android.widget.Space
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass
+abstract class NewSubSpaceSummaryItem : VectorEpoxyModel<NewSubSpaceSummaryItem.Holder>(R.layout.item_new_sub_space) {
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State.Count(0, false)
+    @EpoxyAttribute var expanded: Boolean = false
+    @EpoxyAttribute var hasChildren: Boolean = false
+    @EpoxyAttribute var indent: Int = 0
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onLongClickListener: ClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onSubSpaceSelectedListener: ClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onToggleExpandListener: ClickListener? = null
+    @EpoxyAttribute var selected: Boolean = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        val context = holder.root.context
+        holder.root.onClick(onSubSpaceSelectedListener)
+        holder.name.text = matrixItem.displayName
+        holder.root.isChecked = selected
+        holder.root.setOnLongClickListener { onLongClickListener?.invoke(holder.root).let { true } }
+
+        holder.chevron.setImageDrawable(
+                ContextCompat.getDrawable(
+                        holder.view.context,
+                        if (expanded) R.drawable.ic_expand_more else R.drawable.ic_arrow_right
+                )
+        )
+        holder.chevron.onClick(onToggleExpandListener)
+        holder.chevron.isVisible = hasChildren
+        holder.chevron.contentDescription = context.getString(
+                if (expanded) R.string.a11y_collapse_space_children else R.string.a11y_expand_space_children,
+                matrixItem.displayName,
+        )
+
+        holder.indent.isVisible = indent > 0
+        holder.indent.updateLayoutParams {
+            width = indent * 30
+        }
+
+        avatarRenderer.render(matrixItem, holder.avatar)
+        holder.notificationBadge.render(countState)
+    }
+
+    override fun unbind(holder: Holder) {
+        avatarRenderer.clear(holder.avatar)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatar by bind<ImageView>(R.id.avatar)
+        val name by bind<TextView>(R.id.name)
+        val root by bind<CheckableConstraintLayout>(R.id.root)
+        val chevron by bind<ImageView>(R.id.chevron)
+        val indent by bind<Space>(R.id.indent)
+        val notificationBadge by bind<UnreadCounterBadgeView>(R.id.notification_badge)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 9fa4a53efc..04412185f6 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -120,7 +120,7 @@ class SpaceCreationActivity : SimpleFragmentActivity() {
     }
 
     private fun navigateToFragment(fragmentClass: Class<out Fragment>) {
-        val frag = supportFragmentManager.findFragmentByTag(fragmentClass.name) ?: createFragment(fragmentClass)
+        val frag = supportFragmentManager.findFragmentByTag(fragmentClass.name) ?: fragmentClass.newInstance()
         supportFragmentManager.beginTransaction()
                 .setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
                 .replace(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index 6463f6b022..b36dd2df4d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -40,6 +40,7 @@ import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
 import im.vector.app.features.spaces.explore.SpaceDirectoryViewAction
 import im.vector.app.features.spaces.explore.SpaceDirectoryViewEvents
 import im.vector.app.features.spaces.explore.SpaceDirectoryViewModel
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 
 @AndroidEntryPoint
 class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), MatrixToBottomSheet.InteractionListener {
@@ -80,7 +81,7 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), Matrix
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
 
         if (isFirstCreation()) {
-            val args = intent?.getParcelableExtra<SpaceDirectoryArgs>(Mavericks.KEY_ARG)
+            val args = intent?.getParcelableExtraCompat<SpaceDirectoryArgs>(Mavericks.KEY_ARG)
             replaceFragment(
                     views.simpleFragmentContainer,
                     SpaceDirectoryFragment::class.java,
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteItem.kt
new file mode 100644
index 0000000000..59095a8dd1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteItem.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.spaces
+
+import android.widget.ImageView
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass
+abstract class SpaceInviteItem : VectorEpoxyModel<SpaceInviteItem.Holder>(R.layout.item_space_invite) {
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute var inviter: String = ""
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onLongClickListener: ClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onInviteSelectedListener: ClickListener? = null
+    @EpoxyAttribute var selected: Boolean = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        val context = holder.root.context
+        holder.root.isChecked = selected
+        holder.root.onClick(onInviteSelectedListener)
+        holder.root.setOnLongClickListener { onLongClickListener?.invoke(holder.root).let { true } }
+        holder.name.text = matrixItem.displayName
+        holder.invitedBy.text = context.getString(R.string.invited_by, inviter)
+
+        avatarRenderer.render(matrixItem, holder.avatar)
+        holder.notificationBadge.render(UnreadCounterBadgeView.State.Text("!", true))
+    }
+
+    override fun unbind(holder: Holder) {
+        avatarRenderer.clear(holder.avatar)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val root by bind<CheckableConstraintLayout>(R.id.root)
+        val avatar by bind<ImageView>(R.id.avatar)
+        val name by bind<TextView>(R.id.name)
+        val invitedBy by bind<TextView>(R.id.invited_by)
+        val notificationBadge by bind<UnreadCounterBadgeView>(R.id.notification_badge)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
index fd2e68e172..1ef755e684 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
@@ -20,7 +20,7 @@ import im.vector.app.core.platform.VectorViewModelAction
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 sealed class SpaceListAction : VectorViewModelAction {
-    data class SelectSpace(val spaceSummary: RoomSummary?) : SpaceListAction()
+    data class SelectSpace(val spaceSummary: RoomSummary?, val isSubSpace: Boolean) : SpaceListAction()
     data class OpenSpaceInvite(val spaceSummary: RoomSummary) : SpaceListAction()
     data class LeaveSpace(val spaceSummary: RoomSummary) : SpaceListAction()
     data class ToggleExpand(val spaceSummary: RoomSummary) : SpaceListAction()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListBottomSheet.kt
new file mode 100644
index 0000000000..9991384643
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListBottomSheet.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.spaces
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import im.vector.app.R
+import im.vector.app.core.extensions.replaceChildFragment
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.FragmentSpacesBottomSheetBinding
+import im.vector.app.features.analytics.plan.MobileScreen
+
+class SpaceListBottomSheet : VectorBaseBottomSheetDialogFragment<FragmentSpacesBottomSheetBinding>() {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSpacesBottomSheetBinding {
+        return FragmentSpacesBottomSheetBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        analyticsScreenName = MobileScreen.ScreenName.SpaceBottomSheet
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        if (savedInstanceState == null) {
+            replaceChildFragment(R.id.space_list, SpaceListFragment::class.java)
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return super.onCreateDialog(savedInstanceState).apply {
+            setPeekHeightAsScreenPercentage(0.75f)
+        }
+    }
+
+    companion object {
+        const val TAG = "SpacesBottomSheet"
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index b358a8c1a6..550db1d0d1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -21,12 +21,15 @@ import android.view.HapticFeedbackConstants
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyTouchHelper
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.StateView
@@ -34,18 +37,31 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSpaceListBinding
 import im.vector.app.features.home.HomeActivitySharedAction
 import im.vector.app.features.home.HomeSharedActionViewModel
+import im.vector.app.features.home.room.list.actions.RoomListSharedAction
+import im.vector.app.features.home.room.list.actions.RoomListSharedActionViewModel
+import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 /**
  * This Fragment is displayed in the navigation drawer [im.vector.app.features.home.HomeDrawerFragment] and
  * is displaying the space hierarchy, with some actions on Spaces.
+ *
+ * In the New App Layout this fragment will instead be displayed in a Bottom Sheet [SpaceListBottomSheet]
+ * and will only display spaces that are direct children of the currently selected space (or root spaces if none)
  */
-class SpaceListFragment @Inject constructor(
-        private val spaceController: SpaceSummaryController
-) : VectorBaseFragment<FragmentSpaceListBinding>(), SpaceSummaryController.Callback {
+@AndroidEntryPoint
+class SpaceListFragment :
+        VectorBaseFragment<FragmentSpaceListBinding>(),
+        SpaceSummaryController.Callback,
+        NewSpaceSummaryController.Callback {
 
-    private lateinit var sharedActionViewModel: HomeSharedActionViewModel
+    @Inject lateinit var spaceController: SpaceSummaryController
+    @Inject lateinit var newSpaceController: NewSpaceSummaryController
+    @Inject lateinit var vectorPreferences: VectorPreferences
+
+    private lateinit var homeActivitySharedActionViewModel: HomeSharedActionViewModel
+    private lateinit var roomListSharedActionViewModel: RoomListSharedActionViewModel
     private val viewModel: SpaceListViewModel by fragmentViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSpaceListBinding {
@@ -54,10 +70,26 @@ class SpaceListFragment @Inject constructor(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        sharedActionViewModel = activityViewModelProvider.get(HomeSharedActionViewModel::class.java)
-        spaceController.callback = this
+        homeActivitySharedActionViewModel = activityViewModelProvider[HomeSharedActionViewModel::class.java]
+        roomListSharedActionViewModel = activityViewModelProvider[RoomListSharedActionViewModel::class.java]
         views.stateView.contentView = views.groupListView
-        views.groupListView.configureWith(spaceController)
+        views.spacesEmptyButton.onClick { onAddSpaceSelected() }
+        setupSpaceController()
+        observeViewEvents()
+    }
+
+    private fun setupSpaceController() {
+        if (vectorPreferences.isNewAppLayoutEnabled()) {
+            newSpaceController.callback = this
+            views.groupListView.configureWith(newSpaceController)
+        } else {
+            enableDragAndDropForSpaceController()
+            spaceController.callback = this
+            views.groupListView.configureWith(spaceController)
+        }
+    }
+
+    private fun enableDragAndDropForSpaceController() {
         EpoxyTouchHelper.initDragging(spaceController)
                 .withRecyclerView(views.groupListView)
                 .forVerticalList()
@@ -100,14 +132,14 @@ class SpaceListFragment @Inject constructor(
                         return model?.canDrag == true
                     }
                 })
+    }
 
-        viewModel.observeViewEvents {
-            when (it) {
-                is SpaceListViewEvents.OpenSpaceSummary -> sharedActionViewModel.post(HomeActivitySharedAction.OpenSpacePreview(it.id))
-                is SpaceListViewEvents.AddSpace -> sharedActionViewModel.post(HomeActivitySharedAction.AddSpace)
-                is SpaceListViewEvents.OpenSpaceInvite -> sharedActionViewModel.post(HomeActivitySharedAction.OpenSpaceInvite(it.id))
-                SpaceListViewEvents.CloseDrawer -> sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
-            }
+    private fun observeViewEvents() = viewModel.observeViewEvents {
+        when (it) {
+            is SpaceListViewEvents.OpenSpaceSummary -> homeActivitySharedActionViewModel.post(HomeActivitySharedAction.OpenSpacePreview(it.id))
+            is SpaceListViewEvents.AddSpace -> homeActivitySharedActionViewModel.post(HomeActivitySharedAction.AddSpace)
+            is SpaceListViewEvents.OpenSpaceInvite -> homeActivitySharedActionViewModel.post(HomeActivitySharedAction.OpenSpaceInvite(it.id))
+            SpaceListViewEvents.CloseDrawer -> homeActivitySharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
         }
     }
 
@@ -118,17 +150,35 @@ class SpaceListFragment @Inject constructor(
     }
 
     override fun invalidate() = withState(viewModel) { state ->
-        when (state.asyncSpaces) {
+        when (val spaces = state.asyncSpaces) {
             Uninitialized,
-            is Loading -> views.stateView.state = StateView.State.Loading
-            is Success -> views.stateView.state = StateView.State.Content
+            is Loading -> {
+                views.stateView.state = StateView.State.Loading
+                return@withState
+            }
+            is Success -> {
+                views.stateView.state = StateView.State.Content
+                if (spaces.invoke().isEmpty()) {
+                    views.spacesEmptyGroup.isVisible = true
+                    views.groupListView.isVisible = false
+                } else {
+                    views.spacesEmptyGroup.isVisible = false
+                    views.groupListView.isVisible = true
+                }
+            }
             else -> Unit
         }
-        spaceController.update(state)
+
+        if (vectorPreferences.isNewAppLayoutEnabled()) {
+            newSpaceController.update(state)
+        } else {
+            spaceController.update(state)
+        }
     }
 
-    override fun onSpaceSelected(spaceSummary: RoomSummary?) {
-        viewModel.handle(SpaceListAction.SelectSpace(spaceSummary))
+    override fun onSpaceSelected(spaceSummary: RoomSummary?, isSubSpace: Boolean) {
+        viewModel.handle(SpaceListAction.SelectSpace(spaceSummary, isSubSpace = isSubSpace))
+        roomListSharedActionViewModel.post(RoomListSharedAction.CloseBottomSheet)
     }
 
     override fun onSpaceInviteSelected(spaceSummary: RoomSummary) {
@@ -136,7 +186,7 @@ class SpaceListFragment @Inject constructor(
     }
 
     override fun onSpaceSettings(spaceSummary: RoomSummary) {
-        sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(spaceSummary.roomId))
+        homeActivitySharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(spaceSummary.roomId))
     }
 
     override fun onToggleExpand(spaceSummary: RoomSummary) {
@@ -148,6 +198,6 @@ class SpaceListFragment @Inject constructor(
     }
 
     override fun sendFeedBack() {
-        sharedActionViewModel.post(HomeActivitySharedAction.SendSpaceFeedBack)
+        homeActivitySharedActionViewModel.post(HomeActivitySharedAction.SendSpaceFeedBack)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
index eea11f9b1b..99f6a254b8 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
@@ -47,6 +47,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataTypes
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -65,7 +66,7 @@ class SpaceListViewModel @AssistedInject constructor(
         private val session: Session,
         private val vectorPreferences: VectorPreferences,
         private val autoAcceptInvites: AutoAcceptInvites,
-        private val analyticsTracker: AnalyticsTracker
+        private val analyticsTracker: AnalyticsTracker,
 ) : VectorViewModel<SpaceListViewState, SpaceListAction, SpaceListViewEvents>(initialState) {
 
     @AssistedFactory
@@ -88,9 +89,7 @@ class SpaceListViewModel @AssistedInject constructor(
         spaceStateHandler.getSelectedSpaceFlow()
                 .distinctUntilChanged()
                 .setOnEach { selectedSpaceOption ->
-                    copy(
-                            selectedSpace = selectedSpaceOption.orNull()
-                    )
+                    copy(selectedSpace = selectedSpaceOption.orNull())
                 }
 
         // XXX there should be a way to refactor this and share it
@@ -194,7 +193,7 @@ class SpaceListViewModel @AssistedInject constructor(
                         val moved = removeAt(index)
                         add(index + action.delta, moved)
                     },
-                    spaceOrderLocalEchos = updatedLocalEchos
+                    spaceOrderLocalEchos = updatedLocalEchos,
             )
         }
         session.coroutineScope.launch {
@@ -216,7 +215,18 @@ class SpaceListViewModel @AssistedInject constructor(
 
     private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
         if (state.selectedSpace?.roomId != action.spaceSummary?.roomId) {
-            analyticsTracker.capture(Interaction(null, null, Interaction.Name.SpacePanelSwitchSpace))
+            val interactionName = if (action.isSubSpace) {
+                Interaction.Name.SpacePanelSwitchSubSpace
+            } else {
+                Interaction.Name.SpacePanelSwitchSpace
+            }
+            analyticsTracker.capture(
+                    Interaction(
+                            index = null,
+                            interactionType = null,
+                            name = interactionName
+                    )
+            )
             setState { copy(selectedSpace = action.spaceSummary) }
             spaceStateHandler.setCurrentSpace(action.spaceSummary?.roomId)
             _viewEvents.post(SpaceListViewEvents.CloseDrawer)
@@ -257,29 +267,32 @@ class SpaceListViewModel @AssistedInject constructor(
         }
 
         combine(
-                session.flow()
-                        .liveSpaceSummaries(params),
+                session.flow().liveSpaceSummaries(params),
                 session.accountDataService()
                         .getLiveRoomAccountDataEvents(setOf(RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER))
                         .asFlow()
         ) { spaces, _ ->
             spaces
+        }.execute { asyncSpaces ->
+            val spaces = asyncSpaces.invoke().orEmpty()
+            val rootSpaces = asyncSpaces.invoke().orEmpty().filter { it.flattenParentIds.isEmpty() }
+            val orders = rootSpaces.associate {
+                it.roomId to session.getRoom(it.roomId)
+                        ?.roomAccountDataService()
+                        ?.getAccountDataEvent(RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER)
+                        ?.content.toModel<SpaceOrderContent>()
+                        ?.safeOrder()
+            }
+            val inviterIds = spaces.mapNotNull { it.inviterId }
+            val inviters = inviterIds.map { session.getUserOrDefault(it) }
+            copy(
+                    asyncSpaces = asyncSpaces,
+                    spaces = spaces,
+                    inviters = inviters,
+                    rootSpacesOrdered = rootSpaces.sortedWith(TopLevelSpaceComparator(orders)),
+                    spaceOrderInfo = orders,
+            )
         }
-                .execute { async ->
-                    val rootSpaces = async.invoke().orEmpty().filter { it.flattenParentIds.isEmpty() }
-                    val orders = rootSpaces.associate {
-                        it.roomId to session.getRoom(it.roomId)
-                                ?.roomAccountDataService()
-                                ?.getAccountDataEvent(RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER)
-                                ?.content.toModel<SpaceOrderContent>()
-                                ?.safeOrder()
-                    }
-                    copy(
-                            asyncSpaces = async,
-                            rootSpacesOrdered = rootSpaces.sortedWith(TopLevelSpaceComparator(orders)),
-                            spaceOrderInfo = orders
-                    )
-                }
 
         // clear local echos on update
         session.accountDataService()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
index 794f1dbd69..87aa7ddb48 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
@@ -21,12 +21,15 @@ import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
+import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.MatrixItem
 
 data class SpaceListViewState(
         val myMxItem: Async<MatrixItem.UserItem> = Uninitialized,
         val asyncSpaces: Async<List<RoomSummary>> = Uninitialized,
+        val spaces: List<RoomSummary> = emptyList(),
         val selectedSpace: RoomSummary? = null,
+        val inviters: List<User> = emptyList(),
         val rootSpacesOrdered: List<RoomSummary>? = null,
         val spaceOrderInfo: Map<String, String?>? = null,
         val spaceOrderLocalEchos: Map<String, String?>? = null,
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt
index db4c2cbe65..06d413e0b2 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt
@@ -27,6 +27,7 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.spaces.preview.SpacePreviewArgs
 import im.vector.app.features.spaces.preview.SpacePreviewFragment
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
@@ -53,7 +54,7 @@ class SpacePreviewActivity : VectorBaseActivity<ActivitySimpleBinding>() {
                 .launchIn(lifecycleScope)
 
         if (isFirstCreation()) {
-            val args = intent?.getParcelableExtra<SpacePreviewArgs>(Mavericks.KEY_ARG)
+            val args = intent?.getParcelableExtraCompat<SpacePreviewArgs>(Mavericks.KEY_ARG)
             replaceFragment(
                     views.simpleFragmentContainer,
                     SpacePreviewFragment::class.java,
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 233e33af18..acc1df5405 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -76,7 +76,7 @@ class SpaceSummaryController @Inject constructor(
                         avatarRenderer(host.avatarRenderer)
                         id("invite_${roomSummary.roomId}")
                         matrixItem(roomSummary.toMatrixItem())
-                        countState(UnreadCounterBadgeView.State(1, true))
+                        countState(UnreadCounterBadgeView.State.Count(1, true))
                         selected(false)
                         description(host.stringProvider.getString(R.string.you_are_invited))
                         canDrag(false)
@@ -87,8 +87,8 @@ class SpaceSummaryController @Inject constructor(
         homeSpaceSummaryItem {
             id("space_home")
             selected(selectedSpace == null)
-            countState(UnreadCounterBadgeView.State(homeCount.totalCount, homeCount.isHighlight))
-            listener { host.callback?.onSpaceSelected(null) }
+            countState(UnreadCounterBadgeView.State.Count(homeCount.totalCount, homeCount.isHighlight))
+            listener { host.callback?.onSpaceSelected(null, isSubSpace = false) }
         }
 
         rootSpaces
@@ -114,10 +114,10 @@ class SpaceSummaryController @Inject constructor(
                         selected(isSelected)
                         canDrag(true)
                         onMore { host.callback?.onSpaceSettings(roomSummary) }
-                        listener { host.callback?.onSpaceSelected(roomSummary) }
+                        listener { host.callback?.onSpaceSelected(roomSummary, isSubSpace = false) }
                         toggleExpand { host.callback?.onToggleExpand(roomSummary) }
                         countState(
-                                UnreadCounterBadgeView.State(
+                                UnreadCounterBadgeView.State.Count(
                                         roomSummary.notificationCount,
                                         roomSummary.highlightCount > 0
                                 )
@@ -165,11 +165,11 @@ class SpaceSummaryController @Inject constructor(
             expanded(expanded)
             onMore { host.callback?.onSpaceSettings(childSummary) }
             matrixItem(childSummary.toMatrixItem())
-            listener { host.callback?.onSpaceSelected(childSummary) }
+            listener { host.callback?.onSpaceSelected(childSummary, isSubSpace = true) }
             toggleExpand { host.callback?.onToggleExpand(childSummary) }
             indent(currentDepth)
             countState(
-                    UnreadCounterBadgeView.State(
+                    UnreadCounterBadgeView.State.Count(
                             childSummary.notificationCount,
                             childSummary.highlightCount > 0
                     )
@@ -184,7 +184,7 @@ class SpaceSummaryController @Inject constructor(
     }
 
     interface Callback {
-        fun onSpaceSelected(spaceSummary: RoomSummary?)
+        fun onSpaceSelected(spaceSummary: RoomSummary?, isSubSpace: Boolean)
         fun onSpaceInviteSelected(spaceSummary: RoomSummary)
         fun onSpaceSettings(spaceSummary: RoomSummary)
         fun onToggleExpand(spaceSummary: RoomSummary)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 192c6c8781..5c3f0c3df5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -48,7 +48,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>(R.la
     @EpoxyAttribute var expanded: Boolean = false
     @EpoxyAttribute var hasChildren: Boolean = false
     @EpoxyAttribute var indent: Int = 0
-    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State.Count(0, false)
     @EpoxyAttribute var description: String? = null
     @EpoxyAttribute var showSeparator: Boolean = false
     @EpoxyAttribute var canDrag: Boolean = true
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
index 871605c9d8..54bba5ed7a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
@@ -46,7 +46,7 @@ abstract class SubSpaceSummaryItem : VectorEpoxyModel<SubSpaceSummaryItem.Holder
     @EpoxyAttribute var expanded: Boolean = false
     @EpoxyAttribute var hasChildren: Boolean = false
     @EpoxyAttribute var indent: Int = 0
-    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State.Count(0, false)
 
     override fun bind(holder: Holder) {
         super.bind(holder)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
index 6d3003dfcf..02ffb7ff6a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.platform.OnBackPressed
@@ -29,9 +30,12 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.databinding.FragmentSpaceCreateChoosePrivateModelBinding
 import javax.inject.Inject
 
-class ChoosePrivateSpaceTypeFragment @Inject constructor(
-        private val stringProvider: StringProvider
-) : VectorBaseFragment<FragmentSpaceCreateChoosePrivateModelBinding>(), OnBackPressed {
+@AndroidEntryPoint
+class ChoosePrivateSpaceTypeFragment :
+        VectorBaseFragment<FragmentSpaceCreateChoosePrivateModelBinding>(),
+        OnBackPressed {
+
+    @Inject lateinit var stringProvider: StringProvider
 
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
index b4c5e63687..6c31b9e856 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
@@ -21,18 +21,26 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSpaceCreateChooseTypeBinding
-import javax.inject.Inject
+import im.vector.app.features.analytics.plan.MobileScreen
 
-class ChooseSpaceTypeFragment @Inject constructor() : VectorBaseFragment<FragmentSpaceCreateChooseTypeBinding>() {
+@AndroidEntryPoint
+class ChooseSpaceTypeFragment :
+        VectorBaseFragment<FragmentSpaceCreateChooseTypeBinding>() {
 
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentSpaceCreateChooseTypeBinding.inflate(layoutInflater, container, false)
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        analyticsScreenName = MobileScreen.ScreenName.CreateSpace
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAdd3pidInvitesFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAdd3pidInvitesFragment.kt
index 6260047d16..a46991caa3 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAdd3pidInvitesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAdd3pidInvitesFragment.kt
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -31,12 +32,14 @@ import im.vector.app.databinding.FragmentSpaceCreateGenericEpoxyFormBinding
 import im.vector.app.features.settings.VectorSettingsActivity
 import javax.inject.Inject
 
-class CreateSpaceAdd3pidInvitesFragment @Inject constructor(
-        private val epoxyController: SpaceAdd3pidEpoxyController
-) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(),
+@AndroidEntryPoint
+class CreateSpaceAdd3pidInvitesFragment :
+        VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(),
         SpaceAdd3pidEpoxyController.Listener,
         OnBackPressed {
 
+    @Inject lateinit var epoxyController: SpaceAdd3pidEpoxyController
+
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
 
     override fun onBackPressed(toolbarButton: Boolean): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
index 4ed7e91417..68e9522282 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.hideKeyboard
@@ -29,12 +30,14 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSpaceCreateGenericEpoxyFormBinding
 import javax.inject.Inject
 
-class CreateSpaceDefaultRoomsFragment @Inject constructor(
-        private val epoxyController: SpaceDefaultRoomEpoxyController
-) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(),
+@AndroidEntryPoint
+class CreateSpaceDefaultRoomsFragment :
+        VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(),
         SpaceDefaultRoomEpoxyController.Listener,
         OnBackPressed {
 
+    @Inject lateinit var epoxyController: SpaceDefaultRoomEpoxyController
+
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
index 847ee5f865..2baac269e0 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
@@ -22,29 +22,37 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelperFactory
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.time.Clock
 import im.vector.app.databinding.FragmentSpaceCreateGenericEpoxyFormBinding
 import javax.inject.Inject
 
-class CreateSpaceDetailsFragment @Inject constructor(
-        private val epoxyController: SpaceDetailEpoxyController,
-        colorProvider: ColorProvider,
-        clock: Clock,
-) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(), SpaceDetailEpoxyController.Listener,
-        GalleryOrCameraDialogHelper.Listener, OnBackPressed {
+@AndroidEntryPoint
+class CreateSpaceDetailsFragment :
+        VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(),
+        SpaceDetailEpoxyController.Listener,
+        GalleryOrCameraDialogHelper.Listener,
+        OnBackPressed {
+
+    @Inject lateinit var epoxyController: SpaceDetailEpoxyController
+    @Inject lateinit var galleryOrCameraDialogHelperFactory: GalleryOrCameraDialogHelperFactory
 
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentSpaceCreateGenericEpoxyFormBinding.inflate(layoutInflater, container, false)
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
+    private lateinit var galleryOrCameraDialogHelper: GalleryOrCameraDialogHelper
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        galleryOrCameraDialogHelper = galleryOrCameraDialogHelperFactory.create(this)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index b680f77df2..1cfac4a5fe 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -32,6 +32,8 @@ import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.plan.Interaction
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixPatterns
@@ -46,7 +48,8 @@ class CreateSpaceViewModel @AssistedInject constructor(
         private val session: Session,
         private val stringProvider: StringProvider,
         private val createSpaceViewModelTask: CreateSpaceViewModelTask,
-        private val errorFormatter: ErrorFormatter
+        private val errorFormatter: ErrorFormatter,
+        private val analyticsTracker: AnalyticsTracker,
 ) : VectorViewModel<CreateSpaceState, CreateSpaceAction, CreateSpaceEvents>(initialState) {
 
     private val identityService = session.identityService()
@@ -350,6 +353,13 @@ class CreateSpaceViewModel @AssistedInject constructor(
         }
         viewModelScope.launch(Dispatchers.IO) {
             try {
+                analyticsTracker.capture(
+                        Interaction(
+                                index = null,
+                                interactionType = null,
+                                name = Interaction.Name.MobileSpaceCreationValidated
+                        )
+                )
                 val alias = if (state.spaceType == SpaceType.Public) {
                     state.aliasLocalPart
                 } else null
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 5b362690fa..e2fde4d45b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -34,7 +34,7 @@ import im.vector.app.core.ui.list.genericEmptyWithActionItem
 import im.vector.app.core.ui.list.genericPillItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.list.spaceChildInfoItem
-import im.vector.app.features.home.room.list.spaceDirectoryFilterNoResults
+import im.vector.app.features.home.room.list.spaceDirectoryFilterNoResultsItem
 import im.vector.app.features.spaces.manage.SpaceChildInfoMatchFilter
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
 import me.gujun.android.span.span
@@ -141,7 +141,7 @@ class SpaceDirectoryController @Inject constructor(
                 val filteredChildInfo = flattenChildInfo.filter { matchFilter.test(it) }
 
                 if (filteredChildInfo.isEmpty()) {
-                    spaceDirectoryFilterNoResults {
+                    spaceDirectoryFilterNoResultsItem {
                         id("no_results")
                     }
                 } else {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index 3818f4278a..b6c49e5d41 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -32,6 +32,7 @@ import com.airbnb.epoxy.EpoxyVisibilityTracker
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -61,16 +62,18 @@ data class SpaceDirectoryArgs(
         val spaceId: String
 ) : Parcelable
 
-class SpaceDirectoryFragment @Inject constructor(
-        private val epoxyController: SpaceDirectoryController,
-        private val permalinkHandler: PermalinkHandler,
-        private val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentSpaceDirectoryBinding>(),
+@AndroidEntryPoint
+class SpaceDirectoryFragment :
+        VectorBaseFragment<FragmentSpaceDirectoryBinding>(),
         SpaceDirectoryController.InteractionListener,
         TimelineEventController.UrlClickCallback,
         OnBackPressed,
         VectorMenuProvider {
 
+    @Inject lateinit var epoxyController: SpaceDirectoryController
+    @Inject lateinit var permalinkHandler: PermalinkHandler
+    @Inject lateinit var colorProvider: ColorProvider
+
     override fun getMenuRes() = R.menu.menu_space_directory
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
index ea36908dd2..27f194e8d2 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
@@ -34,7 +34,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoomSummary
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
@@ -49,7 +49,7 @@ class SpaceInviteBottomSheetViewModel @AssistedInject constructor(
         session.getRoomSummary(initialState.spaceId)?.let { roomSummary ->
             val knownMembers = roomSummary.otherMemberIds.filter {
                 session.roomService().getExistingDirectRoomWithUser(it) != null
-            }.mapNotNull { session.getUser(it) }
+            }.map { session.getUserOrDefault(it) }
             // put one with avatar first, and take 5
             val peopleYouKnow = (knownMembers.filter { it.avatarUrl != null } + knownMembers.filter { it.avatarUrl == null })
                     .take(5)
@@ -57,7 +57,7 @@ class SpaceInviteBottomSheetViewModel @AssistedInject constructor(
             setState {
                 copy(
                         summary = Success(roomSummary),
-                        inviterUser = roomSummary.inviterId?.let { session.getUser(it) }?.let { Success(it) } ?: Uninitialized,
+                        inviterUser = roomSummary.inviterId?.let { session.getUserOrDefault(it) }?.let { Success(it) } ?: Uninitialized,
                         peopleYouKnow = Success(peopleYouKnow)
                 )
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedActivity.kt
index f661b92dac..6f9aef401d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedActivity.kt
@@ -29,23 +29,20 @@ import com.airbnb.mvrx.viewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleLoadingBinding
 import im.vector.app.features.spaces.SpaceBottomSheetSettingsArgs
-import javax.inject.Inject
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 
 @AndroidEntryPoint
 class SpaceLeaveAdvancedActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>() {
 
     override fun getBinding(): ActivitySimpleLoadingBinding = ActivitySimpleLoadingBinding.inflate(layoutInflater)
 
-    val leaveViewModel: SpaceLeaveAdvancedViewModel by viewModel()
-
-    @Inject lateinit var errorFormatter: ErrorFormatter
+    private val leaveViewModel: SpaceLeaveAdvancedViewModel by viewModel()
 
     override fun showWaitingView(text: String?) {
         hideKeyboard()
@@ -63,7 +60,7 @@ class SpaceLeaveAdvancedActivity : VectorBaseActivity<ActivitySimpleLoadingBindi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val args = intent?.getParcelableExtra<SpaceBottomSheetSettingsArgs>(Mavericks.KEY_ARG)
+        val args = intent?.getParcelableExtraCompat<SpaceBottomSheetSettingsArgs>(Mavericks.KEY_ARG)
 
         if (isFirstCreation()) {
             replaceFragment(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedFragment.kt
index de1273b8d5..da6b43aede 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedFragment.kt
@@ -28,6 +28,7 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -38,12 +39,14 @@ import im.vector.app.databinding.FragmentSpaceLeaveAdvancedBinding
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
-class SpaceLeaveAdvancedFragment @Inject constructor(
-        val controller: SelectChildrenController
-) : VectorBaseFragment<FragmentSpaceLeaveAdvancedBinding>(),
+@AndroidEntryPoint
+class SpaceLeaveAdvancedFragment :
+        VectorBaseFragment<FragmentSpaceLeaveAdvancedBinding>(),
         SelectChildrenController.Listener,
         VectorMenuProvider {
 
+    @Inject lateinit var controller: SelectChildrenController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentSpaceLeaveAdvancedBinding.inflate(layoutInflater, container, false)
 
@@ -147,12 +150,12 @@ class SpaceLeaveAdvancedFragment @Inject constructor(
             onTextChanged: (String) -> Unit
     ) {
         setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
-            override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+            override fun onMenuItemActionExpand(item: MenuItem): Boolean {
                 onExpanded()
                 return true
             }
 
-            override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+            override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
                 onCollapsed()
                 return true
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
index 848c17deb6..edc18a8816 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
@@ -32,6 +32,7 @@ import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.platform.OnBackPressed
@@ -47,15 +48,17 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import reactivecircus.flowbinding.appcompat.queryTextChanges
 import javax.inject.Inject
 
-class SpaceAddRoomFragment @Inject constructor(
-        private val spaceEpoxyController: AddRoomListController,
-        private val roomEpoxyController: AddRoomListController,
-        private val dmEpoxyController: AddRoomListController,
-) : VectorBaseFragment<FragmentSpaceAddRoomsBinding>(),
+@AndroidEntryPoint
+class SpaceAddRoomFragment :
+        VectorBaseFragment<FragmentSpaceAddRoomsBinding>(),
         OnBackPressed,
         AddRoomListController.Listener,
         VectorMenuProvider {
 
+    @Inject lateinit var spaceEpoxyController: AddRoomListController
+    @Inject lateinit var roomEpoxyController: AddRoomListController
+    @Inject lateinit var dmEpoxyController: AddRoomListController
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentSpaceAddRoomsBinding.inflate(layoutInflater, container, false)
 
@@ -211,7 +214,7 @@ class SpaceAddRoomFragment @Inject constructor(
             roomEpoxyController.submitList(it)
         }
         listenItemCount(viewModel.roomCountFlow) { roomEpoxyController.totalSize = it }
-        views.roomList.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        views.roomList.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
         views.roomList.setHasFixedSize(true)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
index d5d4c86563..a246bd29aa 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
@@ -40,6 +40,7 @@ import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import im.vector.app.features.roomprofile.alias.RoomAliasFragment
 import im.vector.app.features.roomprofile.permissions.RoomPermissionsFragment
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.parcelize.Parcelize
@@ -90,7 +91,7 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>() {
                 }
                 .launchIn(lifecycleScope)
 
-        val args = intent?.getParcelableExtra<SpaceManageArgs>(Mavericks.KEY_ARG)
+        val args = intent?.getParcelableExtraCompat<SpaceManageArgs>(Mavericks.KEY_ARG)
         if (isFirstCreation()) {
             withState(sharedViewModel) {
                 when (it.manageType) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
index d0e78bff5b..4580119070 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
@@ -32,6 +32,7 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -46,13 +47,15 @@ import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import reactivecircus.flowbinding.appcompat.queryTextChanges
 import javax.inject.Inject
 
-class SpaceManageRoomsFragment @Inject constructor(
-        private val epoxyController: SpaceManageRoomsController
-) : VectorBaseFragment<FragmentSpaceAddRoomsBinding>(),
+@AndroidEntryPoint
+class SpaceManageRoomsFragment :
+        VectorBaseFragment<FragmentSpaceAddRoomsBinding>(),
         OnBackPressed,
         SpaceManageRoomsController.Listener,
         Callback {
 
+    @Inject lateinit var epoxyController: SpaceManageRoomsController
+
     private val viewModel by fragmentViewModel(SpaceManageRoomsViewModel::class)
     private val sharedViewModel: SpaceManageSharedViewModel by activityViewModel()
     private val epoxyVisibilityTracker = EpoxyVisibilityTracker()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
index d7db9b123b..63d63329d7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
@@ -189,7 +189,7 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
                 val apiResult = session.spaceService().querySpaceChildren(
                         spaceId = initialState.spaceId,
                         from = nextToken,
-                        knownStateList = knownResults.childrenState.orEmpty(),
+                        knownStateList = knownResults.childrenState,
                         limit = paginationLimit
                 )
                 val newKnown = apiResult.children.mapNotNull { session.getRoomSummary(it.childRoomId) }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
index eb1de4fe60..98c81b19bc 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
@@ -30,16 +30,16 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelperFactory
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.platform.VectorMenuProvider
-import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.FragmentRoomSettingGenericBinding
 import im.vector.app.features.home.AvatarRenderer
@@ -59,23 +59,24 @@ import org.matrix.android.sdk.api.util.toMatrixItem
 import java.util.UUID
 import javax.inject.Inject
 
-class SpaceSettingsFragment @Inject constructor(
-        private val epoxyController: SpaceSettingsController,
-        colorProvider: ColorProvider,
-        clock: Clock,
-        private val avatarRenderer: AvatarRenderer,
-) : VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
+@AndroidEntryPoint
+class SpaceSettingsFragment :
+        VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         SpaceSettingsController.Callback,
         GalleryOrCameraDialogHelper.Listener,
         OnBackPressed,
         VectorMenuProvider {
 
+    @Inject lateinit var epoxyController: SpaceSettingsController
+    @Inject lateinit var galleryOrCameraDialogHelperFactory: GalleryOrCameraDialogHelperFactory
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+
     private val viewModel: RoomSettingsViewModel by fragmentViewModel()
     private val sharedViewModel: SpaceManageSharedViewModel by activityViewModel()
 
     private lateinit var roomJoinRuleSharedActionViewModel: RoomJoinRuleSharedActionViewModel
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
+    private lateinit var galleryOrCameraDialogHelper: GalleryOrCameraDialogHelper
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) = FragmentRoomSettingGenericBinding.inflate(inflater)
 
@@ -83,6 +84,11 @@ class SpaceSettingsFragment @Inject constructor(
 
     override fun getMenuRes() = R.menu.vector_room_settings
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        galleryOrCameraDialogHelper = galleryOrCameraDialogHelperFactory.create(this)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar(views.roomSettingsToolbar)
@@ -101,6 +107,7 @@ class SpaceSettingsFragment @Inject constructor(
                 RoomSettingsViewEvents.Success -> showSuccess()
                 RoomSettingsViewEvents.GoBack -> {
                     ignoreChanges = true
+                    @Suppress("DEPRECATION")
                     vectorBaseActivity.onBackPressed()
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
index f214f77724..0e7a9e4edf 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
@@ -32,6 +32,7 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleLoadingBinding
 import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
@@ -63,7 +64,7 @@ class SpacePeopleActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val args = intent?.getParcelableExtra<GenericIdArgs>(Mavericks.KEY_ARG)
+        val args = intent?.getParcelableExtraCompat<GenericIdArgs>(Mavericks.KEY_ARG)
         if (isFirstCreation()) {
             replaceFragment(
                     views.simpleFragmentContainer,
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
index 1181ccfa52..239b0ccb53 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
@@ -28,6 +28,7 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -43,10 +44,13 @@ import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import reactivecircus.flowbinding.appcompat.queryTextChanges
 import javax.inject.Inject
 
-class SpacePeopleFragment @Inject constructor(
-        private val epoxyController: SpacePeopleListController
-) : VectorBaseFragment<FragmentRecyclerviewWithSearchBinding>(),
-        OnBackPressed, SpacePeopleListController.InteractionListener {
+@AndroidEntryPoint
+class SpacePeopleFragment :
+        VectorBaseFragment<FragmentRecyclerviewWithSearchBinding>(),
+        OnBackPressed,
+        SpacePeopleListController.InteractionListener {
+
+    @Inject lateinit var epoxyController: SpacePeopleListController
 
     private val viewModel by fragmentViewModel(SpacePeopleViewModel::class)
     private val membersViewModel by fragmentViewModel(RoomMemberListViewModel::class)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
index 5e6efcc816..3b74b4b38b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
@@ -77,7 +77,7 @@ class SpacePeopleListController @Inject constructor(
                                     id(roomMember.userId)
                                     matrixItem(roomMember.toMatrixItem())
                                     avatarRenderer(host.avatarRenderer)
-                                    userEncryptionTrustLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
+                                    userVerificationLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
                                             .apply {
                                                 val pl = host.toPowerLevelLabel(memberEntry.first)
                                                 if (memberEntry.first == RoomMemberListCategories.INVITE) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
index 9632087191..d149a3521d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
@@ -65,7 +65,7 @@ class SpacePreviewController @Inject constructor(
                 subSpaceItem {
                     id(child.roomId)
                     roomId(child.roomId)
-                    title(child.name)
+                    title(child.name ?: "")
                     depth(depth)
                     avatarUrl(child.avatarUrl)
                     avatarRenderer(host.avatarRenderer)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
index 5722a0ff2c..df15d3001c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
@@ -29,6 +29,7 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -50,10 +51,12 @@ data class SpacePreviewArgs(
         val idOrAlias: String
 ) : Parcelable
 
-class SpacePreviewFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer,
-        private val epoxyController: SpacePreviewController
-) : VectorBaseFragment<FragmentSpacePreviewBinding>() {
+@AndroidEntryPoint
+class SpacePreviewFragment :
+        VectorBaseFragment<FragmentSpacePreviewBinding>() {
+
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var epoxyController: SpacePreviewController
 
     private val viewModel by fragmentViewModel(SpacePreviewViewModel::class)
     lateinit var sharedActionViewModel: SpacePreviewSharedActionViewModel
diff --git a/vector/src/main/java/im/vector/app/features/start/StartAppAndroidService.kt b/vector/src/main/java/im/vector/app/features/start/StartAppAndroidService.kt
index e8e0eac863..a14967a931 100644
--- a/vector/src/main/java/im/vector/app/features/start/StartAppAndroidService.kt
+++ b/vector/src/main/java/im/vector/app/features/start/StartAppAndroidService.kt
@@ -20,6 +20,7 @@ import android.content.Intent
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.NamedGlobalScope
+import im.vector.app.core.extensions.startForegroundCompat
 import im.vector.app.core.services.VectorAndroidService
 import im.vector.app.features.notifications.NotificationUtils
 import kotlinx.coroutines.CoroutineScope
@@ -58,6 +59,6 @@ class StartAppAndroidService : VectorAndroidService() {
     private fun showStickyNotification() {
         val notificationId = Random.nextInt()
         val notification = notificationUtils.buildStartAppNotification()
-        startForeground(notificationId, notification)
+        startForegroundCompat(notificationId, notification)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/start/StartAppViewModel.kt b/vector/src/main/java/im/vector/app/features/start/StartAppViewModel.kt
index 4b2e7bef98..6eb8bf2e80 100644
--- a/vector/src/main/java/im/vector/app/features/start/StartAppViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/start/StartAppViewModel.kt
@@ -63,7 +63,7 @@ class StartAppViewModel @AssistedInject constructor(
     }
 
     private suspend fun eagerlyInitializeSession() {
-        sessionHolder.getOrInitializeSession(startSync = true)
+        sessionHolder.getOrInitializeSession()
     }
 
     private fun handleLongProcessing() {
diff --git a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
index 5466ef2339..6e34113012 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
@@ -22,17 +22,14 @@ import com.airbnb.mvrx.viewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import org.matrix.android.sdk.api.session.terms.TermsService
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class ReviewTermsActivity : SimpleFragmentActivity() {
 
-    @Inject lateinit var errorFormatter: ErrorFormatter
-
     private val reviewTermsViewModel: ReviewTermsViewModel by viewModel()
 
     override fun initUiAndData() {
@@ -42,7 +39,7 @@ class ReviewTermsActivity : SimpleFragmentActivity() {
             replaceFragment(views.container, ReviewTermsFragment::class.java)
         }
 
-        reviewTermsViewModel.termsArgs = intent.getParcelableExtra(EXTRA_INFO) ?: error("Missing parameter")
+        reviewTermsViewModel.termsArgs = intent.getParcelableExtraCompat(EXTRA_INFO) ?: error("Missing parameter")
 
         reviewTermsViewModel.observeViewEvents {
             when (it) {
diff --git a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt
index f7012b93c4..2e8e2c3c14 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt
@@ -25,6 +25,7 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.extensions.cleanup
@@ -35,11 +36,13 @@ import im.vector.app.databinding.FragmentReviewTermsBinding
 import org.matrix.android.sdk.api.session.terms.TermsService
 import javax.inject.Inject
 
-class ReviewTermsFragment @Inject constructor(
-        private val termsController: TermsController
-) : VectorBaseFragment<FragmentReviewTermsBinding>(),
+@AndroidEntryPoint
+class ReviewTermsFragment :
+        VectorBaseFragment<FragmentReviewTermsBinding>(),
         TermsController.Listener {
 
+    @Inject lateinit var termsController: TermsController
+
     private val reviewTermsViewModel: ReviewTermsViewModel by activityViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentReviewTermsBinding {
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index 96af7906e2..3c902d162e 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -24,11 +24,12 @@ import android.graphics.drawable.Drawable
 import android.util.TypedValue
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
+import androidx.annotation.StyleRes
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.core.graphics.drawable.DrawableCompat
+import androidx.preference.PreferenceManager
 import im.vector.app.R
-import im.vector.app.core.di.DefaultSharedPreferences
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicReference
 
@@ -84,7 +85,7 @@ object ThemeUtils {
     fun getApplicationTheme(context: Context): String {
         val currentTheme = this.currentTheme.get()
         return if (currentTheme == null) {
-            val prefs = DefaultSharedPreferences.getInstance(context)
+            val prefs = PreferenceManager.getDefaultSharedPreferences(context.applicationContext)
             var themeFromPref = prefs.getString(APPLICATION_THEME_KEY, DEFAULT_THEME) ?: DEFAULT_THEME
             if (themeFromPref == "status") {
                 // Migrate to the default theme
@@ -113,19 +114,16 @@ object ThemeUtils {
      */
     fun setApplicationTheme(context: Context, aTheme: String) {
         currentTheme.set(aTheme)
-        context.setTheme(
-                when (aTheme) {
-                    SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.Theme_Vector_Dark else R.style.Theme_Vector_Light
-                    THEME_DARK_VALUE -> R.style.Theme_Vector_Dark
-                    THEME_BLACK_VALUE -> R.style.Theme_Vector_Black
-                    else -> R.style.Theme_Vector_Light
-                }
-        )
+        context.setTheme(themeToRes(context, aTheme))
 
         // Clear the cache
         mColorByAttr.clear()
     }
 
+    @StyleRes
+    fun getApplicationThemeRes(context: Context) =
+            themeToRes(context, currentTheme.get())
+
     /**
      * Set the activity theme according to the selected one. Default is Light, so if this is the current
      * theme, the theme is not changed.
@@ -200,4 +198,13 @@ object ThemeUtils {
         DrawableCompat.setTint(tinted, color)
         return tinted
     }
+
+    @StyleRes
+    private fun themeToRes(context: Context, theme: String): Int =
+            when (theme) {
+                SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.Theme_Vector_Dark else R.style.Theme_Vector_Light
+                THEME_DARK_VALUE -> R.style.Theme_Vector_Dark
+                THEME_BLACK_VALUE -> R.style.Theme_Vector_Black
+                else -> R.style.Theme_Vector_Light
+            }
 }
diff --git a/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt b/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt
index 259a220874..4232b94ead 100644
--- a/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
@@ -32,9 +33,11 @@ import im.vector.app.databinding.FragmentUserCodeShowBinding
 import im.vector.app.features.home.AvatarRenderer
 import javax.inject.Inject
 
-class ShowUserCodeFragment @Inject constructor(
-        private val avatarRenderer: AvatarRenderer
-) : VectorBaseFragment<FragmentUserCodeShowBinding>() {
+@AndroidEntryPoint
+class ShowUserCodeFragment :
+        VectorBaseFragment<FragmentUserCodeShowBinding>() {
+
+    @Inject lateinit var avatarRenderer: AvatarRenderer
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentUserCodeShowBinding {
         return FragmentUserCodeShowBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt
index cf7d9c6ddb..4fd8305f29 100644
--- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt
@@ -151,7 +151,10 @@ class UserCodeActivity : VectorBaseActivity<ActivitySimpleBinding>(),
 
     override fun onBackPressed() = withState(sharedViewModel) {
         when (it.mode) {
-            UserCodeState.Mode.SHOW -> super.onBackPressed()
+            UserCodeState.Mode.SHOW -> {
+                @Suppress("DEPRECATION")
+                super.onBackPressed()
+            }
             is UserCodeState.Mode.RESULT,
             UserCodeState.Mode.SCAN -> sharedViewModel.handle(UserCodeActions.SwitchMode(UserCodeState.Mode.SHOW))
         }
diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
index 8c377cafd5..e76837f182 100644
--- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
@@ -30,7 +30,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.getUserOrDefault
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.user.model.User
@@ -46,10 +46,10 @@ class UserCodeSharedViewModel @AssistedInject constructor(
     companion object : MavericksViewModelFactory<UserCodeSharedViewModel, UserCodeState> by hiltMavericksViewModelFactory()
 
     init {
-        val user = session.getUser(initialState.userId)
+        val user = session.getUserOrDefault(initialState.userId)
         setState {
             copy(
-                    matrixItem = user?.toMatrixItem(),
+                    matrixItem = user.toMatrixItem(),
                     shareLink = session.permalinkService().createPermalink(initialState.userId)
             )
         }
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/InviteByEmailItem.kt b/vector/src/main/java/im/vector/app/features/userdirectory/InviteByEmailItem.kt
index eaeec35791..da1d76e86a 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/InviteByEmailItem.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/InviteByEmailItem.kt
@@ -25,12 +25,10 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.features.home.AvatarRenderer
 
 @EpoxyModelClass
 abstract class InviteByEmailItem : VectorEpoxyModel<InviteByEmailItem.Holder>(R.layout.item_invite_by_mail) {
 
-    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute lateinit var foundItem: ThreePidUser
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var clickListener: ClickListener? = null
     @EpoxyAttribute var selected: Boolean = false
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
index 3fe95cfb7c..fbb6a8ee14 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
@@ -30,6 +30,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.chip.Chip
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -51,13 +52,15 @@ import org.matrix.android.sdk.api.session.user.model.User
 import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
-class UserListFragment @Inject constructor(
-        private val userListController: UserListController,
-        private val dimensionConverter: DimensionConverter,
-) : VectorBaseFragment<FragmentUserListBinding>(),
+@AndroidEntryPoint
+class UserListFragment :
+        VectorBaseFragment<FragmentUserListBinding>(),
         UserListController.Callback,
         VectorMenuProvider {
 
+    @Inject lateinit var userListController: UserListController
+    @Inject lateinit var dimensionConverter: DimensionConverter
+
     private val args: UserListFragmentArgs by args()
     private val viewModel: UserListViewModel by activityViewModel()
     private val homeServerCapabilitiesViewModel: HomeServerCapabilitiesViewModel by fragmentViewModel()
diff --git a/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
index 4c8188dc8b..2b7406813f 100644
--- a/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
@@ -25,7 +25,7 @@ class VersionProvider @Inject constructor(
         private val buildMeta: BuildMeta,
 ) {
 
-    fun getVersion(longFormat: Boolean, useBuildNumber: Boolean): String {
+    fun getVersion(longFormat: Boolean): String {
         var result = "${buildMeta.versionName} [${versionCodeProvider.getVersionCode()}]"
 
         var flavor = buildMeta.flavorShortDescription
@@ -34,19 +34,10 @@ class VersionProvider @Inject constructor(
             flavor += "-"
         }
 
-        var gitVersion = buildMeta.gitRevision
+        val gitVersion = buildMeta.gitRevision
         val gitRevisionDate = buildMeta.gitRevisionDate
-        val buildNumber = buildMeta.buildNumber
 
-        var useLongFormat = longFormat
-
-        if (useBuildNumber && buildNumber != "0") {
-            // It's a build from CI
-            gitVersion = "b$buildNumber"
-            useLongFormat = false
-        }
-
-        result += if (useLongFormat) {
+        result += if (longFormat) {
             " ($flavor$gitVersion-$gitRevisionDate)"
         } else {
             " ($flavor$gitVersion)"
diff --git a/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt b/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt
index 5e27aa5bb2..9755a0b3fb 100644
--- a/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt
@@ -17,77 +17,24 @@
 package im.vector.app.features.voice
 
 import android.content.Context
-import android.media.MediaRecorder
-import android.os.Build
-import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.util.md5
 import java.io.File
-import java.io.FileOutputStream
 import java.util.UUID
 
 abstract class AbstractVoiceRecorder(
         private val context: Context,
-        private val filenameExt: String,
 ) : VoiceRecorder {
+
     private val outputDirectory: File by lazy { ensureAudioDirectory(context) }
+    protected var outputFile: File? = null
 
-    private var mediaRecorder: MediaRecorder? = null
-    private var outputFile: File? = null
-
-    abstract fun setOutputFormat(mediaRecorder: MediaRecorder)
-
-    private fun init() {
-        createMediaRecorder().let {
-            it.setAudioSource(MediaRecorder.AudioSource.DEFAULT)
-            setOutputFormat(it)
-            it.setAudioEncodingBitRate(24000)
-            it.setAudioSamplingRate(48000)
-            mediaRecorder = it
+    override fun initializeRecord(roomId: String, attachmentData: ContentAttachmentData?) {
+        if (attachmentData != null) {
+            outputFile = attachmentData.findVoiceFile(outputDirectory)
         }
     }
 
-    private fun createMediaRecorder(): MediaRecorder {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            MediaRecorder(context)
-        } else {
-            @Suppress("DEPRECATION")
-            MediaRecorder()
-        }
-    }
-
-    override fun initializeRecord(attachmentData: ContentAttachmentData) {
-        outputFile = attachmentData.findVoiceFile(outputDirectory)
-    }
-
-    override fun startRecord(roomId: String) {
-        init()
-        val fileName = "${UUID.randomUUID()}.$filenameExt"
-        val outputDirectoryForRoom = File(outputDirectory, roomId.md5()).apply {
-            mkdirs()
-        }
-        outputFile = File(outputDirectoryForRoom, fileName)
-
-        val mr = mediaRecorder ?: return
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            mr.setOutputFile(outputFile)
-        } else {
-            mr.setOutputFile(FileOutputStream(outputFile).fd)
-        }
-        mr.prepare()
-        mr.start()
-    }
-
-    override fun stopRecord() {
-        // Can throw when the record is less than 1 second.
-        mediaRecorder?.let {
-            tryOrNull { it.stop() }
-            it.reset()
-            it.release()
-        }
-        mediaRecorder = null
-    }
-
     override fun cancelRecord() {
         stopRecord()
 
@@ -95,11 +42,15 @@ abstract class AbstractVoiceRecorder(
         outputFile = null
     }
 
-    override fun getMaxAmplitude(): Int {
-        return mediaRecorder?.maxAmplitude ?: 0
-    }
-
     override fun getVoiceMessageFile(): File? {
         return outputFile
     }
+
+    protected fun createOutputFile(roomId: String): File {
+        val fileName = "${UUID.randomUUID()}.$fileNameExt"
+        val outputDirectoryForRoom = File(outputDirectory, roomId.md5()).apply {
+            mkdirs()
+        }
+        return File(outputDirectoryForRoom, fileName)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorderQ.kt b/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorderQ.kt
new file mode 100644
index 0000000000..0d8373870f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorderQ.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.features.voice
+
+import android.content.Context
+import android.media.MediaRecorder
+import android.os.Build
+import androidx.annotation.RequiresApi
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import java.io.File
+
+/**
+ * VoiceRecorder abstraction to be used on Android versions >= [Build.VERSION_CODES.Q].
+ */
+@RequiresApi(Build.VERSION_CODES.Q)
+abstract class AbstractVoiceRecorderQ(private val context: Context) : AbstractVoiceRecorder(context) {
+
+    var mediaRecorder: MediaRecorder? = null
+    protected var nextOutputFile: File? = null
+
+    private val audioSource: Int = MediaRecorder.AudioSource.DEFAULT
+    private val audioSamplingRate: Int = 48_000
+    protected val audioEncodingBitRate: Int = 24_000
+
+    abstract val outputFormat: Int // see MediaRecorder.OutputFormat
+    abstract val audioEncoder: Int // see MediaRecorder.AudioEncoder
+
+    override fun initializeRecord(roomId: String, attachmentData: ContentAttachmentData?) {
+        super.initializeRecord(roomId, attachmentData)
+        mediaRecorder = createMediaRecorder().apply {
+            setAudioSource(audioSource)
+            setOutputFormat()
+            setAudioEncodingBitRate(audioEncodingBitRate)
+            setAudioSamplingRate(audioSamplingRate)
+        }
+        setOutputFile(roomId)
+    }
+
+    override fun startRecord(roomId: String) {
+        initializeRecord(roomId = roomId)
+        mediaRecorder?.prepare()
+        mediaRecorder?.start()
+    }
+
+    override fun pauseRecord() {
+        // Can throw when the record is less than 1 second.
+        tryOrNull { mediaRecorder?.pause() }
+    }
+
+    override fun resumeRecord() {
+        mediaRecorder?.resume()
+    }
+
+    override fun stopRecord() {
+        // Can throw when the record is less than 1 second.
+        tryOrNull { mediaRecorder?.stop() }
+        mediaRecorder?.reset()
+        release()
+    }
+
+    override fun cancelRecord() {
+        super.cancelRecord()
+        nextOutputFile?.delete()
+        nextOutputFile = null
+    }
+
+    override fun getMaxAmplitude(): Int {
+        return mediaRecorder?.maxAmplitude ?: 0
+    }
+
+    protected open fun release() {
+        mediaRecorder?.release()
+        mediaRecorder = null
+    }
+
+    fun setNextOutputFile(roomId: String) {
+        val mediaRecorder = mediaRecorder ?: return
+        nextOutputFile = createOutputFile(roomId)
+        mediaRecorder.setNextOutputFile(nextOutputFile)
+    }
+
+    private fun createMediaRecorder(): MediaRecorder {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            MediaRecorder(context)
+        } else {
+            @Suppress("DEPRECATION")
+            MediaRecorder()
+        }
+    }
+
+    private fun MediaRecorder.setOutputFormat() {
+        setOutputFormat(outputFormat)
+        setAudioEncoder(audioEncoder)
+    }
+
+    private fun setOutputFile(roomId: String) {
+        val mediaRecorder = mediaRecorder ?: return
+        outputFile = outputFile ?: createOutputFile(roomId)
+        mediaRecorder.setOutputFile(outputFile)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorder.kt b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorder.kt
index 785fb9b4da..bf38e4adbf 100644
--- a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorder.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorder.kt
@@ -22,11 +22,19 @@ import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import java.io.File
 
 interface VoiceRecorder {
+
     /**
-     * Initialize recording with a pre-recorded file.
-     * @param attachmentData data of the recorded file
+     * Audio file extension (eg. `mp4`).
      */
-    fun initializeRecord(attachmentData: ContentAttachmentData)
+    val fileNameExt: String
+
+    /**
+     * Initialize recording with an optional pre-recorded file.
+     *
+     * @param roomId id of the room to initialize record
+     * @param attachmentData data of the pre-recorded file, if any.
+     */
+    fun initializeRecord(roomId: String, attachmentData: ContentAttachmentData? = null)
 
     /**
      * Start the recording.
@@ -34,6 +42,16 @@ interface VoiceRecorder {
      */
     fun startRecord(roomId: String)
 
+    /**
+     * Pause the recording.
+     */
+    fun pauseRecord()
+
+    /**
+     * Resume the recording.
+     */
+    fun resumeRecord()
+
     /**
      * Stop the recording.
      */
diff --git a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
index c8eeb45635..13ddf60620 100644
--- a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
@@ -23,6 +23,7 @@ import android.media.MediaRecorder
 import android.media.audiofx.AutomaticGainControl
 import android.media.audiofx.NoiseSuppressor
 import android.os.Build
+import android.widget.Toast
 import io.element.android.opusencoder.OggOpusEncoder
 import io.element.android.opusencoder.configuration.SampleRate
 import kotlinx.coroutines.CoroutineScope
@@ -30,40 +31,35 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.session.content.ContentAttachmentData
-import org.matrix.android.sdk.api.util.md5
-import java.io.File
-import java.util.UUID
 import kotlin.coroutines.CoroutineContext
 
 /**
  * VoiceRecorder to be used on Android versions < [Build.VERSION_CODES.Q]. It uses libopus to record ogg files.
  */
 class VoiceRecorderL(
-        context: Context,
+        private val context: Context,
         coroutineContext: CoroutineContext,
-) : VoiceRecorder {
+        private val codec: OggOpusEncoder,
+) : AbstractVoiceRecorder(context) {
 
     companion object {
         private val SAMPLE_RATE = SampleRate.Rate48kHz
         private const val BITRATE = 24 * 1024
     }
 
-    private val outputDirectory: File by lazy { ensureAudioDirectory(context) }
-    private var outputFile: File? = null
-
     private val recorderScope = CoroutineScope(coroutineContext)
     private var recordingJob: Job? = null
 
     private var audioRecorder: AudioRecord? = null
     private var noiseSuppressor: NoiseSuppressor? = null
     private var automaticGainControl: AutomaticGainControl? = null
-    private val codec = OggOpusEncoder()
 
     // Size of the audio buffer for Short values
     private var bufferSizeInShorts = 0
     private var maxAmplitude = 0
 
+    override val fileNameExt: String = "ogg"
+
     private fun initializeCodec(filePath: String) {
         codec.init(filePath, SAMPLE_RATE)
         codec.setBitrate(BITRATE)
@@ -85,19 +81,10 @@ class VoiceRecorderL(
         }
     }
 
-    override fun initializeRecord(attachmentData: ContentAttachmentData) {
-        outputFile = attachmentData.findVoiceFile(outputDirectory)
-    }
-
     override fun startRecord(roomId: String) {
-        val fileName = "${UUID.randomUUID()}.ogg"
-        val outputDirectoryForRoom = File(outputDirectory, roomId.md5()).apply {
-            mkdirs()
+        outputFile = createOutputFile(roomId).also {
+            initializeCodec(it.absolutePath)
         }
-        val outputFile = File(outputDirectoryForRoom, fileName)
-        this.outputFile = outputFile
-
-        initializeCodec(outputFile.absolutePath)
 
         recordingJob = recorderScope.launch {
             audioRecorder?.startRecording()
@@ -112,6 +99,14 @@ class VoiceRecorderL(
         }
     }
 
+    override fun pauseRecord() {
+        Toast.makeText(context, "Not implemented for this Android version", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun resumeRecord() {
+        Toast.makeText(context, "Not implemented for this Android version", Toast.LENGTH_SHORT).show()
+    }
+
     override fun stopRecord() {
         val recorder = this.audioRecorder ?: return
         recordingJob?.cancel()
@@ -131,19 +126,10 @@ class VoiceRecorderL(
         codec.release()
     }
 
-    override fun cancelRecord() {
-        outputFile?.delete()
-        outputFile = null
-    }
-
     override fun getMaxAmplitude(): Int {
         return maxAmplitude
     }
 
-    override fun getVoiceMessageFile(): File? {
-        return outputFile
-    }
-
     private fun createAudioRecord() {
         val channelConfig = AudioFormat.CHANNEL_IN_MONO
         val format = AudioFormat.ENCODING_PCM_16BIT
diff --git a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderProvider.kt b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderProvider.kt
index 28693ca287..38771be44e 100644
--- a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderProvider.kt
@@ -17,20 +17,41 @@
 package im.vector.app.features.voice
 
 import android.content.Context
+import android.media.MediaCodecList
+import android.media.MediaFormat
 import android.os.Build
+import androidx.annotation.ChecksSdkIntAtLeast
+import androidx.annotation.VisibleForTesting
 import im.vector.app.features.VectorFeatures
+import io.element.android.opusencoder.OggOpusEncoder
 import kotlinx.coroutines.Dispatchers
+import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 import javax.inject.Inject
 
 class VoiceRecorderProvider @Inject constructor(
         private val context: Context,
         private val vectorFeatures: VectorFeatures,
+        private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
 ) {
     fun provideVoiceRecorder(): VoiceRecorder {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && vectorFeatures.forceUsageOfOpusEncoder().not()) {
+        return if (useNativeRecorder()) {
             VoiceRecorderQ(context)
         } else {
-            VoiceRecorderL(context, Dispatchers.IO)
+            VoiceRecorderL(context, Dispatchers.IO, OggOpusEncoder.create())
         }
     }
+
+    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.Q)
+    private fun useNativeRecorder(): Boolean {
+        return buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.Q &&
+                hasOpusEncoder() &&
+                !vectorFeatures.forceUsageOfOpusEncoder()
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    internal fun hasOpusEncoder(): Boolean {
+        val codecList = MediaCodecList(MediaCodecList.ALL_CODECS)
+        val format = MediaFormat.createAudioFormat(MediaFormat.MIMETYPE_AUDIO_OPUS, 48000, 1)
+        return codecList.findEncoderForFormat(format) != null
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderQ.kt b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderQ.kt
index 5091ddfa3b..f128673e27 100644
--- a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderQ.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderQ.kt
@@ -22,13 +22,15 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 
 /**
- * VoiceRecorder to be used on Android versions >= [Build.VERSION_CODES.Q]. It uses the native OPUS support on Android 10+.
+ * VoiceRecorder to be used on Android versions >= [Build.VERSION_CODES.Q].
+ * It uses the native OPUS support on Android 10+.
  */
 @RequiresApi(Build.VERSION_CODES.Q)
-class VoiceRecorderQ(context: Context) : AbstractVoiceRecorder(context, "ogg") {
-    override fun setOutputFormat(mediaRecorder: MediaRecorder) {
-        // We can directly use OGG here
-        mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.OGG)
-        mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.OPUS)
-    }
+class VoiceRecorderQ(context: Context) : AbstractVoiceRecorderQ(context) {
+
+    // We can directly use OGG here
+    override val outputFormat = MediaRecorder.OutputFormat.OGG
+    override val audioEncoder = MediaRecorder.AudioEncoder.OPUS
+
+    override val fileNameExt: String = "ogg"
 }
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
new file mode 100644
index 0000000000..11b4f50d2f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast
+
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+
+object VoiceBroadcastConstants {
+
+    /** Voice Broadcast State Event. */
+    const val STATE_ROOM_VOICE_BROADCAST_INFO = "io.element.voice_broadcast_info"
+
+    /** Custom key passed to the [MessageAudioContent] with Voice Broadcast information. */
+    const val VOICE_BROADCAST_CHUNK_KEY = "io.element.voice_broadcast_chunk"
+
+    /** Default voice broadcast chunk duration, in seconds. */
+    const val DEFAULT_CHUNK_LENGTH_IN_SECONDS = 120
+
+    /** Maximum length of the voice broadcast in seconds. */
+    const val MAX_VOICE_BROADCAST_LENGTH_IN_SECONDS = 14_400 // 4 hours
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastExtensions.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastExtensions.kt
new file mode 100644
index 0000000000..6faec5a262
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastExtensions.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast
+
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastChunk
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.getRelationContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioEvent
+
+fun MessageAudioEvent?.isVoiceBroadcast() = this?.root?.getClearContent()?.get(VoiceBroadcastConstants.VOICE_BROADCAST_CHUNK_KEY) != null
+
+fun MessageAudioEvent.getVoiceBroadcastEventId(): String? = if (isVoiceBroadcast()) root.getRelationContent()?.eventId else null
+
+fun MessageAudioEvent.getVoiceBroadcastChunk(): VoiceBroadcastChunk? {
+    @Suppress("UNCHECKED_CAST")
+    return (root.getClearContent()?.get(VoiceBroadcastConstants.VOICE_BROADCAST_CHUNK_KEY) as? Content).toModel<VoiceBroadcastChunk>()
+}
+
+val MessageAudioEvent.sequence: Int? get() = getVoiceBroadcastChunk()?.sequence
+
+val MessageAudioEvent.duration get() = content.audioInfo?.duration ?: content.audioWaveformInfo?.duration ?: 0
+
+val VoiceBroadcastEvent.voiceBroadcastId
+    get() = reference?.eventId
+
+val VoiceBroadcastEvent.isLive
+    get() = content?.isLive.orFalse()
+
+val MessageVoiceBroadcastInfoContent.isLive
+    get() = voiceBroadcastState != null && voiceBroadcastState != VoiceBroadcastState.STOPPED
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastFailure.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastFailure.kt
new file mode 100644
index 0000000000..76b50c78ab
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastFailure.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast
+
+sealed class VoiceBroadcastFailure : Throwable() {
+    sealed class RecordingError : VoiceBroadcastFailure() {
+        object NoPermission : RecordingError()
+        object BlockedBySomeoneElse : RecordingError()
+        object UserAlreadyBroadcasting : RecordingError()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastHelper.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastHelper.kt
new file mode 100644
index 0000000000..38fb157748
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastHelper.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast
+
+import im.vector.app.features.voicebroadcast.listening.VoiceBroadcastPlayer
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+import im.vector.app.features.voicebroadcast.recording.usecase.PauseVoiceBroadcastUseCase
+import im.vector.app.features.voicebroadcast.recording.usecase.ResumeVoiceBroadcastUseCase
+import im.vector.app.features.voicebroadcast.recording.usecase.StartVoiceBroadcastUseCase
+import im.vector.app.features.voicebroadcast.recording.usecase.StopVoiceBroadcastUseCase
+import javax.inject.Inject
+
+/**
+ * Helper class to record voice broadcast.
+ */
+class VoiceBroadcastHelper @Inject constructor(
+        private val startVoiceBroadcastUseCase: StartVoiceBroadcastUseCase,
+        private val pauseVoiceBroadcastUseCase: PauseVoiceBroadcastUseCase,
+        private val resumeVoiceBroadcastUseCase: ResumeVoiceBroadcastUseCase,
+        private val stopVoiceBroadcastUseCase: StopVoiceBroadcastUseCase,
+        private val voiceBroadcastPlayer: VoiceBroadcastPlayer,
+) {
+    suspend fun startVoiceBroadcast(roomId: String) = startVoiceBroadcastUseCase.execute(roomId)
+
+    suspend fun pauseVoiceBroadcast(roomId: String) = pauseVoiceBroadcastUseCase.execute(roomId)
+
+    suspend fun resumeVoiceBroadcast(roomId: String) = resumeVoiceBroadcastUseCase.execute(roomId)
+
+    suspend fun stopVoiceBroadcast(roomId: String) = stopVoiceBroadcastUseCase.execute(roomId)
+
+    fun playOrResumePlayback(voiceBroadcast: VoiceBroadcast) = voiceBroadcastPlayer.playOrResume(voiceBroadcast)
+
+    fun pausePlayback() = voiceBroadcastPlayer.pause()
+
+    fun stopPlayback() = voiceBroadcastPlayer.stop()
+
+    fun seekTo(voiceBroadcast: VoiceBroadcast, positionMillis: Int, duration: Int) {
+        voiceBroadcastPlayer.seekTo(voiceBroadcast, positionMillis, duration)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayer.kt
new file mode 100644
index 0000000000..0de88e9992
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayer.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.listening
+
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+
+interface VoiceBroadcastPlayer {
+
+    /**
+     * The current playing voice broadcast, if any.
+     */
+    val currentVoiceBroadcast: VoiceBroadcast?
+
+    /**
+     * The current playing [State], [State.IDLE] by default.
+     */
+    val playingState: State
+
+    /**
+     * Tells whether the player is listening a live voice broadcast in "live" position.
+     */
+    val isLiveListening: Boolean
+
+    /**
+     * Start playback of the given voice broadcast.
+     */
+    fun playOrResume(voiceBroadcast: VoiceBroadcast)
+
+    /**
+     * Pause playback of the current voice broadcast, if any.
+     */
+    fun pause()
+
+    /**
+     * Stop playback of the current voice broadcast, if any, and reset the player state.
+     */
+    fun stop()
+
+    /**
+     * Seek the given voice broadcast playback to the given position, is milliseconds.
+     */
+    fun seekTo(voiceBroadcast: VoiceBroadcast, positionMillis: Int, duration: Int)
+
+    /**
+     * Add a [Listener] to the given voice broadcast.
+     */
+    fun addListener(voiceBroadcast: VoiceBroadcast, listener: Listener)
+
+    /**
+     * Remove a [Listener] from the given voice broadcast.
+     */
+    fun removeListener(voiceBroadcast: VoiceBroadcast, listener: Listener)
+
+    /**
+     * Player states.
+     */
+    enum class State {
+        PLAYING,
+        PAUSED,
+        BUFFERING,
+        IDLE
+    }
+
+    /**
+     * Listener related to [VoiceBroadcastPlayer].
+     */
+    interface Listener {
+        /**
+         * Notify about [VoiceBroadcastPlayer.playingState] changes.
+         */
+        fun onPlayingStateChanged(state: State) = Unit
+
+        /**
+         * Notify about [VoiceBroadcastPlayer.isLiveListening] changes.
+         */
+        fun onLiveModeChanged(isLive: Boolean) = Unit
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
new file mode 100644
index 0000000000..d56f4ad715
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
@@ -0,0 +1,484 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.listening
+
+import android.media.AudioAttributes
+import android.media.MediaPlayer
+import android.media.MediaPlayer.OnPreparedListener
+import androidx.annotation.MainThread
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.onFirst
+import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
+import im.vector.app.features.session.coroutineScope
+import im.vector.app.features.voice.VoiceFailure
+import im.vector.app.features.voicebroadcast.isLive
+import im.vector.app.features.voicebroadcast.listening.VoiceBroadcastPlayer.Listener
+import im.vector.app.features.voicebroadcast.listening.VoiceBroadcastPlayer.State
+import im.vector.app.features.voicebroadcast.listening.usecase.GetLiveVoiceBroadcastChunksUseCase
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.usecase.GetVoiceBroadcastStateEventLiveUseCase
+import im.vector.lib.core.utils.timer.CountUpTimer
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import timber.log.Timber
+import java.util.concurrent.CopyOnWriteArrayList
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class VoiceBroadcastPlayerImpl @Inject constructor(
+        private val sessionHolder: ActiveSessionHolder,
+        private val playbackTracker: AudioMessagePlaybackTracker,
+        private val getVoiceBroadcastEventUseCase: GetVoiceBroadcastStateEventLiveUseCase,
+        private val getLiveVoiceBroadcastChunksUseCase: GetLiveVoiceBroadcastChunksUseCase
+) : VoiceBroadcastPlayer {
+
+    private val session get() = sessionHolder.getActiveSession()
+    private val sessionScope get() = session.coroutineScope
+
+    private val mediaPlayerListener = MediaPlayerListener()
+    private val playbackTicker = PlaybackTicker()
+    private val playlist = VoiceBroadcastPlaylist()
+
+    private var fetchPlaylistTask: Job? = null
+    private var voiceBroadcastStateObserver: Job? = null
+
+    private var currentMediaPlayer: MediaPlayer? = null
+    private var nextMediaPlayer: MediaPlayer? = null
+    private var isPreparingNextPlayer: Boolean = false
+
+    private var mostRecentVoiceBroadcastEvent: VoiceBroadcastEvent? = null
+
+    override var currentVoiceBroadcast: VoiceBroadcast? = null
+    override var isLiveListening: Boolean = false
+        @MainThread
+        set(value) {
+            if (field != value) {
+                Timber.d("## Voice Broadcast | isLiveListening: $field -> $value")
+                field = value
+                onLiveListeningChanged(value)
+            }
+        }
+
+    override var playingState = State.IDLE
+        @MainThread
+        set(value) {
+            if (field != value) {
+                Timber.d("## Voice Broadcast | playingState: $field -> $value")
+                field = value
+                onPlayingStateChanged(value)
+            }
+        }
+
+    /** Map voiceBroadcastId to listeners. */
+    private val listeners: MutableMap<String, CopyOnWriteArrayList<Listener>> = mutableMapOf()
+
+    override fun playOrResume(voiceBroadcast: VoiceBroadcast) {
+        val hasChanged = currentVoiceBroadcast != voiceBroadcast
+        when {
+            hasChanged -> startPlayback(voiceBroadcast)
+            playingState == State.PAUSED -> resumePlayback()
+            else -> Unit
+        }
+    }
+
+    override fun pause() {
+        pausePlayback()
+    }
+
+    override fun stop() {
+        // Update state
+        playingState = State.IDLE
+
+        // Stop and release media players
+        stopPlayer()
+
+        // Do not observe anymore voice broadcast changes
+        fetchPlaylistTask?.cancel()
+        fetchPlaylistTask = null
+        voiceBroadcastStateObserver?.cancel()
+        voiceBroadcastStateObserver = null
+
+        // Clear playlist
+        playlist.reset()
+
+        mostRecentVoiceBroadcastEvent = null
+        currentVoiceBroadcast = null
+    }
+
+    override fun addListener(voiceBroadcast: VoiceBroadcast, listener: Listener) {
+        listeners[voiceBroadcast.voiceBroadcastId]?.add(listener) ?: run {
+            listeners[voiceBroadcast.voiceBroadcastId] = CopyOnWriteArrayList<Listener>().apply { add(listener) }
+        }
+        listener.onPlayingStateChanged(if (voiceBroadcast == currentVoiceBroadcast) playingState else State.IDLE)
+        listener.onLiveModeChanged(voiceBroadcast == currentVoiceBroadcast)
+    }
+
+    override fun removeListener(voiceBroadcast: VoiceBroadcast, listener: Listener) {
+        listeners[voiceBroadcast.voiceBroadcastId]?.remove(listener)
+    }
+
+    private fun startPlayback(voiceBroadcast: VoiceBroadcast) {
+        // Stop listening previous voice broadcast if any
+        if (playingState != State.IDLE) stop()
+
+        currentVoiceBroadcast = voiceBroadcast
+
+        playingState = State.BUFFERING
+
+        observeVoiceBroadcastStateEvent(voiceBroadcast)
+    }
+
+    private fun observeVoiceBroadcastStateEvent(voiceBroadcast: VoiceBroadcast) {
+        voiceBroadcastStateObserver = getVoiceBroadcastEventUseCase.execute(voiceBroadcast)
+                .onFirst { fetchPlaylistAndStartPlayback(voiceBroadcast) }
+                .onEach { onVoiceBroadcastStateEventUpdated(it.getOrNull()) }
+                .launchIn(sessionScope)
+    }
+
+    private fun onVoiceBroadcastStateEventUpdated(event: VoiceBroadcastEvent?) {
+        if (event == null) {
+            stop()
+        } else {
+            mostRecentVoiceBroadcastEvent = event
+            updateLiveListeningMode()
+        }
+    }
+
+    private fun fetchPlaylistAndStartPlayback(voiceBroadcast: VoiceBroadcast) {
+        fetchPlaylistTask = getLiveVoiceBroadcastChunksUseCase.execute(voiceBroadcast)
+                .onEach {
+                    playlist.setItems(it)
+                    onPlaylistUpdated()
+                }
+                .launchIn(sessionScope)
+    }
+
+    private fun onPlaylistUpdated() {
+        when (playingState) {
+            State.PLAYING,
+            State.PAUSED -> {
+                if (nextMediaPlayer == null && !isPreparingNextPlayer) {
+                    prepareNextMediaPlayer()
+                }
+            }
+            State.BUFFERING -> {
+                val nextItem = if (isLiveListening && playlist.currentSequence == null) {
+                    // live listening, jump to the last item if playback has not started
+                    playlist.lastOrNull()
+                } else {
+                    // not live or playback already started, request next item
+                    playlist.getNextItem()
+                }
+                if (nextItem != null) {
+                    startPlayback(nextItem.startTime)
+                }
+            }
+            State.IDLE -> Unit // Should not happen
+        }
+    }
+
+    private fun startPlayback(position: Int) {
+        stopPlayer()
+
+        val playlistItem = playlist.findByPosition(position)
+        val content = playlistItem?.audioEvent?.content ?: run { Timber.w("## Voice Broadcast | No content to play at position $position"); return }
+        val sequence = playlistItem.sequence ?: run { Timber.w("## Voice Broadcast | Playlist item has no sequence"); return }
+        val sequencePosition = position - playlistItem.startTime
+        sessionScope.launch {
+            try {
+                prepareMediaPlayer(content) { mp ->
+                    currentMediaPlayer = mp
+                    playlist.currentSequence = sequence
+                    mp.start()
+                    if (sequencePosition > 0) {
+                        mp.seekTo(sequencePosition)
+                    }
+                    playingState = State.PLAYING
+                    prepareNextMediaPlayer()
+                }
+            } catch (failure: Throwable) {
+                Timber.e(failure, "## Voice Broadcast | Unable to start playback: $failure")
+                throw VoiceFailure.UnableToPlay(failure)
+            }
+        }
+    }
+
+    private fun pausePlayback() {
+        playingState = State.PAUSED // This will trigger a playing state update and save the current position
+        if (currentMediaPlayer != null) {
+            currentMediaPlayer?.pause()
+        } else {
+            stopPlayer()
+        }
+    }
+
+    private fun resumePlayback() {
+        if (currentMediaPlayer != null) {
+            playingState = State.PLAYING
+            currentMediaPlayer?.start()
+        } else {
+            val savedPosition = currentVoiceBroadcast?.voiceBroadcastId?.let { playbackTracker.getPlaybackTime(it) } ?: 0
+            startPlayback(savedPosition)
+        }
+    }
+
+    override fun seekTo(voiceBroadcast: VoiceBroadcast, positionMillis: Int, duration: Int) {
+        when {
+            voiceBroadcast != currentVoiceBroadcast -> {
+                playbackTracker.updatePausedAtPlaybackTime(voiceBroadcast.voiceBroadcastId, positionMillis, positionMillis.toFloat() / duration)
+            }
+            playingState == State.PLAYING || playingState == State.BUFFERING -> {
+                updateLiveListeningMode(positionMillis)
+                startPlayback(positionMillis)
+            }
+            playingState == State.IDLE || playingState == State.PAUSED -> {
+                stopPlayer()
+                playbackTracker.updatePausedAtPlaybackTime(voiceBroadcast.voiceBroadcastId, positionMillis, positionMillis.toFloat() / duration)
+            }
+        }
+    }
+
+    private fun prepareNextMediaPlayer() {
+        val nextItem = playlist.getNextItem()
+        if (nextItem != null) {
+            isPreparingNextPlayer = true
+            sessionScope.launch {
+                prepareMediaPlayer(nextItem.audioEvent.content) { mp ->
+                    isPreparingNextPlayer = false
+                    nextMediaPlayer = mp
+                    when (playingState) {
+                        State.PLAYING,
+                        State.PAUSED -> {
+                            currentMediaPlayer?.setNextMediaPlayer(mp)
+                        }
+                        State.BUFFERING -> {
+                            mp.start()
+                            onNextMediaPlayerStarted(mp)
+                        }
+                        State.IDLE -> stopPlayer()
+                    }
+                }
+            }
+        }
+    }
+
+    private suspend fun prepareMediaPlayer(messageAudioContent: MessageAudioContent, onPreparedListener: OnPreparedListener): MediaPlayer {
+        // Download can fail
+        val audioFile = try {
+            session.fileService().downloadFile(messageAudioContent)
+        } catch (failure: Throwable) {
+            Timber.e(failure, "Voice Broadcast | Download has failed: $failure")
+            throw VoiceFailure.UnableToPlay(failure)
+        }
+
+        return audioFile.inputStream().use { fis ->
+            MediaPlayer().apply {
+                setAudioAttributes(
+                        AudioAttributes.Builder()
+                                // Do not use CONTENT_TYPE_SPEECH / USAGE_VOICE_COMMUNICATION because we want to play loud here
+                                .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                                .setUsage(AudioAttributes.USAGE_MEDIA)
+                                .build()
+                )
+                setDataSource(fis.fd)
+                setOnInfoListener(mediaPlayerListener)
+                setOnErrorListener(mediaPlayerListener)
+                setOnPreparedListener(onPreparedListener)
+                setOnCompletionListener(mediaPlayerListener)
+                prepare()
+            }
+        }
+    }
+
+    private fun stopPlayer() {
+        tryOrNull { currentMediaPlayer?.stop() }
+        currentMediaPlayer?.release()
+        currentMediaPlayer = null
+
+        nextMediaPlayer?.release()
+        nextMediaPlayer = null
+        isPreparingNextPlayer = false
+    }
+
+    private fun onPlayingStateChanged(playingState: State) {
+        // Update live playback flag
+        updateLiveListeningMode()
+
+        currentVoiceBroadcast?.voiceBroadcastId?.let { voiceBroadcastId ->
+            // Start or stop playback ticker
+            when (playingState) {
+                State.PLAYING -> playbackTicker.startPlaybackTicker(voiceBroadcastId)
+                State.PAUSED,
+                State.BUFFERING,
+                State.IDLE -> playbackTicker.stopPlaybackTicker(voiceBroadcastId)
+            }
+            // Notify state change to all the listeners attached to the current voice broadcast id
+            listeners[voiceBroadcastId]?.forEach { listener -> listener.onPlayingStateChanged(playingState) }
+        }
+    }
+
+    /**
+     * Update the live listening state according to:
+     * - the voice broadcast state (started/paused/resumed/stopped),
+     * - the playing state (IDLE, PLAYING, PAUSED, BUFFERING),
+     * - the potential seek position (backward/forward).
+     */
+    private fun updateLiveListeningMode(seekPosition: Int? = null) {
+        isLiveListening = when {
+            // the current voice broadcast is not live (ended)
+            mostRecentVoiceBroadcastEvent?.isLive != true -> false
+            // the player is stopped or paused
+            playingState == State.IDLE || playingState == State.PAUSED -> false
+            seekPosition != null -> {
+                val seekDirection = seekPosition.compareTo(getCurrentPlaybackPosition() ?: 0)
+                val newSequence = playlist.findByPosition(seekPosition)?.sequence
+                // the user has sought forward
+                if (seekDirection >= 0) {
+                    // stay in live or latest sequence reached
+                    isLiveListening || newSequence == playlist.lastOrNull()?.sequence
+                }
+                // the user has sought backward
+                else {
+                    // was in live and stay in the same sequence
+                    isLiveListening && newSequence == playlist.currentSequence
+                }
+            }
+            // if there is no saved position, go in live
+            getCurrentPlaybackPosition() == null -> true
+            // if we reached the latest sequence, go in live
+            playlist.currentSequence == playlist.lastOrNull()?.sequence -> true
+            // otherwise, do not change
+            else -> isLiveListening
+        }
+    }
+
+    private fun onLiveListeningChanged(isLiveListening: Boolean) {
+        // Live has ended and last chunk has been reached, we can stop the playback
+        if (!isLiveListening && playingState == State.BUFFERING && playlist.currentSequence == mostRecentVoiceBroadcastEvent?.content?.lastChunkSequence) {
+            stop()
+        }
+    }
+
+    private fun onNextMediaPlayerStarted(mp: MediaPlayer) {
+        playingState = State.PLAYING
+        playlist.currentSequence = playlist.currentSequence?.inc()
+        currentMediaPlayer = mp
+        nextMediaPlayer = null
+        prepareNextMediaPlayer()
+    }
+
+    private fun getCurrentPlaybackPosition(): Int? {
+        val voiceBroadcastId = currentVoiceBroadcast?.voiceBroadcastId ?: return null
+        val computedPosition = currentMediaPlayer?.currentPosition?.let { playlist.currentItem?.startTime?.plus(it) }
+        val savedPosition = playbackTracker.getPlaybackTime(voiceBroadcastId)
+        return computedPosition ?: savedPosition
+    }
+
+    private fun getCurrentPlaybackPercentage(): Float? {
+        val playlistPosition = playlist.currentItem?.startTime
+        val computedPosition = currentMediaPlayer?.currentPosition?.let { playlistPosition?.plus(it) } ?: playlistPosition
+        val duration = playlist.duration.takeIf { it > 0 }
+        val computedPercentage = if (computedPosition != null && duration != null) computedPosition.toFloat() / duration else null
+        val savedPercentage = currentVoiceBroadcast?.voiceBroadcastId?.let { playbackTracker.getPercentage(it) }
+        return computedPercentage ?: savedPercentage
+    }
+
+    private inner class MediaPlayerListener :
+            MediaPlayer.OnInfoListener,
+            MediaPlayer.OnCompletionListener,
+            MediaPlayer.OnErrorListener {
+
+        override fun onInfo(mp: MediaPlayer, what: Int, extra: Int): Boolean {
+            when (what) {
+                MediaPlayer.MEDIA_INFO_STARTED_AS_NEXT -> onNextMediaPlayerStarted(mp)
+            }
+            return false
+        }
+
+        override fun onCompletion(mp: MediaPlayer) {
+            // Next media player is already attached to this player and will start playing automatically
+            if (nextMediaPlayer != null) return
+
+            val hasEnded = !isLiveListening && mostRecentVoiceBroadcastEvent?.content?.lastChunkSequence == playlist.currentSequence
+            if (hasEnded) {
+                // We'll not receive new chunks anymore so we can stop the live listening
+                stop()
+            } else {
+                // Enter in buffering mode and release current media player
+                playingState = State.BUFFERING
+                currentMediaPlayer?.release()
+                currentMediaPlayer = null
+            }
+        }
+
+        override fun onError(mp: MediaPlayer, what: Int, extra: Int): Boolean {
+            stop()
+            return true
+        }
+    }
+
+    private inner class PlaybackTicker(
+            private var playbackTicker: CountUpTimer? = null,
+    ) {
+
+        fun startPlaybackTicker(id: String) {
+            playbackTicker?.stop()
+            playbackTicker = CountUpTimer(50L).apply {
+                tickListener = CountUpTimer.TickListener { onPlaybackTick(id) }
+                resume()
+            }
+            onPlaybackTick(id)
+        }
+
+        fun stopPlaybackTicker(id: String) {
+            playbackTicker?.stop()
+            playbackTicker = null
+            onPlaybackTick(id)
+        }
+
+        private fun onPlaybackTick(id: String) {
+            val playbackTime = getCurrentPlaybackPosition()
+            val percentage = getCurrentPlaybackPercentage()
+            when (playingState) {
+                State.PLAYING -> {
+                    if (playbackTime != null && percentage != null) {
+                        playbackTracker.updatePlayingAtPlaybackTime(id, playbackTime, percentage)
+                    }
+                }
+                State.PAUSED,
+                State.BUFFERING -> {
+                    if (playbackTime != null && percentage != null) {
+                        playbackTracker.updatePausedAtPlaybackTime(id, playbackTime, percentage)
+                    }
+                }
+                State.IDLE -> {
+                    if (playbackTime == null || percentage == null || (playlist.duration - playbackTime) < 50) {
+                        playbackTracker.stopPlayback(id)
+                    } else {
+                        playbackTracker.updatePausedAtPlaybackTime(id, playbackTime, percentage)
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlaylist.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlaylist.kt
new file mode 100644
index 0000000000..36b737f23f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlaylist.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.listening
+
+import im.vector.app.features.voicebroadcast.duration
+import im.vector.app.features.voicebroadcast.sequence
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioEvent
+
+class VoiceBroadcastPlaylist(
+        private val items: MutableList<PlaylistItem> = mutableListOf(),
+) : List<PlaylistItem> by items {
+
+    var currentSequence: Int? = null
+    val currentItem get() = currentSequence?.let { findBySequence(it) }
+
+    val duration
+        get() = items.lastOrNull()?.let { it.startTime + it.audioEvent.duration } ?: 0
+
+    fun setItems(audioEvents: List<MessageAudioEvent>) {
+        items.clear()
+        val sorted = audioEvents.sortedBy { it.sequence?.toLong() ?: it.root.originServerTs }
+        val chunkPositions = sorted
+                .map { it.duration }
+                .runningFold(0) { acc, i -> acc + i }
+                .dropLast(1)
+        val newItems = sorted.mapIndexed { index, messageAudioEvent ->
+            PlaylistItem(
+                    audioEvent = messageAudioEvent,
+                    startTime = chunkPositions.getOrNull(index) ?: 0
+            )
+        }
+        items.addAll(newItems)
+    }
+
+    fun reset() {
+        currentSequence = null
+        items.clear()
+    }
+
+    fun findByPosition(positionMillis: Int): PlaylistItem? {
+        return items.lastOrNull { it.startTime <= positionMillis }
+    }
+
+    fun findBySequence(sequenceNumber: Int): PlaylistItem? {
+        return items.find { it.sequence == sequenceNumber }
+    }
+
+    fun getNextItem() = findBySequence(currentSequence?.plus(1) ?: 1)
+
+    fun firstOrNull() = findBySequence(1)
+}
+
+data class PlaylistItem(val audioEvent: MessageAudioEvent, val startTime: Int) {
+    val sequence: Int?
+        get() = audioEvent.sequence
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/usecase/GetLiveVoiceBroadcastChunksUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/usecase/GetLiveVoiceBroadcastChunksUseCase.kt
new file mode 100644
index 0000000000..b2aebd9932
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/usecase/GetLiveVoiceBroadcastChunksUseCase.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.listening.usecase
+
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.voicebroadcast.getVoiceBroadcastEventId
+import im.vector.app.features.voicebroadcast.isVoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.sequence
+import im.vector.app.features.voicebroadcast.usecase.GetVoiceBroadcastStateEventLiveUseCase
+import im.vector.app.features.voicebroadcast.voiceBroadcastId
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.runningReduce
+import kotlinx.coroutines.runBlocking
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioEvent
+import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import javax.inject.Inject
+
+/**
+ * Get a [Flow] of [MessageAudioEvent]s related to the given voice broadcast.
+ */
+class GetLiveVoiceBroadcastChunksUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val getVoiceBroadcastEventUseCase: GetVoiceBroadcastStateEventLiveUseCase,
+) {
+
+    fun execute(voiceBroadcast: VoiceBroadcast): Flow<List<MessageAudioEvent>> {
+        val session = activeSessionHolder.getSafeActiveSession() ?: return emptyFlow()
+        val room = session.roomService().getRoom(voiceBroadcast.roomId) ?: return emptyFlow()
+        val timeline = room.timelineService().createTimeline(null, TimelineSettings(5))
+
+        // Get initial chunks
+        val existingChunks = room.timelineService().getTimelineEventsRelatedTo(RelationType.REFERENCE, voiceBroadcast.voiceBroadcastId)
+                .mapNotNull { timelineEvent -> timelineEvent.root.asMessageAudioEvent().takeIf { it.isVoiceBroadcast() } }
+
+        val voiceBroadcastEvent = runBlocking { getVoiceBroadcastEventUseCase.execute(voiceBroadcast).firstOrNull()?.getOrNull() }
+        val voiceBroadcastState = voiceBroadcastEvent?.content?.voiceBroadcastState
+
+        return if (voiceBroadcastState == null || voiceBroadcastState == VoiceBroadcastState.STOPPED) {
+            // Just send the existing chunks if voice broadcast is stopped
+            flowOf(existingChunks)
+        } else {
+            // Observe new timeline events if voice broadcast is ongoing
+            callbackFlow {
+                // Init with existing chunks
+                send(existingChunks)
+
+                // Observe new timeline events
+                val listener = object : Timeline.Listener {
+                    private var latestEventId: String? = null
+                    private var lastSequence: Int? = null
+
+                    override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
+                        val latestEventIndex = latestEventId?.let { eventId -> snapshot.indexOfFirst { it.eventId == eventId } }
+                        val newEvents = if (latestEventIndex != null) snapshot.subList(0, latestEventIndex) else snapshot
+
+                        // Detect a potential stopped voice broadcast state event
+                        val stopEvent = newEvents.findStopEvent(voiceBroadcast)
+                        if (stopEvent != null) {
+                            lastSequence = stopEvent.content?.lastChunkSequence
+                        }
+
+                        val newChunks = newEvents.mapToChunkEvents(voiceBroadcast.voiceBroadcastId, voiceBroadcastEvent.root.senderId)
+
+                        // Notify about new chunks
+                        if (newChunks.isNotEmpty()) {
+                            trySend(newChunks)
+                        }
+
+                        // Automatically stop observing the timeline if the last chunk has been received
+                        if (lastSequence != null && newChunks.any { it.sequence == lastSequence }) {
+                            timeline.removeListener(this)
+                            timeline.dispose()
+                        }
+
+                        latestEventId = snapshot.firstOrNull()?.eventId
+                    }
+                }
+
+                timeline.addListener(listener)
+                timeline.start()
+                awaitClose {
+                    timeline.removeListener(listener)
+                    timeline.dispose()
+                }
+            }
+                    .runningReduce { accumulator: List<MessageAudioEvent>, value: List<MessageAudioEvent> -> accumulator.plus(value) }
+                    .map { events -> events.distinctBy { it.sequence } }
+        }
+    }
+
+    /**
+     * Find a [VoiceBroadcastEvent] with a [VoiceBroadcastState.STOPPED] state.
+     */
+    private fun List<TimelineEvent>.findStopEvent(voiceBroadcast: VoiceBroadcast): VoiceBroadcastEvent? =
+            this.mapNotNull { timelineEvent -> timelineEvent.root.asVoiceBroadcastEvent()?.takeIf { it.voiceBroadcastId == voiceBroadcast.voiceBroadcastId } }
+                    .find { it.content?.voiceBroadcastState == VoiceBroadcastState.STOPPED }
+
+    /**
+     * Transform the list of [TimelineEvent] to a mapped list of [MessageAudioEvent] related to a given voice broadcast.
+     */
+    private fun List<TimelineEvent>.mapToChunkEvents(voiceBroadcastId: String, senderId: String?): List<MessageAudioEvent> =
+            this.mapNotNull { timelineEvent ->
+                timelineEvent.root.asMessageAudioEvent()
+                        ?.takeIf {
+                            it.isVoiceBroadcast() && it.getVoiceBroadcastEventId() == voiceBroadcastId &&
+                                    it.root.senderId == senderId
+                        }
+            }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/model/MessageVoiceBroadcastInfoContent.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/MessageVoiceBroadcastInfoContent.kt
new file mode 100644
index 0000000000..d882d4049e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/MessageVoiceBroadcastInfoContent.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType.MSGTYPE_VOICE_BROADCAST_INFO
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import timber.log.Timber
+
+/**
+ * Content of the state event of type [VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO].
+ *
+ * It contains general info related to a voice broadcast.
+ */
+@JsonClass(generateAdapter = true)
+data class MessageVoiceBroadcastInfoContent(
+        /** Local message type, not from server. */
+        @Transient override val msgType: String = MSGTYPE_VOICE_BROADCAST_INFO,
+        @Json(name = "body") override val body: String = "",
+        @Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
+        @Json(name = "m.new_content") override val newContent: Content? = null,
+
+        /** The device from which the broadcast has been started. */
+        @Json(name = "device_id") val deviceId: String? = null,
+        /** The [VoiceBroadcastState] value. **/
+        @Json(name = "state") val voiceBroadcastStateStr: String = "",
+        /** The length of the voice chunks in seconds. **/
+        @Json(name = "chunk_length") val chunkLength: Int? = null,
+        /** The sequence of the last sent chunk. **/
+        @Json(name = "last_chunk_sequence") val lastChunkSequence: Int? = null,
+) : MessageContent {
+
+    val voiceBroadcastState: VoiceBroadcastState? = VoiceBroadcastState.values()
+            .find { it.value == voiceBroadcastStateStr }
+            ?: run {
+                Timber.w("Invalid value for state: `$voiceBroadcastStateStr`")
+                null
+            }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcast.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcast.kt
new file mode 100644
index 0000000000..62207d5b87
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcast.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.model
+
+data class VoiceBroadcast(
+        val voiceBroadcastId: String,
+        val roomId: String,
+)
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastChunk.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastChunk.kt
new file mode 100644
index 0000000000..e0f6e6e7b1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastChunk.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class VoiceBroadcastChunk(
+        @Json(name = "sequence") val sequence: Int? = null
+)
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastEvent.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastEvent.kt
new file mode 100644
index 0000000000..d464a253d3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastEvent.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.model
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+
+/**
+ * [Event] wrapper for [VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO] event type.
+ * Provides additional fields and functions related to voice broadcast.
+ */
+@JvmInline
+value class VoiceBroadcastEvent(val root: Event) {
+
+    /**
+     * Reference on the initial voice broadcast state event (ie. with [MessageVoiceBroadcastInfoContent.voiceBroadcastState]=[VoiceBroadcastState.STARTED]).
+     */
+    val reference: RelationDefaultContent?
+        get() {
+            val voiceBroadcastInfoContent = root.content.toModel<MessageVoiceBroadcastInfoContent>()
+            return if (voiceBroadcastInfoContent?.voiceBroadcastState == VoiceBroadcastState.STARTED) {
+                RelationDefaultContent(RelationType.REFERENCE, root.eventId)
+            } else {
+                voiceBroadcastInfoContent?.relatesTo
+            }
+        }
+
+    /**
+     * The mapped [MessageVoiceBroadcastInfoContent] model of the event content.
+     */
+    val content: MessageVoiceBroadcastInfoContent?
+        get() = root.content.toModel()
+}
+
+/**
+ * Map a [VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO] state event to a [VoiceBroadcastEvent].
+ */
+fun Event.asVoiceBroadcastEvent() = if (type == VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO) VoiceBroadcastEvent(this) else null
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastState.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastState.kt
new file mode 100644
index 0000000000..02e1b2decc
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastState.kt
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package im.vector.app.features.voicebroadcast.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * Ref: https://github.com/vector-im/element-meta/discussions/632
+ */
+@JsonClass(generateAdapter = false)
+enum class VoiceBroadcastState(val value: String) {
+    /**
+     * The voice broadcast had been started and is currently being live.
+     */
+    @Json(name = "started") STARTED("started"),
+
+    /**
+     * The voice broadcast has been paused and may be resumed at any time by the recorder.
+     */
+    @Json(name = "paused") PAUSED("paused"),
+
+    /**
+     * The voice broadcast is currently being live again.
+     */
+    @Json(name = "resumed") RESUMED("resumed"),
+
+    /**
+     * The voice broadcast has ended.
+     */
+    @Json(name = "stopped") STOPPED("stopped"),
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/VoiceBroadcastRecorder.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/VoiceBroadcastRecorder.kt
new file mode 100644
index 0000000000..00e4bb17dd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/VoiceBroadcastRecorder.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.recording
+
+import androidx.annotation.IntRange
+import im.vector.app.features.voice.VoiceRecorder
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+import java.io.File
+
+interface VoiceBroadcastRecorder : VoiceRecorder {
+
+    /** The current chunk number. */
+    val currentSequence: Int
+
+    /** Current state of the recorder. */
+    val recordingState: State
+
+    /** Current remaining time of recording, in seconds, if any. */
+    val currentRemainingTime: Long?
+
+    fun startRecordVoiceBroadcast(voiceBroadcast: VoiceBroadcast, chunkLength: Int, maxLength: Int)
+    fun addListener(listener: Listener)
+    fun removeListener(listener: Listener)
+
+    interface Listener {
+        fun onVoiceMessageCreated(file: File, @IntRange(from = 1) sequence: Int) = Unit
+        fun onStateUpdated(state: State) = Unit
+        fun onRemainingTimeUpdated(remainingTime: Long?) = Unit
+    }
+
+    enum class State {
+        Recording,
+        Paused,
+        Idle,
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/VoiceBroadcastRecorderQ.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/VoiceBroadcastRecorderQ.kt
new file mode 100644
index 0000000000..2da807293f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/VoiceBroadcastRecorderQ.kt
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.recording
+
+import android.content.Context
+import android.media.MediaRecorder
+import android.os.Build
+import androidx.annotation.RequiresApi
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.session.coroutineScope
+import im.vector.app.features.voice.AbstractVoiceRecorderQ
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.usecase.GetVoiceBroadcastStateEventLiveUseCase
+import im.vector.lib.core.utils.timer.CountUpTimer
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.TimeUnit
+
+@RequiresApi(Build.VERSION_CODES.Q)
+class VoiceBroadcastRecorderQ(
+        context: Context,
+        private val sessionHolder: ActiveSessionHolder,
+        private val getVoiceBroadcastEventUseCase: GetVoiceBroadcastStateEventLiveUseCase
+) : AbstractVoiceRecorderQ(context), VoiceBroadcastRecorder {
+
+    private val session get() = sessionHolder.getActiveSession()
+    private val sessionScope get() = session.coroutineScope
+
+    private var voiceBroadcastStateObserver: Job? = null
+
+    private var maxFileSize = 0L // zero or negative for no limit
+    private var currentVoiceBroadcast: VoiceBroadcast? = null
+    private var currentMaxLength: Int = 0
+
+    override var currentSequence = 0
+    override var recordingState = VoiceBroadcastRecorder.State.Idle
+        set(value) {
+            field = value
+            listeners.forEach { it.onStateUpdated(value) }
+        }
+    override var currentRemainingTime: Long? = null
+        set(value) {
+            field = value
+            listeners.forEach { it.onRemainingTimeUpdated(value) }
+        }
+
+    private val recordingTicker = RecordingTicker()
+    private val listeners = CopyOnWriteArrayList<VoiceBroadcastRecorder.Listener>()
+
+    override val outputFormat = MediaRecorder.OutputFormat.MPEG_4
+    override val audioEncoder = MediaRecorder.AudioEncoder.HE_AAC
+
+    override val fileNameExt: String = "mp4"
+
+    override fun initializeRecord(roomId: String, attachmentData: ContentAttachmentData?) {
+        super.initializeRecord(roomId, attachmentData)
+        mediaRecorder?.setMaxFileSize(maxFileSize)
+        mediaRecorder?.setOnInfoListener { _, what, _ ->
+            when (what) {
+                MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_APPROACHING -> onMaxFileSizeApproaching(roomId)
+                MediaRecorder.MEDIA_RECORDER_INFO_NEXT_OUTPUT_FILE_STARTED -> onNextOutputFileStarted()
+                else -> Unit // Nothing to do
+            }
+        }
+    }
+
+    override fun startRecordVoiceBroadcast(voiceBroadcast: VoiceBroadcast, chunkLength: Int, maxLength: Int) {
+        // Stop recording previous voice broadcast if any
+        if (recordingState != VoiceBroadcastRecorder.State.Idle) stopRecord()
+
+        currentVoiceBroadcast = voiceBroadcast
+        maxFileSize = (chunkLength * audioEncodingBitRate / 8).toLong()
+        currentMaxLength = maxLength
+        currentSequence = 1
+
+        observeVoiceBroadcastStateEvent(voiceBroadcast)
+    }
+
+    override fun pauseRecord() {
+        if (recordingState != VoiceBroadcastRecorder.State.Recording) return
+        tryOrNull { mediaRecorder?.stop() }
+        mediaRecorder?.reset()
+        recordingState = VoiceBroadcastRecorder.State.Paused
+        recordingTicker.pause()
+        notifyOutputFileCreated()
+    }
+
+    override fun resumeRecord() {
+        if (recordingState != VoiceBroadcastRecorder.State.Paused) return
+        currentSequence++
+        currentVoiceBroadcast?.let { startRecord(it.roomId) }
+        recordingState = VoiceBroadcastRecorder.State.Recording
+        recordingTicker.resume()
+    }
+
+    override fun stopRecord() {
+        super.stopRecord()
+
+        // Stop recording
+        recordingState = VoiceBroadcastRecorder.State.Idle
+        recordingTicker.stop()
+        notifyOutputFileCreated()
+
+        // Remove listeners
+        listeners.clear()
+
+        // Do not observe anymore voice broadcast changes
+        voiceBroadcastStateObserver?.cancel()
+        voiceBroadcastStateObserver = null
+
+        // Reset data
+        currentSequence = 0
+        currentMaxLength = 0
+        currentRemainingTime = null
+        currentVoiceBroadcast = null
+    }
+
+    override fun release() {
+        mediaRecorder?.setOnInfoListener(null)
+        super.release()
+    }
+
+    override fun addListener(listener: VoiceBroadcastRecorder.Listener) {
+        listeners.add(listener)
+        listener.onStateUpdated(recordingState)
+        listener.onRemainingTimeUpdated(currentRemainingTime)
+    }
+
+    override fun removeListener(listener: VoiceBroadcastRecorder.Listener) {
+        listeners.remove(listener)
+    }
+
+    private fun observeVoiceBroadcastStateEvent(voiceBroadcast: VoiceBroadcast) {
+        voiceBroadcastStateObserver = getVoiceBroadcastEventUseCase.execute(voiceBroadcast)
+                .onEach { onVoiceBroadcastStateEventUpdated(voiceBroadcast, it.getOrNull()) }
+                .launchIn(sessionScope)
+    }
+
+    private fun onVoiceBroadcastStateEventUpdated(voiceBroadcast: VoiceBroadcast, event: VoiceBroadcastEvent?) {
+        when (event?.content?.voiceBroadcastState) {
+            VoiceBroadcastState.STARTED -> {
+                startRecord(voiceBroadcast.roomId)
+                recordingState = VoiceBroadcastRecorder.State.Recording
+                recordingTicker.start()
+            }
+            VoiceBroadcastState.PAUSED -> pauseRecord()
+            VoiceBroadcastState.RESUMED -> resumeRecord()
+            VoiceBroadcastState.STOPPED,
+            null -> stopRecord()
+        }
+    }
+
+    private fun onMaxFileSizeApproaching(roomId: String) {
+        setNextOutputFile(roomId)
+    }
+
+    private fun onNextOutputFileStarted() {
+        notifyOutputFileCreated()
+        currentSequence++
+    }
+
+    private fun notifyOutputFileCreated() {
+        outputFile?.let { file ->
+            listeners.forEach { it.onVoiceMessageCreated(file, currentSequence) }
+            outputFile = nextOutputFile
+            nextOutputFile = null
+        }
+    }
+
+    private fun onElapsedTimeUpdated(elapsedTimeMillis: Long) {
+        currentRemainingTime = if (currentMaxLength > 0 && recordingState != VoiceBroadcastRecorder.State.Idle) {
+            val currentMaxLengthMillis = TimeUnit.SECONDS.toMillis(currentMaxLength.toLong())
+            val remainingTimeMillis = currentMaxLengthMillis - elapsedTimeMillis
+            TimeUnit.MILLISECONDS.toSeconds(remainingTimeMillis)
+        } else {
+            null
+        }
+    }
+
+    private inner class RecordingTicker(
+            private var recordingTicker: CountUpTimer? = null,
+    ) {
+        fun start() {
+            recordingTicker?.stop()
+            recordingTicker = CountUpTimer().apply {
+                tickListener = CountUpTimer.TickListener { onTick(elapsedTime()) }
+                resume()
+                onTick(elapsedTime())
+            }
+        }
+
+        fun pause() {
+            recordingTicker?.apply {
+                pause()
+                onTick(elapsedTime())
+            }
+        }
+
+        fun resume() {
+            recordingTicker?.apply {
+                resume()
+                onTick(elapsedTime())
+            }
+        }
+
+        fun stop() {
+            recordingTicker?.apply {
+                stop()
+                onTick(elapsedTime())
+                recordingTicker = null
+            }
+        }
+
+        private fun onTick(elapsedTimeMillis: Long) {
+            onElapsedTimeUpdated(elapsedTimeMillis)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/PauseVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/PauseVoiceBroadcastUseCase.kt
new file mode 100644
index 0000000000..0b22d7adf5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/PauseVoiceBroadcastUseCase.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.recording.usecase
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import timber.log.Timber
+import javax.inject.Inject
+
+class PauseVoiceBroadcastUseCase @Inject constructor(
+        private val session: Session,
+        private val voiceBroadcastRecorder: VoiceBroadcastRecorder?,
+) {
+
+    suspend fun execute(roomId: String): Result<Unit> = runCatching {
+        val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
+
+        Timber.d("## PauseVoiceBroadcastUseCase: Pause voice broadcast requested")
+
+        val lastVoiceBroadcastEvent = room.stateService().getStateEvent(
+                VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                QueryStringValue.Equals(session.myUserId)
+        )?.asVoiceBroadcastEvent()
+        when (val voiceBroadcastState = lastVoiceBroadcastEvent?.content?.voiceBroadcastState) {
+            VoiceBroadcastState.STARTED,
+            VoiceBroadcastState.RESUMED -> pauseVoiceBroadcast(room, lastVoiceBroadcastEvent.reference)
+            else -> Timber.d("## PauseVoiceBroadcastUseCase: Cannot pause voice broadcast: currentState=$voiceBroadcastState")
+        }
+    }
+
+    private suspend fun pauseVoiceBroadcast(room: Room, reference: RelationDefaultContent?) {
+        Timber.d("## PauseVoiceBroadcastUseCase: Send new voice broadcast info state event")
+
+        // save the last sequence number and immediately pause the recording
+        val lastSequence = voiceBroadcastRecorder?.currentSequence
+        pauseRecording()
+
+        room.stateService().sendStateEvent(
+                eventType = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                stateKey = session.myUserId,
+                body = MessageVoiceBroadcastInfoContent(
+                        relatesTo = reference,
+                        voiceBroadcastStateStr = VoiceBroadcastState.PAUSED.value,
+                        lastChunkSequence = lastSequence,
+                ).toContent(),
+        )
+    }
+
+    private fun pauseRecording() {
+        voiceBroadcastRecorder?.pauseRecord()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/ResumeVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/ResumeVoiceBroadcastUseCase.kt
new file mode 100644
index 0000000000..5be726c03e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/ResumeVoiceBroadcastUseCase.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.recording.usecase
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import timber.log.Timber
+import javax.inject.Inject
+
+class ResumeVoiceBroadcastUseCase @Inject constructor(
+        private val session: Session,
+) {
+
+    suspend fun execute(roomId: String): Result<Unit> = runCatching {
+        val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
+
+        Timber.d("## ResumeVoiceBroadcastUseCase: Resume voice broadcast requested")
+
+        val lastVoiceBroadcastEvent = room.stateService().getStateEvent(
+                VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                QueryStringValue.Equals(session.myUserId)
+        )?.asVoiceBroadcastEvent()
+        when (val voiceBroadcastState = lastVoiceBroadcastEvent?.content?.voiceBroadcastState) {
+            VoiceBroadcastState.PAUSED -> resumeVoiceBroadcast(room, lastVoiceBroadcastEvent.reference)
+            else -> Timber.d("## ResumeVoiceBroadcastUseCase: Cannot resume voice broadcast: currentState=$voiceBroadcastState")
+        }
+    }
+
+    /**
+     * Resume a paused voice broadcast in the given room.
+     *
+     * @param room the room related to the voice broadcast
+     * @param reference reference on the initial voice broadcast state event (ie. state=STARTED)
+     */
+    private suspend fun resumeVoiceBroadcast(room: Room, reference: RelationDefaultContent?) {
+        Timber.d("## ResumeVoiceBroadcastUseCase: Send new voice broadcast info state event")
+        room.stateService().sendStateEvent(
+                eventType = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                stateKey = session.myUserId,
+                body = MessageVoiceBroadcastInfoContent(
+                        relatesTo = reference,
+                        voiceBroadcastStateStr = VoiceBroadcastState.RESUMED.value,
+                ).toContent(),
+        )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/StartVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/StartVoiceBroadcastUseCase.kt
new file mode 100644
index 0000000000..87ea49cece
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/StartVoiceBroadcastUseCase.kt
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.recording.usecase
+
+import android.content.Context
+import androidx.core.content.FileProvider
+import im.vector.app.core.resources.BuildMeta
+import im.vector.app.features.attachments.toContentAttachmentData
+import im.vector.app.features.session.coroutineScope
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.VoiceBroadcastFailure
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastChunk
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import im.vector.app.features.voicebroadcast.usecase.GetRoomLiveVoiceBroadcastsUseCase
+import im.vector.lib.multipicker.utils.toMultiPickerAudioType
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import org.jetbrains.annotations.VisibleForTesting
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.getStateEvent
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.flow.flow
+import org.matrix.android.sdk.flow.unwrap
+import timber.log.Timber
+import java.io.File
+import javax.inject.Inject
+
+class StartVoiceBroadcastUseCase @Inject constructor(
+        private val session: Session,
+        private val voiceBroadcastRecorder: VoiceBroadcastRecorder?,
+        private val context: Context,
+        private val buildMeta: BuildMeta,
+        private val getRoomLiveVoiceBroadcastsUseCase: GetRoomLiveVoiceBroadcastsUseCase,
+        private val stopVoiceBroadcastUseCase: StopVoiceBroadcastUseCase,
+) {
+
+    suspend fun execute(roomId: String): Result<Unit> = runCatching {
+        val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
+
+        Timber.d("## StartVoiceBroadcastUseCase: Start voice broadcast requested")
+
+        assertCanStartVoiceBroadcast(room)
+        startVoiceBroadcast(room)
+        return Result.success(Unit)
+    }
+
+    private suspend fun startVoiceBroadcast(room: Room) {
+        Timber.d("## StartVoiceBroadcastUseCase: Send new voice broadcast info state event")
+        val chunkLength = VoiceBroadcastConstants.DEFAULT_CHUNK_LENGTH_IN_SECONDS // Todo Get the chunk length from the room settings
+        val maxLength = VoiceBroadcastConstants.MAX_VOICE_BROADCAST_LENGTH_IN_SECONDS // Todo Get the max length from the room settings
+        val eventId = room.stateService().sendStateEvent(
+                eventType = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                stateKey = session.myUserId,
+                body = MessageVoiceBroadcastInfoContent(
+                        deviceId = session.sessionParams.deviceId,
+                        voiceBroadcastStateStr = VoiceBroadcastState.STARTED.value,
+                        chunkLength = chunkLength,
+                ).toContent()
+        )
+
+        val voiceBroadcast = VoiceBroadcast(roomId = room.roomId, voiceBroadcastId = eventId)
+
+        // TODO Update unit test to cover the following line
+        room.flow().liveTimelineEvent(eventId).unwrap().first() // wait for the event come back from the sync
+
+        startRecording(room, voiceBroadcast, chunkLength, maxLength)
+    }
+
+    private fun startRecording(room: Room, voiceBroadcast: VoiceBroadcast, chunkLength: Int, maxLength: Int) {
+        voiceBroadcastRecorder?.addListener(object : VoiceBroadcastRecorder.Listener {
+            override fun onVoiceMessageCreated(file: File, sequence: Int) {
+                sendVoiceFile(room, file, voiceBroadcast, sequence)
+            }
+
+            override fun onRemainingTimeUpdated(remainingTime: Long?) {
+                if (remainingTime != null && remainingTime <= 0) {
+                    session.coroutineScope.launch { stopVoiceBroadcastUseCase.execute(room.roomId) }
+                }
+            }
+        })
+        voiceBroadcastRecorder?.startRecordVoiceBroadcast(voiceBroadcast, chunkLength, maxLength)
+    }
+
+    private fun sendVoiceFile(room: Room, voiceMessageFile: File, voiceBroadcast: VoiceBroadcast, sequence: Int) {
+        val outputFileUri = FileProvider.getUriForFile(
+                context,
+                buildMeta.applicationId + ".fileProvider",
+                voiceMessageFile,
+                "Voice Broadcast Part ($sequence).${voiceMessageFile.extension}"
+        )
+        val audioType = outputFileUri.toMultiPickerAudioType(context) ?: return
+        room.sendService().sendMedia(
+                attachment = audioType.toContentAttachmentData(isVoiceMessage = true),
+                compressBeforeSending = false,
+                roomIds = emptySet(),
+                relatesTo = RelationDefaultContent(RelationType.REFERENCE, voiceBroadcast.voiceBroadcastId),
+                additionalContent = mapOf(
+                        VoiceBroadcastConstants.VOICE_BROADCAST_CHUNK_KEY to VoiceBroadcastChunk(sequence = sequence).toContent()
+                )
+        )
+    }
+
+    private fun assertCanStartVoiceBroadcast(room: Room) {
+        assertHasEnoughPowerLevels(room)
+        assertNoOngoingVoiceBroadcast(room)
+    }
+
+    @VisibleForTesting
+    fun assertHasEnoughPowerLevels(room: Room) {
+        val powerLevelsHelper = room.getStateEvent(EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.IsEmpty)
+                ?.content
+                ?.toModel<PowerLevelsContent>()
+                ?.let { PowerLevelsHelper(it) }
+
+        if (powerLevelsHelper?.isUserAllowedToSend(session.myUserId, true, VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO) != true) {
+            Timber.d("## StartVoiceBroadcastUseCase: Cannot start voice broadcast: no permission")
+            throw VoiceBroadcastFailure.RecordingError.NoPermission
+        }
+    }
+
+    @VisibleForTesting
+    fun assertNoOngoingVoiceBroadcast(room: Room) {
+        when {
+            voiceBroadcastRecorder?.recordingState == VoiceBroadcastRecorder.State.Recording ||
+                    voiceBroadcastRecorder?.recordingState == VoiceBroadcastRecorder.State.Paused -> {
+                Timber.d("## StartVoiceBroadcastUseCase: Cannot start voice broadcast: another voice broadcast")
+                throw VoiceBroadcastFailure.RecordingError.UserAlreadyBroadcasting
+            }
+            getRoomLiveVoiceBroadcastsUseCase.execute(room.roomId).isNotEmpty() -> {
+                Timber.d("## StartVoiceBroadcastUseCase: Cannot start voice broadcast: user already broadcasting")
+                throw VoiceBroadcastFailure.RecordingError.BlockedBySomeoneElse
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/StopOngoingVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/StopOngoingVoiceBroadcastUseCase.kt
new file mode 100644
index 0000000000..fdbf1a067d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/StopOngoingVoiceBroadcastUseCase.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.recording.usecase
+
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.voicebroadcast.VoiceBroadcastHelper
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.usecase.GetRoomLiveVoiceBroadcastsUseCase
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * Stop ongoing voice broadcast if any.
+ */
+class StopOngoingVoiceBroadcastUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val getRoomLiveVoiceBroadcastsUseCase: GetRoomLiveVoiceBroadcastsUseCase,
+        private val voiceBroadcastHelper: VoiceBroadcastHelper,
+) {
+
+    suspend fun execute() {
+        Timber.d("## StopOngoingVoiceBroadcastUseCase: Stop ongoing voice broadcast requested")
+
+        val session = activeSessionHolder.getSafeActiveSession() ?: run {
+            Timber.w("## StopOngoingVoiceBroadcastUseCase: no active session")
+            return
+        }
+        // FIXME Iterate only on recent rooms for the moment, improve this
+        val recentRooms = session.roomService()
+                .getBreadcrumbs(roomSummaryQueryParams {
+                    displayName = QueryStringValue.NoCondition
+                    memberships = listOf(Membership.JOIN)
+                })
+                .mapNotNull { session.getRoom(it.roomId) }
+
+        recentRooms
+                .forEach { room ->
+                    val ongoingVoiceBroadcasts = getRoomLiveVoiceBroadcastsUseCase.execute(room.roomId)
+                    val myOngoingVoiceBroadcastId = ongoingVoiceBroadcasts.find { it.root.stateKey == session.myUserId }?.reference?.eventId
+                    val initialEvent = myOngoingVoiceBroadcastId?.let { room.timelineService().getTimelineEvent(it)?.root?.asVoiceBroadcastEvent() }
+                    if (myOngoingVoiceBroadcastId != null && initialEvent?.content?.deviceId == session.sessionParams.deviceId) {
+                        voiceBroadcastHelper.stopVoiceBroadcast(room.roomId)
+                        return // No need to iterate more as we should not have more than one recording VB
+                    }
+                }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/StopVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/StopVoiceBroadcastUseCase.kt
new file mode 100644
index 0000000000..b93bd346db
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/recording/usecase/StopVoiceBroadcastUseCase.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.recording.usecase
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import timber.log.Timber
+import javax.inject.Inject
+
+class StopVoiceBroadcastUseCase @Inject constructor(
+        private val session: Session,
+        private val voiceBroadcastRecorder: VoiceBroadcastRecorder?,
+) {
+
+    suspend fun execute(roomId: String): Result<Unit> = runCatching {
+        val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
+
+        Timber.d("## StopVoiceBroadcastUseCase: Stop voice broadcast requested")
+
+        val lastVoiceBroadcastEvent = room.stateService().getStateEvent(
+                VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                QueryStringValue.Equals(session.myUserId)
+        )?.asVoiceBroadcastEvent()
+        when (val voiceBroadcastState = lastVoiceBroadcastEvent?.content?.voiceBroadcastState) {
+            VoiceBroadcastState.STARTED,
+            VoiceBroadcastState.PAUSED,
+            VoiceBroadcastState.RESUMED -> stopVoiceBroadcast(room, lastVoiceBroadcastEvent.reference)
+            else -> Timber.d("## StopVoiceBroadcastUseCase: Cannot stop voice broadcast: currentState=$voiceBroadcastState")
+        }
+    }
+
+    private suspend fun stopVoiceBroadcast(room: Room, reference: RelationDefaultContent?) {
+        Timber.d("## StopVoiceBroadcastUseCase: Send new voice broadcast info state event")
+
+        // save the last sequence number and immediately stop the recording
+        val lastSequence = voiceBroadcastRecorder?.currentSequence
+        stopRecording()
+
+        room.stateService().sendStateEvent(
+                eventType = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                stateKey = session.myUserId,
+                body = MessageVoiceBroadcastInfoContent(
+                        relatesTo = reference,
+                        voiceBroadcastStateStr = VoiceBroadcastState.STOPPED.value,
+                        lastChunkSequence = lastSequence,
+                ).toContent(),
+        )
+    }
+
+    private fun stopRecording() {
+        voiceBroadcastRecorder?.stopRecord()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetRoomLiveVoiceBroadcastsUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetRoomLiveVoiceBroadcastsUseCase.kt
new file mode 100644
index 0000000000..fa5f06bfe6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetRoomLiveVoiceBroadcastsUseCase.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.usecase
+
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.isLive
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.getRoom
+import javax.inject.Inject
+
+class GetRoomLiveVoiceBroadcastsUseCase @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+
+    fun execute(roomId: String): List<VoiceBroadcastEvent> {
+        val session = activeSessionHolder.getSafeActiveSession() ?: return emptyList()
+        val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
+
+        return room.stateService().getStateEvents(
+                setOf(VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO),
+                QueryStringValue.IsNotEmpty
+        )
+                .mapNotNull { it.asVoiceBroadcastEvent() }
+                .filter { it.isLive }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateEventLiveUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateEventLiveUseCase.kt
new file mode 100644
index 0000000000..b3bbdad635
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateEventLiveUseCase.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.usecase
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcast
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.voiceBroadcastId
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.transformWhile
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.flow.flow
+import org.matrix.android.sdk.flow.mapOptional
+import timber.log.Timber
+import javax.inject.Inject
+
+class GetVoiceBroadcastStateEventLiveUseCase @Inject constructor(
+        private val session: Session,
+) {
+
+    fun execute(voiceBroadcast: VoiceBroadcast): Flow<Optional<VoiceBroadcastEvent>> {
+        val room = session.getRoom(voiceBroadcast.roomId) ?: error("Unknown roomId: ${voiceBroadcast.roomId}")
+        return getMostRecentVoiceBroadcastEventFlow(room, voiceBroadcast)
+                .onEach { event ->
+                    Timber.d(
+                            "## VoiceBroadcast | " +
+                                    "voiceBroadcastId=${event.getOrNull()?.voiceBroadcastId}, " +
+                                    "state=${event.getOrNull()?.content?.voiceBroadcastState}"
+                    )
+                }
+    }
+
+    /**
+     * Get a flow of the most recent event for the given voice broadcast.
+     */
+    private fun getMostRecentVoiceBroadcastEventFlow(room: Room, voiceBroadcast: VoiceBroadcast): Flow<Optional<VoiceBroadcastEvent>> {
+        val startedEventFlow = room.flow().liveTimelineEvent(voiceBroadcast.voiceBroadcastId)
+        // observe started event changes
+        return startedEventFlow
+                .mapOptional { it.root.asVoiceBroadcastEvent() }
+                .flatMapLatest { startedEvent ->
+                    if (startedEvent.hasValue().not() || startedEvent.get().root.isRedacted()) {
+                        // if started event is null or redacted, send null
+                        flowOf(Optional.empty())
+                    } else {
+                        // otherwise, observe most recent event changes
+                        getMostRecentRelatedEventFlow(room, voiceBroadcast)
+                                .transformWhile { mostRecentEvent ->
+                                    val hasValue = mostRecentEvent.hasValue()
+                                    if (hasValue) {
+                                        // keep the most recent event
+                                        emit(mostRecentEvent)
+                                    } else {
+                                        // no most recent event, fallback to started event
+                                        emit(startedEvent)
+                                    }
+                                    hasValue
+                                }
+                    }
+                }
+                .distinctUntilChangedBy { it.getOrNull()?.content?.voiceBroadcastState }
+    }
+
+    /**
+     * Get a flow of the most recent related event.
+     */
+    private fun getMostRecentRelatedEventFlow(room: Room, voiceBroadcast: VoiceBroadcast): Flow<Optional<VoiceBroadcastEvent>> {
+        val mostRecentEvent = getMostRecentRelatedEvent(room, voiceBroadcast).toOptional()
+        return if (mostRecentEvent.hasValue()) {
+            val stateKey = mostRecentEvent.get().root.stateKey.orEmpty()
+            // observe incoming voice broadcast state events
+            room.flow()
+                    .liveStateEvent(VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO, QueryStringValue.Equals(stateKey))
+                    .mapOptional { it.asVoiceBroadcastEvent() }
+                    // drop first event sent by the matrix-sdk, we compute manually this first event
+                    .drop(1)
+                    // start with the computed most recent event
+                    .onStart { emit(mostRecentEvent) }
+                    // handle event if null or related to the given voice broadcast
+                    .filter { it.hasValue().not() || it.get().voiceBroadcastId == voiceBroadcast.voiceBroadcastId }
+                    // observe changes while event is not null
+                    .transformWhile { event ->
+                        emit(event)
+                        event.hasValue()
+                    }
+                    .flatMapLatest { newMostRecentEvent ->
+                        if (newMostRecentEvent.hasValue()) {
+                            // observe most recent event changes
+                            newMostRecentEvent.get().flow()
+                                    .transformWhile { event ->
+                                        // observe changes until event is null or redacted
+                                        emit(event)
+                                        event.hasValue() && event.get().root.isRedacted().not()
+                                    }
+                                    .flatMapLatest { event ->
+                                        val isRedactedOrNull = !event.hasValue() || event.get().root.isRedacted()
+                                        if (isRedactedOrNull) {
+                                            // event is null or redacted, switch to the latest not redacted event
+                                            getMostRecentRelatedEventFlow(room, voiceBroadcast)
+                                        } else {
+                                            // event is not redacted, send the event
+                                            flowOf(event)
+                                        }
+                                    }
+                        } else {
+                            // there is no more most recent event, just send it
+                            flowOf(newMostRecentEvent)
+                        }
+                    }
+        } else {
+            // there is no more most recent event, just send it
+            flowOf(mostRecentEvent)
+        }
+    }
+
+    /**
+     * Get the most recent event related to the given voice broadcast.
+     */
+    private fun getMostRecentRelatedEvent(room: Room, voiceBroadcast: VoiceBroadcast): VoiceBroadcastEvent? {
+        return room.timelineService().getTimelineEventsRelatedTo(RelationType.REFERENCE, voiceBroadcast.voiceBroadcastId)
+                .mapNotNull { timelineEvent -> timelineEvent.root.asVoiceBroadcastEvent()?.takeUnless { it.root.isRedacted() } }
+                .maxByOrNull { it.root.originServerTs ?: 0 }
+    }
+
+    /**
+     * Get a flow of the given voice broadcast event changes.
+     */
+    private fun VoiceBroadcastEvent.flow(): Flow<Optional<VoiceBroadcastEvent>> {
+        val room = this.root.roomId?.let { session.getRoom(it) } ?: return flowOf(Optional.empty())
+        return room.flow().liveTimelineEvent(root.eventId!!).mapOptional { it.root.asVoiceBroadcastEvent() }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/views/VoiceBroadcastBufferingView.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/views/VoiceBroadcastBufferingView.kt
new file mode 100644
index 0000000000..eabefa323e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/views/VoiceBroadcastBufferingView.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import im.vector.app.databinding.ViewVoiceBroadcastBufferingBinding
+
+class VoiceBroadcastBufferingView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
+
+    init {
+        ViewVoiceBroadcastBufferingBinding.inflate(
+                LayoutInflater.from(context),
+                this
+        )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/views/VoiceBroadcastMetadataView.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/views/VoiceBroadcastMetadataView.kt
new file mode 100644
index 0000000000..c743d8a542
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/views/VoiceBroadcastMetadataView.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.views
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import androidx.core.content.res.use
+import im.vector.app.R
+import im.vector.app.databinding.ViewVoiceBroadcastMetadataBinding
+
+class VoiceBroadcastMetadataView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
+
+    private val views = ViewVoiceBroadcastMetadataBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+
+    var value: String
+        get() = views.metadataText.text.toString()
+        set(newValue) {
+            views.metadataText.text = newValue
+        }
+
+    init {
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.VoiceBroadcastMetadataView,
+                0,
+                0
+        ).use {
+            setIcon(it)
+            setValue(it)
+        }
+    }
+
+    private fun setIcon(typedArray: TypedArray) {
+        val icon = typedArray.getDrawable(R.styleable.VoiceBroadcastMetadataView_metadataIcon)
+        views.metadataIcon.setImageDrawable(icon)
+    }
+
+    private fun setValue(typedArray: TypedArray) {
+        val value = typedArray.getString(R.styleable.VoiceBroadcastMetadataView_metadataValue)
+        views.metadataText.text = value
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
index 0678d5143d..6f60ed9958 100644
--- a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
@@ -21,11 +21,10 @@ import android.content.Intent
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityVectorWebViewBinding
+import im.vector.lib.core.utils.compat.getSerializableCompat
 import org.matrix.android.sdk.api.session.Session
-import javax.inject.Inject
 
 /**
  * This class is responsible for managing a WebView
@@ -38,7 +37,6 @@ class VectorWebViewActivity : VectorBaseActivity<ActivityVectorWebViewBinding>()
 
     override fun getBinding() = ActivityVectorWebViewBinding.inflate(layoutInflater)
 
-    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     val session: Session by lazy {
         activeSessionHolder.getActiveSession()
     }
@@ -79,7 +77,7 @@ class VectorWebViewActivity : VectorBaseActivity<ActivityVectorWebViewBinding>()
             setTitle(title)
         }
 
-        val webViewMode = intent.extras?.getSerializable(EXTRA_MODE) as WebViewMode
+        val webViewMode = intent.extras?.getSerializableCompat<WebViewMode>(EXTRA_MODE)!!
         val eventListener = webViewMode.eventListener(this, session)
         views.simpleWebview.webViewClient = VectorWebViewClient(eventListener)
         views.simpleWebview.webChromeClient = object : WebChromeClient() {
@@ -100,6 +98,7 @@ class VectorWebViewActivity : VectorBaseActivity<ActivityVectorWebViewBinding>()
         if (views.simpleWebview.canGoBack()) {
             views.simpleWebview.goBack()
         } else {
+            @Suppress("DEPRECATION")
             super.onBackPressed()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
index 91aa3a4e6a..eeb3959ef8 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
@@ -39,14 +39,14 @@ import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityWidgetBinding
-import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet
 import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewEvents
 import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewModel
+import im.vector.lib.core.utils.compat.getParcelableCompat
+import im.vector.lib.core.utils.compat.getSerializableCompat
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Content
 import java.io.Serializable
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class WidgetActivity : VectorBaseActivity<ActivityWidgetBinding>() {
@@ -68,7 +68,7 @@ class WidgetActivity : VectorBaseActivity<ActivityWidgetBinding>() {
 
         @Suppress("UNCHECKED_CAST")
         fun getOutput(intent: Intent): Content? {
-            return intent.extras?.getSerializable(EXTRA_RESULT) as? Content
+            return intent.extras?.getSerializableCompat(EXTRA_RESULT) as? Content
         }
 
         private fun createResultIntent(content: Content): Intent {
@@ -81,14 +81,12 @@ class WidgetActivity : VectorBaseActivity<ActivityWidgetBinding>() {
     private val viewModel: WidgetViewModel by viewModel()
     private val permissionViewModel: RoomWidgetPermissionViewModel by viewModel()
 
-    @Inject lateinit var vectorPreferences: VectorPreferences
-
     override fun getBinding() = ActivityWidgetBinding.inflate(layoutInflater)
 
     override fun getTitleRes() = R.string.room_widget_activity_title
 
     override fun initUiAndData() {
-        val widgetArgs: WidgetArgs? = intent?.extras?.getParcelable(Mavericks.KEY_ARG)
+        val widgetArgs: WidgetArgs? = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG)
         if (widgetArgs == null) {
             finish()
             return
@@ -150,7 +148,7 @@ class WidgetActivity : VectorBaseActivity<ActivityWidgetBinding>() {
 
     override fun onUserLeaveHint() {
         super.onUserLeaveHint()
-        val widgetArgs: WidgetArgs? = intent?.extras?.getParcelable(Mavericks.KEY_ARG)
+        val widgetArgs: WidgetArgs? = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG)
         if (widgetArgs?.kind?.supportsPictureInPictureMode().orFalse()) {
             enterPictureInPicture()
         }
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
index ed1bace70c..944ee627d7 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
@@ -38,6 +38,7 @@ import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.OnBackPressed
@@ -51,6 +52,7 @@ import im.vector.app.features.webview.WebEventListener
 import im.vector.app.features.widgets.webview.WebviewPermissionUtils
 import im.vector.app.features.widgets.webview.clearAfterWidget
 import im.vector.app.features.widgets.webview.setupForWidget
+import im.vector.lib.core.utils.compat.resolveActivityCompat
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.terms.TermsService
 import timber.log.Timber
@@ -66,16 +68,17 @@ data class WidgetArgs(
         val urlParams: Map<String, String> = emptyMap()
 ) : Parcelable
 
-class WidgetFragment @Inject constructor(
-        private val permissionUtils: WebviewPermissionUtils,
-        private val checkWebViewPermissionsUseCase: CheckWebViewPermissionsUseCase,
-        private val vectorPreferences: VectorPreferences,
-) :
+@AndroidEntryPoint
+class WidgetFragment :
         VectorBaseFragment<FragmentRoomWidgetBinding>(),
         WebEventListener,
         OnBackPressed,
         VectorMenuProvider {
 
+    @Inject lateinit var permissionUtils: WebviewPermissionUtils
+    @Inject lateinit var checkWebViewPermissionsUseCase: CheckWebViewPermissionsUseCase
+    @Inject lateinit var vectorPreferences: VectorPreferences
+
     private val fragmentArgs: WidgetArgs by args()
     private val viewModel: WidgetViewModel by activityViewModel()
 
@@ -262,7 +265,7 @@ class WidgetFragment @Inject constructor(
                 val intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME)
                 if (intent != null) {
                     val packageManager: PackageManager = context.packageManager
-                    val info = packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY)
+                    val info = packageManager.resolveActivityCompat(intent, PackageManager.MATCH_DEFAULT_ONLY)
                     if (info != null) {
                         context.startActivity(intent)
                     } else {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
index ac9930866f..254a7f97f5 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.widgets.webview
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.view.ViewGroup
 import android.webkit.CookieManager
@@ -29,7 +28,6 @@ import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.webview.VectorWebViewClient
 import im.vector.app.features.webview.WebEventListener
 
-@SuppressLint("NewApi")
 fun WebView.setupForWidget(activity: Activity,
                            checkWebViewPermissionsUseCase: CheckWebViewPermissionsUseCase,
                            eventListener: WebEventListener,
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusAction.kt b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusAction.kt
new file mode 100644
index 0000000000..2c59a80964
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusAction.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.workers.signout
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed interface ServerBackupStatusAction : VectorViewModelAction {
+    data class OnRecoverDoneForVersion(val version: String) : ServerBackupStatusAction
+    object OnBannerDisplayed : ServerBackupStatusAction
+    object OnBannerClosed : ServerBackupStatusAction
+}
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
index d2a4b3193a..81cf48a832 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
@@ -16,6 +16,8 @@
 
 package im.vector.app.features.workers.signout
 
+import android.content.SharedPreferences
+import androidx.core.content.edit
 import androidx.lifecycle.MutableLiveData
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MavericksState
@@ -24,9 +26,9 @@ import com.airbnb.mvrx.Uninitialized
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.core.di.DefaultPreferences
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
-import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -51,29 +53,55 @@ data class ServerBackupStatusViewState(
  * The state representing the view.
  * It can take one state at a time.
  */
-sealed class BannerState {
+sealed interface BannerState {
+    // Not yet rendered
+    object Initial : BannerState
 
-    object Hidden : BannerState()
+    // View will be Gone
+    object Hidden : BannerState
 
     // Keys backup is not setup, numberOfKeys is the number of locally stored keys
-    data class Setup(val numberOfKeys: Int) : BannerState()
+    data class Setup(val numberOfKeys: Int, val doNotShowAgain: Boolean) : BannerState
+
+    // Keys backup can be recovered, with version from the server
+    data class Recover(val version: String, val doNotShowForVersion: String) : BannerState
+
+    // Keys backup can be updated
+    data class Update(val version: String, val doNotShowForVersion: String) : BannerState
 
     // Keys are backing up
-    object BackingUp : BannerState()
+    object BackingUp : BannerState
 }
 
 class ServerBackupStatusViewModel @AssistedInject constructor(
         @Assisted initialState: ServerBackupStatusViewState,
-        private val session: Session
+        private val session: Session,
+        @DefaultPreferences
+        private val sharedPreferences: SharedPreferences,
 ) :
-        VectorViewModel<ServerBackupStatusViewState, EmptyAction, EmptyViewEvents>(initialState), KeysBackupStateListener {
+        VectorViewModel<ServerBackupStatusViewState, ServerBackupStatusAction, EmptyViewEvents>(initialState), KeysBackupStateListener {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<ServerBackupStatusViewModel, ServerBackupStatusViewState> {
         override fun create(initialState: ServerBackupStatusViewState): ServerBackupStatusViewModel
     }
 
-    companion object : MavericksViewModelFactory<ServerBackupStatusViewModel, ServerBackupStatusViewState> by hiltMavericksViewModelFactory()
+    companion object : MavericksViewModelFactory<ServerBackupStatusViewModel, ServerBackupStatusViewState> by hiltMavericksViewModelFactory() {
+        /**
+         * Preference key for setup. Value is a boolean.
+         */
+        private const val BANNER_SETUP_DO_NOT_SHOW_AGAIN = "BANNER_SETUP_DO_NOT_SHOW_AGAIN"
+
+        /**
+         * Preference key for recover. Value is a backup version (String).
+         */
+        private const val BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION = "BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION"
+
+        /**
+         * Preference key for update. Value is a backup version (String).
+         */
+        private const val BANNER_UPDATE_DO_NOT_SHOW_FOR_VERSION = "BANNER_UPDATE_DO_NOT_SHOW_FOR_VERSION"
+    }
 
     // Keys exported manually
     val keysExportedToFile = MutableLiveData<Boolean>()
@@ -105,7 +133,10 @@ class ServerBackupStatusViewModel @AssistedInject constructor(
                             pInfo.getOrNull()?.allKnown().orFalse())
             ) {
                 // So 4S is not setup and we have local secrets,
-                return@combine BannerState.Setup(numberOfKeys = getNumberOfKeysToBackup())
+                return@combine BannerState.Setup(
+                        numberOfKeys = getNumberOfKeysToBackup(),
+                        doNotShowAgain = sharedPreferences.getBoolean(BANNER_SETUP_DO_NOT_SHOW_AGAIN, false)
+                )
             }
             BannerState.Hidden
         }
@@ -161,5 +192,47 @@ class ServerBackupStatusViewModel @AssistedInject constructor(
         }
     }
 
-    override fun handle(action: EmptyAction) {}
+    override fun handle(action: ServerBackupStatusAction) {
+        when (action) {
+            is ServerBackupStatusAction.OnRecoverDoneForVersion -> handleOnRecoverDoneForVersion(action)
+            ServerBackupStatusAction.OnBannerDisplayed -> handleOnBannerDisplayed()
+            ServerBackupStatusAction.OnBannerClosed -> handleOnBannerClosed()
+        }
+    }
+
+    private fun handleOnRecoverDoneForVersion(action: ServerBackupStatusAction.OnRecoverDoneForVersion) {
+        sharedPreferences.edit {
+            putString(BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION, action.version)
+        }
+    }
+
+    private fun handleOnBannerDisplayed() {
+        sharedPreferences.edit {
+            putBoolean(BANNER_SETUP_DO_NOT_SHOW_AGAIN, false)
+            putString(BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION, "")
+        }
+    }
+
+    private fun handleOnBannerClosed() = withState { state ->
+        when (val bannerState = state.bannerState()) {
+            is BannerState.Setup -> {
+                sharedPreferences.edit {
+                    putBoolean(BANNER_SETUP_DO_NOT_SHOW_AGAIN, true)
+                }
+            }
+            is BannerState.Recover -> {
+                sharedPreferences.edit {
+                    putString(BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION, bannerState.version)
+                }
+            }
+            is BannerState.Update -> {
+                sharedPreferences.edit {
+                    putString(BANNER_UPDATE_DO_NOT_SHOW_FOR_VERSION, bannerState.version)
+                }
+            }
+            else -> {
+                // Should not happen, close button is not displayed in other cases
+            }
+        }
+    }
 }
diff --git a/vector/src/main/res/color/selector_rich_text_menu_icon.xml b/vector/src/main/res/color/selector_rich_text_menu_icon.xml
new file mode 100644
index 0000000000..0d8789d6c5
--- /dev/null
+++ b/vector/src/main/res/color/selector_rich_text_menu_icon.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="?attr/vctr_content_quinary" />
+    <item android:state_pressed="true" android:color="?attr/colorSecondary" />
+    <item android:state_hovered="true" android:color="?attr/colorSecondary" />
+    <item android:state_selected="true" android:color="?attr/colorSecondary" />
+    <item android:color="?attr/vctr_content_tertiary" />
+</selector>
diff --git a/vector/src/main/res/drawable-hdpi/ic_status_bar.png b/vector/src/main/res/drawable-hdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-hdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/vector/src/main/res/drawable-hdpi/ill_app_layout_onboarding_rooms.webp b/vector/src/main/res/drawable-hdpi/ill_app_layout_onboarding_rooms.webp
new file mode 100644
index 0000000000..5ac890e617
Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/ill_app_layout_onboarding_rooms.webp differ
diff --git a/vector/src/main/res/drawable-hdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-hdpi/ill_app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..f1fe6c70b7
Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/ill_app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/drawable-hdpi/ill_empty_all_chats.webp b/vector/src/main/res/drawable-hdpi/ill_empty_all_chats.webp
new file mode 100644
index 0000000000..6f5211b17e
Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/ill_empty_all_chats.webp differ
diff --git a/vector/src/main/res/drawable-hdpi/ill_empty_space.webp b/vector/src/main/res/drawable-hdpi/ill_empty_space.webp
new file mode 100644
index 0000000000..b33fe7937c
Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/ill_empty_space.webp differ
diff --git a/vector/src/main/res/drawable-hdpi/ill_empty_unreads.webp b/vector/src/main/res/drawable-hdpi/ill_empty_unreads.webp
new file mode 100644
index 0000000000..ce94823cc7
Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/ill_empty_unreads.webp differ
diff --git a/vector/src/main/res/drawable-mdpi/ic_status_bar.png b/vector/src/main/res/drawable-mdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-mdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/vector/src/main/res/drawable-mdpi/ill_app_layout_onboarding_rooms.webp b/vector/src/main/res/drawable-mdpi/ill_app_layout_onboarding_rooms.webp
new file mode 100644
index 0000000000..07ece0d947
Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/ill_app_layout_onboarding_rooms.webp differ
diff --git a/vector/src/main/res/drawable-mdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-mdpi/ill_app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..8e16d650e4
Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/ill_app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/drawable-mdpi/ill_empty_all_chats.webp b/vector/src/main/res/drawable-mdpi/ill_empty_all_chats.webp
new file mode 100644
index 0000000000..41c83c6b50
Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/ill_empty_all_chats.webp differ
diff --git a/vector/src/main/res/drawable-mdpi/ill_empty_space.webp b/vector/src/main/res/drawable-mdpi/ill_empty_space.webp
new file mode 100644
index 0000000000..379bf44b63
Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/ill_empty_space.webp differ
diff --git a/vector/src/main/res/drawable-mdpi/ill_empty_unreads.webp b/vector/src/main/res/drawable-mdpi/ill_empty_unreads.webp
new file mode 100644
index 0000000000..4209c0591d
Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/ill_empty_unreads.webp differ
diff --git a/vector/src/main/res/drawable-xhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xhdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-xhdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/vector/src/main/res/drawable-xhdpi/ill_app_layout_onboarding_rooms.webp b/vector/src/main/res/drawable-xhdpi/ill_app_layout_onboarding_rooms.webp
new file mode 100644
index 0000000000..e86bd5fe6b
Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/ill_app_layout_onboarding_rooms.webp differ
diff --git a/vector/src/main/res/drawable-xhdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-xhdpi/ill_app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..652bc6c77c
Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/ill_app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/drawable-xhdpi/ill_empty_all_chats.webp b/vector/src/main/res/drawable-xhdpi/ill_empty_all_chats.webp
new file mode 100644
index 0000000000..c8374d1160
Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/ill_empty_all_chats.webp differ
diff --git a/vector/src/main/res/drawable-xhdpi/ill_empty_space.webp b/vector/src/main/res/drawable-xhdpi/ill_empty_space.webp
new file mode 100644
index 0000000000..c6d83f16c7
Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/ill_empty_space.webp differ
diff --git a/vector/src/main/res/drawable-xhdpi/ill_empty_unreads.webp b/vector/src/main/res/drawable-xhdpi/ill_empty_unreads.webp
new file mode 100644
index 0000000000..14d2dbdf9a
Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/ill_empty_unreads.webp differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xxhdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-xxhdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/vector/src/main/res/drawable-xxhdpi/ill_app_layout_onboarding_rooms.webp b/vector/src/main/res/drawable-xxhdpi/ill_app_layout_onboarding_rooms.webp
new file mode 100644
index 0000000000..f95909eaae
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/ill_app_layout_onboarding_rooms.webp differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-xxhdpi/ill_app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..9cf1ea9187
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/ill_app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ill_empty_all_chats.webp b/vector/src/main/res/drawable-xxhdpi/ill_empty_all_chats.webp
new file mode 100644
index 0000000000..fc19311faf
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/ill_empty_all_chats.webp differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ill_empty_space.webp b/vector/src/main/res/drawable-xxhdpi/ill_empty_space.webp
new file mode 100644
index 0000000000..18b26b82ff
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/ill_empty_space.webp differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ill_empty_unreads.webp b/vector/src/main/res/drawable-xxhdpi/ill_empty_unreads.webp
new file mode 100644
index 0000000000..17127018ba
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/ill_empty_unreads.webp differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xxxhdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-xxxhdpi/ic_notification.png
diff --git a/vector/src/main/res/drawable-xxxhdpi/ill_app_layout_onboarding_rooms.webp b/vector/src/main/res/drawable-xxxhdpi/ill_app_layout_onboarding_rooms.webp
new file mode 100644
index 0000000000..cee3cf512c
Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/ill_app_layout_onboarding_rooms.webp differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-xxxhdpi/ill_app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..e7d07defe2
Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/ill_app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ill_empty_all_chats.webp b/vector/src/main/res/drawable-xxxhdpi/ill_empty_all_chats.webp
new file mode 100644
index 0000000000..e020c33543
Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/ill_empty_all_chats.webp differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ill_empty_space.webp b/vector/src/main/res/drawable-xxxhdpi/ill_empty_space.webp
new file mode 100644
index 0000000000..2c11bbafa0
Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/ill_empty_space.webp differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ill_empty_unreads.webp b/vector/src/main/res/drawable-xxxhdpi/ill_empty_unreads.webp
new file mode 100644
index 0000000000..278fbfac0b
Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/ill_empty_unreads.webp differ
diff --git a/vector/src/main/res/drawable/bg_composer_rich_bottom_sheet.xml b/vector/src/main/res/drawable/bg_composer_rich_bottom_sheet.xml
new file mode 100644
index 0000000000..47364373f7
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_composer_rich_bottom_sheet.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?android:colorBackground"/>
+    <corners android:topLeftRadius="24dp" android:topRightRadius="24dp" />
+</shape>
diff --git a/vector/src/main/res/drawable/bg_current_session.xml b/vector/src/main/res/drawable/bg_current_session.xml
new file mode 100644
index 0000000000..02728b022f
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_current_session.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/transparent" />
+
+    <stroke
+        android:width="1dp"
+        android:color="?vctr_content_quinary" />
+
+    <corners android:radius="8dp" />
+
+</shape>
diff --git a/vector/src/main/res/drawable/bg_device_type.xml b/vector/src/main/res/drawable/bg_device_type.xml
new file mode 100644
index 0000000000..dc85b723a8
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_device_type.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="oval">
+            <solid android:color="?attr/vctr_content_primary" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="?attr/colorSurface" />
+        </shape>
+    </item>
+</selector>
diff --git a/vector/src/main/res/drawable/bg_other_session.xml b/vector/src/main/res/drawable/bg_other_session.xml
new file mode 100644
index 0000000000..a0c988b8a2
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_other_session.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/rounded_rect_shape_8" android:state_selected="true" />
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+</selector>
diff --git a/vector/src/main/res/drawable/bg_rich_text_menu_button.xml b/vector/src/main/res/drawable/bg_rich_text_menu_button.xml
new file mode 100644
index 0000000000..7ac477e9f3
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_rich_text_menu_button.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_hovered="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="8dp" />
+            <solid android:color="?attr/vctr_rich_text_editor_menu_button_background" />
+        </shape>
+    </item>
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="8dp" />
+            <solid android:color="?attr/vctr_rich_text_editor_menu_button_background" />
+        </shape>
+    </item>
+    <item>
+        <ripple android:color="?attr/vctr_rich_text_editor_menu_button_background" />
+    </item>
+</selector>
diff --git a/vector/src/main/res/drawable/bg_security_recommendation_shield.xml b/vector/src/main/res/drawable/bg_security_recommendation_shield.xml
new file mode 100644
index 0000000000..3d46fd4ff6
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_security_recommendation_shield.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="?android:colorBackground" />
+
+    <corners android:radius="8dp" />
+
+</shape>
diff --git a/vector/src/main/res/drawable/bg_seek_bar.xml b/vector/src/main/res/drawable/bg_seek_bar.xml
index 0a33522dfd..eff461091e 100644
--- a/vector/src/main/res/drawable/bg_seek_bar.xml
+++ b/vector/src/main/res/drawable/bg_seek_bar.xml
@@ -13,9 +13,9 @@
             <shape
                 android:shape="line">
                 <stroke
-                    android:color="?vctr_content_tertiary"
+                    android:color="?vctr_content_secondary"
                     android:width="2dp"/>
             </shape>
         </clip>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/vector/src/main/res/drawable/bottomsheet_handle.xml b/vector/src/main/res/drawable/bottomsheet_handle.xml
new file mode 100644
index 0000000000..89ccf57ed0
--- /dev/null
+++ b/vector/src/main/res/drawable/bottomsheet_handle.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="?vctr_content_quinary"/>
+    <corners android:radius="4dp" />
+
+</shape>
diff --git a/vector/src/main/res/drawable/circle_qr_code_login_instruction_with_border.xml b/vector/src/main/res/drawable/circle_qr_code_login_instruction_with_border.xml
new file mode 100644
index 0000000000..cb99e4467c
--- /dev/null
+++ b/vector/src/main/res/drawable/circle_qr_code_login_instruction_with_border.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="ring"
+    android:innerRadius="0dp"
+    android:thicknessRatio="2"
+    android:useLevel="false">
+
+    <solid android:color="?android:colorBackground" />
+
+    <stroke
+        android:width="1dp"
+        android:color="?colorPrimary" />
+
+</shape>
diff --git a/vector/src/main/res/drawable/circle_with_border.xml b/vector/src/main/res/drawable/circle_with_border.xml
new file mode 100644
index 0000000000..7b9bad44f7
--- /dev/null
+++ b/vector/src/main/res/drawable/circle_with_border.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="ring"
+    android:innerRadius="0dp"
+    android:thicknessRatio="2"
+    android:useLevel="false">
+
+    <solid android:color="?android:colorBackground" />
+
+    <stroke
+        android:width="1dp"
+        android:color="?vctr_content_quinary" />
+
+</shape>
diff --git a/vector/src/main/res/drawable/circle_with_transparent_border.xml b/vector/src/main/res/drawable/circle_with_transparent_border.xml
new file mode 100644
index 0000000000..22b092a71e
--- /dev/null
+++ b/vector/src/main/res/drawable/circle_with_transparent_border.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="ring"
+    android:innerRadius="0dp"
+    android:thicknessRatio="2"
+    android:useLevel="false">
+
+    <solid android:color="?colorPrimary" />
+
+    <stroke
+        android:width="3dp"
+        android:color="?vctr_toolbar_background" />
+
+</shape>
diff --git a/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml b/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml
new file mode 100644
index 0000000000..3e93522b18
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_attachment_voice_broadcast.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M20.189,4.187C19.85,3.751 19.222,3.672 18.785,4.011C18.35,4.35 18.271,4.977 18.609,5.413L18.61,5.414L18.611,5.415L18.624,5.434C18.638,5.451 18.659,5.48 18.687,5.52C18.744,5.6 18.828,5.722 18.931,5.884C19.137,6.207 19.415,6.683 19.693,7.281C20.253,8.481 20.799,10.134 20.799,12.001C20.799,13.867 20.253,15.52 19.693,16.721C19.415,17.318 19.137,17.794 18.931,18.117C18.828,18.279 18.744,18.401 18.687,18.481C18.659,18.521 18.638,18.55 18.624,18.568L18.611,18.586L18.61,18.587L18.609,18.588C18.271,19.024 18.35,19.651 18.785,19.99C19.222,20.329 19.85,20.25 20.189,19.815L19.444,19.235C20.189,19.815 20.189,19.815 20.189,19.815L20.191,19.812L20.194,19.808L20.202,19.797L20.229,19.762C20.25,19.733 20.281,19.691 20.318,19.639C20.393,19.534 20.496,19.383 20.618,19.191C20.862,18.807 21.184,18.255 21.506,17.566C22.145,16.195 22.799,14.248 22.799,12.001C22.799,9.753 22.145,7.806 21.506,6.435C21.184,5.746 20.862,5.194 20.618,4.81C20.496,4.618 20.393,4.467 20.318,4.362C20.281,4.31 20.25,4.268 20.229,4.239L20.202,4.204L20.194,4.193L20.191,4.189L20.19,4.188C20.19,4.188 20.189,4.187 19.399,4.801L20.189,4.187Z"
+        android:fillColor="#737D8C" />
+    <path
+        android:pathData="M17.59,7.787C17.251,7.351 16.622,7.272 16.186,7.611C15.752,7.95 15.672,8.576 16.008,9.011L16.012,9.016C16.016,9.022 16.025,9.033 16.037,9.05C16.06,9.084 16.098,9.138 16.144,9.211C16.237,9.357 16.365,9.576 16.494,9.852C16.754,10.41 17,11.163 17,12.001C17,12.839 16.754,13.592 16.494,14.149C16.365,14.425 16.237,14.644 16.144,14.791C16.098,14.864 16.06,14.918 16.037,14.951C16.025,14.968 16.016,14.98 16.012,14.986L16.008,14.99C15.672,15.426 15.752,16.052 16.186,16.39C16.622,16.729 17.251,16.651 17.59,16.215L16.8,15.601C17.59,16.215 17.59,16.215 17.59,16.215L17.591,16.212L17.594,16.21L17.599,16.202L17.616,16.18C17.629,16.163 17.646,16.139 17.667,16.11C17.709,16.051 17.765,15.968 17.831,15.865C17.963,15.657 18.135,15.362 18.306,14.995C18.646,14.267 19,13.22 19,12.001C19,10.782 18.646,9.735 18.306,9.006C18.135,8.639 17.963,8.344 17.831,8.137C17.765,8.033 17.709,7.951 17.667,7.892C17.646,7.863 17.629,7.839 17.616,7.821L17.599,7.799L17.594,7.792L17.591,7.789L17.59,7.788C17.59,7.788 17.59,7.787 16.8,8.401L17.59,7.787Z"
+        android:fillColor="#737D8C" />
+    <path
+        android:pathData="M3.611,19.815C3.95,20.25 4.578,20.329 5.014,19.99C5.45,19.651 5.528,19.024 5.191,18.588L5.19,18.587L5.189,18.586L5.175,18.568C5.162,18.55 5.141,18.521 5.112,18.481C5.056,18.401 4.971,18.279 4.869,18.117C4.663,17.794 4.385,17.318 4.106,16.721C3.546,15.52 3,13.867 3,12C3,10.134 3.546,8.481 4.106,7.281C4.385,6.683 4.663,6.207 4.869,5.884C4.971,5.722 5.056,5.6 5.112,5.52C5.141,5.48 5.162,5.451 5.175,5.433L5.189,5.415L5.19,5.414L5.191,5.413C5.528,4.977 5.449,4.35 5.014,4.011C4.578,3.672 3.95,3.751 3.611,4.187L4.356,4.766C3.611,4.187 3.611,4.187 3.611,4.187L3.609,4.189L3.606,4.193L3.598,4.204L3.571,4.239C3.549,4.268 3.519,4.31 3.482,4.362C3.407,4.467 3.304,4.618 3.181,4.81C2.937,5.194 2.615,5.746 2.294,6.435C1.654,7.806 1,9.753 1,12C1,14.248 1.654,16.195 2.294,17.566C2.615,18.255 2.937,18.807 3.181,19.191C3.304,19.383 3.407,19.534 3.482,19.639C3.519,19.691 3.549,19.733 3.571,19.762L3.598,19.797L3.606,19.808L3.609,19.812L3.61,19.813C3.61,19.813 3.611,19.815 4.4,19.201L3.611,19.815Z"
+        android:fillColor="#737D8C" />
+    <path
+        android:pathData="M6.21,16.214C6.549,16.65 7.177,16.729 7.613,16.39C8.048,16.052 8.127,15.426 7.791,14.99L7.788,14.985C7.783,14.979 7.775,14.968 7.763,14.951C7.739,14.917 7.702,14.863 7.655,14.79C7.562,14.644 7.434,14.425 7.305,14.149C7.045,13.591 6.799,12.838 6.799,12C6.799,11.162 7.045,10.409 7.305,9.852C7.434,9.576 7.562,9.357 7.655,9.21C7.702,9.137 7.739,9.083 7.763,9.05C7.775,9.033 7.783,9.021 7.788,9.015L7.791,9.011C8.127,8.575 8.048,7.949 7.613,7.611C7.177,7.272 6.549,7.35 6.21,7.786L6.999,8.4C6.21,7.786 6.21,7.786 6.21,7.786L6.208,7.789L6.206,7.792L6.2,7.799L6.184,7.821C6.171,7.838 6.153,7.862 6.132,7.892C6.091,7.951 6.034,8.033 5.968,8.137C5.836,8.344 5.664,8.639 5.493,9.006C5.153,9.734 4.799,10.781 4.799,12C4.799,13.219 5.153,14.267 5.493,14.995C5.664,15.362 5.836,15.657 5.968,15.864C6.034,15.968 6.091,16.05 6.132,16.109C6.153,16.139 6.171,16.162 6.184,16.18L6.2,16.202L6.206,16.209L6.208,16.212L6.209,16.213C6.209,16.213 6.21,16.214 6.999,15.6L6.21,16.214Z"
+        android:fillColor="#737D8C" />
+    <path
+        android:pathData="M12,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+        android:fillColor="#737D8C" />
+</vector>
diff --git a/vector/src/main/res/drawable/ic_chat.xml b/vector/src/main/res/drawable/ic_chat.xml
new file mode 100644
index 0000000000..fb10eae9c9
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_chat.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.283,21.44C17.649,21.44 22,17.088 22,11.719C22,6.351 17.649,1.999 12.283,1.999C6.916,1.999 2.566,6.351 2.566,11.719C2.566,13.223 2.907,14.648 3.517,15.918L2.045,20.705C1.808,21.474 2.531,22.194 3.299,21.953L8.046,20.47C9.326,21.091 10.764,21.44 12.283,21.44Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_bold.xml b/vector/src/main/res/drawable/ic_composer_bold.xml
new file mode 100644
index 0000000000..3d9a10d16b
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_bold.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+  <path
+      android:pathData="M16,14.5C16,13.672 16.672,13 17.5,13H22.288C25.139,13 27.25,15.466 27.25,18.25C27.25,19.38 26.902,20.458 26.298,21.34C27.765,22.268 28.75,23.882 28.75,25.75C28.75,28.689 26.311,31 23.393,31H17.5C16.672,31 16,30.328 16,29.5V14.5ZM19,16V20.5H22.288C23.261,20.5 24.25,19.608 24.25,18.25C24.25,16.892 23.261,16 22.288,16H19ZM19,23.5V28H23.393C24.735,28 25.75,26.953 25.75,25.75C25.75,24.547 24.735,23.5 23.393,23.5H19Z"
+      android:fillColor="#8D97A5"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_bullet_list.xml b/vector/src/main/res/drawable/ic_composer_bullet_list.xml
new file mode 100644
index 0000000000..f6febc88f0
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_bullet_list.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+  <group>
+    <clip-path
+        android:pathData="M10,10h24v24h-24z"/>
+    <path
+        android:pathData="M14,20.5C13.17,20.5 12.5,21.17 12.5,22C12.5,22.83 13.17,23.5 14,23.5C14.83,23.5 15.5,22.83 15.5,22C15.5,21.17 14.83,20.5 14,20.5ZM14,14.5C13.17,14.5 12.5,15.17 12.5,16C12.5,16.83 13.17,17.5 14,17.5C14.83,17.5 15.5,16.83 15.5,16C15.5,15.17 14.83,14.5 14,14.5ZM14,26.5C13.17,26.5 12.5,27.18 12.5,28C12.5,28.82 13.18,29.5 14,29.5C14.82,29.5 15.5,28.82 15.5,28C15.5,27.18 14.83,26.5 14,26.5ZM18,29H30C30.55,29 31,28.55 31,28C31,27.45 30.55,27 30,27H18C17.45,27 17,27.45 17,28C17,28.55 17.45,29 18,29ZM18,23H30C30.55,23 31,22.55 31,22C31,21.45 30.55,21 30,21H18C17.45,21 17,21.45 17,22C17,22.55 17.45,23 18,23ZM17,16C17,16.55 17.45,17 18,17H30C30.55,17 31,16.55 31,16C31,15.45 30.55,15 30,15H18C17.45,15 17,15.45 17,16Z"
+        android:fillColor="#8D97A5"/>
+  </group>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_collapse.xml b/vector/src/main/res/drawable/ic_composer_collapse.xml
new file mode 100644
index 0000000000..724a833761
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_collapse.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#C1C6CD"
+        android:pathData="M10.708,10Q10.438,10 10.219,9.781Q10,9.562 10,9.292V4.542Q10,4.354 10.146,4.219Q10.292,4.083 10.458,4.083Q10.646,4.083 10.781,4.219Q10.917,4.354 10.917,4.542V8.438L16.375,3Q16.5,2.854 16.688,2.854Q16.875,2.854 17,3Q17.146,3.125 17.146,3.312Q17.146,3.5 17,3.625L11.562,9.083H15.458Q15.646,9.083 15.781,9.229Q15.917,9.375 15.917,9.542Q15.917,9.729 15.781,9.865Q15.646,10 15.458,10ZM3,17Q2.854,16.875 2.854,16.688Q2.854,16.5 3,16.375L8.438,10.917H4.542Q4.354,10.917 4.219,10.771Q4.083,10.625 4.083,10.458Q4.083,10.271 4.219,10.135Q4.354,10 4.542,10H9.292Q9.562,10 9.781,10.219Q10,10.438 10,10.708V15.458Q10,15.646 9.854,15.781Q9.708,15.917 9.542,15.917Q9.354,15.917 9.219,15.781Q9.083,15.646 9.083,15.458V11.562L3.625,17Q3.5,17.146 3.312,17.146Q3.125,17.146 3,17Z"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_full_screen.xml b/vector/src/main/res/drawable/ic_composer_full_screen.xml
new file mode 100644
index 0000000000..de1862c09b
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_full_screen.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#C1C6CD"
+        android:pathData="M3.625,17.083Q3.354,17.083 3.135,16.865Q2.917,16.646 2.917,16.375V11.625Q2.917,11.438 3.062,11.302Q3.208,11.167 3.375,11.167Q3.562,11.167 3.698,11.302Q3.833,11.438 3.833,11.625V15.5L15.5,3.833H11.625Q11.438,3.833 11.302,3.688Q11.167,3.542 11.167,3.375Q11.167,3.188 11.302,3.052Q11.438,2.917 11.625,2.917H16.375Q16.646,2.917 16.865,3.135Q17.083,3.354 17.083,3.625V8.375Q17.083,8.562 16.938,8.698Q16.792,8.833 16.625,8.833Q16.438,8.833 16.302,8.698Q16.167,8.562 16.167,8.375V4.5L4.5,16.167H8.375Q8.562,16.167 8.698,16.312Q8.833,16.458 8.833,16.625Q8.833,16.812 8.698,16.948Q8.562,17.083 8.375,17.083Z"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_italic.xml b/vector/src/main/res/drawable/ic_composer_italic.xml
new file mode 100644
index 0000000000..faa4f89cd4
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_italic.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+  <path
+      android:pathData="M22.619,14.999L19.747,29.005H17.2C16.758,29.005 16.4,29.363 16.4,29.805C16.4,30.247 16.758,30.605 17.2,30.605H20.389C20.397,30.605 20.405,30.605 20.412,30.605H23.6C24.042,30.605 24.4,30.247 24.4,29.805C24.4,29.363 24.042,29.005 23.6,29.005H21.381L24.253,14.999H26.8C27.242,14.999 27.6,14.64 27.6,14.199C27.6,13.757 27.242,13.399 26.8,13.399H23.615C23.604,13.398 23.594,13.398 23.583,13.399H20.4C19.958,13.399 19.6,13.757 19.6,14.199C19.6,14.64 19.958,14.999 20.4,14.999H22.619Z"
+      android:fillColor="#8D97A5"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_link.xml b/vector/src/main/res/drawable/ic_composer_link.xml
new file mode 100644
index 0000000000..6d0f731ed9
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_link.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+  <path
+      android:pathData="M22.566,16.151L23.101,15.616C24.577,14.14 26.956,14.126 28.415,15.585C29.874,17.044 29.86,19.423 28.383,20.899L25.844,23.438C24.368,24.915 21.989,24.929 20.53,23.47M21.434,27.849L20.899,28.383C19.423,29.86 17.044,29.874 15.585,28.415C14.126,26.956 14.14,24.577 15.616,23.101L18.156,20.562C19.632,19.086 22.011,19.071 23.47,20.53"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#8D97A5"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_numbered_list.xml b/vector/src/main/res/drawable/ic_composer_numbered_list.xml
new file mode 100644
index 0000000000..d6a860c4c8
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_numbered_list.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+  <path
+      android:pathData="m14.5,20h-2c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5h1.3l-1.68,1.96C12.04,23.05 12,23.17 12,23.28v0.22c0,0.28 0.22,0.5 0.5,0.5h2C14.78,24 15,23.78 15,23.5 15,23.22 14.78,23 14.5,23h-1.3l1.68,-1.96C14.96,20.95 15,20.83 15,20.72V20.5C15,20.22 14.78,20 14.5,20Z"
+      android:fillColor="#8d97a5"/>
+  <path
+      android:pathData="M12.5,15H13v2.5c0,0.28 0.22,0.5 0.5,0.5 0.28,0 0.5,-0.22 0.5,-0.5v-3C14,14.22 13.78,14 13.5,14h-1c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5z"
+      android:fillColor="#8d97a5"/>
+  <path
+      android:pathData="m14.5,26h-2c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5H14v0.5h-0.5c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5H14V29h-1.5c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5h2c0.28,0 0.5,-0.22 0.5,-0.5v-3C15,26.22 14.78,26 14.5,26Z"
+      android:fillColor="#8d97a5"/>
+  <path
+      android:pathData="M30,21H18c-0.55,0 -1,0.45 -1,1 0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1z"
+      android:fillColor="#8d97a5"/>
+  <path
+      android:pathData="M30,27H18c-0.55,0 -1,0.45 -1,1 0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1z"
+      android:fillColor="#8d97a5"/>
+  <path
+      android:pathData="m18,17h12c0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1H18c-0.55,0 -1,0.45 -1,1 0,0.55 0.45,1 1,1z"
+      android:fillColor="#8d97a5"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_rich_mic_pressed.xml b/vector/src/main/res/drawable/ic_composer_rich_mic_pressed.xml
new file mode 100644
index 0000000000..e9dbe610e4
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_rich_mic_pressed.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="52dp"
+    android:height="52dp"
+    android:viewportWidth="52"
+    android:viewportHeight="52">
+  <path
+      android:pathData="M26.173,26.169m-22.763,0a22.763,22.763 0,1 1,45.526 0a22.763,22.763 0,1 1,-45.526 0"
+      android:fillColor="#0DBD8B"/>
+  <path
+      android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#0DBD8B"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M26,29.5C27.937,29.5 29.488,27.937 29.488,26L29.5,19C29.5,17.063 27.937,15.5 26,15.5C24.063,15.5 22.5,17.063 22.5,19V26C22.5,27.937 24.063,29.5 26,29.5ZM33.093,26C32.603,26 32.195,26.35 32.125,26.828C31.693,29.873 28.952,31.95 26,31.95C23.048,31.95 20.307,29.885 19.875,26.828C19.805,26.35 19.385,26 18.907,26C18.3,26 17.833,26.537 17.915,27.132C18.452,30.597 21.368,33.315 24.833,33.84V36.5C24.833,37.142 25.358,37.667 26,37.667C26.642,37.667 27.167,37.142 27.167,36.5V33.84C30.62,33.338 33.548,30.597 34.085,27.132C34.167,26.537 33.7,26 33.093,26Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml b/vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
new file mode 100644
index 0000000000..c461470de5
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M10.403,2.53C10.696,2.237 10.696,1.763 10.403,1.47C10.111,1.177 9.636,1.177 9.343,1.47L5.946,4.867L2.549,1.47C2.256,1.177 1.781,1.177 1.488,1.47C1.195,1.763 1.195,2.237 1.488,2.53L4.885,5.927L1.343,9.47C1.05,9.763 1.05,10.237 1.343,10.53C1.636,10.823 2.11,10.823 2.403,10.53L5.946,6.988L9.488,10.53C9.781,10.823 10.256,10.823 10.549,10.53C10.842,10.237 10.842,9.763 10.549,9.47L7.006,5.927L10.403,2.53Z"
+      android:fillColor="#8D97A5"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml b/vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
new file mode 100644
index 0000000000..4556974221
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M2.649,7.355C2.655,7.316 2.672,7.28 2.699,7.251L8.404,1.064C8.479,0.983 8.605,0.978 8.686,1.053L9.863,2.138C9.944,2.213 9.949,2.339 9.874,2.42L4.169,8.607C4.143,8.636 4.108,8.656 4.069,8.665L2.668,9.005C2.529,9.039 2.401,8.92 2.423,8.779L2.649,7.355Z"
+      android:fillColor="#8D97A5"/>
+  <path
+      android:pathData="M1.75,9.443C1.336,9.443 1,9.779 1,10.193C1,10.608 1.336,10.943 1.75,10.943L10.75,10.943C11.164,10.943 11.5,10.608 11.5,10.193C11.5,9.779 11.164,9.443 10.75,9.443L1.75,9.443Z"
+      android:fillColor="#8D97A5"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_rich_text_save.xml b/vector/src/main/res/drawable/ic_composer_rich_text_save.xml
new file mode 100644
index 0000000000..f270d6f8ae
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_rich_text_save.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M18,18m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"
+      android:fillColor="#0DBD8B"/>
+  <path
+      android:pathData="M9.818,18.787L14.705,23.818L26.182,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_strikethrough.xml b/vector/src/main/res/drawable/ic_composer_strikethrough.xml
new file mode 100644
index 0000000000..3970c95381
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_strikethrough.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+  <path
+      android:pathData="M24.897,17.154C24.235,15.821 22.876,15.21 21.374,15.372C19.05,15.622 18.44,17.423 18.722,18.592C19.032,19.872 20.046,20.37 21.839,20.826H29.92C30.517,20.826 31,21.351 31,22C31,22.648 30.517,23.174 29.92,23.174H14.08C13.483,23.174 13,22.648 13,22C13,21.351 13.483,20.826 14.08,20.826H17.355C17.041,20.377 16.791,19.839 16.633,19.189C16.003,16.581 17.554,13.424 21.16,13.036C23.285,12.807 25.615,13.661 26.798,16.038C27.081,16.608 26.886,17.32 26.361,17.629C25.836,17.937 25.181,17.725 24.897,17.154Z"
+      android:fillColor="#8D97A5"/>
+  <path
+      android:pathData="M25.427,25.13H27.67C27.888,26.306 27.721,27.56 27.05,28.632C26.114,30.125 24.37,31 21.985,31C18.076,31 16.279,28.584 15.912,26.986C15.768,26.357 16.12,25.72 16.698,25.563C17.277,25.406 17.863,25.788 18.008,26.417C18.119,26.902 19.002,28.652 21.985,28.652C23.907,28.652 24.854,27.965 25.264,27.31C25.642,26.707 25.708,25.909 25.427,25.13Z"
+      android:fillColor="#8D97A5"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_composer_underlined.xml b/vector/src/main/res/drawable/ic_composer_underlined.xml
new file mode 100644
index 0000000000..fe18d60185
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_composer_underlined.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+  <group>
+    <clip-path
+        android:pathData="M10,10h24v24h-24z"/>
+    <path
+        android:pathData="M22.79,26.95C25.82,26.56 28,23.84 28,20.79V14.25C28,13.56 27.44,13 26.75,13C26.06,13 25.5,13.56 25.5,14.25V20.9C25.5,22.57 24.37,24.09 22.73,24.42C20.48,24.89 18.5,23.17 18.5,21V14.25C18.5,13.56 17.94,13 17.25,13C16.56,13 16,13.56 16,14.25V21C16,24.57 19.13,27.42 22.79,26.95ZM15,30C15,30.55 15.45,31 16,31H28C28.55,31 29,30.55 29,30C29,29.45 28.55,29 28,29H16C15.45,29 15,29.45 15,30Z"
+        android:fillColor="#8D97A5"/>
+  </group>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_device_type_desktop.xml b/vector/src/main/res/drawable/ic_device_type_desktop.xml
new file mode 100644
index 0000000000..922073459d
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_device_type_desktop.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="22dp"
+    android:height="19dp"
+    android:viewportWidth="22"
+    android:viewportHeight="19"
+    tools:ignore="UnusedResources">
+  <path
+      android:pathData="M3,15.5C2.45,15.5 1.979,15.304 1.588,14.913C1.196,14.521 1,14.05 1,13.5V2.5C1,1.95 1.196,1.479 1.588,1.087C1.979,0.696 2.45,0.5 3,0.5H19C19.55,0.5 20.021,0.696 20.413,1.087C20.804,1.479 21,1.95 21,2.5V13.5C21,14.05 20.804,14.521 20.413,14.913C20.021,15.304 19.55,15.5 19,15.5H3ZM3,13.5H19V2.5H3V13.5ZM1,18.5C0.717,18.5 0.479,18.404 0.288,18.212C0.096,18.021 0,17.783 0,17.5C0,17.217 0.096,16.979 0.288,16.788C0.479,16.596 0.717,16.5 1,16.5H21C21.283,16.5 21.521,16.596 21.712,16.788C21.904,16.979 22,17.217 22,17.5C22,17.783 21.904,18.021 21.712,18.212C21.521,18.404 21.283,18.5 21,18.5H1ZM3,13.5V2.5V13.5Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_device_type_mobile.xml b/vector/src/main/res/drawable/ic_device_type_mobile.xml
new file mode 100644
index 0000000000..fd825c77f0
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_device_type_mobile.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="22dp"
+    android:viewportWidth="14"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M12,0.01L2,0C0.9,0 0,0.9 0,2V20C0,21.1 0.9,22 2,22H12C13.1,22 14,21.1 14,20V2C14,0.9 13.1,0.01 12,0.01ZM12,18H2V4H12V18Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_device_type_unknown.xml b/vector/src/main/res/drawable/ic_device_type_unknown.xml
new file mode 100644
index 0000000000..8368dcbd0b
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_device_type_unknown.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M12,23.5C18.075,23.5 23,18.575 23,12.5C23,6.425 18.075,1.5 12,1.5C5.925,1.5 1,6.425 1,12.5C1,18.575 5.925,23.5 12,23.5ZM12,19.26C12.76,19.26 13.375,18.645 13.375,17.885C13.375,17.126 12.76,16.51 12,16.51C11.241,16.51 10.625,17.126 10.625,17.885C10.625,18.645 11.241,19.26 12,19.26ZM10.09,10.428C10.09,9.37 10.949,8.518 12,8.518C13.048,8.518 13.909,9.38 13.909,10.428C13.909,10.913 13.702,11.087 12.884,11.652C12.521,11.902 12.025,12.25 11.638,12.76C11.223,13.306 10.968,13.987 10.968,14.853H13.031C13.031,14.429 13.144,14.187 13.281,14.007C13.445,13.79 13.683,13.606 14.056,13.349C14.095,13.321 14.137,13.293 14.18,13.264C14.856,12.804 15.972,12.045 15.972,10.428C15.972,8.241 14.187,6.456 12,6.456C9.816,6.456 8.027,8.225 8.027,10.428H10.09Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_device_type_web.xml b/vector/src/main/res/drawable/ic_device_type_web.xml
new file mode 100644
index 0000000000..dde3ce3a1f
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_device_type_web.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17"
+    tools:ignore="UnusedResources">
+  <path
+      android:pathData="M18,16.5H2C1.45,16.5 0.979,16.304 0.588,15.913C0.196,15.521 0,15.05 0,14.5V2.5C0,1.95 0.196,1.479 0.588,1.088C0.979,0.696 1.45,0.5 2,0.5H18C18.55,0.5 19.021,0.696 19.413,1.088C19.804,1.479 20,1.95 20,2.5V14.5C20,15.05 19.804,15.521 19.413,15.913C19.021,16.304 18.55,16.5 18,16.5ZM2,4.5V14.5H18V4.5H2Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_inactive_sessions.xml b/vector/src/main/res/drawable/ic_inactive_sessions.xml
new file mode 100644
index 0000000000..30ee2b3b3c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_inactive_sessions.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="14dp"
+    android:viewportWidth="8"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M1.333,0.333C0.6,0.333 0,0.933 0,1.666L0.007,3.786C0.007,4.14 0.147,4.473 0.393,4.726L2.667,7L0.393,9.286C0.147,9.533 0.007,9.873 0.007,10.226L0,12.333C0,13.066 0.6,13.666 1.333,13.666H6.667C7.4,13.666 8,13.066 8,12.333V10.226C8,9.873 7.86,9.533 7.613,9.286L5.333,7L7.607,4.733C7.86,4.48 8,4.14 8,3.786V1.666C8,0.933 7.4,0.333 6.667,0.333H1.333ZM6.667,10.273V11.666C6.667,12.033 6.367,12.333 6,12.333H2C1.633,12.333 1.333,12.033 1.333,11.666V10.273C1.333,10.093 1.407,9.926 1.527,9.8L4,7.333L6.473,9.806C6.593,9.926 6.667,10.1 6.667,10.273Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_invites_empty.xml b/vector/src/main/res/drawable/ic_invites_empty.xml
new file mode 100644
index 0000000000..79908ff380
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_invites_empty.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60dp"
+    android:height="60dp"
+    android:viewportWidth="60"
+    android:viewportHeight="60">
+  <path
+      android:pathData="M30,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
+      android:fillColor="#E3E8F0"/>
+  <path
+      android:pathData="M25.665,33.544L15.229,23.209L29.236,13.398C29.993,12.868 31.007,12.868 31.764,13.398L45.771,23.209L35.247,33.631L33.851,32.446C31.93,30.816 29.11,30.778 27.145,32.355L25.665,33.544ZM22.439,36.134L14,42.91V27.777L22.439,36.134ZM47,27.777V43.606L38.393,36.301L47,27.777ZM31.177,35.566L43.47,46H16.714L29.733,35.546C30.156,35.208 30.765,35.216 31.177,35.566Z"
+      android:strokeWidth="2"
+      android:fillColor="#737D8C"
+      android:strokeColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_microphone.xml b/vector/src/main/res/drawable/ic_microphone.xml
new file mode 100644
index 0000000000..270fe456fa
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_microphone.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,15C13.66,15 14.99,13.66 14.99,12L15,6C15,4.34 13.66,3 12,3C10.34,3 9,4.34 9,6V12C9,13.66 10.34,15 12,15ZM18.08,12C17.66,12 17.31,12.3 17.25,12.71C16.88,15.32 14.53,17.1 12,17.1C9.47,17.1 7.12,15.33 6.75,12.71C6.69,12.3 6.33,12 5.92,12C5.4,12 5,12.46 5.07,12.97C5.53,15.94 8.03,18.27 11,18.72V21C11,21.55 11.45,22 12,22C12.55,22 13,21.55 13,21V18.72C15.96,18.29 18.47,15.94 18.93,12.97C19,12.46 18.6,12 18.08,12Z"
+      android:fillColor="#8D97A5"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_open_spaces.xml b/vector/src/main/res/drawable/ic_open_spaces.xml
deleted file mode 100644
index 180f71f1cd..0000000000
--- a/vector/src/main/res/drawable/ic_open_spaces.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <group>
-    <clip-path
-        android:pathData="M1,0C0.448,0 0,0.448 0,1V7.889C0,8.441 0.448,8.889 1,8.889H7.889C8.441,8.889 8.889,8.441 8.889,7.889V1C8.889,0.448 8.441,0 7.889,0H1ZM12.111,0C11.559,0 11.111,0.448 11.111,1V7.889C11.111,8.441 11.559,8.889 12.111,8.889H19C19.552,8.889 20,8.441 20,7.889V1C20,0.448 19.552,0 19,0H12.111ZM0,12.111C0,11.559 0.448,11.111 1,11.111H7.889C8.441,11.111 8.889,11.559 8.889,12.111V19C8.889,19.552 8.441,20 7.889,20H1C0.448,20 0,19.552 0,19V12.111ZM12.111,11.111C11.559,11.111 11.111,11.559 11.111,12.111V19C11.111,19.552 11.559,20 12.111,20H19C19.552,20 20,19.552 20,19V12.111C20,11.559 19.552,11.111 19,11.111H12.111Z"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M2,1C2,1.552 1.552,2 1,2V-2C-0.657,-2 -2,-0.657 -2,1H2ZM2,7.889V1H-2V7.889H2ZM1,6.889C1.552,6.889 2,7.337 2,7.889H-2C-2,9.546 -0.657,10.889 1,10.889V6.889ZM7.889,6.889H1V10.889H7.889V6.889ZM6.889,7.889C6.889,7.337 7.337,6.889 7.889,6.889V10.889C9.546,10.889 10.889,9.546 10.889,7.889H6.889ZM6.889,1V7.889H10.889V1H6.889ZM7.889,2C7.337,2 6.889,1.552 6.889,1H10.889C10.889,-0.657 9.546,-2 7.889,-2V2ZM1,2H7.889V-2H1V2ZM13.111,1C13.111,1.552 12.663,2 12.111,2V-2C10.454,-2 9.111,-0.657 9.111,1H13.111ZM13.111,7.889V1H9.111V7.889H13.111ZM12.111,6.889C12.663,6.889 13.111,7.337 13.111,7.889H9.111C9.111,9.546 10.454,10.889 12.111,10.889V6.889ZM19,6.889H12.111V10.889H19V6.889ZM18,7.889C18,7.337 18.448,6.889 19,6.889V10.889C20.657,10.889 22,9.546 22,7.889H18ZM18,1V7.889H22V1H18ZM19,2C18.448,2 18,1.552 18,1H22C22,-0.657 20.657,-2 19,-2V2ZM12.111,2H19V-2H12.111V2ZM1,9.111C-0.657,9.111 -2,10.454 -2,12.111H2C2,12.663 1.552,13.111 1,13.111V9.111ZM7.889,9.111H1V13.111H7.889V9.111ZM10.889,12.111C10.889,10.454 9.546,9.111 7.889,9.111V13.111C7.337,13.111 6.889,12.663 6.889,12.111H10.889ZM10.889,19V12.111H6.889V19H10.889ZM7.889,22C9.546,22 10.889,20.657 10.889,19H6.889C6.889,18.448 7.337,18 7.889,18V22ZM1,22H7.889V18H1V22ZM-2,19C-2,20.657 -0.657,22 1,22V18C1.552,18 2,18.448 2,19H-2ZM-2,12.111V19H2V12.111H-2ZM13.111,12.111C13.111,12.663 12.663,13.111 12.111,13.111V9.111C10.454,9.111 9.111,10.454 9.111,12.111H13.111ZM13.111,19V12.111H9.111V19H13.111ZM12.111,18C12.663,18 13.111,18.448 13.111,19H9.111C9.111,20.657 10.454,22 12.111,22V18ZM19,18H12.111V22H19V18ZM18,19C18,18.448 18.448,18 19,18V22C20.657,22 22,20.657 22,19H18ZM18,12.111V19H22V12.111H18ZM19,13.111C18.448,13.111 18,12.663 18,12.111H22C22,10.454 20.657,9.111 19,9.111V13.111ZM12.111,13.111H19V9.111H12.111V13.111Z"
-        android:fillColor="#0DBD8B"/>
-  </group>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_player_backward_30.xml b/vector/src/main/res/drawable/ic_player_backward_30.xml
new file mode 100644
index 0000000000..cb244806b3
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_player_backward_30.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.976,23.15C9.328,23.15 7.054,22.27 5.156,20.511C3.258,18.751 2.207,16.575 2.003,13.982C1.984,13.76 2.054,13.566 2.211,13.399C2.369,13.232 2.568,13.149 2.809,13.149C3.031,13.149 3.221,13.227 3.378,13.385C3.536,13.542 3.633,13.741 3.67,13.982C3.874,16.112 4.762,17.895 6.337,19.33C7.911,20.765 9.791,21.483 11.976,21.483C14.291,21.483 16.259,20.673 17.88,19.052C19.5,17.432 20.311,15.464 20.311,13.149C20.311,10.834 19.524,8.866 17.949,7.245C16.375,5.625 14.43,4.814 12.115,4.814H11.504L12.949,6.259C13.115,6.426 13.199,6.62 13.199,6.842C13.199,7.065 13.115,7.259 12.949,7.426C12.782,7.593 12.587,7.676 12.365,7.676C12.143,7.676 11.948,7.593 11.782,7.426L8.865,4.509C8.772,4.416 8.707,4.324 8.67,4.231C8.633,4.138 8.615,4.037 8.615,3.925C8.615,3.814 8.633,3.712 8.67,3.62C8.707,3.527 8.772,3.435 8.865,3.342L11.81,0.397C11.958,0.249 12.143,0.175 12.365,0.175C12.587,0.175 12.782,0.249 12.949,0.397C13.097,0.564 13.171,0.758 13.171,0.981C13.171,1.203 13.097,1.388 12.949,1.536L11.337,3.148H11.976C13.365,3.148 14.666,3.407 15.88,3.925C17.093,4.444 18.153,5.157 19.06,6.065C19.968,6.972 20.681,8.032 21.2,9.246C21.718,10.459 21.977,11.76 21.977,13.149C21.977,14.538 21.718,15.839 21.2,17.052C20.681,18.265 19.968,19.325 19.06,20.233C18.153,21.14 17.093,21.854 15.88,22.372C14.666,22.891 13.365,23.15 11.976,23.15Z"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M9.017,17.09C8.557,17.09 8.148,17.011 7.79,16.853C7.434,16.695 7.153,16.476 6.946,16.195C6.739,15.913 6.63,15.588 6.617,15.22H7.819C7.829,15.397 7.888,15.551 7.994,15.683C8.101,15.813 8.243,15.914 8.419,15.987C8.596,16.059 8.794,16.096 9.014,16.096C9.248,16.096 9.456,16.055 9.637,15.974C9.818,15.891 9.96,15.776 10.062,15.629C10.164,15.482 10.215,15.313 10.212,15.121C10.215,14.923 10.163,14.748 10.059,14.597C9.955,14.445 9.803,14.327 9.605,14.242C9.409,14.157 9.173,14.114 8.896,14.114H8.317V13.2H8.896C9.124,13.2 9.323,13.16 9.493,13.082C9.666,13.003 9.801,12.892 9.899,12.749C9.997,12.604 10.045,12.437 10.043,12.248C10.045,12.062 10.004,11.901 9.918,11.765C9.835,11.626 9.717,11.519 9.564,11.442C9.412,11.365 9.234,11.327 9.03,11.327C8.83,11.327 8.644,11.363 8.474,11.436C8.303,11.508 8.166,11.611 8.061,11.746C7.957,11.878 7.902,12.035 7.895,12.219H6.754C6.763,11.852 6.868,11.531 7.071,11.254C7.275,10.974 7.548,10.757 7.889,10.602C8.23,10.444 8.612,10.365 9.036,10.365C9.473,10.365 9.852,10.447 10.174,10.611C10.498,10.773 10.748,10.991 10.925,11.266C11.102,11.541 11.19,11.845 11.19,12.177C11.193,12.546 11.084,12.855 10.864,13.104C10.647,13.353 10.361,13.516 10.008,13.593V13.644C10.468,13.708 10.821,13.879 11.066,14.156C11.313,14.43 11.435,14.772 11.433,15.182C11.433,15.548 11.329,15.876 11.12,16.166C10.913,16.454 10.628,16.679 10.264,16.843C9.901,17.007 9.486,17.09 9.017,17.09ZM14.515,17.125C13.989,17.125 13.537,16.992 13.16,16.725C12.785,16.457 12.496,16.07 12.294,15.565C12.094,15.058 11.993,14.447 11.993,13.734C11.996,13.02 12.097,12.413 12.297,11.912C12.5,11.409 12.788,11.026 13.163,10.761C13.54,10.497 13.991,10.365 14.515,10.365C15.039,10.365 15.49,10.497 15.867,10.761C16.244,11.026 16.533,11.409 16.733,11.912C16.936,12.415 17.037,13.022 17.037,13.734C17.037,14.45 16.936,15.061 16.733,15.568C16.533,16.073 16.244,16.459 15.867,16.725C15.492,16.992 15.041,17.125 14.515,17.125ZM14.515,16.124C14.924,16.124 15.247,15.923 15.483,15.52C15.722,15.115 15.842,14.52 15.842,13.734C15.842,13.214 15.787,12.777 15.679,12.423C15.57,12.07 15.416,11.803 15.218,11.624C15.02,11.443 14.786,11.353 14.515,11.353C14.108,11.353 13.786,11.555 13.55,11.96C13.313,12.363 13.194,12.954 13.192,13.734C13.19,14.256 13.242,14.695 13.349,15.05C13.457,15.406 13.611,15.675 13.809,15.856C14.007,16.035 14.242,16.124 14.515,16.124Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_player_forward_30.xml b/vector/src/main/res/drawable/ic_player_forward_30.xml
new file mode 100644
index 0000000000..be61fda8ff
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_player_forward_30.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.001,23.15C14.65,23.15 16.923,22.27 18.822,20.511C20.72,18.751 21.771,16.575 21.975,13.982C21.993,13.76 21.924,13.566 21.766,13.399C21.609,13.232 21.41,13.149 21.169,13.149C20.947,13.149 20.757,13.227 20.6,13.385C20.442,13.542 20.345,13.741 20.308,13.982C20.104,16.112 19.215,17.895 17.641,19.33C16.066,20.765 14.187,21.483 12.001,21.483C9.686,21.483 7.718,20.673 6.098,19.052C4.477,17.432 3.667,15.464 3.667,13.149C3.667,10.834 4.454,8.866 6.028,7.245C7.603,5.625 9.547,4.814 11.862,4.814H12.474L11.029,6.259C10.862,6.426 10.779,6.62 10.779,6.842C10.779,7.065 10.862,7.259 11.029,7.426C11.196,7.593 11.39,7.676 11.612,7.676C11.835,7.676 12.029,7.593 12.196,7.426L15.113,4.509C15.205,4.416 15.27,4.324 15.307,4.231C15.344,4.138 15.363,4.037 15.363,3.925C15.363,3.814 15.344,3.712 15.307,3.62C15.27,3.527 15.205,3.435 15.113,3.342L12.168,0.397C12.02,0.249 11.835,0.175 11.612,0.175C11.39,0.175 11.196,0.249 11.029,0.397C10.881,0.564 10.807,0.758 10.807,0.981C10.807,1.203 10.881,1.388 11.029,1.536L12.64,3.148H12.001C10.612,3.148 9.311,3.407 8.098,3.925C6.885,4.444 5.825,5.157 4.917,6.065C4.01,6.972 3.297,8.032 2.778,9.246C2.259,10.459 2,11.76 2,13.149C2,14.538 2.259,15.839 2.778,17.052C3.297,18.265 4.01,19.325 4.917,20.233C5.825,21.14 6.885,21.854 8.098,22.372C9.311,22.891 10.612,23.15 12.001,23.15Z"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M9.017,17.09C8.557,17.09 8.148,17.011 7.79,16.853C7.434,16.695 7.153,16.476 6.946,16.195C6.739,15.913 6.63,15.588 6.617,15.22H7.819C7.829,15.397 7.888,15.551 7.994,15.683C8.101,15.813 8.243,15.914 8.419,15.987C8.596,16.059 8.794,16.096 9.014,16.096C9.248,16.096 9.456,16.055 9.637,15.974C9.818,15.891 9.96,15.776 10.062,15.629C10.164,15.482 10.215,15.313 10.212,15.121C10.215,14.923 10.163,14.748 10.059,14.597C9.955,14.445 9.803,14.327 9.605,14.242C9.409,14.157 9.173,14.114 8.896,14.114H8.317V13.2H8.896C9.124,13.2 9.323,13.16 9.493,13.082C9.666,13.003 9.801,12.892 9.899,12.749C9.997,12.604 10.045,12.437 10.043,12.248C10.045,12.062 10.004,11.901 9.918,11.765C9.835,11.626 9.717,11.519 9.564,11.442C9.412,11.365 9.234,11.327 9.03,11.327C8.83,11.327 8.644,11.363 8.474,11.436C8.303,11.508 8.166,11.611 8.061,11.746C7.957,11.878 7.902,12.035 7.895,12.219H6.754C6.763,11.852 6.868,11.531 7.071,11.254C7.275,10.974 7.548,10.757 7.889,10.602C8.23,10.444 8.612,10.365 9.036,10.365C9.473,10.365 9.852,10.447 10.174,10.611C10.498,10.773 10.748,10.991 10.925,11.266C11.102,11.541 11.19,11.845 11.19,12.177C11.193,12.546 11.084,12.855 10.864,13.104C10.647,13.353 10.361,13.516 10.008,13.593V13.644C10.468,13.708 10.821,13.879 11.066,14.156C11.313,14.43 11.435,14.772 11.433,15.182C11.433,15.548 11.329,15.876 11.12,16.166C10.913,16.454 10.628,16.679 10.264,16.843C9.901,17.007 9.486,17.09 9.017,17.09ZM14.515,17.125C13.989,17.125 13.537,16.992 13.16,16.725C12.785,16.457 12.496,16.07 12.294,15.565C12.094,15.058 11.993,14.447 11.993,13.734C11.996,13.02 12.097,12.413 12.297,11.912C12.5,11.409 12.788,11.026 13.163,10.761C13.54,10.497 13.991,10.365 14.515,10.365C15.039,10.365 15.49,10.497 15.867,10.761C16.244,11.026 16.533,11.409 16.733,11.912C16.936,12.415 17.037,13.022 17.037,13.734C17.037,14.45 16.936,15.061 16.733,15.568C16.533,16.073 16.244,16.459 15.867,16.725C15.492,16.992 15.041,17.125 14.515,17.125ZM14.515,16.124C14.924,16.124 15.247,15.923 15.483,15.52C15.722,15.115 15.842,14.52 15.842,13.734C15.842,13.214 15.787,12.777 15.679,12.423C15.57,12.07 15.416,11.803 15.218,11.624C15.02,11.443 14.786,11.353 14.515,11.353C14.108,11.353 13.786,11.555 13.55,11.96C13.313,12.363 13.194,12.954 13.192,13.734C13.19,14.256 13.242,14.695 13.349,15.05C13.457,15.406 13.611,15.675 13.809,15.856C14.007,16.035 14.242,16.124 14.515,16.124Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_plus.xml b/vector/src/main/res/drawable/ic_plus.xml
new file mode 100644
index 0000000000..25a611472b
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_plus.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12.7822,4.2963C12.7822,3.8641 12.4318,3.5137 11.9996,3.5137C11.5673,3.5137 11.217,3.8641 11.217,4.2963V11.2173L4.2963,11.2173C3.8641,11.2173 3.5137,11.5676 3.5137,11.9999C3.5137,12.4321 3.8641,12.7825 4.2963,12.7825H11.217V19.7038C11.217,20.136 11.5673,20.4864 11.9996,20.4864C12.4318,20.4864 12.7822,20.136 12.7822,19.7038V12.7825H19.7038C20.136,12.7825 20.4864,12.4321 20.4864,11.9999C20.4864,11.5676 20.136,11.2173 19.7038,11.2173L12.7822,11.2173V4.2963Z"
+        android:fillColor="#17191C"
+        android:fillType="evenOdd"/>
+</vector>
+
diff --git a/vector/src/main/res/drawable/ic_qr_code.xml b/vector/src/main/res/drawable/ic_qr_code.xml
new file mode 100644
index 0000000000..1ebdc169c9
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_qr_code.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="13dp"
+    android:height="12dp"
+    android:viewportWidth="13"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M7.167,12V10.667H8.5V12H7.167ZM5.833,10.667V7.333H7.167V10.667H5.833ZM11.167,8.667V6H12.5V8.667H11.167ZM9.833,6V4.667H11.167V6H9.833ZM1.833,7.333V6H3.167V7.333H1.833ZM0.5,6V4.667H1.833V6H0.5ZM6.5,1.333V0H7.833V1.333H6.5ZM1.333,3.167H3.667V0.833H1.333V3.167ZM1,4C0.856,4 0.736,3.953 0.642,3.858C0.547,3.764 0.5,3.644 0.5,3.5V0.5C0.5,0.356 0.547,0.236 0.642,0.142C0.736,0.047 0.856,0 1,0H4C4.144,0 4.264,0.047 4.358,0.142C4.453,0.236 4.5,0.356 4.5,0.5V3.5C4.5,3.644 4.453,3.764 4.358,3.858C4.264,3.953 4.144,4 4,4H1ZM1.333,11.167H3.667V8.833H1.333V11.167ZM1,12C0.856,12 0.736,11.953 0.642,11.858C0.547,11.764 0.5,11.644 0.5,11.5V8.5C0.5,8.356 0.547,8.236 0.642,8.142C0.736,8.047 0.856,8 1,8H4C4.144,8 4.264,8.047 4.358,8.142C4.453,8.236 4.5,8.356 4.5,8.5V11.5C4.5,11.644 4.453,11.764 4.358,11.858C4.264,11.953 4.144,12 4,12H1ZM9.333,3.167H11.667V0.833H9.333V3.167ZM9,4C8.856,4 8.736,3.953 8.642,3.858C8.547,3.764 8.5,3.644 8.5,3.5V0.5C8.5,0.356 8.547,0.236 8.642,0.142C8.736,0.047 8.856,0 9,0H12C12.144,0 12.264,0.047 12.358,0.142C12.453,0.236 12.5,0.356 12.5,0.5V3.5C12.5,3.644 12.453,3.764 12.358,3.858C12.264,3.953 12.144,4 12,4H9ZM9.833,12V10H8.5V8.667H11.167V10.667H12.5V12H9.833ZM7.167,7.333V6H9.833V7.333H7.167ZM4.5,7.333V6H3.167V4.667H7.167V6H5.833V7.333H4.5ZM5.167,4V1.333H6.5V2.667H7.833V4H5.167ZM2,2.5V1.5H3V2.5H2ZM2,10.5V9.5H3V10.5H2ZM10,2.5V1.5H11V2.5H10Z"
+      android:fillColor="#0DBD8B"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_qr_code_login_connected.xml b/vector/src/main/res/drawable/ic_qr_code_login_connected.xml
new file mode 100644
index 0000000000..48f5c6a383
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_qr_code_login_connected.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="54dp"
+    android:height="38dp"
+    android:viewportWidth="54"
+    android:viewportHeight="38">
+  <path
+      android:pathData="M53.667,19C53.667,17.533 52.467,16.333 51,16.333H45.48C44.173,7.293 36.413,0.333 27,0.333C17.587,0.333 9.827,7.293 8.52,16.333H3C1.533,16.333 0.333,17.533 0.333,19C0.333,20.467 1.533,21.667 3,21.667H8.52C9.827,30.707 17.587,37.667 27,37.667C36.413,37.667 44.173,30.707 45.48,21.667H51C52.467,21.667 53.667,20.467 53.667,19ZM35,25.667C35,27.133 33.8,28.333 32.333,28.333H21.667C20.2,28.333 19,27.133 19,25.667V17.667C19,16.2 20.2,15 21.667,15V12.333C21.667,9.107 24.547,6.52 27.907,7.08C30.52,7.507 32.333,9.96 32.333,12.627V15C33.8,15 35,16.2 35,17.667V25.667ZM29,21.667C29,22.76 28.093,23.667 27,23.667C25.907,23.667 25,22.76 25,21.667C25,20.573 25.907,19.667 27,19.667C28.093,19.667 29,20.573 29,21.667ZM29.667,12.333V15H24.333V12.333C24.333,10.867 25.533,9.667 27,9.667C28.467,9.667 29.667,10.867 29.667,12.333Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_qr_code_login_failed.xml b/vector/src/main/res/drawable/ic_qr_code_login_failed.xml
new file mode 100644
index 0000000000..f49e07c066
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_qr_code_login_failed.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M20,40C31.046,40 40,31.046 40,20C40,8.954 31.046,0 20,0C8.954,0 0,8.954 0,20C0,31.046 8.954,40 20,40ZM18.084,14.688C18.007,13.809 18.655,13.037 19.535,12.976C20.399,12.914 21.17,13.562 21.263,14.441V14.688L20.769,20.86C20.723,21.431 20.244,21.863 19.674,21.863H19.581C19.041,21.816 18.624,21.4 18.578,20.86L18.084,14.688ZM21.015,24.887C21.015,25.637 20.407,26.244 19.657,26.244C18.907,26.244 18.3,25.637 18.3,24.887C18.3,24.137 18.907,23.529 19.657,23.529C20.407,23.529 21.015,24.137 21.015,24.887Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_recording_dot.xml b/vector/src/main/res/drawable/ic_recording_dot.xml
new file mode 100644
index 0000000000..f5d92f9718
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_recording_dot.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,8m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0"
+      android:fillColor="#FF5B55"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_rich_composer_add.xml b/vector/src/main/res/drawable/ic_rich_composer_add.xml
new file mode 100644
index 0000000000..3a90a40902
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_rich_composer_add.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M18,18m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"
+      android:fillColor="#F4F6FA"/>
+  <path
+      android:pathData="M11.251,18H24.751M18.001,11.25V24.75"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#737D8C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_rich_composer_send.xml b/vector/src/main/res/drawable/ic_rich_composer_send.xml
new file mode 100644
index 0000000000..0f99c1670e
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_rich_composer_send.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M18,18m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"
+      android:fillColor="#0DBD8B"/>
+  <path
+      android:pathData="M27.83,19.085L12.26,26.867C11.21,27.391 10.119,26.266 10.632,25.24C10.632,25.24 12.561,21.343 13.092,20.322C13.623,19.301 14.231,19.124 19.874,18.395C20.083,18.368 20.253,18.21 20.253,18C20.253,17.79 20.083,17.632 19.874,17.605C14.231,16.876 13.623,16.699 13.092,15.678C12.561,14.658 10.632,10.76 10.632,10.76C10.119,9.734 11.21,8.609 12.26,9.133L27.83,16.915C28.725,17.362 28.725,18.638 27.83,19.085Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_room_add.xml b/vector/src/main/res/drawable/ic_room_add.xml
new file mode 100644
index 0000000000..8404ff2181
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_room_add.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.048,4.105C17.107,3.556 16.708,3.064 16.159,3.006C15.61,2.948 15.118,3.346 15.059,3.895L14.668,7.602H9.613L9.983,4.105C10.041,3.556 9.642,3.064 9.093,3.006C8.544,2.948 8.052,3.346 7.994,3.895L7.602,7.602H4.834C4.281,7.602 3.834,8.05 3.834,8.602C3.834,9.154 4.281,9.602 4.834,9.602H7.39L6.872,14.505H4C3.448,14.505 3,14.953 3,15.505C3,16.058 3.448,16.506 4,16.506H6.661L6.331,19.622C6.273,20.171 6.671,20.663 7.221,20.721C7.77,20.779 8.262,20.381 8.32,19.832L8.589,17.288C8.319,16.818 8.165,16.274 8.165,15.693C8.165,14.871 8.474,14.122 8.984,13.555L9.401,9.602H12.959C13.538,8.776 14.497,8.235 15.583,8.235C16.669,8.235 17.628,8.776 18.207,9.602H19.379C19.931,9.602 20.379,9.154 20.379,8.602C20.379,8.05 19.931,7.602 19.379,7.602H16.679L17.048,4.105ZM15.583,10.382C16.135,10.382 16.583,10.83 16.583,11.382V14.693H19.852C20.404,14.693 20.852,15.141 20.852,15.693C20.852,16.246 20.404,16.694 19.852,16.694H16.583V20.004C16.583,20.557 16.135,21.004 15.583,21.004C15.031,21.004 14.583,20.557 14.583,20.004V16.694H11.313C10.76,16.694 10.313,16.246 10.313,15.693C10.313,15.141 10.76,14.693 11.313,14.693H14.583V11.382C14.583,10.83 15.031,10.382 15.583,10.382Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_room_explore.xml b/vector/src/main/res/drawable/ic_room_explore.xml
new file mode 100644
index 0000000000..9811a09054
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_room_explore.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.647,3.006C17.196,3.065 17.593,3.558 17.533,4.108L17.147,7.684H19.998C20.55,7.684 20.998,8.132 20.998,8.684C20.998,9.236 20.55,9.684 19.998,9.684H16.931L16.8,10.891C16.058,10.967 15.356,11.181 14.722,11.508L14.919,9.684H9.582L9.039,14.708H11.898C11.67,15.332 11.545,16.006 11.544,16.708H8.822L8.455,20.111C8.395,20.66 7.902,21.057 7.353,20.997C6.804,20.938 6.407,20.445 6.466,19.896L6.811,16.708H3.999C3.447,16.708 2.999,16.26 2.999,15.708C2.999,15.156 3.447,14.708 3.999,14.708H7.027L7.57,9.684H4.864C4.312,9.684 3.864,9.236 3.864,8.684C3.864,8.132 4.312,7.684 4.864,7.684H7.786L8.196,3.893C8.255,3.344 8.748,2.947 9.298,3.006C9.847,3.065 10.244,3.558 10.184,4.108L9.798,7.684H15.135L15.545,3.893C15.604,3.344 16.097,2.947 16.647,3.006Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19.003,16.765C19.003,17.817 18.151,18.669 17.1,18.669C16.048,18.669 15.196,17.817 15.196,16.765C15.196,15.714 16.048,14.862 17.1,14.862C18.151,14.862 19.003,15.714 19.003,16.765ZM20.332,18.698C20.67,18.133 20.865,17.472 20.865,16.765C20.865,14.686 19.179,13 17.1,13C15.02,13 13.334,14.686 13.334,16.765C13.334,18.845 15.02,20.531 17.1,20.531C17.806,20.531 18.467,20.336 19.032,19.998C19.062,20.038 19.094,20.077 19.131,20.114L20.745,21.727C21.108,22.091 21.698,22.091 22.061,21.727C22.425,21.364 22.425,20.774 22.061,20.411L20.448,18.797C20.411,18.76 20.372,18.728 20.332,18.698Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_shield_gray.xml b/vector/src/main/res/drawable/ic_shield_gray.xml
new file mode 100644
index 0000000000..a4c52d74ba
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_shield_gray.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M12.0077,23.4869C12.0051,23.4875 12.0025,23.4881 12,23.4886C11.9975,23.4881 11.9949,23.4875 11.9923,23.4869C11.9204,23.4706 11.8129,23.4452 11.6749,23.4092C11.3989,23.3373 11.0015,23.2235 10.5233,23.0575C9.5654,22.725 8.2921,22.186 7.0225,21.3608C4.4897,19.7145 2,16.954 2,12.405V3.4496L12,0.521L22,3.4496V12.405C22,16.954 19.5103,19.7145 16.9775,21.3608C15.7079,22.186 14.4346,22.725 13.4767,23.0575C12.9985,23.2235 12.6011,23.3373 12.3251,23.4092C12.1871,23.4452 12.0796,23.4706 12.0077,23.4869Z"
+      android:fillColor="@color/shield_color_gray"
+      android:strokeColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_shield_unknown.xml b/vector/src/main/res/drawable/ic_shield_unknown.xml
new file mode 100644
index 0000000000..de56aa475e
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_shield_unknown.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/shield_color_unknown"
+        android:pathData="M12.008,23.487C12.005,23.487 12.002,23.488 12,23.489C11.998,23.488 11.995,23.487 11.992,23.487C11.92,23.471 11.813,23.445 11.675,23.409C11.399,23.337 11.002,23.223 10.523,23.058C9.565,22.725 8.292,22.186 7.022,21.361C4.49,19.715 2,16.954 2,12.405V3.45L12,0.521L22,3.45V12.405C22,16.954 19.51,19.715 16.978,21.361C15.708,22.186 14.435,22.725 13.477,23.058C12.998,23.223 12.601,23.337 12.325,23.409C12.187,23.445 12.08,23.471 12.008,23.487Z"
+        android:strokeWidth="1"
+        android:strokeColor="#ffffff" />
+    <path
+        android:fillColor="@color/shield_color_unknown"
+        android:pathData="M12.008,23.487C12.005,23.487 12.002,23.488 12,23.489C11.998,23.488 11.995,23.487 11.992,23.487C11.92,23.471 11.813,23.445 11.675,23.409C11.399,23.337 11.002,23.223 10.523,23.058C9.565,22.725 8.292,22.186 7.022,21.361C4.49,19.715 2,16.954 2,12.405V3.45L12,0.521L22,3.45V12.405C22,16.954 19.51,19.715 16.978,21.361C15.708,22.186 14.435,22.725 13.477,23.058C12.998,23.223 12.601,23.337 12.325,23.409C12.187,23.445 12.08,23.471 12.008,23.487Z"
+        android:strokeWidth="1"
+        android:strokeColor="#ffffff" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.003,16.5C12.577,16.5 13.043,16.035 13.043,15.46C13.043,14.887 12.577,14.421 12.003,14.421C11.429,14.421 10.964,14.887 10.964,15.46C10.964,16.035 11.429,16.5 12.003,16.5ZM10.559,9.823C10.559,9.023 11.208,8.379 12.003,8.379C12.795,8.379 13.447,9.031 13.447,9.823C13.447,10.19 13.29,10.321 12.671,10.748C12.398,10.937 12.022,11.2 11.729,11.586C11.416,11.999 11.223,12.513 11.223,13.168H12.783C12.783,12.847 12.868,12.665 12.971,12.528C13.096,12.364 13.276,12.226 13.558,12.031C13.587,12.01 13.618,11.989 13.651,11.967C14.162,11.619 15.006,11.045 15.006,9.823C15.006,8.17 13.656,6.82 12.003,6.82C10.352,6.82 9,8.157 9,9.823H10.559Z" />
+</vector>
diff --git a/vector/src/main/res/drawable/ic_shield_unknown_no_border.xml b/vector/src/main/res/drawable/ic_shield_unknown_no_border.xml
new file mode 100644
index 0000000000..bdc35ed891
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_shield_unknown_no_border.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/shield_color_unknown"
+        android:pathData="M12.008,23.487C12.005,23.487 12.002,23.488 12,23.489C11.998,23.488 11.995,23.487 11.992,23.487C11.92,23.471 11.813,23.445 11.675,23.409C11.399,23.337 11.002,23.223 10.523,23.058C9.565,22.725 8.292,22.186 7.022,21.361C4.49,19.715 2,16.954 2,12.405V3.45L12,0.521L22,3.45V12.405C22,16.954 19.51,19.715 16.978,21.361C15.708,22.186 14.435,22.725 13.477,23.058C12.998,23.223 12.601,23.337 12.325,23.409C12.187,23.445 12.08,23.471 12.008,23.487Z"
+        android:strokeWidth="1"
+        android:strokeColor="#ffffff" />
+    <path
+        android:fillColor="@color/shield_color_unknown"
+        android:pathData="M1.5,12.405V3.075L12,0L22.5,3.075V12.405C22.5,21.945 12,24 12,24C12,24 1.5,21.945 1.5,12.405Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.003,16.5C12.577,16.5 13.043,16.035 13.043,15.46C13.043,14.887 12.577,14.421 12.003,14.421C11.429,14.421 10.964,14.887 10.964,15.46C10.964,16.035 11.429,16.5 12.003,16.5ZM10.559,9.823C10.559,9.023 11.208,8.379 12.003,8.379C12.795,8.379 13.447,9.031 13.447,9.823C13.447,10.19 13.29,10.321 12.671,10.748C12.398,10.937 12.022,11.2 11.729,11.586C11.416,11.999 11.223,12.513 11.223,13.168H12.783C12.783,12.847 12.868,12.665 12.971,12.528C13.096,12.364 13.276,12.226 13.558,12.031C13.587,12.01 13.618,11.989 13.651,11.967C14.162,11.619 15.006,11.045 15.006,9.823C15.006,8.17 13.656,6.82 12.003,6.82C10.352,6.82 9,8.157 9,9.823H10.559Z" />
+</vector>
diff --git a/vector/src/main/res/drawable/ic_spaces.xml b/vector/src/main/res/drawable/ic_spaces.xml
new file mode 100644
index 0000000000..113bfb68f4
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_spaces.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M2,1L7,1A1,1 0,0 1,8 2L8,7A1,1 0,0 1,7 8L2,8A1,1 0,0 1,1 7L1,2A1,1 0,0 1,2 1z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#0DBD8B"/>
+  <path
+      android:pathData="M13,1L18,1A1,1 0,0 1,19 2L19,7A1,1 0,0 1,18 8L13,8A1,1 0,0 1,12 7L12,2A1,1 0,0 1,13 1z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#0DBD8B"/>
+  <path
+      android:pathData="M15.5,12L15.5,12A3.5,3.5 0,0 1,19 15.5L19,15.5A3.5,3.5 0,0 1,15.5 19L15.5,19A3.5,3.5 0,0 1,12 15.5L12,15.5A3.5,3.5 0,0 1,15.5 12z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#0DBD8B"/>
+  <path
+      android:pathData="M2,12L7,12A1,1 0,0 1,8 13L8,18A1,1 0,0 1,7 19L2,19A1,1 0,0 1,1 18L1,13A1,1 0,0 1,2 12z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#0DBD8B"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_stop.xml b/vector/src/main/res/drawable/ic_stop.xml
new file mode 100644
index 0000000000..459a7cfce2
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_stop.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="24dp"
+    android:viewportWidth="18"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M1.5,3L16.5,3A1.5,1.5 0,0 1,18 4.5L18,19.5A1.5,1.5 0,0 1,16.5 21L1.5,21A1.5,1.5 0,0 1,0 19.5L0,4.5A1.5,1.5 0,0 1,1.5 3z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_text_formatting.xml b/vector/src/main/res/drawable/ic_text_formatting.xml
new file mode 100644
index 0000000000..375c459692
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_text_formatting.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M3,20.667C3,21.4 3.6,22 4.333,22H20.333C21.067,22 21.667,21.4 21.667,20.667C21.667,19.933 21.067,19.333 20.333,19.333H4.333C3.6,19.333 3,19.933 3,20.667ZM9,13.733H15.667L16.547,15.867C16.747,16.347 17.213,16.667 17.733,16.667C18.653,16.667 19.267,15.72 18.907,14.88L13.733,2.92C13.493,2.36 12.947,2 12.333,2C11.72,2 11.173,2.36 10.933,2.92L5.76,14.88C5.4,15.72 6.027,16.667 6.947,16.667C7.467,16.667 7.933,16.347 8.133,15.867L9,13.733ZM12.333,4.64L14.827,11.333H9.84L12.333,4.64Z"
+        android:fillColor="#0DBD8B"/>
+  </group>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_text_formatting_disabled.xml b/vector/src/main/res/drawable/ic_text_formatting_disabled.xml
new file mode 100644
index 0000000000..bb34211c7a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_text_formatting_disabled.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M9,15.733H15.667L16.547,17.867C16.747,18.347 17.213,18.667 17.733,18.667C18.653,18.667 19.267,17.72 18.907,16.88L13.733,4.92C13.493,4.36 12.947,4 12.333,4C11.72,4 11.173,4.36 10.933,4.92L5.76,16.88C5.4,17.72 6.027,18.667 6.947,18.667C7.467,18.667 7.933,18.347 8.133,17.867L9,15.733ZM12.333,6.64L14.827,13.333H9.84L12.333,6.64Z"
+        android:fillColor="#0DBD8B"/>
+    <path
+        android:strokeWidth="1"
+        android:pathData="M2.5,11.667C2.5,12.676 3.324,13.5 4.333,13.5H20.333C21.343,13.5 22.167,12.676 22.167,11.667C22.167,10.657 21.343,9.833 20.333,9.833H4.333C3.324,9.833 2.5,10.657 2.5,11.667Z"
+        android:fillColor="#0DBD8B"
+        android:strokeColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_timer.xml b/vector/src/main/res/drawable/ic_timer.xml
new file mode 100644
index 0000000000..11a42b0696
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_timer.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M10,1H6V2.333H10V1ZM7.333,9.667H8.667V5.667H7.333V9.667ZM12.687,5.26L13.633,4.313C13.347,3.973 13.033,3.653 12.693,3.373L11.747,4.32C10.713,3.493 9.413,3 8,3C4.687,3 2,5.687 2,9C2,12.313 4.68,15 8,15C11.32,15 14,12.313 14,9C14,7.587 13.507,6.287 12.687,5.26ZM8,13.667C5.42,13.667 3.333,11.58 3.333,9C3.333,6.42 5.42,4.333 8,4.333C10.58,4.333 12.667,6.42 12.667,9C12.667,11.58 10.58,13.667 8,13.667Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_voice_broadcast.xml b/vector/src/main/res/drawable/ic_voice_broadcast.xml
new file mode 100644
index 0000000000..7d427a56d0
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_voice_broadcast.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M13.459,2.791C13.233,2.5 12.814,2.448 12.523,2.674C12.233,2.9 12.181,3.318 12.406,3.609L12.406,3.609L12.407,3.61L12.416,3.622C12.425,3.634 12.439,3.654 12.458,3.68C12.496,3.733 12.552,3.815 12.62,3.923C12.757,4.138 12.943,4.456 13.128,4.854C13.502,5.654 13.866,6.756 13.866,8C13.866,9.245 13.502,10.347 13.128,11.147C12.943,11.545 12.757,11.863 12.62,12.078C12.552,12.186 12.496,12.267 12.458,12.321C12.439,12.347 12.425,12.367 12.416,12.378L12.407,12.391L12.406,12.391L12.406,12.392C12.181,12.683 12.233,13.101 12.523,13.327C12.814,13.553 13.233,13.5 13.459,13.21L12.962,12.823C13.459,13.21 13.459,13.21 13.459,13.21L13.46,13.208L13.462,13.205L13.468,13.198L13.485,13.175C13.5,13.155 13.52,13.128 13.545,13.093C13.595,13.023 13.664,12.922 13.745,12.794C13.908,12.538 14.123,12.17 14.337,11.711C14.763,10.797 15.199,9.499 15.199,8C15.199,6.502 14.763,5.204 14.337,4.29C14.123,3.831 13.908,3.463 13.745,3.207C13.664,3.079 13.595,2.978 13.545,2.908C13.52,2.873 13.5,2.846 13.485,2.826L13.468,2.803L13.462,2.795L13.46,2.793L13.46,2.792C13.46,2.792 13.459,2.791 12.933,3.2L13.459,2.791Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11.726,5.191C11.5,4.901 11.081,4.848 10.791,5.074C10.501,5.3 10.448,5.717 10.672,6.008L10.674,6.011C10.677,6.015 10.683,6.022 10.691,6.033C10.707,6.056 10.731,6.092 10.762,6.141C10.825,6.238 10.91,6.384 10.996,6.568C11.169,6.94 11.333,7.442 11.333,8.001C11.333,8.559 11.169,9.061 10.996,9.433C10.91,9.617 10.825,9.763 10.762,9.86C10.731,9.909 10.707,9.945 10.691,9.968C10.683,9.979 10.677,9.986 10.674,9.99L10.672,9.994C10.448,10.284 10.501,10.701 10.791,10.927C11.081,11.153 11.5,11.101 11.726,10.81L11.2,10.401C11.726,10.81 11.726,10.81 11.726,10.81L11.727,10.808L11.729,10.806L11.733,10.801L11.744,10.787C11.752,10.775 11.764,10.759 11.778,10.74C11.806,10.7 11.843,10.646 11.887,10.576C11.975,10.438 12.09,10.241 12.204,9.997C12.431,9.511 12.667,8.813 12.667,8.001C12.667,7.188 12.431,6.49 12.204,6.004C12.09,5.76 11.975,5.563 11.887,5.425C11.843,5.356 11.806,5.301 11.778,5.261C11.764,5.242 11.752,5.226 11.744,5.214L11.733,5.2L11.729,5.195L11.727,5.193L11.727,5.192C11.727,5.192 11.726,5.191 11.2,5.601L11.726,5.191Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2.407,13.21C2.633,13.5 3.052,13.553 3.343,13.327C3.633,13.101 3.686,12.683 3.461,12.392L3.46,12.391L3.459,12.391L3.45,12.378C3.441,12.366 3.427,12.347 3.408,12.321C3.371,12.267 3.314,12.186 3.246,12.078C3.109,11.863 2.924,11.545 2.738,11.147C2.364,10.347 2,9.245 2,8C2,6.756 2.364,5.654 2.738,4.854C2.924,4.456 3.109,4.138 3.246,3.923C3.314,3.815 3.371,3.733 3.408,3.68C3.427,3.654 3.441,3.634 3.45,3.622L3.459,3.61L3.46,3.609L3.461,3.609C3.686,3.318 3.633,2.9 3.343,2.674C3.052,2.448 2.633,2.5 2.407,2.791L2.904,3.177C2.407,2.791 2.407,2.791 2.407,2.791L2.406,2.793L2.404,2.795L2.399,2.802L2.381,2.826C2.366,2.846 2.346,2.873 2.321,2.908C2.272,2.978 2.203,3.079 2.121,3.207C1.958,3.463 1.744,3.831 1.529,4.29C1.103,5.204 0.667,6.502 0.667,8C0.667,9.499 1.103,10.797 1.529,11.711C1.744,12.17 1.958,12.538 2.121,12.794C2.203,12.922 2.272,13.023 2.321,13.093C2.346,13.128 2.366,13.155 2.381,13.175L2.399,13.198L2.404,13.205L2.406,13.208L2.407,13.209C2.407,13.209 2.407,13.21 2.934,12.8L2.407,13.21Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4.14,10.809C4.366,11.1 4.785,11.153 5.076,10.926C5.365,10.701 5.418,10.284 5.194,9.993L5.192,9.99C5.189,9.986 5.183,9.978 5.175,9.967C5.16,9.945 5.135,9.909 5.104,9.86C5.042,9.762 4.956,9.616 4.87,9.433C4.697,9.061 4.533,8.559 4.533,8C4.533,7.442 4.697,6.94 4.87,6.568C4.956,6.384 5.042,6.238 5.104,6.14C5.135,6.092 5.16,6.055 5.175,6.033C5.183,6.022 5.189,6.014 5.192,6.01L5.194,6.007C5.418,5.717 5.365,5.299 5.076,5.074C4.785,4.848 4.366,4.9 4.14,5.191L4.666,5.6C4.14,5.191 4.14,5.191 4.14,5.191L4.139,5.192L4.137,5.194L4.134,5.199L4.123,5.214C4.114,5.226 4.102,5.241 4.088,5.261C4.061,5.3 4.023,5.355 3.979,5.424C3.891,5.562 3.776,5.759 3.662,6.004C3.436,6.489 3.2,7.187 3.2,8C3.2,8.813 3.436,9.511 3.662,9.996C3.776,10.241 3.891,10.438 3.979,10.576C4.023,10.645 4.061,10.7 4.088,10.739C4.102,10.759 4.114,10.775 4.123,10.786L4.134,10.801L4.137,10.806L4.139,10.808L4.14,10.809C4.14,10.809 4.14,10.809 4.666,10.4L4.14,10.809Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,8m-1.333,0a1.333,1.333 0,1 1,2.667 0a1.333,1.333 0,1 1,-2.667 0"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_voice_broadcast_mic.xml b/vector/src/main/res/drawable/ic_voice_broadcast_mic.xml
new file mode 100644
index 0000000000..edadb55b81
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_voice_broadcast_mic.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M5.4,4.1C5.4,2.664 6.564,1.5 8,1.5C9.436,1.5 10.6,2.664 10.6,4.1V7.988C10.6,9.424 9.436,10.588 8,10.588C6.564,10.588 5.4,9.424 5.4,7.988V4.1Z"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M3.45,7.158C3.91,7.158 4.283,7.531 4.283,7.992C4.283,10.037 5.941,11.697 7.99,11.703C7.993,11.703 7.996,11.703 8,11.703C8.003,11.703 8.006,11.703 8.01,11.703C10.059,11.697 11.716,10.037 11.716,7.992C11.716,7.531 12.089,7.158 12.55,7.158C13.01,7.158 13.383,7.531 13.383,7.992C13.383,10.679 11.41,12.905 8.833,13.305V13.834C8.833,14.294 8.46,14.667 8,14.667C7.539,14.667 7.166,14.294 7.166,13.834V13.305C4.59,12.905 2.616,10.679 2.616,7.992C2.616,7.531 2.989,7.158 3.45,7.158Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_voice_mic.xml b/vector/src/main/res/drawable/ic_voice_mic.xml
deleted file mode 100644
index fef5fb9dcf..0000000000
--- a/vector/src/main/res/drawable/ic_voice_mic.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:pathData="M10.8,8.2C10.8,5.3281 13.1282,3 16,3C18.8719,3 21.2,5.3281 21.2,8.2V15.9767C21.2,18.8486 18.8719,21.1767 16,21.1767C13.1282,21.1767 10.8,18.8486 10.8,15.9767V8.2Z"
-      android:fillColor="?vctr_content_tertiary"/>
-  <path
-      android:pathData="M6.8998,14.3167C7.8203,14.3167 8.5665,15.0629 8.5665,15.9834C8.5665,20.0737 11.8818,23.3944 15.98,23.4051C15.9867,23.405 15.9934,23.4049 16.0001,23.4049C16.0068,23.4049 16.0134,23.405 16.0201,23.4051C20.1181,23.3941 23.4332,20.0735 23.4332,15.9834C23.4332,15.0629 24.1793,14.3167 25.0998,14.3167C26.0203,14.3167 26.7665,15.0629 26.7665,15.9834C26.7665,21.3586 22.8201,25.8101 17.6667,26.6103V27.6683C17.6667,28.5888 16.9206,29.335 16.0001,29.335C15.0796,29.335 14.3334,28.5888 14.3334,27.6683V26.6104C9.1798,25.8104 5.2332,21.3587 5.2332,15.9834C5.2332,15.0629 5.9794,14.3167 6.8998,14.3167Z"
-      android:fillColor="?vctr_content_tertiary"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_voice_mic_recording.xml b/vector/src/main/res/drawable/ic_voice_mic_recording.xml
deleted file mode 100644
index a57852c92f..0000000000
--- a/vector/src/main/res/drawable/ic_voice_mic_recording.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="52dp"
-    android:height="52dp"
-    android:viewportWidth="52"
-    android:viewportHeight="52">
-  <path
-      android:pathData="M21.2414,18.7749C21.2414,16.051 23.4496,13.8429 26.1734,13.8429C28.8973,13.8429 31.1054,16.051 31.1054,18.7749V26.1509C31.1054,28.8747 28.8973,31.0829 26.1734,31.0829C23.4496,31.0829 21.2414,28.8747 21.2414,26.1509V18.7749ZM17.542,24.2475C18.5968,24.2475 19.4518,25.1025 19.4518,26.1572C19.4518,29.8561 22.4509,32.8596 26.1586,32.8675C26.1637,32.8674 26.1689,32.8674 26.174,32.8674C26.179,32.8674 26.184,32.8674 26.189,32.8675C29.896,32.8589 32.8944,29.8556 32.8944,26.1572C32.8944,25.1025 33.7494,24.2475 34.8041,24.2475C35.8588,24.2475 36.7138,25.1025 36.7138,26.1572C36.7138,31.3227 32.9916,35.6165 28.0837,36.5143V37.24C28.0837,38.2947 27.2287,39.1497 26.174,39.1497C25.1193,39.1497 24.2643,38.2947 24.2643,37.24V36.5147C19.3555,35.6176 15.6323,31.3233 15.6323,26.1572C15.6323,25.1025 16.4873,24.2475 17.542,24.2475Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/vector/src/main/res/drawable/new_space_home_background.xml b/vector/src/main/res/drawable/new_space_home_background.xml
new file mode 100644
index 0000000000..47fdeb0226
--- /dev/null
+++ b/vector/src/main/res/drawable/new_space_home_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:width="40dp" android:height="40dp"/>
+
+    <solid android:color="?android:colorBackground" />
+
+    <corners android:radius="8dp" />
+
+</shape>
diff --git a/vector/src/main/res/drawable/placeholder_shape_8.xml b/vector/src/main/res/drawable/placeholder_shape_8.xml
index 503389788d..4e015d4a56 100644
--- a/vector/src/main/res/drawable/placeholder_shape_8.xml
+++ b/vector/src/main/res/drawable/placeholder_shape_8.xml
@@ -2,10 +2,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <size android:width="40dp" android:height="40dp"/>
 
     <solid android:color="?vctr_reaction_background_off" />
 
     <corners android:radius="8dp" />
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/vector/src/main/res/drawable/poll_option_checked.xml b/vector/src/main/res/drawable/poll_option_checked.xml
index 28ab94a421..2324792eac 100644
--- a/vector/src/main/res/drawable/poll_option_checked.xml
+++ b/vector/src/main/res/drawable/poll_option_checked.xml
@@ -10,5 +10,9 @@
     </item>
     <item
         android:drawable="@drawable/ic_check_on_white"
-        android:gravity="center" />
-</layer-list>
\ No newline at end of file
+        android:top="2dp"
+        android:bottom="2dp"
+        android:left="2dp"
+        android:right="2dp"
+        />
+</layer-list>
diff --git a/vector/src/main/res/drawable/rounded_rect_shape_2.xml b/vector/src/main/res/drawable/rounded_rect_shape_2.xml
new file mode 100644
index 0000000000..977de2fd09
--- /dev/null
+++ b/vector/src/main/res/drawable/rounded_rect_shape_2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:width="40dp" android:height="40dp"/>
+
+    <solid android:color="?vctr_system" />
+
+    <corners android:radius="2dp" />
+
+</shape>
diff --git a/vector/src/main/res/drawable/space_home_background.xml b/vector/src/main/res/drawable/space_home_background.xml
index 2efd6d407c..c7fc727267 100644
--- a/vector/src/main/res/drawable/space_home_background.xml
+++ b/vector/src/main/res/drawable/space_home_background.xml
@@ -10,4 +10,4 @@
 
     <corners android:radius="8dp" />
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/vector/src/main/res/layout/activity_home.xml b/vector/src/main/res/layout/activity_home.xml
index 9899c15aa6..698aab2340 100644
--- a/vector/src/main/res/layout/activity_home.xml
+++ b/vector/src/main/res/layout/activity_home.xml
@@ -28,4 +28,4 @@
         android:layout_height="match_parent"
         android:layout_gravity="start" />
 
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
new file mode 100644
index 0000000000..7a22ab57f8
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?colorSurface">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/gallery"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_gallery"
+            app:leftIcon="@drawable/ic_attachment_gallery"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/stickers"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_sticker"
+            app:leftIcon="@drawable/ic_attachment_sticker"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/file"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_file"
+            app:leftIcon="@drawable/ic_attachment_file"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/voiceBroadcast"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_voice_broadcast"
+            app:leftIcon="@drawable/ic_attachment_voice_broadcast"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/poll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_poll"
+            app:leftIcon="@drawable/ic_attachment_poll"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/location"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_location"
+            app:leftIcon="@drawable/ic_attachment_location"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/camera"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_camera"
+            app:leftIcon="@drawable/ic_attachment_camera"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/contact"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_contact"
+            app:leftIcon="@drawable/ic_attachment_contact_white_24dp"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?vctr_list_separator" />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/textFormatting"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/ic_text_formatting"
+            android:drawablePadding="20dp"
+            android:padding="20dp"
+            android:paddingStart="28dp"
+            android:text="@string/attachment_type_selector_text_formatting"
+            android:textAppearance="@style/TextAppearance.Vector.Subtitle"
+            android:textColor="?vctr_content_primary"
+            app:drawableTint="?colorPrimary"
+            tools:ignore="RtlSymmetry" />
+
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
new file mode 100644
index 0000000000..fd66aec1ea
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="36dp"
+        android:layout_height="6dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/ic_bottom_sheet_handle" />
+
+    <TextView
+        style="@style/TextAppearance.Vector.Subtitle.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:paddingHorizontal="24dp"
+        android:text="@string/device_manager_filter_bottom_sheet_title" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:paddingHorizontal="24dp"
+        android:paddingBottom="32dp"
+        android:scrollbarStyle="outsideOverlay">
+
+        <RadioGroup
+            android:id="@+id/filterOptionsRadioGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="24dp"
+            android:showDividers="none">
+
+            <RadioButton
+                android:id="@+id/filterOptionAllSessionsRadioButton"
+                style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:background="?android:selectableItemBackground"
+                android:button="@null"
+                android:checked="true"
+                android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
+                android:minHeight="0dp"
+                android:text="@string/device_manager_filter_option_all_sessions"
+                android:textAlignment="textStart" />
+
+            <RadioButton
+                android:id="@+id/filterOptionVerifiedRadioButton"
+                style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginTop="24dp"
+                android:background="?android:selectableItemBackground"
+                android:button="@null"
+                android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
+                android:minHeight="0dp"
+                android:text="@string/device_manager_filter_option_verified"
+                android:textAlignment="textStart" />
+
+            <TextView
+                android:id="@+id/filterOptionVerifiedTextView"
+                style="@style/TextAppearance.Vector.Body.DevicesManagement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/device_manager_filter_option_verified_description" />
+
+            <RadioButton
+                android:id="@+id/filterOptionUnverifiedRadioButton"
+                style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginTop="16dp"
+                android:background="?android:selectableItemBackground"
+                android:button="@null"
+                android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
+                android:minHeight="0dp"
+                android:text="@string/device_manager_filter_option_unverified"
+                android:textAlignment="textStart" />
+
+            <TextView
+                android:id="@+id/filterOptionUnverifiedTextView"
+                style="@style/TextAppearance.Vector.Body.DevicesManagement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/device_manager_filter_option_unverified_description" />
+
+            <RadioButton
+                android:id="@+id/filterOptionInactiveRadioButton"
+                style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginTop="16dp"
+                android:background="?android:selectableItemBackground"
+                android:button="@null"
+                android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
+                android:minHeight="0dp"
+                android:text="@string/device_manager_filter_option_inactive"
+                android:textAlignment="textStart" />
+
+            <TextView
+                android:id="@+id/filterOptionInactiveTextView"
+                style="@style/TextAppearance.Vector.Body.DevicesManagement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </RadioGroup>
+
+    </ScrollView>
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_home_layout_settings.xml b/vector/src/main/res/layout/bottom_sheet_home_layout_settings.xml
new file mode 100644
index 0000000000..1766695354
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_home_layout_settings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorSurface"
+    android:orientation="vertical">
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="8dp"
+        android:text="@string/home_layout_preferences"
+        android:textAllCaps="true" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/home_layout_settings_recents"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_marginHorizontal="16dp"
+        android:checked="true"
+        android:text="@string/home_layout_preferences_recents" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/home_layout_settings_filters"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_marginHorizontal="16dp"
+        android:checked="true"
+        android:text="@string/home_layout_preferences_filters" />
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginVertical="8dp"
+        android:text="@string/home_layout_preferences_sort_by"
+        android:textAllCaps="true" />
+
+    <RadioGroup
+        android:id="@+id/home_layout_settings_sort_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:orientation="vertical">
+
+        <RadioButton
+            android:id="@+id/home_layout_settings_sort_activity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/home_layout_preferences_sort_activity"
+            android:textColor="?vctr_content_primary" />
+
+        <RadioButton
+            android:id="@+id/home_layout_settings_sort_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/home_layout_preferences_sort_name"
+            android:textColor="?vctr_content_primary" />
+    </RadioGroup>
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_release_notes.xml b/vector/src/main/res/layout/bottom_sheet_release_notes.xml
new file mode 100644
index 0000000000..1d14c2c4a2
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_release_notes.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="bottom"
+    android:background="?colorSurface">
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/release_notes_btn_close"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@null"
+        android:src="@drawable/ic_close_24dp"
+        android:tint="?vctr_content_secondary"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/release_notes_carousel_indicator"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:layout_marginBottom="@dimen/release_notes_vertical_margin_small"
+        android:background="@null"
+        app:layout_constraintBottom_toTopOf="@id/releaseNotesButtonNext"
+        app:tabBackground="@drawable/indicator_onboarding_carousel_selector"
+        app:tabGravity="center"
+        app:tabIndicatorHeight="0dp"
+        app:tabPaddingEnd="8dp"
+        app:tabPaddingStart="8dp" />
+
+    <Button
+        android:id="@+id/releaseNotesButtonNext"
+        style="@style/Widget.Vector.Button.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginBottom="@dimen/release_notes_vertical_margin"
+        android:textAllCaps="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@string/action_next" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/release_notes_carousel"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/release_notes_vertical_margin_small"
+        android:layout_marginBottom="@dimen/release_notes_vertical_margin"
+        app:layout_constraintBottom_toTopOf="@id/release_notes_carousel_indicator"
+        app:layout_constraintTop_toBottomOf="@id/release_notes_btn_close" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_session_learn_more.xml b/vector/src/main/res/layout/bottom_sheet_session_learn_more.xml
new file mode 100644
index 0000000000..466ab5af49
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_session_learn_more.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorSurface"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="16dp">
+
+    <View
+        android:id="@+id/bottomSheetSessionLearnMoreHandle"
+        android:layout_width="36dp"
+        android:layout_height="6dp"
+        android:background="@drawable/ic_bottom_sheet_handle"
+        app:layout_constraintBottom_toTopOf="@id/bottomSheetSessionLearnMoreTitle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/bottomSheetSessionLearnMoreTitle"
+        style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        app:layout_constraintBottom_toTopOf="@id/bottomSheetSessionLearnMoreDescription"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/bottomSheetSessionLearnMoreHandle"
+        tools:text="Verified sessions" />
+
+    <TextView
+        android:id="@+id/bottomSheetSessionLearnMoreDescription"
+        style="@style/TextAppearance.Vector.Body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        app:layout_constraintBottom_toTopOf="@id/bottomSheetSessionLearnMoreCloseButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/bottomSheetSessionLearnMoreTitle"
+        tools:text="Further context on verified sessions. What do those mean, and how do they differ from unverified ones." />
+
+    <Button
+        android:id="@+id/bottomSheetSessionLearnMoreCloseButton"
+        style="@style/Widget.Vector.Button.CallToAction"
+        android:layout_width="0dp"
+        android:layout_height="56dp"
+        android:layout_marginTop="24dp"
+        android:text="@string/action_got_it"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/bottomSheetSessionLearnMoreDescription" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index bed10f7606..7c465891c3 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -1,146 +1,210 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:constraintSet="@layout/composer_layout_constraint_set_compact"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+    android:orientation="vertical">
 
-    <!-- ========================
-        /!\ Constraints for this layout are defined in external layout files that are used as constraint set for animation.
-        /!\ These 3 files must be modified to stay coherent!
-    ======================== -->
-    <View
-        android:id="@+id/related_message_background"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="?colorSurface"
-        tools:ignore="MissingConstraints" />
-
-    <View
-        android:id="@+id/related_message_background_top_separator"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="?vctr_list_separator"
-        tools:ignore="MissingConstraints" />
-
-    <ImageView
-        android:id="@+id/composerRelatedMessageAvatar"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:importantForAccessibility="no"
-        tools:ignore="MissingConstraints" />
-
-    <TextView
-        android:id="@+id/composerRelatedMessageTitle"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:textStyle="bold"
-        tools:ignore="MissingConstraints"
-        tools:text="@tools:sample/first_names"
-        tools:visibility="gone" />
-
-    <TextView
-        android:id="@+id/composerRelatedMessageContent"
-        android:layout_width="0dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/related_message_group"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="3"
-        android:textColor="?vctr_message_text_color"
-        tools:ignore="MissingConstraints"
-        tools:text="@tools:sample/lorem"
-        tools:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible">
 
-    <ImageView
-        android:id="@+id/composerRelatedMessageActionIcon"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:importantForAccessibility="no"
-        app:tint="?vctr_content_primary"
-        tools:ignore="MissingConstraints,MissingPrefix" />
+        <View
+            android:id="@+id/related_message_background"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="?colorSurface"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-    <ImageView
-        android:id="@+id/composerRelatedMessageImage"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:importantForAccessibility="no"
-        tools:ignore="MissingPrefix" />
+        <View
+            android:id="@+id/related_message_background_top_separator"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:background="?vctr_list_separator"
+            app:layout_constraintEnd_toEndOf="@id/related_message_background"
+            app:layout_constraintStart_toStartOf="@id/related_message_background"
+            app:layout_constraintTop_toTopOf="@id/related_message_background" />
 
-    <ImageButton
-        android:id="@+id/composerRelatedMessageCloseButton"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/action_cancel"
-        android:src="@drawable/ic_close_round"
-        app:tint="?colorError"
-        tools:ignore="MissingConstraints,MissingPrefix" />
+        <ImageView
+            android:id="@+id/composerRelatedMessageAvatar"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:importantForAccessibility="no"
+            app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageActionIcon"
+            app:layout_constraintEnd_toStartOf="@id/composerRelatedMessageTitle"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/composerRelatedMessageTitle"
+            tools:src="@sample/user_round_avatars" />
 
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/composer_preview_barrier"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:barrierDirection="bottom"
-        app:barrierMargin="8dp"
-        app:constraint_referenced_ids="composerRelatedMessageContent,composerRelatedMessageActionIcon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        <TextView
+            android:id="@+id/composerRelatedMessageTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@id/composerRelatedMessageCloseButton"
+            app:layout_constraintStart_toEndOf="@id/composerRelatedMessageAvatar"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@tools:sample/first_names" />
 
-    <ImageButton
-        android:id="@+id/attachmentButton"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/option_send_files"
-        android:src="@drawable/ic_attachment"
-        tools:ignore="MissingConstraints" />
+        <TextView
+            android:id="@+id/composerRelatedMessageContent"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textColor="?vctr_message_text_color"
+            app:layout_constrainedHeight="true"
+            app:layout_constraintEnd_toEndOf="@id/composerRelatedMessageTitle"
+            app:layout_constraintStart_toStartOf="@id/composerRelatedMessageTitle"
+            app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageImage"
+            tools:text="@tools:sample/lorem/random"  />
 
-    <FrameLayout
-        android:id="@+id/composerEditTextOuterBorder"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/bg_composer_edit_text" />
+        <ImageView
+            android:id="@+id/composerRelatedMessageActionIcon"
+            android:layout_width="10dp"
+            android:layout_height="10dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="38dp"
+            android:alpha="1"
+            android:importantForAccessibility="no"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="@id/composerRelatedMessageAvatar"
+            app:layout_constraintStart_toStartOf="@id/composerRelatedMessageAvatar"
+            app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageAvatar"
+            app:tint="?vctr_content_primary"
+            tools:ignore="MissingPrefix"
+            tools:src="@drawable/ic_edit" />
 
-    <im.vector.app.features.home.room.detail.composer.ComposerEditText
-        android:id="@+id/composerEditText"
-        style="@style/Widget.Vector.EditText.Composer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:nextFocusLeft="@id/composerEditText"
-        android:nextFocusUp="@id/composerEditText"
-        tools:hint="@string/room_message_placeholder"
-        tools:ignore="MissingConstraints" />
+        <ImageView
+            android:id="@+id/composerRelatedMessageImage"
+            android:layout_width="100dp"
+            android:layout_height="66dp"
+            android:layout_marginTop="6dp"
+            android:importantForAccessibility="no"
+            android:scaleType="centerCrop"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="@id/composerRelatedMessageTitle"
+            app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageTitle"
+            tools:ignore="MissingPrefix"
+            tools:src="@tools:sample/backgrounds/scenic"
+            tools:visibility="visible" />
 
-    <ImageButton
-        android:id="@+id/composerEmojiButton"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/a11y_open_emoji_picker"
-        android:src="@drawable/ic_insert_emoji"
-        app:tint="?vctr_content_tertiary"
-        tools:ignore="MissingConstraints,MissingPrefix" />
+        <ImageButton
+            android:id="@+id/composerRelatedMessageCloseButton"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/action_cancel"
+            android:src="@drawable/ic_close_round"
+            app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="?colorError"
+            tools:ignore="MissingPrefix" />
 
-    <ImageButton
-        android:id="@+id/sendButton"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/bg_send"
-        android:contentDescription="@string/action_send"
-        android:src="@drawable/ic_send"
-        tools:ignore="MissingConstraints" />
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/composer_preview_barrier"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:barrierDirection="bottom"
+            app:barrierMargin="8dp"
+            app:constraint_referenced_ids="composerRelatedMessageContent,composerRelatedMessageActionIcon"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-    <!--
-    <ImageButton
-        android:id="@+id/voiceMessageMicButton"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/a11y_start_voice_message"
-        android:src="@drawable/ic_voice_mic" />
-    -->
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</merge>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageButton
+            android:id="@+id/attachmentButton"
+            android:layout_width="@dimen/composer_attachment_size"
+            android:layout_height="@dimen/composer_attachment_size"
+            android:layout_margin="@dimen/composer_attachment_margin"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/option_send_files"
+            android:src="@drawable/ic_attachment"
+            app:layout_constraintBottom_toBottomOf="@id/sendButton"
+            app:layout_constraintEnd_toStartOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/sendButton"
+            app:layout_goneMarginBottom="57dp"
+            tools:ignore="MissingPrefix" />
+
+        <FrameLayout
+            android:id="@+id/composerEditTextOuterBorder"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="@drawable/bg_composer_edit_text"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/sendButton"
+            app:layout_constraintStart_toEndOf="@id/attachmentButton"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginEnd="12dp" />
+
+        <im.vector.app.features.home.room.detail.composer.ComposerEditText
+            android:id="@+id/composerEditText"
+            style="@style/Widget.Vector.EditText.Composer"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="@string/room_message_placeholder"
+            android:nextFocusLeft="@id/composerEditText"
+            android:nextFocusUp="@id/composerEditText"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/composerEmojiButton"
+            app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@tools:sample/lorem/random" />
+
+        <ImageButton
+            android:id="@+id/composerEmojiButton"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_margin="1dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/a11y_open_emoji_picker"
+            android:src="@drawable/ic_insert_emoji"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="@id/attachmentButton"
+            app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintStart_toEndOf="@id/composerEditText"
+            app:layout_constraintTop_toTopOf="@id/attachmentButton"
+            app:layout_goneMarginEnd="8dp"
+            app:tint="?vctr_content_quaternary"
+            tools:ignore="MissingPrefix"
+            tools:visibility="visible" />
+
+        <ImageButton
+            android:id="@+id/sendButton"
+            android:layout_width="56dp"
+            android:layout_height="@dimen/composer_min_height"
+            android:layout_marginEnd="2dp"
+            android:background="@drawable/bg_send"
+            android:contentDescription="@string/action_send"
+            android:scaleType="center"
+            android:src="@drawable/ic_send"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:ignore="MissingPrefix"
+            tools:visibility="visible" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
deleted file mode 100644
index 7b37fb9c60..0000000000
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/composerLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent">
-
-    <View
-        android:id="@+id/related_message_background"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="?colorSurface"
-        app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:layout_height="40dp" />
-
-    <View
-        android:id="@+id/related_message_background_top_separator"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="?vctr_list_separator"
-        app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ImageView
-        android:id="@+id/composerRelatedMessageAvatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:importantForAccessibility="no"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/composerRelatedMessageTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textStyle="bold"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageContent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@tools:sample/first_names" />
-
-    <TextView
-        android:id="@+id/composerRelatedMessageContent"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@tools:sample/lorem/random" />
-
-    <ImageView
-        android:id="@+id/composerRelatedMessageActionIcon"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="38dp"
-        android:alpha="0"
-        android:importantForAccessibility="no"
-        app:layout_constraintEnd_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:tint="?vctr_content_primary"
-        tools:ignore="MissingConstraints,MissingPrefix"
-        tools:src="@drawable/ic_edit" />
-
-    <ImageView
-        android:id="@+id/composerRelatedMessageImage"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:importantForAccessibility="no"
-        app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintStart_toEndOf="parent"
-        tools:ignore="MissingPrefix"
-        tools:src="@tools:sample/backgrounds/scenic" />
-
-    <ImageButton
-        android:id="@+id/composerRelatedMessageCloseButton"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/action_cancel"
-        android:src="@drawable/ic_close_round"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintStart_toEndOf="parent"
-        app:tint="?colorError"
-        tools:ignore="MissingPrefix"
-        tools:visibility="visible" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/composer_preview_barrier"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:barrierDirection="bottom"
-        app:barrierMargin="8dp"
-        app:constraint_referenced_ids="composerRelatedMessageContent,composerRelatedMessageActionIcon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ImageButton
-        android:id="@+id/attachmentButton"
-        android:layout_width="@dimen/composer_attachment_size"
-        android:layout_height="@dimen/composer_attachment_size"
-        android:layout_margin="@dimen/composer_attachment_margin"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/option_send_files"
-        android:src="@drawable/ic_attachment"
-        app:layout_constraintBottom_toBottomOf="@id/sendButton"
-        app:layout_constraintEnd_toStartOf="@id/composerEditTextOuterBorder"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/sendButton"
-        app:layout_goneMarginBottom="57dp"
-        tools:ignore="MissingPrefix" />
-
-    <FrameLayout
-        android:id="@+id/composerEditTextOuterBorder"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/sendButton"
-        app:layout_constraintStart_toEndOf="@id/attachmentButton"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginEnd="12dp" />
-
-    <im.vector.app.features.home.room.detail.composer.ComposerEditText
-        android:id="@+id/composerEditText"
-        style="@style/Widget.Vector.EditText.Composer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:hint="@string/room_message_placeholder"
-        android:nextFocusLeft="@id/composerEditText"
-        android:nextFocusUp="@id/composerEditText"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/composerEmojiButton"
-        app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/lorem/random" />
-
-    <ImageButton
-        android:id="@+id/composerEmojiButton"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_margin="1dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/a11y_open_emoji_picker"
-        android:src="@drawable/ic_insert_emoji"
-        app:layout_constraintBottom_toBottomOf="@id/attachmentButton"
-        app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
-        app:layout_constraintStart_toEndOf="@id/composerEditText"
-        app:layout_constraintTop_toTopOf="@id/attachmentButton"
-        app:layout_goneMarginEnd="8dp"
-        app:tint="?vctr_content_quaternary"
-        tools:ignore="MissingPrefix" />
-
-    <ImageButton
-        android:id="@+id/sendButton"
-        android:layout_width="56dp"
-        android:layout_height="@dimen/composer_min_height"
-        android:layout_marginEnd="2dp"
-        android:background="@drawable/bg_send"
-        android:contentDescription="@string/action_send"
-        android:scaleType="center"
-        android:src="@drawable/ic_send"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:ignore="MissingPrefix"
-        tools:visibility="visible" />
-
-    <!--
-    <ImageButton
-        android:id="@+id/voiceMessageMicButton"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/a11y_start_voice_message"
-        android:src="@drawable/ic_voice_mic"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-    -->
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
deleted file mode 100644
index 72bdf37911..0000000000
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/composerLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent">
-
-    <View
-        android:id="@+id/related_message_background"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="?colorSurface"
-        app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <View
-        android:id="@+id/related_message_background_top_separator"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:background="?vctr_list_separator"
-        app:layout_constraintEnd_toEndOf="@id/related_message_background"
-        app:layout_constraintStart_toStartOf="@id/related_message_background"
-        app:layout_constraintTop_toTopOf="@id/related_message_background" />
-
-    <ImageView
-        android:id="@+id/composerRelatedMessageAvatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:importantForAccessibility="no"
-        app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageActionIcon"
-        app:layout_constraintEnd_toStartOf="@id/composerRelatedMessageTitle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/composerRelatedMessageTitle"
-        tools:src="@sample/user_round_avatars" />
-
-    <TextView
-        android:id="@+id/composerRelatedMessageTitle"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@id/composerRelatedMessageCloseButton"
-        app:layout_constraintStart_toEndOf="@id/composerRelatedMessageAvatar"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/first_names" />
-
-    <ImageView
-        android:id="@+id/composerRelatedMessageImage"
-        android:layout_width="100dp"
-        android:layout_height="66dp"
-        android:layout_marginTop="6dp"
-        android:importantForAccessibility="no"
-        android:scaleType="centerCrop"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="@id/composerRelatedMessageTitle"
-        app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageTitle"
-        tools:ignore="MissingPrefix"
-        tools:src="@tools:sample/backgrounds/scenic"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/composerRelatedMessageContent"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textColor="?vctr_message_text_color"
-        app:layout_constrainedHeight="true"
-        app:layout_constraintEnd_toEndOf="@id/composerRelatedMessageTitle"
-        app:layout_constraintStart_toStartOf="@id/composerRelatedMessageTitle"
-        app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageImage"
-        tools:text="@tools:sample/lorem/random" />
-
-    <ImageView
-        android:id="@+id/composerRelatedMessageActionIcon"
-        android:layout_width="10dp"
-        android:layout_height="10dp"
-        android:layout_marginTop="6dp"
-        android:layout_marginBottom="38dp"
-        android:alpha="1"
-        android:importantForAccessibility="no"
-        android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="@id/composerRelatedMessageAvatar"
-        app:layout_constraintStart_toStartOf="@id/composerRelatedMessageAvatar"
-        app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageAvatar"
-        app:tint="?vctr_content_primary"
-        tools:ignore="MissingPrefix"
-        tools:src="@drawable/ic_edit" />
-
-    <ImageButton
-        android:id="@+id/composerRelatedMessageCloseButton"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/action_cancel"
-        android:src="@drawable/ic_close_round"
-        app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="?colorError"
-        tools:ignore="MissingPrefix" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/composer_preview_barrier"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:barrierDirection="bottom"
-        app:barrierMargin="8dp"
-        app:constraint_referenced_ids="composerRelatedMessageContent,composerRelatedMessageActionIcon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ImageButton
-        android:id="@+id/attachmentButton"
-        android:layout_width="@dimen/composer_attachment_size"
-        android:layout_height="@dimen/composer_attachment_size"
-        android:layout_margin="@dimen/composer_attachment_margin"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/option_send_files"
-        android:src="@drawable/ic_attachment"
-        app:layout_constraintBottom_toBottomOf="@id/sendButton"
-        app:layout_constraintEnd_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/sendButton"
-        tools:ignore="MissingPrefix" />
-
-    <FrameLayout
-        android:id="@+id/composerEditTextOuterBorder"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/sendButton"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
-        app:layout_goneMarginEnd="12dp" />
-
-    <im.vector.app.features.home.room.detail.composer.ComposerEditText
-        android:id="@+id/composerEditText"
-        style="@style/Widget.Vector.EditText.Composer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:nextFocusLeft="@id/composerEditText"
-        android:nextFocusUp="@id/composerEditText"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/composerEmojiButton"
-        app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
-        app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
-        tools:text="@tools:sample/lorem/random" />
-
-    <ImageButton
-        android:id="@+id/composerEmojiButton"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_margin="1dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/a11y_open_emoji_picker"
-        android:src="@drawable/ic_insert_emoji"
-        app:layout_constraintBottom_toBottomOf="@id/sendButton"
-        app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
-        app:layout_constraintStart_toEndOf="@id/composerEditText"
-        app:layout_constraintTop_toTopOf="@id/sendButton"
-        app:layout_goneMarginBottom="52dp"
-        app:layout_goneMarginEnd="8dp"
-        app:tint="?vctr_content_quaternary"
-        tools:ignore="MissingPrefix" />
-
-    <ImageButton
-        android:id="@+id/sendButton"
-        android:layout_width="56dp"
-        android:layout_height="@dimen/composer_min_height"
-        android:layout_marginEnd="2dp"
-        android:background="@drawable/bg_send"
-        android:contentDescription="@string/action_send"
-        android:scaleType="center"
-        android:src="@drawable/ic_send"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
-        app:layout_constraintVertical_bias="1"
-        tools:ignore="MissingPrefix"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/composer_rich_text_layout.xml b/vector/src/main/res/layout/composer_rich_text_layout.xml
new file mode 100644
index 0000000000..7cc2d48cda
--- /dev/null
+++ b/vector/src/main/res/layout/composer_rich_text_layout.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/composerLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@drawable/bg_composer_rich_bottom_sheet">
+
+    <FrameLayout
+        android:id="@+id/bottomSheetHandle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <View
+            android:layout_width="36dp"
+            android:layout_height="5dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/bottomsheet_handle" />
+
+    </FrameLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/composerLayoutContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageButton
+            android:id="@+id/attachmentButton"
+            android:layout_width="60dp"
+            android:layout_height="56dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/option_send_files"
+            android:src="@drawable/ic_rich_composer_add"
+            app:layout_constraintVertical_bias="1"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginBottom="56dp"
+            tools:ignore="MissingPrefix,RtlSymmetry" />
+
+        <!-- Constraints are updated programmatically -->
+        <FrameLayout
+            android:id="@+id/composerEditTextOuterBorder"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:minHeight="40dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginHorizontal="12dp"
+            app:layout_constraintVertical_bias="0"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/sendButton"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/composerModeIconView"
+            android:layout_width="11dp"
+            android:layout_height="11dp"
+            tools:src="@drawable/ic_quote"
+            android:layout_marginStart="12dp"
+            app:layout_constraintTop_toTopOf="@id/composerModeTitleView"
+            app:layout_constraintBottom_toBottomOf="@id/composerModeTitleView"
+            app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
+            app:tint="?vctr_content_tertiary" />
+
+        <TextView android:id="@+id/composerModeTitleView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="8dp"
+            android:paddingBottom="2dp"
+            android:fontFamily="sans-serif-medium"
+            tools:text="Editing"
+            style="@style/BottomSheetItemTime"
+            app:layout_constraintTop_toTopOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintStart_toEndOf="@id/composerModeIconView" />
+
+        <ImageButton android:id="@+id/composerModeCloseView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_composer_rich_text_editor_close"
+            android:background="?android:selectableItemBackground"
+            android:layout_marginEnd="12dp"
+            android:contentDescription="@string/action_close"
+            app:layout_constraintTop_toTopOf="@id/composerModeIconView"
+            app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/composerModeBarrier"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="composerModeIconView,composerModeTitleView,composerModeCloseView" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/composerModeGroup"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:constraint_referenced_ids="composerModeIconView,composerModeTitleView,composerModeCloseView" />
+
+        <io.element.android.wysiwyg.EditorEditText
+            android:id="@+id/richTextComposerEditText"
+            style="@style/Widget.Vector.EditText.RichTextComposer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintHeight_default="wrap"
+            android:gravity="top"
+            android:hint="@string/room_message_placeholder"
+            android:nextFocusLeft="@id/richTextComposerEditText"
+            android:nextFocusUp="@id/richTextComposerEditText"
+            android:layout_marginStart="12dp"
+            android:imeOptions="flagNoExtractUi"
+            app:layout_constraintVertical_bias="0"
+            app:layout_constraintBottom_toBottomOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintEnd_toStartOf="@id/composerFullScreenButton"
+            app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintTop_toBottomOf="@id/composerModeBarrier"
+            tools:text="@tools:sample/lorem/random" />
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/plainTextComposerEditText"
+            style="@style/Widget.Vector.EditText.RichTextComposer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintHeight_default="wrap"
+            android:visibility="gone"
+            android:hint="@string/room_message_placeholder"
+            android:nextFocusLeft="@id/plainTextComposerEditText"
+            android:nextFocusUp="@id/plainTextComposerEditText"
+            android:layout_marginStart="12dp"
+            android:gravity="top"
+            android:imeOptions="flagNoExtractUi"
+            app:layout_constraintVertical_bias="0"
+            app:layout_constraintBottom_toBottomOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintEnd_toStartOf="@id/composerFullScreenButton"
+            app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintTop_toBottomOf="@id/composerModeBarrier"
+            tools:text="@tools:sample/lorem/random" />
+
+        <ImageButton
+            android:id="@+id/composerFullScreenButton"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginEnd="4dp"
+            app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintTop_toBottomOf="@id/composerModeBarrier"
+            app:layout_constraintBottom_toBottomOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintVertical_bias="0"
+            android:src="@drawable/ic_composer_full_screen"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/rich_text_editor_full_screen_toggle" />
+
+        <ImageButton
+            android:id="@+id/sendButton"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:paddingEnd="4dp"
+            android:contentDescription="@string/action_send"
+            android:scaleType="center"
+            android:src="@drawable/ic_rich_composer_send"
+            android:visibility="invisible"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            app:layout_constraintTop_toBottomOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintVertical_bias="1"
+            tools:ignore="MissingPrefix,RtlSymmetry"
+            tools:visibility="visible" />
+
+        <HorizontalScrollView android:id="@+id/richTextMenuScrollView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:minHeight="52dp"
+            android:requiresFadingEdge="horizontal"
+            android:fadingEdgeLength="28dp"
+            app:layout_constraintTop_toBottomOf="@id/composerEditTextOuterBorder"
+            app:layout_constraintStart_toEndOf="@id/attachmentButton"
+            app:layout_constraintEnd_toStartOf="@id/sendButton"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:id="@+id/richTextMenu"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:paddingVertical="4dp">
+
+            </LinearLayout>
+
+        </HorizontalScrollView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/dialog_device_verify.xml b/vector/src/main/res/layout/dialog_device_verify.xml
index bbf346c8dc..475ffc69af 100644
--- a/vector/src/main/res/layout/dialog_device_verify.xml
+++ b/vector/src/main/res/layout/dialog_device_verify.xml
@@ -39,7 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
-            android:text="@string/encryption_information_device_id"
+            android:text="@string/device_manager_session_details_session_id"
             android:textStyle="bold" />
 
         <TextView
@@ -73,4 +73,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/vector/src/main/res/layout/fragment_composer.xml b/vector/src/main/res/layout/fragment_composer.xml
new file mode 100644
index 0000000000..5038a9e179
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_composer.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent">
+
+    <im.vector.app.features.home.room.detail.composer.PlainTextComposerLayout
+        android:id="@+id/composerLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:colorBackground"
+        android:minHeight="56dp"
+        android:transitionName="composer"
+        android:visibility="gone"
+        tools:visibility="gone" />
+
+    <im.vector.app.features.home.room.detail.composer.RichTextComposerLayout
+        android:id="@+id/richTextComposerLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_composer_rich_bottom_sheet"
+        android:minHeight="56dp"
+        android:transitionName="composer"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+</FrameLayout>
diff --git a/vector/src/main/res/layout/fragment_ftue_combined_login.xml b/vector/src/main/res/layout/fragment_ftue_combined_login.xml
index 12943b4dc0..7eff92f4f9 100644
--- a/vector/src/main/res/layout/fragment_ftue_combined_login.xml
+++ b/vector/src/main/res/layout/fragment_ftue_combined_login.xml
@@ -194,9 +194,9 @@
             android:text="@string/ftue_auth_forgot_password"
             android:textAllCaps="true"
             android:textColor="?colorSecondary"
-            app:layout_constraintHorizontal_bias="1"
             app:layout_constraintBottom_toTopOf="@id/actionSpacing"
             app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintHorizontal_bias="1"
             app:layout_constraintStart_toStartOf="@id/loginGutterStart"
             app:layout_constraintTop_toBottomOf="@id/loginPasswordInput" />
 
@@ -244,6 +244,20 @@
             app:layout_constraintStart_toStartOf="@id/loginGutterStart"
             app:layout_constraintTop_toBottomOf="@id/loginSubmit" />
 
+        <Button
+            android:id="@+id/loginWithQrCode"
+            style="@style/Widget.Vector.Button.Outlined.Login"
+            android:layout_width="0dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="12dp"
+            android:text="@string/login_scan_qr_code"
+            android:visibility="gone"
+            app:drawableLeftCompat="@drawable/ic_qr_code"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/ssoButtonsHeader"
+            tools:visibility="visible" />
+
         <im.vector.app.features.login.SocialLoginButtonsView
             android:id="@+id/ssoButtons"
             android:layout_width="0dp"
@@ -252,7 +266,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
             app:layout_constraintStart_toStartOf="@id/loginGutterStart"
-            app:layout_constraintTop_toBottomOf="@id/ssoButtonsHeader"
+            app:layout_constraintTop_toBottomOf="@id/loginWithQrCode"
             tools:signMode="signup" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_ftue_email_input.xml b/vector/src/main/res/layout/fragment_ftue_email_input.xml
index 046d9de552..c58fd3fc6e 100644
--- a/vector/src/main/res/layout/fragment_ftue_email_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_email_input.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/LoginFormScrollView"
     android:layout_height="match_parent"
     android:background="?android:colorBackground"
@@ -88,11 +89,11 @@
             android:id="@+id/emailEntryInput"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:hint="@string/ftue_auth_email_entry_title"
             app:endIconMode="clear_text"
             app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
             app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
-            app:layout_constraintTop_toBottomOf="@id/titleContentSpacing">
+            app:layout_constraintTop_toBottomOf="@id/titleContentSpacing"
+            tools:hint="@string/ftue_auth_email_entry_title">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_ftue_login_captcha.xml b/vector/src/main/res/layout/fragment_ftue_login_captcha.xml
index 2f6970c785..fc93d0f990 100644
--- a/vector/src/main/res/layout/fragment_ftue_login_captcha.xml
+++ b/vector/src/main/res/layout/fragment_ftue_login_captcha.xml
@@ -64,15 +64,27 @@
         android:id="@+id/titleContentSpacing"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginCaptchaWevView"
+        app:layout_constraintBottom_toTopOf="@id/loginWebViewBarrier"
         app:layout_constraintHeight_percent="0.03"
         app:layout_constraintTop_toBottomOf="@id/captchaHeaderTitle" />
 
-    <WebView
-        android:id="@+id/loginCaptchaWevView"
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/loginWebViewBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="loginCaptchaWebViewStub,loginCaptchaWebView"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/captchaGutterEnd"
+        app:layout_constraintStart_toStartOf="@id/captchaGutterStart"
+        app:layout_constraintTop_toBottomOf="@id/titleContentSpacing"/>
+
+    <ViewStub
+        android:id="@+id/loginCaptchaWebViewStub"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:contentDescription="@string/login_a11y_captcha_container"
+        android:layout="@layout/view_stub_webview"
+        android:inflatedId="@+id/loginCaptchaWebView"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/captchaGutterEnd"
         app:layout_constraintStart_toStartOf="@id/captchaGutterStart"
diff --git a/vector/src/main/res/layout/fragment_invites.xml b/vector/src/main/res/layout/fragment_invites.xml
new file mode 100644
index 0000000000..070cad5ec8
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_invites.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/invites_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?actionBarSize"
+            app:title="@string/invites_title" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <im.vector.app.core.platform.StateView
+        android:id="@+id/invites_state_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/invites_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fastScrollEnabled="true"
+            android:overScrollMode="always"
+            android:scrollbars="vertical" />
+
+    </im.vector.app.core.platform.StateView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
deleted file mode 100644
index 2f02da71d7..0000000000
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_account_created_title"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginAccountCreatedSubtitle"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_account_created_subtitle" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_account_created_notice"
-                android:textColor="?vctr_content_secondary" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_account_created_notice_2"
-                android:textColor="?vctr_content_secondary" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/loginAccountCreatedMessage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:background="@drawable/bg_login_server_selector"
-                android:padding="4dp">
-
-                <ImageView
-                    android:id="@+id/loginAccountCreatedAvatar"
-                    android:layout_width="44dp"
-                    android:layout_height="44dp"
-                    android:importantForAccessibility="no"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
-
-                <TextView
-                    android:id="@+id/loginAccountCreatedMemberName"
-                    style="@style/Widget.Vector.TextView.Subtitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginEnd="4dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="?vctr_content_primary"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toStartOf="@id/loginAccountCreatedTime"
-                    app:layout_constraintStart_toEndOf="@id/loginAccountCreatedAvatar"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="\@user:domain.org" />
-
-                <TextView
-                    android:id="@+id/loginAccountCreatedTime"
-                    style="@style/Widget.Vector.TextView.Caption"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:textColor="?vctr_content_secondary"
-                    app:layout_constraintBaseline_toBaselineOf="@id/loginAccountCreatedMemberName"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    tools:text="@tools:sample/date/hhmm" />
-
-                <TextView
-                    style="@style/Widget.Vector.TextView.Body"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:text="@string/login_account_created_message"
-                    android:textColor="?vctr_content_primary"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="@id/loginAccountCreatedMemberName"
-                    app:layout_constraintTop_toBottomOf="@id/loginAccountCreatedMemberName" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_account_created_instruction"
-                android:textColor="?vctr_content_secondary" />
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp">
-
-                <Button
-                    android:id="@+id/loginAccountCreatedLater"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/later" />
-
-                <Button
-                    android:id="@+id/loginAccountCreatedDone"
-                    style="@style/Widget.Vector.Button.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/done"
-                    android:visibility="gone"
-                    tools:layout_marginEnd="120dp"
-                    tools:visibility="visible" />
-
-            </FrameLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
deleted file mode 100644
index a5b65d62f5..0000000000
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_set_email_title_2" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormNotice"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:layout_marginBottom="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:textColor="?vctr_content_secondary"
-                tools:text="@string/login_set_email_notice_2" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormMandatoryNotice"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="26dp"
-                android:gravity="start"
-                android:textColor="?vctr_content_secondary"
-                android:visibility="gone"
-                tools:text="@string/login_set_email_mandatory_notice_2"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/loginGenericTextInputFormNotice2"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="start"
-                android:textColor="?vctr_content_secondary"
-                android:visibility="gone"
-                tools:text="@string/login_set_msisdn_notice2"
-                tools:visibility="visible" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginGenericTextInputFormTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:errorEnabled="true"
-                tools:hint="@string/login_set_email_optional_hint">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginGenericTextInputFormTextInput"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionDone"
-                    android:maxLines="1"
-                    tools:inputType="textEmailAddress" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp">
-
-                <Button
-                    android:id="@+id/loginGenericTextInputFormOtherButton"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:visibility="gone"
-                    tools:text="@string/login_msisdn_confirm_send_again"
-                    tools:visibility="visible" />
-
-                <Button
-                    android:id="@+id/loginGenericTextInputFormLater"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/later"
-                    android:visibility="gone"
-                    tools:layout_marginEnd="100dp"
-                    tools:visibility="visible" />
-
-                <Button
-                    android:id="@+id/loginGenericTextInputFormSubmit"
-                    style="@style/Widget.Vector.Button.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:enabled="false"
-                    tools:ignore="RelativeOverlap"
-                    tools:text="@string/login_set_email_submit" />
-
-            </FrameLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
deleted file mode 100644
index 6a2dad569c..0000000000
--- a/vector/src/main/res/layout/fragment_login_reset_password_2.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/resetPasswordTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_reset_password_on" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_enter_your_email"
-                android:textColor="?vctr_content_primary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/resetPasswordEmailTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:hint="@string/login_reset_password_email_hint"
-                app:errorEnabled="true">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/resetPasswordEmail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:id="@+id/loginNotice"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:gravity="start"
-                android:text="@string/login_reset_password_notice"
-                android:textColor="?vctr_content_secondary" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="16dp"
-                android:text="@string/login_choose_a_new_password"
-                android:textColor="?vctr_content_primary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/passwordFieldTil"
-                style="@style/Widget.Vector.TextInputLayout.Password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:hint="@string/login_reset_password_password_hint"
-                app:errorEnabled="true"
-                app:errorIconDrawable="@null">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/passwordField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:imeOptions="actionDone"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:paddingEnd="48dp"
-                    tools:ignore="RtlSymmetry" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <Button
-                android:id="@+id/resetPasswordSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/login_reset_password_submit"
-                tools:ignore="RelativeOverlap" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
deleted file mode 100644
index fa3aa74285..0000000000
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_mail_confirmation_title"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/resetPasswordMailConfirmationNotice"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_secondary"
-                tools:text="@string/login_reset_password_mail_confirmation_notice" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_mail_confirmation_notice_2"
-                android:textColor="?vctr_content_secondary" />
-
-            <Button
-                android:id="@+id/resetPasswordMailConfirmationSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_reset_password_mail_confirmation_submit" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
deleted file mode 100644
index d0e7a447cc..0000000000
--- a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_success_title"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/resetPasswordSuccessNotice"
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_success_notice"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_reset_password_success_notice_2"
-                android:textColor="?vctr_content_secondary" />
-
-            <Button
-                android:id="@+id/resetPasswordSuccessSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_reset_password_success_submit" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
deleted file mode 100644
index 9113e5e84b..0000000000
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginServerTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_choose_a_server"
-                android:textColor="?vctr_content_primary"
-                tools:ignore="UnknownId" />
-
-            <TextView
-                android:id="@+id/loginServerText"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:text="@string/login_server_text"
-                android:textColor="?vctr_content_secondary" />
-
-            <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
-            <im.vector.app.core.platform.CheckableConstraintLayout
-                android:id="@+id/loginServerChoiceMatrixOrg"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:background="@drawable/bg_login_server_selector"
-                android:contentDescription="@string/login_a11y_choose_matrix_org"
-                android:minHeight="80dp"
-                android:paddingStart="@dimen/layout_horizontal_margin"
-                android:paddingEnd="@dimen/layout_horizontal_margin">
-
-                <ImageView
-                    android:id="@+id/loginServerChoiceMatrixOrgIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:importantForAccessibility="no"
-                    android:src="@drawable/ic_logo_matrix_org"
-                    app:layout_constraintBottom_toTopOf="@id/loginServerChoiceMatrixOrgText"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed"
-                    app:tint="?vctr_content_primary"
-                    tools:ignore="MissingPrefix" />
-
-                <TextView
-                    android:id="@+id/loginServerChoiceMatrixOrgText"
-                    style="@style/Widget.Vector.TextView.Caption"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:gravity="start"
-                    android:text="@string/login_server_matrix_org_text"
-                    android:textColor="?vctr_content_secondary"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/loginServerChoiceMatrixOrgIcon" />
-
-            </im.vector.app.core.platform.CheckableConstraintLayout>
-
-            <TextView
-                android:id="@+id/loginServerText2"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:text="@string/login_if_you_re_not_sure_select_this_option"
-                android:textColor="?vctr_content_secondary"
-                android:textStyle="italic" />
-
-            <im.vector.app.core.platform.CheckableConstraintLayout
-                android:id="@+id/loginServerChoiceOther"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:background="@drawable/bg_login_server_selector"
-                android:contentDescription="@string/login_a11y_choose_other"
-                android:minHeight="80dp"
-                android:paddingStart="@dimen/layout_horizontal_margin"
-                android:paddingEnd="@dimen/layout_horizontal_margin">
-
-                <TextView
-                    android:id="@+id/loginServerChoiceOtherTitle"
-                    style="@style/Widget.Vector.TextView.Subtitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:text="@string/login_element_matrix_server_and_others"
-                    android:textColor="?vctr_content_primary"
-                    app:layout_constraintBottom_toTopOf="@id/loginServerChoiceOtherText"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
-
-                <TextView
-                    android:id="@+id/loginServerChoiceOtherText"
-                    style="@style/Widget.Vector.TextView.Caption"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:gravity="start"
-                    android:text="@string/login_server_other_text"
-                    android:textColor="?vctr_content_secondary"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/loginServerChoiceOtherTitle" />
-
-            </im.vector.app.core.platform.CheckableConstraintLayout>
-
-            <TextView
-                android:id="@+id/loginServerChoiceEmsLearnMore"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="32dp"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:text="@string/login_server_modular_learn_more_about_ems"
-                android:textColor="?vctr_content_secondary"
-                app:layout_constraintBottom_toBottomOf="@id/loginServerChoiceEmsText"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/loginServerChoiceEmsText" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
deleted file mode 100644
index 6038cfaedd..0000000000
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginServerUrlFormTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_server_url_form_common_notice"
-                android:textColor="?vctr_content_primary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginServerUrlFormHomeServerUrlTil"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="26dp"
-                app:errorEnabled="true"
-                tools:hint="@string/login_server_url_form_modular_hint">
-
-                <AutoCompleteTextView
-                    android:id="@+id/loginServerUrlFormHomeServerUrl"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/hs_url"
-                    android:imeOptions="actionDone"
-                    android:inputType="textUri"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:id="@+id/loginServerUrlFormClearHistory"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:paddingStart="16dp"
-                android:paddingEnd="0dp"
-                android:paddingBottom="16dp"
-                android:text="@string/login_clear_homeserver_history"
-                android:textColor="?colorPrimary"
-                android:visibility="invisible"
-                tools:visibility="visible" />
-
-            <Button
-                android:id="@+id/loginServerUrlFormSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="4dp"
-                android:text="@string/login_continue" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
deleted file mode 100644
index c70982f209..0000000000
--- a/vector/src/main/res/layout/fragment_login_signin_password_2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_enter_your_password"
-                android:textColor="?vctr_content_primary" />
-
-            <ImageView
-                android:id="@+id/loginUserIcon"
-                android:layout_width="92dp"
-                android:layout_height="92dp"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:importantForAccessibility="no"
-                tools:ignore="MissingPrefix"
-                tools:src="@tools:sample/avatars" />
-
-            <TextView
-                android:id="@+id/loginWelcomeBack"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_secondary"
-                tools:text="Welcome back user!" />
-
-            <TextView
-                android:id="@+id/loginWelcomeBackWarning"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_unknown_user_warning"
-                android:textColor="@color/vector_warning_color_2"
-                android:visibility="gone"
-                tools:visibility="visible" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/passwordFieldTil"
-                style="@style/Widget.Vector.TextInputLayout.Password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:hint="@string/login_signup_password_hint"
-                app:errorEnabled="true"
-                app:errorIconDrawable="@null">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/passwordField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:imeOptions="actionDone"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:paddingEnd="48dp"
-                    tools:ignore="RtlSymmetry" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin">
-
-                <Button
-                    android:id="@+id/forgetPasswordButton"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:paddingStart="0dp"
-                    android:paddingEnd="0dp"
-                    android:text="@string/auth_forgot_password" />
-
-                <Button
-                    android:id="@+id/loginSubmit"
-                    style="@style/Widget.Vector.Button.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/auth_login"
-                    tools:enabled="false"
-                    tools:ignore="RelativeOverlap" />
-
-            </FrameLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
deleted file mode 100644
index 61f565e093..0000000000
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_signin_to" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFieldTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:hint="@string/login_signin_username_hint"
-                app:errorEnabled="true">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/passwordFieldTil"
-                style="@style/Widget.Vector.TextInputLayout.Password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:hint="@string/login_signup_password_hint"
-                app:errorEnabled="true"
-                app:errorIconDrawable="@null">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/passwordField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:imeOptions="actionDone"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:paddingEnd="48dp"
-                    tools:ignore="RtlSymmetry" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin">
-
-                <Button
-                    android:id="@+id/forgetPasswordButton"
-                    style="@style/Widget.Vector.Button.Text.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:paddingStart="0dp"
-                    android:paddingEnd="0dp"
-                    android:text="@string/auth_forgot_password" />
-
-                <Button
-                    android:id="@+id/loginSubmit"
-                    style="@style/Widget.Vector.Button.Login"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/auth_login"
-                    tools:enabled="false"
-                    tools:ignore="RelativeOverlap" />
-
-            </FrameLayout>
-
-            <!-- Social Logins buttons -->
-            <LinearLayout
-                android:id="@+id/loginSocialLoginContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <TextView
-                    android:id="@+id/loginSocialLoginHeader"
-                    style="@style/Widget.Vector.TextView.Body"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:gravity="center"
-                    android:text="@string/login_social_continue"
-                    android:textColor="?vctr_content_secondary" />
-
-                <im.vector.app.features.login.SocialLoginButtonsView
-                    android:id="@+id/loginSocialLoginButtons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    tools:signMode="signin" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
deleted file mode 100644
index acba8dd7e1..0000000000
--- a/vector/src/main/res/layout/fragment_login_signin_username_2.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_enter_your_matrix_identifier"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginSubtitle"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_enter_your_matrix_identifier_help"
-                android:textColor="?vctr_content_secondary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFieldTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:hint="@string/login_signin_matrix_id_hint"
-                app:errorEnabled="true">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <Button
-                android:id="@+id/loginSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/_continue"
-                tools:enabled="false" />
-
-            <TextView
-                android:id="@+id/loginServerText3"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:gravity="start"
-                android:text="@string/login_enter_identifier_help"
-                android:textColor="?vctr_content_secondary" />
-
-            <Button
-                android:id="@+id/loginChooseAServer"
-                style="@style/Widget.Vector.Button.Text.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/login_choose_a_server" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
deleted file mode 100644
index 33730e92cb..0000000000
--- a/vector/src/main/res/layout/fragment_login_signup_password_2.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_choose_a_password"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:text="@string/login_your_matrix_identifier"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginMatrixIdentifier"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textColor="?vctr_content_secondary"
-                tools:text="\@user:domain.org" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/login_press_back_to_change"
-                android:textColor="?vctr_content_secondary"
-                android:textStyle="italic" />
-
-            <TextView
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_choose_a_password"
-                android:textColor="?vctr_content_primary" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/passwordFieldTil"
-                style="@style/Widget.Vector.TextInputLayout.Password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:hint="@string/login_signup_password_hint"
-                app:errorEnabled="true"
-                app:errorIconDrawable="@null">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/passwordField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:imeOptions="actionDone"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:paddingEnd="48dp"
-                    tools:ignore="RtlSymmetry" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <Button
-                android:id="@+id/loginSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/_continue"
-                tools:enabled="false"
-                tools:ignore="RelativeOverlap" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
deleted file mode 100644
index 6eeff13d86..0000000000
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_please_choose_a_user_name"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginSubtitle"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:textColor="?vctr_content_secondary"
-                tools:text="@string/login_signup_to" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFieldTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:hint="@string/login_signup_username_hint"
-                app:errorEnabled="true">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:id="@+id/loginChooseHelp"
-                style="@style/Widget.Vector.TextView.Caption"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/login_please_choose_a_user_name_help_2"
-                android:textColor="?vctr_content_secondary"
-                android:textStyle="italic" />
-
-            <Button
-                android:id="@+id/loginSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="8dp"
-                android:text="@string/_continue"
-                tools:enabled="false" />
-
-            <!-- SSO Option -->
-            <!-- Social Logins buttons -->
-            <LinearLayout
-                android:id="@+id/loginSocialLoginContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <TextView
-                    android:id="@+id/loginSocialLoginHeader"
-                    style="@style/Widget.Vector.TextView.Body"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:gravity="center"
-                    android:text="@string/login_social_continue"
-                    android:textColor="?vctr_content_secondary" />
-
-                <im.vector.app.features.login.SocialLoginButtonsView
-                    android:id="@+id/loginSocialLoginButtons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    tools:signMode="signin" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
deleted file mode 100644
index b7010ba4da..0000000000
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground"
-    android:paddingStart="36dp"
-    android:paddingTop="@dimen/layout_vertical_margin"
-    android:paddingEnd="36dp"
-    android:paddingBottom="@dimen/layout_vertical_margin">
-
-    <!-- Strategy: Spaces are used to spread the remaining space, using weight -->
-
-    <Space
-        android:id="@+id/loginSplashSpace1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashLogoContainer"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="spread_inside"
-        app:layout_constraintVertical_weight="4" />
-
-    <LinearLayout
-        android:id="@+id/loginSplashLogoContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace1">
-
-        <ImageView
-            android:id="@+id/loginSplashLogo"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/element_logo_green"
-            android:transitionName="loginLogoTransition" />
-
-        <ImageView
-            android:id="@+id/logoType"
-            android:layout_width="wrap_content"
-            android:layout_height="44dp"
-            android:layout_marginTop="8dp"
-            android:contentDescription="@string/app_name"
-            android:src="@drawable/element_logotype"
-            app:tint="?colorSecondary"
-            tools:ignore="MissingPrefix" />
-
-    </LinearLayout>
-
-    <Space
-        android:id="@+id/loginSplashSpace2"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashTitle"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashLogoContainer"
-        app:layout_constraintVertical_weight="1" />
-
-    <TextView
-        android:id="@+id/loginSplashTitle"
-        style="@style/Widget.Vector.TextView.Title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/login_splash_title"
-        android:textColor="?vctr_content_primary"
-        android:transitionName="loginTitleTransition"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace25"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace2" />
-
-    <Space
-        android:id="@+id/loginSplashSpace25"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashContent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashTitle"
-        app:layout_constraintVertical_weight="3" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/loginSplashContent"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace3"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace25">
-
-        <ImageView
-            android:id="@+id/loginSplashPicto1"
-            android:layout_width="32dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_login_splash_message_circle"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/loginSplashText1"
-            app:tint="?vctr_content_secondary"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:id="@+id/loginSplashText1"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:gravity="start"
-            android:text="@string/login_splash_text1"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@id/loginSplashText2"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/loginSplashPicto2"
-            android:layout_width="32dp"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_login_splash_lock"
-            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@id/loginSplashText2"
-            app:tint="?vctr_content_secondary"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:id="@+id/loginSplashText2"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="start"
-            android:text="@string/login_splash_text2"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@id/loginSplashText1" />
-
-        <ImageView
-            android:id="@+id/loginSplashPicto3"
-            android:layout_width="32dp"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_login_splash_sliders"
-            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@id/loginSplashText3"
-            app:tint="?vctr_content_secondary"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:id="@+id/loginSplashText3"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="start"
-            android:text="@string/login_splash_text3"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@id/loginSplashText2" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <Space
-        android:id="@+id/loginSplashSpace3"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginFormContent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashContent"
-        app:layout_constraintVertical_weight="3" />
-
-    <LinearLayout
-        android:id="@+id/loginFormContent"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace3">
-
-        <Button
-            android:id="@+id/loginSignupSigninSignUp"
-            style="@style/Widget.Vector.Button.Login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/login_create_a_new_account" />
-
-        <Button
-            android:id="@+id/loginSignupSigninSignIn"
-            style="@style/Widget.Vector.Button.Text.Login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="14dp"
-            android:text="@string/login_i_already_have_an_account" />
-
-    </LinearLayout>
-
-    <Space
-        android:id="@+id/loginSplashSpace5"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginFormContent"
-        app:layout_constraintVertical_weight="6" />
-
-    <TextView
-        android:id="@+id/loginSplashVersion"
-        style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="12dp"
-        android:textColor="?vctr_content_secondary"
-        android:visibility="gone"
-        app:drawableStartCompat="@drawable/ic_debug_icon"
-        app:drawableTint="?colorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@string/settings_version"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_login_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
deleted file mode 100644
index baa05ee30f..0000000000
--- a/vector/src/main/res/layout/fragment_login_sso_only_2.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginSignupSigninTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textColor="?vctr_content_primary"
-                tools:ignore="UnknownId"
-                tools:text="@string/login_connect_to" />
-
-            <Button
-                android:id="@+id/loginSignupSigninSubmit"
-                style="@style/Widget.Vector.Button.Login"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="38dp"
-                android:text="@string/login_signin_sso" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
deleted file mode 100644
index 18b7df3880..0000000000
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        style="@style/LoginFormScrollView"
-        android:layout_height="match_parent"
-        tools:ignore="MissingConstraints">
-
-        <ImageView
-            style="@style/LoginLogo"
-            android:layout_marginTop="36dp"
-            android:importantForAccessibility="no"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/loginTermsTitle"
-            style="@style/Widget.Vector.TextView.Title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="36dp"
-            android:layout_marginTop="52dp"
-            android:layout_marginEnd="36dp"
-            android:text="@string/login_terms_title"
-            android:textColor="?vctr_content_primary"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/loginLogo"
-            tools:ignore="UnknownId" />
-
-        <TextView
-            android:id="@+id/loginTermsNotice"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:paddingStart="36dp"
-            android:paddingEnd="36dp"
-            android:text="@string/auth_accept_policies"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintTop_toBottomOf="@id/loginTermsTitle" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/loginTermsPolicyList"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="16dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            app:layout_constraintBottom_toTopOf="@id/loginTermsSubmit"
-            app:layout_constraintTop_toBottomOf="@id/loginTermsNotice"
-            tools:listitem="@layout/item_policy" />
-
-        <Button
-            android:id="@+id/loginTermsSubmit"
-            style="@style/Widget.Vector.Button.Login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="36dp"
-            android:text="@string/action_accept"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
deleted file mode 100644
index 15046afb61..0000000000
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
-
-    <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
-
-        <LinearLayout style="@style/LoginFormContainer">
-
-            <ImageView
-                style="@style/LoginLogo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/loginWaitForEmailTitle"
-                style="@style/Widget.Vector.TextView.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:text="@string/login_wait_for_email_title"
-                android:textColor="?vctr_content_primary" />
-
-            <TextView
-                android:id="@+id/loginWaitForEmailNotice"
-                style="@style/Widget.Vector.TextView.Subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:gravity="start"
-                android:textColor="?vctr_content_primary"
-                tools:text="@string/login_wait_for_email_notice_2" />
-
-            <TextView
-                android:id="@+id/loginWaitForEmailHelp"
-                style="@style/Widget.Vector.TextView.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:gravity="start"
-                android:text="@string/login_wait_for_email_help"
-                android:textColor="?vctr_content_secondary" />
-
-            <ProgressBar
-                style="@style/Widget.Vector.ProgressBar.Horizontal"
-                android:layout_width="240dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="32dp"
-                android:indeterminate="true" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</FrameLayout>
-
diff --git a/vector/src/main/res/layout/fragment_new_chat_bottom_sheet.xml b/vector/src/main/res/layout/fragment_new_chat_bottom_sheet.xml
new file mode 100644
index 0000000000..07c19b43eb
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_new_chat_bottom_sheet.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/start_chat"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?selectableItemBackground"
+        android:drawablePadding="16dp"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="16dp"
+        android:text="@string/start_chat"
+        android:textColor="?vctr_content_primary"
+        android:textSize="16sp"
+        app:drawableStartCompat="@drawable/ic_chat" />
+
+    <TextView
+        android:id="@+id/create_room"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?selectableItemBackground"
+        android:drawablePadding="16dp"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="16dp"
+        android:text="@string/create_room"
+        android:textColor="?vctr_content_primary"
+        android:textSize="16sp"
+        app:drawableStartCompat="@drawable/ic_room_add" />
+
+    <TextView
+        android:id="@+id/explore_rooms"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?selectableItemBackground"
+        android:drawablePadding="16dp"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="16dp"
+        android:text="@string/explore_rooms"
+        android:textColor="?vctr_content_primary"
+        android:textSize="16sp"
+        app:drawableStartCompat="@drawable/ic_room_explore" />
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_new_home_detail.xml b/vector/src/main/res/layout/fragment_new_home_detail.xml
index b0e7bf7634..ced71a7863 100644
--- a/vector/src/main/res/layout/fragment_new_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_new_home_detail.xml
@@ -39,7 +39,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/currentCallsView">
+        app:layout_constraintTop_toBottomOf="@id/syncStateView">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBarLayout"
@@ -49,6 +49,7 @@
             app:layout_constraintTop_toBottomOf="@id/syncStateView">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
                 style="@style/Widget.Vector.Material3.CollapsingToolbar.Medium"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
@@ -61,43 +62,78 @@
                     android:layout_height="?attr/actionBarSize"
                     android:elevation="0dp"
                     app:layout_collapseMode="pin"
-                    app:title="@string/all_chats">
+                    tools:title="@string/all_chats">
 
                     <ImageView
                         android:id="@+id/avatar"
                         android:layout_width="36dp"
                         android:layout_height="36dp"
-                        android:padding="6dp"
                         android:contentDescription="@string/a11y_open_settings"
+                        android:padding="6dp"
                         tools:src="@sample/user_round_avatars" />
 
                 </com.google.android.material.appbar.MaterialToolbar>
 
+                <ImageView
+                    android:id="@+id/debug_button"
+                    style="@style/VectorDebug"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_gravity="bottom|end"
+                    android:layout_marginStart="12dp"
+                    android:importantForAccessibility="no"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_settings_x"
+                    app:tint="?colorPrimary"
+                    tools:ignore="MissingPrefix" />
+
             </com.google.android.material.appbar.CollapsingToolbarLayout>
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/roomListContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/roomListContainer"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toTopOf="@id/bottomNavigationView"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.google.android.material.bottomnavigation.BottomNavigationView
-                android:id="@+id/bottomNavigationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:menu="@menu/home_bottom_navigation" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/newLayoutOpenSpacesButton"
+        style="@style/Widget.Vector.FloatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:accessibilityTraversalAfter="@id/newLayoutCreateChatButton"
+        android:contentDescription="@string/a11y_open_spaces"
+        android:src="@drawable/ic_spaces"
+        android:visibility="gone"
+        app:backgroundTint="?attr/vctr_toolbar_background"
+        app:fabSize="mini"
+        app:layout_constraintBottom_toTopOf="@id/newLayoutCreateChatButton"
+        app:layout_constraintEnd_toEndOf="@id/newLayoutCreateChatButton"
+        app:layout_constraintStart_toStartOf="@id/newLayoutCreateChatButton"
+        app:tint="?attr/colorPrimary"
+        tools:targetApi="lollipop_mr1"
+        tools:visibility="visible" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/newLayoutCreateChatButton"
+        style="@style/Widget.Vector.FloatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:contentDescription="@string/a11y_create_message"
+        android:src="@drawable/ic_new_chat"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:targetApi="lollipop_mr1"
+        tools:visibility="visible" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_other_sessions.xml b/vector/src/main/res/layout/fragment_other_sessions.xml
new file mode 100644
index 0000000000..ce289bd125
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_other_sessions.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:id="@+id/otherSessionsNotFoundLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="72dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="16dp"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/otherSessionsNotFoundTextView"
+                style="@style/TextAppearance.Vector.Body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="@string/device_manager_other_sessions_no_verified_sessions_found" />
+
+            <Button
+                android:id="@+id/otherSessionsClearFilterButton"
+                style="@style/Widget.Vector.Button.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:gravity="start"
+                android:padding="0dp"
+                android:text="@string/device_manager_other_sessions_clear_filter" />
+
+        </LinearLayout>
+
+        <im.vector.app.features.settings.devices.v2.list.OtherSessionsView
+            android:id="@+id/deviceListOtherSessions"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:titleEnabled="false"
+            app:toolbarId="@id/otherSessionsToolbar">
+
+            <im.vector.app.features.settings.devices.v2.list.SessionsListHeaderView
+                android:id="@+id/deviceListHeaderOtherSessions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="?attr/actionBarSize"
+                android:layout_marginBottom="16dp"
+                app:layout_collapseMode="parallax"
+                app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
+                app:sessionsListHeaderHasLearnMoreLink="false"
+                app:sessionsListHeaderTitle="" />
+
+            <im.vector.app.features.settings.devices.v2.othersessions.OtherSessionsSecurityRecommendationView
+                android:id="@+id/otherSessionsSecurityRecommendationView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="?attr/actionBarSize"
+                android:layout_marginBottom="16dp"
+                android:paddingTop="20dp"
+                android:visibility="gone"
+                app:layout_collapseMode="parallax"
+                app:otherSessionsRecommendationDescription="@string/device_manager_other_sessions_recommendation_description_unverified"
+                app:otherSessionsRecommendationImageBackgroundTint="@color/shield_color_warning_background"
+                app:otherSessionsRecommendationImageResource="@drawable/ic_shield_warning_no_border"
+                app:otherSessionsRecommendationTitle="@string/device_manager_other_sessions_recommendation_title_unverified"
+                tools:visibility="visible" />
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/otherSessionsToolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/ic_back_24dp"
+                app:title="@string/device_manager_sessions_other_title">
+
+                <FrameLayout
+                    android:id="@+id/otherSessionsFilterFrameLayout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginEnd="8dp"
+                    android:padding="8dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/a11y_device_manager_filter"
+                        android:src="@drawable/ic_filter" />
+
+                    <ImageView
+                        android:id="@+id/otherSessionsFilterBadgeImageView"
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:layout_marginStart="12dp"
+                        android:importantForAccessibility="no"
+                        android:src="@drawable/circle_with_transparent_border" />
+
+                </FrameLayout>
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/fragment_qr_code_login_instructions.xml b/vector/src/main/res/layout/fragment_qr_code_login_instructions.xml
new file mode 100644
index 0000000000..a13e460a5a
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_qr_code_login_instructions.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingHorizontal="16dp">
+
+    <im.vector.app.features.login.qr.QrCodeLoginHeaderView
+        android:id="@+id/qrCodeLoginInstructionsHeaderView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:qrCodeLoginHeaderDescription="@string/qr_code_login_header_scan_qr_code_description"
+        app:qrCodeLoginHeaderImageBackgroundTint="?colorPrimary"
+        app:qrCodeLoginHeaderImageResource="@drawable/ic_camera"
+        app:qrCodeLoginHeaderTitle="@string/qr_code_login_header_scan_qr_code_title" />
+
+    <im.vector.app.features.login.qr.QrCodeLoginInstructionsView
+        android:id="@+id/qrCodeLoginInstructionsView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/qrCodeLoginInstructionsHeaderView"
+        app:qrCodeLoginInstruction1="@string/qr_code_login_new_device_instruction_1"
+        app:qrCodeLoginInstruction2="@string/qr_code_login_new_device_instruction_2"
+        app:qrCodeLoginInstruction3="@string/qr_code_login_new_device_instruction_3" />
+
+    <Button
+        android:id="@+id/qrCodeLoginInstructionsShowQrCodeButton"
+        style="@style/Widget.Vector.Button.Outlined.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="40dp"
+        android:text="@string/qr_code_login_show_qr_code_button"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <FrameLayout
+        android:id="@+id/qrCodeLoginInstructionsAlternativeLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/qrCodeLoginInstructionsShowQrCodeButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/divider_horizontal" />
+
+        <TextView
+            android:id="@+id/qrCodeLoginInstructionsAlternativeTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="?android:colorBackground"
+            android:paddingHorizontal="12dp"
+            android:text="@string/qr_code_login_signing_in_a_mobile_device"
+            app:drawableLeftCompat="@drawable/divider_horizontal"
+            app:drawableTint="@color/alert_default_error_background" />
+    </FrameLayout>
+
+    <Button
+        android:id="@+id/qrCodeLoginInstructionsScanQrCodeButton"
+        style="@style/Widget.Vector.Button.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:text="@string/qr_code_login_scan_qr_code_button"
+        android:textAllCaps="false"
+        app:layout_constraintBottom_toTopOf="@id/qrCodeLoginInstructionsAlternativeLayout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_qr_code_login_show_qr_code.xml b/vector/src/main/res/layout/fragment_qr_code_login_show_qr_code.xml
new file mode 100644
index 0000000000..539f019848
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_qr_code_login_show_qr_code.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingHorizontal="16dp"
+    android:background="?android:colorBackground">
+
+    <im.vector.app.features.login.qr.QrCodeLoginHeaderView
+        android:id="@+id/qrCodeLoginShowQrCodeHeaderView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:qrCodeLoginHeaderDescription="@string/qr_code_login_header_show_qr_code_link_a_device_description"
+        app:qrCodeLoginHeaderImageBackgroundTint="?colorPrimary"
+        app:qrCodeLoginHeaderImageResource="@drawable/ic_camera"
+        app:qrCodeLoginHeaderTitle="@string/qr_code_login_header_show_qr_code_title" />
+
+    <im.vector.app.features.login.qr.QrCodeLoginInstructionsView
+        android:id="@+id/qrCodeLoginShowQrCodeInstructionsView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/qrCodeLoginShowQrCodeHeaderView"
+        app:qrCodeLoginInstruction1="@string/qr_code_login_new_device_instruction_1"
+        app:qrCodeLoginInstruction2="@string/qr_code_login_new_device_instruction_2"
+        app:qrCodeLoginInstruction3="@string/qr_code_login_new_device_instruction_3" />
+
+    <im.vector.app.core.ui.views.QrCodeImageView
+        android:id="@+id/qrCodeLoginSHowQrCodeImageView"
+        android:layout_width="240dp"
+        android:layout_height="240dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/qrCodeLoginShowQrCodeInstructionsView"
+        app:layout_constraintBottom_toTopOf="@id/qrCodeLoginShowQrCodeCancelButton"/>
+
+    <Button
+        android:id="@+id/qrCodeLoginShowQrCodeCancelButton"
+        style="@style/Widget.Vector.Button.Outlined.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="40dp"
+        android:text="@string/action_cancel"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_qr_code_login_status.xml b/vector/src/main/res/layout/fragment_qr_code_login_status.xml
new file mode 100644
index 0000000000..59e1e60cd5
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_qr_code_login_status.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground"
+    android:paddingHorizontal="16dp">
+
+    <LinearLayout
+        android:id="@+id/qrCodeLoginStatusLoadingLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="100dp"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/qrCodeLoginStatusLoadingTextView"
+            style="@style/TextAppearance.Vector.Subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="@string/qr_code_login_connecting_to_device" />
+
+        <include layout="@layout/item_loading" />
+
+    </LinearLayout>
+
+    <im.vector.app.features.login.qr.QrCodeLoginHeaderView
+        android:id="@+id/qrCodeLoginStatusHeaderView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:qrCodeLoginHeaderDescription="@string/qr_code_login_header_connected_description"
+        app:qrCodeLoginHeaderImageBackgroundTint="?colorPrimary"
+        app:qrCodeLoginHeaderImageResource="@drawable/ic_qr_code_login_connected"
+        app:qrCodeLoginHeaderTitle="@string/qr_code_login_header_connected_title" />
+
+    <TextView
+        android:id="@+id/qrCodeLoginStatusSecurityCode"
+        style="@style/TextAppearance.Vector.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="80dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/qrCodeLoginStatusHeaderView"
+        tools:text="28E-1B9-D0F-896"
+        tools:visibility="visible" />
+
+    <FrameLayout
+        android:id="@+id/qrCodeLoginStatusNoMatchLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        app:layout_constraintBottom_toTopOf="@id/qrCodeLoginStatusCancelButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/divider_horizontal" />
+
+        <TextView
+            android:id="@+id/qrCodeLoginStatusNoMatchTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="?android:colorBackground"
+            android:paddingHorizontal="12dp"
+            android:text="@string/qr_code_login_status_no_match"
+            app:drawableLeftCompat="@drawable/divider_horizontal"
+            app:drawableTint="@color/alert_default_error_background" />
+    </FrameLayout>
+
+    <Button
+        android:id="@+id/qrCodeLoginStatusTryAgainButton"
+        style="@style/Widget.Vector.Button.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:text="@string/qr_code_login_try_again"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/qrCodeLoginStatusNoMatchLayout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/qrCodeLoginConfirmSecurityCodeLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/qrCodeLoginStatusCancelButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:visibility="visible">
+
+        <ImageView
+            android:id="@+id/qrCodeLoginConfirmSecurityCodeImageView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_info"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/qrCodeLoginConfirmSecurityCodeTextView"
+            style="@style/TextAppearance.Vector.Body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="false"
+            android:layout_marginStart="8dp"
+            android:text="@string/qr_code_login_confirm_security_code_description"
+            app:layout_constraintStart_toEndOf="@id/qrCodeLoginConfirmSecurityCodeImageView"
+            app:layout_constraintTop_toTopOf="@id/qrCodeLoginConfirmSecurityCodeImageView" />
+
+        <Button
+            android:id="@+id/qrCodeLoginConfirmSecurityCodeButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/qr_code_login_confirm_security_code"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/qrCodeLoginConfirmSecurityCodeTextView" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <Button
+        android:id="@+id/qrCodeLoginStatusCancelButton"
+        style="@style/Widget.Vector.Button.Outlined.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="40dp"
+        android:text="@string/action_cancel"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_room_list.xml b/vector/src/main/res/layout/fragment_room_list.xml
index 17d93eb98a..19310bdf67 100644
--- a/vector/src/main/res/layout/fragment_room_list.xml
+++ b/vector/src/main/res/layout/fragment_room_list.xml
@@ -1,101 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<im.vector.app.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/stateView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground">
+    android:layout_height="match_parent">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/roomListView"
+    <im.vector.app.core.platform.StateView
+        android:id="@+id/stateView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:overScrollMode="always"
-        tools:itemCount="5"
-        tools:listitem="@layout/item_room" />
+        android:background="?android:colorBackground">
 
-    <im.vector.app.features.home.room.list.widget.NotifsFabMenuView
-        android:id="@+id/createChatFabMenu"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        app:layoutDescription="@xml/motion_scene_notifs_fab_menu"
-        tools:showPaths="true"
-        tools:visibility="visible" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/roomListView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:overScrollMode="always"
+            tools:itemCount="5"
+            tools:listitem="@layout/item_room" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/createChatRoomButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        android:accessibilityTraversalBefore="@id/roomListView"
-        android:contentDescription="@string/a11y_create_direct_message"
-        android:scaleType="center"
-        android:src="@drawable/ic_fab_add_chat"
-        android:visibility="gone"
-        app:maxImageSize="34dp"
-        tools:layout_marginEnd="80dp"
-        tools:visibility="visible" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/createGroupRoomButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        android:accessibilityTraversalBefore="@id/roomListView"
-        android:contentDescription="@string/a11y_create_room"
-        android:src="@drawable/ic_fab_add_room"
-        android:visibility="gone"
-        app:maxImageSize="32dp"
-        tools:layout_marginEnd="144dp"
-        tools:visibility="visible" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="bottom|end">
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/newLayoutOpenSpacesButton"
-            style="@style/Widget.Vector.FloatingActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"
-            android:accessibilityTraversalAfter="@id/newLayoutCreateChatButton"
-            android:contentDescription="@string/a11y_open_spaces"
-            android:src="@drawable/ic_open_spaces"
+        <im.vector.app.features.home.room.list.widget.NotifsFabMenuView
+            android:id="@+id/createChatFabMenu"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:visibility="gone"
-            app:backgroundTint="?attr/vctr_toolbar_background"
-            app:fabSize="mini"
-            app:layout_constraintBottom_toTopOf="@id/newLayoutCreateChatButton"
-            app:layout_constraintEnd_toEndOf="@id/newLayoutCreateChatButton"
-            app:layout_constraintStart_toStartOf="@id/newLayoutCreateChatButton"
-            app:tint="?attr/colorPrimary"
-            tools:visibility="visible"
-            tools:targetApi="lollipop_mr1" />
-
+            app:layoutDescription="@xml/motion_scene_notifs_fab_menu"
+            tools:showPaths="true"
+            tools:visibility="visible" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/newLayoutCreateChatButton"
-            style="@style/Widget.Vector.FloatingActionButton"
+            android:id="@+id/createChatRoomButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
             android:accessibilityTraversalBefore="@id/roomListView"
-            android:contentDescription="@string/a11y_create_message"
-            android:src="@drawable/ic_new_chat"
+            android:contentDescription="@string/a11y_create_direct_message"
+            android:scaleType="center"
+            android:src="@drawable/ic_fab_add_chat"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            tools:visibility="visible"
-            tools:targetApi="lollipop_mr1" />
+            app:maxImageSize="34dp"
+            tools:layout_marginEnd="80dp"
+            tools:visibility="visible" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/createGroupRoomButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:accessibilityTraversalBefore="@id/roomListView"
+            android:contentDescription="@string/a11y_create_room"
+            android:src="@drawable/ic_fab_add_room"
+            android:visibility="gone"
+            app:maxImageSize="32dp"
+            tools:layout_marginEnd="144dp"
+            tools:visibility="visible" />
 
-</im.vector.app.core.platform.StateView>
+    </im.vector.app.core.platform.StateView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/fragment_session_details.xml b/vector/src/main/res/layout/fragment_session_details.xml
new file mode 100644
index 0000000000..de0ce27798
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_session_details.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/sessionDetails"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        tools:listitem="@layout/item_session_details_content" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_session_overview.xml b/vector/src/main/res/layout/fragment_session_overview.xml
new file mode 100644
index 0000000000..4719357802
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_session_overview.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <im.vector.app.features.settings.devices.v2.list.SessionInfoView
+            android:id="@+id/sessionOverviewInfo"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="24dp"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <im.vector.app.features.settings.devices.v2.overview.SessionOverviewEntryView
+            android:id="@+id/sessionOverviewEntryDetails"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/sessionOverviewInfo"
+            app:sessionOverviewEntryDescription="@string/device_manager_session_details_description"
+            app:sessionOverviewEntryTitle="@string/device_manager_session_details_title" />
+
+        <im.vector.app.features.settings.devices.v2.overview.SessionOverviewEntrySwitchView
+            android:id="@+id/sessionOverviewPushNotifications"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/sessionOverviewEntryDetails"
+            app:sessionOverviewEntrySwitchDescription="@string/device_manager_push_notifications_description"
+            app:sessionOverviewEntrySwitchTitle="@string/device_manager_push_notifications_title" />
+
+        <Button
+            android:id="@+id/sessionOverviewSignout"
+            style="@style/Widget.Vector.Button.Text.Destructive"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="8dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/device_manager_session_overview_signout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/sessionOverviewPushNotifications"
+            app:layout_constraintWidth="wrap_content" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
diff --git a/vector/src/main/res/layout/fragment_session_rename.xml b/vector/src/main/res/layout/fragment_session_rename.xml
new file mode 100644
index 0000000000..cbca907353
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_session_rename.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/renameSessionToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?actionBarSize"
+            app:title="@string/device_manager_session_rename">
+
+            <Button
+                android:id="@+id/renameSessionSave"
+                style="@style/Widget.Vector.Button.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:text="@string/action_save" />
+
+        </com.google.android.material.appbar.MaterialToolbar>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/renameSessionInputLayout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="28dp"
+        android:hint="@string/device_manager_session_rename_edit_hint"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/renameSessionEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <TextView
+        android:id="@+id/renameSessionDescription"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="8dp"
+        android:text="@string/device_manager_session_rename_description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/renameSessionInputLayout" />
+
+    <im.vector.app.features.settings.devices.v2.SessionWarningInfoView
+        android:id="@+id/renameSessionInfo"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/layout_horizontal_margin"
+        android:layout_marginVertical="@dimen/layout_vertical_margin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/renameSessionDescription"
+        app:sessionsWarningInfoDescription="@string/device_manager_session_rename_warning"
+        app:sessionsWarningInfoHasLearnMore="true" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_set_link.xml b/vector/src/main/res/layout/fragment_set_link.xml
new file mode 100644
index 0000000000..36b3421253
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_set_link.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?actionBarSize"
+            app:navigationIcon="@drawable/ic_x_18dp"
+            app:title="@string/set_link_create" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/save"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_min="100dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/textLayout"
+                style="@style/Widget.Vector.TextInputLayout.Form"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:hint="@string/set_link_text">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/linkLayout"
+                style="@style/Widget.Vector.TextInputLayout.Form"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:hint="@string/set_link_link">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/link"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textUri" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+        </LinearLayout>
+    </ScrollView>
+
+    <Button
+        android:id="@+id/save"
+        style="@style/Widget.Vector.Button.CallToAction"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:height="56dp"
+        android:text="@string/action_save"
+        android:textAllCaps="false"
+        app:iconGravity="textStart"
+        app:layout_constraintBottom_toTopOf="@id/remove"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/remove"
+        style="@style/Widget.Vector.Button.Destructive"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:height="56dp"
+        android:text="@string/action_remove"
+        android:textAllCaps="false"
+        android:visibility="gone"
+        app:iconGravity="textStart"
+        app:layout_constraintBottom_toTopOf="@id/cancel"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:visibility="visible" />
+
+    <Button
+        android:id="@+id/cancel"
+        style="@style/Widget.Vector.Button.Outlined"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginBottom="8dp"
+        android:height="56dp"
+        android:text="@string/action_cancel"
+        android:textAllCaps="false"
+        app:iconGravity="textStart"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_settings_devices.xml b/vector/src/main/res/layout/fragment_settings_devices.xml
index 2a77219ad0..266f8df46f 100644
--- a/vector/src/main/res/layout/fragment_settings_devices.xml
+++ b/vector/src/main/res/layout/fragment_settings_devices.xml
@@ -1,5 +1,164 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground" />
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <im.vector.app.features.settings.devices.v2.list.SessionsListHeaderView
+            android:id="@+id/deviceListHeaderSectionSecurityRecommendations"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:sessionsListHeaderDescription="@string/device_manager_header_section_security_recommendations_description"
+            app:sessionsListHeaderHasLearnMoreLink="false"
+            app:sessionsListHeaderTitle="@string/device_manager_header_section_security_recommendations_title" />
+
+        <im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
+            android:id="@+id/deviceListUnverifiedSessionsRecommendation"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSectionSecurityRecommendations"
+            app:recommendationDescription="@string/device_manager_unverified_sessions_description"
+            app:recommendationImageBackgroundTint="@color/shield_color_warning_background"
+            app:recommendationImageResource="@drawable/ic_shield_warning_no_border"
+            app:recommendationTitle="@string/device_manager_unverified_sessions_title" />
+
+        <im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
+            android:id="@+id/deviceListInactiveSessionsRecommendation"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListUnverifiedSessionsRecommendation"
+            app:recommendationDescription="@plurals/device_manager_inactive_sessions_description"
+            app:recommendationImageBackgroundTint="?vctr_system"
+            app:recommendationImageResource="@drawable/ic_inactive_sessions"
+            app:recommendationTitle="@string/device_manager_inactive_sessions_title" />
+
+        <View
+            android:id="@+id/deviceListSecurityRecommendationsDivider"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="24dp"
+            android:background="@drawable/divider_horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListInactiveSessionsRecommendation" />
+
+        <im.vector.app.features.settings.devices.v2.list.SessionsListHeaderView
+            android:id="@+id/deviceListHeaderCurrentSession"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListSecurityRecommendationsDivider"
+            app:sessionsListHeaderDescription=""
+            app:sessionsListHeaderHasLearnMoreLink="false"
+            app:sessionsListHeaderMenu="@menu/menu_current_session_header"
+            app:sessionsListHeaderTitle="@string/device_manager_current_session_title" />
+
+        <im.vector.app.features.settings.devices.v2.list.SessionInfoView
+            android:id="@+id/deviceListCurrentSession"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="4dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderCurrentSession" />
+
+        <View
+            android:id="@+id/deviceListDividerCurrentSession"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="24dp"
+            android:background="@drawable/divider_horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListCurrentSession" />
+
+        <im.vector.app.features.settings.devices.v2.list.SessionsListHeaderView
+            android:id="@+id/deviceListHeaderOtherSessions"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListDividerCurrentSession"
+            app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
+            app:sessionsListHeaderHasLearnMoreLink="false"
+            app:sessionsListHeaderMenu="@menu/menu_other_sessions_header"
+            app:sessionsListHeaderTitle="@string/device_manager_sessions_other_title" />
+
+        <im.vector.app.features.settings.devices.v2.list.OtherSessionsView
+            android:id="@+id/deviceListOtherSessions"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderOtherSessions" />
+
+        <im.vector.app.features.settings.devices.v2.list.SessionsListHeaderView
+            android:id="@+id/deviceListHeaderSignInWithQrCode"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListOtherSessions"
+            app:sessionsListHeaderDescription="@string/device_manager_sessions_sign_in_with_qr_code_description"
+            app:sessionsListHeaderHasLearnMoreLink="false"
+            app:sessionsListHeaderTitle="@string/device_manager_sessions_sign_in_with_qr_code_title"
+            tools:visibility="visible" />
+
+        <Button
+            android:id="@+id/deviceListHeaderScanQrCodeButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="12dp"
+            android:text="@string/qr_code_login_scan_qr_code_button"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSignInWithQrCode"
+            tools:visibility="visible" />
+
+        <Button
+            android:id="@+id/deviceListHeaderShowQrCodeButton"
+            style="@style/Widget.Vector.Button.Outlined"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="12dp"
+            android:text="@string/qr_code_login_show_qr_code_button"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderScanQrCodeButton"
+            tools:visibility="visible" />
+
+        <include
+            android:id="@+id/waiting_view"
+            layout="@layout/merge_overlay_waiting_view"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/vector/src/main/res/layout/fragment_space_list.xml b/vector/src/main/res/layout/fragment_space_list.xml
index d54ffa7155..e2822495bf 100644
--- a/vector/src/main/res/layout/fragment_space_list.xml
+++ b/vector/src/main/res/layout/fragment_space_list.xml
@@ -9,7 +9,52 @@
         android:id="@+id/groupListView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:minHeight="195dp"
         android:overScrollMode="always"
         tools:listitem="@layout/item_space" />
 
+
+    <LinearLayout
+        android:id="@+id/spaces_empty_group"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:padding="@dimen/layout_horizontal_margin"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/spaces_empty_title"
+            style="@style/Widget.Vector.TextView.Subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:text="@string/space_list_empty_title"
+            android:textColor="?vctr_content_primary"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/spaces_empty_message"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="220dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:text="@string/space_list_empty_message"
+            android:textColor="?vctr_content_secondary" />
+
+        <Button
+            android:id="@+id/spaces_empty_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="8dp"
+            android:minWidth="190dp"
+            android:text="@string/create_space" />
+
+    </LinearLayout>
+
 </im.vector.app.core.platform.StateView>
diff --git a/vector/src/main/res/layout/fragment_spaces_bottom_sheet.xml b/vector/src/main/res/layout/fragment_spaces_bottom_sheet.xml
new file mode 100644
index 0000000000..27324c852f
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_spaces_bottom_sheet.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/space_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</FrameLayout>
diff --git a/vector/src/main/res/layout/fragment_timeline.xml b/vector/src/main/res/layout/fragment_timeline.xml
index d505e23103..6e83dbe8fd 100644
--- a/vector/src/main/res/layout/fragment_timeline.xml
+++ b/vector/src/main/res/layout/fragment_timeline.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rootConstraintLayout"
+    android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -37,161 +37,187 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <im.vector.app.features.sync.widget.SyncStateView
-        android:id="@+id/syncStateView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
-
-    <im.vector.app.features.location.live.LiveLocationStatusView
-        android:id="@+id/liveLocationStatusIndicator"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/syncStateView"
-        tools:visibility="visible" />
-
-    <im.vector.app.features.call.conference.RemoveJitsiWidgetView
-        android:id="@+id/removeJitsiWidgetView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
-        android:minHeight="54dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/liveLocationStatusIndicator" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/timelineRecyclerView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:overScrollMode="always"
-        app:layout_constraintBottom_toTopOf="@id/typingMessageView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
-        tools:listitem="@layout/item_timeline_event_base" />
-
-    <com.google.android.material.chip.Chip
-        android:id="@+id/jumpToReadMarkerView"
-        style="?vctr_jump_to_unread_style"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="24dp"
-        android:text="@string/room_jump_to_first_unread"
-        android:visibility="invisible"
-        app:chipIcon="@drawable/ic_jump_to_unread"
-        app:chipIconTint="?colorPrimary"
-        app:closeIcon="@drawable/ic_close_24dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView" />
-
-    <im.vector.app.core.ui.views.TypingMessageView
-        android:id="@+id/typingMessageView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingStart="20dp"
-        android:paddingEnd="20dp"
-        app:layout_constraintBottom_toTopOf="@id/bottomBarrier"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/timelineRecyclerView" />
-
-    <im.vector.app.core.ui.views.NotificationAreaView
-        android:id="@+id/notificationAreaView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:visibility="visible" />
-
-    <ViewStub
-        android:id="@+id/failedMessagesWarningStub"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inflatedId="@+id/failedMessagesWarningStub"
-        android:layout="@layout/view_stub_failed_message_warning_layout"
-        app:layout_constraintBottom_toTopOf="@id/composerLayout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:layout_height="300dp" />
-
-    <im.vector.app.features.home.room.detail.composer.MessageComposerView
-        android:id="@+id/composerLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
-        android:minHeight="56dp"
-        android:transitionName="composer"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:visibility="visible" />
-
-    <im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
-        android:id="@+id/voiceMessageRecorderView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:visibility="visible" />
-
-    <ViewStub
-        android:id="@+id/inviteViewStub"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="?android:colorBackground"
-        android:layout="@layout/view_stub_invite_layout"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/bottomBarrier"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:barrierDirection="top"
-        app:constraint_referenced_ids="composerLayout,notificationAreaView,failedMessagesWarningStub" />
-
-    <im.vector.app.core.platform.BadgeFloatingActionButton
-        android:id="@+id/jumpToBottomView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/a11y_jump_to_bottom"
-        android:src="@drawable/ic_expand_more"
-        app:backgroundTint="#FFFFFF"
-        app:badgeBackgroundColor="?colorPrimary"
-        app:badgeTextColor="?colorOnPrimary"
-        app:badgeTextPadding="2dp"
-        app:badgeTextSize="10sp"
-        app:layout_constraintBottom_toTopOf="@id/bottomBarrier"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:tint="@android:color/black" />
-
-    <im.vector.app.core.ui.views.CompatKonfetti
-        android:id="@+id/viewKonfetti"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="invisible" />
+        android:id="@+id/rootConstraintLayout">
 
-    <com.jetradarmobile.snowfall.SnowfallView
-        android:id="@+id/viewSnowFall"
+        <im.vector.app.features.sync.widget.SyncStateView
+            android:id="@+id/syncStateView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <im.vector.app.features.location.live.LiveLocationStatusView
+            android:id="@+id/liveLocationStatusIndicator"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/syncStateView"
+            tools:visibility="visible" />
+
+        <im.vector.app.features.call.conference.RemoveJitsiWidgetView
+            android:id="@+id/removeJitsiWidgetView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="?android:colorBackground"
+            android:minHeight="54dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/liveLocationStatusIndicator" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/timelineRecyclerView"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:overScrollMode="always"
+            app:layout_constraintBottom_toTopOf="@id/notificationAreaView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
+            tools:listitem="@layout/item_timeline_event_base" />
+
+        <com.google.android.material.chip.Chip
+            android:id="@+id/jumpToReadMarkerView"
+            style="?vctr_jump_to_unread_style"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="24dp"
+            android:text="@string/room_jump_to_first_unread"
+            android:visibility="invisible"
+            app:chipIcon="@drawable/ic_jump_to_unread"
+            app:chipIconTint="?colorPrimary"
+            app:closeIcon="@drawable/ic_close_24dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView" />
+
+        <im.vector.app.core.ui.views.NotificationAreaView
+            android:id="@+id/notificationAreaView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:visibility="visible" />
+
+        <ViewStub
+            android:id="@+id/failedMessagesWarningStub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/failedMessagesWarningStub"
+            android:layout="@layout/view_stub_failed_message_warning_layout"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:layout_height="300dp" />
+
+        <ViewStub
+            android:id="@+id/inviteViewStub"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="?android:colorBackground"
+            android:layout="@layout/view_stub_invite_layout"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <im.vector.app.core.platform.BadgeFloatingActionButton
+            android:id="@+id/jumpToBottomView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:contentDescription="@string/a11y_jump_to_bottom"
+            android:src="@drawable/ic_expand_more"
+            android:visibility="gone"
+            app:backgroundTint="#FFFFFF"
+            app:badgeBackgroundColor="?colorPrimary"
+            app:badgeTextColor="?colorOnPrimary"
+            app:badgeTextPadding="2dp"
+            app:badgeTextSize="10sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:tint="@android:color/black" />
+
+        <im.vector.app.core.ui.views.CompatKonfetti
+            android:id="@+id/viewKonfetti"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="invisible" />
+
+        <com.jetradarmobile.snowfall.SnowfallView
+            android:id="@+id/viewSnowFall"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?vctr_chat_effect_snow_background"
+            android:visibility="invisible" />
+
+        <!-- Room not found layout -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/roomNotFound"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="?android:colorBackground"
+            android:elevation="10dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="gone">
+
+            <ImageView
+                android:id="@+id/roomNotFoundIcon"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_alert_triangle"
+                app:layout_constraintBottom_toTopOf="@id/roomNotFoundText"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <TextView
+                android:id="@+id/roomNotFoundText"
+                style="@style/Widget.Vector.TextView.Subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/layout_vertical_margin"
+                android:gravity="center"
+                android:paddingHorizontal="16dp"
+                android:text="@string/timeline_error_room_not_found"
+                android:textColor="?vctr_content_primary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/roomNotFoundIcon" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <FrameLayout
+        android:id="@+id/composerContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?vctr_chat_effect_snow_background"
-        android:visibility="invisible" />
+        android:translationZ="10dp"
+        android:background="@android:color/transparent"
+        app:layout_behavior="im.vector.app.core.utils.ExpandingBottomSheetBehavior" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <FrameLayout
+        android:id="@+id/voiceMessageRecorderContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:visibility="visible"
+        android:translationZ="10dp" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 59b60d1c3b..673dcbf886 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -69,6 +69,7 @@
                     android:textAlignment="center"
                     android:textColor="?vctr_content_tertiary"
                     app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
+                    app:layout_goneMarginTop="54dp"
                     tools:text="@sample/users.json/data/id" />
 
                 <!--                android:id="@+id/itemShareQrCodeImage"-->
diff --git a/vector/src/main/res/layout/fragment_voice_recorder.xml b/vector/src/main/res/layout/fragment_voice_recorder.xml
new file mode 100644
index 0000000000..787bcd25f3
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_voice_recorder.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/voiceMessageRecorderView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index a637c8f52e..67d286a917 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -7,6 +7,8 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="@dimen/item_form_min_height"
+    android:paddingBottom="8dp"
+    android:paddingTop="8dp"
     tools:viewBindingIgnore="true">
 
     <TextView
diff --git a/vector/src/main/res/layout/item_invites_count.xml b/vector/src/main/res/layout/item_invites_count.xml
new file mode 100644
index 0000000000..8ec4eb0279
--- /dev/null
+++ b/vector/src/main/res/layout/item_invites_count.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="36sp"
+    android:background="?vctr_toolbar_background"
+    android:clickable="true"
+    android:focusable="true"
+    tools:viewBindingIgnore="true">
+
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+        android:id="@+id/invites_count_badge"
+        style="@style/Widget.Vector.TextView.Micro"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:gravity="center"
+        android:minWidth="16dp"
+        android:minHeight="16dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        android:textColor="?colorOnError"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="@drawable/bg_unread_highlight"
+        tools:text="4"
+        tools:visibility="visible" />
+
+
+    <TextView
+        android:id="@+id/invites_count_title"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|end"
+        android:layout_marginEnd="8dp"
+        android:text="@string/invites_title"
+        android:textAllCaps="true"
+        android:textColor="?colorSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/invites_count_badge"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/invites_divider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginStart="22dp"
+        android:layout_marginEnd="16dp"
+        android:background="?vctr_list_separator"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_new_space.xml b/vector/src/main/res/layout/item_new_space.xml
new file mode 100644
index 0000000000..fc023ebd6e
--- /dev/null
+++ b/vector/src/main/res/layout/item_new_space.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="65dp"
+    android:background="@drawable/bg_space_item"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
+
+    <ImageView
+        android:id="@+id/avatar"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:duplicateParentState="true"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/space_avatars" />
+
+    <TextView
+        android:id="@+id/name"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_primary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/unread_counter"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Element Corp" />
+
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+        android:id="@+id/unread_counter"
+        style="@style/Widget.Vector.TextView.Micro"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:gravity="center"
+        android:minWidth="16dp"
+        android:minHeight="16dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        android:textColor="?colorOnError"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/chevron"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="@drawable/bg_unread_highlight"
+        tools:text="147"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/chevron"
+        android:layout_width="32dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="21dp"
+        android:background="?selectableItemBackground"
+        android:contentDescription="@string/a11y_expand_space_children"
+        android:scaleType="centerInside"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?vctr_content_secondary"
+        tools:ignore="MissingPrefix"
+        tools:src="@drawable/ic_arrow_right"
+        tools:visibility="visible" />
+
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_new_space_add.xml b/vector/src/main/res/layout/item_new_space_add.xml
new file mode 100644
index 0000000000..5a62abd740
--- /dev/null
+++ b/vector/src/main/res/layout/item_new_space_add.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemGroupLayout"
+    android:layout_width="match_parent"
+    android:layout_height="65dp"
+    android:background="@drawable/bg_space_item"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="26dp"
+        android:background="?attr/vctr_system"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/plus"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:background="@drawable/rounded_rect_shape_8"
+        android:backgroundTint="#4D8D97A5"
+        android:duplicateParentState="true"
+        android:importantForAccessibility="no"
+        android:padding="10dp"
+        android:src="@drawable/ic_plus"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/groupNameView"
+        style="@style/Widget.Vector.TextView.Subtitle.Medium"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/create_space"
+        android:textColor="?vctr_message_text_color"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/plus"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_new_space_list_header.xml b/vector/src/main/res/layout/item_new_space_list_header.xml
new file mode 100644
index 0000000000..2c52304249
--- /dev/null
+++ b/vector/src/main/res/layout/item_new_space_list_header.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/TextAppearance.Vector.Body.Medium"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_space_item"
+    android:ellipsize="middle"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:singleLine="true"
+    android:text="@string/change_space"
+    android:textAllCaps="true"
+    android:textColor="?vctr_content_tertiary"
+    android:textSize="14sp"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_new_sub_space.xml b/vector/src/main/res/layout/item_new_sub_space.xml
new file mode 100644
index 0000000000..014568e26d
--- /dev/null
+++ b/vector/src/main/res/layout/item_new_sub_space.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:background="@drawable/bg_space_item"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
+
+    <Space
+        android:id="@+id/indent"
+        android:layout_width="20dp"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/avatar"
+        android:layout_width="26dp"
+        android:layout_height="26dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:duplicateParentState="true"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/indent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/space_avatars" />
+
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+        android:id="@+id/notification_badge"
+        style="@style/Widget.Vector.TextView.Micro"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:gravity="center"
+        android:minWidth="16dp"
+        android:minHeight="16dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        android:textColor="?colorOnError"
+        android:visibility="gone"
+        app:layout_constraintCircle="@id/avatar"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="14dp"
+        tools:background="@drawable/bg_unread_highlight"
+        tools:text="147"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/name"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_primary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/chevron"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@tools:sample/lorem/random" />
+
+    <ImageView
+        android:id="@+id/chevron"
+        android:layout_width="24dp"
+        android:layout_height="32dp"
+        android:layout_marginEnd="24dp"
+        android:background="?selectableItemBackground"
+        android:contentDescription="@string/a11y_expand_space_children"
+        android:scaleType="centerInside"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?vctr_content_secondary"
+        tools:ignore="MissingPrefix"
+        tools:src="@drawable/ic_arrow_right"
+        tools:visibility="visible" />
+
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_other_session.xml b/vector/src/main/res/layout/item_other_session.xml
new file mode 100644
index 0000000000..8f6e4f64e4
--- /dev/null
+++ b/vector/src/main/res/layout/item_other_session.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:foreground="?selectableItemBackground"
+    android:paddingTop="8dp">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/startGuideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="8dp" />
+
+    <View
+        android:id="@+id/otherSessionItemBackground"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/bg_other_session"
+        app:layout_constraintBottom_toBottomOf="@id/otherSessionSeparator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/otherSessionDeviceTypeImageView"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="11dp"
+        android:background="@drawable/bg_device_type"
+        android:contentDescription="@string/a11y_device_manager_device_type_mobile"
+        android:padding="8dp"
+        app:layout_constraintBottom_toBottomOf="@id/otherSessionItemBackground"
+        app:layout_constraintStart_toStartOf="@id/startGuideline"
+        app:layout_constraintTop_toTopOf="@id/otherSessionItemBackground"
+        tools:src="@drawable/ic_device_type_mobile" />
+
+    <im.vector.app.core.ui.views.ShieldImageView
+        android:id="@+id/otherSessionVerificationStatusImageView"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="26dp"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/circle_with_border"
+        android:importantForAccessibility="no"
+        android:padding="6dp"
+        app:layout_constraintStart_toStartOf="@id/otherSessionDeviceTypeImageView"
+        app:layout_constraintTop_toTopOf="@id/otherSessionDeviceTypeImageView"
+        tools:src="@drawable/ic_shield_trusted" />
+
+    <TextView
+        android:id="@+id/otherSessionNameTextView"
+        style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:lines="1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/otherSessionDeviceTypeImageView"
+        app:layout_constraintTop_toTopOf="@id/otherSessionItemBackground"
+        tools:text="Element Mobile: Android" />
+
+    <TextView
+        android:id="@+id/otherSessionDescriptionTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:drawablePadding="8dp"
+        app:layout_constraintEnd_toEndOf="@id/otherSessionNameTextView"
+        app:layout_constraintStart_toStartOf="@id/otherSessionNameTextView"
+        app:layout_constraintTop_toBottomOf="@id/otherSessionNameTextView"
+        tools:text="@string/device_manager_verification_status_verified" />
+
+    <TextView
+        android:id="@+id/otherSessionIpAddressTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:drawablePadding="8dp"
+        app:layout_constraintEnd_toEndOf="@id/otherSessionNameTextView"
+        app:layout_constraintStart_toStartOf="@id/otherSessionNameTextView"
+        app:layout_constraintTop_toBottomOf="@id/otherSessionDescriptionTextView"
+        tools:text="0.0.0.0" />
+
+    <View
+        android:id="@+id/otherSessionSeparator"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="16dp"
+        android:background="?vctr_content_quinary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/otherSessionNameTextView"
+        app:layout_constraintTop_toBottomOf="@id/otherSessionIpAddressTextView" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index afc40e5b7a..67a3a7d390 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -83,6 +83,23 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
+        tools:text="Pixel 6" />
+
+    <TextView
+        android:id="@+id/pushGatewayDeviceId"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:text="@string/push_gateway_item_device_id"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/pushGatewayDeviceIdValue"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         tools:text="EBMDOLFJD" />
 
     <TextView
@@ -135,6 +152,23 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp" />
 
+    <TextView
+        android:id="@+id/pushGatewayEnabled"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:text="@string/push_gateway_item_enabled"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/pushGatewayEnabledValue"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        tools:text="true" />
+
     <Button
         android:id="@+id/pushGatewayDeleteButton"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/item_recent_room.xml b/vector/src/main/res/layout/item_recent_room.xml
index 8e17707ff3..7feb8f0d16 100644
--- a/vector/src/main/res/layout/item_recent_room.xml
+++ b/vector/src/main/res/layout/item_recent_room.xml
@@ -3,12 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/recentRoot"
-    android:layout_width="60dp"
+    android:layout_width="84dp"
     android:layout_height="wrap_content"
-    android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
+    android:paddingHorizontal="12dp"
     tools:viewBindingIgnore="true">
 
     <ImageView
@@ -50,6 +50,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginBottom="16dp"
         android:ellipsize="end"
+        android:importantForAccessibility="no"
         android:lines="1"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_release_carousel.xml b/vector/src/main/res/layout/item_release_carousel.xml
new file mode 100644
index 0000000000..eeb999b187
--- /dev/null
+++ b/vector/src/main/res/layout/item_release_carousel.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="bottom">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/splashCarouselGutterStart"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_start_percent" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/splashCarouselGutterEnd"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" />
+
+    <ImageView
+        android:id="@+id/carousel_item_image"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:scaleType="centerInside"
+        android:layout_marginBottom="@dimen/release_notes_vertical_margin_large"
+        android:contentDescription="@null"
+        app:layout_constraintStart_toStartOf="@id/splashCarouselGutterStart"
+        app:layout_constraintEnd_toEndOf="@id/splashCarouselGutterStart"
+        app:layout_constraintBottom_toTopOf="@id/carousel_item_title"
+        tools:src="@drawable/ill_app_layout_onboarding_rooms"/>
+
+    <TextView
+        android:id="@+id/carousel_item_title"
+        style="@style/Widget.Vector.TextView.Title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:textColor="?vctr_content_primary"
+        android:maxLines="2"
+        app:layout_constraintBottom_toTopOf="@id/carousel_item_body"
+        app:layout_constraintEnd_toEndOf="@id/splashCarouselGutterEnd"
+        app:layout_constraintStart_toStartOf="@id/splashCarouselGutterStart"
+        tools:text="@string/onboarding_new_app_layout_welcome_title" />
+
+    <TextView
+        android:id="@+id/carousel_item_body"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textColor="?vctr_content_secondary"
+        android:maxLines="3"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/splashCarouselGutterEnd"
+        app:layout_constraintStart_toStartOf="@id/splashCarouselGutterStart"
+        tools:text="@string/onboarding_new_app_layout_welcome_message" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index ab0af18acb..a94cc0738b 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -190,7 +190,7 @@
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
-        android:maxLines="2"
+        android:lines="2"
         android:textAlignment="viewStart"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_room_placeholder.xml b/vector/src/main/res/layout/item_room_placeholder.xml
index ea264f2668..fa1a83c2a1 100644
--- a/vector/src/main/res/layout/item_room_placeholder.xml
+++ b/vector/src/main/res/layout/item_room_placeholder.xml
@@ -16,7 +16,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="12dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -29,23 +29,20 @@
 
     </FrameLayout>
 
-    <!-- Margin bottom does not work, so I use space -->
-    <Space
-        android:id="@+id/roomAvatarBottomSpace"
-        android:layout_width="0dp"
-        android:layout_height="12dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/roomAvatarContainer"
-        tools:layout_marginStart="20dp" />
-
-    <View
+    <TextView
         android:id="@+id/roomNameView"
-        android:layout_width="wrap_content"
-        android:layout_height="15dp"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="70dp"
         android:background="@drawable/placeholder_shape_8"
+        android:duplicateParentState="true"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_primary"
+        android:textStyle="bold"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -53,23 +50,38 @@
         app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <View
-        android:id="@+id/roomTypingView"
+    <TextView
+        android:id="@+id/subtitleView"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
-        android:layout_height="30dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="20dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="8dp"
         android:background="@drawable/placeholder_shape_8"
+        android:ellipsize="end"
+        android:lines="2"
+        android:textAlignment="viewStart"
+        android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/roomNameView"
         app:layout_constraintTop_toBottomOf="@id/roomNameView" />
 
+    <!-- Margin bottom does not work, so I use space -->
+    <Space
+        android:id="@+id/roomAvatarBottomSpace"
+        android:layout_width="0dp"
+        android:layout_height="7dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/subtitleView"
+        tools:layout_marginStart="120dp" />
+
     <!-- We use vctr_list_separator_system here for a better rendering -->
     <View
         android:id="@+id/roomDividerView"
         android:layout_width="0dp"
         android:layout_height="1dp"
         android:background="?vctr_list_separator_system"
+        app:layout_constraintTop_toBottomOf="@id/roomAvatarBottomSpace"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/vector/src/main/res/layout/item_session_details_content.xml b/vector/src/main/res/layout/item_session_details_content.xml
new file mode 100644
index 0000000000..c847090b3f
--- /dev/null
+++ b/vector/src/main/res/layout/item_session_details_content.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/sessionDetailsContentTitle"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        app:layout_constraintBottom_toTopOf="@id/sessionDetailsContentDivider"
+        app:layout_constraintEnd_toStartOf="@id/sessionDetailsContentDescription"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/sessionDetailsContentTop"
+        tools:text="Session name" />
+
+    <TextView
+        android:id="@+id/sessionDetailsContentDescription"
+        style="@style/TextAppearance.Vector.Body"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:gravity="end"
+        app:layout_constraintBottom_toTopOf="@id/sessionDetailsContentDivider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/sessionDetailsContentTitle"
+        app:layout_constraintTop_toTopOf="@id/sessionDetailsContentTop"
+        tools:text="app.element.io: Firefox on macOS" />
+
+    <View
+        android:id="@+id/sessionDetailsContentDivider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="@drawable/divider_horizontal"
+        app:layout_constraintEnd_toEndOf="@id/sessionDetailsContentDescription"
+        app:layout_constraintStart_toStartOf="@id/sessionDetailsContentTitle"
+        app:layout_constraintTop_toTopOf="@id/sessionDetailsContentBarrier" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/sessionDetailsContentBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:barrierMargin="14dp"
+        app:constraint_referenced_ids="sessionDetailsContentTitle, sessionDetailsContentDescription" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/sessionDetailsContentTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="14dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_session_details_header.xml b/vector/src/main/res/layout/item_session_details_header.xml
new file mode 100644
index 0000000000..64e0efac1f
--- /dev/null
+++ b/vector/src/main/res/layout/item_session_details_header.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="10dp">
+
+    <TextView
+        android:id="@+id/sessionDetailsHeaderTitle"
+        style="@style/TextAppearance.Vector.Body.Medium"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:lines="1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Session" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_space_invite.xml b/vector/src/main/res/layout/item_space_invite.xml
new file mode 100644
index 0000000000..2bad079b5f
--- /dev/null
+++ b/vector/src/main/res/layout/item_space_invite.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="65dp"
+    android:background="@drawable/bg_space_item"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
+
+    <ImageView
+        android:id="@+id/avatar"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:duplicateParentState="true"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/space_avatars" />
+
+    <TextView
+        android:id="@+id/name"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_primary"
+        android:textStyle="bold"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toTopOf="@id/invited_by"
+        app:layout_constraintEnd_toStartOf="@id/unread_counter"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Element Corp" />
+
+    <TextView
+        android:id="@+id/invited_by"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:layout_marginTop="2dp"
+        android:maxLines="1"
+        android:textColor="?vctr_content_secondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/unread_counter"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toBottomOf="@id/name"
+        tools:text="Invited by John Smith" />
+
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+        android:id="@+id/notification_badge"
+        style="@style/Widget.Vector.TextView.Micro"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginEnd="52dp"
+        android:gravity="center"
+        android:minWidth="16dp"
+        android:minHeight="16dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        android:textColor="?colorOnError"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="@drawable/bg_unread_highlight"
+        tools:text="!"
+        tools:visibility="visible" />
+
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_state_view.xml b/vector/src/main/res/layout/item_state_view.xml
new file mode 100644
index 0000000000..3cf2e3e6d2
--- /dev/null
+++ b/vector/src/main/res/layout/item_state_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/stateView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:colorBackground">
+
+</im.vector.app.core.platform.StateView>
diff --git a/vector/src/main/res/layout/item_timeline_event_audio_stub.xml b/vector/src/main/res/layout/item_timeline_event_audio_stub.xml
index 2a6fbf5a9e..4c4286af9b 100644
--- a/vector/src/main/res/layout/item_timeline_event_audio_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_audio_stub.xml
@@ -73,7 +73,7 @@
             android:layout_marginTop="12dp"
             android:layout_marginBottom="10dp"
             android:progressDrawable="@drawable/bg_seek_bar"
-            android:thumbTint="?vctr_content_tertiary"
+            android:thumbTint="?vctr_content_secondary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/audioPlaybackTime"
             app:layout_constraintTop_toBottomOf="@id/audioPlaybackControlButton"
@@ -85,7 +85,7 @@
             style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?vctr_content_tertiary"
+            android:textColor="?vctr_content_secondary"
             android:layout_marginEnd="4dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/audioSeekBar"
@@ -104,4 +104,4 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml b/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
index 0d45a48b9b..643f4a89c8 100644
--- a/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
+++ b/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
@@ -47,6 +47,20 @@
         android:layout="@layout/item_timeline_event_audio_stub"
         tools:visibility="gone" />
 
+    <ViewStub
+        android:id="@+id/messageVoiceBroadcastRecordingStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout="@layout/item_timeline_event_voice_broadcast_recording_stub"
+        tools:visibility="gone" />
+
+    <ViewStub
+        android:id="@+id/messageVoiceBroadcastListeningStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout="@layout/item_timeline_event_voice_broadcast_listening_stub"
+        tools:visibility="gone" />
+
     <ViewStub
         android:id="@+id/messageContentPollStub"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
new file mode 100644
index 0000000000..760293ee64
--- /dev/null
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/messageRootLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/rounded_rect_shape_8"
+    android:backgroundTint="?vctr_content_quinary"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="12dp">
+
+    <TextView
+        android:id="@+id/liveIndicator"
+        style="@style/VoiceBroadcastLiveIndicator"
+        android:background="@drawable/rounded_rect_shape_2"
+        android:text="@string/voice_broadcast_live"
+        app:drawableStartCompat="@drawable/ic_voice_broadcast"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/roomAvatarImageView"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/room_round_avatars" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/avatarRightBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="right"
+        app:barrierMargin="6dp"
+        app:constraint_referenced_ids="roomAvatarImageView" />
+
+    <TextView
+        android:id="@+id/titleText"
+        style="@style/Widget.Vector.TextView.Body.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@sample/rooms.json/data/name" />
+
+    <androidx.constraintlayout.helper.widget.Flow
+        android:id="@+id/metadataFlow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:orientation="vertical"
+        app:constraint_referenced_ids="broadcasterNameMetadata,bufferingMetadata,voiceBroadcastMetadata,listenersCountMetadata"
+        app:flow_horizontalAlign="start"
+        app:flow_verticalGap="4dp"
+        app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
+        app:layout_constraintTop_toBottomOf="@id/titleText" />
+
+    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+        android:id="@+id/broadcasterNameMetadata"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:metadataIcon="@drawable/ic_voice_broadcast_mic"
+        tools:metadataValue="@sample/users.json/data/displayName" />
+
+    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastBufferingView
+        android:id="@+id/bufferingMetadata"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+        android:id="@+id/voiceBroadcastMetadata"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:metadataIcon="@drawable/ic_voice_broadcast"
+        app:metadataValue="@string/attachment_type_voice_broadcast" />
+
+    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+        android:id="@+id/listenersCountMetadata"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:metadataIcon="@drawable/ic_member_small"
+        app:metadataValue="@string/no_value_placeholder"
+        tools:metadataValue="5 listeners" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/headerBottomBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:barrierMargin="10dp"
+        app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataFlow" />
+
+    <androidx.constraintlayout.helper.widget.Flow
+        android:id="@+id/controllerButtonsFlow"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:constraint_referenced_ids="fastBackwardButton,playPauseButton,fastForwardButton"
+        app:layout_constraintBottom_toTopOf="@id/seekBar"
+        app:layout_constraintTop_toBottomOf="@id/headerBottomBarrier" />
+
+    <ImageButton
+        android:id="@+id/fastBackwardButton"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:background="@drawable/bg_rounded_button"
+        android:contentDescription="@string/a11y_voice_broadcast_fast_backward"
+        android:src="@drawable/ic_player_backward_30"
+        android:visibility="invisible"
+        app:tint="?vctr_content_secondary"
+        tools:visibility="visible" />
+
+    <ImageButton
+        android:id="@+id/playPauseButton"
+        android:layout_width="@dimen/voice_broadcast_player_button_size"
+        android:layout_height="@dimen/voice_broadcast_player_button_size"
+        android:background="@drawable/bg_rounded_button"
+        android:backgroundTint="?vctr_system"
+        android:contentDescription="@string/a11y_play_voice_broadcast"
+        android:src="@drawable/ic_play_pause_play"
+        app:tint="?vctr_content_secondary" />
+
+    <ImageButton
+        android:id="@+id/fastForwardButton"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:background="@drawable/bg_rounded_button"
+        android:contentDescription="@string/a11y_voice_broadcast_fast_forward"
+        android:src="@drawable/ic_player_forward_30"
+        android:visibility="invisible"
+        app:tint="?vctr_content_secondary"
+        tools:visibility="visible" />
+
+    <SeekBar
+        android:id="@+id/seekBar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="0dp"
+        android:progressDrawable="@drawable/bg_seek_bar"
+        android:thumbOffset="3dp"
+        android:thumbTint="?vctr_content_secondary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/controllerButtonsFlow"
+        tools:progress="50" />
+
+    <TextView
+        android:id="@+id/elapsedTime"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="-3dp"
+        android:textColor="?vctr_content_tertiary"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/seekBar"
+        tools:ignore="NegativeMargin"
+        tools:text="0:11" />
+
+    <TextView
+        android:id="@+id/remainingTime"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-3dp"
+        android:layout_marginEnd="4dp"
+        android:textColor="?vctr_content_tertiary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/seekBar"
+        tools:ignore="NegativeMargin"
+        tools:text="-0:12" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
new file mode 100644
index 0000000000..2bac6a8e42
--- /dev/null
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/messageRootLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/rounded_rect_shape_8"
+    android:backgroundTint="?vctr_content_quinary"
+    android:padding="12dp">
+
+    <TextView
+        android:id="@+id/liveIndicator"
+        style="@style/VoiceBroadcastLiveIndicator"
+        android:background="@drawable/rounded_rect_shape_2"
+        android:text="@string/voice_broadcast_live"
+        app:drawableStartCompat="@drawable/ic_voice_broadcast"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/roomAvatarImageView"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/user_round_avatars" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/avatarRightBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="right"
+        app:barrierMargin="6dp"
+        app:constraint_referenced_ids="roomAvatarImageView" />
+
+    <TextView
+        android:id="@+id/titleText"
+        style="@style/Widget.Vector.TextView.Body.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@sample/users.json/data/displayName" />
+
+    <androidx.constraintlayout.helper.widget.Flow
+        android:id="@+id/metadataFlow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:orientation="vertical"
+        app:constraint_referenced_ids="listenersCountMetadata,remainingTimeMetadata"
+        app:flow_horizontalAlign="start"
+        app:flow_verticalGap="4dp"
+        app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
+        app:layout_constraintTop_toBottomOf="@id/titleText" />
+
+    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+        android:id="@+id/listenersCountMetadata"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:metadataIcon="@drawable/ic_member_small"
+        app:metadataValue="@string/no_value_placeholder"
+        tools:metadataValue="5 listening" />
+
+    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+        android:id="@+id/remainingTimeMetadata"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:metadataIcon="@drawable/ic_timer"
+        tools:metadataValue="3h 2m 50s left" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/headerBottomBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:barrierMargin="12dp"
+        app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataFlow" />
+
+    <androidx.constraintlayout.helper.widget.Flow
+        android:id="@+id/controllerButtonsFlow"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        app:constraint_referenced_ids="recordButton,stopRecordButton"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/headerBottomBarrier" />
+
+    <ImageButton
+        android:id="@+id/recordButton"
+        android:layout_width="@dimen/voice_broadcast_recorder_button_size"
+        android:layout_height="@dimen/voice_broadcast_recorder_button_size"
+        android:background="@drawable/bg_rounded_button"
+        android:backgroundTint="?vctr_system"
+        android:contentDescription="@string/a11y_resume_voice_broadcast_record"
+        android:src="@drawable/ic_recording_dot" />
+
+    <ImageButton
+        android:id="@+id/stopRecordButton"
+        android:layout_width="@dimen/voice_broadcast_recorder_button_size"
+        android:layout_height="@dimen/voice_broadcast_recorder_button_size"
+        android:background="@drawable/bg_rounded_button"
+        android:backgroundTint="?vctr_system"
+        android:contentDescription="@string/a11y_stop_voice_broadcast_record"
+        android:src="@drawable/ic_stop" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_typing_users.xml b/vector/src/main/res/layout/item_typing_users.xml
new file mode 100644
index 0000000000..7902f0c814
--- /dev/null
+++ b/vector/src/main/res/layout/item_typing_users.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.ui.views.TypingMessageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/typingMessageView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="20dp"
+    android:visibility="invisible" />
diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index c108dfd96e..6ce96111e9 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -63,6 +63,16 @@
                 android:src="@drawable/ic_attachment_file"
                 app:tint="?colorPrimary" />
 
+            <ImageButton
+                android:id="@+id/attachmentVoiceBroadcast"
+                android:layout_width="@dimen/layout_touch_size"
+                android:layout_height="@dimen/layout_touch_size"
+                android:layout_marginStart="2dp"
+                android:background="?android:attr/selectableItemBackground"
+                android:contentDescription="@string/attachment_type_voice_broadcast"
+                android:src="@drawable/ic_attachment_voice_broadcast"
+                app:tint="?colorPrimary" />
+
             <ImageButton
                 android:id="@+id/attachmentPollButton"
                 android:layout_width="@dimen/layout_touch_size"
diff --git a/vector/src/main/res/layout/view_other_session_security_recommendation.xml b/vector/src/main/res/layout/view_other_session_security_recommendation.xml
new file mode 100644
index 0000000000..d7597aea35
--- /dev/null
+++ b/vector/src/main/res/layout/view_other_session_security_recommendation.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/recommendationShieldImageView"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@drawable/bg_security_recommendation_shield"
+        android:importantForAccessibility="no"
+        android:padding="8dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:backgroundTint="@color/shield_color_warning_background"
+        tools:src="@drawable/ic_shield_warning_no_border" />
+
+    <TextView
+        android:id="@+id/recommendationTitleTextView"
+        style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/recommendationShieldImageView"
+        app:layout_constraintTop_toTopOf="@id/recommendationShieldImageView"
+        app:layout_constraintBottom_toBottomOf="@id/recommendationShieldImageView"
+        tools:text="@string/device_manager_other_sessions_recommendation_title_unverified" />
+
+    <TextView
+        android:id="@+id/recommendationDescriptionTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="40dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
+        app:layout_constraintTop_toBottomOf="@id/recommendationTitleTextView"
+        tools:text="@string/device_manager_other_sessions_recommendation_description_unverified" />
+
+</merge>
diff --git a/vector/src/main/res/layout/view_other_sessions.xml b/vector/src/main/res/layout/view_other_sessions.xml
new file mode 100644
index 0000000000..dc3d35494c
--- /dev/null
+++ b/vector/src/main/res/layout/view_other_sessions.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="8dp">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/otherSessionsRecyclerView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:listitem="@layout/item_other_session" />
+
+    <Button
+        android:id="@+id/otherSessionsViewAllButton"
+        style="@style/Widget.Vector.Button.Text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="72dp"
+        android:layout_marginTop="4dp"
+        android:padding="0dp"
+        app:layout_constraintStart_toStartOf="@id/otherSessionsRecyclerView"
+        app:layout_constraintTop_toBottomOf="@id/otherSessionsRecyclerView"
+        tools:text="@string/device_manager_other_sessions_view_all" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_qr_code_login_header.xml b/vector/src/main/res/layout/view_qr_code_login_header.xml
new file mode 100644
index 0000000000..4a734ec21e
--- /dev/null
+++ b/vector/src/main/res/layout/view_qr_code_login_header.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/qrCodeLoginHeaderImageView"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_marginTop="40dp"
+        android:background="@drawable/circle"
+        android:contentDescription="@string/qr_code_login_header_scan_qr_code_title"
+        android:padding="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?vctr_system"
+        tools:backgroundTint="?colorPrimary"
+        tools:src="@drawable/ic_camera" />
+
+    <TextView
+        android:id="@+id/qrCodeLoginHeaderTitleTextView"
+        style="@style/TextAppearance.Vector.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/qrCodeLoginHeaderImageView"
+        tools:text="@string/qr_code_login_header_scan_qr_code_title" />
+
+    <TextView
+        android:id="@+id/qrCodeLoginHeaderDescriptionTextView"
+        style="@style/TextAppearance.Vector.Subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/qrCodeLoginHeaderTitleTextView"
+        tools:text="@string/qr_code_login_header_scan_qr_code_description" />
+
+</merge>
diff --git a/vector/src/main/res/layout/view_qr_code_login_instructions.xml b/vector/src/main/res/layout/view_qr_code_login_instructions.xml
new file mode 100644
index 0000000000..fee3e2c5d6
--- /dev/null
+++ b/vector/src/main/res/layout/view_qr_code_login_instructions.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <LinearLayout
+        android:id="@+id/instructions1Layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible">
+
+        <TextView
+            style="@style/TextAppearance.Vector.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/circle_qr_code_login_instruction_with_border"
+            android:padding="6dp"
+            android:text="@string/one"
+            android:textColor="?colorPrimary" />
+
+        <TextView
+            android:id="@+id/instruction1TextView"
+            style="@style/TextAppearance.Vector.Body"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            tools:text="@string/qr_code_login_new_device_instruction_1" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/instructions2Layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/instructions1Layout"
+        tools:visibility="visible">
+
+        <TextView
+            style="@style/TextAppearance.Vector.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/circle_qr_code_login_instruction_with_border"
+            android:padding="6dp"
+            android:text="@string/two"
+            android:textColor="?colorPrimary" />
+
+        <TextView
+            android:id="@+id/instruction2TextView"
+            style="@style/TextAppearance.Vector.Body"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            tools:text="@string/qr_code_login_new_device_instruction_2" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/instructions3Layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/instructions2Layout"
+        tools:visibility="visible">
+
+        <TextView
+            style="@style/TextAppearance.Vector.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/circle_qr_code_login_instruction_with_border"
+            android:padding="6dp"
+            android:text="@string/three"
+            android:textColor="?colorPrimary" />
+
+        <TextView
+            android:id="@+id/instruction3TextView"
+            style="@style/TextAppearance.Vector.Body"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            tools:text="@string/qr_code_login_new_device_instruction_3" />
+    </LinearLayout>
+
+</merge>
diff --git a/vector/src/main/res/layout/view_rich_text_menu_button.xml b/vector/src/main/res/layout/view_rich_text_menu_button.xml
new file mode 100644
index 0000000000..b99a29da2b
--- /dev/null
+++ b/vector/src/main/res/layout/view_rich_text_menu_button.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/rich_text_composer_menu_item_size"
+    android:layout_height="@dimen/rich_text_composer_menu_item_size"
+    android:layout_marginHorizontal="2dp"
+    android:background="@drawable/bg_rich_text_menu_button"
+    app:tint="@color/selector_rich_text_menu_icon"
+    tools:src="@drawable/ic_composer_bold"
+    tools:ignore="ContentDescription" />
diff --git a/vector/src/main/res/layout/view_security_recommendation.xml b/vector/src/main/res/layout/view_security_recommendation.xml
new file mode 100644
index 0000000000..4a41ca961f
--- /dev/null
+++ b/vector/src/main/res/layout/view_security_recommendation.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_current_session"
+    android:foreground="?attr/selectableItemBackground"
+    android:paddingHorizontal="16dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="8dp">
+
+    <ImageView
+        android:id="@+id/recommendationShieldImageView"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:background="@drawable/bg_security_recommendation_shield"
+        android:importantForAccessibility="no"
+        android:padding="8dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:backgroundTint="@color/shield_color_warning_background"
+        tools:src="@drawable/ic_shield_warning_no_border" />
+
+    <TextView
+        android:id="@+id/recommendationTitleTextView"
+        style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        app:layout_constraintStart_toEndOf="@id/recommendationShieldImageView"
+        app:layout_constraintTop_toTopOf="@id/recommendationShieldImageView"
+        tools:text="@string/device_manager_unverified_sessions_title" />
+
+    <TextView
+        android:id="@+id/recommendationDescriptionTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
+        app:layout_constraintTop_toBottomOf="@id/recommendationTitleTextView"
+        tools:text="@string/device_manager_unverified_sessions_description" />
+
+    <Button
+        android:id="@+id/recommendationViewAllButton"
+        style="@style/Widget.Vector.Button.Text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:padding="0dp"
+        android:text="@string/device_manager_other_sessions_view_all"
+        app:layout_constraintStart_toStartOf="@id/recommendationTitleTextView"
+        app:layout_constraintTop_toBottomOf="@id/recommendationDescriptionTextView" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_session_info.xml b/vector/src/main/res/layout/view_session_info.xml
new file mode 100644
index 0000000000..eff0eef4b6
--- /dev/null
+++ b/vector/src/main/res/layout/view_session_info.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_current_session"
+    android:paddingHorizontal="24dp"
+    android:paddingBottom="8dp">
+
+    <ImageView
+        android:id="@+id/sessionInfoDeviceTypeImageView"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="16dp"
+        android:background="@drawable/bg_device_type"
+        android:contentDescription="@string/a11y_device_manager_device_type_mobile"
+        android:padding="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_device_type_mobile" />
+
+    <TextView
+        android:id="@+id/sessionInfoNameTextView"
+        style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoDeviceTypeImageView"
+        tools:text="Element Mobile: Android" />
+
+    <LinearLayout
+        android:id="@+id/sessionInfoVerificationStatusContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoNameTextView">
+
+        <im.vector.app.core.ui.views.ShieldImageView
+            android:id="@+id/sessionInfoVerificationStatusImageView"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:importantForAccessibility="no"
+            tools:src="@drawable/ic_shield_trusted" />
+
+        <TextView
+            android:id="@+id/sessionInfoVerificationStatusTextView"
+            style="@style/TextAppearance.Vector.Body"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            tools:text="@string/device_manager_verification_status_verified"
+            tools:textColor="?colorPrimary" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/sessionInfoVerificationStatusDetailTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoVerificationStatusContainer"
+        tools:text="@string/device_manager_verification_status_detail_current_session_verified" />
+
+    <TextView
+        android:id="@+id/sessionInfoLastActivityTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoVerificationStatusDetailTextView"
+        app:layout_constraintWidth="wrap_content_constrained"
+        tools:text="Last activity Fri 14:59"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/sessionInfoLastIPAddressTextView"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoLastActivityTextView"
+        tools:text="81.235.41.100 (United Kingdom)"
+        tools:visibility="visible" />
+
+    <Button
+        android:id="@+id/sessionInfoVerifySessionButton"
+        android:layout_width="0dp"
+        android:layout_height="52dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/device_manager_verify_session"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoLastIPAddressTextView" />
+
+    <Button
+        android:id="@+id/sessionInfoViewDetailsButton"
+        style="@style/Widget.Vector.Button.Text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/device_manager_view_details"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessionInfoVerifySessionButton" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_session_overview_entry.xml b/vector/src/main/res/layout/view_session_overview_entry.xml
new file mode 100644
index 0000000000..464f775192
--- /dev/null
+++ b/vector/src/main/res/layout/view_session_overview_entry.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <TextView
+        android:id="@+id/sessionsOverviewEntryTitle"
+        style="@style/TextAppearance.Vector.Subtitle.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Session details" />
+
+    <TextView
+        android:id="@+id/sessionsOverviewEntryDescription"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="@id/sessionsOverviewEntryTitle"
+        app:layout_constraintStart_toStartOf="@id/sessionsOverviewEntryTitle"
+        app:layout_constraintTop_toBottomOf="@id/sessionsOverviewEntryTitle"
+        tools:text="Application, device, and activity information." />
+
+    <View
+        android:id="@+id/sessionsOverviewEntryDivider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/divider_horizontal"
+        app:layout_constraintEnd_toEndOf="@id/sessionsOverviewEntryTitle"
+        app:layout_constraintStart_toStartOf="@id/sessionsOverviewEntryTitle"
+        app:layout_constraintTop_toBottomOf="@id/sessionsOverviewEntryDescription" />
+
+</merge>
diff --git a/vector/src/main/res/layout/view_session_overview_entry_switch.xml b/vector/src/main/res/layout/view_session_overview_entry_switch.xml
new file mode 100644
index 0000000000..34d68abf6e
--- /dev/null
+++ b/vector/src/main/res/layout/view_session_overview_entry_switch.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <TextView
+        android:id="@+id/sessionsOverviewEntryTitle"
+        style="@style/TextAppearance.Vector.Subtitle.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Push notifications" />
+
+    <TextView
+        android:id="@+id/sessionsOverviewEntryDescription"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="@id/sessionsOverviewEntryTitle"
+        app:layout_constraintStart_toStartOf="@id/sessionsOverviewEntryTitle"
+        app:layout_constraintTop_toBottomOf="@id/sessionsOverviewEntryTitle"
+        tools:text="Receive push notifications on this session." />
+
+    <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/sessionsOverviewEntrySwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <View
+        android:id="@+id/sessionsOverviewEntryDivider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/divider_horizontal"
+        app:layout_constraintEnd_toEndOf="@id/sessionsOverviewEntryTitle"
+        app:layout_constraintStart_toStartOf="@id/sessionsOverviewEntryTitle"
+        app:layout_constraintTop_toBottomOf="@id/sessionsOverviewEntryDescription" />
+
+</merge>
diff --git a/vector/src/main/res/layout/view_session_warning_info.xml b/vector/src/main/res/layout/view_session_warning_info.xml
new file mode 100644
index 0000000000..818217e71c
--- /dev/null
+++ b/vector/src/main/res/layout/view_session_warning_info.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <View
+        android:id="@+id/sessionWarningInfoBackground"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/rounded_rect_shape_8"
+        android:backgroundTint="?colorSurface"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/sessionWarningInfoIcon"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginStart="14dp"
+        android:layout_marginVertical="14dp"
+        android:layout_marginEnd="10dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/sessionWarningInfoDescription"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_info"
+        app:tint="?vctr_content_secondary" />
+
+    <TextView
+        android:id="@+id/sessionWarningInfoDescription"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="12dp"
+        android:layout_marginEnd="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/sessionWarningInfoIcon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/sessionWarningInfoBackground"
+        tools:text="Please be aware that session names are also visible to people you communicate with. Learn more" />
+</merge>
diff --git a/vector/src/main/res/layout/view_sessions_list_header.xml b/vector/src/main/res/layout/view_sessions_list_header.xml
new file mode 100644
index 0000000000..b4759b1bef
--- /dev/null
+++ b/vector/src/main/res/layout/view_sessions_list_header.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <TextView
+        android:id="@+id/sessions_list_header_title"
+        style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toStartOf="@id/sessionsListHeaderMenu"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Other sessions" />
+
+    <TextView
+        android:id="@+id/sessions_list_header_description"
+        style="@style/TextAppearance.Vector.Body.DevicesManagement"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="@dimen/layout_vertical_margin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sessions_list_header_title"
+        tools:text="For best security, verify your sessions and sign out from any session that you don’t recognize or use anymore. Learn More." />
+
+    <androidx.appcompat.widget.ActionMenuView
+        android:id="@+id/sessionsListHeaderMenu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="8dp"
+        app:layout_constraintBottom_toBottomOf="@id/sessions_list_header_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/sessions_list_header_title" />
+</merge>
diff --git a/vector/src/main/res/layout/view_stub_webview.xml b/vector/src/main/res/layout/view_stub_webview.xml
new file mode 100644
index 0000000000..b4b4dc5f55
--- /dev/null
+++ b/vector/src/main/res/layout/view_stub_webview.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WebView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/vector/src/main/res/layout/view_voice_broadcast_buffering.xml b/vector/src/main/res/layout/view_voice_broadcast_buffering.xml
new file mode 100644
index 0000000000..e292169537
--- /dev/null
+++ b/vector/src/main/res/layout/view_voice_broadcast_buffering.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    tools:parentTag="android.widget.LinearLayout">
+
+    <ProgressBar
+        android:id="@+id/bufferingIcon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginEnd="4dp"
+        android:indeterminate="true"
+        android:indeterminateTint="?vctr_content_secondary"
+        tools:src="@drawable/ic_voice_broadcast" />
+
+    <TextView
+        android:id="@+id/bufferingText"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/a11y_voice_broadcast_buffering" />
+</merge>
diff --git a/vector/src/main/res/layout/view_voice_broadcast_metadata.xml b/vector/src/main/res/layout/view_voice_broadcast_metadata.xml
new file mode 100644
index 0000000000..70de3e330e
--- /dev/null
+++ b/vector/src/main/res/layout/view_voice_broadcast_metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    tools:parentTag="android.widget.LinearLayout">
+
+    <ImageView
+        android:id="@+id/metadataIcon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginEnd="4dp"
+        android:contentDescription="@null"
+        app:tint="?vctr_content_secondary"
+        tools:src="@drawable/ic_voice_broadcast" />
+
+    <TextView
+        android:id="@+id/metadataText"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/no_value_placeholder"
+        tools:text="@string/attachment_type_voice_broadcast" />
+</merge>
diff --git a/vector/src/main/res/layout/view_voice_message_recorder.xml b/vector/src/main/res/layout/view_voice_message_recorder.xml
index f7b5f5da1d..ee9c4bfb58 100644
--- a/vector/src/main/res/layout/view_voice_message_recorder.xml
+++ b/vector/src/main/res/layout/view_voice_message_recorder.xml
@@ -7,13 +7,23 @@
     android:layout_height="match_parent"
     android:minHeight="200dp">
 
+    <View
+        android:id="@+id/voiceMessageBackgroundView"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/composer_min_height"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="?android:colorBackground" />
+
     <View
         android:id="@+id/voiceMessageLockBackground"
-        android:layout_width="78dp"
+        android:layout_width="52dp"
         android:layout_height="180dp"
         android:background="@drawable/bg_voice_message_lock"
         android:backgroundTint="?vctr_system"
         android:visibility="gone"
+        android:layout_marginEnd="12dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/voiceMessageMicButton"
         tools:translationY="-180dp"
@@ -23,11 +33,13 @@
         android:id="@+id/voiceMessageMicButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:minWidth="32dp"
+        android:minHeight="32dp"
         android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginBottom="16dp"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/a11y_start_voice_message"
-        android:src="@drawable/ic_voice_mic"
+        android:src="@drawable/ic_microphone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
@@ -98,7 +110,6 @@
         android:id="@+id/voiceMessageSlideToCancelDivider"
         android:layout_width="48dp"
         android:layout_height="0dp"
-        android:background="?android:colorBackground"
         app:layout_constraintBottom_toBottomOf="@id/voiceMessageTimer"
         app:layout_constraintStart_toEndOf="@id/voiceMessageTimer"
         app:layout_constraintTop_toTopOf="@id/voiceMessageTimer" />
@@ -107,7 +118,7 @@
         android:id="@+id/voiceMessageLockImage"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
+        android:layout_marginTop="16dp"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_voice_message_unlocked"
         android:visibility="gone"
@@ -121,7 +132,6 @@
         android:id="@+id/voiceMessageLockArrow"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
         android:layout_marginBottom="14dp"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_voice_lock_arrow"
diff --git a/vector/src/main/res/menu/menu_current_session_header.xml b/vector/src/main/res/menu/menu_current_session_header.xml
new file mode 100644
index 0000000000..993bee6178
--- /dev/null
+++ b/vector/src/main/res/menu/menu_current_session_header.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
+
+    <item
+        android:id="@+id/currentSessionHeaderRename"
+        android:title="@string/device_manager_session_rename"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/currentSessionHeaderSignout"
+        android:title="@string/logout"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/currentSessionHeaderSignoutOtherSessions"
+        android:title="@string/device_manager_signout_all_other_sessions"
+        app:showAsAction="withText|never" />
+
+</menu>
diff --git a/vector/src/main/res/menu/menu_home.xml b/vector/src/main/res/menu/menu_home.xml
index f15c31b4e9..a78907bd93 100644
--- a/vector/src/main/res/menu/menu_home.xml
+++ b/vector/src/main/res/menu/menu_home.xml
@@ -34,6 +34,7 @@
         android:icon="@drawable/ic_filter"
         android:title="@string/home_filter_placeholder_home"
         app:iconTint="?vctr_content_secondary"
-        app:showAsAction="always" />
+        app:showAsAction="always"
+        tools:ignore="AlwaysShowAction" />
 
 </menu>
diff --git a/vector/src/main/res/menu/menu_manage_space.xml b/vector/src/main/res/menu/menu_manage_space.xml
index 86defa7869..171614ef3f 100644
--- a/vector/src/main/res/menu/menu_manage_space.xml
+++ b/vector/src/main/res/menu/menu_manage_space.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_unsent_messages"
         android:title="@string/action_delete"
-        app:showAsAction="always" />
+        app:showAsAction="always"
+        tools:ignore="AlwaysShowAction" />
 
     <item
         android:id="@+id/action_mark_as_suggested"
@@ -18,4 +20,4 @@
         android:title="@string/space_mark_as_not_suggested"
         app:showAsAction="never" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/vector/src/main/res/menu/menu_new_home.xml b/vector/src/main/res/menu/menu_new_home.xml
index e893624d54..2292480bac 100644
--- a/vector/src/main/res/menu/menu_new_home.xml
+++ b/vector/src/main/res/menu/menu_new_home.xml
@@ -3,11 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <item
+        android:id="@+id/menu_home_layout_settings"
+        android:title="@string/home_layout_preferences"/>
+
     <item
         android:id="@+id/menu_home_invite_friends"
         android:title="@string/invite_friends"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_home_qr"
+        android:title="@string/add_by_qr_code"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_home_suggestion"
         android:icon="@drawable/ic_material_bug_report"
@@ -37,6 +46,5 @@
         android:icon="@drawable/ic_home_search"
         android:title="@string/home_filter_placeholder_home"
         app:iconTint="?vctr_content_secondary"
-        app:showAsAction="always" />
-
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/vector/src/main/res/menu/menu_other_sessions.xml b/vector/src/main/res/menu/menu_other_sessions.xml
new file mode 100644
index 0000000000..98f9dd8256
--- /dev/null
+++ b/vector/src/main/res/menu/menu_other_sessions.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
+
+    <item
+        android:id="@+id/otherSessionsSelect"
+        android:title="@string/device_manager_other_sessions_select"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/otherSessionsToggleIpAddress"
+        android:title="@string/device_manager_other_sessions_show_ip_address"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/otherSessionsMultiSignout"
+        android:title="@plurals/device_manager_other_sessions_multi_signout_all"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/otherSessionsSelectAll"
+        android:title="@string/action_select_all"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/otherSessionsDeselectAll"
+        android:title="@string/action_deselect_all"
+        app:showAsAction="withText|never" />
+</menu>
diff --git a/vector/src/main/res/menu/menu_other_sessions_header.xml b/vector/src/main/res/menu/menu_other_sessions_header.xml
new file mode 100644
index 0000000000..d1386ba461
--- /dev/null
+++ b/vector/src/main/res/menu/menu_other_sessions_header.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
+
+    <item
+        android:id="@+id/otherSessionsHeaderToggleIpAddress"
+        android:title="@string/device_manager_other_sessions_show_ip_address"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/otherSessionsHeaderMultiSignout"
+        android:title="@plurals/device_manager_other_sessions_multi_signout_all"
+        app:showAsAction="withText|never" />
+
+</menu>
diff --git a/vector/src/main/res/menu/menu_session_overview.xml b/vector/src/main/res/menu/menu_session_overview.xml
new file mode 100644
index 0000000000..4179a0d975
--- /dev/null
+++ b/vector/src/main/res/menu/menu_session_overview.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
+
+    <item
+        android:id="@+id/sessionOverviewToggleIpAddress"
+        android:title="@string/device_manager_other_sessions_show_ip_address"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/sessionOverviewRename"
+        android:title="@string/device_manager_session_rename"
+        app:showAsAction="withText|never" />
+</menu>
diff --git a/vector/src/main/res/menu/room_list.xml b/vector/src/main/res/menu/room_list.xml
index 60ffdcd87b..ad375d241b 100644
--- a/vector/src/main/res/menu/room_list.xml
+++ b/vector/src/main/res/menu/room_list.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <item
         android:id="@+id/menu_home_mark_all_as_read"
         android:icon="@drawable/ic_material_done"
         android:title="@string/action_mark_all_as_read" />
 
-</menu>
\ No newline at end of file
+    <item
+        android:id="@+id/menu_home_dialpad"
+        android:title="@string/call_dial_pad_title"
+        android:visible="false"
+        app:showAsAction="never"
+        tools:visible="true" />
+</menu>
diff --git a/vector/src/main/res/raw/emoji_picker_datasource.json b/vector/src/main/res/raw/emoji_picker_datasource.json
index ed8c479711..736686d0ef 100644
--- a/vector/src/main/res/raw/emoji_picker_datasource.json
+++ b/vector/src/main/res/raw/emoji_picker_datasource.json
@@ -1 +1 @@
-{"compressed":true,"categories":[{"id":"smileys_&_emotion","name":"Smileys & Emotion","emojis":["grinning-face","grinning-face-with-big-eyes","grinning-face-with-smiling-eyes","beaming-face-with-smiling-eyes","grinning-squinting-face","grinning-face-with-sweat","rolling-on-the-floor-laughing","face-with-tears-of-joy","slightly-smiling-face","upsidedown-face","melting-face","winking-face","smiling-face-with-smiling-eyes","smiling-face-with-halo","smiling-face-with-hearts","smiling-face-with-hearteyes","starstruck","face-blowing-a-kiss","kissing-face","smiling-face","kissing-face-with-closed-eyes","kissing-face-with-smiling-eyes","smiling-face-with-tear","face-savoring-food","face-with-tongue","winking-face-with-tongue","zany-face","squinting-face-with-tongue","moneymouth-face","smiling-face-with-open-hands","face-with-hand-over-mouth","face-with-open-eyes-and-hand-over-mouth","face-with-peeking-eye","shushing-face","thinking-face","saluting-face","zippermouth-face","face-with-raised-eyebrow","neutral-face","expressionless-face","face-without-mouth","dotted-line-face","face-in-clouds","smirking-face","unamused-face","face-with-rolling-eyes","grimacing-face","face-exhaling","lying-face","relieved-face","pensive-face","sleepy-face","drooling-face","sleeping-face","face-with-medical-mask","face-with-thermometer","face-with-headbandage","nauseated-face","face-vomiting","sneezing-face","hot-face","cold-face","woozy-face","face-with-crossedout-eyes","face-with-spiral-eyes","exploding-head","cowboy-hat-face","partying-face","disguised-face","smiling-face-with-sunglasses","nerd-face","face-with-monocle","confused-face","face-with-diagonal-mouth","worried-face","slightly-frowning-face","frowning-face","face-with-open-mouth","hushed-face","astonished-face","flushed-face","pleading-face","face-holding-back-tears","frowning-face-with-open-mouth","anguished-face","fearful-face","anxious-face-with-sweat","sad-but-relieved-face","crying-face","loudly-crying-face","face-screaming-in-fear","confounded-face","persevering-face","disappointed-face","downcast-face-with-sweat","weary-face","tired-face","yawning-face","face-with-steam-from-nose","pouting-face","angry-face","face-with-symbols-on-mouth","smiling-face-with-horns","angry-face-with-horns","skull","skull-and-crossbones","pile-of-poo","clown-face","ogre","goblin","ghost","alien","alien-monster","robot","grinning-cat","grinning-cat-with-smiling-eyes","cat-with-tears-of-joy","smiling-cat-with-hearteyes","cat-with-wry-smile","kissing-cat","weary-cat","crying-cat","pouting-cat","seenoevil-monkey","hearnoevil-monkey","speaknoevil-monkey","kiss-mark","love-letter","heart-with-arrow","heart-with-ribbon","sparkling-heart","growing-heart","beating-heart","revolving-hearts","two-hearts","heart-decoration","heart-exclamation","broken-heart","heart-on-fire","mending-heart","red-heart","orange-heart","yellow-heart","green-heart","blue-heart","purple-heart","brown-heart","black-heart","white-heart","hundred-points","anger-symbol","collision","dizzy","sweat-droplets","dashing-away","hole","bomb","speech-balloon","eye-in-speech-bubble","left-speech-bubble","right-anger-bubble","thought-balloon","zzz"]},{"id":"people_&_body","name":"People & Body","emojis":["waving-hand","raised-back-of-hand","hand-with-fingers-splayed","raised-hand","vulcan-salute","rightwards-hand","leftwards-hand","palm-down-hand","palm-up-hand","ok-hand","pinched-fingers","pinching-hand","victory-hand","crossed-fingers","hand-with-index-finger-and-thumb-crossed","loveyou-gesture","sign-of-the-horns","call-me-hand","backhand-index-pointing-left","backhand-index-pointing-right","backhand-index-pointing-up","middle-finger","backhand-index-pointing-down","index-pointing-up","index-pointing-at-the-viewer","thumbs-up","thumbs-down","raised-fist","oncoming-fist","leftfacing-fist","rightfacing-fist","clapping-hands","raising-hands","heart-hands","open-hands","palms-up-together","handshake","folded-hands","writing-hand","nail-polish","selfie","flexed-biceps","mechanical-arm","mechanical-leg","leg","foot","ear","ear-with-hearing-aid","nose","brain","anatomical-heart","lungs","tooth","bone","eyes","eye","tongue","mouth","biting-lip","baby","child","boy","girl","person","person-blond-hair","man","person-beard","man-beard","woman-beard","man-red-hair","man-curly-hair","man-white-hair","man-bald","woman","woman-red-hair","person-red-hair","woman-curly-hair","person-curly-hair","woman-white-hair","person-white-hair","woman-bald","person-bald","woman-blond-hair","man-blond-hair","older-person","old-man","old-woman","person-frowning","man-frowning","woman-frowning","person-pouting","man-pouting","woman-pouting","person-gesturing-no","man-gesturing-no","woman-gesturing-no","person-gesturing-ok","man-gesturing-ok","woman-gesturing-ok","person-tipping-hand","man-tipping-hand","woman-tipping-hand","person-raising-hand","man-raising-hand","woman-raising-hand","deaf-person","deaf-man","deaf-woman","person-bowing","man-bowing","woman-bowing","person-facepalming","man-facepalming","woman-facepalming","person-shrugging","man-shrugging","woman-shrugging","health-worker","man-health-worker","woman-health-worker","student","man-student","woman-student","teacher","man-teacher","woman-teacher","judge","man-judge","woman-judge","farmer","man-farmer","woman-farmer","cook","man-cook","woman-cook","mechanic","man-mechanic","woman-mechanic","factory-worker","man-factory-worker","woman-factory-worker","office-worker","man-office-worker","woman-office-worker","scientist","man-scientist","woman-scientist","technologist","man-technologist","woman-technologist","singer","man-singer","woman-singer","artist","man-artist","woman-artist","pilot","man-pilot","woman-pilot","astronaut","man-astronaut","woman-astronaut","firefighter","man-firefighter","woman-firefighter","police-officer","man-police-officer","woman-police-officer","detective","man-detective","woman-detective","guard","man-guard","woman-guard","ninja","construction-worker","man-construction-worker","woman-construction-worker","person-with-crown","prince","princess","person-wearing-turban","man-wearing-turban","woman-wearing-turban","person-with-skullcap","woman-with-headscarf","person-in-tuxedo","man-in-tuxedo","woman-in-tuxedo","person-with-veil","man-with-veil","woman-with-veil","pregnant-woman","pregnant-man","pregnant-person","breastfeeding","woman-feeding-baby","man-feeding-baby","person-feeding-baby","baby-angel","santa-claus","mrs-claus","mx-claus","superhero","man-superhero","woman-superhero","supervillain","man-supervillain","woman-supervillain","mage","man-mage","woman-mage","fairy","man-fairy","woman-fairy","vampire","man-vampire","woman-vampire","merperson","merman","mermaid","elf","man-elf","woman-elf","genie","man-genie","woman-genie","zombie","man-zombie","woman-zombie","troll","person-getting-massage","man-getting-massage","woman-getting-massage","person-getting-haircut","man-getting-haircut","woman-getting-haircut","person-walking","man-walking","woman-walking","person-standing","man-standing","woman-standing","person-kneeling","man-kneeling","woman-kneeling","person-with-white-cane","man-with-white-cane","woman-with-white-cane","person-in-motorized-wheelchair","man-in-motorized-wheelchair","woman-in-motorized-wheelchair","person-in-manual-wheelchair","man-in-manual-wheelchair","woman-in-manual-wheelchair","person-running","man-running","woman-running","woman-dancing","man-dancing","person-in-suit-levitating","people-with-bunny-ears","men-with-bunny-ears","women-with-bunny-ears","person-in-steamy-room","man-in-steamy-room","woman-in-steamy-room","person-climbing","man-climbing","woman-climbing","person-fencing","horse-racing","skier","snowboarder","person-golfing","man-golfing","woman-golfing","person-surfing","man-surfing","woman-surfing","person-rowing-boat","man-rowing-boat","woman-rowing-boat","person-swimming","man-swimming","woman-swimming","person-bouncing-ball","man-bouncing-ball","woman-bouncing-ball","person-lifting-weights","man-lifting-weights","woman-lifting-weights","person-biking","man-biking","woman-biking","person-mountain-biking","man-mountain-biking","woman-mountain-biking","person-cartwheeling","man-cartwheeling","woman-cartwheeling","people-wrestling","men-wrestling","women-wrestling","person-playing-water-polo","man-playing-water-polo","woman-playing-water-polo","person-playing-handball","man-playing-handball","woman-playing-handball","person-juggling","man-juggling","woman-juggling","person-in-lotus-position","man-in-lotus-position","woman-in-lotus-position","person-taking-bath","person-in-bed","people-holding-hands","women-holding-hands","woman-and-man-holding-hands","men-holding-hands","kiss","kiss-woman-man","kiss-man-man","kiss-woman-woman","couple-with-heart","couple-with-heart-woman-man","couple-with-heart-man-man","couple-with-heart-woman-woman","family","family-man-woman-boy","family-man-woman-girl","family-man-woman-girl-boy","family-man-woman-boy-boy","family-man-woman-girl-girl","family-man-man-boy","family-man-man-girl","family-man-man-girl-boy","family-man-man-boy-boy","family-man-man-girl-girl","family-woman-woman-boy","family-woman-woman-girl","family-woman-woman-girl-boy","family-woman-woman-boy-boy","family-woman-woman-girl-girl","family-man-boy","family-man-boy-boy","family-man-girl","family-man-girl-boy","family-man-girl-girl","family-woman-boy","family-woman-boy-boy","family-woman-girl","family-woman-girl-boy","family-woman-girl-girl","speaking-head","bust-in-silhouette","busts-in-silhouette","people-hugging","footprints"]},{"id":"animals_&_nature","name":"Animals & Nature","emojis":["monkey-face","monkey","gorilla","orangutan","dog-face","dog","guide-dog","service-dog","poodle","wolf","fox","raccoon","cat-face","cat","black-cat","lion","tiger-face","tiger","leopard","horse-face","horse","unicorn","zebra","deer","bison","cow-face","ox","water-buffalo","cow","pig-face","pig","boar","pig-nose","ram","ewe","goat","camel","twohump-camel","llama","giraffe","elephant","mammoth","rhinoceros","hippopotamus","mouse-face","mouse","rat","hamster","rabbit-face","rabbit","chipmunk","beaver","hedgehog","bat","bear","polar-bear","koala","panda","sloth","otter","skunk","kangaroo","badger","paw-prints","turkey","chicken","rooster","hatching-chick","baby-chick","frontfacing-baby-chick","bird","penguin","dove","eagle","duck","swan","owl","dodo","feather","flamingo","peacock","parrot","frog","crocodile","turtle","lizard","snake","dragon-face","dragon","sauropod","trex","spouting-whale","whale","dolphin","seal","fish","tropical-fish","blowfish","shark","octopus","spiral-shell","coral","snail","butterfly","bug","ant","honeybee","beetle","lady-beetle","cricket","cockroach","spider","spider-web","scorpion","mosquito","fly","worm","microbe","bouquet","cherry-blossom","white-flower","lotus","rosette","rose","wilted-flower","hibiscus","sunflower","blossom","tulip","seedling","potted-plant","evergreen-tree","deciduous-tree","palm-tree","cactus","sheaf-of-rice","herb","shamrock","four-leaf-clover","maple-leaf","fallen-leaf","leaf-fluttering-in-wind","empty-nest","nest-with-eggs"]},{"id":"food_&_drink","name":"Food & Drink","emojis":["grapes","melon","watermelon","tangerine","lemon","banana","pineapple","mango","red-apple","green-apple","pear","peach","cherries","strawberry","blueberries","kiwi-fruit","tomato","olive","coconut","avocado","eggplant","potato","carrot","ear-of-corn","hot-pepper","bell-pepper","cucumber","leafy-green","broccoli","garlic","onion","mushroom","peanuts","beans","chestnut","bread","croissant","baguette-bread","flatbread","pretzel","bagel","pancakes","waffle","cheese-wedge","meat-on-bone","poultry-leg","cut-of-meat","bacon","hamburger","french-fries","pizza","hot-dog","sandwich","taco","burrito","tamale","stuffed-flatbread","falafel","egg","cooking","shallow-pan-of-food","pot-of-food","fondue","bowl-with-spoon","green-salad","popcorn","butter","salt","canned-food","bento-box","rice-cracker","rice-ball","cooked-rice","curry-rice","steaming-bowl","spaghetti","roasted-sweet-potato","oden","sushi","fried-shrimp","fish-cake-with-swirl","moon-cake","dango","dumpling","fortune-cookie","takeout-box","crab","lobster","shrimp","squid","oyster","soft-ice-cream","shaved-ice","ice-cream","doughnut","cookie","birthday-cake","shortcake","cupcake","pie","chocolate-bar","candy","lollipop","custard","honey-pot","baby-bottle","glass-of-milk","hot-beverage","teapot","teacup-without-handle","sake","bottle-with-popping-cork","wine-glass","cocktail-glass","tropical-drink","beer-mug","clinking-beer-mugs","clinking-glasses","tumbler-glass","pouring-liquid","cup-with-straw","bubble-tea","beverage-box","mate","ice","chopsticks","fork-and-knife-with-plate","fork-and-knife","spoon","kitchen-knife","jar","amphora"]},{"id":"travel_&_places","name":"Travel & Places","emojis":["globe-showing-europeafrica","globe-showing-americas","globe-showing-asiaaustralia","globe-with-meridians","world-map","map-of-japan","compass","snowcapped-mountain","mountain","volcano","mount-fuji","camping","beach-with-umbrella","desert","desert-island","national-park","stadium","classical-building","building-construction","brick","rock","wood","hut","houses","derelict-house","house","house-with-garden","office-building","japanese-post-office","post-office","hospital","bank","hotel","love-hotel","convenience-store","school","department-store","factory","japanese-castle","castle","wedding","tokyo-tower","statue-of-liberty","church","mosque","hindu-temple","synagogue","shinto-shrine","kaaba","fountain","tent","foggy","night-with-stars","cityscape","sunrise-over-mountains","sunrise","cityscape-at-dusk","sunset","bridge-at-night","hot-springs","carousel-horse","playground-slide","ferris-wheel","roller-coaster","barber-pole","circus-tent","locomotive","railway-car","highspeed-train","bullet-train","train","metro","light-rail","station","tram","monorail","mountain-railway","tram-car","bus","oncoming-bus","trolleybus","minibus","ambulance","fire-engine","police-car","oncoming-police-car","taxi","oncoming-taxi","automobile","oncoming-automobile","sport-utility-vehicle","pickup-truck","delivery-truck","articulated-lorry","tractor","racing-car","motorcycle","motor-scooter","manual-wheelchair","motorized-wheelchair","auto-rickshaw","bicycle","kick-scooter","skateboard","roller-skate","bus-stop","motorway","railway-track","oil-drum","fuel-pump","wheel","police-car-light","horizontal-traffic-light","vertical-traffic-light","stop-sign","construction","anchor","ring-buoy","sailboat","canoe","speedboat","passenger-ship","ferry","motor-boat","ship","airplane","small-airplane","airplane-departure","airplane-arrival","parachute","seat","helicopter","suspension-railway","mountain-cableway","aerial-tramway","satellite","rocket","flying-saucer","bellhop-bell","luggage","hourglass-done","hourglass-not-done","watch","alarm-clock","stopwatch","timer-clock","mantelpiece-clock","twelve-oclock","twelvethirty","one-oclock","onethirty","two-oclock","twothirty","three-oclock","threethirty","four-oclock","fourthirty","five-oclock","fivethirty","six-oclock","sixthirty","seven-oclock","seventhirty","eight-oclock","eightthirty","nine-oclock","ninethirty","ten-oclock","tenthirty","eleven-oclock","eleventhirty","new-moon","waxing-crescent-moon","first-quarter-moon","waxing-gibbous-moon","full-moon","waning-gibbous-moon","last-quarter-moon","waning-crescent-moon","crescent-moon","new-moon-face","first-quarter-moon-face","last-quarter-moon-face","thermometer","sun","full-moon-face","sun-with-face","ringed-planet","star","glowing-star","shooting-star","milky-way","cloud","sun-behind-cloud","cloud-with-lightning-and-rain","sun-behind-small-cloud","sun-behind-large-cloud","sun-behind-rain-cloud","cloud-with-rain","cloud-with-snow","cloud-with-lightning","tornado","fog","wind-face","cyclone","rainbow","closed-umbrella","umbrella","umbrella-with-rain-drops","umbrella-on-ground","high-voltage","snowflake","snowman","snowman-without-snow","comet","fire","droplet","water-wave"]},{"id":"activities","name":"Activities","emojis":["jackolantern","christmas-tree","fireworks","sparkler","firecracker","sparkles","balloon","party-popper","confetti-ball","tanabata-tree","pine-decoration","japanese-dolls","carp-streamer","wind-chime","moon-viewing-ceremony","red-envelope","ribbon","wrapped-gift","reminder-ribbon","admission-tickets","ticket","military-medal","trophy","sports-medal","1st-place-medal","2nd-place-medal","3rd-place-medal","soccer-ball","baseball","softball","basketball","volleyball","american-football","rugby-football","tennis","flying-disc","bowling","cricket-game","field-hockey","ice-hockey","lacrosse","ping-pong","badminton","boxing-glove","martial-arts-uniform","goal-net","flag-in-hole","ice-skate","fishing-pole","diving-mask","running-shirt","skis","sled","curling-stone","bullseye","yoyo","kite","pool-8-ball","crystal-ball","magic-wand","nazar-amulet","hamsa","video-game","joystick","slot-machine","game-die","puzzle-piece","teddy-bear","piata","mirror-ball","nesting-dolls","spade-suit","heart-suit","diamond-suit","club-suit","chess-pawn","joker","mahjong-red-dragon","flower-playing-cards","performing-arts","framed-picture","artist-palette","thread","sewing-needle","yarn","knot"]},{"id":"objects","name":"Objects","emojis":["glasses","sunglasses","goggles","lab-coat","safety-vest","necktie","tshirt","jeans","scarf","gloves","coat","socks","dress","kimono","sari","onepiece-swimsuit","briefs","shorts","bikini","womans-clothes","purse","handbag","clutch-bag","shopping-bags","backpack","thong-sandal","mans-shoe","running-shoe","hiking-boot","flat-shoe","highheeled-shoe","womans-sandal","ballet-shoes","womans-boot","crown","womans-hat","top-hat","graduation-cap","billed-cap","military-helmet","rescue-workers-helmet","prayer-beads","lipstick","ring","gem-stone","muted-speaker","speaker-low-volume","speaker-medium-volume","speaker-high-volume","loudspeaker","megaphone","postal-horn","bell","bell-with-slash","musical-score","musical-note","musical-notes","studio-microphone","level-slider","control-knobs","microphone","headphone","radio","saxophone","accordion","guitar","musical-keyboard","trumpet","violin","banjo","drum","long-drum","mobile-phone","mobile-phone-with-arrow","telephone","telephone-receiver","pager","fax-machine","battery","low-battery","electric-plug","laptop","desktop-computer","printer","keyboard","computer-mouse","trackball","computer-disk","floppy-disk","optical-disk","dvd","abacus","movie-camera","film-frames","film-projector","clapper-board","television","camera","camera-with-flash","video-camera","videocassette","magnifying-glass-tilted-left","magnifying-glass-tilted-right","candle","light-bulb","flashlight","red-paper-lantern","diya-lamp","notebook-with-decorative-cover","closed-book","open-book","green-book","blue-book","orange-book","books","notebook","ledger","page-with-curl","scroll","page-facing-up","newspaper","rolledup-newspaper","bookmark-tabs","bookmark","label","money-bag","coin","yen-banknote","dollar-banknote","euro-banknote","pound-banknote","money-with-wings","credit-card","receipt","chart-increasing-with-yen","envelope","email","incoming-envelope","envelope-with-arrow","outbox-tray","inbox-tray","package","closed-mailbox-with-raised-flag","closed-mailbox-with-lowered-flag","open-mailbox-with-raised-flag","open-mailbox-with-lowered-flag","postbox","ballot-box-with-ballot","pencil","black-nib","fountain-pen","pen","paintbrush","crayon","memo","briefcase","file-folder","open-file-folder","card-index-dividers","calendar","tearoff-calendar","spiral-notepad","spiral-calendar","card-index","chart-increasing","chart-decreasing","bar-chart","clipboard","pushpin","round-pushpin","paperclip","linked-paperclips","straight-ruler","triangular-ruler","scissors","card-file-box","file-cabinet","wastebasket","locked","unlocked","locked-with-pen","locked-with-key","key","old-key","hammer","axe","pick","hammer-and-pick","hammer-and-wrench","dagger","crossed-swords","water-pistol","boomerang","bow-and-arrow","shield","carpentry-saw","wrench","screwdriver","nut-and-bolt","gear","clamp","balance-scale","white-cane","link","chains","hook","toolbox","magnet","ladder","alembic","test-tube","petri-dish","dna","microscope","telescope","satellite-antenna","syringe","drop-of-blood","pill","adhesive-bandage","crutch","stethoscope","xray","door","elevator","mirror","window","bed","couch-and-lamp","chair","toilet","plunger","shower","bathtub","mouse-trap","razor","lotion-bottle","safety-pin","broom","basket","roll-of-paper","bucket","soap","bubbles","toothbrush","sponge","fire-extinguisher","shopping-cart","cigarette","coffin","headstone","funeral-urn","moai","placard","identification-card"]},{"id":"symbols","name":"Symbols","emojis":["atm-sign","litter-in-bin-sign","potable-water","wheelchair-symbol","mens-room","womens-room","restroom","baby-symbol","water-closet","passport-control","customs","baggage-claim","left-luggage","warning","children-crossing","no-entry","prohibited","no-bicycles","no-smoking","no-littering","nonpotable-water","no-pedestrians","no-mobile-phones","no-one-under-eighteen","radioactive","biohazard","up-arrow","upright-arrow","right-arrow","downright-arrow","down-arrow","downleft-arrow","left-arrow","upleft-arrow","updown-arrow","leftright-arrow","right-arrow-curving-left","left-arrow-curving-right","right-arrow-curving-up","right-arrow-curving-down","clockwise-vertical-arrows","counterclockwise-arrows-button","back-arrow","end-arrow","on-arrow","soon-arrow","top-arrow","place-of-worship","atom-symbol","om","star-of-david","wheel-of-dharma","yin-yang","latin-cross","orthodox-cross","star-and-crescent","peace-symbol","menorah","dotted-sixpointed-star","aries","taurus","gemini","cancer","leo","virgo","libra","scorpio","sagittarius","capricorn","aquarius","pisces","ophiuchus","shuffle-tracks-button","repeat-button","repeat-single-button","play-button","fastforward-button","next-track-button","play-or-pause-button","reverse-button","fast-reverse-button","last-track-button","upwards-button","fast-up-button","downwards-button","fast-down-button","pause-button","stop-button","record-button","eject-button","cinema","dim-button","bright-button","antenna-bars","vibration-mode","mobile-phone-off","female-sign","male-sign","transgender-symbol","multiply","plus","minus","divide","heavy-equals-sign","infinity","double-exclamation-mark","exclamation-question-mark","red-question-mark","white-question-mark","white-exclamation-mark","red-exclamation-mark","wavy-dash","currency-exchange","heavy-dollar-sign","medical-symbol","recycling-symbol","fleurdelis","trident-emblem","name-badge","japanese-symbol-for-beginner","hollow-red-circle","check-mark-button","check-box-with-check","check-mark","cross-mark","cross-mark-button","curly-loop","double-curly-loop","part-alternation-mark","eightspoked-asterisk","eightpointed-star","sparkle","copyright","registered","trade-mark","keycap","keycap","keycap-0","keycap-1","keycap-2","keycap-3","keycap-4","keycap-5","keycap-6","keycap-7","keycap-8","keycap-9","keycap-10","input-latin-uppercase","input-latin-lowercase","input-numbers","input-symbols","input-latin-letters","a-button-blood-type","ab-button-blood-type","b-button-blood-type","cl-button","cool-button","free-button","information","id-button","circled-m","new-button","ng-button","o-button-blood-type","ok-button","p-button","sos-button","up-button","vs-button","japanese-here-button","japanese-service-charge-button","japanese-monthly-amount-button","japanese-not-free-of-charge-button","japanese-reserved-button","japanese-bargain-button","japanese-discount-button","japanese-free-of-charge-button","japanese-prohibited-button","japanese-acceptable-button","japanese-application-button","japanese-passing-grade-button","japanese-vacancy-button","japanese-congratulations-button","japanese-secret-button","japanese-open-for-business-button","japanese-no-vacancy-button","red-circle","orange-circle","yellow-circle","green-circle","blue-circle","purple-circle","brown-circle","black-circle","white-circle","red-square","orange-square","yellow-square","green-square","blue-square","purple-square","brown-square","black-large-square","white-large-square","black-medium-square","white-medium-square","black-mediumsmall-square","white-mediumsmall-square","black-small-square","white-small-square","large-orange-diamond","large-blue-diamond","small-orange-diamond","small-blue-diamond","red-triangle-pointed-up","red-triangle-pointed-down","diamond-with-a-dot","radio-button","white-square-button","black-square-button"]},{"id":"flags","name":"Flags","emojis":["chequered-flag","triangular-flag","crossed-flags","black-flag","white-flag","rainbow-flag","transgender-flag","pirate-flag","flag-ascension-island","flag-andorra","flag-united-arab-emirates","flag-afghanistan","flag-antigua--barbuda","flag-anguilla","flag-albania","flag-armenia","flag-angola","flag-antarctica","flag-argentina","flag-american-samoa","flag-austria","flag-australia","flag-aruba","flag-land-islands","flag-azerbaijan","flag-bosnia--herzegovina","flag-barbados","flag-bangladesh","flag-belgium","flag-burkina-faso","flag-bulgaria","flag-bahrain","flag-burundi","flag-benin","flag-st-barthlemy","flag-bermuda","flag-brunei","flag-bolivia","flag-caribbean-netherlands","flag-brazil","flag-bahamas","flag-bhutan","flag-bouvet-island","flag-botswana","flag-belarus","flag-belize","flag-canada","flag-cocos-keeling-islands","flag-congo--kinshasa","flag-central-african-republic","flag-congo--brazzaville","flag-switzerland","flag-cte-divoire","flag-cook-islands","flag-chile","flag-cameroon","flag-china","flag-colombia","flag-clipperton-island","flag-costa-rica","flag-cuba","flag-cape-verde","flag-curaao","flag-christmas-island","flag-cyprus","flag-czechia","flag-germany","flag-diego-garcia","flag-djibouti","flag-denmark","flag-dominica","flag-dominican-republic","flag-algeria","flag-ceuta--melilla","flag-ecuador","flag-estonia","flag-egypt","flag-western-sahara","flag-eritrea","flag-spain","flag-ethiopia","flag-european-union","flag-finland","flag-fiji","flag-falkland-islands","flag-micronesia","flag-faroe-islands","flag-france","flag-gabon","flag-united-kingdom","flag-grenada","flag-georgia","flag-french-guiana","flag-guernsey","flag-ghana","flag-gibraltar","flag-greenland","flag-gambia","flag-guinea","flag-guadeloupe","flag-equatorial-guinea","flag-greece","flag-south-georgia--south-sandwich-islands","flag-guatemala","flag-guam","flag-guineabissau","flag-guyana","flag-hong-kong-sar-china","flag-heard--mcdonald-islands","flag-honduras","flag-croatia","flag-haiti","flag-hungary","flag-canary-islands","flag-indonesia","flag-ireland","flag-israel","flag-isle-of-man","flag-india","flag-british-indian-ocean-territory","flag-iraq","flag-iran","flag-iceland","flag-italy","flag-jersey","flag-jamaica","flag-jordan","flag-japan","flag-kenya","flag-kyrgyzstan","flag-cambodia","flag-kiribati","flag-comoros","flag-st-kitts--nevis","flag-north-korea","flag-south-korea","flag-kuwait","flag-cayman-islands","flag-kazakhstan","flag-laos","flag-lebanon","flag-st-lucia","flag-liechtenstein","flag-sri-lanka","flag-liberia","flag-lesotho","flag-lithuania","flag-luxembourg","flag-latvia","flag-libya","flag-morocco","flag-monaco","flag-moldova","flag-montenegro","flag-st-martin","flag-madagascar","flag-marshall-islands","flag-north-macedonia","flag-mali","flag-myanmar-burma","flag-mongolia","flag-macao-sar-china","flag-northern-mariana-islands","flag-martinique","flag-mauritania","flag-montserrat","flag-malta","flag-mauritius","flag-maldives","flag-malawi","flag-mexico","flag-malaysia","flag-mozambique","flag-namibia","flag-new-caledonia","flag-niger","flag-norfolk-island","flag-nigeria","flag-nicaragua","flag-netherlands","flag-norway","flag-nepal","flag-nauru","flag-niue","flag-new-zealand","flag-oman","flag-panama","flag-peru","flag-french-polynesia","flag-papua-new-guinea","flag-philippines","flag-pakistan","flag-poland","flag-st-pierre--miquelon","flag-pitcairn-islands","flag-puerto-rico","flag-palestinian-territories","flag-portugal","flag-palau","flag-paraguay","flag-qatar","flag-runion","flag-romania","flag-serbia","flag-russia","flag-rwanda","flag-saudi-arabia","flag-solomon-islands","flag-seychelles","flag-sudan","flag-sweden","flag-singapore","flag-st-helena","flag-slovenia","flag-svalbard--jan-mayen","flag-slovakia","flag-sierra-leone","flag-san-marino","flag-senegal","flag-somalia","flag-suriname","flag-south-sudan","flag-so-tom--prncipe","flag-el-salvador","flag-sint-maarten","flag-syria","flag-eswatini","flag-tristan-da-cunha","flag-turks--caicos-islands","flag-chad","flag-french-southern-territories","flag-togo","flag-thailand","flag-tajikistan","flag-tokelau","flag-timorleste","flag-turkmenistan","flag-tunisia","flag-tonga","flag-turkey","flag-trinidad--tobago","flag-tuvalu","flag-taiwan","flag-tanzania","flag-ukraine","flag-uganda","flag-us-outlying-islands","flag-united-nations","flag-united-states","flag-uruguay","flag-uzbekistan","flag-vatican-city","flag-st-vincent--grenadines","flag-venezuela","flag-british-virgin-islands","flag-us-virgin-islands","flag-vietnam","flag-vanuatu","flag-wallis--futuna","flag-samoa","flag-kosovo","flag-yemen","flag-mayotte","flag-south-africa","flag-zambia","flag-zimbabwe","flag-england","flag-scotland","flag-wales"]}],"emojis":{"grinning-face":{"a":"Grinning Face","b":"1F600","j":["face","grin","smile","happy","joy",":D"]},"grinning-face-with-big-eyes":{"a":"Grinning Face with Big Eyes","b":"1F603","j":["face","mouth","open","smile","happy","joy","haha",":D",":)","funny"]},"grinning-face-with-smiling-eyes":{"a":"Grinning Face with Smiling Eyes","b":"1F604","j":["eye","face","mouth","open","smile","happy","joy","funny","haha","laugh","like",":D",":)"]},"beaming-face-with-smiling-eyes":{"a":"Beaming Face with Smiling Eyes","b":"1F601","j":["eye","face","grin","smile","happy","joy","kawaii"]},"grinning-squinting-face":{"a":"Grinning Squinting Face","b":"1F606","j":["face","laugh","mouth","satisfied","smile","happy","joy","lol","haha","glad","XD"]},"grinning-face-with-sweat":{"a":"Grinning Face with Sweat","b":"1F605","j":["cold","face","open","smile","sweat","hot","happy","laugh","relief"]},"rolling-on-the-floor-laughing":{"a":"Rolling on the Floor Laughing","b":"1F923","j":["face","floor","laugh","rofl","rolling","rotfl","laughing","lol","haha"]},"face-with-tears-of-joy":{"a":"Face with Tears of Joy","b":"1F602","j":["face","joy","laugh","tear","cry","tears","weep","happy","happytears","haha"]},"slightly-smiling-face":{"a":"Slightly Smiling Face","b":"1F642","j":["face","smile"]},"upsidedown-face":{"a":"Upside-Down Face","b":"1F643","j":["face","upside-down","upside_down_face","flipped","silly","smile"]},"melting-face":{"a":"⊛ Melting Face","b":"1FAE0","j":["disappear","dissolve","liquid","melt","hot","heat"]},"winking-face":{"a":"Winking Face","b":"1F609","j":["face","wink","happy","mischievous","secret",";)","smile","eye"]},"smiling-face-with-smiling-eyes":{"a":"Smiling Face with Smiling Eyes","b":"1F60A","j":["blush","eye","face","smile","happy","flushed","crush","embarrassed","shy","joy"]},"smiling-face-with-halo":{"a":"Smiling Face with Halo","b":"1F607","j":["angel","face","fantasy","halo","innocent","heaven"]},"smiling-face-with-hearts":{"a":"Smiling Face with Hearts","b":"1F970","j":["adore","crush","hearts","in love","face","love","like","affection","valentines","infatuation"]},"smiling-face-with-hearteyes":{"a":"Smiling Face with Heart-Eyes","b":"1F60D","j":["eye","face","love","smile","smiling face with heart-eyes","smiling_face_with_heart_eyes","like","affection","valentines","infatuation","crush","heart"]},"starstruck":{"a":"Star-Struck","b":"1F929","j":["eyes","face","grinning","star","star-struck","starry-eyed","star_struck","smile","starry"]},"face-blowing-a-kiss":{"a":"Face Blowing a Kiss","b":"1F618","j":["face","kiss","love","like","affection","valentines","infatuation"]},"kissing-face":{"a":"Kissing Face","b":"1F617","j":["face","kiss","love","like","3","valentines","infatuation"]},"smiling-face":{"a":"Smiling Face","b":"263A","j":["face","outlined","relaxed","smile","blush","massage","happiness"]},"kissing-face-with-closed-eyes":{"a":"Kissing Face with Closed Eyes","b":"1F61A","j":["closed","eye","face","kiss","love","like","affection","valentines","infatuation"]},"kissing-face-with-smiling-eyes":{"a":"Kissing Face with Smiling Eyes","b":"1F619","j":["eye","face","kiss","smile","affection","valentines","infatuation"]},"smiling-face-with-tear":{"a":"Smiling Face with Tear","b":"1F972","j":["grateful","proud","relieved","smiling","tear","touched","sad","cry","pretend"]},"face-savoring-food":{"a":"Face Savoring Food","b":"1F60B","j":["delicious","face","savouring","smile","yum","happy","joy","tongue","silly","yummy","nom"]},"face-with-tongue":{"a":"Face with Tongue","b":"1F61B","j":["face","tongue","prank","childish","playful","mischievous","smile"]},"winking-face-with-tongue":{"a":"Winking Face with Tongue","b":"1F61C","j":["eye","face","joke","tongue","wink","prank","childish","playful","mischievous","smile"]},"zany-face":{"a":"Zany Face","b":"1F92A","j":["eye","goofy","large","small","face","crazy"]},"squinting-face-with-tongue":{"a":"Squinting Face with Tongue","b":"1F61D","j":["eye","face","horrible","taste","tongue","prank","playful","mischievous","smile"]},"moneymouth-face":{"a":"Money-Mouth Face","b":"1F911","j":["face","money","money-mouth face","mouth","money_mouth_face","rich","dollar"]},"smiling-face-with-open-hands":{"a":"Smiling Face with Open Hands","b":"1F917","j":["face","hug","hugging","open hands","smiling face","hugging_face","smile"]},"face-with-hand-over-mouth":{"a":"Face with Hand over Mouth","b":"1F92D","j":["whoops","shock","sudden realization","surprise","face"]},"face-with-open-eyes-and-hand-over-mouth":{"a":"⊛ Face with Open Eyes and Hand over Mouth","b":"1FAE2","j":["amazement","awe","disbelief","embarrass","scared","surprise","silence","secret","shock"]},"face-with-peeking-eye":{"a":"⊛ Face with Peeking Eye","b":"1FAE3","j":["captivated","peep","stare","scared","frightening","embarrassing"]},"shushing-face":{"a":"Shushing Face","b":"1F92B","j":["quiet","shush","face","shhh"]},"thinking-face":{"a":"Thinking Face","b":"1F914","j":["face","thinking","hmmm","think","consider"]},"saluting-face":{"a":"⊛ Saluting Face","b":"1FAE1","j":["ok","salute","sunny","troops","yes","respect"]},"zippermouth-face":{"a":"Zipper-Mouth Face","b":"1F910","j":["face","mouth","zipper","zipper-mouth face","zipper_mouth_face","sealed","secret"]},"face-with-raised-eyebrow":{"a":"Face with Raised Eyebrow","b":"1F928","j":["distrust","skeptic","disapproval","disbelief","mild surprise","scepticism","face","surprise"]},"neutral-face":{"a":"Neutral Face","b":"1F610","j":["deadpan","face","meh","neutral","indifference",":|"]},"expressionless-face":{"a":"Expressionless Face","b":"1F611","j":["expressionless","face","inexpressive","meh","unexpressive","indifferent","-_-","deadpan"]},"face-without-mouth":{"a":"Face Without Mouth","b":"1F636","j":["face","mouth","quiet","silent","hellokitty"]},"dotted-line-face":{"a":"⊛ Dotted Line Face","b":"1FAE5","j":["depressed","disappear","hide","introvert","invisible","lonely","isolation","depression"]},"face-in-clouds":{"a":"Face in Clouds","b":"1F636-200D-1F32B-FE0F","j":["absentminded","face in the fog","head in clouds","shower","steam","dream"]},"smirking-face":{"a":"Smirking Face","b":"1F60F","j":["face","smirk","smile","mean","prank","smug","sarcasm"]},"unamused-face":{"a":"Unamused Face","b":"1F612","j":["face","unamused","unhappy","indifference","bored","straight face","serious","sarcasm","unimpressed","skeptical","dubious","side_eye"]},"face-with-rolling-eyes":{"a":"Face with Rolling Eyes","b":"1F644","j":["eyeroll","eyes","face","rolling","frustrated"]},"grimacing-face":{"a":"Grimacing Face","b":"1F62C","j":["face","grimace","teeth"]},"face-exhaling":{"a":"Face Exhaling","b":"1F62E-200D-1F4A8","j":["exhale","gasp","groan","relief","whisper","whistle","relieve","tired","sigh"]},"lying-face":{"a":"Lying Face","b":"1F925","j":["face","lie","pinocchio"]},"relieved-face":{"a":"Relieved Face","b":"1F60C","j":["face","relieved","relaxed","phew","massage","happiness"]},"pensive-face":{"a":"Pensive Face","b":"1F614","j":["dejected","face","pensive","sad","depressed","upset"]},"sleepy-face":{"a":"Sleepy Face","b":"1F62A","j":["face","sleep","tired","rest","nap"]},"drooling-face":{"a":"Drooling Face","b":"1F924","j":["drooling","face"]},"sleeping-face":{"a":"Sleeping Face","b":"1F634","j":["face","sleep","zzz","tired","sleepy","night"]},"face-with-medical-mask":{"a":"Face with Medical Mask","b":"1F637","j":["cold","doctor","face","mask","sick","ill","disease"]},"face-with-thermometer":{"a":"Face with Thermometer","b":"1F912","j":["face","ill","sick","thermometer","temperature","cold","fever"]},"face-with-headbandage":{"a":"Face with Head-Bandage","b":"1F915","j":["bandage","face","face with head-bandage","hurt","injury","face_with_head_bandage","injured","clumsy"]},"nauseated-face":{"a":"Nauseated Face","b":"1F922","j":["face","nauseated","vomit","gross","green","sick","throw up","ill"]},"face-vomiting":{"a":"Face Vomiting","b":"1F92E","j":["puke","sick","vomit","face"]},"sneezing-face":{"a":"Sneezing Face","b":"1F927","j":["face","gesundheit","sneeze","sick","allergy"]},"hot-face":{"a":"Hot Face","b":"1F975","j":["feverish","heat stroke","hot","red-faced","sweating","face","heat","red"]},"cold-face":{"a":"Cold Face","b":"1F976","j":["blue-faced","cold","freezing","frostbite","icicles","face","blue","frozen"]},"woozy-face":{"a":"Woozy Face","b":"1F974","j":["dizzy","intoxicated","tipsy","uneven eyes","wavy mouth","face","wavy"]},"face-with-crossedout-eyes":{"a":"Face with Crossed-out Eyes","b":"1F635","j":["crossed-out eyes","dead","face","face with crossed-out eyes","knocked out","dizzy_face","spent","unconscious","xox","dizzy"]},"face-with-spiral-eyes":{"a":"Face with Spiral Eyes","b":"1F635-200D-1F4AB","j":["dizzy","hypnotized","spiral","trouble","whoa","sick","ill","confused","nauseous","nausea"]},"exploding-head":{"a":"Exploding Head","b":"1F92F","j":["mind blown","shocked","face","mind","blown"]},"cowboy-hat-face":{"a":"Cowboy Hat Face","b":"1F920","j":["cowboy","cowgirl","face","hat"]},"partying-face":{"a":"Partying Face","b":"1F973","j":["celebration","hat","horn","party","face","woohoo"]},"disguised-face":{"a":"Disguised Face","b":"1F978","j":["disguise","face","glasses","incognito","nose","pretent","brows","moustache"]},"smiling-face-with-sunglasses":{"a":"Smiling Face with Sunglasses","b":"1F60E","j":["bright","cool","face","sun","sunglasses","smile","summer","beach","sunglass"]},"nerd-face":{"a":"Nerd Face","b":"1F913","j":["face","geek","nerd","nerdy","dork"]},"face-with-monocle":{"a":"Face with Monocle","b":"1F9D0","j":["stuffy","wealthy","face"]},"confused-face":{"a":"Confused Face","b":"1F615","j":["confused","face","meh","indifference","huh","weird","hmmm",":/"]},"face-with-diagonal-mouth":{"a":"⊛ Face with Diagonal Mouth","b":"1FAE4","j":["disappointed","meh","skeptical","unsure","skeptic","confuse","frustrated","indifferent"]},"worried-face":{"a":"Worried Face","b":"1F61F","j":["face","worried","concern","nervous",":("]},"slightly-frowning-face":{"a":"Slightly Frowning Face","b":"1F641","j":["face","frown","frowning","disappointed","sad","upset"]},"frowning-face":{"a":"Frowning Face","b":"2639","j":["face","frown","sad","upset"]},"face-with-open-mouth":{"a":"Face with Open Mouth","b":"1F62E","j":["face","mouth","open","sympathy","surprise","impressed","wow","whoa",":O"]},"hushed-face":{"a":"Hushed Face","b":"1F62F","j":["face","hushed","stunned","surprised","woo","shh"]},"astonished-face":{"a":"Astonished Face","b":"1F632","j":["astonished","face","shocked","totally","xox","surprised","poisoned"]},"flushed-face":{"a":"Flushed Face","b":"1F633","j":["dazed","face","flushed","blush","shy","flattered"]},"pleading-face":{"a":"Pleading Face","b":"1F97A","j":["begging","mercy","puppy eyes","face"]},"face-holding-back-tears":{"a":"⊛ Face Holding Back Tears","b":"1F979","j":["angry","cry","proud","resist","sad","touched","gratitude"]},"frowning-face-with-open-mouth":{"a":"Frowning Face with Open Mouth","b":"1F626","j":["face","frown","mouth","open","aw","what"]},"anguished-face":{"a":"Anguished Face","b":"1F627","j":["anguished","face","stunned","nervous"]},"fearful-face":{"a":"Fearful Face","b":"1F628","j":["face","fear","fearful","scared","terrified","nervous","oops","huh"]},"anxious-face-with-sweat":{"a":"Anxious Face with Sweat","b":"1F630","j":["blue","cold","face","rushed","sweat","nervous"]},"sad-but-relieved-face":{"a":"Sad but Relieved Face","b":"1F625","j":["disappointed","face","relieved","whew","phew","sweat","nervous"]},"crying-face":{"a":"Crying Face","b":"1F622","j":["cry","face","sad","tear","tears","depressed","upset",":'("]},"loudly-crying-face":{"a":"Loudly Crying Face","b":"1F62D","j":["cry","face","sad","sob","tear","tears","upset","depressed"]},"face-screaming-in-fear":{"a":"Face Screaming in Fear","b":"1F631","j":["face","fear","munch","scared","scream","omg"]},"confounded-face":{"a":"Confounded Face","b":"1F616","j":["confounded","face","confused","sick","unwell","oops",":S"]},"persevering-face":{"a":"Persevering Face","b":"1F623","j":["face","persevere","sick","no","upset","oops"]},"disappointed-face":{"a":"Disappointed Face","b":"1F61E","j":["disappointed","face","sad","upset","depressed",":("]},"downcast-face-with-sweat":{"a":"Downcast Face with Sweat","b":"1F613","j":["cold","face","sweat","hot","sad","tired","exercise"]},"weary-face":{"a":"Weary Face","b":"1F629","j":["face","tired","weary","sleepy","sad","frustrated","upset"]},"tired-face":{"a":"Tired Face","b":"1F62B","j":["face","tired","sick","whine","upset","frustrated"]},"yawning-face":{"a":"Yawning Face","b":"1F971","j":["bored","tired","yawn","sleepy"]},"face-with-steam-from-nose":{"a":"Face with Steam From Nose","b":"1F624","j":["face","triumph","won","gas","phew","proud","pride"]},"pouting-face":{"a":"Pouting Face","b":"1F621","j":["angry","face","mad","pouting","rage","red","hate","despise"]},"angry-face":{"a":"Angry Face","b":"1F620","j":["anger","angry","face","mad","annoyed","frustrated"]},"face-with-symbols-on-mouth":{"a":"Face with Symbols on Mouth","b":"1F92C","j":["swearing","cursing","face","cussing","profanity","expletive"]},"smiling-face-with-horns":{"a":"Smiling Face with Horns","b":"1F608","j":["face","fairy tale","fantasy","horns","smile","devil"]},"angry-face-with-horns":{"a":"Angry Face with Horns","b":"1F47F","j":["demon","devil","face","fantasy","imp","angry","horns"]},"skull":{"a":"Skull","b":"1F480","j":["death","face","fairy tale","monster","dead","skeleton","creepy"]},"skull-and-crossbones":{"a":"Skull and Crossbones","b":"2620","j":["crossbones","death","face","monster","skull","poison","danger","deadly","scary","pirate","evil"]},"pile-of-poo":{"a":"Pile of Poo","b":"1F4A9","j":["dung","face","monster","poo","poop","hankey","shitface","fail","turd","shit"]},"clown-face":{"a":"Clown Face","b":"1F921","j":["clown","face"]},"ogre":{"a":"Ogre","b":"1F479","j":["creature","face","fairy tale","fantasy","monster","troll","red","mask","halloween","scary","creepy","devil","demon","japanese"]},"goblin":{"a":"Goblin","b":"1F47A","j":["creature","face","fairy tale","fantasy","monster","red","evil","mask","scary","creepy","japanese"]},"ghost":{"a":"Ghost","b":"1F47B","j":["creature","face","fairy tale","fantasy","monster","halloween","spooky","scary"]},"alien":{"a":"Alien","b":"1F47D","j":["creature","extraterrestrial","face","fantasy","ufo","UFO","paul","weird","outer_space"]},"alien-monster":{"a":"Alien Monster","b":"1F47E","j":["alien","creature","extraterrestrial","face","monster","ufo","game","arcade","play"]},"robot":{"a":"Robot","b":"1F916","j":["face","monster","computer","machine","bot"]},"grinning-cat":{"a":"Grinning Cat","b":"1F63A","j":["cat","face","grinning","mouth","open","smile","animal","cats","happy"]},"grinning-cat-with-smiling-eyes":{"a":"Grinning Cat with Smiling Eyes","b":"1F638","j":["cat","eye","face","grin","smile","animal","cats"]},"cat-with-tears-of-joy":{"a":"Cat with Tears of Joy","b":"1F639","j":["cat","face","joy","tear","animal","cats","haha","happy","tears"]},"smiling-cat-with-hearteyes":{"a":"Smiling Cat with Heart-Eyes","b":"1F63B","j":["cat","eye","face","heart","love","smile","smiling cat with heart-eyes","smiling_cat_with_heart_eyes","animal","like","affection","cats","valentines"]},"cat-with-wry-smile":{"a":"Cat with Wry Smile","b":"1F63C","j":["cat","face","ironic","smile","wry","animal","cats","smirk"]},"kissing-cat":{"a":"Kissing Cat","b":"1F63D","j":["cat","eye","face","kiss","animal","cats"]},"weary-cat":{"a":"Weary Cat","b":"1F640","j":["cat","face","oh","surprised","weary","animal","cats","munch","scared","scream"]},"crying-cat":{"a":"Crying Cat","b":"1F63F","j":["cat","cry","face","sad","tear","animal","tears","weep","cats","upset"]},"pouting-cat":{"a":"Pouting Cat","b":"1F63E","j":["cat","face","pouting","animal","cats"]},"seenoevil-monkey":{"a":"See-No-Evil Monkey","b":"1F648","j":["evil","face","forbidden","monkey","see","see-no-evil monkey","see_no_evil_monkey","animal","nature","haha"]},"hearnoevil-monkey":{"a":"Hear-No-Evil Monkey","b":"1F649","j":["evil","face","forbidden","hear","hear-no-evil monkey","monkey","hear_no_evil_monkey","animal","nature"]},"speaknoevil-monkey":{"a":"Speak-No-Evil Monkey","b":"1F64A","j":["evil","face","forbidden","monkey","speak","speak-no-evil monkey","speak_no_evil_monkey","animal","nature","omg"]},"kiss-mark":{"a":"Kiss Mark","b":"1F48B","j":["kiss","lips","face","love","like","affection","valentines"]},"love-letter":{"a":"Love Letter","b":"1F48C","j":["heart","letter","love","mail","email","like","affection","envelope","valentines"]},"heart-with-arrow":{"a":"Heart with Arrow","b":"1F498","j":["arrow","cupid","love","like","heart","affection","valentines"]},"heart-with-ribbon":{"a":"Heart with Ribbon","b":"1F49D","j":["ribbon","valentine","love","valentines"]},"sparkling-heart":{"a":"Sparkling Heart","b":"1F496","j":["excited","sparkle","love","like","affection","valentines"]},"growing-heart":{"a":"Growing Heart","b":"1F497","j":["excited","growing","nervous","pulse","like","love","affection","valentines","pink"]},"beating-heart":{"a":"Beating Heart","b":"1F493","j":["beating","heartbeat","pulsating","love","like","affection","valentines","pink","heart"]},"revolving-hearts":{"a":"Revolving Hearts","b":"1F49E","j":["revolving","love","like","affection","valentines"]},"two-hearts":{"a":"Two Hearts","b":"1F495","j":["love","like","affection","valentines","heart"]},"heart-decoration":{"a":"Heart Decoration","b":"1F49F","j":["heart","purple-square","love","like"]},"heart-exclamation":{"a":"Heart Exclamation","b":"2763","j":["exclamation","mark","punctuation","decoration","love"]},"broken-heart":{"a":"Broken Heart","b":"1F494","j":["break","broken","sad","sorry","heart","heartbreak"]},"heart-on-fire":{"a":"Heart on Fire","b":"2764-FE0F-200D-1F525","j":["burn","heart","love","lust","sacred heart","passionate","enthusiastic"]},"mending-heart":{"a":"Mending Heart","b":"2764-FE0F-200D-1FA79","j":["healthier","improving","mending","recovering","recuperating","well","broken heart","bandage","wounded"]},"red-heart":{"a":"Red Heart","b":"2764","j":["heart","love","like","valentines"]},"orange-heart":{"a":"Orange Heart","b":"1F9E1","j":["orange","love","like","affection","valentines"]},"yellow-heart":{"a":"Yellow Heart","b":"1F49B","j":["yellow","love","like","affection","valentines"]},"green-heart":{"a":"Green Heart","b":"1F49A","j":["green","love","like","affection","valentines"]},"blue-heart":{"a":"Blue Heart","b":"1F499","j":["blue","love","like","affection","valentines"]},"purple-heart":{"a":"Purple Heart","b":"1F49C","j":["purple","love","like","affection","valentines"]},"brown-heart":{"a":"Brown Heart","b":"1F90E","j":["brown","heart","coffee"]},"black-heart":{"a":"Black Heart","b":"1F5A4","j":["black","evil","wicked"]},"white-heart":{"a":"White Heart","b":"1F90D","j":["heart","white","pure"]},"hundred-points":{"a":"Hundred Points","b":"1F4AF","j":["100","full","hundred","score","perfect","numbers","century","exam","quiz","test","pass"]},"anger-symbol":{"a":"Anger Symbol","b":"1F4A2","j":["angry","comic","mad"]},"collision":{"a":"Collision","b":"1F4A5","j":["boom","comic","bomb","explode","explosion","blown"]},"dizzy":{"a":"Dizzy","b":"1F4AB","j":["comic","star","sparkle","shoot","magic"]},"sweat-droplets":{"a":"Sweat Droplets","b":"1F4A6","j":["comic","splashing","sweat","water","drip","oops"]},"dashing-away":{"a":"Dashing Away","b":"1F4A8","j":["comic","dash","running","wind","air","fast","shoo","fart","smoke","puff"]},"hole":{"a":"Hole","b":"1F573","j":["embarrassing"]},"bomb":{"a":"Bomb","b":"1F4A3","j":["comic","boom","explode","explosion","terrorism"]},"speech-balloon":{"a":"Speech Balloon","b":"1F4AC","j":["balloon","bubble","comic","dialog","speech","words","message","talk","chatting"]},"eye-in-speech-bubble":{"a":"Eye in Speech Bubble","b":"1F441-FE0F-200D-1F5E8-FE0F","j":["eye","speech bubble","witness","info"]},"left-speech-bubble":{"a":"Left Speech Bubble","b":"1F5E8","j":["dialog","speech","words","message","talk","chatting"]},"right-anger-bubble":{"a":"Right Anger Bubble","b":"1F5EF","j":["angry","balloon","bubble","mad","caption","speech","thinking"]},"thought-balloon":{"a":"Thought Balloon","b":"1F4AD","j":["balloon","bubble","comic","thought","cloud","speech","thinking","dream"]},"zzz":{"a":"Zzz","b":"1F4A4","j":["comic","sleep","sleepy","tired","dream"]},"waving-hand":{"a":"Waving Hand","b":"1F44B","j":["hand","wave","waving","hands","gesture","goodbye","solong","farewell","hello","hi","palm"]},"raised-back-of-hand":{"a":"Raised Back of Hand","b":"1F91A","j":["backhand","raised","fingers"]},"hand-with-fingers-splayed":{"a":"Hand with Fingers Splayed","b":"1F590","j":["finger","hand","splayed","fingers","palm"]},"raised-hand":{"a":"Raised Hand","b":"270B","j":["hand","high 5","high five","fingers","stop","highfive","palm","ban"]},"vulcan-salute":{"a":"Vulcan Salute","b":"1F596","j":["finger","hand","spock","vulcan","fingers","star trek"]},"rightwards-hand":{"a":"⊛ Rightwards Hand","b":"1FAF1","j":["hand","right","rightward","palm","offer"]},"leftwards-hand":{"a":"⊛ Leftwards Hand","b":"1FAF2","j":["hand","left","leftward","palm","offer"]},"palm-down-hand":{"a":"⊛ Palm Down Hand","b":"1FAF3","j":["dismiss","drop","shoo","palm"]},"palm-up-hand":{"a":"⊛ Palm Up Hand","b":"1FAF4","j":["beckon","catch","come","offer","lift","demand"]},"ok-hand":{"a":"Ok Hand","b":"1F44C","j":["hand","OK","fingers","limbs","perfect","ok","okay"]},"pinched-fingers":{"a":"Pinched Fingers","b":"1F90C","j":["fingers","hand gesture","interrogation","pinched","sarcastic","size","tiny","small"]},"pinching-hand":{"a":"Pinching Hand","b":"1F90F","j":["small amount","tiny","small","size"]},"victory-hand":{"a":"Victory Hand","b":"270C","j":["hand","v","victory","fingers","ohyeah","peace","two"]},"crossed-fingers":{"a":"Crossed Fingers","b":"1F91E","j":["cross","finger","hand","luck","good","lucky"]},"hand-with-index-finger-and-thumb-crossed":{"a":"⊛ Hand with Index Finger and Thumb Crossed","b":"1FAF0","j":["expensive","heart","love","money","snap"]},"loveyou-gesture":{"a":"Love-You Gesture","b":"1F91F","j":["hand","ILY","love-you gesture","love_you_gesture","fingers","gesture"]},"sign-of-the-horns":{"a":"Sign of the Horns","b":"1F918","j":["finger","hand","horns","rock-on","fingers","evil_eye","sign_of_horns","rock_on"]},"call-me-hand":{"a":"Call Me Hand","b":"1F919","j":["call","hand","hands","gesture","shaka"]},"backhand-index-pointing-left":{"a":"Backhand Index Pointing Left","b":"1F448","j":["backhand","finger","hand","index","point","direction","fingers","left"]},"backhand-index-pointing-right":{"a":"Backhand Index Pointing Right","b":"1F449","j":["backhand","finger","hand","index","point","fingers","direction","right"]},"backhand-index-pointing-up":{"a":"Backhand Index Pointing Up","b":"1F446","j":["backhand","finger","hand","point","up","fingers","direction"]},"middle-finger":{"a":"Middle Finger","b":"1F595","j":["finger","hand","fingers","rude","middle","flipping"]},"backhand-index-pointing-down":{"a":"Backhand Index Pointing Down","b":"1F447","j":["backhand","down","finger","hand","point","fingers","direction"]},"index-pointing-up":{"a":"Index Pointing Up","b":"261D","j":["finger","hand","index","point","up","fingers","direction"]},"index-pointing-at-the-viewer":{"a":"⊛ Index Pointing at the Viewer","b":"1FAF5","j":["point","you","recruit"]},"thumbs-up":{"a":"Thumbs Up","b":"1F44D","j":["+1","hand","thumb","up","thumbsup","yes","awesome","good","agree","accept","cool","like"]},"thumbs-down":{"a":"Thumbs Down","b":"1F44E","j":["-1","down","hand","thumb","thumbsdown","no","dislike"]},"raised-fist":{"a":"Raised Fist","b":"270A","j":["clenched","fist","hand","punch","fingers","grasp"]},"oncoming-fist":{"a":"Oncoming Fist","b":"1F44A","j":["clenched","fist","hand","punch","angry","violence","hit","attack"]},"leftfacing-fist":{"a":"Left-Facing Fist","b":"1F91B","j":["fist","left-facing fist","leftwards","left_facing_fist","hand","fistbump"]},"rightfacing-fist":{"a":"Right-Facing Fist","b":"1F91C","j":["fist","right-facing fist","rightwards","right_facing_fist","hand","fistbump"]},"clapping-hands":{"a":"Clapping Hands","b":"1F44F","j":["clap","hand","hands","praise","applause","congrats","yay"]},"raising-hands":{"a":"Raising Hands","b":"1F64C","j":["celebration","gesture","hand","hooray","raised","yea","hands"]},"heart-hands":{"a":"⊛ Heart Hands","b":"1FAF6","j":["love","appreciation","support"]},"open-hands":{"a":"Open Hands","b":"1F450","j":["hand","open","fingers","butterfly","hands"]},"palms-up-together":{"a":"Palms Up Together","b":"1F932","j":["prayer","cupped hands","hands","gesture","cupped"]},"handshake":{"a":"Handshake","b":"1F91D","j":["agreement","hand","meeting","shake"]},"folded-hands":{"a":"Folded Hands","b":"1F64F","j":["ask","hand","high 5","high five","please","pray","thanks","hope","wish","namaste","highfive"]},"writing-hand":{"a":"Writing Hand","b":"270D","j":["hand","write","lower_left_ballpoint_pen","stationery","compose"]},"nail-polish":{"a":"Nail Polish","b":"1F485","j":["care","cosmetics","manicure","nail","polish","beauty","finger","fashion"]},"selfie":{"a":"Selfie","b":"1F933","j":["camera","phone"]},"flexed-biceps":{"a":"Flexed Biceps","b":"1F4AA","j":["biceps","comic","flex","muscle","arm","hand","summer","strong"]},"mechanical-arm":{"a":"Mechanical Arm","b":"1F9BE","j":["accessibility","prosthetic"]},"mechanical-leg":{"a":"Mechanical Leg","b":"1F9BF","j":["accessibility","prosthetic"]},"leg":{"a":"Leg","b":"1F9B5","j":["kick","limb"]},"foot":{"a":"Foot","b":"1F9B6","j":["kick","stomp"]},"ear":{"a":"Ear","b":"1F442","j":["body","face","hear","sound","listen"]},"ear-with-hearing-aid":{"a":"Ear with Hearing Aid","b":"1F9BB","j":["accessibility","hard of hearing"]},"nose":{"a":"Nose","b":"1F443","j":["body","smell","sniff"]},"brain":{"a":"Brain","b":"1F9E0","j":["intelligent","smart"]},"anatomical-heart":{"a":"Anatomical Heart","b":"1FAC0","j":["anatomical","cardiology","heart","organ","pulse","health","heartbeat"]},"lungs":{"a":"Lungs","b":"1FAC1","j":["breath","exhalation","inhalation","organ","respiration","breathe"]},"tooth":{"a":"Tooth","b":"1F9B7","j":["dentist","teeth"]},"bone":{"a":"Bone","b":"1F9B4","j":["skeleton"]},"eyes":{"a":"Eyes","b":"1F440","j":["eye","face","look","watch","stalk","peek","see"]},"eye":{"a":"Eye","b":"1F441","j":["body","face","look","see","watch","stare"]},"tongue":{"a":"Tongue","b":"1F445","j":["body","mouth","playful"]},"mouth":{"a":"Mouth","b":"1F444","j":["lips","kiss"]},"biting-lip":{"a":"⊛ Biting Lip","b":"1FAE6","j":["anxious","fear","flirting","nervous","uncomfortable","worried","flirt","sexy","pain","worry"]},"baby":{"a":"Baby","b":"1F476","j":["young","child","boy","girl","toddler"]},"child":{"a":"Child","b":"1F9D2","j":["gender-neutral","unspecified gender","young"]},"boy":{"a":"Boy","b":"1F466","j":["young","man","male","guy","teenager"]},"girl":{"a":"Girl","b":"1F467","j":["Virgo","young","zodiac","female","woman","teenager"]},"person":{"a":"Person","b":"1F9D1","j":["adult","gender-neutral","unspecified gender"]},"person-blond-hair":{"a":"Person: Blond Hair","b":"1F471","j":["blond","blond-haired person","hair","person: blond hair","hairstyle"]},"man":{"a":"Man","b":"1F468","j":["adult","mustache","father","dad","guy","classy","sir","moustache"]},"person-beard":{"a":"Person: Beard","b":"1F9D4","j":["beard","person","person: beard","bewhiskered","man_beard"]},"man-beard":{"a":"Man: Beard","b":"1F9D4-200D-2642-FE0F","j":["beard","man","man: beard","facial hair"]},"woman-beard":{"a":"Woman: Beard","b":"1F9D4-200D-2640-FE0F","j":["beard","woman","woman: beard","facial hair"]},"man-red-hair":{"a":"Man: Red Hair","b":"1F468-200D-1F9B0","j":["adult","man","red hair","hairstyle"]},"man-curly-hair":{"a":"Man: Curly Hair","b":"1F468-200D-1F9B1","j":["adult","curly hair","man","hairstyle"]},"man-white-hair":{"a":"Man: White Hair","b":"1F468-200D-1F9B3","j":["adult","man","white hair","old","elder"]},"man-bald":{"a":"Man: Bald","b":"1F468-200D-1F9B2","j":["adult","bald","man","hairless"]},"woman":{"a":"Woman","b":"1F469","j":["adult","female","girls","lady"]},"woman-red-hair":{"a":"Woman: Red Hair","b":"1F469-200D-1F9B0","j":["adult","red hair","woman","hairstyle"]},"person-red-hair":{"a":"Person: Red Hair","b":"1F9D1-200D-1F9B0","j":["adult","gender-neutral","person","red hair","unspecified gender","hairstyle"]},"woman-curly-hair":{"a":"Woman: Curly Hair","b":"1F469-200D-1F9B1","j":["adult","curly hair","woman","hairstyle"]},"person-curly-hair":{"a":"Person: Curly Hair","b":"1F9D1-200D-1F9B1","j":["adult","curly hair","gender-neutral","person","unspecified gender","hairstyle"]},"woman-white-hair":{"a":"Woman: White Hair","b":"1F469-200D-1F9B3","j":["adult","white hair","woman","old","elder"]},"person-white-hair":{"a":"Person: White Hair","b":"1F9D1-200D-1F9B3","j":["adult","gender-neutral","person","unspecified gender","white hair","elder","old"]},"woman-bald":{"a":"Woman: Bald","b":"1F469-200D-1F9B2","j":["adult","bald","woman","hairless"]},"person-bald":{"a":"Person: Bald","b":"1F9D1-200D-1F9B2","j":["adult","bald","gender-neutral","person","unspecified gender","hairless"]},"woman-blond-hair":{"a":"Woman: Blond Hair","b":"1F471-200D-2640-FE0F","j":["blond-haired woman","blonde","hair","woman","woman: blond hair","female","girl","person"]},"man-blond-hair":{"a":"Man: Blond Hair","b":"1F471-200D-2642-FE0F","j":["blond","blond-haired man","hair","man","man: blond hair","male","boy","blonde","guy","person"]},"older-person":{"a":"Older Person","b":"1F9D3","j":["adult","gender-neutral","old","unspecified gender","human","elder","senior"]},"old-man":{"a":"Old Man","b":"1F474","j":["adult","man","old","human","male","men","elder","senior"]},"old-woman":{"a":"Old Woman","b":"1F475","j":["adult","old","woman","human","female","women","lady","elder","senior"]},"person-frowning":{"a":"Person Frowning","b":"1F64D","j":["frown","gesture","worried"]},"man-frowning":{"a":"Man Frowning","b":"1F64D-200D-2642-FE0F","j":["frowning","gesture","man","male","boy","sad","depressed","discouraged","unhappy"]},"woman-frowning":{"a":"Woman Frowning","b":"1F64D-200D-2640-FE0F","j":["frowning","gesture","woman","female","girl","sad","depressed","discouraged","unhappy"]},"person-pouting":{"a":"Person Pouting","b":"1F64E","j":["gesture","pouting","upset"]},"man-pouting":{"a":"Man Pouting","b":"1F64E-200D-2642-FE0F","j":["gesture","man","pouting","male","boy"]},"woman-pouting":{"a":"Woman Pouting","b":"1F64E-200D-2640-FE0F","j":["gesture","pouting","woman","female","girl"]},"person-gesturing-no":{"a":"Person Gesturing No","b":"1F645","j":["forbidden","gesture","hand","person gesturing NO","prohibited","decline"]},"man-gesturing-no":{"a":"Man Gesturing No","b":"1F645-200D-2642-FE0F","j":["forbidden","gesture","hand","man","man gesturing NO","prohibited","male","boy","nope"]},"woman-gesturing-no":{"a":"Woman Gesturing No","b":"1F645-200D-2640-FE0F","j":["forbidden","gesture","hand","prohibited","woman","woman gesturing NO","female","girl","nope"]},"person-gesturing-ok":{"a":"Person Gesturing Ok","b":"1F646","j":["gesture","hand","OK","person gesturing OK","agree"]},"man-gesturing-ok":{"a":"Man Gesturing Ok","b":"1F646-200D-2642-FE0F","j":["gesture","hand","man","man gesturing OK","OK","men","boy","male","blue","human"]},"woman-gesturing-ok":{"a":"Woman Gesturing Ok","b":"1F646-200D-2640-FE0F","j":["gesture","hand","OK","woman","woman gesturing OK","women","girl","female","pink","human"]},"person-tipping-hand":{"a":"Person Tipping Hand","b":"1F481","j":["hand","help","information","sassy","tipping"]},"man-tipping-hand":{"a":"Man Tipping Hand","b":"1F481-200D-2642-FE0F","j":["man","sassy","tipping hand","male","boy","human","information"]},"woman-tipping-hand":{"a":"Woman Tipping Hand","b":"1F481-200D-2640-FE0F","j":["sassy","tipping hand","woman","female","girl","human","information"]},"person-raising-hand":{"a":"Person Raising Hand","b":"1F64B","j":["gesture","hand","happy","raised","question"]},"man-raising-hand":{"a":"Man Raising Hand","b":"1F64B-200D-2642-FE0F","j":["gesture","man","raising hand","male","boy"]},"woman-raising-hand":{"a":"Woman Raising Hand","b":"1F64B-200D-2640-FE0F","j":["gesture","raising hand","woman","female","girl"]},"deaf-person":{"a":"Deaf Person","b":"1F9CF","j":["accessibility","deaf","ear","hear"]},"deaf-man":{"a":"Deaf Man","b":"1F9CF-200D-2642-FE0F","j":["deaf","man","accessibility"]},"deaf-woman":{"a":"Deaf Woman","b":"1F9CF-200D-2640-FE0F","j":["deaf","woman","accessibility"]},"person-bowing":{"a":"Person Bowing","b":"1F647","j":["apology","bow","gesture","sorry","respectiful"]},"man-bowing":{"a":"Man Bowing","b":"1F647-200D-2642-FE0F","j":["apology","bowing","favor","gesture","man","sorry","male","boy"]},"woman-bowing":{"a":"Woman Bowing","b":"1F647-200D-2640-FE0F","j":["apology","bowing","favor","gesture","sorry","woman","female","girl"]},"person-facepalming":{"a":"Person Facepalming","b":"1F926","j":["disbelief","exasperation","face","palm","disappointed"]},"man-facepalming":{"a":"Man Facepalming","b":"1F926-200D-2642-FE0F","j":["disbelief","exasperation","facepalm","man","male","boy"]},"woman-facepalming":{"a":"Woman Facepalming","b":"1F926-200D-2640-FE0F","j":["disbelief","exasperation","facepalm","woman","female","girl"]},"person-shrugging":{"a":"Person Shrugging","b":"1F937","j":["doubt","ignorance","indifference","shrug","regardless"]},"man-shrugging":{"a":"Man Shrugging","b":"1F937-200D-2642-FE0F","j":["doubt","ignorance","indifference","man","shrug","male","boy","confused","indifferent"]},"woman-shrugging":{"a":"Woman Shrugging","b":"1F937-200D-2640-FE0F","j":["doubt","ignorance","indifference","shrug","woman","female","girl","confused","indifferent"]},"health-worker":{"a":"Health Worker","b":"1F9D1-200D-2695-FE0F","j":["doctor","healthcare","nurse","therapist","hospital"]},"man-health-worker":{"a":"Man Health Worker","b":"1F468-200D-2695-FE0F","j":["doctor","healthcare","man","nurse","therapist","human"]},"woman-health-worker":{"a":"Woman Health Worker","b":"1F469-200D-2695-FE0F","j":["doctor","healthcare","nurse","therapist","woman","human"]},"student":{"a":"Student","b":"1F9D1-200D-1F393","j":["graduate","learn"]},"man-student":{"a":"Man Student","b":"1F468-200D-1F393","j":["graduate","man","student","human"]},"woman-student":{"a":"Woman Student","b":"1F469-200D-1F393","j":["graduate","student","woman","human"]},"teacher":{"a":"Teacher","b":"1F9D1-200D-1F3EB","j":["instructor","professor"]},"man-teacher":{"a":"Man Teacher","b":"1F468-200D-1F3EB","j":["instructor","man","professor","teacher","human"]},"woman-teacher":{"a":"Woman Teacher","b":"1F469-200D-1F3EB","j":["instructor","professor","teacher","woman","human"]},"judge":{"a":"Judge","b":"1F9D1-200D-2696-FE0F","j":["justice","scales","law"]},"man-judge":{"a":"Man Judge","b":"1F468-200D-2696-FE0F","j":["judge","justice","man","scales","court","human"]},"woman-judge":{"a":"Woman Judge","b":"1F469-200D-2696-FE0F","j":["judge","justice","scales","woman","court","human"]},"farmer":{"a":"Farmer","b":"1F9D1-200D-1F33E","j":["gardener","rancher","crops"]},"man-farmer":{"a":"Man Farmer","b":"1F468-200D-1F33E","j":["farmer","gardener","man","rancher","human"]},"woman-farmer":{"a":"Woman Farmer","b":"1F469-200D-1F33E","j":["farmer","gardener","rancher","woman","human"]},"cook":{"a":"Cook","b":"1F9D1-200D-1F373","j":["chef","food","kitchen","culinary"]},"man-cook":{"a":"Man Cook","b":"1F468-200D-1F373","j":["chef","cook","man","human"]},"woman-cook":{"a":"Woman Cook","b":"1F469-200D-1F373","j":["chef","cook","woman","human"]},"mechanic":{"a":"Mechanic","b":"1F9D1-200D-1F527","j":["electrician","plumber","tradesperson","worker","technician"]},"man-mechanic":{"a":"Man Mechanic","b":"1F468-200D-1F527","j":["electrician","man","mechanic","plumber","tradesperson","human","wrench"]},"woman-mechanic":{"a":"Woman Mechanic","b":"1F469-200D-1F527","j":["electrician","mechanic","plumber","tradesperson","woman","human","wrench"]},"factory-worker":{"a":"Factory Worker","b":"1F9D1-200D-1F3ED","j":["assembly","factory","industrial","worker","labor"]},"man-factory-worker":{"a":"Man Factory Worker","b":"1F468-200D-1F3ED","j":["assembly","factory","industrial","man","worker","human"]},"woman-factory-worker":{"a":"Woman Factory Worker","b":"1F469-200D-1F3ED","j":["assembly","factory","industrial","woman","worker","human"]},"office-worker":{"a":"Office Worker","b":"1F9D1-200D-1F4BC","j":["architect","business","manager","white-collar"]},"man-office-worker":{"a":"Man Office Worker","b":"1F468-200D-1F4BC","j":["architect","business","man","manager","white-collar","human"]},"woman-office-worker":{"a":"Woman Office Worker","b":"1F469-200D-1F4BC","j":["architect","business","manager","white-collar","woman","human"]},"scientist":{"a":"Scientist","b":"1F9D1-200D-1F52C","j":["biologist","chemist","engineer","physicist","chemistry"]},"man-scientist":{"a":"Man Scientist","b":"1F468-200D-1F52C","j":["biologist","chemist","engineer","man","physicist","scientist","human"]},"woman-scientist":{"a":"Woman Scientist","b":"1F469-200D-1F52C","j":["biologist","chemist","engineer","physicist","scientist","woman","human"]},"technologist":{"a":"Technologist","b":"1F9D1-200D-1F4BB","j":["coder","developer","inventor","software","computer"]},"man-technologist":{"a":"Man Technologist","b":"1F468-200D-1F4BB","j":["coder","developer","inventor","man","software","technologist","engineer","programmer","human","laptop","computer"]},"woman-technologist":{"a":"Woman Technologist","b":"1F469-200D-1F4BB","j":["coder","developer","inventor","software","technologist","woman","engineer","programmer","human","laptop","computer"]},"singer":{"a":"Singer","b":"1F9D1-200D-1F3A4","j":["actor","entertainer","rock","star","song","artist","performer"]},"man-singer":{"a":"Man Singer","b":"1F468-200D-1F3A4","j":["actor","entertainer","man","rock","singer","star","rockstar","human"]},"woman-singer":{"a":"Woman Singer","b":"1F469-200D-1F3A4","j":["actor","entertainer","rock","singer","star","woman","rockstar","human"]},"artist":{"a":"Artist","b":"1F9D1-200D-1F3A8","j":["palette","painting","draw","creativity"]},"man-artist":{"a":"Man Artist","b":"1F468-200D-1F3A8","j":["artist","man","palette","painter","human"]},"woman-artist":{"a":"Woman Artist","b":"1F469-200D-1F3A8","j":["artist","palette","woman","painter","human"]},"pilot":{"a":"Pilot","b":"1F9D1-200D-2708-FE0F","j":["plane","fly","airplane"]},"man-pilot":{"a":"Man Pilot","b":"1F468-200D-2708-FE0F","j":["man","pilot","plane","aviator","human"]},"woman-pilot":{"a":"Woman Pilot","b":"1F469-200D-2708-FE0F","j":["pilot","plane","woman","aviator","human"]},"astronaut":{"a":"Astronaut","b":"1F9D1-200D-1F680","j":["rocket","outerspace"]},"man-astronaut":{"a":"Man Astronaut","b":"1F468-200D-1F680","j":["astronaut","man","rocket","space","human"]},"woman-astronaut":{"a":"Woman Astronaut","b":"1F469-200D-1F680","j":["astronaut","rocket","woman","space","human"]},"firefighter":{"a":"Firefighter","b":"1F9D1-200D-1F692","j":["firetruck","fire"]},"man-firefighter":{"a":"Man Firefighter","b":"1F468-200D-1F692","j":["firefighter","firetruck","man","fireman","human"]},"woman-firefighter":{"a":"Woman Firefighter","b":"1F469-200D-1F692","j":["firefighter","firetruck","woman","fireman","human"]},"police-officer":{"a":"Police Officer","b":"1F46E","j":["cop","officer","police"]},"man-police-officer":{"a":"Man Police Officer","b":"1F46E-200D-2642-FE0F","j":["cop","man","officer","police","law","legal","enforcement","arrest","911"]},"woman-police-officer":{"a":"Woman Police Officer","b":"1F46E-200D-2640-FE0F","j":["cop","officer","police","woman","law","legal","enforcement","arrest","911","female"]},"detective":{"a":"Detective","b":"1F575","j":["sleuth","spy","human"]},"man-detective":{"a":"Man Detective","b":"1F575-FE0F-200D-2642-FE0F","j":["detective","man","sleuth","spy","crime"]},"woman-detective":{"a":"Woman Detective","b":"1F575-FE0F-200D-2640-FE0F","j":["detective","sleuth","spy","woman","human","female"]},"guard":{"a":"Guard","b":"1F482","j":["protect"]},"man-guard":{"a":"Man Guard","b":"1F482-200D-2642-FE0F","j":["guard","man","uk","gb","british","male","guy","royal"]},"woman-guard":{"a":"Woman Guard","b":"1F482-200D-2640-FE0F","j":["guard","woman","uk","gb","british","female","royal"]},"ninja":{"a":"Ninja","b":"1F977","j":["fighter","hidden","stealth","ninjutsu","skills","japanese"]},"construction-worker":{"a":"Construction Worker","b":"1F477","j":["construction","hat","worker","labor","build"]},"man-construction-worker":{"a":"Man Construction Worker","b":"1F477-200D-2642-FE0F","j":["construction","man","worker","male","human","wip","guy","build","labor"]},"woman-construction-worker":{"a":"Woman Construction Worker","b":"1F477-200D-2640-FE0F","j":["construction","woman","worker","female","human","wip","build","labor"]},"person-with-crown":{"a":"⊛ Person with Crown","b":"1FAC5","j":["monarch","noble","regal","royalty","power"]},"prince":{"a":"Prince","b":"1F934","j":["boy","man","male","crown","royal","king"]},"princess":{"a":"Princess","b":"1F478","j":["fairy tale","fantasy","girl","woman","female","blond","crown","royal","queen"]},"person-wearing-turban":{"a":"Person Wearing Turban","b":"1F473","j":["turban","headdress"]},"man-wearing-turban":{"a":"Man Wearing Turban","b":"1F473-200D-2642-FE0F","j":["man","turban","male","indian","hinduism","arabs"]},"woman-wearing-turban":{"a":"Woman Wearing Turban","b":"1F473-200D-2640-FE0F","j":["turban","woman","female","indian","hinduism","arabs"]},"person-with-skullcap":{"a":"Person with Skullcap","b":"1F472","j":["cap","gua pi mao","hat","person","skullcap","man_with_skullcap","male","boy","chinese"]},"woman-with-headscarf":{"a":"Woman with Headscarf","b":"1F9D5","j":["headscarf","hijab","mantilla","tichel","bandana","head kerchief","female"]},"person-in-tuxedo":{"a":"Person in Tuxedo","b":"1F935","j":["groom","person","tuxedo","man_in_tuxedo","couple","marriage","wedding"]},"man-in-tuxedo":{"a":"Man in Tuxedo","b":"1F935-200D-2642-FE0F","j":["man","tuxedo","formal","fashion"]},"woman-in-tuxedo":{"a":"Woman in Tuxedo","b":"1F935-200D-2640-FE0F","j":["tuxedo","woman","formal","fashion"]},"person-with-veil":{"a":"Person with Veil","b":"1F470","j":["bride","person","veil","wedding","bride_with_veil","couple","marriage","woman"]},"man-with-veil":{"a":"Man with Veil","b":"1F470-200D-2642-FE0F","j":["man","veil","wedding","marriage"]},"woman-with-veil":{"a":"Woman with Veil","b":"1F470-200D-2640-FE0F","j":["veil","woman","wedding","marriage"]},"pregnant-woman":{"a":"Pregnant Woman","b":"1F930","j":["pregnant","woman","baby"]},"pregnant-man":{"a":"⊛ Pregnant Man","b":"1FAC3","j":["belly","bloated","full","pregnant","baby"]},"pregnant-person":{"a":"⊛ Pregnant Person","b":"1FAC4","j":["belly","bloated","full","pregnant","baby"]},"breastfeeding":{"a":"Breast-Feeding","b":"1F931","j":["baby","breast","breast-feeding","nursing","breast_feeding"]},"woman-feeding-baby":{"a":"Woman Feeding Baby","b":"1F469-200D-1F37C","j":["baby","feeding","nursing","woman","birth","food"]},"man-feeding-baby":{"a":"Man Feeding Baby","b":"1F468-200D-1F37C","j":["baby","feeding","man","nursing","birth","food"]},"person-feeding-baby":{"a":"Person Feeding Baby","b":"1F9D1-200D-1F37C","j":["baby","feeding","nursing","person","birth","food"]},"baby-angel":{"a":"Baby Angel","b":"1F47C","j":["angel","baby","face","fairy tale","fantasy","heaven","wings","halo"]},"santa-claus":{"a":"Santa Claus","b":"1F385","j":["celebration","Christmas","claus","father","santa","festival","man","male","xmas","father christmas"]},"mrs-claus":{"a":"Mrs. Claus","b":"1F936","j":["celebration","Christmas","claus","mother","Mrs.","woman","female","xmas","mother christmas"]},"mx-claus":{"a":"Mx Claus","b":"1F9D1-200D-1F384","j":["Claus, christmas","christmas"]},"superhero":{"a":"Superhero","b":"1F9B8","j":["good","hero","heroine","superpower","marvel"]},"man-superhero":{"a":"Man Superhero","b":"1F9B8-200D-2642-FE0F","j":["good","hero","man","superpower","male","superpowers"]},"woman-superhero":{"a":"Woman Superhero","b":"1F9B8-200D-2640-FE0F","j":["good","hero","heroine","superpower","woman","female","superpowers"]},"supervillain":{"a":"Supervillain","b":"1F9B9","j":["criminal","evil","superpower","villain","marvel"]},"man-supervillain":{"a":"Man Supervillain","b":"1F9B9-200D-2642-FE0F","j":["criminal","evil","man","superpower","villain","male","bad","hero","superpowers"]},"woman-supervillain":{"a":"Woman Supervillain","b":"1F9B9-200D-2640-FE0F","j":["criminal","evil","superpower","villain","woman","female","bad","heroine","superpowers"]},"mage":{"a":"Mage","b":"1F9D9","j":["sorcerer","sorceress","witch","wizard","magic"]},"man-mage":{"a":"Man Mage","b":"1F9D9-200D-2642-FE0F","j":["sorcerer","wizard","man","male","mage"]},"woman-mage":{"a":"Woman Mage","b":"1F9D9-200D-2640-FE0F","j":["sorceress","witch","woman","female","mage"]},"fairy":{"a":"Fairy","b":"1F9DA","j":["Oberon","Puck","Titania","wings","magical"]},"man-fairy":{"a":"Man Fairy","b":"1F9DA-200D-2642-FE0F","j":["Oberon","Puck","man","male"]},"woman-fairy":{"a":"Woman Fairy","b":"1F9DA-200D-2640-FE0F","j":["Titania","woman","female"]},"vampire":{"a":"Vampire","b":"1F9DB","j":["Dracula","undead","blood","twilight"]},"man-vampire":{"a":"Man Vampire","b":"1F9DB-200D-2642-FE0F","j":["Dracula","undead","man","male","dracula"]},"woman-vampire":{"a":"Woman Vampire","b":"1F9DB-200D-2640-FE0F","j":["undead","woman","female"]},"merperson":{"a":"Merperson","b":"1F9DC","j":["mermaid","merman","merwoman","sea"]},"merman":{"a":"Merman","b":"1F9DC-200D-2642-FE0F","j":["Triton","man","male","triton"]},"mermaid":{"a":"Mermaid","b":"1F9DC-200D-2640-FE0F","j":["merwoman","woman","female","ariel"]},"elf":{"a":"Elf","b":"1F9DD","j":["magical","LOTR style"]},"man-elf":{"a":"Man Elf","b":"1F9DD-200D-2642-FE0F","j":["magical","man","male"]},"woman-elf":{"a":"Woman Elf","b":"1F9DD-200D-2640-FE0F","j":["magical","woman","female"]},"genie":{"a":"Genie","b":"1F9DE","j":["djinn","(non-human color)","magical","wishes"]},"man-genie":{"a":"Man Genie","b":"1F9DE-200D-2642-FE0F","j":["djinn","man","male"]},"woman-genie":{"a":"Woman Genie","b":"1F9DE-200D-2640-FE0F","j":["djinn","woman","female"]},"zombie":{"a":"Zombie","b":"1F9DF","j":["undead","walking dead","(non-human color)","dead"]},"man-zombie":{"a":"Man Zombie","b":"1F9DF-200D-2642-FE0F","j":["undead","walking dead","man","male","dracula"]},"woman-zombie":{"a":"Woman Zombie","b":"1F9DF-200D-2640-FE0F","j":["undead","walking dead","woman","female"]},"troll":{"a":"⊛ Troll","b":"1F9CC","j":["fairy tale","fantasy","monster","mystical"]},"person-getting-massage":{"a":"Person Getting Massage","b":"1F486","j":["face","massage","salon","relax"]},"man-getting-massage":{"a":"Man Getting Massage","b":"1F486-200D-2642-FE0F","j":["face","man","massage","male","boy","head"]},"woman-getting-massage":{"a":"Woman Getting Massage","b":"1F486-200D-2640-FE0F","j":["face","massage","woman","female","girl","head"]},"person-getting-haircut":{"a":"Person Getting Haircut","b":"1F487","j":["barber","beauty","haircut","parlor","hairstyle"]},"man-getting-haircut":{"a":"Man Getting Haircut","b":"1F487-200D-2642-FE0F","j":["haircut","man","male","boy"]},"woman-getting-haircut":{"a":"Woman Getting Haircut","b":"1F487-200D-2640-FE0F","j":["haircut","woman","female","girl"]},"person-walking":{"a":"Person Walking","b":"1F6B6","j":["hike","walk","walking","move"]},"man-walking":{"a":"Man Walking","b":"1F6B6-200D-2642-FE0F","j":["hike","man","walk","human","feet","steps"]},"woman-walking":{"a":"Woman Walking","b":"1F6B6-200D-2640-FE0F","j":["hike","walk","woman","human","feet","steps","female"]},"person-standing":{"a":"Person Standing","b":"1F9CD","j":["stand","standing","still"]},"man-standing":{"a":"Man Standing","b":"1F9CD-200D-2642-FE0F","j":["man","standing","still"]},"woman-standing":{"a":"Woman Standing","b":"1F9CD-200D-2640-FE0F","j":["standing","woman","still"]},"person-kneeling":{"a":"Person Kneeling","b":"1F9CE","j":["kneel","kneeling","pray","respectful"]},"man-kneeling":{"a":"Man Kneeling","b":"1F9CE-200D-2642-FE0F","j":["kneeling","man","pray","respectful"]},"woman-kneeling":{"a":"Woman Kneeling","b":"1F9CE-200D-2640-FE0F","j":["kneeling","woman","respectful","pray"]},"person-with-white-cane":{"a":"Person with White Cane","b":"1F9D1-200D-1F9AF","j":["accessibility","blind","person_with_probing_cane"]},"man-with-white-cane":{"a":"Man with White Cane","b":"1F468-200D-1F9AF","j":["accessibility","blind","man","man_with_probing_cane"]},"woman-with-white-cane":{"a":"Woman with White Cane","b":"1F469-200D-1F9AF","j":["accessibility","blind","woman","woman_with_probing_cane"]},"person-in-motorized-wheelchair":{"a":"Person in Motorized Wheelchair","b":"1F9D1-200D-1F9BC","j":["accessibility","wheelchair","disability"]},"man-in-motorized-wheelchair":{"a":"Man in Motorized Wheelchair","b":"1F468-200D-1F9BC","j":["accessibility","man","wheelchair","disability"]},"woman-in-motorized-wheelchair":{"a":"Woman in Motorized Wheelchair","b":"1F469-200D-1F9BC","j":["accessibility","wheelchair","woman","disability"]},"person-in-manual-wheelchair":{"a":"Person in Manual Wheelchair","b":"1F9D1-200D-1F9BD","j":["accessibility","wheelchair","disability"]},"man-in-manual-wheelchair":{"a":"Man in Manual Wheelchair","b":"1F468-200D-1F9BD","j":["accessibility","man","wheelchair","disability"]},"woman-in-manual-wheelchair":{"a":"Woman in Manual Wheelchair","b":"1F469-200D-1F9BD","j":["accessibility","wheelchair","woman","disability"]},"person-running":{"a":"Person Running","b":"1F3C3","j":["marathon","running","move"]},"man-running":{"a":"Man Running","b":"1F3C3-200D-2642-FE0F","j":["man","marathon","racing","running","walking","exercise","race"]},"woman-running":{"a":"Woman Running","b":"1F3C3-200D-2640-FE0F","j":["marathon","racing","running","woman","walking","exercise","race","female"]},"woman-dancing":{"a":"Woman Dancing","b":"1F483","j":["dance","dancing","woman","female","girl","fun"]},"man-dancing":{"a":"Man Dancing","b":"1F57A","j":["dance","dancing","man","male","boy","fun","dancer"]},"person-in-suit-levitating":{"a":"Person in Suit Levitating","b":"1F574","j":["business","person","suit","man_in_suit_levitating","levitate","hover","jump"]},"people-with-bunny-ears":{"a":"People with Bunny Ears","b":"1F46F","j":["bunny ear","dancer","partying","perform","costume"]},"men-with-bunny-ears":{"a":"Men with Bunny Ears","b":"1F46F-200D-2642-FE0F","j":["bunny ear","dancer","men","partying","male","bunny","boys"]},"women-with-bunny-ears":{"a":"Women with Bunny Ears","b":"1F46F-200D-2640-FE0F","j":["bunny ear","dancer","partying","women","female","bunny","girls"]},"person-in-steamy-room":{"a":"Person in Steamy Room","b":"1F9D6","j":["sauna","steam room","hamam","steambath","relax","spa"]},"man-in-steamy-room":{"a":"Man in Steamy Room","b":"1F9D6-200D-2642-FE0F","j":["sauna","steam room","male","man","spa","steamroom"]},"woman-in-steamy-room":{"a":"Woman in Steamy Room","b":"1F9D6-200D-2640-FE0F","j":["sauna","steam room","female","woman","spa","steamroom"]},"person-climbing":{"a":"Person Climbing","b":"1F9D7","j":["climber","sport"]},"man-climbing":{"a":"Man Climbing","b":"1F9D7-200D-2642-FE0F","j":["climber","sports","hobby","man","male","rock"]},"woman-climbing":{"a":"Woman Climbing","b":"1F9D7-200D-2640-FE0F","j":["climber","sports","hobby","woman","female","rock"]},"person-fencing":{"a":"Person Fencing","b":"1F93A","j":["fencer","fencing","sword","sports"]},"horse-racing":{"a":"Horse Racing","b":"1F3C7","j":["horse","jockey","racehorse","racing","animal","betting","competition","gambling","luck"]},"skier":{"a":"Skier","b":"26F7","j":["ski","snow","sports","winter"]},"snowboarder":{"a":"Snowboarder","b":"1F3C2","j":["ski","snow","snowboard","sports","winter"]},"person-golfing":{"a":"Person Golfing","b":"1F3CC","j":["ball","golf","sports","business"]},"man-golfing":{"a":"Man Golfing","b":"1F3CC-FE0F-200D-2642-FE0F","j":["golf","man","sport"]},"woman-golfing":{"a":"Woman Golfing","b":"1F3CC-FE0F-200D-2640-FE0F","j":["golf","woman","sports","business","female"]},"person-surfing":{"a":"Person Surfing","b":"1F3C4","j":["surfing","sport","sea"]},"man-surfing":{"a":"Man Surfing","b":"1F3C4-200D-2642-FE0F","j":["man","surfing","sports","ocean","sea","summer","beach"]},"woman-surfing":{"a":"Woman Surfing","b":"1F3C4-200D-2640-FE0F","j":["surfing","woman","sports","ocean","sea","summer","beach","female"]},"person-rowing-boat":{"a":"Person Rowing Boat","b":"1F6A3","j":["boat","rowboat","sport","move"]},"man-rowing-boat":{"a":"Man Rowing Boat","b":"1F6A3-200D-2642-FE0F","j":["boat","man","rowboat","sports","hobby","water","ship"]},"woman-rowing-boat":{"a":"Woman Rowing Boat","b":"1F6A3-200D-2640-FE0F","j":["boat","rowboat","woman","sports","hobby","water","ship","female"]},"person-swimming":{"a":"Person Swimming","b":"1F3CA","j":["swim","sport","pool"]},"man-swimming":{"a":"Man Swimming","b":"1F3CA-200D-2642-FE0F","j":["man","swim","sports","exercise","human","athlete","water","summer"]},"woman-swimming":{"a":"Woman Swimming","b":"1F3CA-200D-2640-FE0F","j":["swim","woman","sports","exercise","human","athlete","water","summer","female"]},"person-bouncing-ball":{"a":"Person Bouncing Ball","b":"26F9","j":["ball","sports","human"]},"man-bouncing-ball":{"a":"Man Bouncing Ball","b":"26F9-FE0F-200D-2642-FE0F","j":["ball","man","sport"]},"woman-bouncing-ball":{"a":"Woman Bouncing Ball","b":"26F9-FE0F-200D-2640-FE0F","j":["ball","woman","sports","human","female"]},"person-lifting-weights":{"a":"Person Lifting Weights","b":"1F3CB","j":["lifter","weight","sports","training","exercise"]},"man-lifting-weights":{"a":"Man Lifting Weights","b":"1F3CB-FE0F-200D-2642-FE0F","j":["man","weight lifter","sport"]},"woman-lifting-weights":{"a":"Woman Lifting Weights","b":"1F3CB-FE0F-200D-2640-FE0F","j":["weight lifter","woman","sports","training","exercise","female"]},"person-biking":{"a":"Person Biking","b":"1F6B4","j":["bicycle","biking","cyclist","sport","move"]},"man-biking":{"a":"Man Biking","b":"1F6B4-200D-2642-FE0F","j":["bicycle","biking","cyclist","man","sports","bike","exercise","hipster"]},"woman-biking":{"a":"Woman Biking","b":"1F6B4-200D-2640-FE0F","j":["bicycle","biking","cyclist","woman","sports","bike","exercise","hipster","female"]},"person-mountain-biking":{"a":"Person Mountain Biking","b":"1F6B5","j":["bicycle","bicyclist","bike","cyclist","mountain","sport","move"]},"man-mountain-biking":{"a":"Man Mountain Biking","b":"1F6B5-200D-2642-FE0F","j":["bicycle","bike","cyclist","man","mountain","transportation","sports","human","race"]},"woman-mountain-biking":{"a":"Woman Mountain Biking","b":"1F6B5-200D-2640-FE0F","j":["bicycle","bike","biking","cyclist","mountain","woman","transportation","sports","human","race","female"]},"person-cartwheeling":{"a":"Person Cartwheeling","b":"1F938","j":["cartwheel","gymnastics","sport","gymnastic"]},"man-cartwheeling":{"a":"Man Cartwheeling","b":"1F938-200D-2642-FE0F","j":["cartwheel","gymnastics","man"]},"woman-cartwheeling":{"a":"Woman Cartwheeling","b":"1F938-200D-2640-FE0F","j":["cartwheel","gymnastics","woman"]},"people-wrestling":{"a":"People Wrestling","b":"1F93C","j":["wrestle","wrestler","sport"]},"men-wrestling":{"a":"Men Wrestling","b":"1F93C-200D-2642-FE0F","j":["men","wrestle","sports","wrestlers"]},"women-wrestling":{"a":"Women Wrestling","b":"1F93C-200D-2640-FE0F","j":["women","wrestle","sports","wrestlers"]},"person-playing-water-polo":{"a":"Person Playing Water Polo","b":"1F93D","j":["polo","water","sport"]},"man-playing-water-polo":{"a":"Man Playing Water Polo","b":"1F93D-200D-2642-FE0F","j":["man","water polo","sports","pool"]},"woman-playing-water-polo":{"a":"Woman Playing Water Polo","b":"1F93D-200D-2640-FE0F","j":["water polo","woman","sports","pool"]},"person-playing-handball":{"a":"Person Playing Handball","b":"1F93E","j":["ball","handball","sport"]},"man-playing-handball":{"a":"Man Playing Handball","b":"1F93E-200D-2642-FE0F","j":["handball","man","sports"]},"woman-playing-handball":{"a":"Woman Playing Handball","b":"1F93E-200D-2640-FE0F","j":["handball","woman","sports"]},"person-juggling":{"a":"Person Juggling","b":"1F939","j":["balance","juggle","multitask","skill","performance"]},"man-juggling":{"a":"Man Juggling","b":"1F939-200D-2642-FE0F","j":["juggling","man","multitask","juggle","balance","skill"]},"woman-juggling":{"a":"Woman Juggling","b":"1F939-200D-2640-FE0F","j":["juggling","multitask","woman","juggle","balance","skill"]},"person-in-lotus-position":{"a":"Person in Lotus Position","b":"1F9D8","j":["meditation","yoga","serenity","meditate"]},"man-in-lotus-position":{"a":"Man in Lotus Position","b":"1F9D8-200D-2642-FE0F","j":["meditation","yoga","man","male","serenity","zen","mindfulness"]},"woman-in-lotus-position":{"a":"Woman in Lotus Position","b":"1F9D8-200D-2640-FE0F","j":["meditation","yoga","woman","female","serenity","zen","mindfulness"]},"person-taking-bath":{"a":"Person Taking Bath","b":"1F6C0","j":["bath","bathtub","clean","shower","bathroom"]},"person-in-bed":{"a":"Person in Bed","b":"1F6CC","j":["hotel","sleep","bed","rest"]},"people-holding-hands":{"a":"People Holding Hands","b":"1F9D1-200D-1F91D-200D-1F9D1","j":["couple","hand","hold","holding hands","person","friendship"]},"women-holding-hands":{"a":"Women Holding Hands","b":"1F46D","j":["couple","hand","holding hands","women","pair","friendship","love","like","female","people","human"]},"woman-and-man-holding-hands":{"a":"Woman and Man Holding Hands","b":"1F46B","j":["couple","hand","hold","holding hands","man","woman","pair","people","human","love","date","dating","like","affection","valentines","marriage"]},"men-holding-hands":{"a":"Men Holding Hands","b":"1F46C","j":["couple","Gemini","holding hands","man","men","twins","zodiac","pair","love","like","bromance","friendship","people","human"]},"kiss":{"a":"Kiss","b":"1F48F","j":["couple","pair","valentines","love","like","dating","marriage"]},"kiss-woman-man":{"a":"Kiss: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["couple","kiss","man","woman","love"]},"kiss-man-man":{"a":"Kiss: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["couple","kiss","man","pair","valentines","love","like","dating","marriage"]},"kiss-woman-woman":{"a":"Kiss: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F469","j":["couple","kiss","woman","pair","valentines","love","like","dating","marriage"]},"couple-with-heart":{"a":"Couple with Heart","b":"1F491","j":["couple","love","pair","like","affection","human","dating","valentines","marriage"]},"couple-with-heart-woman-man":{"a":"Couple with Heart: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F468","j":["couple","couple with heart","love","man","woman"]},"couple-with-heart-man-man":{"a":"Couple with Heart: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F468","j":["couple","couple with heart","love","man","pair","like","affection","human","dating","valentines","marriage"]},"couple-with-heart-woman-woman":{"a":"Couple with Heart: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F469","j":["couple","couple with heart","love","woman","pair","like","affection","human","dating","valentines","marriage"]},"family":{"a":"Family","b":"1F46A","j":["home","parents","child","mom","dad","father","mother","people","human"]},"family-man-woman-boy":{"a":"Family: Man, Woman, Boy","b":"1F468-200D-1F469-200D-1F466","j":["boy","family","man","woman","love"]},"family-man-woman-girl":{"a":"Family: Man, Woman, Girl","b":"1F468-200D-1F469-200D-1F467","j":["family","girl","man","woman","home","parents","people","human","child"]},"family-man-woman-girl-boy":{"a":"Family: Man, Woman, Girl, Boy","b":"1F468-200D-1F469-200D-1F467-200D-1F466","j":["boy","family","girl","man","woman","home","parents","people","human","children"]},"family-man-woman-boy-boy":{"a":"Family: Man, Woman, Boy, Boy","b":"1F468-200D-1F469-200D-1F466-200D-1F466","j":["boy","family","man","woman","home","parents","people","human","children"]},"family-man-woman-girl-girl":{"a":"Family: Man, Woman, Girl, Girl","b":"1F468-200D-1F469-200D-1F467-200D-1F467","j":["family","girl","man","woman","home","parents","people","human","children"]},"family-man-man-boy":{"a":"Family: Man, Man, Boy","b":"1F468-200D-1F468-200D-1F466","j":["boy","family","man","home","parents","people","human","children"]},"family-man-man-girl":{"a":"Family: Man, Man, Girl","b":"1F468-200D-1F468-200D-1F467","j":["family","girl","man","home","parents","people","human","children"]},"family-man-man-girl-boy":{"a":"Family: Man, Man, Girl, Boy","b":"1F468-200D-1F468-200D-1F467-200D-1F466","j":["boy","family","girl","man","home","parents","people","human","children"]},"family-man-man-boy-boy":{"a":"Family: Man, Man, Boy, Boy","b":"1F468-200D-1F468-200D-1F466-200D-1F466","j":["boy","family","man","home","parents","people","human","children"]},"family-man-man-girl-girl":{"a":"Family: Man, Man, Girl, Girl","b":"1F468-200D-1F468-200D-1F467-200D-1F467","j":["family","girl","man","home","parents","people","human","children"]},"family-woman-woman-boy":{"a":"Family: Woman, Woman, Boy","b":"1F469-200D-1F469-200D-1F466","j":["boy","family","woman","home","parents","people","human","children"]},"family-woman-woman-girl":{"a":"Family: Woman, Woman, Girl","b":"1F469-200D-1F469-200D-1F467","j":["family","girl","woman","home","parents","people","human","children"]},"family-woman-woman-girl-boy":{"a":"Family: Woman, Woman, Girl, Boy","b":"1F469-200D-1F469-200D-1F467-200D-1F466","j":["boy","family","girl","woman","home","parents","people","human","children"]},"family-woman-woman-boy-boy":{"a":"Family: Woman, Woman, Boy, Boy","b":"1F469-200D-1F469-200D-1F466-200D-1F466","j":["boy","family","woman","home","parents","people","human","children"]},"family-woman-woman-girl-girl":{"a":"Family: Woman, Woman, Girl, Girl","b":"1F469-200D-1F469-200D-1F467-200D-1F467","j":["family","girl","woman","home","parents","people","human","children"]},"family-man-boy":{"a":"Family: Man, Boy","b":"1F468-200D-1F466","j":["boy","family","man","home","parent","people","human","child"]},"family-man-boy-boy":{"a":"Family: Man, Boy, Boy","b":"1F468-200D-1F466-200D-1F466","j":["boy","family","man","home","parent","people","human","children"]},"family-man-girl":{"a":"Family: Man, Girl","b":"1F468-200D-1F467","j":["family","girl","man","home","parent","people","human","child"]},"family-man-girl-boy":{"a":"Family: Man, Girl, Boy","b":"1F468-200D-1F467-200D-1F466","j":["boy","family","girl","man","home","parent","people","human","children"]},"family-man-girl-girl":{"a":"Family: Man, Girl, Girl","b":"1F468-200D-1F467-200D-1F467","j":["family","girl","man","home","parent","people","human","children"]},"family-woman-boy":{"a":"Family: Woman, Boy","b":"1F469-200D-1F466","j":["boy","family","woman","home","parent","people","human","child"]},"family-woman-boy-boy":{"a":"Family: Woman, Boy, Boy","b":"1F469-200D-1F466-200D-1F466","j":["boy","family","woman","home","parent","people","human","children"]},"family-woman-girl":{"a":"Family: Woman, Girl","b":"1F469-200D-1F467","j":["family","girl","woman","home","parent","people","human","child"]},"family-woman-girl-boy":{"a":"Family: Woman, Girl, Boy","b":"1F469-200D-1F467-200D-1F466","j":["boy","family","girl","woman","home","parent","people","human","children"]},"family-woman-girl-girl":{"a":"Family: Woman, Girl, Girl","b":"1F469-200D-1F467-200D-1F467","j":["family","girl","woman","home","parent","people","human","children"]},"speaking-head":{"a":"Speaking Head","b":"1F5E3","j":["face","head","silhouette","speak","speaking","user","person","human","sing","say","talk"]},"bust-in-silhouette":{"a":"Bust in Silhouette","b":"1F464","j":["bust","silhouette","user","person","human"]},"busts-in-silhouette":{"a":"Busts in Silhouette","b":"1F465","j":["bust","silhouette","user","person","human","group","team"]},"people-hugging":{"a":"People Hugging","b":"1FAC2","j":["goodbye","hello","hug","thanks","care"]},"footprints":{"a":"Footprints","b":"1F463","j":["clothing","footprint","print","feet","tracking","walking","beach"]},"red-hair":{"a":"Red Hair","b":"1F9B0","j":["ginger","red hair","redhead"]},"curly-hair":{"a":"Curly Hair","b":"1F9B1","j":["afro","curly","curly hair","ringlets"]},"white-hair":{"a":"White Hair","b":"1F9B3","j":["gray","hair","old","white"]},"bald":{"a":"Bald","b":"1F9B2","j":["bald","chemotherapy","hairless","no hair","shaven"]},"monkey-face":{"a":"Monkey Face","b":"1F435","j":["face","monkey","animal","nature","circus"]},"monkey":{"a":"Monkey","b":"1F412","j":["animal","nature","banana","circus"]},"gorilla":{"a":"Gorilla","b":"1F98D","j":["animal","nature","circus"]},"orangutan":{"a":"Orangutan","b":"1F9A7","j":["ape","animal"]},"dog-face":{"a":"Dog Face","b":"1F436","j":["dog","face","pet","animal","friend","nature","woof","puppy","faithful"]},"dog":{"a":"Dog","b":"1F415","j":["pet","animal","nature","friend","doge","faithful"]},"guide-dog":{"a":"Guide Dog","b":"1F9AE","j":["accessibility","blind","guide","animal"]},"service-dog":{"a":"Service Dog","b":"1F415-200D-1F9BA","j":["accessibility","assistance","dog","service","blind","animal"]},"poodle":{"a":"Poodle","b":"1F429","j":["dog","animal","101","nature","pet"]},"wolf":{"a":"Wolf","b":"1F43A","j":["face","animal","nature","wild"]},"fox":{"a":"Fox","b":"1F98A","j":["face","animal","nature"]},"raccoon":{"a":"Raccoon","b":"1F99D","j":["curious","sly","animal","nature"]},"cat-face":{"a":"Cat Face","b":"1F431","j":["cat","face","pet","animal","meow","nature","kitten"]},"cat":{"a":"Cat","b":"1F408","j":["pet","animal","meow","cats"]},"black-cat":{"a":"Black Cat","b":"1F408-200D-2B1B","j":["black","cat","unlucky","superstition","luck"]},"lion":{"a":"Lion","b":"1F981","j":["face","Leo","zodiac","animal","nature"]},"tiger-face":{"a":"Tiger Face","b":"1F42F","j":["face","tiger","animal","cat","danger","wild","nature","roar"]},"tiger":{"a":"Tiger","b":"1F405","j":["animal","nature","roar"]},"leopard":{"a":"Leopard","b":"1F406","j":["animal","nature"]},"horse-face":{"a":"Horse Face","b":"1F434","j":["face","horse","animal","brown","nature"]},"horse":{"a":"Horse","b":"1F40E","j":["equestrian","racehorse","racing","animal","gamble","luck"]},"unicorn":{"a":"Unicorn","b":"1F984","j":["face","animal","nature","mystical"]},"zebra":{"a":"Zebra","b":"1F993","j":["stripe","animal","nature","stripes","safari"]},"deer":{"a":"Deer","b":"1F98C","j":["animal","nature","horns","venison"]},"bison":{"a":"Bison","b":"1F9AC","j":["buffalo","herd","wisent","ox"]},"cow-face":{"a":"Cow Face","b":"1F42E","j":["cow","face","beef","ox","animal","nature","moo","milk"]},"ox":{"a":"Ox","b":"1F402","j":["bull","Taurus","zodiac","animal","cow","beef"]},"water-buffalo":{"a":"Water Buffalo","b":"1F403","j":["buffalo","water","animal","nature","ox","cow"]},"cow":{"a":"Cow","b":"1F404","j":["beef","ox","animal","nature","moo","milk"]},"pig-face":{"a":"Pig Face","b":"1F437","j":["face","pig","animal","oink","nature"]},"pig":{"a":"Pig","b":"1F416","j":["sow","animal","nature"]},"boar":{"a":"Boar","b":"1F417","j":["pig","animal","nature"]},"pig-nose":{"a":"Pig Nose","b":"1F43D","j":["face","nose","pig","animal","oink"]},"ram":{"a":"Ram","b":"1F40F","j":["Aries","male","sheep","zodiac","animal","nature"]},"ewe":{"a":"Ewe","b":"1F411","j":["female","sheep","animal","nature","wool","shipit"]},"goat":{"a":"Goat","b":"1F410","j":["Capricorn","zodiac","animal","nature"]},"camel":{"a":"Camel","b":"1F42A","j":["dromedary","hump","animal","hot","desert"]},"twohump-camel":{"a":"Two-Hump Camel","b":"1F42B","j":["bactrian","camel","hump","two-hump camel","two_hump_camel","animal","nature","hot","desert"]},"llama":{"a":"Llama","b":"1F999","j":["alpaca","guanaco","vicuña","wool","animal","nature"]},"giraffe":{"a":"Giraffe","b":"1F992","j":["spots","animal","nature","safari"]},"elephant":{"a":"Elephant","b":"1F418","j":["animal","nature","nose","th","circus"]},"mammoth":{"a":"Mammoth","b":"1F9A3","j":["extinction","large","tusk","woolly","elephant","tusks"]},"rhinoceros":{"a":"Rhinoceros","b":"1F98F","j":["animal","nature","horn"]},"hippopotamus":{"a":"Hippopotamus","b":"1F99B","j":["hippo","animal","nature"]},"mouse-face":{"a":"Mouse Face","b":"1F42D","j":["face","mouse","animal","nature","cheese_wedge","rodent"]},"mouse":{"a":"Mouse","b":"1F401","j":["animal","nature","rodent"]},"rat":{"a":"Rat","b":"1F400","j":["animal","mouse","rodent"]},"hamster":{"a":"Hamster","b":"1F439","j":["face","pet","animal","nature"]},"rabbit-face":{"a":"Rabbit Face","b":"1F430","j":["bunny","face","pet","rabbit","animal","nature","spring","magic"]},"rabbit":{"a":"Rabbit","b":"1F407","j":["bunny","pet","animal","nature","magic","spring"]},"chipmunk":{"a":"Chipmunk","b":"1F43F","j":["squirrel","animal","nature","rodent"]},"beaver":{"a":"Beaver","b":"1F9AB","j":["dam","animal","rodent"]},"hedgehog":{"a":"Hedgehog","b":"1F994","j":["spiny","animal","nature"]},"bat":{"a":"Bat","b":"1F987","j":["vampire","animal","nature","blind"]},"bear":{"a":"Bear","b":"1F43B","j":["face","animal","nature","wild"]},"polar-bear":{"a":"Polar Bear","b":"1F43B-200D-2744-FE0F","j":["arctic","bear","white","animal"]},"koala":{"a":"Koala","b":"1F428","j":["face","marsupial","animal","nature"]},"panda":{"a":"Panda","b":"1F43C","j":["face","animal","nature"]},"sloth":{"a":"Sloth","b":"1F9A5","j":["lazy","slow","animal"]},"otter":{"a":"Otter","b":"1F9A6","j":["fishing","playful","animal"]},"skunk":{"a":"Skunk","b":"1F9A8","j":["stink","animal"]},"kangaroo":{"a":"Kangaroo","b":"1F998","j":["Australia","joey","jump","marsupial","animal","nature","australia","hop"]},"badger":{"a":"Badger","b":"1F9A1","j":["honey badger","pester","animal","nature","honey"]},"paw-prints":{"a":"Paw Prints","b":"1F43E","j":["feet","paw","print","animal","tracking","footprints","dog","cat","pet"]},"turkey":{"a":"Turkey","b":"1F983","j":["bird","animal"]},"chicken":{"a":"Chicken","b":"1F414","j":["bird","animal","cluck","nature"]},"rooster":{"a":"Rooster","b":"1F413","j":["bird","animal","nature","chicken"]},"hatching-chick":{"a":"Hatching Chick","b":"1F423","j":["baby","bird","chick","hatching","animal","chicken","egg","born"]},"baby-chick":{"a":"Baby Chick","b":"1F424","j":["baby","bird","chick","animal","chicken"]},"frontfacing-baby-chick":{"a":"Front-Facing Baby Chick","b":"1F425","j":["baby","bird","chick","front-facing baby chick","front_facing_baby_chick","animal","chicken"]},"bird":{"a":"Bird","b":"1F426","j":["animal","nature","fly","tweet","spring"]},"penguin":{"a":"Penguin","b":"1F427","j":["bird","animal","nature"]},"dove":{"a":"Dove","b":"1F54A","j":["bird","fly","peace","animal"]},"eagle":{"a":"Eagle","b":"1F985","j":["bird","animal","nature"]},"duck":{"a":"Duck","b":"1F986","j":["bird","animal","nature","mallard"]},"swan":{"a":"Swan","b":"1F9A2","j":["bird","cygnet","ugly duckling","animal","nature"]},"owl":{"a":"Owl","b":"1F989","j":["bird","wise","animal","nature","hoot"]},"dodo":{"a":"Dodo","b":"1F9A4","j":["extinction","large","Mauritius","animal","bird"]},"feather":{"a":"Feather","b":"1FAB6","j":["bird","flight","light","plumage","fly"]},"flamingo":{"a":"Flamingo","b":"1F9A9","j":["flamboyant","tropical","animal"]},"peacock":{"a":"Peacock","b":"1F99A","j":["bird","ostentatious","peahen","proud","animal","nature"]},"parrot":{"a":"Parrot","b":"1F99C","j":["bird","pirate","talk","animal","nature"]},"frog":{"a":"Frog","b":"1F438","j":["face","animal","nature","croak","toad"]},"crocodile":{"a":"Crocodile","b":"1F40A","j":["animal","nature","reptile","lizard","alligator"]},"turtle":{"a":"Turtle","b":"1F422","j":["terrapin","tortoise","animal","slow","nature"]},"lizard":{"a":"Lizard","b":"1F98E","j":["reptile","animal","nature"]},"snake":{"a":"Snake","b":"1F40D","j":["bearer","Ophiuchus","serpent","zodiac","animal","evil","nature","hiss","python"]},"dragon-face":{"a":"Dragon Face","b":"1F432","j":["dragon","face","fairy tale","animal","myth","nature","chinese","green"]},"dragon":{"a":"Dragon","b":"1F409","j":["fairy tale","animal","myth","nature","chinese","green"]},"sauropod":{"a":"Sauropod","b":"1F995","j":["brachiosaurus","brontosaurus","diplodocus","animal","nature","dinosaur","extinct"]},"trex":{"a":"T-Rex","b":"1F996","j":["Tyrannosaurus Rex","t_rex","animal","nature","dinosaur","tyrannosaurus","extinct"]},"spouting-whale":{"a":"Spouting Whale","b":"1F433","j":["face","spouting","whale","animal","nature","sea","ocean"]},"whale":{"a":"Whale","b":"1F40B","j":["animal","nature","sea","ocean"]},"dolphin":{"a":"Dolphin","b":"1F42C","j":["flipper","animal","nature","fish","sea","ocean","fins","beach"]},"seal":{"a":"Seal","b":"1F9AD","j":["sea lion","animal","creature","sea"]},"fish":{"a":"Fish","b":"1F41F","j":["Pisces","zodiac","animal","food","nature"]},"tropical-fish":{"a":"Tropical Fish","b":"1F420","j":["fish","tropical","animal","swim","ocean","beach","nemo"]},"blowfish":{"a":"Blowfish","b":"1F421","j":["fish","animal","nature","food","sea","ocean"]},"shark":{"a":"Shark","b":"1F988","j":["fish","animal","nature","sea","ocean","jaws","fins","beach"]},"octopus":{"a":"Octopus","b":"1F419","j":["animal","creature","ocean","sea","nature","beach"]},"spiral-shell":{"a":"Spiral Shell","b":"1F41A","j":["shell","spiral","nature","sea","beach"]},"coral":{"a":"⊛ Coral","b":"1FAB8","j":["ocean","reef","sea"]},"snail":{"a":"Snail","b":"1F40C","j":["slow","animal","shell"]},"butterfly":{"a":"Butterfly","b":"1F98B","j":["insect","pretty","animal","nature","caterpillar"]},"bug":{"a":"Bug","b":"1F41B","j":["insect","animal","nature","worm"]},"ant":{"a":"Ant","b":"1F41C","j":["insect","animal","nature","bug"]},"honeybee":{"a":"Honeybee","b":"1F41D","j":["bee","insect","animal","nature","bug","spring","honey"]},"beetle":{"a":"Beetle","b":"1FAB2","j":["bug","insect"]},"lady-beetle":{"a":"Lady Beetle","b":"1F41E","j":["beetle","insect","ladybird","ladybug","animal","nature"]},"cricket":{"a":"Cricket","b":"1F997","j":["grasshopper","Orthoptera","animal","chirp"]},"cockroach":{"a":"Cockroach","b":"1FAB3","j":["insect","pest","roach","pests"]},"spider":{"a":"Spider","b":"1F577","j":["insect","animal","arachnid"]},"spider-web":{"a":"Spider Web","b":"1F578","j":["spider","web","animal","insect","arachnid","silk"]},"scorpion":{"a":"Scorpion","b":"1F982","j":["scorpio","Scorpio","zodiac","animal","arachnid"]},"mosquito":{"a":"Mosquito","b":"1F99F","j":["disease","fever","malaria","pest","virus","animal","nature","insect"]},"fly":{"a":"Fly","b":"1FAB0","j":["disease","maggot","pest","rotting","insect"]},"worm":{"a":"Worm","b":"1FAB1","j":["annelid","earthworm","parasite","animal"]},"microbe":{"a":"Microbe","b":"1F9A0","j":["amoeba","bacteria","virus","germs"]},"bouquet":{"a":"Bouquet","b":"1F490","j":["flower","flowers","nature","spring"]},"cherry-blossom":{"a":"Cherry Blossom","b":"1F338","j":["blossom","cherry","flower","nature","plant","spring"]},"white-flower":{"a":"White Flower","b":"1F4AE","j":["flower","japanese","spring"]},"lotus":{"a":"⊛ Lotus","b":"1FAB7","j":["Buddhism","flower","Hinduism","India","purity","Vietnam","calm","meditation"]},"rosette":{"a":"Rosette","b":"1F3F5","j":["plant","flower","decoration","military"]},"rose":{"a":"Rose","b":"1F339","j":["flower","flowers","valentines","love","spring"]},"wilted-flower":{"a":"Wilted Flower","b":"1F940","j":["flower","wilted","plant","nature"]},"hibiscus":{"a":"Hibiscus","b":"1F33A","j":["flower","plant","vegetable","flowers","beach"]},"sunflower":{"a":"Sunflower","b":"1F33B","j":["flower","sun","nature","plant","fall"]},"blossom":{"a":"Blossom","b":"1F33C","j":["flower","nature","flowers","yellow"]},"tulip":{"a":"Tulip","b":"1F337","j":["flower","flowers","plant","nature","summer","spring"]},"seedling":{"a":"Seedling","b":"1F331","j":["young","plant","nature","grass","lawn","spring"]},"potted-plant":{"a":"Potted Plant","b":"1FAB4","j":["boring","grow","house","nurturing","plant","useless","greenery"]},"evergreen-tree":{"a":"Evergreen Tree","b":"1F332","j":["tree","plant","nature"]},"deciduous-tree":{"a":"Deciduous Tree","b":"1F333","j":["deciduous","shedding","tree","plant","nature"]},"palm-tree":{"a":"Palm Tree","b":"1F334","j":["palm","tree","plant","vegetable","nature","summer","beach","mojito","tropical"]},"cactus":{"a":"Cactus","b":"1F335","j":["plant","vegetable","nature"]},"sheaf-of-rice":{"a":"Sheaf of Rice","b":"1F33E","j":["ear","grain","rice","nature","plant"]},"herb":{"a":"Herb","b":"1F33F","j":["leaf","vegetable","plant","medicine","weed","grass","lawn"]},"shamrock":{"a":"Shamrock","b":"2618","j":["plant","vegetable","nature","irish","clover"]},"four-leaf-clover":{"a":"Four Leaf Clover","b":"1F340","j":["4","clover","four","four-leaf clover","leaf","vegetable","plant","nature","lucky","irish"]},"maple-leaf":{"a":"Maple Leaf","b":"1F341","j":["falling","leaf","maple","nature","plant","vegetable","ca","fall"]},"fallen-leaf":{"a":"Fallen Leaf","b":"1F342","j":["falling","leaf","nature","plant","vegetable","leaves"]},"leaf-fluttering-in-wind":{"a":"Leaf Fluttering in Wind","b":"1F343","j":["blow","flutter","leaf","wind","nature","plant","tree","vegetable","grass","lawn","spring"]},"empty-nest":{"a":"⊛ Empty Nest","b":"1FAB9","j":["nesting","bird"]},"nest-with-eggs":{"a":"⊛ Nest with Eggs","b":"1FABA","j":["nesting","bird"]},"grapes":{"a":"Grapes","b":"1F347","j":["fruit","grape","food","wine"]},"melon":{"a":"Melon","b":"1F348","j":["fruit","nature","food"]},"watermelon":{"a":"Watermelon","b":"1F349","j":["fruit","food","picnic","summer"]},"tangerine":{"a":"Tangerine","b":"1F34A","j":["fruit","orange","food","nature"]},"lemon":{"a":"Lemon","b":"1F34B","j":["citrus","fruit","nature"]},"banana":{"a":"Banana","b":"1F34C","j":["fruit","food","monkey"]},"pineapple":{"a":"Pineapple","b":"1F34D","j":["fruit","nature","food"]},"mango":{"a":"Mango","b":"1F96D","j":["fruit","tropical","food"]},"red-apple":{"a":"Red Apple","b":"1F34E","j":["apple","fruit","red","mac","school"]},"green-apple":{"a":"Green Apple","b":"1F34F","j":["apple","fruit","green","nature"]},"pear":{"a":"Pear","b":"1F350","j":["fruit","nature","food"]},"peach":{"a":"Peach","b":"1F351","j":["fruit","nature","food"]},"cherries":{"a":"Cherries","b":"1F352","j":["berries","cherry","fruit","red","food"]},"strawberry":{"a":"Strawberry","b":"1F353","j":["berry","fruit","food","nature"]},"blueberries":{"a":"Blueberries","b":"1FAD0","j":["berry","bilberry","blue","blueberry","fruit"]},"kiwi-fruit":{"a":"Kiwi Fruit","b":"1F95D","j":["food","fruit","kiwi"]},"tomato":{"a":"Tomato","b":"1F345","j":["fruit","vegetable","nature","food"]},"olive":{"a":"Olive","b":"1FAD2","j":["food","fruit"]},"coconut":{"a":"Coconut","b":"1F965","j":["palm","piña colada","fruit","nature","food"]},"avocado":{"a":"Avocado","b":"1F951","j":["food","fruit"]},"eggplant":{"a":"Eggplant","b":"1F346","j":["aubergine","vegetable","nature","food"]},"potato":{"a":"Potato","b":"1F954","j":["food","vegetable","tuber","vegatable","starch"]},"carrot":{"a":"Carrot","b":"1F955","j":["food","vegetable","orange"]},"ear-of-corn":{"a":"Ear of Corn","b":"1F33D","j":["corn","ear","maize","maze","food","vegetable","plant"]},"hot-pepper":{"a":"Hot Pepper","b":"1F336","j":["hot","pepper","food","spicy","chilli","chili"]},"bell-pepper":{"a":"Bell Pepper","b":"1FAD1","j":["capsicum","pepper","vegetable","fruit","plant"]},"cucumber":{"a":"Cucumber","b":"1F952","j":["food","pickle","vegetable","fruit"]},"leafy-green":{"a":"Leafy Green","b":"1F96C","j":["bok choy","cabbage","kale","lettuce","food","vegetable","plant"]},"broccoli":{"a":"Broccoli","b":"1F966","j":["wild cabbage","fruit","food","vegetable"]},"garlic":{"a":"Garlic","b":"1F9C4","j":["flavoring","food","spice","cook"]},"onion":{"a":"Onion","b":"1F9C5","j":["flavoring","cook","food","spice"]},"mushroom":{"a":"Mushroom","b":"1F344","j":["toadstool","plant","vegetable"]},"peanuts":{"a":"Peanuts","b":"1F95C","j":["food","nut","peanut","vegetable"]},"beans":{"a":"⊛ Beans","b":"1FAD8","j":["food","kidney","legume"]},"chestnut":{"a":"Chestnut","b":"1F330","j":["plant","food","squirrel"]},"bread":{"a":"Bread","b":"1F35E","j":["loaf","food","wheat","breakfast","toast"]},"croissant":{"a":"Croissant","b":"1F950","j":["bread","breakfast","food","french","roll"]},"baguette-bread":{"a":"Baguette Bread","b":"1F956","j":["baguette","bread","food","french"]},"flatbread":{"a":"Flatbread","b":"1FAD3","j":["arepa","lavash","naan","pita","flour","food"]},"pretzel":{"a":"Pretzel","b":"1F968","j":["twisted","convoluted","food","bread"]},"bagel":{"a":"Bagel","b":"1F96F","j":["bakery","breakfast","schmear","food","bread"]},"pancakes":{"a":"Pancakes","b":"1F95E","j":["breakfast","crêpe","food","hotcake","pancake","flapjacks","hotcakes"]},"waffle":{"a":"Waffle","b":"1F9C7","j":["breakfast","indecisive","iron","food"]},"cheese-wedge":{"a":"Cheese Wedge","b":"1F9C0","j":["cheese","food","chadder"]},"meat-on-bone":{"a":"Meat on Bone","b":"1F356","j":["bone","meat","good","food","drumstick"]},"poultry-leg":{"a":"Poultry Leg","b":"1F357","j":["bone","chicken","drumstick","leg","poultry","food","meat","bird","turkey"]},"cut-of-meat":{"a":"Cut of Meat","b":"1F969","j":["chop","lambchop","porkchop","steak","food","cow","meat","cut"]},"bacon":{"a":"Bacon","b":"1F953","j":["breakfast","food","meat","pork","pig"]},"hamburger":{"a":"Hamburger","b":"1F354","j":["burger","meat","fast food","beef","cheeseburger","mcdonalds","burger king"]},"french-fries":{"a":"French Fries","b":"1F35F","j":["french","fries","chips","snack","fast food"]},"pizza":{"a":"Pizza","b":"1F355","j":["cheese","slice","food","party"]},"hot-dog":{"a":"Hot Dog","b":"1F32D","j":["frankfurter","hotdog","sausage","food"]},"sandwich":{"a":"Sandwich","b":"1F96A","j":["bread","food","lunch"]},"taco":{"a":"Taco","b":"1F32E","j":["mexican","food"]},"burrito":{"a":"Burrito","b":"1F32F","j":["mexican","wrap","food"]},"tamale":{"a":"Tamale","b":"1FAD4","j":["mexican","wrapped","food","masa"]},"stuffed-flatbread":{"a":"Stuffed Flatbread","b":"1F959","j":["falafel","flatbread","food","gyro","kebab","stuffed"]},"falafel":{"a":"Falafel","b":"1F9C6","j":["chickpea","meatball","food"]},"egg":{"a":"Egg","b":"1F95A","j":["breakfast","food","chicken"]},"cooking":{"a":"Cooking","b":"1F373","j":["breakfast","egg","frying","pan","food","kitchen"]},"shallow-pan-of-food":{"a":"Shallow Pan of Food","b":"1F958","j":["casserole","food","paella","pan","shallow","cooking"]},"pot-of-food":{"a":"Pot of Food","b":"1F372","j":["pot","stew","food","meat","soup"]},"fondue":{"a":"Fondue","b":"1FAD5","j":["cheese","chocolate","melted","pot","Swiss","food"]},"bowl-with-spoon":{"a":"Bowl with Spoon","b":"1F963","j":["breakfast","cereal","congee","oatmeal","porridge","food"]},"green-salad":{"a":"Green Salad","b":"1F957","j":["food","green","salad","healthy","lettuce"]},"popcorn":{"a":"Popcorn","b":"1F37F","j":["food","movie theater","films","snack"]},"butter":{"a":"Butter","b":"1F9C8","j":["dairy","food","cook"]},"salt":{"a":"Salt","b":"1F9C2","j":["condiment","shaker"]},"canned-food":{"a":"Canned Food","b":"1F96B","j":["can","food","soup"]},"bento-box":{"a":"Bento Box","b":"1F371","j":["bento","box","food","japanese"]},"rice-cracker":{"a":"Rice Cracker","b":"1F358","j":["cracker","rice","food","japanese"]},"rice-ball":{"a":"Rice Ball","b":"1F359","j":["ball","Japanese","rice","food","japanese"]},"cooked-rice":{"a":"Cooked Rice","b":"1F35A","j":["cooked","rice","food","china","asian"]},"curry-rice":{"a":"Curry Rice","b":"1F35B","j":["curry","rice","food","spicy","hot","indian"]},"steaming-bowl":{"a":"Steaming Bowl","b":"1F35C","j":["bowl","noodle","ramen","steaming","food","japanese","chopsticks"]},"spaghetti":{"a":"Spaghetti","b":"1F35D","j":["pasta","food","italian","noodle"]},"roasted-sweet-potato":{"a":"Roasted Sweet Potato","b":"1F360","j":["potato","roasted","sweet","food","nature"]},"oden":{"a":"Oden","b":"1F362","j":["kebab","seafood","skewer","stick","food","japanese"]},"sushi":{"a":"Sushi","b":"1F363","j":["food","fish","japanese","rice"]},"fried-shrimp":{"a":"Fried Shrimp","b":"1F364","j":["fried","prawn","shrimp","tempura","food","animal","appetizer","summer"]},"fish-cake-with-swirl":{"a":"Fish Cake with Swirl","b":"1F365","j":["cake","fish","pastry","swirl","food","japan","sea","beach","narutomaki","pink","kamaboko","surimi","ramen"]},"moon-cake":{"a":"Moon Cake","b":"1F96E","j":["autumn","festival","yuèbǐng","food"]},"dango":{"a":"Dango","b":"1F361","j":["dessert","Japanese","skewer","stick","sweet","food","japanese","barbecue","meat"]},"dumpling":{"a":"Dumpling","b":"1F95F","j":["empanada","gyōza","jiaozi","pierogi","potsticker","food"]},"fortune-cookie":{"a":"Fortune Cookie","b":"1F960","j":["prophecy","food"]},"takeout-box":{"a":"Takeout Box","b":"1F961","j":["oyster pail","food","leftovers"]},"crab":{"a":"Crab","b":"1F980","j":["Cancer","zodiac","animal","crustacean"]},"lobster":{"a":"Lobster","b":"1F99E","j":["bisque","claws","seafood","animal","nature"]},"shrimp":{"a":"Shrimp","b":"1F990","j":["food","shellfish","small","animal","ocean","nature","seafood"]},"squid":{"a":"Squid","b":"1F991","j":["food","molusc","animal","nature","ocean","sea"]},"oyster":{"a":"Oyster","b":"1F9AA","j":["diving","pearl","food"]},"soft-ice-cream":{"a":"Soft Ice Cream","b":"1F366","j":["cream","dessert","ice","icecream","soft","sweet","food","hot","summer"]},"shaved-ice":{"a":"Shaved Ice","b":"1F367","j":["dessert","ice","shaved","sweet","hot","summer"]},"ice-cream":{"a":"Ice Cream","b":"1F368","j":["cream","dessert","ice","sweet","food","hot"]},"doughnut":{"a":"Doughnut","b":"1F369","j":["breakfast","dessert","donut","sweet","food","snack"]},"cookie":{"a":"Cookie","b":"1F36A","j":["dessert","sweet","food","snack","oreo","chocolate"]},"birthday-cake":{"a":"Birthday Cake","b":"1F382","j":["birthday","cake","celebration","dessert","pastry","sweet","food"]},"shortcake":{"a":"Shortcake","b":"1F370","j":["cake","dessert","pastry","slice","sweet","food"]},"cupcake":{"a":"Cupcake","b":"1F9C1","j":["bakery","sweet","food","dessert"]},"pie":{"a":"Pie","b":"1F967","j":["filling","pastry","fruit","meat","food","dessert"]},"chocolate-bar":{"a":"Chocolate Bar","b":"1F36B","j":["bar","chocolate","dessert","sweet","food","snack"]},"candy":{"a":"Candy","b":"1F36C","j":["dessert","sweet","snack","lolly"]},"lollipop":{"a":"Lollipop","b":"1F36D","j":["candy","dessert","sweet","food","snack"]},"custard":{"a":"Custard","b":"1F36E","j":["dessert","pudding","sweet","food"]},"honey-pot":{"a":"Honey Pot","b":"1F36F","j":["honey","honeypot","pot","sweet","bees","kitchen"]},"baby-bottle":{"a":"Baby Bottle","b":"1F37C","j":["baby","bottle","drink","milk","food","container"]},"glass-of-milk":{"a":"Glass of Milk","b":"1F95B","j":["drink","glass","milk","beverage","cow"]},"hot-beverage":{"a":"Hot Beverage","b":"2615","j":["beverage","coffee","drink","hot","steaming","tea","caffeine","latte","espresso"]},"teapot":{"a":"Teapot","b":"1FAD6","j":["drink","pot","tea","hot"]},"teacup-without-handle":{"a":"Teacup Without Handle","b":"1F375","j":["beverage","cup","drink","tea","teacup","bowl","breakfast","green","british"]},"sake":{"a":"Sake","b":"1F376","j":["bar","beverage","bottle","cup","drink","wine","drunk","japanese","alcohol","booze"]},"bottle-with-popping-cork":{"a":"Bottle with Popping Cork","b":"1F37E","j":["bar","bottle","cork","drink","popping","wine","celebration"]},"wine-glass":{"a":"Wine Glass","b":"1F377","j":["bar","beverage","drink","glass","wine","drunk","alcohol","booze"]},"cocktail-glass":{"a":"Cocktail Glass","b":"1F378","j":["bar","cocktail","drink","glass","drunk","alcohol","beverage","booze","mojito"]},"tropical-drink":{"a":"Tropical Drink","b":"1F379","j":["bar","drink","tropical","beverage","cocktail","summer","beach","alcohol","booze","mojito"]},"beer-mug":{"a":"Beer Mug","b":"1F37A","j":["bar","beer","drink","mug","relax","beverage","drunk","party","pub","summer","alcohol","booze"]},"clinking-beer-mugs":{"a":"Clinking Beer Mugs","b":"1F37B","j":["bar","beer","clink","drink","mug","relax","beverage","drunk","party","pub","summer","alcohol","booze"]},"clinking-glasses":{"a":"Clinking Glasses","b":"1F942","j":["celebrate","clink","drink","glass","beverage","party","alcohol","cheers","wine","champagne","toast"]},"tumbler-glass":{"a":"Tumbler Glass","b":"1F943","j":["glass","liquor","shot","tumbler","whisky","drink","beverage","drunk","alcohol","booze","bourbon","scotch"]},"pouring-liquid":{"a":"⊛ Pouring Liquid","b":"1FAD7","j":["drink","empty","glass","spill","cup","water"]},"cup-with-straw":{"a":"Cup with Straw","b":"1F964","j":["juice","soda","malt","soft drink","water","drink"]},"bubble-tea":{"a":"Bubble Tea","b":"1F9CB","j":["bubble","milk","pearl","tea","taiwan","boba","milk tea","straw"]},"beverage-box":{"a":"Beverage Box","b":"1F9C3","j":["beverage","box","juice","straw","sweet","drink"]},"mate":{"a":"Mate","b":"1F9C9","j":["drink","tea","beverage"]},"ice":{"a":"Ice","b":"1F9CA","j":["cold","ice cube","iceberg","water"]},"chopsticks":{"a":"Chopsticks","b":"1F962","j":["hashi","jeotgarak","kuaizi","food"]},"fork-and-knife-with-plate":{"a":"Fork and Knife with Plate","b":"1F37D","j":["cooking","fork","knife","plate","food","eat","meal","lunch","dinner","restaurant"]},"fork-and-knife":{"a":"Fork and Knife","b":"1F374","j":["cooking","cutlery","fork","knife","kitchen"]},"spoon":{"a":"Spoon","b":"1F944","j":["tableware","cutlery","kitchen"]},"kitchen-knife":{"a":"Kitchen Knife","b":"1F52A","j":["cooking","hocho","knife","tool","weapon","blade","cutlery","kitchen"]},"jar":{"a":"⊛ Jar","b":"1FAD9","j":["condiment","container","empty","sauce","store"]},"amphora":{"a":"Amphora","b":"1F3FA","j":["Aquarius","cooking","drink","jug","zodiac","vase","jar"]},"globe-showing-europeafrica":{"a":"Globe Showing Europe-Africa","b":"1F30D","j":["Africa","earth","Europe","globe","globe showing Europe-Africa","world","globe_showing_europe_africa","international"]},"globe-showing-americas":{"a":"Globe Showing Americas","b":"1F30E","j":["Americas","earth","globe","globe showing Americas","world","USA","international"]},"globe-showing-asiaaustralia":{"a":"Globe Showing Asia-Australia","b":"1F30F","j":["Asia","Australia","earth","globe","globe showing Asia-Australia","world","globe_showing_asia_australia","east","international"]},"globe-with-meridians":{"a":"Globe with Meridians","b":"1F310","j":["earth","globe","meridians","world","international","internet","interweb","i18n"]},"world-map":{"a":"World Map","b":"1F5FA","j":["map","world","location","direction"]},"map-of-japan":{"a":"Map of Japan","b":"1F5FE","j":["Japan","map","map of Japan","nation","country","japanese","asia"]},"compass":{"a":"Compass","b":"1F9ED","j":["magnetic","navigation","orienteering"]},"snowcapped-mountain":{"a":"Snow-Capped Mountain","b":"1F3D4","j":["cold","mountain","snow","snow-capped mountain","snow_capped_mountain","photo","nature","environment","winter"]},"mountain":{"a":"Mountain","b":"26F0","j":["photo","nature","environment"]},"volcano":{"a":"Volcano","b":"1F30B","j":["eruption","mountain","photo","nature","disaster"]},"mount-fuji":{"a":"Mount Fuji","b":"1F5FB","j":["fuji","mountain","photo","nature","japanese"]},"camping":{"a":"Camping","b":"1F3D5","j":["photo","outdoors","tent"]},"beach-with-umbrella":{"a":"Beach with Umbrella","b":"1F3D6","j":["beach","umbrella","weather","summer","sunny","sand","mojito"]},"desert":{"a":"Desert","b":"1F3DC","j":["photo","warm","saharah"]},"desert-island":{"a":"Desert Island","b":"1F3DD","j":["desert","island","photo","tropical","mojito"]},"national-park":{"a":"National Park","b":"1F3DE","j":["park","photo","environment","nature"]},"stadium":{"a":"Stadium","b":"1F3DF","j":["photo","place","sports","concert","venue"]},"classical-building":{"a":"Classical Building","b":"1F3DB","j":["classical","art","culture","history"]},"building-construction":{"a":"Building Construction","b":"1F3D7","j":["construction","wip","working","progress"]},"brick":{"a":"Brick","b":"1F9F1","j":["bricks","clay","mortar","wall"]},"rock":{"a":"Rock","b":"1FAA8","j":["boulder","heavy","solid","stone"]},"wood":{"a":"Wood","b":"1FAB5","j":["log","lumber","timber","nature","trunk"]},"hut":{"a":"Hut","b":"1F6D6","j":["house","roundhouse","yurt","structure"]},"houses":{"a":"Houses","b":"1F3D8","j":["buildings","photo"]},"derelict-house":{"a":"Derelict House","b":"1F3DA","j":["derelict","house","abandon","evict","broken","building"]},"house":{"a":"House","b":"1F3E0","j":["home","building"]},"house-with-garden":{"a":"House with Garden","b":"1F3E1","j":["garden","home","house","plant","nature"]},"office-building":{"a":"Office Building","b":"1F3E2","j":["building","bureau","work"]},"japanese-post-office":{"a":"Japanese Post Office","b":"1F3E3","j":["Japanese","Japanese post office","post","building","envelope","communication"]},"post-office":{"a":"Post Office","b":"1F3E4","j":["European","post","building","email"]},"hospital":{"a":"Hospital","b":"1F3E5","j":["doctor","medicine","building","health","surgery"]},"bank":{"a":"Bank","b":"1F3E6","j":["building","money","sales","cash","business","enterprise"]},"hotel":{"a":"Hotel","b":"1F3E8","j":["building","accomodation","checkin"]},"love-hotel":{"a":"Love Hotel","b":"1F3E9","j":["hotel","love","like","affection","dating"]},"convenience-store":{"a":"Convenience Store","b":"1F3EA","j":["convenience","store","building","shopping","groceries"]},"school":{"a":"School","b":"1F3EB","j":["building","student","education","learn","teach"]},"department-store":{"a":"Department Store","b":"1F3EC","j":["department","store","building","shopping","mall"]},"factory":{"a":"Factory","b":"1F3ED","j":["building","industry","pollution","smoke"]},"japanese-castle":{"a":"Japanese Castle","b":"1F3EF","j":["castle","Japanese","photo","building"]},"castle":{"a":"Castle","b":"1F3F0","j":["European","building","royalty","history"]},"wedding":{"a":"Wedding","b":"1F492","j":["chapel","romance","love","like","affection","couple","marriage","bride","groom"]},"tokyo-tower":{"a":"Tokyo Tower","b":"1F5FC","j":["Tokyo","tower","photo","japanese"]},"statue-of-liberty":{"a":"Statue of Liberty","b":"1F5FD","j":["liberty","statue","american","newyork"]},"church":{"a":"Church","b":"26EA","j":["Christian","cross","religion","building","christ"]},"mosque":{"a":"Mosque","b":"1F54C","j":["islam","Muslim","religion","worship","minaret"]},"hindu-temple":{"a":"Hindu Temple","b":"1F6D5","j":["hindu","temple","religion"]},"synagogue":{"a":"Synagogue","b":"1F54D","j":["Jew","Jewish","religion","temple","judaism","worship","jewish"]},"shinto-shrine":{"a":"Shinto Shrine","b":"26E9","j":["religion","shinto","shrine","temple","japan","kyoto"]},"kaaba":{"a":"Kaaba","b":"1F54B","j":["islam","Muslim","religion","mecca","mosque"]},"fountain":{"a":"Fountain","b":"26F2","j":["photo","summer","water","fresh"]},"tent":{"a":"Tent","b":"26FA","j":["camping","photo","outdoors"]},"foggy":{"a":"Foggy","b":"1F301","j":["fog","photo","mountain"]},"night-with-stars":{"a":"Night with Stars","b":"1F303","j":["night","star","evening","city","downtown"]},"cityscape":{"a":"Cityscape","b":"1F3D9","j":["city","photo","night life","urban"]},"sunrise-over-mountains":{"a":"Sunrise over Mountains","b":"1F304","j":["morning","mountain","sun","sunrise","view","vacation","photo"]},"sunrise":{"a":"Sunrise","b":"1F305","j":["morning","sun","view","vacation","photo"]},"cityscape-at-dusk":{"a":"Cityscape at Dusk","b":"1F306","j":["city","dusk","evening","landscape","sunset","photo","sky","buildings"]},"sunset":{"a":"Sunset","b":"1F307","j":["dusk","sun","photo","good morning","dawn"]},"bridge-at-night":{"a":"Bridge at Night","b":"1F309","j":["bridge","night","photo","sanfrancisco"]},"hot-springs":{"a":"Hot Springs","b":"2668","j":["hot","hotsprings","springs","steaming","bath","warm","relax"]},"carousel-horse":{"a":"Carousel Horse","b":"1F3A0","j":["carousel","horse","photo","carnival"]},"playground-slide":{"a":"⊛ Playground Slide","b":"1F6DD","j":["amusement park","play","fun","park"]},"ferris-wheel":{"a":"Ferris Wheel","b":"1F3A1","j":["amusement park","ferris","wheel","photo","carnival","londoneye"]},"roller-coaster":{"a":"Roller Coaster","b":"1F3A2","j":["amusement park","coaster","roller","carnival","playground","photo","fun"]},"barber-pole":{"a":"Barber Pole","b":"1F488","j":["barber","haircut","pole","hair","salon","style"]},"circus-tent":{"a":"Circus Tent","b":"1F3AA","j":["circus","tent","festival","carnival","party"]},"locomotive":{"a":"Locomotive","b":"1F682","j":["engine","railway","steam","train","transportation","vehicle"]},"railway-car":{"a":"Railway Car","b":"1F683","j":["car","electric","railway","train","tram","trolleybus","transportation","vehicle"]},"highspeed-train":{"a":"High-Speed Train","b":"1F684","j":["high-speed train","railway","shinkansen","speed","train","high_speed_train","transportation","vehicle"]},"bullet-train":{"a":"Bullet Train","b":"1F685","j":["bullet","railway","shinkansen","speed","train","transportation","vehicle","fast","public","travel"]},"train":{"a":"Train","b":"1F686","j":["railway","transportation","vehicle"]},"metro":{"a":"Metro","b":"1F687","j":["subway","transportation","blue-square","mrt","underground","tube"]},"light-rail":{"a":"Light Rail","b":"1F688","j":["railway","transportation","vehicle"]},"station":{"a":"Station","b":"1F689","j":["railway","train","transportation","vehicle","public"]},"tram":{"a":"Tram","b":"1F68A","j":["trolleybus","transportation","vehicle"]},"monorail":{"a":"Monorail","b":"1F69D","j":["vehicle","transportation"]},"mountain-railway":{"a":"Mountain Railway","b":"1F69E","j":["car","mountain","railway","transportation","vehicle"]},"tram-car":{"a":"Tram Car","b":"1F68B","j":["car","tram","trolleybus","transportation","vehicle","carriage","public","travel"]},"bus":{"a":"Bus","b":"1F68C","j":["vehicle","car","transportation"]},"oncoming-bus":{"a":"Oncoming Bus","b":"1F68D","j":["bus","oncoming","vehicle","transportation"]},"trolleybus":{"a":"Trolleybus","b":"1F68E","j":["bus","tram","trolley","bart","transportation","vehicle"]},"minibus":{"a":"Minibus","b":"1F690","j":["bus","vehicle","car","transportation"]},"ambulance":{"a":"Ambulance","b":"1F691","j":["vehicle","health","911","hospital"]},"fire-engine":{"a":"Fire Engine","b":"1F692","j":["engine","fire","truck","transportation","cars","vehicle"]},"police-car":{"a":"Police Car","b":"1F693","j":["car","patrol","police","vehicle","cars","transportation","law","legal","enforcement"]},"oncoming-police-car":{"a":"Oncoming Police Car","b":"1F694","j":["car","oncoming","police","vehicle","law","legal","enforcement","911"]},"taxi":{"a":"Taxi","b":"1F695","j":["vehicle","uber","cars","transportation"]},"oncoming-taxi":{"a":"Oncoming Taxi","b":"1F696","j":["oncoming","taxi","vehicle","cars","uber"]},"automobile":{"a":"Automobile","b":"1F697","j":["car","red","transportation","vehicle"]},"oncoming-automobile":{"a":"Oncoming Automobile","b":"1F698","j":["automobile","car","oncoming","vehicle","transportation"]},"sport-utility-vehicle":{"a":"Sport Utility Vehicle","b":"1F699","j":["recreational","sport utility","transportation","vehicle"]},"pickup-truck":{"a":"Pickup Truck","b":"1F6FB","j":["pick-up","pickup","truck","car","transportation"]},"delivery-truck":{"a":"Delivery Truck","b":"1F69A","j":["delivery","truck","cars","transportation"]},"articulated-lorry":{"a":"Articulated Lorry","b":"1F69B","j":["lorry","semi","truck","vehicle","cars","transportation","express"]},"tractor":{"a":"Tractor","b":"1F69C","j":["vehicle","car","farming","agriculture"]},"racing-car":{"a":"Racing Car","b":"1F3CE","j":["car","racing","sports","race","fast","formula","f1"]},"motorcycle":{"a":"Motorcycle","b":"1F3CD","j":["racing","race","sports","fast"]},"motor-scooter":{"a":"Motor Scooter","b":"1F6F5","j":["motor","scooter","vehicle","vespa","sasha"]},"manual-wheelchair":{"a":"Manual Wheelchair","b":"1F9BD","j":["accessibility"]},"motorized-wheelchair":{"a":"Motorized Wheelchair","b":"1F9BC","j":["accessibility"]},"auto-rickshaw":{"a":"Auto Rickshaw","b":"1F6FA","j":["tuk tuk","move","transportation"]},"bicycle":{"a":"Bicycle","b":"1F6B2","j":["bike","sports","exercise","hipster"]},"kick-scooter":{"a":"Kick Scooter","b":"1F6F4","j":["kick","scooter","vehicle","razor"]},"skateboard":{"a":"Skateboard","b":"1F6F9","j":["board"]},"roller-skate":{"a":"Roller Skate","b":"1F6FC","j":["roller","skate","footwear","sports"]},"bus-stop":{"a":"Bus Stop","b":"1F68F","j":["bus","stop","transportation","wait"]},"motorway":{"a":"Motorway","b":"1F6E3","j":["highway","road","cupertino","interstate"]},"railway-track":{"a":"Railway Track","b":"1F6E4","j":["railway","train","transportation"]},"oil-drum":{"a":"Oil Drum","b":"1F6E2","j":["drum","oil","barrell"]},"fuel-pump":{"a":"Fuel Pump","b":"26FD","j":["diesel","fuel","fuelpump","gas","pump","station","gas station","petroleum"]},"wheel":{"a":"⊛ Wheel","b":"1F6DE","j":["circle","tire","turn","car","transport"]},"police-car-light":{"a":"Police Car Light","b":"1F6A8","j":["beacon","car","light","police","revolving","ambulance","911","emergency","alert","error","pinged","law","legal"]},"horizontal-traffic-light":{"a":"Horizontal Traffic Light","b":"1F6A5","j":["light","signal","traffic","transportation"]},"vertical-traffic-light":{"a":"Vertical Traffic Light","b":"1F6A6","j":["light","signal","traffic","transportation","driving"]},"stop-sign":{"a":"Stop Sign","b":"1F6D1","j":["octagonal","sign","stop"]},"construction":{"a":"Construction","b":"1F6A7","j":["barrier","wip","progress","caution","warning"]},"anchor":{"a":"Anchor","b":"2693","j":["ship","tool","ferry","sea","boat"]},"ring-buoy":{"a":"⊛ Ring Buoy","b":"1F6DF","j":["float","life preserver","life saver","rescue","safety"]},"sailboat":{"a":"Sailboat","b":"26F5","j":["boat","resort","sea","yacht","ship","summer","transportation","water","sailing"]},"canoe":{"a":"Canoe","b":"1F6F6","j":["boat","paddle","water","ship"]},"speedboat":{"a":"Speedboat","b":"1F6A4","j":["boat","ship","transportation","vehicle","summer"]},"passenger-ship":{"a":"Passenger Ship","b":"1F6F3","j":["passenger","ship","yacht","cruise","ferry"]},"ferry":{"a":"Ferry","b":"26F4","j":["boat","passenger","ship","yacht"]},"motor-boat":{"a":"Motor Boat","b":"1F6E5","j":["boat","motorboat","ship"]},"ship":{"a":"Ship","b":"1F6A2","j":["boat","passenger","transportation","titanic","deploy"]},"airplane":{"a":"Airplane","b":"2708","j":["aeroplane","vehicle","transportation","flight","fly"]},"small-airplane":{"a":"Small Airplane","b":"1F6E9","j":["aeroplane","airplane","flight","transportation","fly","vehicle"]},"airplane-departure":{"a":"Airplane Departure","b":"1F6EB","j":["aeroplane","airplane","check-in","departure","departures","airport","flight","landing"]},"airplane-arrival":{"a":"Airplane Arrival","b":"1F6EC","j":["aeroplane","airplane","arrivals","arriving","landing","airport","flight","boarding"]},"parachute":{"a":"Parachute","b":"1FA82","j":["hang-glide","parasail","skydive","fly","glide"]},"seat":{"a":"Seat","b":"1F4BA","j":["chair","sit","airplane","transport","bus","flight","fly"]},"helicopter":{"a":"Helicopter","b":"1F681","j":["vehicle","transportation","fly"]},"suspension-railway":{"a":"Suspension Railway","b":"1F69F","j":["railway","suspension","vehicle","transportation"]},"mountain-cableway":{"a":"Mountain Cableway","b":"1F6A0","j":["cable","gondola","mountain","transportation","vehicle","ski"]},"aerial-tramway":{"a":"Aerial Tramway","b":"1F6A1","j":["aerial","cable","car","gondola","tramway","transportation","vehicle","ski"]},"satellite":{"a":"Satellite","b":"1F6F0","j":["space","communication","gps","orbit","spaceflight","NASA","ISS"]},"rocket":{"a":"Rocket","b":"1F680","j":["space","launch","ship","staffmode","NASA","outer space","outer_space","fly"]},"flying-saucer":{"a":"Flying Saucer","b":"1F6F8","j":["UFO","transportation","vehicle","ufo"]},"bellhop-bell":{"a":"Bellhop Bell","b":"1F6CE","j":["bell","bellhop","hotel","service"]},"luggage":{"a":"Luggage","b":"1F9F3","j":["packing","travel"]},"hourglass-done":{"a":"Hourglass Done","b":"231B","j":["sand","timer","time","clock","oldschool","limit","exam","quiz","test"]},"hourglass-not-done":{"a":"Hourglass Not Done","b":"23F3","j":["hourglass","sand","timer","oldschool","time","countdown"]},"watch":{"a":"Watch","b":"231A","j":["clock","time","accessories"]},"alarm-clock":{"a":"Alarm Clock","b":"23F0","j":["alarm","clock","time","wake"]},"stopwatch":{"a":"Stopwatch","b":"23F1","j":["clock","time","deadline"]},"timer-clock":{"a":"Timer Clock","b":"23F2","j":["clock","timer","alarm"]},"mantelpiece-clock":{"a":"Mantelpiece Clock","b":"1F570","j":["clock","time"]},"twelve-oclock":{"a":"Twelve O’Clock","b":"1F55B","j":["00","12","12:00","clock","o’clock","twelve","twelve_o_clock","time","noon","midnight","midday","late","early","schedule"]},"twelvethirty":{"a":"Twelve-Thirty","b":"1F567","j":["12","12:30","clock","thirty","twelve","twelve-thirty","twelve_thirty","time","late","early","schedule"]},"one-oclock":{"a":"One O’Clock","b":"1F550","j":["00","1","1:00","clock","o’clock","one","one_o_clock","time","late","early","schedule"]},"onethirty":{"a":"One-Thirty","b":"1F55C","j":["1","1:30","clock","one","one-thirty","thirty","one_thirty","time","late","early","schedule"]},"two-oclock":{"a":"Two O’Clock","b":"1F551","j":["00","2","2:00","clock","o’clock","two","two_o_clock","time","late","early","schedule"]},"twothirty":{"a":"Two-Thirty","b":"1F55D","j":["2","2:30","clock","thirty","two","two-thirty","two_thirty","time","late","early","schedule"]},"three-oclock":{"a":"Three O’Clock","b":"1F552","j":["00","3","3:00","clock","o’clock","three","three_o_clock","time","late","early","schedule"]},"threethirty":{"a":"Three-Thirty","b":"1F55E","j":["3","3:30","clock","thirty","three","three-thirty","three_thirty","time","late","early","schedule"]},"four-oclock":{"a":"Four O’Clock","b":"1F553","j":["00","4","4:00","clock","four","o’clock","four_o_clock","time","late","early","schedule"]},"fourthirty":{"a":"Four-Thirty","b":"1F55F","j":["4","4:30","clock","four","four-thirty","thirty","four_thirty","time","late","early","schedule"]},"five-oclock":{"a":"Five O’Clock","b":"1F554","j":["00","5","5:00","clock","five","o’clock","five_o_clock","time","late","early","schedule"]},"fivethirty":{"a":"Five-Thirty","b":"1F560","j":["5","5:30","clock","five","five-thirty","thirty","five_thirty","time","late","early","schedule"]},"six-oclock":{"a":"Six O’Clock","b":"1F555","j":["00","6","6:00","clock","o’clock","six","six_o_clock","time","late","early","schedule","dawn","dusk"]},"sixthirty":{"a":"Six-Thirty","b":"1F561","j":["6","6:30","clock","six","six-thirty","thirty","six_thirty","time","late","early","schedule"]},"seven-oclock":{"a":"Seven O’Clock","b":"1F556","j":["00","7","7:00","clock","o’clock","seven","seven_o_clock","time","late","early","schedule"]},"seventhirty":{"a":"Seven-Thirty","b":"1F562","j":["7","7:30","clock","seven","seven-thirty","thirty","seven_thirty","time","late","early","schedule"]},"eight-oclock":{"a":"Eight O’Clock","b":"1F557","j":["00","8","8:00","clock","eight","o’clock","eight_o_clock","time","late","early","schedule"]},"eightthirty":{"a":"Eight-Thirty","b":"1F563","j":["8","8:30","clock","eight","eight-thirty","thirty","eight_thirty","time","late","early","schedule"]},"nine-oclock":{"a":"Nine O’Clock","b":"1F558","j":["00","9","9:00","clock","nine","o’clock","nine_o_clock","time","late","early","schedule"]},"ninethirty":{"a":"Nine-Thirty","b":"1F564","j":["9","9:30","clock","nine","nine-thirty","thirty","nine_thirty","time","late","early","schedule"]},"ten-oclock":{"a":"Ten O’Clock","b":"1F559","j":["00","10","10:00","clock","o’clock","ten","ten_o_clock","time","late","early","schedule"]},"tenthirty":{"a":"Ten-Thirty","b":"1F565","j":["10","10:30","clock","ten","ten-thirty","thirty","ten_thirty","time","late","early","schedule"]},"eleven-oclock":{"a":"Eleven O’Clock","b":"1F55A","j":["00","11","11:00","clock","eleven","o’clock","eleven_o_clock","time","late","early","schedule"]},"eleventhirty":{"a":"Eleven-Thirty","b":"1F566","j":["11","11:30","clock","eleven","eleven-thirty","thirty","eleven_thirty","time","late","early","schedule"]},"new-moon":{"a":"New Moon","b":"1F311","j":["dark","moon","nature","twilight","planet","space","night","evening","sleep"]},"waxing-crescent-moon":{"a":"Waxing Crescent Moon","b":"1F312","j":["crescent","moon","waxing","nature","twilight","planet","space","night","evening","sleep"]},"first-quarter-moon":{"a":"First Quarter Moon","b":"1F313","j":["moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"waxing-gibbous-moon":{"a":"Waxing Gibbous Moon","b":"1F314","j":["gibbous","moon","waxing","nature","night","sky","gray","twilight","planet","space","evening","sleep"]},"full-moon":{"a":"Full Moon","b":"1F315","j":["full","moon","nature","yellow","twilight","planet","space","night","evening","sleep"]},"waning-gibbous-moon":{"a":"Waning Gibbous Moon","b":"1F316","j":["gibbous","moon","waning","nature","twilight","planet","space","night","evening","sleep","waxing_gibbous_moon"]},"last-quarter-moon":{"a":"Last Quarter Moon","b":"1F317","j":["moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"waning-crescent-moon":{"a":"Waning Crescent Moon","b":"1F318","j":["crescent","moon","waning","nature","twilight","planet","space","night","evening","sleep"]},"crescent-moon":{"a":"Crescent Moon","b":"1F319","j":["crescent","moon","night","sleep","sky","evening","magic"]},"new-moon-face":{"a":"New Moon Face","b":"1F31A","j":["face","moon","nature","twilight","planet","space","night","evening","sleep"]},"first-quarter-moon-face":{"a":"First Quarter Moon Face","b":"1F31B","j":["face","moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"last-quarter-moon-face":{"a":"Last Quarter Moon Face","b":"1F31C","j":["face","moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"thermometer":{"a":"Thermometer","b":"1F321","j":["weather","temperature","hot","cold"]},"sun":{"a":"Sun","b":"2600","j":["bright","rays","sunny","weather","nature","brightness","summer","beach","spring"]},"full-moon-face":{"a":"Full Moon Face","b":"1F31D","j":["bright","face","full","moon","nature","twilight","planet","space","night","evening","sleep"]},"sun-with-face":{"a":"Sun with Face","b":"1F31E","j":["bright","face","sun","nature","morning","sky"]},"ringed-planet":{"a":"Ringed Planet","b":"1FA90","j":["saturn","saturnine","outerspace"]},"star":{"a":"Star","b":"2B50","j":["night","yellow"]},"glowing-star":{"a":"Glowing Star","b":"1F31F","j":["glittery","glow","shining","sparkle","star","night","awesome","good","magic"]},"shooting-star":{"a":"Shooting Star","b":"1F320","j":["falling","shooting","star","night","photo"]},"milky-way":{"a":"Milky Way","b":"1F30C","j":["space","photo","stars"]},"cloud":{"a":"Cloud","b":"2601","j":["weather","sky"]},"sun-behind-cloud":{"a":"Sun Behind Cloud","b":"26C5","j":["cloud","sun","weather","nature","cloudy","morning","fall","spring"]},"cloud-with-lightning-and-rain":{"a":"Cloud with Lightning and Rain","b":"26C8","j":["cloud","rain","thunder","weather","lightning"]},"sun-behind-small-cloud":{"a":"Sun Behind Small Cloud","b":"1F324","j":["cloud","sun","weather"]},"sun-behind-large-cloud":{"a":"Sun Behind Large Cloud","b":"1F325","j":["cloud","sun","weather"]},"sun-behind-rain-cloud":{"a":"Sun Behind Rain Cloud","b":"1F326","j":["cloud","rain","sun","weather"]},"cloud-with-rain":{"a":"Cloud with Rain","b":"1F327","j":["cloud","rain","weather"]},"cloud-with-snow":{"a":"Cloud with Snow","b":"1F328","j":["cloud","cold","snow","weather"]},"cloud-with-lightning":{"a":"Cloud with Lightning","b":"1F329","j":["cloud","lightning","weather","thunder"]},"tornado":{"a":"Tornado","b":"1F32A","j":["cloud","whirlwind","weather","cyclone","twister"]},"fog":{"a":"Fog","b":"1F32B","j":["cloud","weather"]},"wind-face":{"a":"Wind Face","b":"1F32C","j":["blow","cloud","face","wind","gust","air"]},"cyclone":{"a":"Cyclone","b":"1F300","j":["dizzy","hurricane","twister","typhoon","weather","swirl","blue","cloud","vortex","spiral","whirlpool","spin","tornado"]},"rainbow":{"a":"Rainbow","b":"1F308","j":["rain","nature","happy","unicorn_face","photo","sky","spring"]},"closed-umbrella":{"a":"Closed Umbrella","b":"1F302","j":["clothing","rain","umbrella","weather","drizzle"]},"umbrella":{"a":"Umbrella","b":"2602","j":["clothing","rain","weather","spring"]},"umbrella-with-rain-drops":{"a":"Umbrella with Rain Drops","b":"2614","j":["clothing","drop","rain","umbrella","rainy","weather","spring"]},"umbrella-on-ground":{"a":"Umbrella on Ground","b":"26F1","j":["rain","sun","umbrella","weather","summer"]},"high-voltage":{"a":"High Voltage","b":"26A1","j":["danger","electric","lightning","voltage","zap","thunder","weather","lightning bolt","fast"]},"snowflake":{"a":"Snowflake","b":"2744","j":["cold","snow","winter","season","weather","christmas","xmas"]},"snowman":{"a":"Snowman","b":"2603","j":["cold","snow","winter","season","weather","christmas","xmas","frozen"]},"snowman-without-snow":{"a":"Snowman Without Snow","b":"26C4","j":["cold","snow","snowman","winter","season","weather","christmas","xmas","frozen","without_snow"]},"comet":{"a":"Comet","b":"2604","j":["space"]},"fire":{"a":"Fire","b":"1F525","j":["flame","tool","hot","cook"]},"droplet":{"a":"Droplet","b":"1F4A7","j":["cold","comic","drop","sweat","water","drip","faucet","spring"]},"water-wave":{"a":"Water Wave","b":"1F30A","j":["ocean","water","wave","sea","nature","tsunami","disaster"]},"jackolantern":{"a":"Jack-O-Lantern","b":"1F383","j":["celebration","halloween","jack","jack-o-lantern","lantern","jack_o_lantern","light","pumpkin","creepy","fall"]},"christmas-tree":{"a":"Christmas Tree","b":"1F384","j":["celebration","Christmas","tree","festival","vacation","december","xmas"]},"fireworks":{"a":"Fireworks","b":"1F386","j":["celebration","photo","festival","carnival","congratulations"]},"sparkler":{"a":"Sparkler","b":"1F387","j":["celebration","fireworks","sparkle","stars","night","shine"]},"firecracker":{"a":"Firecracker","b":"1F9E8","j":["dynamite","explosive","fireworks","boom","explode","explosion"]},"sparkles":{"a":"Sparkles","b":"2728","j":["*","sparkle","star","stars","shine","shiny","cool","awesome","good","magic"]},"balloon":{"a":"Balloon","b":"1F388","j":["celebration","party","birthday","circus"]},"party-popper":{"a":"Party Popper","b":"1F389","j":["celebration","party","popper","tada","congratulations","birthday","magic","circus"]},"confetti-ball":{"a":"Confetti Ball","b":"1F38A","j":["ball","celebration","confetti","festival","party","birthday","circus"]},"tanabata-tree":{"a":"Tanabata Tree","b":"1F38B","j":["banner","celebration","Japanese","tree","plant","nature","branch","summer"]},"pine-decoration":{"a":"Pine Decoration","b":"1F38D","j":["bamboo","celebration","Japanese","pine","plant","nature","vegetable","panda"]},"japanese-dolls":{"a":"Japanese Dolls","b":"1F38E","j":["celebration","doll","festival","Japanese","Japanese dolls","japanese","toy","kimono"]},"carp-streamer":{"a":"Carp Streamer","b":"1F38F","j":["carp","celebration","streamer","fish","japanese","koinobori","banner"]},"wind-chime":{"a":"Wind Chime","b":"1F390","j":["bell","celebration","chime","wind","nature","ding","spring"]},"moon-viewing-ceremony":{"a":"Moon Viewing Ceremony","b":"1F391","j":["celebration","ceremony","moon","photo","japan","asia","tsukimi"]},"red-envelope":{"a":"Red Envelope","b":"1F9E7","j":["gift","good luck","hóngbāo","lai see","money"]},"ribbon":{"a":"Ribbon","b":"1F380","j":["celebration","decoration","pink","girl","bowtie"]},"wrapped-gift":{"a":"Wrapped Gift","b":"1F381","j":["box","celebration","gift","present","wrapped","birthday","christmas","xmas"]},"reminder-ribbon":{"a":"Reminder Ribbon","b":"1F397","j":["celebration","reminder","ribbon","sports","cause","support","awareness"]},"admission-tickets":{"a":"Admission Tickets","b":"1F39F","j":["admission","ticket","sports","concert","entrance"]},"ticket":{"a":"Ticket","b":"1F3AB","j":["admission","event","concert","pass"]},"military-medal":{"a":"Military Medal","b":"1F396","j":["celebration","medal","military","award","winning","army"]},"trophy":{"a":"Trophy","b":"1F3C6","j":["prize","win","award","contest","place","ftw","ceremony"]},"sports-medal":{"a":"Sports Medal","b":"1F3C5","j":["medal","award","winning"]},"1st-place-medal":{"a":"1st Place Medal","b":"1F947","j":["first","gold","medal","award","winning"]},"2nd-place-medal":{"a":"2nd Place Medal","b":"1F948","j":["medal","second","silver","award"]},"3rd-place-medal":{"a":"3rd Place Medal","b":"1F949","j":["bronze","medal","third","award"]},"soccer-ball":{"a":"Soccer Ball","b":"26BD","j":["ball","football","soccer","sports"]},"baseball":{"a":"Baseball","b":"26BE","j":["ball","sports","balls"]},"softball":{"a":"Softball","b":"1F94E","j":["ball","glove","underarm","sports","balls"]},"basketball":{"a":"Basketball","b":"1F3C0","j":["ball","hoop","sports","balls","NBA"]},"volleyball":{"a":"Volleyball","b":"1F3D0","j":["ball","game","sports","balls"]},"american-football":{"a":"American Football","b":"1F3C8","j":["american","ball","football","sports","balls","NFL"]},"rugby-football":{"a":"Rugby Football","b":"1F3C9","j":["ball","football","rugby","sports","team"]},"tennis":{"a":"Tennis","b":"1F3BE","j":["ball","racquet","sports","balls","green"]},"flying-disc":{"a":"Flying Disc","b":"1F94F","j":["ultimate","sports","frisbee"]},"bowling":{"a":"Bowling","b":"1F3B3","j":["ball","game","sports","fun","play"]},"cricket-game":{"a":"Cricket Game","b":"1F3CF","j":["ball","bat","game","sports"]},"field-hockey":{"a":"Field Hockey","b":"1F3D1","j":["ball","field","game","hockey","stick","sports"]},"ice-hockey":{"a":"Ice Hockey","b":"1F3D2","j":["game","hockey","ice","puck","stick","sports"]},"lacrosse":{"a":"Lacrosse","b":"1F94D","j":["ball","goal","stick","sports"]},"ping-pong":{"a":"Ping Pong","b":"1F3D3","j":["ball","bat","game","paddle","table tennis","sports","pingpong"]},"badminton":{"a":"Badminton","b":"1F3F8","j":["birdie","game","racquet","shuttlecock","sports"]},"boxing-glove":{"a":"Boxing Glove","b":"1F94A","j":["boxing","glove","sports","fighting"]},"martial-arts-uniform":{"a":"Martial Arts Uniform","b":"1F94B","j":["judo","karate","martial arts","taekwondo","uniform"]},"goal-net":{"a":"Goal Net","b":"1F945","j":["goal","net","sports"]},"flag-in-hole":{"a":"Flag in Hole","b":"26F3","j":["golf","hole","sports","business","flag","summer"]},"ice-skate":{"a":"Ice Skate","b":"26F8","j":["ice","skate","sports"]},"fishing-pole":{"a":"Fishing Pole","b":"1F3A3","j":["fish","pole","food","hobby","summer"]},"diving-mask":{"a":"Diving Mask","b":"1F93F","j":["diving","scuba","snorkeling","sport","ocean"]},"running-shirt":{"a":"Running Shirt","b":"1F3BD","j":["athletics","running","sash","shirt","play","pageant"]},"skis":{"a":"Skis","b":"1F3BF","j":["ski","snow","sports","winter","cold"]},"sled":{"a":"Sled","b":"1F6F7","j":["sledge","sleigh","luge","toboggan"]},"curling-stone":{"a":"Curling Stone","b":"1F94C","j":["game","rock","sports"]},"bullseye":{"a":"Bullseye","b":"1F3AF","j":["dart","direct hit","game","hit","target","direct_hit","play","bar"]},"yoyo":{"a":"Yo-Yo","b":"1FA80","j":["fluctuate","toy","yo-yo","yo_yo"]},"kite":{"a":"Kite","b":"1FA81","j":["fly","soar","wind"]},"pool-8-ball":{"a":"Pool 8 Ball","b":"1F3B1","j":["8","ball","billiard","eight","game","pool","hobby","luck","magic"]},"crystal-ball":{"a":"Crystal Ball","b":"1F52E","j":["ball","crystal","fairy tale","fantasy","fortune","tool","disco","party","magic","circus","fortune_teller"]},"magic-wand":{"a":"Magic Wand","b":"1FA84","j":["magic","witch","wizard","supernature","power"]},"nazar-amulet":{"a":"Nazar Amulet","b":"1F9FF","j":["bead","charm","evil-eye","nazar","talisman"]},"hamsa":{"a":"⊛ Hamsa","b":"1FAAC","j":["amulet","Fatima","hand","Mary","Miriam","protection","religion"]},"video-game":{"a":"Video Game","b":"1F3AE","j":["controller","game","play","console","PS4"]},"joystick":{"a":"Joystick","b":"1F579","j":["game","video game","play"]},"slot-machine":{"a":"Slot Machine","b":"1F3B0","j":["game","slot","bet","gamble","vegas","fruit machine","luck","casino"]},"game-die":{"a":"Game Die","b":"1F3B2","j":["dice","die","game","random","tabletop","play","luck"]},"puzzle-piece":{"a":"Puzzle Piece","b":"1F9E9","j":["clue","interlocking","jigsaw","piece","puzzle"]},"teddy-bear":{"a":"Teddy Bear","b":"1F9F8","j":["plaything","plush","stuffed","toy"]},"piata":{"a":"Piñata","b":"1FA85","j":["celebration","party","piñata","pinata","mexico","candy"]},"mirror-ball":{"a":"⊛ Mirror Ball","b":"1FAA9","j":["dance","disco","glitter","party"]},"nesting-dolls":{"a":"Nesting Dolls","b":"1FA86","j":["doll","nesting","russia","matryoshka","toy"]},"spade-suit":{"a":"Spade Suit","b":"2660","j":["card","game","poker","cards","suits","magic"]},"heart-suit":{"a":"Heart Suit","b":"2665","j":["card","game","poker","cards","magic","suits"]},"diamond-suit":{"a":"Diamond Suit","b":"2666","j":["card","game","poker","cards","magic","suits"]},"club-suit":{"a":"Club Suit","b":"2663","j":["card","game","poker","cards","magic","suits"]},"chess-pawn":{"a":"Chess Pawn","b":"265F","j":["chess","dupe","expendable"]},"joker":{"a":"Joker","b":"1F0CF","j":["card","game","wildcard","poker","cards","play","magic"]},"mahjong-red-dragon":{"a":"Mahjong Red Dragon","b":"1F004","j":["game","mahjong","red","play","chinese","kanji"]},"flower-playing-cards":{"a":"Flower Playing Cards","b":"1F3B4","j":["card","flower","game","Japanese","playing","sunset","red"]},"performing-arts":{"a":"Performing Arts","b":"1F3AD","j":["art","mask","performing","theater","theatre","acting","drama"]},"framed-picture":{"a":"Framed Picture","b":"1F5BC","j":["art","frame","museum","painting","picture","photography"]},"artist-palette":{"a":"Artist Palette","b":"1F3A8","j":["art","museum","painting","palette","design","paint","draw","colors"]},"thread":{"a":"Thread","b":"1F9F5","j":["needle","sewing","spool","string"]},"sewing-needle":{"a":"Sewing Needle","b":"1FAA1","j":["embroidery","needle","sewing","stitches","sutures","tailoring"]},"yarn":{"a":"Yarn","b":"1F9F6","j":["ball","crochet","knit"]},"knot":{"a":"Knot","b":"1FAA2","j":["rope","tangled","tie","twine","twist","scout"]},"glasses":{"a":"Glasses","b":"1F453","j":["clothing","eye","eyeglasses","eyewear","fashion","accessories","eyesight","nerdy","dork","geek"]},"sunglasses":{"a":"Sunglasses","b":"1F576","j":["dark","eye","eyewear","glasses","face","cool","accessories"]},"goggles":{"a":"Goggles","b":"1F97D","j":["eye protection","swimming","welding","eyes","protection","safety"]},"lab-coat":{"a":"Lab Coat","b":"1F97C","j":["doctor","experiment","scientist","chemist"]},"safety-vest":{"a":"Safety Vest","b":"1F9BA","j":["emergency","safety","vest","protection"]},"necktie":{"a":"Necktie","b":"1F454","j":["clothing","tie","shirt","suitup","formal","fashion","cloth","business"]},"tshirt":{"a":"T-Shirt","b":"1F455","j":["clothing","shirt","t-shirt","t_shirt","fashion","cloth","casual","tee"]},"jeans":{"a":"Jeans","b":"1F456","j":["clothing","pants","trousers","fashion","shopping"]},"scarf":{"a":"Scarf","b":"1F9E3","j":["neck","winter","clothes"]},"gloves":{"a":"Gloves","b":"1F9E4","j":["hand","hands","winter","clothes"]},"coat":{"a":"Coat","b":"1F9E5","j":["jacket"]},"socks":{"a":"Socks","b":"1F9E6","j":["stocking","stockings","clothes"]},"dress":{"a":"Dress","b":"1F457","j":["clothing","clothes","fashion","shopping"]},"kimono":{"a":"Kimono","b":"1F458","j":["clothing","dress","fashion","women","female","japanese"]},"sari":{"a":"Sari","b":"1F97B","j":["clothing","dress"]},"onepiece-swimsuit":{"a":"One-Piece Swimsuit","b":"1FA71","j":["bathing suit","one-piece swimsuit","one_piece_swimsuit","fashion"]},"briefs":{"a":"Briefs","b":"1FA72","j":["bathing suit","one-piece","swimsuit","underwear","clothing"]},"shorts":{"a":"Shorts","b":"1FA73","j":["bathing suit","pants","underwear","clothing"]},"bikini":{"a":"Bikini","b":"1F459","j":["clothing","swim","swimming","female","woman","girl","fashion","beach","summer"]},"womans-clothes":{"a":"Woman’S Clothes","b":"1F45A","j":["clothing","woman","woman’s clothes","woman_s_clothes","fashion","shopping_bags","female"]},"purse":{"a":"Purse","b":"1F45B","j":["clothing","coin","fashion","accessories","money","sales","shopping"]},"handbag":{"a":"Handbag","b":"1F45C","j":["bag","clothing","purse","fashion","accessory","accessories","shopping"]},"clutch-bag":{"a":"Clutch Bag","b":"1F45D","j":["bag","clothing","pouch","accessories","shopping"]},"shopping-bags":{"a":"Shopping Bags","b":"1F6CD","j":["bag","hotel","shopping","mall","buy","purchase"]},"backpack":{"a":"Backpack","b":"1F392","j":["bag","rucksack","satchel","school","student","education"]},"thong-sandal":{"a":"Thong Sandal","b":"1FA74","j":["beach sandals","sandals","thong sandals","thongs","zōri","footwear","summer"]},"mans-shoe":{"a":"Man’S Shoe","b":"1F45E","j":["clothing","man","man’s shoe","shoe","man_s_shoe","fashion","male"]},"running-shoe":{"a":"Running Shoe","b":"1F45F","j":["athletic","clothing","shoe","sneaker","shoes","sports","sneakers"]},"hiking-boot":{"a":"Hiking Boot","b":"1F97E","j":["backpacking","boot","camping","hiking"]},"flat-shoe":{"a":"Flat Shoe","b":"1F97F","j":["ballet flat","slip-on","slipper","ballet"]},"highheeled-shoe":{"a":"High-Heeled Shoe","b":"1F460","j":["clothing","heel","high-heeled shoe","shoe","woman","high_heeled_shoe","fashion","shoes","female","pumps","stiletto"]},"womans-sandal":{"a":"Woman’S Sandal","b":"1F461","j":["clothing","sandal","shoe","woman","woman’s sandal","woman_s_sandal","shoes","fashion","flip flops"]},"ballet-shoes":{"a":"Ballet Shoes","b":"1FA70","j":["ballet","dance"]},"womans-boot":{"a":"Woman’S Boot","b":"1F462","j":["boot","clothing","shoe","woman","woman’s boot","woman_s_boot","shoes","fashion"]},"crown":{"a":"Crown","b":"1F451","j":["clothing","king","queen","kod","leader","royalty","lord"]},"womans-hat":{"a":"Woman’S Hat","b":"1F452","j":["clothing","hat","woman","woman’s hat","woman_s_hat","fashion","accessories","female","lady","spring"]},"top-hat":{"a":"Top Hat","b":"1F3A9","j":["clothing","hat","top","tophat","magic","gentleman","classy","circus"]},"graduation-cap":{"a":"Graduation Cap","b":"1F393","j":["cap","celebration","clothing","graduation","hat","school","college","degree","university","legal","learn","education"]},"billed-cap":{"a":"Billed Cap","b":"1F9E2","j":["baseball cap","cap","baseball"]},"military-helmet":{"a":"Military Helmet","b":"1FA96","j":["army","helmet","military","soldier","warrior","protection"]},"rescue-workers-helmet":{"a":"Rescue Worker’S Helmet","b":"26D1","j":["aid","cross","face","hat","helmet","rescue worker’s helmet","rescue_worker_s_helmet","construction","build"]},"prayer-beads":{"a":"Prayer Beads","b":"1F4FF","j":["beads","clothing","necklace","prayer","religion","dhikr","religious"]},"lipstick":{"a":"Lipstick","b":"1F484","j":["cosmetics","makeup","female","girl","fashion","woman"]},"ring":{"a":"Ring","b":"1F48D","j":["diamond","wedding","propose","marriage","valentines","fashion","jewelry","gem","engagement"]},"gem-stone":{"a":"Gem Stone","b":"1F48E","j":["diamond","gem","jewel","blue","ruby","jewelry"]},"muted-speaker":{"a":"Muted Speaker","b":"1F507","j":["mute","quiet","silent","speaker","sound","volume","silence"]},"speaker-low-volume":{"a":"Speaker Low Volume","b":"1F508","j":["soft","sound","volume","silence","broadcast"]},"speaker-medium-volume":{"a":"Speaker Medium Volume","b":"1F509","j":["medium","volume","speaker","broadcast"]},"speaker-high-volume":{"a":"Speaker High Volume","b":"1F50A","j":["loud","volume","noise","noisy","speaker","broadcast"]},"loudspeaker":{"a":"Loudspeaker","b":"1F4E2","j":["loud","public address","volume","sound"]},"megaphone":{"a":"Megaphone","b":"1F4E3","j":["cheering","sound","speaker","volume"]},"postal-horn":{"a":"Postal Horn","b":"1F4EF","j":["horn","post","postal","instrument","music"]},"bell":{"a":"Bell","b":"1F514","j":["sound","notification","christmas","xmas","chime"]},"bell-with-slash":{"a":"Bell with Slash","b":"1F515","j":["bell","forbidden","mute","quiet","silent","sound","volume"]},"musical-score":{"a":"Musical Score","b":"1F3BC","j":["music","score","treble","clef","compose"]},"musical-note":{"a":"Musical Note","b":"1F3B5","j":["music","note","score","tone","sound"]},"musical-notes":{"a":"Musical Notes","b":"1F3B6","j":["music","note","notes","score"]},"studio-microphone":{"a":"Studio Microphone","b":"1F399","j":["mic","microphone","music","studio","sing","recording","artist","talkshow"]},"level-slider":{"a":"Level Slider","b":"1F39A","j":["level","music","slider","scale"]},"control-knobs":{"a":"Control Knobs","b":"1F39B","j":["control","knobs","music","dial"]},"microphone":{"a":"Microphone","b":"1F3A4","j":["karaoke","mic","sound","music","PA","sing","talkshow"]},"headphone":{"a":"Headphone","b":"1F3A7","j":["earbud","music","score","gadgets"]},"radio":{"a":"Radio","b":"1F4FB","j":["video","communication","music","podcast","program"]},"saxophone":{"a":"Saxophone","b":"1F3B7","j":["instrument","music","sax","jazz","blues"]},"accordion":{"a":"Accordion","b":"1FA97","j":["concertina","squeeze box","music"]},"guitar":{"a":"Guitar","b":"1F3B8","j":["instrument","music"]},"musical-keyboard":{"a":"Musical Keyboard","b":"1F3B9","j":["instrument","keyboard","music","piano","compose"]},"trumpet":{"a":"Trumpet","b":"1F3BA","j":["instrument","music","brass"]},"violin":{"a":"Violin","b":"1F3BB","j":["instrument","music","orchestra","symphony"]},"banjo":{"a":"Banjo","b":"1FA95","j":["music","stringed","instructment"]},"drum":{"a":"Drum","b":"1F941","j":["drumsticks","music","instrument","snare"]},"long-drum":{"a":"Long Drum","b":"1FA98","j":["beat","conga","drum","rhythm","music"]},"mobile-phone":{"a":"Mobile Phone","b":"1F4F1","j":["cell","mobile","phone","telephone","technology","apple","gadgets","dial"]},"mobile-phone-with-arrow":{"a":"Mobile Phone with Arrow","b":"1F4F2","j":["arrow","cell","mobile","phone","receive","iphone","incoming"]},"telephone":{"a":"Telephone","b":"260E","j":["phone","technology","communication","dial"]},"telephone-receiver":{"a":"Telephone Receiver","b":"1F4DE","j":["phone","receiver","telephone","technology","communication","dial"]},"pager":{"a":"Pager","b":"1F4DF","j":["bbcall","oldschool","90s"]},"fax-machine":{"a":"Fax Machine","b":"1F4E0","j":["fax","communication","technology"]},"battery":{"a":"Battery","b":"1F50B","j":["power","energy","sustain"]},"low-battery":{"a":"⊛ Low Battery","b":"1FAAB","j":["electronic","low energy","drained","dead"]},"electric-plug":{"a":"Electric Plug","b":"1F50C","j":["electric","electricity","plug","charger","power"]},"laptop":{"a":"Laptop","b":"1F4BB","j":["computer","pc","personal","technology","screen","display","monitor"]},"desktop-computer":{"a":"Desktop Computer","b":"1F5A5","j":["computer","desktop","technology","computing","screen"]},"printer":{"a":"Printer","b":"1F5A8","j":["computer","paper","ink"]},"keyboard":{"a":"Keyboard","b":"2328","j":["computer","technology","type","input","text"]},"computer-mouse":{"a":"Computer Mouse","b":"1F5B1","j":["computer","click"]},"trackball":{"a":"Trackball","b":"1F5B2","j":["computer","technology","trackpad"]},"computer-disk":{"a":"Computer Disk","b":"1F4BD","j":["computer","disk","minidisk","optical","technology","record","data","90s"]},"floppy-disk":{"a":"Floppy Disk","b":"1F4BE","j":["computer","disk","floppy","oldschool","technology","save","90s","80s"]},"optical-disk":{"a":"Optical Disk","b":"1F4BF","j":["cd","computer","disk","optical","technology","dvd","disc","90s"]},"dvd":{"a":"Dvd","b":"1F4C0","j":["blu-ray","computer","disk","optical","cd","disc"]},"abacus":{"a":"Abacus","b":"1F9EE","j":["calculation"]},"movie-camera":{"a":"Movie Camera","b":"1F3A5","j":["camera","cinema","movie","film","record"]},"film-frames":{"a":"Film Frames","b":"1F39E","j":["cinema","film","frames","movie"]},"film-projector":{"a":"Film Projector","b":"1F4FD","j":["cinema","film","movie","projector","video","tape","record"]},"clapper-board":{"a":"Clapper Board","b":"1F3AC","j":["clapper","movie","film","record"]},"television":{"a":"Television","b":"1F4FA","j":["tv","video","technology","program","oldschool","show"]},"camera":{"a":"Camera","b":"1F4F7","j":["video","gadgets","photography"]},"camera-with-flash":{"a":"Camera with Flash","b":"1F4F8","j":["camera","flash","video","photography","gadgets"]},"video-camera":{"a":"Video Camera","b":"1F4F9","j":["camera","video","film","record"]},"videocassette":{"a":"Videocassette","b":"1F4FC","j":["tape","vhs","video","record","oldschool","90s","80s"]},"magnifying-glass-tilted-left":{"a":"Magnifying Glass Tilted Left","b":"1F50D","j":["glass","magnifying","search","tool","zoom","find","detective"]},"magnifying-glass-tilted-right":{"a":"Magnifying Glass Tilted Right","b":"1F50E","j":["glass","magnifying","search","tool","zoom","find","detective"]},"candle":{"a":"Candle","b":"1F56F","j":["light","fire","wax"]},"light-bulb":{"a":"Light Bulb","b":"1F4A1","j":["bulb","comic","electric","idea","light","electricity"]},"flashlight":{"a":"Flashlight","b":"1F526","j":["electric","light","tool","torch","dark","camping","sight","night"]},"red-paper-lantern":{"a":"Red Paper Lantern","b":"1F3EE","j":["bar","lantern","light","red","paper","halloween","spooky"]},"diya-lamp":{"a":"Diya Lamp","b":"1FA94","j":["diya","lamp","oil","lighting"]},"notebook-with-decorative-cover":{"a":"Notebook with Decorative Cover","b":"1F4D4","j":["book","cover","decorated","notebook","classroom","notes","record","paper","study"]},"closed-book":{"a":"Closed Book","b":"1F4D5","j":["book","closed","read","library","knowledge","textbook","learn"]},"open-book":{"a":"Open Book","b":"1F4D6","j":["book","open","read","library","knowledge","literature","learn","study"]},"green-book":{"a":"Green Book","b":"1F4D7","j":["book","green","read","library","knowledge","study"]},"blue-book":{"a":"Blue Book","b":"1F4D8","j":["blue","book","read","library","knowledge","learn","study"]},"orange-book":{"a":"Orange Book","b":"1F4D9","j":["book","orange","read","library","knowledge","textbook","study"]},"books":{"a":"Books","b":"1F4DA","j":["book","literature","library","study"]},"notebook":{"a":"Notebook","b":"1F4D3","j":["stationery","record","notes","paper","study"]},"ledger":{"a":"Ledger","b":"1F4D2","j":["notebook","notes","paper"]},"page-with-curl":{"a":"Page with Curl","b":"1F4C3","j":["curl","document","page","documents","office","paper"]},"scroll":{"a":"Scroll","b":"1F4DC","j":["paper","documents","ancient","history"]},"page-facing-up":{"a":"Page Facing Up","b":"1F4C4","j":["document","page","documents","office","paper","information"]},"newspaper":{"a":"Newspaper","b":"1F4F0","j":["news","paper","press","headline"]},"rolledup-newspaper":{"a":"Rolled-Up Newspaper","b":"1F5DE","j":["news","newspaper","paper","rolled","rolled-up newspaper","rolled_up_newspaper","press","headline"]},"bookmark-tabs":{"a":"Bookmark Tabs","b":"1F4D1","j":["bookmark","mark","marker","tabs","favorite","save","order","tidy"]},"bookmark":{"a":"Bookmark","b":"1F516","j":["mark","favorite","label","save"]},"label":{"a":"Label","b":"1F3F7","j":["sale","tag"]},"money-bag":{"a":"Money Bag","b":"1F4B0","j":["bag","dollar","money","moneybag","payment","coins","sale"]},"coin":{"a":"Coin","b":"1FA99","j":["gold","metal","money","silver","treasure","currency"]},"yen-banknote":{"a":"Yen Banknote","b":"1F4B4","j":["banknote","bill","currency","money","note","yen","sales","japanese","dollar"]},"dollar-banknote":{"a":"Dollar Banknote","b":"1F4B5","j":["banknote","bill","currency","dollar","money","note","sales"]},"euro-banknote":{"a":"Euro Banknote","b":"1F4B6","j":["banknote","bill","currency","euro","money","note","sales","dollar"]},"pound-banknote":{"a":"Pound Banknote","b":"1F4B7","j":["banknote","bill","currency","money","note","pound","british","sterling","sales","bills","uk","england"]},"money-with-wings":{"a":"Money with Wings","b":"1F4B8","j":["banknote","bill","fly","money","wings","dollar","bills","payment","sale"]},"credit-card":{"a":"Credit Card","b":"1F4B3","j":["card","credit","money","sales","dollar","bill","payment","shopping"]},"receipt":{"a":"Receipt","b":"1F9FE","j":["accounting","bookkeeping","evidence","proof","expenses"]},"chart-increasing-with-yen":{"a":"Chart Increasing with Yen","b":"1F4B9","j":["chart","graph","growth","money","yen","green-square","presentation","stats"]},"envelope":{"a":"Envelope","b":"2709","j":["email","letter","postal","inbox","communication"]},"email":{"a":"E-Mail","b":"1F4E7","j":["e-mail","letter","mail","e_mail","communication","inbox"]},"incoming-envelope":{"a":"Incoming Envelope","b":"1F4E8","j":["e-mail","email","envelope","incoming","letter","receive","inbox"]},"envelope-with-arrow":{"a":"Envelope with Arrow","b":"1F4E9","j":["arrow","e-mail","email","envelope","outgoing","communication"]},"outbox-tray":{"a":"Outbox Tray","b":"1F4E4","j":["box","letter","mail","outbox","sent","tray","inbox","email"]},"inbox-tray":{"a":"Inbox Tray","b":"1F4E5","j":["box","inbox","letter","mail","receive","tray","email","documents"]},"package":{"a":"Package","b":"1F4E6","j":["box","parcel","mail","gift","cardboard","moving"]},"closed-mailbox-with-raised-flag":{"a":"Closed Mailbox with Raised Flag","b":"1F4EB","j":["closed","mail","mailbox","postbox","email","inbox","communication"]},"closed-mailbox-with-lowered-flag":{"a":"Closed Mailbox with Lowered Flag","b":"1F4EA","j":["closed","lowered","mail","mailbox","postbox","email","communication","inbox"]},"open-mailbox-with-raised-flag":{"a":"Open Mailbox with Raised Flag","b":"1F4EC","j":["mail","mailbox","open","postbox","email","inbox","communication"]},"open-mailbox-with-lowered-flag":{"a":"Open Mailbox with Lowered Flag","b":"1F4ED","j":["lowered","mail","mailbox","open","postbox","email","inbox"]},"postbox":{"a":"Postbox","b":"1F4EE","j":["mail","mailbox","email","letter","envelope"]},"ballot-box-with-ballot":{"a":"Ballot Box with Ballot","b":"1F5F3","j":["ballot","box","election","vote"]},"pencil":{"a":"Pencil","b":"270F","j":["stationery","write","paper","writing","school","study"]},"black-nib":{"a":"Black Nib","b":"2712","j":["nib","pen","stationery","writing","write"]},"fountain-pen":{"a":"Fountain Pen","b":"1F58B","j":["fountain","pen","stationery","writing","write"]},"pen":{"a":"Pen","b":"1F58A","j":["ballpoint","stationery","writing","write"]},"paintbrush":{"a":"Paintbrush","b":"1F58C","j":["painting","drawing","creativity","art"]},"crayon":{"a":"Crayon","b":"1F58D","j":["drawing","creativity"]},"memo":{"a":"Memo","b":"1F4DD","j":["pencil","write","documents","stationery","paper","writing","legal","exam","quiz","test","study","compose"]},"briefcase":{"a":"Briefcase","b":"1F4BC","j":["business","documents","work","law","legal","job","career"]},"file-folder":{"a":"File Folder","b":"1F4C1","j":["file","folder","documents","business","office"]},"open-file-folder":{"a":"Open File Folder","b":"1F4C2","j":["file","folder","open","documents","load"]},"card-index-dividers":{"a":"Card Index Dividers","b":"1F5C2","j":["card","dividers","index","organizing","business","stationery"]},"calendar":{"a":"Calendar","b":"1F4C5","j":["date","schedule"]},"tearoff-calendar":{"a":"Tear-off Calendar","b":"1F4C6","j":["calendar","tear-off calendar","tear_off_calendar","schedule","date","planning"]},"spiral-notepad":{"a":"Spiral Notepad","b":"1F5D2","j":["note","pad","spiral","memo","stationery"]},"spiral-calendar":{"a":"Spiral Calendar","b":"1F5D3","j":["calendar","pad","spiral","date","schedule","planning"]},"card-index":{"a":"Card Index","b":"1F4C7","j":["card","index","rolodex","business","stationery"]},"chart-increasing":{"a":"Chart Increasing","b":"1F4C8","j":["chart","graph","growth","trend","upward","presentation","stats","recovery","business","economics","money","sales","good","success"]},"chart-decreasing":{"a":"Chart Decreasing","b":"1F4C9","j":["chart","down","graph","trend","presentation","stats","recession","business","economics","money","sales","bad","failure"]},"bar-chart":{"a":"Bar Chart","b":"1F4CA","j":["bar","chart","graph","presentation","stats"]},"clipboard":{"a":"Clipboard","b":"1F4CB","j":["stationery","documents"]},"pushpin":{"a":"Pushpin","b":"1F4CC","j":["pin","stationery","mark","here"]},"round-pushpin":{"a":"Round Pushpin","b":"1F4CD","j":["pin","pushpin","stationery","location","map","here"]},"paperclip":{"a":"Paperclip","b":"1F4CE","j":["documents","stationery"]},"linked-paperclips":{"a":"Linked Paperclips","b":"1F587","j":["link","paperclip","documents","stationery"]},"straight-ruler":{"a":"Straight Ruler","b":"1F4CF","j":["ruler","straight edge","stationery","calculate","length","math","school","drawing","architect","sketch"]},"triangular-ruler":{"a":"Triangular Ruler","b":"1F4D0","j":["ruler","set","triangle","stationery","math","architect","sketch"]},"scissors":{"a":"Scissors","b":"2702","j":["cutting","tool","stationery","cut"]},"card-file-box":{"a":"Card File Box","b":"1F5C3","j":["box","card","file","business","stationery"]},"file-cabinet":{"a":"File Cabinet","b":"1F5C4","j":["cabinet","file","filing","organizing"]},"wastebasket":{"a":"Wastebasket","b":"1F5D1","j":["bin","trash","rubbish","garbage","toss"]},"locked":{"a":"Locked","b":"1F512","j":["closed","security","password","padlock"]},"unlocked":{"a":"Unlocked","b":"1F513","j":["lock","open","unlock","privacy","security"]},"locked-with-pen":{"a":"Locked with Pen","b":"1F50F","j":["ink","lock","nib","pen","privacy","security","secret"]},"locked-with-key":{"a":"Locked with Key","b":"1F510","j":["closed","key","lock","secure","security","privacy"]},"key":{"a":"Key","b":"1F511","j":["lock","password","door"]},"old-key":{"a":"Old Key","b":"1F5DD","j":["clue","key","lock","old","door","password"]},"hammer":{"a":"Hammer","b":"1F528","j":["tool","tools","build","create"]},"axe":{"a":"Axe","b":"1FA93","j":["chop","hatchet","split","wood","tool","cut"]},"pick":{"a":"Pick","b":"26CF","j":["mining","tool","tools","dig"]},"hammer-and-pick":{"a":"Hammer and Pick","b":"2692","j":["hammer","pick","tool","tools","build","create"]},"hammer-and-wrench":{"a":"Hammer and Wrench","b":"1F6E0","j":["hammer","spanner","tool","wrench","tools","build","create"]},"dagger":{"a":"Dagger","b":"1F5E1","j":["knife","weapon"]},"crossed-swords":{"a":"Crossed Swords","b":"2694","j":["crossed","swords","weapon"]},"water-pistol":{"a":"Water Pistol","b":"1F52B","j":["gun","handgun","pistol","revolver","tool","water","weapon","violence"]},"boomerang":{"a":"Boomerang","b":"1FA83","j":["australia","rebound","repercussion","weapon"]},"bow-and-arrow":{"a":"Bow and Arrow","b":"1F3F9","j":["archer","arrow","bow","Sagittarius","zodiac","sports"]},"shield":{"a":"Shield","b":"1F6E1","j":["weapon","protection","security"]},"carpentry-saw":{"a":"Carpentry Saw","b":"1FA9A","j":["carpenter","lumber","saw","tool","cut","chop"]},"wrench":{"a":"Wrench","b":"1F527","j":["spanner","tool","tools","diy","ikea","fix","maintainer"]},"screwdriver":{"a":"Screwdriver","b":"1FA9B","j":["screw","tool","tools"]},"nut-and-bolt":{"a":"Nut and Bolt","b":"1F529","j":["bolt","nut","tool","handy","tools","fix"]},"gear":{"a":"Gear","b":"2699","j":["cog","cogwheel","tool"]},"clamp":{"a":"Clamp","b":"1F5DC","j":["compress","tool","vice"]},"balance-scale":{"a":"Balance Scale","b":"2696","j":["balance","justice","Libra","scale","zodiac","law","fairness","weight"]},"white-cane":{"a":"White Cane","b":"1F9AF","j":["accessibility","blind","probing_cane"]},"link":{"a":"Link","b":"1F517","j":["rings","url"]},"chains":{"a":"Chains","b":"26D3","j":["chain","lock","arrest"]},"hook":{"a":"Hook","b":"1FA9D","j":["catch","crook","curve","ensnare","selling point","tools"]},"toolbox":{"a":"Toolbox","b":"1F9F0","j":["chest","mechanic","tool","tools","diy","fix","maintainer"]},"magnet":{"a":"Magnet","b":"1F9F2","j":["attraction","horseshoe","magnetic"]},"ladder":{"a":"Ladder","b":"1FA9C","j":["climb","rung","step","tools"]},"alembic":{"a":"Alembic","b":"2697","j":["chemistry","tool","distilling","science","experiment"]},"test-tube":{"a":"Test Tube","b":"1F9EA","j":["chemist","chemistry","experiment","lab","science"]},"petri-dish":{"a":"Petri Dish","b":"1F9EB","j":["bacteria","biologist","biology","culture","lab"]},"dna":{"a":"Dna","b":"1F9EC","j":["biologist","evolution","gene","genetics","life"]},"microscope":{"a":"Microscope","b":"1F52C","j":["science","tool","laboratory","experiment","zoomin","study"]},"telescope":{"a":"Telescope","b":"1F52D","j":["science","tool","stars","space","zoom","astronomy"]},"satellite-antenna":{"a":"Satellite Antenna","b":"1F4E1","j":["antenna","dish","satellite","communication","future","radio","space"]},"syringe":{"a":"Syringe","b":"1F489","j":["medicine","needle","shot","sick","health","hospital","drugs","blood","doctor","nurse"]},"drop-of-blood":{"a":"Drop of Blood","b":"1FA78","j":["bleed","blood donation","injury","medicine","menstruation","period","hurt","harm","wound"]},"pill":{"a":"Pill","b":"1F48A","j":["doctor","medicine","sick","health","pharmacy","drug"]},"adhesive-bandage":{"a":"Adhesive Bandage","b":"1FA79","j":["bandage","heal"]},"crutch":{"a":"⊛ Crutch","b":"1FA7C","j":["cane","disability","hurt","mobility aid","stick","accessibility","assist"]},"stethoscope":{"a":"Stethoscope","b":"1FA7A","j":["doctor","heart","medicine","health"]},"xray":{"a":"⊛ X-Ray","b":"1FA7B","j":["bones","doctor","medical","skeleton","x-ray","medicine"]},"door":{"a":"Door","b":"1F6AA","j":["house","entry","exit"]},"elevator":{"a":"Elevator","b":"1F6D7","j":["accessibility","hoist","lift"]},"mirror":{"a":"Mirror","b":"1FA9E","j":["reflection","reflector","speculum"]},"window":{"a":"Window","b":"1FA9F","j":["frame","fresh air","opening","transparent","view","scenery"]},"bed":{"a":"Bed","b":"1F6CF","j":["hotel","sleep","rest"]},"couch-and-lamp":{"a":"Couch and Lamp","b":"1F6CB","j":["couch","hotel","lamp","read","chill"]},"chair":{"a":"Chair","b":"1FA91","j":["seat","sit","furniture"]},"toilet":{"a":"Toilet","b":"1F6BD","j":["restroom","wc","washroom","bathroom","potty"]},"plunger":{"a":"Plunger","b":"1FAA0","j":["force cup","plumber","suction","toilet"]},"shower":{"a":"Shower","b":"1F6BF","j":["water","clean","bathroom"]},"bathtub":{"a":"Bathtub","b":"1F6C1","j":["bath","clean","shower","bathroom"]},"mouse-trap":{"a":"Mouse Trap","b":"1FAA4","j":["bait","mousetrap","snare","trap","cheese"]},"razor":{"a":"Razor","b":"1FA92","j":["sharp","shave","cut"]},"lotion-bottle":{"a":"Lotion Bottle","b":"1F9F4","j":["lotion","moisturizer","shampoo","sunscreen"]},"safety-pin":{"a":"Safety Pin","b":"1F9F7","j":["diaper","punk rock"]},"broom":{"a":"Broom","b":"1F9F9","j":["cleaning","sweeping","witch"]},"basket":{"a":"Basket","b":"1F9FA","j":["farming","laundry","picnic"]},"roll-of-paper":{"a":"Roll of Paper","b":"1F9FB","j":["paper towels","toilet paper","roll"]},"bucket":{"a":"Bucket","b":"1FAA3","j":["cask","pail","vat","water","container"]},"soap":{"a":"Soap","b":"1F9FC","j":["bar","bathing","cleaning","lather","soapdish"]},"bubbles":{"a":"⊛ Bubbles","b":"1FAE7","j":["burp","clean","soap","underwater","fun","carbonation","sparkling"]},"toothbrush":{"a":"Toothbrush","b":"1FAA5","j":["bathroom","brush","clean","dental","hygiene","teeth"]},"sponge":{"a":"Sponge","b":"1F9FD","j":["absorbing","cleaning","porous"]},"fire-extinguisher":{"a":"Fire Extinguisher","b":"1F9EF","j":["extinguish","fire","quench"]},"shopping-cart":{"a":"Shopping Cart","b":"1F6D2","j":["cart","shopping","trolley"]},"cigarette":{"a":"Cigarette","b":"1F6AC","j":["smoking","kills","tobacco","joint","smoke"]},"coffin":{"a":"Coffin","b":"26B0","j":["death","vampire","dead","die","rip","graveyard","cemetery","casket","funeral","box"]},"headstone":{"a":"Headstone","b":"1FAA6","j":["cemetery","grave","graveyard","tombstone","death","rip"]},"funeral-urn":{"a":"Funeral Urn","b":"26B1","j":["ashes","death","funeral","urn","dead","die","rip"]},"moai":{"a":"Moai","b":"1F5FF","j":["face","moyai","statue","rock","easter island"]},"placard":{"a":"Placard","b":"1FAA7","j":["demonstration","picket","protest","sign","announcement"]},"identification-card":{"a":"⊛ Identification Card","b":"1FAAA","j":["credentials","ID","license","security","document"]},"atm-sign":{"a":"Atm Sign","b":"1F3E7","j":["atm","ATM sign","automated","bank","teller","money","sales","cash","blue-square","payment"]},"litter-in-bin-sign":{"a":"Litter in Bin Sign","b":"1F6AE","j":["litter","litter bin","blue-square","sign","human","info"]},"potable-water":{"a":"Potable Water","b":"1F6B0","j":["drinking","potable","water","blue-square","liquid","restroom","cleaning","faucet"]},"wheelchair-symbol":{"a":"Wheelchair Symbol","b":"267F","j":["access","blue-square","disabled","accessibility"]},"mens-room":{"a":"Men’S Room","b":"1F6B9","j":["lavatory","man","men’s room","restroom","wc","men_s_room","toilet","blue-square","gender","male"]},"womens-room":{"a":"Women’S Room","b":"1F6BA","j":["lavatory","restroom","wc","woman","women’s room","women_s_room","purple-square","female","toilet","loo","gender"]},"restroom":{"a":"Restroom","b":"1F6BB","j":["lavatory","WC","blue-square","toilet","refresh","wc","gender"]},"baby-symbol":{"a":"Baby Symbol","b":"1F6BC","j":["baby","changing","orange-square","child"]},"water-closet":{"a":"Water Closet","b":"1F6BE","j":["closet","lavatory","restroom","water","wc","toilet","blue-square"]},"passport-control":{"a":"Passport Control","b":"1F6C2","j":["control","passport","custom","blue-square"]},"customs":{"a":"Customs","b":"1F6C3","j":["passport","border","blue-square"]},"baggage-claim":{"a":"Baggage Claim","b":"1F6C4","j":["baggage","claim","blue-square","airport","transport"]},"left-luggage":{"a":"Left Luggage","b":"1F6C5","j":["baggage","locker","luggage","blue-square","travel"]},"warning":{"a":"Warning","b":"26A0","j":["exclamation","wip","alert","error","problem","issue"]},"children-crossing":{"a":"Children Crossing","b":"1F6B8","j":["child","crossing","pedestrian","traffic","school","warning","danger","sign","driving","yellow-diamond"]},"no-entry":{"a":"No Entry","b":"26D4","j":["entry","forbidden","no","not","prohibited","traffic","limit","security","privacy","bad","denied","stop","circle"]},"prohibited":{"a":"Prohibited","b":"1F6AB","j":["entry","forbidden","no","not","forbid","stop","limit","denied","disallow","circle"]},"no-bicycles":{"a":"No Bicycles","b":"1F6B3","j":["bicycle","bike","forbidden","no","prohibited","cyclist","circle"]},"no-smoking":{"a":"No Smoking","b":"1F6AD","j":["forbidden","no","not","prohibited","smoking","cigarette","blue-square","smell","smoke"]},"no-littering":{"a":"No Littering","b":"1F6AF","j":["forbidden","litter","no","not","prohibited","trash","bin","garbage","circle"]},"nonpotable-water":{"a":"Non-Potable Water","b":"1F6B1","j":["non-drinking","non-potable","water","non_potable_water","drink","faucet","tap","circle"]},"no-pedestrians":{"a":"No Pedestrians","b":"1F6B7","j":["forbidden","no","not","pedestrian","prohibited","rules","crossing","walking","circle"]},"no-mobile-phones":{"a":"No Mobile Phones","b":"1F4F5","j":["cell","forbidden","mobile","no","phone","iphone","mute","circle"]},"no-one-under-eighteen":{"a":"No One Under Eighteen","b":"1F51E","j":["18","age restriction","eighteen","prohibited","underage","drink","pub","night","minor","circle"]},"radioactive":{"a":"Radioactive","b":"2622","j":["sign","nuclear","danger"]},"biohazard":{"a":"Biohazard","b":"2623","j":["sign","danger"]},"up-arrow":{"a":"Up Arrow","b":"2B06","j":["arrow","cardinal","direction","north","blue-square","continue","top"]},"upright-arrow":{"a":"Up-Right Arrow","b":"2197","j":["arrow","direction","intercardinal","northeast","up-right arrow","up_right_arrow","blue-square","point","diagonal"]},"right-arrow":{"a":"Right Arrow","b":"27A1","j":["arrow","cardinal","direction","east","blue-square","next"]},"downright-arrow":{"a":"Down-Right Arrow","b":"2198","j":["arrow","direction","down-right arrow","intercardinal","southeast","down_right_arrow","blue-square","diagonal"]},"down-arrow":{"a":"Down Arrow","b":"2B07","j":["arrow","cardinal","direction","down","south","blue-square","bottom"]},"downleft-arrow":{"a":"Down-Left Arrow","b":"2199","j":["arrow","direction","down-left arrow","intercardinal","southwest","down_left_arrow","blue-square","diagonal"]},"left-arrow":{"a":"Left Arrow","b":"2B05","j":["arrow","cardinal","direction","west","blue-square","previous","back"]},"upleft-arrow":{"a":"Up-Left Arrow","b":"2196","j":["arrow","direction","intercardinal","northwest","up-left arrow","up_left_arrow","blue-square","point","diagonal"]},"updown-arrow":{"a":"Up-Down Arrow","b":"2195","j":["arrow","up-down arrow","up_down_arrow","blue-square","direction","way","vertical"]},"leftright-arrow":{"a":"Left-Right Arrow","b":"2194","j":["arrow","left-right arrow","left_right_arrow","shape","direction","horizontal","sideways"]},"right-arrow-curving-left":{"a":"Right Arrow Curving Left","b":"21A9","j":["arrow","back","return","blue-square","undo","enter"]},"left-arrow-curving-right":{"a":"Left Arrow Curving Right","b":"21AA","j":["arrow","blue-square","return","rotate","direction"]},"right-arrow-curving-up":{"a":"Right Arrow Curving Up","b":"2934","j":["arrow","blue-square","direction","top"]},"right-arrow-curving-down":{"a":"Right Arrow Curving Down","b":"2935","j":["arrow","down","blue-square","direction","bottom"]},"clockwise-vertical-arrows":{"a":"Clockwise Vertical Arrows","b":"1F503","j":["arrow","clockwise","reload","sync","cycle","round","repeat"]},"counterclockwise-arrows-button":{"a":"Counterclockwise Arrows Button","b":"1F504","j":["anticlockwise","arrow","counterclockwise","withershins","blue-square","sync","cycle"]},"back-arrow":{"a":"Back Arrow","b":"1F519","j":["arrow","back","BACK arrow","words","return"]},"end-arrow":{"a":"End Arrow","b":"1F51A","j":["arrow","end","END arrow","words"]},"on-arrow":{"a":"On! Arrow","b":"1F51B","j":["arrow","mark","on","ON! arrow","words"]},"soon-arrow":{"a":"Soon Arrow","b":"1F51C","j":["arrow","soon","SOON arrow","words"]},"top-arrow":{"a":"Top Arrow","b":"1F51D","j":["arrow","top","TOP arrow","up","words","blue-square"]},"place-of-worship":{"a":"Place of Worship","b":"1F6D0","j":["religion","worship","church","temple","prayer"]},"atom-symbol":{"a":"Atom Symbol","b":"269B","j":["atheist","atom","science","physics","chemistry"]},"om":{"a":"Om","b":"1F549","j":["Hindu","religion","hinduism","buddhism","sikhism","jainism"]},"star-of-david":{"a":"Star of David","b":"2721","j":["David","Jew","Jewish","religion","star","star of David","judaism"]},"wheel-of-dharma":{"a":"Wheel of Dharma","b":"2638","j":["Buddhist","dharma","religion","wheel","hinduism","buddhism","sikhism","jainism"]},"yin-yang":{"a":"Yin Yang","b":"262F","j":["religion","tao","taoist","yang","yin","balance"]},"latin-cross":{"a":"Latin Cross","b":"271D","j":["Christian","cross","religion","christianity"]},"orthodox-cross":{"a":"Orthodox Cross","b":"2626","j":["Christian","cross","religion","suppedaneum"]},"star-and-crescent":{"a":"Star and Crescent","b":"262A","j":["islam","Muslim","religion"]},"peace-symbol":{"a":"Peace Symbol","b":"262E","j":["peace","hippie"]},"menorah":{"a":"Menorah","b":"1F54E","j":["candelabrum","candlestick","religion","hanukkah","candles","jewish"]},"dotted-sixpointed-star":{"a":"Dotted Six-Pointed Star","b":"1F52F","j":["dotted six-pointed star","fortune","star","dotted_six_pointed_star","purple-square","religion","jewish","hexagram"]},"aries":{"a":"Aries","b":"2648","j":["ram","zodiac","sign","purple-square","astrology"]},"taurus":{"a":"Taurus","b":"2649","j":["bull","ox","zodiac","purple-square","sign","astrology"]},"gemini":{"a":"Gemini","b":"264A","j":["twins","zodiac","sign","purple-square","astrology"]},"cancer":{"a":"Cancer","b":"264B","j":["crab","zodiac","sign","purple-square","astrology"]},"leo":{"a":"Leo","b":"264C","j":["lion","zodiac","sign","purple-square","astrology"]},"virgo":{"a":"Virgo","b":"264D","j":["zodiac","sign","purple-square","astrology"]},"libra":{"a":"Libra","b":"264E","j":["balance","justice","scales","zodiac","sign","purple-square","astrology"]},"scorpio":{"a":"Scorpio","b":"264F","j":["scorpion","scorpius","zodiac","sign","purple-square","astrology"]},"sagittarius":{"a":"Sagittarius","b":"2650","j":["archer","zodiac","sign","purple-square","astrology"]},"capricorn":{"a":"Capricorn","b":"2651","j":["goat","zodiac","sign","purple-square","astrology"]},"aquarius":{"a":"Aquarius","b":"2652","j":["bearer","water","zodiac","sign","purple-square","astrology"]},"pisces":{"a":"Pisces","b":"2653","j":["fish","zodiac","purple-square","sign","astrology"]},"ophiuchus":{"a":"Ophiuchus","b":"26CE","j":["bearer","serpent","snake","zodiac","sign","purple-square","constellation","astrology"]},"shuffle-tracks-button":{"a":"Shuffle Tracks Button","b":"1F500","j":["arrow","crossed","blue-square","shuffle","music","random"]},"repeat-button":{"a":"Repeat Button","b":"1F501","j":["arrow","clockwise","repeat","loop","record"]},"repeat-single-button":{"a":"Repeat Single Button","b":"1F502","j":["arrow","clockwise","once","blue-square","loop"]},"play-button":{"a":"Play Button","b":"25B6","j":["arrow","play","right","triangle","blue-square","direction"]},"fastforward-button":{"a":"Fast-Forward Button","b":"23E9","j":["arrow","double","fast","fast-forward button","forward","fast_forward_button","blue-square","play","speed","continue"]},"next-track-button":{"a":"Next Track Button","b":"23ED","j":["arrow","next scene","next track","triangle","forward","next","blue-square"]},"play-or-pause-button":{"a":"Play or Pause Button","b":"23EF","j":["arrow","pause","play","right","triangle","blue-square"]},"reverse-button":{"a":"Reverse Button","b":"25C0","j":["arrow","left","reverse","triangle","blue-square","direction"]},"fast-reverse-button":{"a":"Fast Reverse Button","b":"23EA","j":["arrow","double","rewind","play","blue-square"]},"last-track-button":{"a":"Last Track Button","b":"23EE","j":["arrow","previous scene","previous track","triangle","backward"]},"upwards-button":{"a":"Upwards Button","b":"1F53C","j":["arrow","button","red","blue-square","triangle","direction","point","forward","top"]},"fast-up-button":{"a":"Fast Up Button","b":"23EB","j":["arrow","double","blue-square","direction","top"]},"downwards-button":{"a":"Downwards Button","b":"1F53D","j":["arrow","button","down","red","blue-square","direction","bottom"]},"fast-down-button":{"a":"Fast Down Button","b":"23EC","j":["arrow","double","down","blue-square","direction","bottom"]},"pause-button":{"a":"Pause Button","b":"23F8","j":["bar","double","pause","vertical","blue-square"]},"stop-button":{"a":"Stop Button","b":"23F9","j":["square","stop","blue-square"]},"record-button":{"a":"Record Button","b":"23FA","j":["circle","record","blue-square"]},"eject-button":{"a":"Eject Button","b":"23CF","j":["eject","blue-square"]},"cinema":{"a":"Cinema","b":"1F3A6","j":["camera","film","movie","blue-square","record","curtain","stage","theater"]},"dim-button":{"a":"Dim Button","b":"1F505","j":["brightness","dim","low","sun","afternoon","warm","summer"]},"bright-button":{"a":"Bright Button","b":"1F506","j":["bright","brightness","sun","light"]},"antenna-bars":{"a":"Antenna Bars","b":"1F4F6","j":["antenna","bar","cell","mobile","phone","blue-square","reception","internet","connection","wifi","bluetooth","bars"]},"vibration-mode":{"a":"Vibration Mode","b":"1F4F3","j":["cell","mobile","mode","phone","telephone","vibration","orange-square"]},"mobile-phone-off":{"a":"Mobile Phone off","b":"1F4F4","j":["cell","mobile","off","phone","telephone","mute","orange-square","silence","quiet"]},"female-sign":{"a":"Female Sign","b":"2640","j":["woman","women","lady","girl"]},"male-sign":{"a":"Male Sign","b":"2642","j":["man","boy","men"]},"transgender-symbol":{"a":"Transgender Symbol","b":"26A7","j":["transgender","lgbtq"]},"multiply":{"a":"Multiply","b":"2716","j":["×","cancel","multiplication","sign","x","multiplication_sign","math","calculation"]},"plus":{"a":"Plus","b":"2795","j":["+","math","sign","plus_sign","calculation","addition","more","increase"]},"minus":{"a":"Minus","b":"2796","j":["-","−","math","sign","minus_sign","calculation","subtract","less"]},"divide":{"a":"Divide","b":"2797","j":["÷","division","math","sign","division_sign","calculation"]},"heavy-equals-sign":{"a":"⊛ Heavy Equals Sign","b":"1F7F0","j":["equality","math"]},"infinity":{"a":"Infinity","b":"267E","j":["forever","unbounded","universal"]},"double-exclamation-mark":{"a":"Double Exclamation Mark","b":"203C","j":["!","!!","bangbang","exclamation","mark","surprise"]},"exclamation-question-mark":{"a":"Exclamation Question Mark","b":"2049","j":["!","!?","?","exclamation","interrobang","mark","punctuation","question","wat","surprise"]},"red-question-mark":{"a":"Red Question Mark","b":"2753","j":["?","mark","punctuation","question","question_mark","doubt","confused"]},"white-question-mark":{"a":"White Question Mark","b":"2754","j":["?","mark","outlined","punctuation","question","doubts","gray","huh","confused"]},"white-exclamation-mark":{"a":"White Exclamation Mark","b":"2755","j":["!","exclamation","mark","outlined","punctuation","surprise","gray","wow","warning"]},"red-exclamation-mark":{"a":"Red Exclamation Mark","b":"2757","j":["!","exclamation","mark","punctuation","exclamation_mark","heavy_exclamation_mark","danger","surprise","wow","warning"]},"wavy-dash":{"a":"Wavy Dash","b":"3030","j":["dash","punctuation","wavy","draw","line","moustache","mustache","squiggle","scribble"]},"currency-exchange":{"a":"Currency Exchange","b":"1F4B1","j":["bank","currency","exchange","money","sales","dollar","travel"]},"heavy-dollar-sign":{"a":"Heavy Dollar Sign","b":"1F4B2","j":["currency","dollar","money","sales","payment","buck"]},"medical-symbol":{"a":"Medical Symbol","b":"2695","j":["aesculapius","medicine","staff","health","hospital"]},"recycling-symbol":{"a":"Recycling Symbol","b":"267B","j":["recycle","arrow","environment","garbage","trash"]},"fleurdelis":{"a":"Fleur-De-Lis","b":"269C","j":["fleur-de-lis","fleur_de_lis","decorative","scout"]},"trident-emblem":{"a":"Trident Emblem","b":"1F531","j":["anchor","emblem","ship","tool","trident","weapon","spear"]},"name-badge":{"a":"Name Badge","b":"1F4DB","j":["badge","name","fire","forbid"]},"japanese-symbol-for-beginner":{"a":"Japanese Symbol for Beginner","b":"1F530","j":["beginner","chevron","Japanese","Japanese symbol for beginner","leaf","badge","shield"]},"hollow-red-circle":{"a":"Hollow Red Circle","b":"2B55","j":["circle","large","o","red","round"]},"check-mark-button":{"a":"Check Mark Button","b":"2705","j":["✓","button","check","mark","green-square","ok","agree","vote","election","answer","tick"]},"check-box-with-check":{"a":"Check Box with Check","b":"2611","j":["✓","box","check","ok","agree","confirm","black-square","vote","election","yes","tick"]},"check-mark":{"a":"Check Mark","b":"2714","j":["✓","check","mark","ok","nike","answer","yes","tick"]},"cross-mark":{"a":"Cross Mark","b":"274C","j":["×","cancel","cross","mark","multiplication","multiply","x","no","delete","remove","red"]},"cross-mark-button":{"a":"Cross Mark Button","b":"274E","j":["×","mark","square","x","green-square","no","deny"]},"curly-loop":{"a":"Curly Loop","b":"27B0","j":["curl","loop","scribble","draw","shape","squiggle"]},"double-curly-loop":{"a":"Double Curly Loop","b":"27BF","j":["curl","double","loop","tape","cassette"]},"part-alternation-mark":{"a":"Part Alternation Mark","b":"303D","j":["mark","part","graph","presentation","stats","business","economics","bad"]},"eightspoked-asterisk":{"a":"Eight-Spoked Asterisk","b":"2733","j":["*","asterisk","eight-spoked asterisk","eight_spoked_asterisk","star","sparkle","green-square"]},"eightpointed-star":{"a":"Eight-Pointed Star","b":"2734","j":["*","eight-pointed star","star","eight_pointed_star","orange-square","shape","polygon"]},"sparkle":{"a":"Sparkle","b":"2747","j":["*","stars","green-square","awesome","good","fireworks"]},"copyright":{"a":"Copyright","b":"00A9","j":["c","ip","license","circle","law","legal"]},"registered":{"a":"Registered","b":"00AE","j":["r","alphabet","circle"]},"trade-mark":{"a":"Trade Mark","b":"2122","j":["mark","tm","trademark","brand","law","legal"]},"keycap":{"a":"Keycap: *","b":"002A-FE0F-20E3","j":["keycap_","star"]},"keycap-0":{"a":"Keycap: 0","b":"0030-FE0F-20E3","j":["keycap","0","numbers","blue-square","null"]},"keycap-1":{"a":"Keycap: 1","b":"0031-FE0F-20E3","j":["keycap","blue-square","numbers","1"]},"keycap-2":{"a":"Keycap: 2","b":"0032-FE0F-20E3","j":["keycap","numbers","2","prime","blue-square"]},"keycap-3":{"a":"Keycap: 3","b":"0033-FE0F-20E3","j":["keycap","3","numbers","prime","blue-square"]},"keycap-4":{"a":"Keycap: 4","b":"0034-FE0F-20E3","j":["keycap","4","numbers","blue-square"]},"keycap-5":{"a":"Keycap: 5","b":"0035-FE0F-20E3","j":["keycap","5","numbers","blue-square","prime"]},"keycap-6":{"a":"Keycap: 6","b":"0036-FE0F-20E3","j":["keycap","6","numbers","blue-square"]},"keycap-7":{"a":"Keycap: 7","b":"0037-FE0F-20E3","j":["keycap","7","numbers","blue-square","prime"]},"keycap-8":{"a":"Keycap: 8","b":"0038-FE0F-20E3","j":["keycap","8","blue-square","numbers"]},"keycap-9":{"a":"Keycap: 9","b":"0039-FE0F-20E3","j":["keycap","blue-square","numbers","9"]},"keycap-10":{"a":"Keycap: 10","b":"1F51F","j":["keycap","numbers","10","blue-square"]},"input-latin-uppercase":{"a":"Input Latin Uppercase","b":"1F520","j":["ABCD","input","latin","letters","uppercase","alphabet","words","blue-square"]},"input-latin-lowercase":{"a":"Input Latin Lowercase","b":"1F521","j":["abcd","input","latin","letters","lowercase","blue-square","alphabet"]},"input-numbers":{"a":"Input Numbers","b":"1F522","j":["1234","input","numbers","blue-square"]},"input-symbols":{"a":"Input Symbols","b":"1F523","j":["〒♪&%","input","blue-square","music","note","ampersand","percent","glyphs","characters"]},"input-latin-letters":{"a":"Input Latin Letters","b":"1F524","j":["abc","alphabet","input","latin","letters","blue-square"]},"a-button-blood-type":{"a":"A Button (Blood Type)","b":"1F170","j":["a","A button (blood type)","blood type","a_button","red-square","alphabet","letter"]},"ab-button-blood-type":{"a":"Ab Button (Blood Type)","b":"1F18E","j":["ab","AB button (blood type)","blood type","ab_button","red-square","alphabet"]},"b-button-blood-type":{"a":"B Button (Blood Type)","b":"1F171","j":["b","B button (blood type)","blood type","b_button","red-square","alphabet","letter"]},"cl-button":{"a":"Cl Button","b":"1F191","j":["cl","CL button","alphabet","words","red-square"]},"cool-button":{"a":"Cool Button","b":"1F192","j":["cool","COOL button","words","blue-square"]},"free-button":{"a":"Free Button","b":"1F193","j":["free","FREE button","blue-square","words"]},"information":{"a":"Information","b":"2139","j":["i","blue-square","alphabet","letter"]},"id-button":{"a":"Id Button","b":"1F194","j":["id","ID button","identity","purple-square","words"]},"circled-m":{"a":"Circled M","b":"24C2","j":["circle","circled M","m","alphabet","blue-circle","letter"]},"new-button":{"a":"New Button","b":"1F195","j":["new","NEW button","blue-square","words","start"]},"ng-button":{"a":"Ng Button","b":"1F196","j":["ng","NG button","blue-square","words","shape","icon"]},"o-button-blood-type":{"a":"O Button (Blood Type)","b":"1F17E","j":["blood type","o","O button (blood type)","o_button","alphabet","red-square","letter"]},"ok-button":{"a":"Ok Button","b":"1F197","j":["OK","OK button","good","agree","yes","blue-square"]},"p-button":{"a":"P Button","b":"1F17F","j":["P button","parking","cars","blue-square","alphabet","letter"]},"sos-button":{"a":"Sos Button","b":"1F198","j":["help","sos","SOS button","red-square","words","emergency","911"]},"up-button":{"a":"Up! Button","b":"1F199","j":["mark","up","UP! button","blue-square","above","high"]},"vs-button":{"a":"Vs Button","b":"1F19A","j":["versus","vs","VS button","words","orange-square"]},"japanese-here-button":{"a":"Japanese “Here” Button","b":"1F201","j":["“here”","Japanese","Japanese “here” button","katakana","ココ","blue-square","here","japanese","destination"]},"japanese-service-charge-button":{"a":"Japanese “Service Charge” Button","b":"1F202","j":["“service charge”","Japanese","Japanese “service charge” button","katakana","サ","japanese","blue-square"]},"japanese-monthly-amount-button":{"a":"Japanese “Monthly Amount” Button","b":"1F237","j":["“monthly amount”","ideograph","Japanese","Japanese “monthly amount” button","月","chinese","month","moon","japanese","orange-square","kanji"]},"japanese-not-free-of-charge-button":{"a":"Japanese “Not Free of Charge” Button","b":"1F236","j":["“not free of charge”","ideograph","Japanese","Japanese “not free of charge” button","有","orange-square","chinese","have","kanji"]},"japanese-reserved-button":{"a":"Japanese “Reserved” Button","b":"1F22F","j":["“reserved”","ideograph","Japanese","Japanese “reserved” button","指","chinese","point","green-square","kanji"]},"japanese-bargain-button":{"a":"Japanese “Bargain” Button","b":"1F250","j":["“bargain”","ideograph","Japanese","Japanese “bargain” button","得","chinese","kanji","obtain","get","circle"]},"japanese-discount-button":{"a":"Japanese “Discount” Button","b":"1F239","j":["“discount”","ideograph","Japanese","Japanese “discount” button","割","cut","divide","chinese","kanji","pink-square"]},"japanese-free-of-charge-button":{"a":"Japanese “Free of Charge” Button","b":"1F21A","j":["“free of charge”","ideograph","Japanese","Japanese “free of charge” button","無","nothing","chinese","kanji","japanese","orange-square"]},"japanese-prohibited-button":{"a":"Japanese “Prohibited” Button","b":"1F232","j":["“prohibited”","ideograph","Japanese","Japanese “prohibited” button","禁","kanji","japanese","chinese","forbidden","limit","restricted","red-square"]},"japanese-acceptable-button":{"a":"Japanese “Acceptable” Button","b":"1F251","j":["“acceptable”","ideograph","Japanese","Japanese “acceptable” button","可","ok","good","chinese","kanji","agree","yes","orange-circle"]},"japanese-application-button":{"a":"Japanese “Application” Button","b":"1F238","j":["“application”","ideograph","Japanese","Japanese “application” button","申","chinese","japanese","kanji","orange-square"]},"japanese-passing-grade-button":{"a":"Japanese “Passing Grade” Button","b":"1F234","j":["“passing grade”","ideograph","Japanese","Japanese “passing grade” button","合","japanese","chinese","join","kanji","red-square"]},"japanese-vacancy-button":{"a":"Japanese “Vacancy” Button","b":"1F233","j":["“vacancy”","ideograph","Japanese","Japanese “vacancy” button","空","kanji","japanese","chinese","empty","sky","blue-square"]},"japanese-congratulations-button":{"a":"Japanese “Congratulations” Button","b":"3297","j":["“congratulations”","ideograph","Japanese","Japanese “congratulations” button","祝","chinese","kanji","japanese","red-circle"]},"japanese-secret-button":{"a":"Japanese “Secret” Button","b":"3299","j":["“secret”","ideograph","Japanese","Japanese “secret” button","秘","privacy","chinese","sshh","kanji","red-circle"]},"japanese-open-for-business-button":{"a":"Japanese “Open for Business” Button","b":"1F23A","j":["“open for business”","ideograph","Japanese","Japanese “open for business” button","営","japanese","opening hours","orange-square"]},"japanese-no-vacancy-button":{"a":"Japanese “No Vacancy” Button","b":"1F235","j":["“no vacancy”","ideograph","Japanese","Japanese “no vacancy” button","満","full","chinese","japanese","red-square","kanji"]},"red-circle":{"a":"Red Circle","b":"1F534","j":["circle","geometric","red","shape","error","danger"]},"orange-circle":{"a":"Orange Circle","b":"1F7E0","j":["circle","orange","round"]},"yellow-circle":{"a":"Yellow Circle","b":"1F7E1","j":["circle","yellow","round"]},"green-circle":{"a":"Green Circle","b":"1F7E2","j":["circle","green","round"]},"blue-circle":{"a":"Blue Circle","b":"1F535","j":["blue","circle","geometric","shape","icon","button"]},"purple-circle":{"a":"Purple Circle","b":"1F7E3","j":["circle","purple","round"]},"brown-circle":{"a":"Brown Circle","b":"1F7E4","j":["brown","circle","round"]},"black-circle":{"a":"Black Circle","b":"26AB","j":["circle","geometric","shape","button","round"]},"white-circle":{"a":"White Circle","b":"26AA","j":["circle","geometric","shape","round"]},"red-square":{"a":"Red Square","b":"1F7E5","j":["red","square"]},"orange-square":{"a":"Orange Square","b":"1F7E7","j":["orange","square"]},"yellow-square":{"a":"Yellow Square","b":"1F7E8","j":["square","yellow"]},"green-square":{"a":"Green Square","b":"1F7E9","j":["green","square"]},"blue-square":{"a":"Blue Square","b":"1F7E6","j":["blue","square"]},"purple-square":{"a":"Purple Square","b":"1F7EA","j":["purple","square"]},"brown-square":{"a":"Brown Square","b":"1F7EB","j":["brown","square"]},"black-large-square":{"a":"Black Large Square","b":"2B1B","j":["geometric","square","shape","icon","button"]},"white-large-square":{"a":"White Large Square","b":"2B1C","j":["geometric","square","shape","icon","stone","button"]},"black-medium-square":{"a":"Black Medium Square","b":"25FC","j":["geometric","square","shape","button","icon"]},"white-medium-square":{"a":"White Medium Square","b":"25FB","j":["geometric","square","shape","stone","icon"]},"black-mediumsmall-square":{"a":"Black Medium-Small Square","b":"25FE","j":["black medium-small square","geometric","square","black_medium_small_square","icon","shape","button"]},"white-mediumsmall-square":{"a":"White Medium-Small Square","b":"25FD","j":["geometric","square","white medium-small square","white_medium_small_square","shape","stone","icon","button"]},"black-small-square":{"a":"Black Small Square","b":"25AA","j":["geometric","square","shape","icon"]},"white-small-square":{"a":"White Small Square","b":"25AB","j":["geometric","square","shape","icon"]},"large-orange-diamond":{"a":"Large Orange Diamond","b":"1F536","j":["diamond","geometric","orange","shape","jewel","gem"]},"large-blue-diamond":{"a":"Large Blue Diamond","b":"1F537","j":["blue","diamond","geometric","shape","jewel","gem"]},"small-orange-diamond":{"a":"Small Orange Diamond","b":"1F538","j":["diamond","geometric","orange","shape","jewel","gem"]},"small-blue-diamond":{"a":"Small Blue Diamond","b":"1F539","j":["blue","diamond","geometric","shape","jewel","gem"]},"red-triangle-pointed-up":{"a":"Red Triangle Pointed Up","b":"1F53A","j":["geometric","red","shape","direction","up","top"]},"red-triangle-pointed-down":{"a":"Red Triangle Pointed Down","b":"1F53B","j":["down","geometric","red","shape","direction","bottom"]},"diamond-with-a-dot":{"a":"Diamond with a Dot","b":"1F4A0","j":["comic","diamond","geometric","inside","jewel","blue","gem","crystal","fancy"]},"radio-button":{"a":"Radio Button","b":"1F518","j":["button","geometric","radio","input","old","music","circle"]},"white-square-button":{"a":"White Square Button","b":"1F533","j":["button","geometric","outlined","square","shape","input"]},"black-square-button":{"a":"Black Square Button","b":"1F532","j":["button","geometric","square","shape","input","frame"]},"chequered-flag":{"a":"Chequered Flag","b":"1F3C1","j":["checkered","chequered","racing","contest","finishline","race","gokart"]},"triangular-flag":{"a":"Triangular Flag","b":"1F6A9","j":["post","mark","milestone","place"]},"crossed-flags":{"a":"Crossed Flags","b":"1F38C","j":["celebration","cross","crossed","Japanese","japanese","nation","country","border"]},"black-flag":{"a":"Black Flag","b":"1F3F4","j":["waving","pirate"]},"white-flag":{"a":"White Flag","b":"1F3F3","j":["waving","losing","loser","lost","surrender","give up","fail"]},"rainbow-flag":{"a":"Rainbow Flag","b":"1F3F3-FE0F-200D-1F308","j":["pride","rainbow","flag","gay","lgbt","glbt","queer","homosexual","lesbian","bisexual","transgender"]},"transgender-flag":{"a":"Transgender Flag","b":"1F3F3-FE0F-200D-26A7-FE0F","j":["flag","light blue","pink","transgender","white","lgbtq"]},"pirate-flag":{"a":"Pirate Flag","b":"1F3F4-200D-2620-FE0F","j":["Jolly Roger","pirate","plunder","treasure","skull","crossbones","flag","banner"]},"flag-ascension-island":{"a":"Flag: Ascension Island","b":"1F1E6-1F1E8","j":["flag"]},"flag-andorra":{"a":"Flag: Andorra","b":"1F1E6-1F1E9","j":["flag","ad","nation","country","banner","andorra"]},"flag-united-arab-emirates":{"a":"Flag: United Arab Emirates","b":"1F1E6-1F1EA","j":["flag","united","arab","emirates","nation","country","banner","united_arab_emirates"]},"flag-afghanistan":{"a":"Flag: Afghanistan","b":"1F1E6-1F1EB","j":["flag","af","nation","country","banner","afghanistan"]},"flag-antigua--barbuda":{"a":"Flag: Antigua & Barbuda","b":"1F1E6-1F1EC","j":["flag","flag_antigua_barbuda","antigua","barbuda","nation","country","banner","antigua_barbuda"]},"flag-anguilla":{"a":"Flag: Anguilla","b":"1F1E6-1F1EE","j":["flag","ai","nation","country","banner","anguilla"]},"flag-albania":{"a":"Flag: Albania","b":"1F1E6-1F1F1","j":["flag","al","nation","country","banner","albania"]},"flag-armenia":{"a":"Flag: Armenia","b":"1F1E6-1F1F2","j":["flag","am","nation","country","banner","armenia"]},"flag-angola":{"a":"Flag: Angola","b":"1F1E6-1F1F4","j":["flag","ao","nation","country","banner","angola"]},"flag-antarctica":{"a":"Flag: Antarctica","b":"1F1E6-1F1F6","j":["flag","aq","nation","country","banner","antarctica"]},"flag-argentina":{"a":"Flag: Argentina","b":"1F1E6-1F1F7","j":["flag","ar","nation","country","banner","argentina"]},"flag-american-samoa":{"a":"Flag: American Samoa","b":"1F1E6-1F1F8","j":["flag","american","ws","nation","country","banner","american_samoa"]},"flag-austria":{"a":"Flag: Austria","b":"1F1E6-1F1F9","j":["flag","at","nation","country","banner","austria"]},"flag-australia":{"a":"Flag: Australia","b":"1F1E6-1F1FA","j":["flag","au","nation","country","banner","australia"]},"flag-aruba":{"a":"Flag: Aruba","b":"1F1E6-1F1FC","j":["flag","aw","nation","country","banner","aruba"]},"flag-land-islands":{"a":"Flag: Åland Islands","b":"1F1E6-1F1FD","j":["flag","flag_aland_islands","Åland","islands","nation","country","banner","aland_islands"]},"flag-azerbaijan":{"a":"Flag: Azerbaijan","b":"1F1E6-1F1FF","j":["flag","az","nation","country","banner","azerbaijan"]},"flag-bosnia--herzegovina":{"a":"Flag: Bosnia & Herzegovina","b":"1F1E7-1F1E6","j":["flag","flag_bosnia_herzegovina","bosnia","herzegovina","nation","country","banner","bosnia_herzegovina"]},"flag-barbados":{"a":"Flag: Barbados","b":"1F1E7-1F1E7","j":["flag","bb","nation","country","banner","barbados"]},"flag-bangladesh":{"a":"Flag: Bangladesh","b":"1F1E7-1F1E9","j":["flag","bd","nation","country","banner","bangladesh"]},"flag-belgium":{"a":"Flag: Belgium","b":"1F1E7-1F1EA","j":["flag","be","nation","country","banner","belgium"]},"flag-burkina-faso":{"a":"Flag: Burkina Faso","b":"1F1E7-1F1EB","j":["flag","burkina","faso","nation","country","banner","burkina_faso"]},"flag-bulgaria":{"a":"Flag: Bulgaria","b":"1F1E7-1F1EC","j":["flag","bg","nation","country","banner","bulgaria"]},"flag-bahrain":{"a":"Flag: Bahrain","b":"1F1E7-1F1ED","j":["flag","bh","nation","country","banner","bahrain"]},"flag-burundi":{"a":"Flag: Burundi","b":"1F1E7-1F1EE","j":["flag","bi","nation","country","banner","burundi"]},"flag-benin":{"a":"Flag: Benin","b":"1F1E7-1F1EF","j":["flag","bj","nation","country","banner","benin"]},"flag-st-barthlemy":{"a":"Flag: St. Barthélemy","b":"1F1E7-1F1F1","j":["flag","flag_st_barthelemy","saint","barthélemy","nation","country","banner","st_barthelemy"]},"flag-bermuda":{"a":"Flag: Bermuda","b":"1F1E7-1F1F2","j":["flag","bm","nation","country","banner","bermuda"]},"flag-brunei":{"a":"Flag: Brunei","b":"1F1E7-1F1F3","j":["flag","bn","darussalam","nation","country","banner","brunei"]},"flag-bolivia":{"a":"Flag: Bolivia","b":"1F1E7-1F1F4","j":["flag","bo","nation","country","banner","bolivia"]},"flag-caribbean-netherlands":{"a":"Flag: Caribbean Netherlands","b":"1F1E7-1F1F6","j":["flag","bonaire","nation","country","banner","caribbean_netherlands"]},"flag-brazil":{"a":"Flag: Brazil","b":"1F1E7-1F1F7","j":["flag","br","nation","country","banner","brazil"]},"flag-bahamas":{"a":"Flag: Bahamas","b":"1F1E7-1F1F8","j":["flag","bs","nation","country","banner","bahamas"]},"flag-bhutan":{"a":"Flag: Bhutan","b":"1F1E7-1F1F9","j":["flag","bt","nation","country","banner","bhutan"]},"flag-bouvet-island":{"a":"Flag: Bouvet Island","b":"1F1E7-1F1FB","j":["flag","norway"]},"flag-botswana":{"a":"Flag: Botswana","b":"1F1E7-1F1FC","j":["flag","bw","nation","country","banner","botswana"]},"flag-belarus":{"a":"Flag: Belarus","b":"1F1E7-1F1FE","j":["flag","by","nation","country","banner","belarus"]},"flag-belize":{"a":"Flag: Belize","b":"1F1E7-1F1FF","j":["flag","bz","nation","country","banner","belize"]},"flag-canada":{"a":"Flag: Canada","b":"1F1E8-1F1E6","j":["flag","ca","nation","country","banner","canada"]},"flag-cocos-keeling-islands":{"a":"Flag: Cocos (Keeling) Islands","b":"1F1E8-1F1E8","j":["flag","flag_cocos_islands","cocos","keeling","islands","nation","country","banner","cocos_islands"]},"flag-congo--kinshasa":{"a":"Flag: Congo - Kinshasa","b":"1F1E8-1F1E9","j":["flag","flag_congo_kinshasa","congo","democratic","republic","nation","country","banner","congo_kinshasa"]},"flag-central-african-republic":{"a":"Flag: Central African Republic","b":"1F1E8-1F1EB","j":["flag","central","african","republic","nation","country","banner","central_african_republic"]},"flag-congo--brazzaville":{"a":"Flag: Congo - Brazzaville","b":"1F1E8-1F1EC","j":["flag","flag_congo_brazzaville","congo","nation","country","banner","congo_brazzaville"]},"flag-switzerland":{"a":"Flag: Switzerland","b":"1F1E8-1F1ED","j":["flag","ch","nation","country","banner","switzerland"]},"flag-cte-divoire":{"a":"Flag: Côte D’Ivoire","b":"1F1E8-1F1EE","j":["flag","flag_cote_d_ivoire","ivory","coast","nation","country","banner","cote_d_ivoire"]},"flag-cook-islands":{"a":"Flag: Cook Islands","b":"1F1E8-1F1F0","j":["flag","cook","islands","nation","country","banner","cook_islands"]},"flag-chile":{"a":"Flag: Chile","b":"1F1E8-1F1F1","j":["flag","nation","country","banner","chile"]},"flag-cameroon":{"a":"Flag: Cameroon","b":"1F1E8-1F1F2","j":["flag","cm","nation","country","banner","cameroon"]},"flag-china":{"a":"Flag: China","b":"1F1E8-1F1F3","j":["flag","china","chinese","prc","country","nation","banner"]},"flag-colombia":{"a":"Flag: Colombia","b":"1F1E8-1F1F4","j":["flag","co","nation","country","banner","colombia"]},"flag-clipperton-island":{"a":"Flag: Clipperton Island","b":"1F1E8-1F1F5","j":["flag"]},"flag-costa-rica":{"a":"Flag: Costa Rica","b":"1F1E8-1F1F7","j":["flag","costa","rica","nation","country","banner","costa_rica"]},"flag-cuba":{"a":"Flag: Cuba","b":"1F1E8-1F1FA","j":["flag","cu","nation","country","banner","cuba"]},"flag-cape-verde":{"a":"Flag: Cape Verde","b":"1F1E8-1F1FB","j":["flag","cabo","verde","nation","country","banner","cape_verde"]},"flag-curaao":{"a":"Flag: Curaçao","b":"1F1E8-1F1FC","j":["flag","flag_curacao","curaçao","nation","country","banner","curacao"]},"flag-christmas-island":{"a":"Flag: Christmas Island","b":"1F1E8-1F1FD","j":["flag","christmas","island","nation","country","banner","christmas_island"]},"flag-cyprus":{"a":"Flag: Cyprus","b":"1F1E8-1F1FE","j":["flag","cy","nation","country","banner","cyprus"]},"flag-czechia":{"a":"Flag: Czechia","b":"1F1E8-1F1FF","j":["flag","cz","nation","country","banner","czechia"]},"flag-germany":{"a":"Flag: Germany","b":"1F1E9-1F1EA","j":["flag","german","nation","country","banner","germany"]},"flag-diego-garcia":{"a":"Flag: Diego Garcia","b":"1F1E9-1F1EC","j":["flag"]},"flag-djibouti":{"a":"Flag: Djibouti","b":"1F1E9-1F1EF","j":["flag","dj","nation","country","banner","djibouti"]},"flag-denmark":{"a":"Flag: Denmark","b":"1F1E9-1F1F0","j":["flag","dk","nation","country","banner","denmark"]},"flag-dominica":{"a":"Flag: Dominica","b":"1F1E9-1F1F2","j":["flag","dm","nation","country","banner","dominica"]},"flag-dominican-republic":{"a":"Flag: Dominican Republic","b":"1F1E9-1F1F4","j":["flag","dominican","republic","nation","country","banner","dominican_republic"]},"flag-algeria":{"a":"Flag: Algeria","b":"1F1E9-1F1FF","j":["flag","dz","nation","country","banner","algeria"]},"flag-ceuta--melilla":{"a":"Flag: Ceuta & Melilla","b":"1F1EA-1F1E6","j":["flag","flag_ceuta_melilla"]},"flag-ecuador":{"a":"Flag: Ecuador","b":"1F1EA-1F1E8","j":["flag","ec","nation","country","banner","ecuador"]},"flag-estonia":{"a":"Flag: Estonia","b":"1F1EA-1F1EA","j":["flag","ee","nation","country","banner","estonia"]},"flag-egypt":{"a":"Flag: Egypt","b":"1F1EA-1F1EC","j":["flag","eg","nation","country","banner","egypt"]},"flag-western-sahara":{"a":"Flag: Western Sahara","b":"1F1EA-1F1ED","j":["flag","western","sahara","nation","country","banner","western_sahara"]},"flag-eritrea":{"a":"Flag: Eritrea","b":"1F1EA-1F1F7","j":["flag","er","nation","country","banner","eritrea"]},"flag-spain":{"a":"Flag: Spain","b":"1F1EA-1F1F8","j":["flag","spain","nation","country","banner"]},"flag-ethiopia":{"a":"Flag: Ethiopia","b":"1F1EA-1F1F9","j":["flag","et","nation","country","banner","ethiopia"]},"flag-european-union":{"a":"Flag: European Union","b":"1F1EA-1F1FA","j":["flag","european","union","banner"]},"flag-finland":{"a":"Flag: Finland","b":"1F1EB-1F1EE","j":["flag","fi","nation","country","banner","finland"]},"flag-fiji":{"a":"Flag: Fiji","b":"1F1EB-1F1EF","j":["flag","fj","nation","country","banner","fiji"]},"flag-falkland-islands":{"a":"Flag: Falkland Islands","b":"1F1EB-1F1F0","j":["flag","falkland","islands","malvinas","nation","country","banner","falkland_islands"]},"flag-micronesia":{"a":"Flag: Micronesia","b":"1F1EB-1F1F2","j":["flag","micronesia","federated","states","nation","country","banner"]},"flag-faroe-islands":{"a":"Flag: Faroe Islands","b":"1F1EB-1F1F4","j":["flag","faroe","islands","nation","country","banner","faroe_islands"]},"flag-france":{"a":"Flag: France","b":"1F1EB-1F1F7","j":["flag","banner","nation","france","french","country"]},"flag-gabon":{"a":"Flag: Gabon","b":"1F1EC-1F1E6","j":["flag","ga","nation","country","banner","gabon"]},"flag-united-kingdom":{"a":"Flag: United Kingdom","b":"1F1EC-1F1E7","j":["flag","united","kingdom","great","britain","northern","ireland","nation","country","banner","british","UK","english","england","union jack","united_kingdom"]},"flag-grenada":{"a":"Flag: Grenada","b":"1F1EC-1F1E9","j":["flag","gd","nation","country","banner","grenada"]},"flag-georgia":{"a":"Flag: Georgia","b":"1F1EC-1F1EA","j":["flag","ge","nation","country","banner","georgia"]},"flag-french-guiana":{"a":"Flag: French Guiana","b":"1F1EC-1F1EB","j":["flag","french","guiana","nation","country","banner","french_guiana"]},"flag-guernsey":{"a":"Flag: Guernsey","b":"1F1EC-1F1EC","j":["flag","gg","nation","country","banner","guernsey"]},"flag-ghana":{"a":"Flag: Ghana","b":"1F1EC-1F1ED","j":["flag","gh","nation","country","banner","ghana"]},"flag-gibraltar":{"a":"Flag: Gibraltar","b":"1F1EC-1F1EE","j":["flag","gi","nation","country","banner","gibraltar"]},"flag-greenland":{"a":"Flag: Greenland","b":"1F1EC-1F1F1","j":["flag","gl","nation","country","banner","greenland"]},"flag-gambia":{"a":"Flag: Gambia","b":"1F1EC-1F1F2","j":["flag","gm","nation","country","banner","gambia"]},"flag-guinea":{"a":"Flag: Guinea","b":"1F1EC-1F1F3","j":["flag","gn","nation","country","banner","guinea"]},"flag-guadeloupe":{"a":"Flag: Guadeloupe","b":"1F1EC-1F1F5","j":["flag","gp","nation","country","banner","guadeloupe"]},"flag-equatorial-guinea":{"a":"Flag: Equatorial Guinea","b":"1F1EC-1F1F6","j":["flag","equatorial","gn","nation","country","banner","equatorial_guinea"]},"flag-greece":{"a":"Flag: Greece","b":"1F1EC-1F1F7","j":["flag","gr","nation","country","banner","greece"]},"flag-south-georgia--south-sandwich-islands":{"a":"Flag: South Georgia & South Sandwich Islands","b":"1F1EC-1F1F8","j":["flag","flag_south_georgia_south_sandwich_islands","south","georgia","sandwich","islands","nation","country","banner","south_georgia_south_sandwich_islands"]},"flag-guatemala":{"a":"Flag: Guatemala","b":"1F1EC-1F1F9","j":["flag","gt","nation","country","banner","guatemala"]},"flag-guam":{"a":"Flag: Guam","b":"1F1EC-1F1FA","j":["flag","gu","nation","country","banner","guam"]},"flag-guineabissau":{"a":"Flag: Guinea-Bissau","b":"1F1EC-1F1FC","j":["flag","flag_guinea_bissau","gw","bissau","nation","country","banner","guinea_bissau"]},"flag-guyana":{"a":"Flag: Guyana","b":"1F1EC-1F1FE","j":["flag","gy","nation","country","banner","guyana"]},"flag-hong-kong-sar-china":{"a":"Flag: Hong Kong Sar China","b":"1F1ED-1F1F0","j":["flag","hong","kong","nation","country","banner","hong_kong_sar_china"]},"flag-heard--mcdonald-islands":{"a":"Flag: Heard & Mcdonald Islands","b":"1F1ED-1F1F2","j":["flag","flag_heard_mcdonald_islands"]},"flag-honduras":{"a":"Flag: Honduras","b":"1F1ED-1F1F3","j":["flag","hn","nation","country","banner","honduras"]},"flag-croatia":{"a":"Flag: Croatia","b":"1F1ED-1F1F7","j":["flag","hr","nation","country","banner","croatia"]},"flag-haiti":{"a":"Flag: Haiti","b":"1F1ED-1F1F9","j":["flag","ht","nation","country","banner","haiti"]},"flag-hungary":{"a":"Flag: Hungary","b":"1F1ED-1F1FA","j":["flag","hu","nation","country","banner","hungary"]},"flag-canary-islands":{"a":"Flag: Canary Islands","b":"1F1EE-1F1E8","j":["flag","canary","islands","nation","country","banner","canary_islands"]},"flag-indonesia":{"a":"Flag: Indonesia","b":"1F1EE-1F1E9","j":["flag","nation","country","banner","indonesia"]},"flag-ireland":{"a":"Flag: Ireland","b":"1F1EE-1F1EA","j":["flag","ie","nation","country","banner","ireland"]},"flag-israel":{"a":"Flag: Israel","b":"1F1EE-1F1F1","j":["flag","il","nation","country","banner","israel"]},"flag-isle-of-man":{"a":"Flag: Isle of Man","b":"1F1EE-1F1F2","j":["flag","isle","man","nation","country","banner","isle_of_man"]},"flag-india":{"a":"Flag: India","b":"1F1EE-1F1F3","j":["flag","in","nation","country","banner","india"]},"flag-british-indian-ocean-territory":{"a":"Flag: British Indian Ocean Territory","b":"1F1EE-1F1F4","j":["flag","british","indian","ocean","territory","nation","country","banner","british_indian_ocean_territory"]},"flag-iraq":{"a":"Flag: Iraq","b":"1F1EE-1F1F6","j":["flag","iq","nation","country","banner","iraq"]},"flag-iran":{"a":"Flag: Iran","b":"1F1EE-1F1F7","j":["flag","iran","islamic","republic","nation","country","banner"]},"flag-iceland":{"a":"Flag: Iceland","b":"1F1EE-1F1F8","j":["flag","is","nation","country","banner","iceland"]},"flag-italy":{"a":"Flag: Italy","b":"1F1EE-1F1F9","j":["flag","italy","nation","country","banner"]},"flag-jersey":{"a":"Flag: Jersey","b":"1F1EF-1F1EA","j":["flag","je","nation","country","banner","jersey"]},"flag-jamaica":{"a":"Flag: Jamaica","b":"1F1EF-1F1F2","j":["flag","jm","nation","country","banner","jamaica"]},"flag-jordan":{"a":"Flag: Jordan","b":"1F1EF-1F1F4","j":["flag","jo","nation","country","banner","jordan"]},"flag-japan":{"a":"Flag: Japan","b":"1F1EF-1F1F5","j":["flag","japanese","nation","country","banner","japan"]},"flag-kenya":{"a":"Flag: Kenya","b":"1F1F0-1F1EA","j":["flag","ke","nation","country","banner","kenya"]},"flag-kyrgyzstan":{"a":"Flag: Kyrgyzstan","b":"1F1F0-1F1EC","j":["flag","kg","nation","country","banner","kyrgyzstan"]},"flag-cambodia":{"a":"Flag: Cambodia","b":"1F1F0-1F1ED","j":["flag","kh","nation","country","banner","cambodia"]},"flag-kiribati":{"a":"Flag: Kiribati","b":"1F1F0-1F1EE","j":["flag","ki","nation","country","banner","kiribati"]},"flag-comoros":{"a":"Flag: Comoros","b":"1F1F0-1F1F2","j":["flag","km","nation","country","banner","comoros"]},"flag-st-kitts--nevis":{"a":"Flag: St. Kitts & Nevis","b":"1F1F0-1F1F3","j":["flag","flag_st_kitts_nevis","saint","kitts","nevis","nation","country","banner","st_kitts_nevis"]},"flag-north-korea":{"a":"Flag: North Korea","b":"1F1F0-1F1F5","j":["flag","north","korea","nation","country","banner","north_korea"]},"flag-south-korea":{"a":"Flag: South Korea","b":"1F1F0-1F1F7","j":["flag","south","korea","nation","country","banner","south_korea"]},"flag-kuwait":{"a":"Flag: Kuwait","b":"1F1F0-1F1FC","j":["flag","kw","nation","country","banner","kuwait"]},"flag-cayman-islands":{"a":"Flag: Cayman Islands","b":"1F1F0-1F1FE","j":["flag","cayman","islands","nation","country","banner","cayman_islands"]},"flag-kazakhstan":{"a":"Flag: Kazakhstan","b":"1F1F0-1F1FF","j":["flag","kz","nation","country","banner","kazakhstan"]},"flag-laos":{"a":"Flag: Laos","b":"1F1F1-1F1E6","j":["flag","lao","democratic","republic","nation","country","banner","laos"]},"flag-lebanon":{"a":"Flag: Lebanon","b":"1F1F1-1F1E7","j":["flag","lb","nation","country","banner","lebanon"]},"flag-st-lucia":{"a":"Flag: St. Lucia","b":"1F1F1-1F1E8","j":["flag","saint","lucia","nation","country","banner","st_lucia"]},"flag-liechtenstein":{"a":"Flag: Liechtenstein","b":"1F1F1-1F1EE","j":["flag","li","nation","country","banner","liechtenstein"]},"flag-sri-lanka":{"a":"Flag: Sri Lanka","b":"1F1F1-1F1F0","j":["flag","sri","lanka","nation","country","banner","sri_lanka"]},"flag-liberia":{"a":"Flag: Liberia","b":"1F1F1-1F1F7","j":["flag","lr","nation","country","banner","liberia"]},"flag-lesotho":{"a":"Flag: Lesotho","b":"1F1F1-1F1F8","j":["flag","ls","nation","country","banner","lesotho"]},"flag-lithuania":{"a":"Flag: Lithuania","b":"1F1F1-1F1F9","j":["flag","lt","nation","country","banner","lithuania"]},"flag-luxembourg":{"a":"Flag: Luxembourg","b":"1F1F1-1F1FA","j":["flag","lu","nation","country","banner","luxembourg"]},"flag-latvia":{"a":"Flag: Latvia","b":"1F1F1-1F1FB","j":["flag","lv","nation","country","banner","latvia"]},"flag-libya":{"a":"Flag: Libya","b":"1F1F1-1F1FE","j":["flag","ly","nation","country","banner","libya"]},"flag-morocco":{"a":"Flag: Morocco","b":"1F1F2-1F1E6","j":["flag","ma","nation","country","banner","morocco"]},"flag-monaco":{"a":"Flag: Monaco","b":"1F1F2-1F1E8","j":["flag","mc","nation","country","banner","monaco"]},"flag-moldova":{"a":"Flag: Moldova","b":"1F1F2-1F1E9","j":["flag","moldova","republic","nation","country","banner"]},"flag-montenegro":{"a":"Flag: Montenegro","b":"1F1F2-1F1EA","j":["flag","me","nation","country","banner","montenegro"]},"flag-st-martin":{"a":"Flag: St. Martin","b":"1F1F2-1F1EB","j":["flag"]},"flag-madagascar":{"a":"Flag: Madagascar","b":"1F1F2-1F1EC","j":["flag","mg","nation","country","banner","madagascar"]},"flag-marshall-islands":{"a":"Flag: Marshall Islands","b":"1F1F2-1F1ED","j":["flag","marshall","islands","nation","country","banner","marshall_islands"]},"flag-north-macedonia":{"a":"Flag: North Macedonia","b":"1F1F2-1F1F0","j":["flag","macedonia","nation","country","banner","north_macedonia"]},"flag-mali":{"a":"Flag: Mali","b":"1F1F2-1F1F1","j":["flag","ml","nation","country","banner","mali"]},"flag-myanmar-burma":{"a":"Flag: Myanmar (Burma)","b":"1F1F2-1F1F2","j":["flag","flag_myanmar","mm","nation","country","banner","myanmar"]},"flag-mongolia":{"a":"Flag: Mongolia","b":"1F1F2-1F1F3","j":["flag","mn","nation","country","banner","mongolia"]},"flag-macao-sar-china":{"a":"Flag: Macao Sar China","b":"1F1F2-1F1F4","j":["flag","macao","nation","country","banner","macao_sar_china"]},"flag-northern-mariana-islands":{"a":"Flag: Northern Mariana Islands","b":"1F1F2-1F1F5","j":["flag","northern","mariana","islands","nation","country","banner","northern_mariana_islands"]},"flag-martinique":{"a":"Flag: Martinique","b":"1F1F2-1F1F6","j":["flag","mq","nation","country","banner","martinique"]},"flag-mauritania":{"a":"Flag: Mauritania","b":"1F1F2-1F1F7","j":["flag","mr","nation","country","banner","mauritania"]},"flag-montserrat":{"a":"Flag: Montserrat","b":"1F1F2-1F1F8","j":["flag","ms","nation","country","banner","montserrat"]},"flag-malta":{"a":"Flag: Malta","b":"1F1F2-1F1F9","j":["flag","mt","nation","country","banner","malta"]},"flag-mauritius":{"a":"Flag: Mauritius","b":"1F1F2-1F1FA","j":["flag","mu","nation","country","banner","mauritius"]},"flag-maldives":{"a":"Flag: Maldives","b":"1F1F2-1F1FB","j":["flag","mv","nation","country","banner","maldives"]},"flag-malawi":{"a":"Flag: Malawi","b":"1F1F2-1F1FC","j":["flag","mw","nation","country","banner","malawi"]},"flag-mexico":{"a":"Flag: Mexico","b":"1F1F2-1F1FD","j":["flag","mx","nation","country","banner","mexico"]},"flag-malaysia":{"a":"Flag: Malaysia","b":"1F1F2-1F1FE","j":["flag","my","nation","country","banner","malaysia"]},"flag-mozambique":{"a":"Flag: Mozambique","b":"1F1F2-1F1FF","j":["flag","mz","nation","country","banner","mozambique"]},"flag-namibia":{"a":"Flag: Namibia","b":"1F1F3-1F1E6","j":["flag","na","nation","country","banner","namibia"]},"flag-new-caledonia":{"a":"Flag: New Caledonia","b":"1F1F3-1F1E8","j":["flag","new","caledonia","nation","country","banner","new_caledonia"]},"flag-niger":{"a":"Flag: Niger","b":"1F1F3-1F1EA","j":["flag","ne","nation","country","banner","niger"]},"flag-norfolk-island":{"a":"Flag: Norfolk Island","b":"1F1F3-1F1EB","j":["flag","norfolk","island","nation","country","banner","norfolk_island"]},"flag-nigeria":{"a":"Flag: Nigeria","b":"1F1F3-1F1EC","j":["flag","nation","country","banner","nigeria"]},"flag-nicaragua":{"a":"Flag: Nicaragua","b":"1F1F3-1F1EE","j":["flag","ni","nation","country","banner","nicaragua"]},"flag-netherlands":{"a":"Flag: Netherlands","b":"1F1F3-1F1F1","j":["flag","nl","nation","country","banner","netherlands"]},"flag-norway":{"a":"Flag: Norway","b":"1F1F3-1F1F4","j":["flag","no","nation","country","banner","norway"]},"flag-nepal":{"a":"Flag: Nepal","b":"1F1F3-1F1F5","j":["flag","np","nation","country","banner","nepal"]},"flag-nauru":{"a":"Flag: Nauru","b":"1F1F3-1F1F7","j":["flag","nr","nation","country","banner","nauru"]},"flag-niue":{"a":"Flag: Niue","b":"1F1F3-1F1FA","j":["flag","nu","nation","country","banner","niue"]},"flag-new-zealand":{"a":"Flag: New Zealand","b":"1F1F3-1F1FF","j":["flag","new","zealand","nation","country","banner","new_zealand"]},"flag-oman":{"a":"Flag: Oman","b":"1F1F4-1F1F2","j":["flag","om_symbol","nation","country","banner","oman"]},"flag-panama":{"a":"Flag: Panama","b":"1F1F5-1F1E6","j":["flag","pa","nation","country","banner","panama"]},"flag-peru":{"a":"Flag: Peru","b":"1F1F5-1F1EA","j":["flag","pe","nation","country","banner","peru"]},"flag-french-polynesia":{"a":"Flag: French Polynesia","b":"1F1F5-1F1EB","j":["flag","french","polynesia","nation","country","banner","french_polynesia"]},"flag-papua-new-guinea":{"a":"Flag: Papua New Guinea","b":"1F1F5-1F1EC","j":["flag","papua","new","guinea","nation","country","banner","papua_new_guinea"]},"flag-philippines":{"a":"Flag: Philippines","b":"1F1F5-1F1ED","j":["flag","ph","nation","country","banner","philippines"]},"flag-pakistan":{"a":"Flag: Pakistan","b":"1F1F5-1F1F0","j":["flag","pk","nation","country","banner","pakistan"]},"flag-poland":{"a":"Flag: Poland","b":"1F1F5-1F1F1","j":["flag","pl","nation","country","banner","poland"]},"flag-st-pierre--miquelon":{"a":"Flag: St. Pierre & Miquelon","b":"1F1F5-1F1F2","j":["flag","flag_st_pierre_miquelon","saint","pierre","miquelon","nation","country","banner","st_pierre_miquelon"]},"flag-pitcairn-islands":{"a":"Flag: Pitcairn Islands","b":"1F1F5-1F1F3","j":["flag","pitcairn","nation","country","banner","pitcairn_islands"]},"flag-puerto-rico":{"a":"Flag: Puerto Rico","b":"1F1F5-1F1F7","j":["flag","puerto","rico","nation","country","banner","puerto_rico"]},"flag-palestinian-territories":{"a":"Flag: Palestinian Territories","b":"1F1F5-1F1F8","j":["flag","palestine","palestinian","territories","nation","country","banner","palestinian_territories"]},"flag-portugal":{"a":"Flag: Portugal","b":"1F1F5-1F1F9","j":["flag","pt","nation","country","banner","portugal"]},"flag-palau":{"a":"Flag: Palau","b":"1F1F5-1F1FC","j":["flag","pw","nation","country","banner","palau"]},"flag-paraguay":{"a":"Flag: Paraguay","b":"1F1F5-1F1FE","j":["flag","py","nation","country","banner","paraguay"]},"flag-qatar":{"a":"Flag: Qatar","b":"1F1F6-1F1E6","j":["flag","qa","nation","country","banner","qatar"]},"flag-runion":{"a":"Flag: Réunion","b":"1F1F7-1F1EA","j":["flag","flag_reunion","réunion","nation","country","banner","reunion"]},"flag-romania":{"a":"Flag: Romania","b":"1F1F7-1F1F4","j":["flag","ro","nation","country","banner","romania"]},"flag-serbia":{"a":"Flag: Serbia","b":"1F1F7-1F1F8","j":["flag","rs","nation","country","banner","serbia"]},"flag-russia":{"a":"Flag: Russia","b":"1F1F7-1F1FA","j":["flag","russian","federation","nation","country","banner","russia"]},"flag-rwanda":{"a":"Flag: Rwanda","b":"1F1F7-1F1FC","j":["flag","rw","nation","country","banner","rwanda"]},"flag-saudi-arabia":{"a":"Flag: Saudi Arabia","b":"1F1F8-1F1E6","j":["flag","nation","country","banner","saudi_arabia"]},"flag-solomon-islands":{"a":"Flag: Solomon Islands","b":"1F1F8-1F1E7","j":["flag","solomon","islands","nation","country","banner","solomon_islands"]},"flag-seychelles":{"a":"Flag: Seychelles","b":"1F1F8-1F1E8","j":["flag","sc","nation","country","banner","seychelles"]},"flag-sudan":{"a":"Flag: Sudan","b":"1F1F8-1F1E9","j":["flag","sd","nation","country","banner","sudan"]},"flag-sweden":{"a":"Flag: Sweden","b":"1F1F8-1F1EA","j":["flag","se","nation","country","banner","sweden"]},"flag-singapore":{"a":"Flag: Singapore","b":"1F1F8-1F1EC","j":["flag","sg","nation","country","banner","singapore"]},"flag-st-helena":{"a":"Flag: St. Helena","b":"1F1F8-1F1ED","j":["flag","saint","helena","ascension","tristan","cunha","nation","country","banner","st_helena"]},"flag-slovenia":{"a":"Flag: Slovenia","b":"1F1F8-1F1EE","j":["flag","si","nation","country","banner","slovenia"]},"flag-svalbard--jan-mayen":{"a":"Flag: Svalbard & Jan Mayen","b":"1F1F8-1F1EF","j":["flag","flag_svalbard_jan_mayen"]},"flag-slovakia":{"a":"Flag: Slovakia","b":"1F1F8-1F1F0","j":["flag","sk","nation","country","banner","slovakia"]},"flag-sierra-leone":{"a":"Flag: Sierra Leone","b":"1F1F8-1F1F1","j":["flag","sierra","leone","nation","country","banner","sierra_leone"]},"flag-san-marino":{"a":"Flag: San Marino","b":"1F1F8-1F1F2","j":["flag","san","marino","nation","country","banner","san_marino"]},"flag-senegal":{"a":"Flag: Senegal","b":"1F1F8-1F1F3","j":["flag","sn","nation","country","banner","senegal"]},"flag-somalia":{"a":"Flag: Somalia","b":"1F1F8-1F1F4","j":["flag","so","nation","country","banner","somalia"]},"flag-suriname":{"a":"Flag: Suriname","b":"1F1F8-1F1F7","j":["flag","sr","nation","country","banner","suriname"]},"flag-south-sudan":{"a":"Flag: South Sudan","b":"1F1F8-1F1F8","j":["flag","south","sd","nation","country","banner","south_sudan"]},"flag-so-tom--prncipe":{"a":"Flag: São Tomé & Príncipe","b":"1F1F8-1F1F9","j":["flag","flag_sao_tome_principe","sao","tome","principe","nation","country","banner","sao_tome_principe"]},"flag-el-salvador":{"a":"Flag: El Salvador","b":"1F1F8-1F1FB","j":["flag","el","salvador","nation","country","banner","el_salvador"]},"flag-sint-maarten":{"a":"Flag: Sint Maarten","b":"1F1F8-1F1FD","j":["flag","sint","maarten","dutch","nation","country","banner","sint_maarten"]},"flag-syria":{"a":"Flag: Syria","b":"1F1F8-1F1FE","j":["flag","syrian","arab","republic","nation","country","banner","syria"]},"flag-eswatini":{"a":"Flag: Eswatini","b":"1F1F8-1F1FF","j":["flag","sz","nation","country","banner","eswatini"]},"flag-tristan-da-cunha":{"a":"Flag: Tristan Da Cunha","b":"1F1F9-1F1E6","j":["flag"]},"flag-turks--caicos-islands":{"a":"Flag: Turks & Caicos Islands","b":"1F1F9-1F1E8","j":["flag","flag_turks_caicos_islands","turks","caicos","islands","nation","country","banner","turks_caicos_islands"]},"flag-chad":{"a":"Flag: Chad","b":"1F1F9-1F1E9","j":["flag","td","nation","country","banner","chad"]},"flag-french-southern-territories":{"a":"Flag: French Southern Territories","b":"1F1F9-1F1EB","j":["flag","french","southern","territories","nation","country","banner","french_southern_territories"]},"flag-togo":{"a":"Flag: Togo","b":"1F1F9-1F1EC","j":["flag","tg","nation","country","banner","togo"]},"flag-thailand":{"a":"Flag: Thailand","b":"1F1F9-1F1ED","j":["flag","th","nation","country","banner","thailand"]},"flag-tajikistan":{"a":"Flag: Tajikistan","b":"1F1F9-1F1EF","j":["flag","tj","nation","country","banner","tajikistan"]},"flag-tokelau":{"a":"Flag: Tokelau","b":"1F1F9-1F1F0","j":["flag","tk","nation","country","banner","tokelau"]},"flag-timorleste":{"a":"Flag: Timor-Leste","b":"1F1F9-1F1F1","j":["flag","flag_timor_leste","timor","leste","nation","country","banner","timor_leste"]},"flag-turkmenistan":{"a":"Flag: Turkmenistan","b":"1F1F9-1F1F2","j":["flag","nation","country","banner","turkmenistan"]},"flag-tunisia":{"a":"Flag: Tunisia","b":"1F1F9-1F1F3","j":["flag","tn","nation","country","banner","tunisia"]},"flag-tonga":{"a":"Flag: Tonga","b":"1F1F9-1F1F4","j":["flag","to","nation","country","banner","tonga"]},"flag-turkey":{"a":"Flag: Turkey","b":"1F1F9-1F1F7","j":["flag","turkey","nation","country","banner"]},"flag-trinidad--tobago":{"a":"Flag: Trinidad & Tobago","b":"1F1F9-1F1F9","j":["flag","flag_trinidad_tobago","trinidad","tobago","nation","country","banner","trinidad_tobago"]},"flag-tuvalu":{"a":"Flag: Tuvalu","b":"1F1F9-1F1FB","j":["flag","nation","country","banner","tuvalu"]},"flag-taiwan":{"a":"Flag: Taiwan","b":"1F1F9-1F1FC","j":["flag","tw","nation","country","banner","taiwan"]},"flag-tanzania":{"a":"Flag: Tanzania","b":"1F1F9-1F1FF","j":["flag","tanzania","united","republic","nation","country","banner"]},"flag-ukraine":{"a":"Flag: Ukraine","b":"1F1FA-1F1E6","j":["flag","ua","nation","country","banner","ukraine"]},"flag-uganda":{"a":"Flag: Uganda","b":"1F1FA-1F1EC","j":["flag","ug","nation","country","banner","uganda"]},"flag-us-outlying-islands":{"a":"Flag: U.S. Outlying Islands","b":"1F1FA-1F1F2","j":["flag","flag_u_s_outlying_islands"]},"flag-united-nations":{"a":"Flag: United Nations","b":"1F1FA-1F1F3","j":["flag","un","banner"]},"flag-united-states":{"a":"Flag: United States","b":"1F1FA-1F1F8","j":["flag","united","states","america","nation","country","banner","united_states"]},"flag-uruguay":{"a":"Flag: Uruguay","b":"1F1FA-1F1FE","j":["flag","uy","nation","country","banner","uruguay"]},"flag-uzbekistan":{"a":"Flag: Uzbekistan","b":"1F1FA-1F1FF","j":["flag","uz","nation","country","banner","uzbekistan"]},"flag-vatican-city":{"a":"Flag: Vatican City","b":"1F1FB-1F1E6","j":["flag","vatican","city","nation","country","banner","vatican_city"]},"flag-st-vincent--grenadines":{"a":"Flag: St. Vincent & Grenadines","b":"1F1FB-1F1E8","j":["flag","flag_st_vincent_grenadines","saint","vincent","grenadines","nation","country","banner","st_vincent_grenadines"]},"flag-venezuela":{"a":"Flag: Venezuela","b":"1F1FB-1F1EA","j":["flag","ve","bolivarian","republic","nation","country","banner","venezuela"]},"flag-british-virgin-islands":{"a":"Flag: British Virgin Islands","b":"1F1FB-1F1EC","j":["flag","british","virgin","islands","bvi","nation","country","banner","british_virgin_islands"]},"flag-us-virgin-islands":{"a":"Flag: U.S. Virgin Islands","b":"1F1FB-1F1EE","j":["flag","flag_u_s_virgin_islands","virgin","islands","us","nation","country","banner","u_s_virgin_islands"]},"flag-vietnam":{"a":"Flag: Vietnam","b":"1F1FB-1F1F3","j":["flag","viet","nam","nation","country","banner","vietnam"]},"flag-vanuatu":{"a":"Flag: Vanuatu","b":"1F1FB-1F1FA","j":["flag","vu","nation","country","banner","vanuatu"]},"flag-wallis--futuna":{"a":"Flag: Wallis & Futuna","b":"1F1FC-1F1EB","j":["flag","flag_wallis_futuna","wallis","futuna","nation","country","banner","wallis_futuna"]},"flag-samoa":{"a":"Flag: Samoa","b":"1F1FC-1F1F8","j":["flag","ws","nation","country","banner","samoa"]},"flag-kosovo":{"a":"Flag: Kosovo","b":"1F1FD-1F1F0","j":["flag","xk","nation","country","banner","kosovo"]},"flag-yemen":{"a":"Flag: Yemen","b":"1F1FE-1F1EA","j":["flag","ye","nation","country","banner","yemen"]},"flag-mayotte":{"a":"Flag: Mayotte","b":"1F1FE-1F1F9","j":["flag","yt","nation","country","banner","mayotte"]},"flag-south-africa":{"a":"Flag: South Africa","b":"1F1FF-1F1E6","j":["flag","south","africa","nation","country","banner","south_africa"]},"flag-zambia":{"a":"Flag: Zambia","b":"1F1FF-1F1F2","j":["flag","zm","nation","country","banner","zambia"]},"flag-zimbabwe":{"a":"Flag: Zimbabwe","b":"1F1FF-1F1FC","j":["flag","zw","nation","country","banner","zimbabwe"]},"flag-england":{"a":"Flag: England","b":"1F3F4-E0067-E0062-E0065-E006E-E0067-E007F","j":["flag","english"]},"flag-scotland":{"a":"Flag: Scotland","b":"1F3F4-E0067-E0062-E0073-E0063-E0074-E007F","j":["flag","scottish"]},"flag-wales":{"a":"Flag: Wales","b":"1F3F4-E0067-E0062-E0077-E006C-E0073-E007F","j":["flag","welsh"]}},"aliases":{}}
\ No newline at end of file
+{"compressed":true,"categories":[{"id":"smileys_&_emotion","name":"Smileys & Emotion","emojis":["grinning-face","grinning-face-with-big-eyes","grinning-face-with-smiling-eyes","beaming-face-with-smiling-eyes","grinning-squinting-face","grinning-face-with-sweat","rolling-on-the-floor-laughing","face-with-tears-of-joy","slightly-smiling-face","upsidedown-face","melting-face","winking-face","smiling-face-with-smiling-eyes","smiling-face-with-halo","smiling-face-with-hearts","smiling-face-with-hearteyes","starstruck","face-blowing-a-kiss","kissing-face","smiling-face","kissing-face-with-closed-eyes","kissing-face-with-smiling-eyes","smiling-face-with-tear","face-savoring-food","face-with-tongue","winking-face-with-tongue","zany-face","squinting-face-with-tongue","moneymouth-face","smiling-face-with-open-hands","face-with-hand-over-mouth","face-with-open-eyes-and-hand-over-mouth","face-with-peeking-eye","shushing-face","thinking-face","saluting-face","zippermouth-face","face-with-raised-eyebrow","neutral-face","expressionless-face","face-without-mouth","dotted-line-face","face-in-clouds","smirking-face","unamused-face","face-with-rolling-eyes","grimacing-face","face-exhaling","lying-face","shaking-face","relieved-face","pensive-face","sleepy-face","drooling-face","sleeping-face","face-with-medical-mask","face-with-thermometer","face-with-headbandage","nauseated-face","face-vomiting","sneezing-face","hot-face","cold-face","woozy-face","face-with-crossedout-eyes","face-with-spiral-eyes","exploding-head","cowboy-hat-face","partying-face","disguised-face","smiling-face-with-sunglasses","nerd-face","face-with-monocle","confused-face","face-with-diagonal-mouth","worried-face","slightly-frowning-face","frowning-face","face-with-open-mouth","hushed-face","astonished-face","flushed-face","pleading-face","face-holding-back-tears","frowning-face-with-open-mouth","anguished-face","fearful-face","anxious-face-with-sweat","sad-but-relieved-face","crying-face","loudly-crying-face","face-screaming-in-fear","confounded-face","persevering-face","disappointed-face","downcast-face-with-sweat","weary-face","tired-face","yawning-face","face-with-steam-from-nose","enraged-face","angry-face","face-with-symbols-on-mouth","smiling-face-with-horns","angry-face-with-horns","skull","skull-and-crossbones","pile-of-poo","clown-face","ogre","goblin","ghost","alien","alien-monster","robot","grinning-cat","grinning-cat-with-smiling-eyes","cat-with-tears-of-joy","smiling-cat-with-hearteyes","cat-with-wry-smile","kissing-cat","weary-cat","crying-cat","pouting-cat","seenoevil-monkey","hearnoevil-monkey","speaknoevil-monkey","love-letter","heart-with-arrow","heart-with-ribbon","sparkling-heart","growing-heart","beating-heart","revolving-hearts","two-hearts","heart-decoration","heart-exclamation","broken-heart","heart-on-fire","mending-heart","red-heart","pink-heart","orange-heart","yellow-heart","green-heart","blue-heart","light-blue-heart","purple-heart","brown-heart","black-heart","grey-heart","white-heart","kiss-mark","hundred-points","anger-symbol","collision","dizzy","sweat-droplets","dashing-away","hole","speech-balloon","eye-in-speech-bubble","left-speech-bubble","right-anger-bubble","thought-balloon","zzz"]},{"id":"people_&_body","name":"People & Body","emojis":["waving-hand","raised-back-of-hand","hand-with-fingers-splayed","raised-hand","vulcan-salute","rightwards-hand","leftwards-hand","palm-down-hand","palm-up-hand","leftwards-pushing-hand","rightwards-pushing-hand","ok-hand","pinched-fingers","pinching-hand","victory-hand","crossed-fingers","hand-with-index-finger-and-thumb-crossed","loveyou-gesture","sign-of-the-horns","call-me-hand","backhand-index-pointing-left","backhand-index-pointing-right","backhand-index-pointing-up","middle-finger","backhand-index-pointing-down","index-pointing-up","index-pointing-at-the-viewer","thumbs-up","thumbs-down","raised-fist","oncoming-fist","leftfacing-fist","rightfacing-fist","clapping-hands","raising-hands","heart-hands","open-hands","palms-up-together","handshake","folded-hands","writing-hand","nail-polish","selfie","flexed-biceps","mechanical-arm","mechanical-leg","leg","foot","ear","ear-with-hearing-aid","nose","brain","anatomical-heart","lungs","tooth","bone","eyes","eye","tongue","mouth","biting-lip","baby","child","boy","girl","person","person-blond-hair","man","person-beard","man-beard","woman-beard","man-red-hair","man-curly-hair","man-white-hair","man-bald","woman","woman-red-hair","person-red-hair","woman-curly-hair","person-curly-hair","woman-white-hair","person-white-hair","woman-bald","person-bald","woman-blond-hair","man-blond-hair","older-person","old-man","old-woman","person-frowning","man-frowning","woman-frowning","person-pouting","man-pouting","woman-pouting","person-gesturing-no","man-gesturing-no","woman-gesturing-no","person-gesturing-ok","man-gesturing-ok","woman-gesturing-ok","person-tipping-hand","man-tipping-hand","woman-tipping-hand","person-raising-hand","man-raising-hand","woman-raising-hand","deaf-person","deaf-man","deaf-woman","person-bowing","man-bowing","woman-bowing","person-facepalming","man-facepalming","woman-facepalming","person-shrugging","man-shrugging","woman-shrugging","health-worker","man-health-worker","woman-health-worker","student","man-student","woman-student","teacher","man-teacher","woman-teacher","judge","man-judge","woman-judge","farmer","man-farmer","woman-farmer","cook","man-cook","woman-cook","mechanic","man-mechanic","woman-mechanic","factory-worker","man-factory-worker","woman-factory-worker","office-worker","man-office-worker","woman-office-worker","scientist","man-scientist","woman-scientist","technologist","man-technologist","woman-technologist","singer","man-singer","woman-singer","artist","man-artist","woman-artist","pilot","man-pilot","woman-pilot","astronaut","man-astronaut","woman-astronaut","firefighter","man-firefighter","woman-firefighter","police-officer","man-police-officer","woman-police-officer","detective","man-detective","woman-detective","guard","man-guard","woman-guard","ninja","construction-worker","man-construction-worker","woman-construction-worker","person-with-crown","prince","princess","person-wearing-turban","man-wearing-turban","woman-wearing-turban","person-with-skullcap","woman-with-headscarf","person-in-tuxedo","man-in-tuxedo","woman-in-tuxedo","person-with-veil","man-with-veil","woman-with-veil","pregnant-woman","pregnant-man","pregnant-person","breastfeeding","woman-feeding-baby","man-feeding-baby","person-feeding-baby","baby-angel","santa-claus","mrs-claus","mx-claus","superhero","man-superhero","woman-superhero","supervillain","man-supervillain","woman-supervillain","mage","man-mage","woman-mage","fairy","man-fairy","woman-fairy","vampire","man-vampire","woman-vampire","merperson","merman","mermaid","elf","man-elf","woman-elf","genie","man-genie","woman-genie","zombie","man-zombie","woman-zombie","troll","person-getting-massage","man-getting-massage","woman-getting-massage","person-getting-haircut","man-getting-haircut","woman-getting-haircut","person-walking","man-walking","woman-walking","person-standing","man-standing","woman-standing","person-kneeling","man-kneeling","woman-kneeling","person-with-white-cane","man-with-white-cane","woman-with-white-cane","person-in-motorized-wheelchair","man-in-motorized-wheelchair","woman-in-motorized-wheelchair","person-in-manual-wheelchair","man-in-manual-wheelchair","woman-in-manual-wheelchair","person-running","man-running","woman-running","woman-dancing","man-dancing","person-in-suit-levitating","people-with-bunny-ears","men-with-bunny-ears","women-with-bunny-ears","person-in-steamy-room","man-in-steamy-room","woman-in-steamy-room","person-climbing","man-climbing","woman-climbing","person-fencing","horse-racing","skier","snowboarder","person-golfing","man-golfing","woman-golfing","person-surfing","man-surfing","woman-surfing","person-rowing-boat","man-rowing-boat","woman-rowing-boat","person-swimming","man-swimming","woman-swimming","person-bouncing-ball","man-bouncing-ball","woman-bouncing-ball","person-lifting-weights","man-lifting-weights","woman-lifting-weights","person-biking","man-biking","woman-biking","person-mountain-biking","man-mountain-biking","woman-mountain-biking","person-cartwheeling","man-cartwheeling","woman-cartwheeling","people-wrestling","men-wrestling","women-wrestling","person-playing-water-polo","man-playing-water-polo","woman-playing-water-polo","person-playing-handball","man-playing-handball","woman-playing-handball","person-juggling","man-juggling","woman-juggling","person-in-lotus-position","man-in-lotus-position","woman-in-lotus-position","person-taking-bath","person-in-bed","people-holding-hands","women-holding-hands","woman-and-man-holding-hands","men-holding-hands","kiss","kiss-woman-man","kiss-man-man","kiss-woman-woman","couple-with-heart","couple-with-heart-woman-man","couple-with-heart-man-man","couple-with-heart-woman-woman","family","family-man-woman-boy","family-man-woman-girl","family-man-woman-girl-boy","family-man-woman-boy-boy","family-man-woman-girl-girl","family-man-man-boy","family-man-man-girl","family-man-man-girl-boy","family-man-man-boy-boy","family-man-man-girl-girl","family-woman-woman-boy","family-woman-woman-girl","family-woman-woman-girl-boy","family-woman-woman-boy-boy","family-woman-woman-girl-girl","family-man-boy","family-man-boy-boy","family-man-girl","family-man-girl-boy","family-man-girl-girl","family-woman-boy","family-woman-boy-boy","family-woman-girl","family-woman-girl-boy","family-woman-girl-girl","speaking-head","bust-in-silhouette","busts-in-silhouette","people-hugging","footprints"]},{"id":"animals_&_nature","name":"Animals & Nature","emojis":["monkey-face","monkey","gorilla","orangutan","dog-face","dog","guide-dog","service-dog","poodle","wolf","fox","raccoon","cat-face","cat","black-cat","lion","tiger-face","tiger","leopard","horse-face","moose","donkey","horse","unicorn","zebra","deer","bison","cow-face","ox","water-buffalo","cow","pig-face","pig","boar","pig-nose","ram","ewe","goat","camel","twohump-camel","llama","giraffe","elephant","mammoth","rhinoceros","hippopotamus","mouse-face","mouse","rat","hamster","rabbit-face","rabbit","chipmunk","beaver","hedgehog","bat","bear","polar-bear","koala","panda","sloth","otter","skunk","kangaroo","badger","paw-prints","turkey","chicken","rooster","hatching-chick","baby-chick","frontfacing-baby-chick","bird","penguin","dove","eagle","duck","swan","owl","dodo","feather","flamingo","peacock","parrot","wing","black-bird","goose","frog","crocodile","turtle","lizard","snake","dragon-face","dragon","sauropod","trex","spouting-whale","whale","dolphin","seal","fish","tropical-fish","blowfish","shark","octopus","spiral-shell","coral","jellyfish","snail","butterfly","bug","ant","honeybee","beetle","lady-beetle","cricket","cockroach","spider","spider-web","scorpion","mosquito","fly","worm","microbe","bouquet","cherry-blossom","white-flower","lotus","rosette","rose","wilted-flower","hibiscus","sunflower","blossom","tulip","hyacinth","seedling","potted-plant","evergreen-tree","deciduous-tree","palm-tree","cactus","sheaf-of-rice","herb","shamrock","four-leaf-clover","maple-leaf","fallen-leaf","leaf-fluttering-in-wind","empty-nest","nest-with-eggs","mushroom"]},{"id":"food_&_drink","name":"Food & Drink","emojis":["grapes","melon","watermelon","tangerine","lemon","banana","pineapple","mango","red-apple","green-apple","pear","peach","cherries","strawberry","blueberries","kiwi-fruit","tomato","olive","coconut","avocado","eggplant","potato","carrot","ear-of-corn","hot-pepper","bell-pepper","cucumber","leafy-green","broccoli","garlic","onion","peanuts","beans","chestnut","ginger-root","pea-pod","bread","croissant","baguette-bread","flatbread","pretzel","bagel","pancakes","waffle","cheese-wedge","meat-on-bone","poultry-leg","cut-of-meat","bacon","hamburger","french-fries","pizza","hot-dog","sandwich","taco","burrito","tamale","stuffed-flatbread","falafel","egg","cooking","shallow-pan-of-food","pot-of-food","fondue","bowl-with-spoon","green-salad","popcorn","butter","salt","canned-food","bento-box","rice-cracker","rice-ball","cooked-rice","curry-rice","steaming-bowl","spaghetti","roasted-sweet-potato","oden","sushi","fried-shrimp","fish-cake-with-swirl","moon-cake","dango","dumpling","fortune-cookie","takeout-box","crab","lobster","shrimp","squid","oyster","soft-ice-cream","shaved-ice","ice-cream","doughnut","cookie","birthday-cake","shortcake","cupcake","pie","chocolate-bar","candy","lollipop","custard","honey-pot","baby-bottle","glass-of-milk","hot-beverage","teapot","teacup-without-handle","sake","bottle-with-popping-cork","wine-glass","cocktail-glass","tropical-drink","beer-mug","clinking-beer-mugs","clinking-glasses","tumbler-glass","pouring-liquid","cup-with-straw","bubble-tea","beverage-box","mate","ice","chopsticks","fork-and-knife-with-plate","fork-and-knife","spoon","kitchen-knife","jar","amphora"]},{"id":"travel_&_places","name":"Travel & Places","emojis":["globe-showing-europeafrica","globe-showing-americas","globe-showing-asiaaustralia","globe-with-meridians","world-map","map-of-japan","compass","snowcapped-mountain","mountain","volcano","mount-fuji","camping","beach-with-umbrella","desert","desert-island","national-park","stadium","classical-building","building-construction","brick","rock","wood","hut","houses","derelict-house","house","house-with-garden","office-building","japanese-post-office","post-office","hospital","bank","hotel","love-hotel","convenience-store","school","department-store","factory","japanese-castle","castle","wedding","tokyo-tower","statue-of-liberty","church","mosque","hindu-temple","synagogue","shinto-shrine","kaaba","fountain","tent","foggy","night-with-stars","cityscape","sunrise-over-mountains","sunrise","cityscape-at-dusk","sunset","bridge-at-night","hot-springs","carousel-horse","playground-slide","ferris-wheel","roller-coaster","barber-pole","circus-tent","locomotive","railway-car","highspeed-train","bullet-train","train","metro","light-rail","station","tram","monorail","mountain-railway","tram-car","bus","oncoming-bus","trolleybus","minibus","ambulance","fire-engine","police-car","oncoming-police-car","taxi","oncoming-taxi","automobile","oncoming-automobile","sport-utility-vehicle","pickup-truck","delivery-truck","articulated-lorry","tractor","racing-car","motorcycle","motor-scooter","manual-wheelchair","motorized-wheelchair","auto-rickshaw","bicycle","kick-scooter","skateboard","roller-skate","bus-stop","motorway","railway-track","oil-drum","fuel-pump","wheel","police-car-light","horizontal-traffic-light","vertical-traffic-light","stop-sign","construction","anchor","ring-buoy","sailboat","canoe","speedboat","passenger-ship","ferry","motor-boat","ship","airplane","small-airplane","airplane-departure","airplane-arrival","parachute","seat","helicopter","suspension-railway","mountain-cableway","aerial-tramway","satellite","rocket","flying-saucer","bellhop-bell","luggage","hourglass-done","hourglass-not-done","watch","alarm-clock","stopwatch","timer-clock","mantelpiece-clock","twelve-oclock","twelvethirty","one-oclock","onethirty","two-oclock","twothirty","three-oclock","threethirty","four-oclock","fourthirty","five-oclock","fivethirty","six-oclock","sixthirty","seven-oclock","seventhirty","eight-oclock","eightthirty","nine-oclock","ninethirty","ten-oclock","tenthirty","eleven-oclock","eleventhirty","new-moon","waxing-crescent-moon","first-quarter-moon","waxing-gibbous-moon","full-moon","waning-gibbous-moon","last-quarter-moon","waning-crescent-moon","crescent-moon","new-moon-face","first-quarter-moon-face","last-quarter-moon-face","thermometer","sun","full-moon-face","sun-with-face","ringed-planet","star","glowing-star","shooting-star","milky-way","cloud","sun-behind-cloud","cloud-with-lightning-and-rain","sun-behind-small-cloud","sun-behind-large-cloud","sun-behind-rain-cloud","cloud-with-rain","cloud-with-snow","cloud-with-lightning","tornado","fog","wind-face","cyclone","rainbow","closed-umbrella","umbrella","umbrella-with-rain-drops","umbrella-on-ground","high-voltage","snowflake","snowman","snowman-without-snow","comet","fire","droplet","water-wave"]},{"id":"activities","name":"Activities","emojis":["jackolantern","christmas-tree","fireworks","sparkler","firecracker","sparkles","balloon","party-popper","confetti-ball","tanabata-tree","pine-decoration","japanese-dolls","carp-streamer","wind-chime","moon-viewing-ceremony","red-envelope","ribbon","wrapped-gift","reminder-ribbon","admission-tickets","ticket","military-medal","trophy","sports-medal","1st-place-medal","2nd-place-medal","3rd-place-medal","soccer-ball","baseball","softball","basketball","volleyball","american-football","rugby-football","tennis","flying-disc","bowling","cricket-game","field-hockey","ice-hockey","lacrosse","ping-pong","badminton","boxing-glove","martial-arts-uniform","goal-net","flag-in-hole","ice-skate","fishing-pole","diving-mask","running-shirt","skis","sled","curling-stone","bullseye","yoyo","kite","water-pistol","pool-8-ball","crystal-ball","magic-wand","video-game","joystick","slot-machine","game-die","puzzle-piece","teddy-bear","piata","mirror-ball","nesting-dolls","spade-suit","heart-suit","diamond-suit","club-suit","chess-pawn","joker","mahjong-red-dragon","flower-playing-cards","performing-arts","framed-picture","artist-palette","thread","sewing-needle","yarn","knot"]},{"id":"objects","name":"Objects","emojis":["glasses","sunglasses","goggles","lab-coat","safety-vest","necktie","tshirt","jeans","scarf","gloves","coat","socks","dress","kimono","sari","onepiece-swimsuit","briefs","shorts","bikini","womans-clothes","folding-hand-fan","purse","handbag","clutch-bag","shopping-bags","backpack","thong-sandal","mans-shoe","running-shoe","hiking-boot","flat-shoe","highheeled-shoe","womans-sandal","ballet-shoes","womans-boot","hair-pick","crown","womans-hat","top-hat","graduation-cap","billed-cap","military-helmet","rescue-workers-helmet","prayer-beads","lipstick","ring","gem-stone","muted-speaker","speaker-low-volume","speaker-medium-volume","speaker-high-volume","loudspeaker","megaphone","postal-horn","bell","bell-with-slash","musical-score","musical-note","musical-notes","studio-microphone","level-slider","control-knobs","microphone","headphone","radio","saxophone","accordion","guitar","musical-keyboard","trumpet","violin","banjo","drum","long-drum","maracas","flute","mobile-phone","mobile-phone-with-arrow","telephone","telephone-receiver","pager","fax-machine","battery","low-battery","electric-plug","laptop","desktop-computer","printer","keyboard","computer-mouse","trackball","computer-disk","floppy-disk","optical-disk","dvd","abacus","movie-camera","film-frames","film-projector","clapper-board","television","camera","camera-with-flash","video-camera","videocassette","magnifying-glass-tilted-left","magnifying-glass-tilted-right","candle","light-bulb","flashlight","red-paper-lantern","diya-lamp","notebook-with-decorative-cover","closed-book","open-book","green-book","blue-book","orange-book","books","notebook","ledger","page-with-curl","scroll","page-facing-up","newspaper","rolledup-newspaper","bookmark-tabs","bookmark","label","money-bag","coin","yen-banknote","dollar-banknote","euro-banknote","pound-banknote","money-with-wings","credit-card","receipt","chart-increasing-with-yen","envelope","email","incoming-envelope","envelope-with-arrow","outbox-tray","inbox-tray","package","closed-mailbox-with-raised-flag","closed-mailbox-with-lowered-flag","open-mailbox-with-raised-flag","open-mailbox-with-lowered-flag","postbox","ballot-box-with-ballot","pencil","black-nib","fountain-pen","pen","paintbrush","crayon","memo","briefcase","file-folder","open-file-folder","card-index-dividers","calendar","tearoff-calendar","spiral-notepad","spiral-calendar","card-index","chart-increasing","chart-decreasing","bar-chart","clipboard","pushpin","round-pushpin","paperclip","linked-paperclips","straight-ruler","triangular-ruler","scissors","card-file-box","file-cabinet","wastebasket","locked","unlocked","locked-with-pen","locked-with-key","key","old-key","hammer","axe","pick","hammer-and-pick","hammer-and-wrench","dagger","crossed-swords","bomb","boomerang","bow-and-arrow","shield","carpentry-saw","wrench","screwdriver","nut-and-bolt","gear","clamp","balance-scale","white-cane","link","chains","hook","toolbox","magnet","ladder","alembic","test-tube","petri-dish","dna","microscope","telescope","satellite-antenna","syringe","drop-of-blood","pill","adhesive-bandage","crutch","stethoscope","xray","door","elevator","mirror","window","bed","couch-and-lamp","chair","toilet","plunger","shower","bathtub","mouse-trap","razor","lotion-bottle","safety-pin","broom","basket","roll-of-paper","bucket","soap","bubbles","toothbrush","sponge","fire-extinguisher","shopping-cart","cigarette","coffin","headstone","funeral-urn","nazar-amulet","hamsa","moai","placard","identification-card"]},{"id":"symbols","name":"Symbols","emojis":["atm-sign","litter-in-bin-sign","potable-water","wheelchair-symbol","mens-room","womens-room","restroom","baby-symbol","water-closet","passport-control","customs","baggage-claim","left-luggage","warning","children-crossing","no-entry","prohibited","no-bicycles","no-smoking","no-littering","nonpotable-water","no-pedestrians","no-mobile-phones","no-one-under-eighteen","radioactive","biohazard","up-arrow","upright-arrow","right-arrow","downright-arrow","down-arrow","downleft-arrow","left-arrow","upleft-arrow","updown-arrow","leftright-arrow","right-arrow-curving-left","left-arrow-curving-right","right-arrow-curving-up","right-arrow-curving-down","clockwise-vertical-arrows","counterclockwise-arrows-button","back-arrow","end-arrow","on-arrow","soon-arrow","top-arrow","place-of-worship","atom-symbol","om","star-of-david","wheel-of-dharma","yin-yang","latin-cross","orthodox-cross","star-and-crescent","peace-symbol","menorah","dotted-sixpointed-star","khanda","aries","taurus","gemini","cancer","leo","virgo","libra","scorpio","sagittarius","capricorn","aquarius","pisces","ophiuchus","shuffle-tracks-button","repeat-button","repeat-single-button","play-button","fastforward-button","next-track-button","play-or-pause-button","reverse-button","fast-reverse-button","last-track-button","upwards-button","fast-up-button","downwards-button","fast-down-button","pause-button","stop-button","record-button","eject-button","cinema","dim-button","bright-button","antenna-bars","wireless","vibration-mode","mobile-phone-off","female-sign","male-sign","transgender-symbol","multiply","plus","minus","divide","heavy-equals-sign","infinity","double-exclamation-mark","exclamation-question-mark","red-question-mark","white-question-mark","white-exclamation-mark","red-exclamation-mark","wavy-dash","currency-exchange","heavy-dollar-sign","medical-symbol","recycling-symbol","fleurdelis","trident-emblem","name-badge","japanese-symbol-for-beginner","hollow-red-circle","check-mark-button","check-box-with-check","check-mark","cross-mark","cross-mark-button","curly-loop","double-curly-loop","part-alternation-mark","eightspoked-asterisk","eightpointed-star","sparkle","copyright","registered","trade-mark","keycap","keycap","keycap-0","keycap-1","keycap-2","keycap-3","keycap-4","keycap-5","keycap-6","keycap-7","keycap-8","keycap-9","keycap-10","input-latin-uppercase","input-latin-lowercase","input-numbers","input-symbols","input-latin-letters","a-button-blood-type","ab-button-blood-type","b-button-blood-type","cl-button","cool-button","free-button","information","id-button","circled-m","new-button","ng-button","o-button-blood-type","ok-button","p-button","sos-button","up-button","vs-button","japanese-here-button","japanese-service-charge-button","japanese-monthly-amount-button","japanese-not-free-of-charge-button","japanese-reserved-button","japanese-bargain-button","japanese-discount-button","japanese-free-of-charge-button","japanese-prohibited-button","japanese-acceptable-button","japanese-application-button","japanese-passing-grade-button","japanese-vacancy-button","japanese-congratulations-button","japanese-secret-button","japanese-open-for-business-button","japanese-no-vacancy-button","red-circle","orange-circle","yellow-circle","green-circle","blue-circle","purple-circle","brown-circle","black-circle","white-circle","red-square","orange-square","yellow-square","green-square","blue-square","purple-square","brown-square","black-large-square","white-large-square","black-medium-square","white-medium-square","black-mediumsmall-square","white-mediumsmall-square","black-small-square","white-small-square","large-orange-diamond","large-blue-diamond","small-orange-diamond","small-blue-diamond","red-triangle-pointed-up","red-triangle-pointed-down","diamond-with-a-dot","radio-button","white-square-button","black-square-button"]},{"id":"flags","name":"Flags","emojis":["chequered-flag","triangular-flag","crossed-flags","black-flag","white-flag","rainbow-flag","transgender-flag","pirate-flag","flag-ascension-island","flag-andorra","flag-united-arab-emirates","flag-afghanistan","flag-antigua--barbuda","flag-anguilla","flag-albania","flag-armenia","flag-angola","flag-antarctica","flag-argentina","flag-american-samoa","flag-austria","flag-australia","flag-aruba","flag-land-islands","flag-azerbaijan","flag-bosnia--herzegovina","flag-barbados","flag-bangladesh","flag-belgium","flag-burkina-faso","flag-bulgaria","flag-bahrain","flag-burundi","flag-benin","flag-st-barthlemy","flag-bermuda","flag-brunei","flag-bolivia","flag-caribbean-netherlands","flag-brazil","flag-bahamas","flag-bhutan","flag-bouvet-island","flag-botswana","flag-belarus","flag-belize","flag-canada","flag-cocos-keeling-islands","flag-congo--kinshasa","flag-central-african-republic","flag-congo--brazzaville","flag-switzerland","flag-cte-divoire","flag-cook-islands","flag-chile","flag-cameroon","flag-china","flag-colombia","flag-clipperton-island","flag-costa-rica","flag-cuba","flag-cape-verde","flag-curaao","flag-christmas-island","flag-cyprus","flag-czechia","flag-germany","flag-diego-garcia","flag-djibouti","flag-denmark","flag-dominica","flag-dominican-republic","flag-algeria","flag-ceuta--melilla","flag-ecuador","flag-estonia","flag-egypt","flag-western-sahara","flag-eritrea","flag-spain","flag-ethiopia","flag-european-union","flag-finland","flag-fiji","flag-falkland-islands","flag-micronesia","flag-faroe-islands","flag-france","flag-gabon","flag-united-kingdom","flag-grenada","flag-georgia","flag-french-guiana","flag-guernsey","flag-ghana","flag-gibraltar","flag-greenland","flag-gambia","flag-guinea","flag-guadeloupe","flag-equatorial-guinea","flag-greece","flag-south-georgia--south-sandwich-islands","flag-guatemala","flag-guam","flag-guineabissau","flag-guyana","flag-hong-kong-sar-china","flag-heard--mcdonald-islands","flag-honduras","flag-croatia","flag-haiti","flag-hungary","flag-canary-islands","flag-indonesia","flag-ireland","flag-israel","flag-isle-of-man","flag-india","flag-british-indian-ocean-territory","flag-iraq","flag-iran","flag-iceland","flag-italy","flag-jersey","flag-jamaica","flag-jordan","flag-japan","flag-kenya","flag-kyrgyzstan","flag-cambodia","flag-kiribati","flag-comoros","flag-st-kitts--nevis","flag-north-korea","flag-south-korea","flag-kuwait","flag-cayman-islands","flag-kazakhstan","flag-laos","flag-lebanon","flag-st-lucia","flag-liechtenstein","flag-sri-lanka","flag-liberia","flag-lesotho","flag-lithuania","flag-luxembourg","flag-latvia","flag-libya","flag-morocco","flag-monaco","flag-moldova","flag-montenegro","flag-st-martin","flag-madagascar","flag-marshall-islands","flag-north-macedonia","flag-mali","flag-myanmar-burma","flag-mongolia","flag-macao-sar-china","flag-northern-mariana-islands","flag-martinique","flag-mauritania","flag-montserrat","flag-malta","flag-mauritius","flag-maldives","flag-malawi","flag-mexico","flag-malaysia","flag-mozambique","flag-namibia","flag-new-caledonia","flag-niger","flag-norfolk-island","flag-nigeria","flag-nicaragua","flag-netherlands","flag-norway","flag-nepal","flag-nauru","flag-niue","flag-new-zealand","flag-oman","flag-panama","flag-peru","flag-french-polynesia","flag-papua-new-guinea","flag-philippines","flag-pakistan","flag-poland","flag-st-pierre--miquelon","flag-pitcairn-islands","flag-puerto-rico","flag-palestinian-territories","flag-portugal","flag-palau","flag-paraguay","flag-qatar","flag-runion","flag-romania","flag-serbia","flag-russia","flag-rwanda","flag-saudi-arabia","flag-solomon-islands","flag-seychelles","flag-sudan","flag-sweden","flag-singapore","flag-st-helena","flag-slovenia","flag-svalbard--jan-mayen","flag-slovakia","flag-sierra-leone","flag-san-marino","flag-senegal","flag-somalia","flag-suriname","flag-south-sudan","flag-so-tom--prncipe","flag-el-salvador","flag-sint-maarten","flag-syria","flag-eswatini","flag-tristan-da-cunha","flag-turks--caicos-islands","flag-chad","flag-french-southern-territories","flag-togo","flag-thailand","flag-tajikistan","flag-tokelau","flag-timorleste","flag-turkmenistan","flag-tunisia","flag-tonga","flag-turkey","flag-trinidad--tobago","flag-tuvalu","flag-taiwan","flag-tanzania","flag-ukraine","flag-uganda","flag-us-outlying-islands","flag-united-nations","flag-united-states","flag-uruguay","flag-uzbekistan","flag-vatican-city","flag-st-vincent--grenadines","flag-venezuela","flag-british-virgin-islands","flag-us-virgin-islands","flag-vietnam","flag-vanuatu","flag-wallis--futuna","flag-samoa","flag-kosovo","flag-yemen","flag-mayotte","flag-south-africa","flag-zambia","flag-zimbabwe","flag-england","flag-scotland","flag-wales"]}],"emojis":{"grinning-face":{"a":"Grinning Face","b":"1F600","j":["face","grin","smile","happy","joy",":D"]},"grinning-face-with-big-eyes":{"a":"Grinning Face with Big Eyes","b":"1F603","j":["face","mouth","open","smile","happy","joy","haha",":D",":)","funny"]},"grinning-face-with-smiling-eyes":{"a":"Grinning Face with Smiling Eyes","b":"1F604","j":["eye","face","mouth","open","smile","happy","joy","funny","haha","laugh","like",":D",":)"]},"beaming-face-with-smiling-eyes":{"a":"Beaming Face with Smiling Eyes","b":"1F601","j":["eye","face","grin","smile","happy","joy","kawaii"]},"grinning-squinting-face":{"a":"Grinning Squinting Face","b":"1F606","j":["face","laugh","mouth","satisfied","smile","happy","joy","lol","haha","glad","XD"]},"grinning-face-with-sweat":{"a":"Grinning Face with Sweat","b":"1F605","j":["cold","face","open","smile","sweat","hot","happy","laugh","relief"]},"rolling-on-the-floor-laughing":{"a":"Rolling on the Floor Laughing","b":"1F923","j":["face","floor","laugh","rofl","rolling","rotfl","laughing","lol","haha"]},"face-with-tears-of-joy":{"a":"Face with Tears of Joy","b":"1F602","j":["face","joy","laugh","tear","cry","tears","weep","happy","happytears","haha"]},"slightly-smiling-face":{"a":"Slightly Smiling Face","b":"1F642","j":["face","smile"]},"upsidedown-face":{"a":"Upside-Down Face","b":"1F643","j":["face","upside-down","upside_down_face","flipped","silly","smile"]},"melting-face":{"a":"Melting Face","b":"1FAE0","j":["disappear","dissolve","liquid","melt","hot","heat"]},"winking-face":{"a":"Winking Face","b":"1F609","j":["face","wink","happy","mischievous","secret",";)","smile","eye"]},"smiling-face-with-smiling-eyes":{"a":"Smiling Face with Smiling Eyes","b":"1F60A","j":["blush","eye","face","smile","happy","flushed","crush","embarrassed","shy","joy"]},"smiling-face-with-halo":{"a":"Smiling Face with Halo","b":"1F607","j":["angel","face","fantasy","halo","innocent","heaven"]},"smiling-face-with-hearts":{"a":"Smiling Face with Hearts","b":"1F970","j":["adore","crush","hearts","in love","face","love","like","affection","valentines","infatuation"]},"smiling-face-with-hearteyes":{"a":"Smiling Face with Heart-Eyes","b":"1F60D","j":["eye","face","love","smile","smiling face with heart-eyes","smiling_face_with_heart_eyes","like","affection","valentines","infatuation","crush","heart"]},"starstruck":{"a":"Star-Struck","b":"1F929","j":["eyes","face","grinning","star","star-struck","starry-eyed","star_struck","smile","starry"]},"face-blowing-a-kiss":{"a":"Face Blowing a Kiss","b":"1F618","j":["face","kiss","love","like","affection","valentines","infatuation"]},"kissing-face":{"a":"Kissing Face","b":"1F617","j":["face","kiss","love","like","3","valentines","infatuation"]},"smiling-face":{"a":"Smiling Face","b":"263A","j":["face","outlined","relaxed","smile","blush","massage","happiness"]},"kissing-face-with-closed-eyes":{"a":"Kissing Face with Closed Eyes","b":"1F61A","j":["closed","eye","face","kiss","love","like","affection","valentines","infatuation"]},"kissing-face-with-smiling-eyes":{"a":"Kissing Face with Smiling Eyes","b":"1F619","j":["eye","face","kiss","smile","affection","valentines","infatuation"]},"smiling-face-with-tear":{"a":"Smiling Face with Tear","b":"1F972","j":["grateful","proud","relieved","smiling","tear","touched","sad","cry","pretend"]},"face-savoring-food":{"a":"Face Savoring Food","b":"1F60B","j":["delicious","face","savouring","smile","yum","happy","joy","tongue","silly","yummy","nom"]},"face-with-tongue":{"a":"Face with Tongue","b":"1F61B","j":["face","tongue","prank","childish","playful","mischievous","smile"]},"winking-face-with-tongue":{"a":"Winking Face with Tongue","b":"1F61C","j":["eye","face","joke","tongue","wink","prank","childish","playful","mischievous","smile"]},"zany-face":{"a":"Zany Face","b":"1F92A","j":["eye","goofy","large","small","face","crazy"]},"squinting-face-with-tongue":{"a":"Squinting Face with Tongue","b":"1F61D","j":["eye","face","horrible","taste","tongue","prank","playful","mischievous","smile"]},"moneymouth-face":{"a":"Money-Mouth Face","b":"1F911","j":["face","money","money-mouth face","mouth","money_mouth_face","rich","dollar"]},"smiling-face-with-open-hands":{"a":"Smiling Face with Open Hands","b":"1F917","j":["face","hug","hugging","open hands","smiling face","hugging_face","smile"]},"face-with-hand-over-mouth":{"a":"Face with Hand over Mouth","b":"1F92D","j":["whoops","shock","sudden realization","surprise","face"]},"face-with-open-eyes-and-hand-over-mouth":{"a":"Face with Open Eyes and Hand over Mouth","b":"1FAE2","j":["amazement","awe","disbelief","embarrass","scared","surprise","silence","secret","shock"]},"face-with-peeking-eye":{"a":"Face with Peeking Eye","b":"1FAE3","j":["captivated","peep","stare","scared","frightening","embarrassing","shy"]},"shushing-face":{"a":"Shushing Face","b":"1F92B","j":["quiet","shush","face","shhh"]},"thinking-face":{"a":"Thinking Face","b":"1F914","j":["face","thinking","hmmm","think","consider"]},"saluting-face":{"a":"Saluting Face","b":"1FAE1","j":["OK","salute","sunny","troops","yes","respect"]},"zippermouth-face":{"a":"Zipper-Mouth Face","b":"1F910","j":["face","mouth","zipper","zipper-mouth face","zipper_mouth_face","sealed","secret"]},"face-with-raised-eyebrow":{"a":"Face with Raised Eyebrow","b":"1F928","j":["distrust","skeptic","disapproval","disbelief","mild surprise","scepticism","face","surprise"]},"neutral-face":{"a":"Neutral Face","b":"1F610","j":["deadpan","face","meh","neutral","indifference",":|"]},"expressionless-face":{"a":"Expressionless Face","b":"1F611","j":["expressionless","face","inexpressive","meh","unexpressive","indifferent","-_-","deadpan"]},"face-without-mouth":{"a":"Face Without Mouth","b":"1F636","j":["face","mouth","quiet","silent","hellokitty"]},"dotted-line-face":{"a":"Dotted Line Face","b":"1FAE5","j":["depressed","disappear","hide","introvert","invisible","lonely","isolation","depression"]},"face-in-clouds":{"a":"Face in Clouds","b":"1F636-200D-1F32B-FE0F","j":["absentminded","face in the fog","head in clouds","shower","steam","dream"]},"smirking-face":{"a":"Smirking Face","b":"1F60F","j":["face","smirk","smile","mean","prank","smug","sarcasm"]},"unamused-face":{"a":"Unamused Face","b":"1F612","j":["face","unamused","unhappy","indifference","bored","straight face","serious","sarcasm","unimpressed","skeptical","dubious","side_eye"]},"face-with-rolling-eyes":{"a":"Face with Rolling Eyes","b":"1F644","j":["eyeroll","eyes","face","rolling","frustrated"]},"grimacing-face":{"a":"Grimacing Face","b":"1F62C","j":["face","grimace","teeth"]},"face-exhaling":{"a":"Face Exhaling","b":"1F62E-200D-1F4A8","j":["exhale","gasp","groan","relief","whisper","whistle","relieve","tired","sigh"]},"lying-face":{"a":"Lying Face","b":"1F925","j":["face","lie","pinocchio"]},"shaking-face":{"a":"⊛ Shaking Face","b":"1FAE8","j":["earthquake","face","shaking","shock","vibrate"]},"relieved-face":{"a":"Relieved Face","b":"1F60C","j":["face","relieved","relaxed","phew","massage","happiness"]},"pensive-face":{"a":"Pensive Face","b":"1F614","j":["dejected","face","pensive","sad","depressed","upset"]},"sleepy-face":{"a":"Sleepy Face","b":"1F62A","j":["face","good night","sleep","tired","rest","nap"]},"drooling-face":{"a":"Drooling Face","b":"1F924","j":["drooling","face"]},"sleeping-face":{"a":"Sleeping Face","b":"1F634","j":["face","good night","sleep","ZZZ","tired","sleepy","night","zzz"]},"face-with-medical-mask":{"a":"Face with Medical Mask","b":"1F637","j":["cold","doctor","face","mask","sick","ill","disease","covid"]},"face-with-thermometer":{"a":"Face with Thermometer","b":"1F912","j":["face","ill","sick","thermometer","temperature","cold","fever","covid"]},"face-with-headbandage":{"a":"Face with Head-Bandage","b":"1F915","j":["bandage","face","face with head-bandage","hurt","injury","face_with_head_bandage","injured","clumsy"]},"nauseated-face":{"a":"Nauseated Face","b":"1F922","j":["face","nauseated","vomit","gross","green","sick","throw up","ill"]},"face-vomiting":{"a":"Face Vomiting","b":"1F92E","j":["puke","sick","vomit","face"]},"sneezing-face":{"a":"Sneezing Face","b":"1F927","j":["face","gesundheit","sneeze","sick","allergy"]},"hot-face":{"a":"Hot Face","b":"1F975","j":["feverish","heat stroke","hot","red-faced","sweating","face","heat","red"]},"cold-face":{"a":"Cold Face","b":"1F976","j":["blue-faced","cold","freezing","frostbite","icicles","face","blue","frozen"]},"woozy-face":{"a":"Woozy Face","b":"1F974","j":["dizzy","intoxicated","tipsy","uneven eyes","wavy mouth","face","wavy"]},"face-with-crossedout-eyes":{"a":"Face with Crossed-out Eyes","b":"1F635","j":["crossed-out eyes","dead","face","face with crossed-out eyes","knocked out","dizzy_face","spent","unconscious","xox","dizzy"]},"face-with-spiral-eyes":{"a":"Face with Spiral Eyes","b":"1F635-200D-1F4AB","j":["dizzy","hypnotized","spiral","trouble","whoa","sick","ill","confused","nauseous","nausea"]},"exploding-head":{"a":"Exploding Head","b":"1F92F","j":["mind blown","shocked","face","mind","blown"]},"cowboy-hat-face":{"a":"Cowboy Hat Face","b":"1F920","j":["cowboy","cowgirl","face","hat"]},"partying-face":{"a":"Partying Face","b":"1F973","j":["celebration","hat","horn","party","face","woohoo"]},"disguised-face":{"a":"Disguised Face","b":"1F978","j":["disguise","face","glasses","incognito","nose","pretent","brows","moustache"]},"smiling-face-with-sunglasses":{"a":"Smiling Face with Sunglasses","b":"1F60E","j":["bright","cool","face","sun","sunglasses","smile","summer","beach","sunglass"]},"nerd-face":{"a":"Nerd Face","b":"1F913","j":["face","geek","nerd","nerdy","dork"]},"face-with-monocle":{"a":"Face with Monocle","b":"1F9D0","j":["face","monocle","stuffy","wealthy"]},"confused-face":{"a":"Confused Face","b":"1F615","j":["confused","face","meh","indifference","huh","weird","hmmm",":/"]},"face-with-diagonal-mouth":{"a":"Face with Diagonal Mouth","b":"1FAE4","j":["disappointed","meh","skeptical","unsure","skeptic","confuse","frustrated","indifferent"]},"worried-face":{"a":"Worried Face","b":"1F61F","j":["face","worried","concern","nervous",":("]},"slightly-frowning-face":{"a":"Slightly Frowning Face","b":"1F641","j":["face","frown","frowning","disappointed","sad","upset"]},"frowning-face":{"a":"Frowning Face","b":"2639","j":["face","frown","sad","upset"]},"face-with-open-mouth":{"a":"Face with Open Mouth","b":"1F62E","j":["face","mouth","open","sympathy","surprise","impressed","wow","whoa",":O"]},"hushed-face":{"a":"Hushed Face","b":"1F62F","j":["face","hushed","stunned","surprised","woo","shh"]},"astonished-face":{"a":"Astonished Face","b":"1F632","j":["astonished","face","shocked","totally","xox","surprised","poisoned"]},"flushed-face":{"a":"Flushed Face","b":"1F633","j":["dazed","face","flushed","blush","shy","flattered"]},"pleading-face":{"a":"Pleading Face","b":"1F97A","j":["begging","mercy","puppy eyes","face","cry","tears","sad","grievance"]},"face-holding-back-tears":{"a":"Face Holding Back Tears","b":"1F979","j":["angry","cry","proud","resist","sad","touched","gratitude"]},"frowning-face-with-open-mouth":{"a":"Frowning Face with Open Mouth","b":"1F626","j":["face","frown","mouth","open","aw","what"]},"anguished-face":{"a":"Anguished Face","b":"1F627","j":["anguished","face","stunned","nervous"]},"fearful-face":{"a":"Fearful Face","b":"1F628","j":["face","fear","fearful","scared","terrified","nervous"]},"anxious-face-with-sweat":{"a":"Anxious Face with Sweat","b":"1F630","j":["blue","cold","face","rushed","sweat","nervous"]},"sad-but-relieved-face":{"a":"Sad but Relieved Face","b":"1F625","j":["disappointed","face","relieved","whew","phew","sweat","nervous"]},"crying-face":{"a":"Crying Face","b":"1F622","j":["cry","face","sad","tear","tears","depressed","upset",":'("]},"loudly-crying-face":{"a":"Loudly Crying Face","b":"1F62D","j":["cry","face","sad","sob","tear","tears","upset","depressed"]},"face-screaming-in-fear":{"a":"Face Screaming in Fear","b":"1F631","j":["face","fear","munch","scared","scream","omg"]},"confounded-face":{"a":"Confounded Face","b":"1F616","j":["confounded","face","confused","sick","unwell","oops",":S"]},"persevering-face":{"a":"Persevering Face","b":"1F623","j":["face","persevere","sick","no","upset","oops"]},"disappointed-face":{"a":"Disappointed Face","b":"1F61E","j":["disappointed","face","sad","upset","depressed",":("]},"downcast-face-with-sweat":{"a":"Downcast Face with Sweat","b":"1F613","j":["cold","face","sweat","hot","sad","tired","exercise"]},"weary-face":{"a":"Weary Face","b":"1F629","j":["face","tired","weary","sleepy","sad","frustrated","upset"]},"tired-face":{"a":"Tired Face","b":"1F62B","j":["face","tired","sick","whine","upset","frustrated"]},"yawning-face":{"a":"Yawning Face","b":"1F971","j":["bored","tired","yawn","sleepy"]},"face-with-steam-from-nose":{"a":"Face with Steam From Nose","b":"1F624","j":["face","triumph","won","gas","phew","proud","pride"]},"enraged-face":{"a":"Enraged Face","b":"1F621","j":["angry","enraged","face","mad","pouting","rage","red","pouting_face","hate","despise"]},"angry-face":{"a":"Angry Face","b":"1F620","j":["anger","angry","face","mad","annoyed","frustrated"]},"face-with-symbols-on-mouth":{"a":"Face with Symbols on Mouth","b":"1F92C","j":["swearing","cursing","face","cussing","profanity","expletive"]},"smiling-face-with-horns":{"a":"Smiling Face with Horns","b":"1F608","j":["face","fairy tale","fantasy","horns","smile","devil"]},"angry-face-with-horns":{"a":"Angry Face with Horns","b":"1F47F","j":["demon","devil","face","fantasy","imp","angry","horns"]},"skull":{"a":"Skull","b":"1F480","j":["death","face","fairy tale","monster","dead","skeleton","creepy"]},"skull-and-crossbones":{"a":"Skull and Crossbones","b":"2620","j":["crossbones","death","face","monster","skull","poison","danger","deadly","scary","pirate","evil"]},"pile-of-poo":{"a":"Pile of Poo","b":"1F4A9","j":["dung","face","monster","poo","poop","hankey","shitface","fail","turd","shit"]},"clown-face":{"a":"Clown Face","b":"1F921","j":["clown","face"]},"ogre":{"a":"Ogre","b":"1F479","j":["creature","face","fairy tale","fantasy","monster","troll","red","mask","halloween","scary","creepy","devil","demon","japanese"]},"goblin":{"a":"Goblin","b":"1F47A","j":["creature","face","fairy tale","fantasy","monster","red","evil","mask","scary","creepy","japanese"]},"ghost":{"a":"Ghost","b":"1F47B","j":["creature","face","fairy tale","fantasy","monster","halloween","spooky","scary"]},"alien":{"a":"Alien","b":"1F47D","j":["creature","extraterrestrial","face","fantasy","ufo","UFO","paul","weird","outer_space"]},"alien-monster":{"a":"Alien Monster","b":"1F47E","j":["alien","creature","extraterrestrial","face","monster","ufo","game","arcade","play"]},"robot":{"a":"Robot","b":"1F916","j":["face","monster","computer","machine","bot"]},"grinning-cat":{"a":"Grinning Cat","b":"1F63A","j":["cat","face","grinning","mouth","open","smile","animal","cats","happy"]},"grinning-cat-with-smiling-eyes":{"a":"Grinning Cat with Smiling Eyes","b":"1F638","j":["cat","eye","face","grin","smile","animal","cats"]},"cat-with-tears-of-joy":{"a":"Cat with Tears of Joy","b":"1F639","j":["cat","face","joy","tear","animal","cats","haha","happy","tears"]},"smiling-cat-with-hearteyes":{"a":"Smiling Cat with Heart-Eyes","b":"1F63B","j":["cat","eye","face","heart","love","smile","smiling cat with heart-eyes","smiling_cat_with_heart_eyes","animal","like","affection","cats","valentines"]},"cat-with-wry-smile":{"a":"Cat with Wry Smile","b":"1F63C","j":["cat","face","ironic","smile","wry","animal","cats","smirk"]},"kissing-cat":{"a":"Kissing Cat","b":"1F63D","j":["cat","eye","face","kiss","animal","cats"]},"weary-cat":{"a":"Weary Cat","b":"1F640","j":["cat","face","oh","surprised","weary","animal","cats","munch","scared","scream"]},"crying-cat":{"a":"Crying Cat","b":"1F63F","j":["cat","cry","face","sad","tear","animal","tears","weep","cats","upset"]},"pouting-cat":{"a":"Pouting Cat","b":"1F63E","j":["cat","face","pouting","animal","cats"]},"seenoevil-monkey":{"a":"See-No-Evil Monkey","b":"1F648","j":["evil","face","forbidden","monkey","see","see-no-evil monkey","see_no_evil_monkey","animal","nature","haha"]},"hearnoevil-monkey":{"a":"Hear-No-Evil Monkey","b":"1F649","j":["evil","face","forbidden","hear","hear-no-evil monkey","monkey","hear_no_evil_monkey","animal","nature"]},"speaknoevil-monkey":{"a":"Speak-No-Evil Monkey","b":"1F64A","j":["evil","face","forbidden","monkey","speak","speak-no-evil monkey","speak_no_evil_monkey","animal","nature","omg"]},"love-letter":{"a":"Love Letter","b":"1F48C","j":["heart","letter","love","mail","email","like","affection","envelope","valentines"]},"heart-with-arrow":{"a":"Heart with Arrow","b":"1F498","j":["arrow","cupid","love","like","heart","affection","valentines"]},"heart-with-ribbon":{"a":"Heart with Ribbon","b":"1F49D","j":["ribbon","valentine","love","valentines"]},"sparkling-heart":{"a":"Sparkling Heart","b":"1F496","j":["excited","sparkle","love","like","affection","valentines"]},"growing-heart":{"a":"Growing Heart","b":"1F497","j":["excited","growing","nervous","pulse","like","love","affection","valentines","pink"]},"beating-heart":{"a":"Beating Heart","b":"1F493","j":["beating","heartbeat","pulsating","love","like","affection","valentines","pink","heart"]},"revolving-hearts":{"a":"Revolving Hearts","b":"1F49E","j":["revolving","love","like","affection","valentines"]},"two-hearts":{"a":"Two Hearts","b":"1F495","j":["love","like","affection","valentines","heart"]},"heart-decoration":{"a":"Heart Decoration","b":"1F49F","j":["heart","purple-square","love","like"]},"heart-exclamation":{"a":"Heart Exclamation","b":"2763","j":["exclamation","mark","punctuation","decoration","love"]},"broken-heart":{"a":"Broken Heart","b":"1F494","j":["break","broken","sad","sorry","heart","heartbreak"]},"heart-on-fire":{"a":"Heart on Fire","b":"2764-FE0F-200D-1F525","j":["burn","heart","love","lust","sacred heart","passionate","enthusiastic"]},"mending-heart":{"a":"Mending Heart","b":"2764-FE0F-200D-1FA79","j":["healthier","improving","mending","recovering","recuperating","well","broken heart","bandage","wounded"]},"red-heart":{"a":"Red Heart","b":"2764","j":["heart","love","like","valentines"]},"pink-heart":{"a":"⊛ Pink Heart","b":"1FA77","j":["cute","heart","like","love","pink"]},"orange-heart":{"a":"Orange Heart","b":"1F9E1","j":["orange","love","like","affection","valentines"]},"yellow-heart":{"a":"Yellow Heart","b":"1F49B","j":["yellow","love","like","affection","valentines"]},"green-heart":{"a":"Green Heart","b":"1F49A","j":["green","love","like","affection","valentines"]},"blue-heart":{"a":"Blue Heart","b":"1F499","j":["blue","love","like","affection","valentines"]},"light-blue-heart":{"a":"⊛ Light Blue Heart","b":"1FA75","j":["cyan","heart","light blue","light blue heart","teal"]},"purple-heart":{"a":"Purple Heart","b":"1F49C","j":["purple","love","like","affection","valentines"]},"brown-heart":{"a":"Brown Heart","b":"1F90E","j":["brown","heart","coffee"]},"black-heart":{"a":"Black Heart","b":"1F5A4","j":["black","evil","wicked"]},"grey-heart":{"a":"⊛ Grey Heart","b":"1FA76","j":["gray","grey heart","heart","silver","slate"]},"white-heart":{"a":"White Heart","b":"1F90D","j":["heart","white","pure"]},"kiss-mark":{"a":"Kiss Mark","b":"1F48B","j":["kiss","lips","face","love","like","affection","valentines"]},"hundred-points":{"a":"Hundred Points","b":"1F4AF","j":["100","full","hundred","score","perfect","numbers","century","exam","quiz","test","pass"]},"anger-symbol":{"a":"Anger Symbol","b":"1F4A2","j":["angry","comic","mad"]},"collision":{"a":"Collision","b":"1F4A5","j":["boom","comic","bomb","explode","explosion","blown"]},"dizzy":{"a":"Dizzy","b":"1F4AB","j":["comic","star","sparkle","shoot","magic"]},"sweat-droplets":{"a":"Sweat Droplets","b":"1F4A6","j":["comic","splashing","sweat","water","drip","oops"]},"dashing-away":{"a":"Dashing Away","b":"1F4A8","j":["comic","dash","running","wind","air","fast","shoo","fart","smoke","puff"]},"hole":{"a":"Hole","b":"1F573","j":["embarrassing"]},"speech-balloon":{"a":"Speech Balloon","b":"1F4AC","j":["balloon","bubble","comic","dialog","speech","words","message","talk","chatting"]},"eye-in-speech-bubble":{"a":"Eye in Speech Bubble","b":"1F441-FE0F-200D-1F5E8-FE0F","j":["balloon","bubble","eye","speech","witness","info"]},"left-speech-bubble":{"a":"Left Speech Bubble","b":"1F5E8","j":["balloon","bubble","dialog","speech","words","message","talk","chatting"]},"right-anger-bubble":{"a":"Right Anger Bubble","b":"1F5EF","j":["angry","balloon","bubble","mad","caption","speech","thinking"]},"thought-balloon":{"a":"Thought Balloon","b":"1F4AD","j":["balloon","bubble","comic","thought","cloud","speech","thinking","dream"]},"zzz":{"a":"Zzz","b":"1F4A4","j":["comic","good night","sleep","ZZZ","sleepy","tired","dream"]},"waving-hand":{"a":"Waving Hand","b":"1F44B","j":["hand","wave","waving","hands","gesture","goodbye","solong","farewell","hello","hi","palm"]},"raised-back-of-hand":{"a":"Raised Back of Hand","b":"1F91A","j":["backhand","raised","fingers"]},"hand-with-fingers-splayed":{"a":"Hand with Fingers Splayed","b":"1F590","j":["finger","hand","splayed","fingers","palm"]},"raised-hand":{"a":"Raised Hand","b":"270B","j":["hand","high 5","high five","fingers","stop","highfive","palm","ban"]},"vulcan-salute":{"a":"Vulcan Salute","b":"1F596","j":["finger","hand","spock","vulcan","fingers","star trek"]},"rightwards-hand":{"a":"Rightwards Hand","b":"1FAF1","j":["hand","right","rightward","palm","offer"]},"leftwards-hand":{"a":"Leftwards Hand","b":"1FAF2","j":["hand","left","leftward","palm","offer"]},"palm-down-hand":{"a":"Palm Down Hand","b":"1FAF3","j":["dismiss","drop","shoo","palm"]},"palm-up-hand":{"a":"Palm Up Hand","b":"1FAF4","j":["beckon","catch","come","offer","lift","demand"]},"leftwards-pushing-hand":{"a":"⊛ Leftwards Pushing Hand","b":"1FAF7","j":["high five","leftward","leftwards pushing hand","push","refuse","stop","wait"]},"rightwards-pushing-hand":{"a":"⊛ Rightwards Pushing Hand","b":"1FAF8","j":["high five","push","refuse","rightward","rightwards pushing hand","stop","wait"]},"ok-hand":{"a":"Ok Hand","b":"1F44C","j":["hand","OK","fingers","limbs","perfect","ok","okay"]},"pinched-fingers":{"a":"Pinched Fingers","b":"1F90C","j":["fingers","hand gesture","interrogation","pinched","sarcastic","size","tiny","small"]},"pinching-hand":{"a":"Pinching Hand","b":"1F90F","j":["small amount","tiny","small","size"]},"victory-hand":{"a":"Victory Hand","b":"270C","j":["hand","v","victory","fingers","ohyeah","peace","two"]},"crossed-fingers":{"a":"Crossed Fingers","b":"1F91E","j":["cross","finger","hand","luck","good","lucky"]},"hand-with-index-finger-and-thumb-crossed":{"a":"Hand with Index Finger and Thumb Crossed","b":"1FAF0","j":["expensive","heart","love","money","snap"]},"loveyou-gesture":{"a":"Love-You Gesture","b":"1F91F","j":["hand","ILY","love-you gesture","love_you_gesture","fingers","gesture"]},"sign-of-the-horns":{"a":"Sign of the Horns","b":"1F918","j":["finger","hand","horns","rock-on","fingers","evil_eye","sign_of_horns","rock_on"]},"call-me-hand":{"a":"Call Me Hand","b":"1F919","j":["call","hand","hang loose","Shaka","hands","gesture","shaka"]},"backhand-index-pointing-left":{"a":"Backhand Index Pointing Left","b":"1F448","j":["backhand","finger","hand","index","point","direction","fingers","left"]},"backhand-index-pointing-right":{"a":"Backhand Index Pointing Right","b":"1F449","j":["backhand","finger","hand","index","point","fingers","direction","right"]},"backhand-index-pointing-up":{"a":"Backhand Index Pointing Up","b":"1F446","j":["backhand","finger","hand","point","up","fingers","direction"]},"middle-finger":{"a":"Middle Finger","b":"1F595","j":["finger","hand","fingers","rude","middle","flipping"]},"backhand-index-pointing-down":{"a":"Backhand Index Pointing Down","b":"1F447","j":["backhand","down","finger","hand","point","fingers","direction"]},"index-pointing-up":{"a":"Index Pointing Up","b":"261D","j":["finger","hand","index","point","up","fingers","direction"]},"index-pointing-at-the-viewer":{"a":"Index Pointing at the Viewer","b":"1FAF5","j":["point","you","recruit"]},"thumbs-up":{"a":"Thumbs Up","b":"1F44D","j":["+1","hand","thumb","up","thumbsup","yes","awesome","good","agree","accept","cool","like"]},"thumbs-down":{"a":"Thumbs Down","b":"1F44E","j":["-1","down","hand","thumb","thumbsdown","no","dislike"]},"raised-fist":{"a":"Raised Fist","b":"270A","j":["clenched","fist","hand","punch","fingers","grasp"]},"oncoming-fist":{"a":"Oncoming Fist","b":"1F44A","j":["clenched","fist","hand","punch","angry","violence","hit","attack"]},"leftfacing-fist":{"a":"Left-Facing Fist","b":"1F91B","j":["fist","left-facing fist","leftwards","left_facing_fist","hand","fistbump"]},"rightfacing-fist":{"a":"Right-Facing Fist","b":"1F91C","j":["fist","right-facing fist","rightwards","right_facing_fist","hand","fistbump"]},"clapping-hands":{"a":"Clapping Hands","b":"1F44F","j":["clap","hand","hands","praise","applause","congrats","yay"]},"raising-hands":{"a":"Raising Hands","b":"1F64C","j":["celebration","gesture","hand","hooray","raised","yea","hands"]},"heart-hands":{"a":"Heart Hands","b":"1FAF6","j":["love","appreciation","support"]},"open-hands":{"a":"Open Hands","b":"1F450","j":["hand","open","fingers","butterfly","hands"]},"palms-up-together":{"a":"Palms Up Together","b":"1F932","j":["prayer","cupped hands","hands","gesture","cupped"]},"handshake":{"a":"Handshake","b":"1F91D","j":["agreement","hand","meeting","shake"]},"folded-hands":{"a":"Folded Hands","b":"1F64F","j":["ask","hand","high 5","high five","please","pray","thanks","hope","wish","namaste","highfive","thank you","appreciate"]},"writing-hand":{"a":"Writing Hand","b":"270D","j":["hand","write","lower_left_ballpoint_pen","stationery","compose"]},"nail-polish":{"a":"Nail Polish","b":"1F485","j":["care","cosmetics","manicure","nail","polish","beauty","finger","fashion"]},"selfie":{"a":"Selfie","b":"1F933","j":["camera","phone"]},"flexed-biceps":{"a":"Flexed Biceps","b":"1F4AA","j":["biceps","comic","flex","muscle","arm","hand","summer","strong"]},"mechanical-arm":{"a":"Mechanical Arm","b":"1F9BE","j":["accessibility","prosthetic"]},"mechanical-leg":{"a":"Mechanical Leg","b":"1F9BF","j":["accessibility","prosthetic"]},"leg":{"a":"Leg","b":"1F9B5","j":["kick","limb"]},"foot":{"a":"Foot","b":"1F9B6","j":["kick","stomp"]},"ear":{"a":"Ear","b":"1F442","j":["body","face","hear","sound","listen"]},"ear-with-hearing-aid":{"a":"Ear with Hearing Aid","b":"1F9BB","j":["accessibility","hard of hearing"]},"nose":{"a":"Nose","b":"1F443","j":["body","smell","sniff"]},"brain":{"a":"Brain","b":"1F9E0","j":["intelligent","smart"]},"anatomical-heart":{"a":"Anatomical Heart","b":"1FAC0","j":["anatomical","cardiology","heart","organ","pulse","health","heartbeat"]},"lungs":{"a":"Lungs","b":"1FAC1","j":["breath","exhalation","inhalation","organ","respiration","breathe"]},"tooth":{"a":"Tooth","b":"1F9B7","j":["dentist","teeth"]},"bone":{"a":"Bone","b":"1F9B4","j":["skeleton"]},"eyes":{"a":"Eyes","b":"1F440","j":["eye","face","look","watch","stalk","peek","see"]},"eye":{"a":"Eye","b":"1F441","j":["body","face","look","see","watch","stare"]},"tongue":{"a":"Tongue","b":"1F445","j":["body","mouth","playful"]},"mouth":{"a":"Mouth","b":"1F444","j":["lips","kiss"]},"biting-lip":{"a":"Biting Lip","b":"1FAE6","j":["anxious","fear","flirting","nervous","uncomfortable","worried","flirt","sexy","pain","worry"]},"baby":{"a":"Baby","b":"1F476","j":["young","child","boy","girl","toddler"]},"child":{"a":"Child","b":"1F9D2","j":["gender-neutral","unspecified gender","young"]},"boy":{"a":"Boy","b":"1F466","j":["young","man","male","guy","teenager"]},"girl":{"a":"Girl","b":"1F467","j":["Virgo","young","zodiac","female","woman","teenager"]},"person":{"a":"Person","b":"1F9D1","j":["adult","gender-neutral","unspecified gender"]},"person-blond-hair":{"a":"Person: Blond Hair","b":"1F471","j":["blond","blond-haired person","hair","person: blond hair","hairstyle"]},"man":{"a":"Man","b":"1F468","j":["adult","mustache","father","dad","guy","classy","sir","moustache"]},"person-beard":{"a":"Person: Beard","b":"1F9D4","j":["beard","person","person: beard","bewhiskered","man_beard"]},"man-beard":{"a":"Man: Beard","b":"1F9D4-200D-2642-FE0F","j":["beard","man","man: beard","facial hair"]},"woman-beard":{"a":"Woman: Beard","b":"1F9D4-200D-2640-FE0F","j":["beard","woman","woman: beard","facial hair"]},"man-red-hair":{"a":"Man: Red Hair","b":"1F468-200D-1F9B0","j":["adult","man","red hair","hairstyle"]},"man-curly-hair":{"a":"Man: Curly Hair","b":"1F468-200D-1F9B1","j":["adult","curly hair","man","hairstyle"]},"man-white-hair":{"a":"Man: White Hair","b":"1F468-200D-1F9B3","j":["adult","man","white hair","old","elder"]},"man-bald":{"a":"Man: Bald","b":"1F468-200D-1F9B2","j":["adult","bald","man","hairless"]},"woman":{"a":"Woman","b":"1F469","j":["adult","female","girls","lady"]},"woman-red-hair":{"a":"Woman: Red Hair","b":"1F469-200D-1F9B0","j":["adult","red hair","woman","hairstyle"]},"person-red-hair":{"a":"Person: Red Hair","b":"1F9D1-200D-1F9B0","j":["adult","gender-neutral","person","red hair","unspecified gender","hairstyle"]},"woman-curly-hair":{"a":"Woman: Curly Hair","b":"1F469-200D-1F9B1","j":["adult","curly hair","woman","hairstyle"]},"person-curly-hair":{"a":"Person: Curly Hair","b":"1F9D1-200D-1F9B1","j":["adult","curly hair","gender-neutral","person","unspecified gender","hairstyle"]},"woman-white-hair":{"a":"Woman: White Hair","b":"1F469-200D-1F9B3","j":["adult","white hair","woman","old","elder"]},"person-white-hair":{"a":"Person: White Hair","b":"1F9D1-200D-1F9B3","j":["adult","gender-neutral","person","unspecified gender","white hair","elder","old"]},"woman-bald":{"a":"Woman: Bald","b":"1F469-200D-1F9B2","j":["adult","bald","woman","hairless"]},"person-bald":{"a":"Person: Bald","b":"1F9D1-200D-1F9B2","j":["adult","bald","gender-neutral","person","unspecified gender","hairless"]},"woman-blond-hair":{"a":"Woman: Blond Hair","b":"1F471-200D-2640-FE0F","j":["blond-haired woman","blonde","hair","woman","woman: blond hair","female","girl","person"]},"man-blond-hair":{"a":"Man: Blond Hair","b":"1F471-200D-2642-FE0F","j":["blond","blond-haired man","hair","man","man: blond hair","male","boy","blonde","guy","person"]},"older-person":{"a":"Older Person","b":"1F9D3","j":["adult","gender-neutral","old","unspecified gender","human","elder","senior"]},"old-man":{"a":"Old Man","b":"1F474","j":["adult","man","old","human","male","men","elder","senior"]},"old-woman":{"a":"Old Woman","b":"1F475","j":["adult","old","woman","human","female","women","lady","elder","senior"]},"person-frowning":{"a":"Person Frowning","b":"1F64D","j":["frown","gesture","worried"]},"man-frowning":{"a":"Man Frowning","b":"1F64D-200D-2642-FE0F","j":["frowning","gesture","man","male","boy","sad","depressed","discouraged","unhappy"]},"woman-frowning":{"a":"Woman Frowning","b":"1F64D-200D-2640-FE0F","j":["frowning","gesture","woman","female","girl","sad","depressed","discouraged","unhappy"]},"person-pouting":{"a":"Person Pouting","b":"1F64E","j":["gesture","pouting","upset"]},"man-pouting":{"a":"Man Pouting","b":"1F64E-200D-2642-FE0F","j":["gesture","man","pouting","male","boy"]},"woman-pouting":{"a":"Woman Pouting","b":"1F64E-200D-2640-FE0F","j":["gesture","pouting","woman","female","girl"]},"person-gesturing-no":{"a":"Person Gesturing No","b":"1F645","j":["forbidden","gesture","hand","person gesturing NO","prohibited","decline"]},"man-gesturing-no":{"a":"Man Gesturing No","b":"1F645-200D-2642-FE0F","j":["forbidden","gesture","hand","man","man gesturing NO","prohibited","male","boy","nope"]},"woman-gesturing-no":{"a":"Woman Gesturing No","b":"1F645-200D-2640-FE0F","j":["forbidden","gesture","hand","prohibited","woman","woman gesturing NO","female","girl","nope"]},"person-gesturing-ok":{"a":"Person Gesturing Ok","b":"1F646","j":["gesture","hand","OK","person gesturing OK","agree"]},"man-gesturing-ok":{"a":"Man Gesturing Ok","b":"1F646-200D-2642-FE0F","j":["gesture","hand","man","man gesturing OK","OK","men","boy","male","blue","human"]},"woman-gesturing-ok":{"a":"Woman Gesturing Ok","b":"1F646-200D-2640-FE0F","j":["gesture","hand","OK","woman","woman gesturing OK","women","girl","female","pink","human"]},"person-tipping-hand":{"a":"Person Tipping Hand","b":"1F481","j":["hand","help","information","sassy","tipping"]},"man-tipping-hand":{"a":"Man Tipping Hand","b":"1F481-200D-2642-FE0F","j":["man","sassy","tipping hand","male","boy","human","information"]},"woman-tipping-hand":{"a":"Woman Tipping Hand","b":"1F481-200D-2640-FE0F","j":["sassy","tipping hand","woman","female","girl","human","information"]},"person-raising-hand":{"a":"Person Raising Hand","b":"1F64B","j":["gesture","hand","happy","raised","question"]},"man-raising-hand":{"a":"Man Raising Hand","b":"1F64B-200D-2642-FE0F","j":["gesture","man","raising hand","male","boy"]},"woman-raising-hand":{"a":"Woman Raising Hand","b":"1F64B-200D-2640-FE0F","j":["gesture","raising hand","woman","female","girl"]},"deaf-person":{"a":"Deaf Person","b":"1F9CF","j":["accessibility","deaf","ear","hear"]},"deaf-man":{"a":"Deaf Man","b":"1F9CF-200D-2642-FE0F","j":["deaf","man","accessibility"]},"deaf-woman":{"a":"Deaf Woman","b":"1F9CF-200D-2640-FE0F","j":["deaf","woman","accessibility"]},"person-bowing":{"a":"Person Bowing","b":"1F647","j":["apology","bow","gesture","sorry","respectiful"]},"man-bowing":{"a":"Man Bowing","b":"1F647-200D-2642-FE0F","j":["apology","bowing","favor","gesture","man","sorry","male","boy"]},"woman-bowing":{"a":"Woman Bowing","b":"1F647-200D-2640-FE0F","j":["apology","bowing","favor","gesture","sorry","woman","female","girl"]},"person-facepalming":{"a":"Person Facepalming","b":"1F926","j":["disbelief","exasperation","face","palm","disappointed"]},"man-facepalming":{"a":"Man Facepalming","b":"1F926-200D-2642-FE0F","j":["disbelief","exasperation","facepalm","man","male","boy"]},"woman-facepalming":{"a":"Woman Facepalming","b":"1F926-200D-2640-FE0F","j":["disbelief","exasperation","facepalm","woman","female","girl"]},"person-shrugging":{"a":"Person Shrugging","b":"1F937","j":["doubt","ignorance","indifference","shrug","regardless"]},"man-shrugging":{"a":"Man Shrugging","b":"1F937-200D-2642-FE0F","j":["doubt","ignorance","indifference","man","shrug","male","boy","confused","indifferent"]},"woman-shrugging":{"a":"Woman Shrugging","b":"1F937-200D-2640-FE0F","j":["doubt","ignorance","indifference","shrug","woman","female","girl","confused","indifferent"]},"health-worker":{"a":"Health Worker","b":"1F9D1-200D-2695-FE0F","j":["doctor","healthcare","nurse","therapist","hospital"]},"man-health-worker":{"a":"Man Health Worker","b":"1F468-200D-2695-FE0F","j":["doctor","healthcare","man","nurse","therapist","human"]},"woman-health-worker":{"a":"Woman Health Worker","b":"1F469-200D-2695-FE0F","j":["doctor","healthcare","nurse","therapist","woman","human"]},"student":{"a":"Student","b":"1F9D1-200D-1F393","j":["graduate","learn"]},"man-student":{"a":"Man Student","b":"1F468-200D-1F393","j":["graduate","man","student","human"]},"woman-student":{"a":"Woman Student","b":"1F469-200D-1F393","j":["graduate","student","woman","human"]},"teacher":{"a":"Teacher","b":"1F9D1-200D-1F3EB","j":["instructor","professor"]},"man-teacher":{"a":"Man Teacher","b":"1F468-200D-1F3EB","j":["instructor","man","professor","teacher","human"]},"woman-teacher":{"a":"Woman Teacher","b":"1F469-200D-1F3EB","j":["instructor","professor","teacher","woman","human"]},"judge":{"a":"Judge","b":"1F9D1-200D-2696-FE0F","j":["justice","scales","law"]},"man-judge":{"a":"Man Judge","b":"1F468-200D-2696-FE0F","j":["judge","justice","man","scales","court","human"]},"woman-judge":{"a":"Woman Judge","b":"1F469-200D-2696-FE0F","j":["judge","justice","scales","woman","court","human"]},"farmer":{"a":"Farmer","b":"1F9D1-200D-1F33E","j":["gardener","rancher","crops"]},"man-farmer":{"a":"Man Farmer","b":"1F468-200D-1F33E","j":["farmer","gardener","man","rancher","human"]},"woman-farmer":{"a":"Woman Farmer","b":"1F469-200D-1F33E","j":["farmer","gardener","rancher","woman","human"]},"cook":{"a":"Cook","b":"1F9D1-200D-1F373","j":["chef","food","kitchen","culinary"]},"man-cook":{"a":"Man Cook","b":"1F468-200D-1F373","j":["chef","cook","man","human"]},"woman-cook":{"a":"Woman Cook","b":"1F469-200D-1F373","j":["chef","cook","woman","human"]},"mechanic":{"a":"Mechanic","b":"1F9D1-200D-1F527","j":["electrician","plumber","tradesperson","worker","technician"]},"man-mechanic":{"a":"Man Mechanic","b":"1F468-200D-1F527","j":["electrician","man","mechanic","plumber","tradesperson","human","wrench"]},"woman-mechanic":{"a":"Woman Mechanic","b":"1F469-200D-1F527","j":["electrician","mechanic","plumber","tradesperson","woman","human","wrench"]},"factory-worker":{"a":"Factory Worker","b":"1F9D1-200D-1F3ED","j":["assembly","factory","industrial","worker","labor"]},"man-factory-worker":{"a":"Man Factory Worker","b":"1F468-200D-1F3ED","j":["assembly","factory","industrial","man","worker","human"]},"woman-factory-worker":{"a":"Woman Factory Worker","b":"1F469-200D-1F3ED","j":["assembly","factory","industrial","woman","worker","human"]},"office-worker":{"a":"Office Worker","b":"1F9D1-200D-1F4BC","j":["architect","business","manager","white-collar"]},"man-office-worker":{"a":"Man Office Worker","b":"1F468-200D-1F4BC","j":["architect","business","man","manager","white-collar","human"]},"woman-office-worker":{"a":"Woman Office Worker","b":"1F469-200D-1F4BC","j":["architect","business","manager","white-collar","woman","human"]},"scientist":{"a":"Scientist","b":"1F9D1-200D-1F52C","j":["biologist","chemist","engineer","physicist","chemistry"]},"man-scientist":{"a":"Man Scientist","b":"1F468-200D-1F52C","j":["biologist","chemist","engineer","man","physicist","scientist","human"]},"woman-scientist":{"a":"Woman Scientist","b":"1F469-200D-1F52C","j":["biologist","chemist","engineer","physicist","scientist","woman","human"]},"technologist":{"a":"Technologist","b":"1F9D1-200D-1F4BB","j":["coder","developer","inventor","software","computer"]},"man-technologist":{"a":"Man Technologist","b":"1F468-200D-1F4BB","j":["coder","developer","inventor","man","software","technologist","engineer","programmer","human","laptop","computer"]},"woman-technologist":{"a":"Woman Technologist","b":"1F469-200D-1F4BB","j":["coder","developer","inventor","software","technologist","woman","engineer","programmer","human","laptop","computer"]},"singer":{"a":"Singer","b":"1F9D1-200D-1F3A4","j":["actor","entertainer","rock","star","song","artist","performer"]},"man-singer":{"a":"Man Singer","b":"1F468-200D-1F3A4","j":["actor","entertainer","man","rock","singer","star","rockstar","human"]},"woman-singer":{"a":"Woman Singer","b":"1F469-200D-1F3A4","j":["actor","entertainer","rock","singer","star","woman","rockstar","human"]},"artist":{"a":"Artist","b":"1F9D1-200D-1F3A8","j":["palette","painting","draw","creativity"]},"man-artist":{"a":"Man Artist","b":"1F468-200D-1F3A8","j":["artist","man","palette","painter","human"]},"woman-artist":{"a":"Woman Artist","b":"1F469-200D-1F3A8","j":["artist","palette","woman","painter","human"]},"pilot":{"a":"Pilot","b":"1F9D1-200D-2708-FE0F","j":["plane","fly","airplane"]},"man-pilot":{"a":"Man Pilot","b":"1F468-200D-2708-FE0F","j":["man","pilot","plane","aviator","human"]},"woman-pilot":{"a":"Woman Pilot","b":"1F469-200D-2708-FE0F","j":["pilot","plane","woman","aviator","human"]},"astronaut":{"a":"Astronaut","b":"1F9D1-200D-1F680","j":["rocket","outerspace"]},"man-astronaut":{"a":"Man Astronaut","b":"1F468-200D-1F680","j":["astronaut","man","rocket","space","human"]},"woman-astronaut":{"a":"Woman Astronaut","b":"1F469-200D-1F680","j":["astronaut","rocket","woman","space","human"]},"firefighter":{"a":"Firefighter","b":"1F9D1-200D-1F692","j":["firetruck","fire"]},"man-firefighter":{"a":"Man Firefighter","b":"1F468-200D-1F692","j":["firefighter","firetruck","man","fireman","human"]},"woman-firefighter":{"a":"Woman Firefighter","b":"1F469-200D-1F692","j":["firefighter","firetruck","woman","fireman","human"]},"police-officer":{"a":"Police Officer","b":"1F46E","j":["cop","officer","police"]},"man-police-officer":{"a":"Man Police Officer","b":"1F46E-200D-2642-FE0F","j":["cop","man","officer","police","law","legal","enforcement","arrest","911"]},"woman-police-officer":{"a":"Woman Police Officer","b":"1F46E-200D-2640-FE0F","j":["cop","officer","police","woman","law","legal","enforcement","arrest","911","female"]},"detective":{"a":"Detective","b":"1F575","j":["sleuth","spy","human"]},"man-detective":{"a":"Man Detective","b":"1F575-FE0F-200D-2642-FE0F","j":["detective","man","sleuth","spy","crime"]},"woman-detective":{"a":"Woman Detective","b":"1F575-FE0F-200D-2640-FE0F","j":["detective","sleuth","spy","woman","human","female"]},"guard":{"a":"Guard","b":"1F482","j":["protect"]},"man-guard":{"a":"Man Guard","b":"1F482-200D-2642-FE0F","j":["guard","man","uk","gb","british","male","guy","royal"]},"woman-guard":{"a":"Woman Guard","b":"1F482-200D-2640-FE0F","j":["guard","woman","uk","gb","british","female","royal"]},"ninja":{"a":"Ninja","b":"1F977","j":["fighter","hidden","stealth","ninjutsu","skills","japanese"]},"construction-worker":{"a":"Construction Worker","b":"1F477","j":["construction","hat","worker","labor","build"]},"man-construction-worker":{"a":"Man Construction Worker","b":"1F477-200D-2642-FE0F","j":["construction","man","worker","male","human","wip","guy","build","labor"]},"woman-construction-worker":{"a":"Woman Construction Worker","b":"1F477-200D-2640-FE0F","j":["construction","woman","worker","female","human","wip","build","labor"]},"person-with-crown":{"a":"Person with Crown","b":"1FAC5","j":["monarch","noble","regal","royalty","power"]},"prince":{"a":"Prince","b":"1F934","j":["boy","man","male","crown","royal","king"]},"princess":{"a":"Princess","b":"1F478","j":["fairy tale","fantasy","girl","woman","female","blond","crown","royal","queen"]},"person-wearing-turban":{"a":"Person Wearing Turban","b":"1F473","j":["turban","headdress"]},"man-wearing-turban":{"a":"Man Wearing Turban","b":"1F473-200D-2642-FE0F","j":["man","turban","male","indian","hinduism","arabs"]},"woman-wearing-turban":{"a":"Woman Wearing Turban","b":"1F473-200D-2640-FE0F","j":["turban","woman","female","indian","hinduism","arabs"]},"person-with-skullcap":{"a":"Person with Skullcap","b":"1F472","j":["cap","gua pi mao","hat","person","skullcap","man_with_skullcap","male","boy","chinese"]},"woman-with-headscarf":{"a":"Woman with Headscarf","b":"1F9D5","j":["headscarf","hijab","mantilla","tichel","bandana","head kerchief","female"]},"person-in-tuxedo":{"a":"Person in Tuxedo","b":"1F935","j":["groom","person","tuxedo","man_in_tuxedo","couple","marriage","wedding"]},"man-in-tuxedo":{"a":"Man in Tuxedo","b":"1F935-200D-2642-FE0F","j":["man","tuxedo","formal","fashion"]},"woman-in-tuxedo":{"a":"Woman in Tuxedo","b":"1F935-200D-2640-FE0F","j":["tuxedo","woman","formal","fashion"]},"person-with-veil":{"a":"Person with Veil","b":"1F470","j":["bride","person","veil","wedding","bride_with_veil","couple","marriage","woman"]},"man-with-veil":{"a":"Man with Veil","b":"1F470-200D-2642-FE0F","j":["man","veil","wedding","marriage"]},"woman-with-veil":{"a":"Woman with Veil","b":"1F470-200D-2640-FE0F","j":["veil","woman","wedding","marriage"]},"pregnant-woman":{"a":"Pregnant Woman","b":"1F930","j":["pregnant","woman","baby"]},"pregnant-man":{"a":"Pregnant Man","b":"1FAC3","j":["belly","bloated","full","pregnant","baby"]},"pregnant-person":{"a":"Pregnant Person","b":"1FAC4","j":["belly","bloated","full","pregnant","baby"]},"breastfeeding":{"a":"Breast-Feeding","b":"1F931","j":["baby","breast","breast-feeding","nursing","breast_feeding"]},"woman-feeding-baby":{"a":"Woman Feeding Baby","b":"1F469-200D-1F37C","j":["baby","feeding","nursing","woman","birth","food"]},"man-feeding-baby":{"a":"Man Feeding Baby","b":"1F468-200D-1F37C","j":["baby","feeding","man","nursing","birth","food"]},"person-feeding-baby":{"a":"Person Feeding Baby","b":"1F9D1-200D-1F37C","j":["baby","feeding","nursing","person","birth","food"]},"baby-angel":{"a":"Baby Angel","b":"1F47C","j":["angel","baby","face","fairy tale","fantasy","heaven","wings","halo"]},"santa-claus":{"a":"Santa Claus","b":"1F385","j":["celebration","Christmas","claus","father","santa","festival","man","male","xmas","father christmas"]},"mrs-claus":{"a":"Mrs. Claus","b":"1F936","j":["celebration","Christmas","claus","mother","Mrs.","woman","female","xmas","mother christmas"]},"mx-claus":{"a":"Mx Claus","b":"1F9D1-200D-1F384","j":["Claus, christmas","christmas"]},"superhero":{"a":"Superhero","b":"1F9B8","j":["good","hero","heroine","superpower","marvel"]},"man-superhero":{"a":"Man Superhero","b":"1F9B8-200D-2642-FE0F","j":["good","hero","man","superpower","male","superpowers"]},"woman-superhero":{"a":"Woman Superhero","b":"1F9B8-200D-2640-FE0F","j":["good","hero","heroine","superpower","woman","female","superpowers"]},"supervillain":{"a":"Supervillain","b":"1F9B9","j":["criminal","evil","superpower","villain","marvel"]},"man-supervillain":{"a":"Man Supervillain","b":"1F9B9-200D-2642-FE0F","j":["criminal","evil","man","superpower","villain","male","bad","hero","superpowers"]},"woman-supervillain":{"a":"Woman Supervillain","b":"1F9B9-200D-2640-FE0F","j":["criminal","evil","superpower","villain","woman","female","bad","heroine","superpowers"]},"mage":{"a":"Mage","b":"1F9D9","j":["sorcerer","sorceress","witch","wizard","magic"]},"man-mage":{"a":"Man Mage","b":"1F9D9-200D-2642-FE0F","j":["sorcerer","wizard","man","male","mage"]},"woman-mage":{"a":"Woman Mage","b":"1F9D9-200D-2640-FE0F","j":["sorceress","witch","woman","female","mage"]},"fairy":{"a":"Fairy","b":"1F9DA","j":["Oberon","Puck","Titania","wings","magical"]},"man-fairy":{"a":"Man Fairy","b":"1F9DA-200D-2642-FE0F","j":["Oberon","Puck","man","male"]},"woman-fairy":{"a":"Woman Fairy","b":"1F9DA-200D-2640-FE0F","j":["Titania","woman","female"]},"vampire":{"a":"Vampire","b":"1F9DB","j":["Dracula","undead","blood","twilight"]},"man-vampire":{"a":"Man Vampire","b":"1F9DB-200D-2642-FE0F","j":["Dracula","undead","man","male","dracula"]},"woman-vampire":{"a":"Woman Vampire","b":"1F9DB-200D-2640-FE0F","j":["undead","woman","female"]},"merperson":{"a":"Merperson","b":"1F9DC","j":["mermaid","merman","merwoman","sea"]},"merman":{"a":"Merman","b":"1F9DC-200D-2642-FE0F","j":["Triton","man","male","triton"]},"mermaid":{"a":"Mermaid","b":"1F9DC-200D-2640-FE0F","j":["merwoman","woman","female","ariel"]},"elf":{"a":"Elf","b":"1F9DD","j":["magical","LOTR style"]},"man-elf":{"a":"Man Elf","b":"1F9DD-200D-2642-FE0F","j":["magical","man","male"]},"woman-elf":{"a":"Woman Elf","b":"1F9DD-200D-2640-FE0F","j":["magical","woman","female"]},"genie":{"a":"Genie","b":"1F9DE","j":["djinn","(non-human color)","magical","wishes"]},"man-genie":{"a":"Man Genie","b":"1F9DE-200D-2642-FE0F","j":["djinn","man","male"]},"woman-genie":{"a":"Woman Genie","b":"1F9DE-200D-2640-FE0F","j":["djinn","woman","female"]},"zombie":{"a":"Zombie","b":"1F9DF","j":["undead","walking dead","(non-human color)","dead"]},"man-zombie":{"a":"Man Zombie","b":"1F9DF-200D-2642-FE0F","j":["undead","walking dead","man","male","dracula"]},"woman-zombie":{"a":"Woman Zombie","b":"1F9DF-200D-2640-FE0F","j":["undead","walking dead","woman","female"]},"troll":{"a":"Troll","b":"1F9CC","j":["fairy tale","fantasy","monster","mystical"]},"person-getting-massage":{"a":"Person Getting Massage","b":"1F486","j":["face","massage","salon","relax"]},"man-getting-massage":{"a":"Man Getting Massage","b":"1F486-200D-2642-FE0F","j":["face","man","massage","male","boy","head"]},"woman-getting-massage":{"a":"Woman Getting Massage","b":"1F486-200D-2640-FE0F","j":["face","massage","woman","female","girl","head"]},"person-getting-haircut":{"a":"Person Getting Haircut","b":"1F487","j":["barber","beauty","haircut","parlor","hairstyle"]},"man-getting-haircut":{"a":"Man Getting Haircut","b":"1F487-200D-2642-FE0F","j":["haircut","man","male","boy"]},"woman-getting-haircut":{"a":"Woman Getting Haircut","b":"1F487-200D-2640-FE0F","j":["haircut","woman","female","girl"]},"person-walking":{"a":"Person Walking","b":"1F6B6","j":["hike","walk","walking","move"]},"man-walking":{"a":"Man Walking","b":"1F6B6-200D-2642-FE0F","j":["hike","man","walk","human","feet","steps"]},"woman-walking":{"a":"Woman Walking","b":"1F6B6-200D-2640-FE0F","j":["hike","walk","woman","human","feet","steps","female"]},"person-standing":{"a":"Person Standing","b":"1F9CD","j":["stand","standing","still"]},"man-standing":{"a":"Man Standing","b":"1F9CD-200D-2642-FE0F","j":["man","standing","still"]},"woman-standing":{"a":"Woman Standing","b":"1F9CD-200D-2640-FE0F","j":["standing","woman","still"]},"person-kneeling":{"a":"Person Kneeling","b":"1F9CE","j":["kneel","kneeling","pray","respectful"]},"man-kneeling":{"a":"Man Kneeling","b":"1F9CE-200D-2642-FE0F","j":["kneeling","man","pray","respectful"]},"woman-kneeling":{"a":"Woman Kneeling","b":"1F9CE-200D-2640-FE0F","j":["kneeling","woman","respectful","pray"]},"person-with-white-cane":{"a":"Person with White Cane","b":"1F9D1-200D-1F9AF","j":["accessibility","blind","person_with_probing_cane"]},"man-with-white-cane":{"a":"Man with White Cane","b":"1F468-200D-1F9AF","j":["accessibility","blind","man","man_with_probing_cane"]},"woman-with-white-cane":{"a":"Woman with White Cane","b":"1F469-200D-1F9AF","j":["accessibility","blind","woman","woman_with_probing_cane"]},"person-in-motorized-wheelchair":{"a":"Person in Motorized Wheelchair","b":"1F9D1-200D-1F9BC","j":["accessibility","wheelchair","disability"]},"man-in-motorized-wheelchair":{"a":"Man in Motorized Wheelchair","b":"1F468-200D-1F9BC","j":["accessibility","man","wheelchair","disability"]},"woman-in-motorized-wheelchair":{"a":"Woman in Motorized Wheelchair","b":"1F469-200D-1F9BC","j":["accessibility","wheelchair","woman","disability"]},"person-in-manual-wheelchair":{"a":"Person in Manual Wheelchair","b":"1F9D1-200D-1F9BD","j":["accessibility","wheelchair","disability"]},"man-in-manual-wheelchair":{"a":"Man in Manual Wheelchair","b":"1F468-200D-1F9BD","j":["accessibility","man","wheelchair","disability"]},"woman-in-manual-wheelchair":{"a":"Woman in Manual Wheelchair","b":"1F469-200D-1F9BD","j":["accessibility","wheelchair","woman","disability"]},"person-running":{"a":"Person Running","b":"1F3C3","j":["marathon","running","move"]},"man-running":{"a":"Man Running","b":"1F3C3-200D-2642-FE0F","j":["man","marathon","racing","running","walking","exercise","race"]},"woman-running":{"a":"Woman Running","b":"1F3C3-200D-2640-FE0F","j":["marathon","racing","running","woman","walking","exercise","race","female"]},"woman-dancing":{"a":"Woman Dancing","b":"1F483","j":["dance","dancing","woman","female","girl","fun"]},"man-dancing":{"a":"Man Dancing","b":"1F57A","j":["dance","dancing","man","male","boy","fun","dancer"]},"person-in-suit-levitating":{"a":"Person in Suit Levitating","b":"1F574","j":["business","person","suit","man_in_suit_levitating","levitate","hover","jump"]},"people-with-bunny-ears":{"a":"People with Bunny Ears","b":"1F46F","j":["bunny ear","dancer","partying","perform","costume"]},"men-with-bunny-ears":{"a":"Men with Bunny Ears","b":"1F46F-200D-2642-FE0F","j":["bunny ear","dancer","men","partying","male","bunny","boys"]},"women-with-bunny-ears":{"a":"Women with Bunny Ears","b":"1F46F-200D-2640-FE0F","j":["bunny ear","dancer","partying","women","female","bunny","girls"]},"person-in-steamy-room":{"a":"Person in Steamy Room","b":"1F9D6","j":["sauna","steam room","hamam","steambath","relax","spa"]},"man-in-steamy-room":{"a":"Man in Steamy Room","b":"1F9D6-200D-2642-FE0F","j":["sauna","steam room","male","man","spa","steamroom"]},"woman-in-steamy-room":{"a":"Woman in Steamy Room","b":"1F9D6-200D-2640-FE0F","j":["sauna","steam room","female","woman","spa","steamroom"]},"person-climbing":{"a":"Person Climbing","b":"1F9D7","j":["climber","sport"]},"man-climbing":{"a":"Man Climbing","b":"1F9D7-200D-2642-FE0F","j":["climber","sports","hobby","man","male","rock"]},"woman-climbing":{"a":"Woman Climbing","b":"1F9D7-200D-2640-FE0F","j":["climber","sports","hobby","woman","female","rock"]},"person-fencing":{"a":"Person Fencing","b":"1F93A","j":["fencer","fencing","sword","sports"]},"horse-racing":{"a":"Horse Racing","b":"1F3C7","j":["horse","jockey","racehorse","racing","animal","betting","competition","gambling","luck"]},"skier":{"a":"Skier","b":"26F7","j":["ski","snow","sports","winter"]},"snowboarder":{"a":"Snowboarder","b":"1F3C2","j":["ski","snow","snowboard","sports","winter"]},"person-golfing":{"a":"Person Golfing","b":"1F3CC","j":["ball","golf","sports","business"]},"man-golfing":{"a":"Man Golfing","b":"1F3CC-FE0F-200D-2642-FE0F","j":["golf","man","sport"]},"woman-golfing":{"a":"Woman Golfing","b":"1F3CC-FE0F-200D-2640-FE0F","j":["golf","woman","sports","business","female"]},"person-surfing":{"a":"Person Surfing","b":"1F3C4","j":["surfing","sport","sea"]},"man-surfing":{"a":"Man Surfing","b":"1F3C4-200D-2642-FE0F","j":["man","surfing","sports","ocean","sea","summer","beach"]},"woman-surfing":{"a":"Woman Surfing","b":"1F3C4-200D-2640-FE0F","j":["surfing","woman","sports","ocean","sea","summer","beach","female"]},"person-rowing-boat":{"a":"Person Rowing Boat","b":"1F6A3","j":["boat","rowboat","sport","move"]},"man-rowing-boat":{"a":"Man Rowing Boat","b":"1F6A3-200D-2642-FE0F","j":["boat","man","rowboat","sports","hobby","water","ship"]},"woman-rowing-boat":{"a":"Woman Rowing Boat","b":"1F6A3-200D-2640-FE0F","j":["boat","rowboat","woman","sports","hobby","water","ship","female"]},"person-swimming":{"a":"Person Swimming","b":"1F3CA","j":["swim","sport","pool"]},"man-swimming":{"a":"Man Swimming","b":"1F3CA-200D-2642-FE0F","j":["man","swim","sports","exercise","human","athlete","water","summer"]},"woman-swimming":{"a":"Woman Swimming","b":"1F3CA-200D-2640-FE0F","j":["swim","woman","sports","exercise","human","athlete","water","summer","female"]},"person-bouncing-ball":{"a":"Person Bouncing Ball","b":"26F9","j":["ball","sports","human"]},"man-bouncing-ball":{"a":"Man Bouncing Ball","b":"26F9-FE0F-200D-2642-FE0F","j":["ball","man","sport"]},"woman-bouncing-ball":{"a":"Woman Bouncing Ball","b":"26F9-FE0F-200D-2640-FE0F","j":["ball","woman","sports","human","female"]},"person-lifting-weights":{"a":"Person Lifting Weights","b":"1F3CB","j":["lifter","weight","sports","training","exercise"]},"man-lifting-weights":{"a":"Man Lifting Weights","b":"1F3CB-FE0F-200D-2642-FE0F","j":["man","weight lifter","sport"]},"woman-lifting-weights":{"a":"Woman Lifting Weights","b":"1F3CB-FE0F-200D-2640-FE0F","j":["weight lifter","woman","sports","training","exercise","female"]},"person-biking":{"a":"Person Biking","b":"1F6B4","j":["bicycle","biking","cyclist","sport","move"]},"man-biking":{"a":"Man Biking","b":"1F6B4-200D-2642-FE0F","j":["bicycle","biking","cyclist","man","sports","bike","exercise","hipster"]},"woman-biking":{"a":"Woman Biking","b":"1F6B4-200D-2640-FE0F","j":["bicycle","biking","cyclist","woman","sports","bike","exercise","hipster","female"]},"person-mountain-biking":{"a":"Person Mountain Biking","b":"1F6B5","j":["bicycle","bicyclist","bike","cyclist","mountain","sport","move"]},"man-mountain-biking":{"a":"Man Mountain Biking","b":"1F6B5-200D-2642-FE0F","j":["bicycle","bike","cyclist","man","mountain","transportation","sports","human","race"]},"woman-mountain-biking":{"a":"Woman Mountain Biking","b":"1F6B5-200D-2640-FE0F","j":["bicycle","bike","biking","cyclist","mountain","woman","transportation","sports","human","race","female"]},"person-cartwheeling":{"a":"Person Cartwheeling","b":"1F938","j":["cartwheel","gymnastics","sport","gymnastic"]},"man-cartwheeling":{"a":"Man Cartwheeling","b":"1F938-200D-2642-FE0F","j":["cartwheel","gymnastics","man"]},"woman-cartwheeling":{"a":"Woman Cartwheeling","b":"1F938-200D-2640-FE0F","j":["cartwheel","gymnastics","woman"]},"people-wrestling":{"a":"People Wrestling","b":"1F93C","j":["wrestle","wrestler","sport"]},"men-wrestling":{"a":"Men Wrestling","b":"1F93C-200D-2642-FE0F","j":["men","wrestle","sports","wrestlers"]},"women-wrestling":{"a":"Women Wrestling","b":"1F93C-200D-2640-FE0F","j":["women","wrestle","sports","wrestlers"]},"person-playing-water-polo":{"a":"Person Playing Water Polo","b":"1F93D","j":["polo","water","sport"]},"man-playing-water-polo":{"a":"Man Playing Water Polo","b":"1F93D-200D-2642-FE0F","j":["man","water polo","sports","pool"]},"woman-playing-water-polo":{"a":"Woman Playing Water Polo","b":"1F93D-200D-2640-FE0F","j":["water polo","woman","sports","pool"]},"person-playing-handball":{"a":"Person Playing Handball","b":"1F93E","j":["ball","handball","sport"]},"man-playing-handball":{"a":"Man Playing Handball","b":"1F93E-200D-2642-FE0F","j":["handball","man","sports"]},"woman-playing-handball":{"a":"Woman Playing Handball","b":"1F93E-200D-2640-FE0F","j":["handball","woman","sports"]},"person-juggling":{"a":"Person Juggling","b":"1F939","j":["balance","juggle","multitask","skill","performance"]},"man-juggling":{"a":"Man Juggling","b":"1F939-200D-2642-FE0F","j":["juggling","man","multitask","juggle","balance","skill"]},"woman-juggling":{"a":"Woman Juggling","b":"1F939-200D-2640-FE0F","j":["juggling","multitask","woman","juggle","balance","skill"]},"person-in-lotus-position":{"a":"Person in Lotus Position","b":"1F9D8","j":["meditation","yoga","serenity","meditate"]},"man-in-lotus-position":{"a":"Man in Lotus Position","b":"1F9D8-200D-2642-FE0F","j":["meditation","yoga","man","male","serenity","zen","mindfulness"]},"woman-in-lotus-position":{"a":"Woman in Lotus Position","b":"1F9D8-200D-2640-FE0F","j":["meditation","yoga","woman","female","serenity","zen","mindfulness"]},"person-taking-bath":{"a":"Person Taking Bath","b":"1F6C0","j":["bath","bathtub","clean","shower","bathroom"]},"person-in-bed":{"a":"Person in Bed","b":"1F6CC","j":["good night","hotel","sleep","bed","rest"]},"people-holding-hands":{"a":"People Holding Hands","b":"1F9D1-200D-1F91D-200D-1F9D1","j":["couple","hand","hold","holding hands","person","friendship"]},"women-holding-hands":{"a":"Women Holding Hands","b":"1F46D","j":["couple","hand","holding hands","women","pair","friendship","love","like","female","people","human"]},"woman-and-man-holding-hands":{"a":"Woman and Man Holding Hands","b":"1F46B","j":["couple","hand","hold","holding hands","man","woman","pair","people","human","love","date","dating","like","affection","valentines","marriage"]},"men-holding-hands":{"a":"Men Holding Hands","b":"1F46C","j":["couple","Gemini","holding hands","man","men","twins","zodiac","pair","love","like","bromance","friendship","people","human"]},"kiss":{"a":"Kiss","b":"1F48F","j":["couple","pair","valentines","love","like","dating","marriage"]},"kiss-woman-man":{"a":"Kiss: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["couple","kiss","man","woman","love"]},"kiss-man-man":{"a":"Kiss: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["couple","kiss","man","pair","valentines","love","like","dating","marriage"]},"kiss-woman-woman":{"a":"Kiss: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F469","j":["couple","kiss","woman","pair","valentines","love","like","dating","marriage"]},"couple-with-heart":{"a":"Couple with Heart","b":"1F491","j":["couple","love","pair","like","affection","human","dating","valentines","marriage"]},"couple-with-heart-woman-man":{"a":"Couple with Heart: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F468","j":["couple","couple with heart","love","man","woman"]},"couple-with-heart-man-man":{"a":"Couple with Heart: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F468","j":["couple","couple with heart","love","man","pair","like","affection","human","dating","valentines","marriage"]},"couple-with-heart-woman-woman":{"a":"Couple with Heart: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F469","j":["couple","couple with heart","love","woman","pair","like","affection","human","dating","valentines","marriage"]},"family":{"a":"Family","b":"1F46A","j":["home","parents","child","mom","dad","father","mother","people","human"]},"family-man-woman-boy":{"a":"Family: Man, Woman, Boy","b":"1F468-200D-1F469-200D-1F466","j":["boy","family","man","woman","love"]},"family-man-woman-girl":{"a":"Family: Man, Woman, Girl","b":"1F468-200D-1F469-200D-1F467","j":["family","girl","man","woman","home","parents","people","human","child"]},"family-man-woman-girl-boy":{"a":"Family: Man, Woman, Girl, Boy","b":"1F468-200D-1F469-200D-1F467-200D-1F466","j":["boy","family","girl","man","woman","home","parents","people","human","children"]},"family-man-woman-boy-boy":{"a":"Family: Man, Woman, Boy, Boy","b":"1F468-200D-1F469-200D-1F466-200D-1F466","j":["boy","family","man","woman","home","parents","people","human","children"]},"family-man-woman-girl-girl":{"a":"Family: Man, Woman, Girl, Girl","b":"1F468-200D-1F469-200D-1F467-200D-1F467","j":["family","girl","man","woman","home","parents","people","human","children"]},"family-man-man-boy":{"a":"Family: Man, Man, Boy","b":"1F468-200D-1F468-200D-1F466","j":["boy","family","man","home","parents","people","human","children"]},"family-man-man-girl":{"a":"Family: Man, Man, Girl","b":"1F468-200D-1F468-200D-1F467","j":["family","girl","man","home","parents","people","human","children"]},"family-man-man-girl-boy":{"a":"Family: Man, Man, Girl, Boy","b":"1F468-200D-1F468-200D-1F467-200D-1F466","j":["boy","family","girl","man","home","parents","people","human","children"]},"family-man-man-boy-boy":{"a":"Family: Man, Man, Boy, Boy","b":"1F468-200D-1F468-200D-1F466-200D-1F466","j":["boy","family","man","home","parents","people","human","children"]},"family-man-man-girl-girl":{"a":"Family: Man, Man, Girl, Girl","b":"1F468-200D-1F468-200D-1F467-200D-1F467","j":["family","girl","man","home","parents","people","human","children"]},"family-woman-woman-boy":{"a":"Family: Woman, Woman, Boy","b":"1F469-200D-1F469-200D-1F466","j":["boy","family","woman","home","parents","people","human","children"]},"family-woman-woman-girl":{"a":"Family: Woman, Woman, Girl","b":"1F469-200D-1F469-200D-1F467","j":["family","girl","woman","home","parents","people","human","children"]},"family-woman-woman-girl-boy":{"a":"Family: Woman, Woman, Girl, Boy","b":"1F469-200D-1F469-200D-1F467-200D-1F466","j":["boy","family","girl","woman","home","parents","people","human","children"]},"family-woman-woman-boy-boy":{"a":"Family: Woman, Woman, Boy, Boy","b":"1F469-200D-1F469-200D-1F466-200D-1F466","j":["boy","family","woman","home","parents","people","human","children"]},"family-woman-woman-girl-girl":{"a":"Family: Woman, Woman, Girl, Girl","b":"1F469-200D-1F469-200D-1F467-200D-1F467","j":["family","girl","woman","home","parents","people","human","children"]},"family-man-boy":{"a":"Family: Man, Boy","b":"1F468-200D-1F466","j":["boy","family","man","home","parent","people","human","child"]},"family-man-boy-boy":{"a":"Family: Man, Boy, Boy","b":"1F468-200D-1F466-200D-1F466","j":["boy","family","man","home","parent","people","human","children"]},"family-man-girl":{"a":"Family: Man, Girl","b":"1F468-200D-1F467","j":["family","girl","man","home","parent","people","human","child"]},"family-man-girl-boy":{"a":"Family: Man, Girl, Boy","b":"1F468-200D-1F467-200D-1F466","j":["boy","family","girl","man","home","parent","people","human","children"]},"family-man-girl-girl":{"a":"Family: Man, Girl, Girl","b":"1F468-200D-1F467-200D-1F467","j":["family","girl","man","home","parent","people","human","children"]},"family-woman-boy":{"a":"Family: Woman, Boy","b":"1F469-200D-1F466","j":["boy","family","woman","home","parent","people","human","child"]},"family-woman-boy-boy":{"a":"Family: Woman, Boy, Boy","b":"1F469-200D-1F466-200D-1F466","j":["boy","family","woman","home","parent","people","human","children"]},"family-woman-girl":{"a":"Family: Woman, Girl","b":"1F469-200D-1F467","j":["family","girl","woman","home","parent","people","human","child"]},"family-woman-girl-boy":{"a":"Family: Woman, Girl, Boy","b":"1F469-200D-1F467-200D-1F466","j":["boy","family","girl","woman","home","parent","people","human","children"]},"family-woman-girl-girl":{"a":"Family: Woman, Girl, Girl","b":"1F469-200D-1F467-200D-1F467","j":["family","girl","woman","home","parent","people","human","children"]},"speaking-head":{"a":"Speaking Head","b":"1F5E3","j":["face","head","silhouette","speak","speaking","user","person","human","sing","say","talk"]},"bust-in-silhouette":{"a":"Bust in Silhouette","b":"1F464","j":["bust","silhouette","user","person","human"]},"busts-in-silhouette":{"a":"Busts in Silhouette","b":"1F465","j":["bust","silhouette","user","person","human","group","team"]},"people-hugging":{"a":"People Hugging","b":"1FAC2","j":["goodbye","hello","hug","thanks","care"]},"footprints":{"a":"Footprints","b":"1F463","j":["clothing","footprint","print","feet","tracking","walking","beach"]},"red-hair":{"a":"Red Hair","b":"1F9B0","j":["ginger","red hair","redhead"]},"curly-hair":{"a":"Curly Hair","b":"1F9B1","j":["afro","curly","curly hair","ringlets"]},"white-hair":{"a":"White Hair","b":"1F9B3","j":["gray","hair","old","white"]},"bald":{"a":"Bald","b":"1F9B2","j":["bald","chemotherapy","hairless","no hair","shaven"]},"monkey-face":{"a":"Monkey Face","b":"1F435","j":["face","monkey","animal","nature","circus"]},"monkey":{"a":"Monkey","b":"1F412","j":["animal","nature","banana","circus"]},"gorilla":{"a":"Gorilla","b":"1F98D","j":["animal","nature","circus"]},"orangutan":{"a":"Orangutan","b":"1F9A7","j":["ape","animal"]},"dog-face":{"a":"Dog Face","b":"1F436","j":["dog","face","pet","animal","friend","nature","woof","puppy","faithful"]},"dog":{"a":"Dog","b":"1F415","j":["pet","animal","nature","friend","doge","faithful"]},"guide-dog":{"a":"Guide Dog","b":"1F9AE","j":["accessibility","blind","guide","animal"]},"service-dog":{"a":"Service Dog","b":"1F415-200D-1F9BA","j":["accessibility","assistance","dog","service","blind","animal"]},"poodle":{"a":"Poodle","b":"1F429","j":["dog","animal","101","nature","pet"]},"wolf":{"a":"Wolf","b":"1F43A","j":["face","animal","nature","wild"]},"fox":{"a":"Fox","b":"1F98A","j":["face","animal","nature"]},"raccoon":{"a":"Raccoon","b":"1F99D","j":["curious","sly","animal","nature"]},"cat-face":{"a":"Cat Face","b":"1F431","j":["cat","face","pet","animal","meow","nature","kitten"]},"cat":{"a":"Cat","b":"1F408","j":["pet","animal","meow","cats"]},"black-cat":{"a":"Black Cat","b":"1F408-200D-2B1B","j":["black","cat","unlucky","superstition","luck"]},"lion":{"a":"Lion","b":"1F981","j":["face","Leo","zodiac","animal","nature"]},"tiger-face":{"a":"Tiger Face","b":"1F42F","j":["face","tiger","animal","cat","danger","wild","nature","roar"]},"tiger":{"a":"Tiger","b":"1F405","j":["animal","nature","roar"]},"leopard":{"a":"Leopard","b":"1F406","j":["animal","nature"]},"horse-face":{"a":"Horse Face","b":"1F434","j":["face","horse","animal","brown","nature"]},"moose":{"a":"⊛ Moose","b":"1FACE","j":["animal","antlers","elk","mammal","moose"]},"donkey":{"a":"⊛ Donkey","b":"1FACF","j":["animal","ass","burro","donkey","mammal","mule","stubborn"]},"horse":{"a":"Horse","b":"1F40E","j":["equestrian","racehorse","racing","animal","gamble","luck"]},"unicorn":{"a":"Unicorn","b":"1F984","j":["face","animal","nature","mystical"]},"zebra":{"a":"Zebra","b":"1F993","j":["stripe","animal","nature","stripes","safari"]},"deer":{"a":"Deer","b":"1F98C","j":["animal","nature","horns","venison"]},"bison":{"a":"Bison","b":"1F9AC","j":["buffalo","herd","wisent","ox"]},"cow-face":{"a":"Cow Face","b":"1F42E","j":["cow","face","beef","ox","animal","nature","moo","milk"]},"ox":{"a":"Ox","b":"1F402","j":["bull","Taurus","zodiac","animal","cow","beef"]},"water-buffalo":{"a":"Water Buffalo","b":"1F403","j":["buffalo","water","animal","nature","ox","cow"]},"cow":{"a":"Cow","b":"1F404","j":["beef","ox","animal","nature","moo","milk"]},"pig-face":{"a":"Pig Face","b":"1F437","j":["face","pig","animal","oink","nature"]},"pig":{"a":"Pig","b":"1F416","j":["sow","animal","nature"]},"boar":{"a":"Boar","b":"1F417","j":["pig","animal","nature"]},"pig-nose":{"a":"Pig Nose","b":"1F43D","j":["face","nose","pig","animal","oink"]},"ram":{"a":"Ram","b":"1F40F","j":["Aries","male","sheep","zodiac","animal","nature"]},"ewe":{"a":"Ewe","b":"1F411","j":["female","sheep","animal","nature","wool","shipit"]},"goat":{"a":"Goat","b":"1F410","j":["Capricorn","zodiac","animal","nature"]},"camel":{"a":"Camel","b":"1F42A","j":["dromedary","hump","animal","hot","desert"]},"twohump-camel":{"a":"Two-Hump Camel","b":"1F42B","j":["bactrian","camel","hump","two-hump camel","two_hump_camel","animal","nature","hot","desert"]},"llama":{"a":"Llama","b":"1F999","j":["alpaca","guanaco","vicuña","wool","animal","nature"]},"giraffe":{"a":"Giraffe","b":"1F992","j":["spots","animal","nature","safari"]},"elephant":{"a":"Elephant","b":"1F418","j":["animal","nature","nose","th","circus"]},"mammoth":{"a":"Mammoth","b":"1F9A3","j":["extinction","large","tusk","woolly","elephant","tusks"]},"rhinoceros":{"a":"Rhinoceros","b":"1F98F","j":["animal","nature","horn"]},"hippopotamus":{"a":"Hippopotamus","b":"1F99B","j":["hippo","animal","nature"]},"mouse-face":{"a":"Mouse Face","b":"1F42D","j":["face","mouse","animal","nature","cheese_wedge","rodent"]},"mouse":{"a":"Mouse","b":"1F401","j":["animal","nature","rodent"]},"rat":{"a":"Rat","b":"1F400","j":["animal","mouse","rodent"]},"hamster":{"a":"Hamster","b":"1F439","j":["face","pet","animal","nature"]},"rabbit-face":{"a":"Rabbit Face","b":"1F430","j":["bunny","face","pet","rabbit","animal","nature","spring","magic"]},"rabbit":{"a":"Rabbit","b":"1F407","j":["bunny","pet","animal","nature","magic","spring"]},"chipmunk":{"a":"Chipmunk","b":"1F43F","j":["squirrel","animal","nature","rodent"]},"beaver":{"a":"Beaver","b":"1F9AB","j":["dam","animal","rodent"]},"hedgehog":{"a":"Hedgehog","b":"1F994","j":["spiny","animal","nature"]},"bat":{"a":"Bat","b":"1F987","j":["vampire","animal","nature","blind"]},"bear":{"a":"Bear","b":"1F43B","j":["face","animal","nature","wild"]},"polar-bear":{"a":"Polar Bear","b":"1F43B-200D-2744-FE0F","j":["arctic","bear","white","animal"]},"koala":{"a":"Koala","b":"1F428","j":["face","marsupial","animal","nature"]},"panda":{"a":"Panda","b":"1F43C","j":["face","animal","nature"]},"sloth":{"a":"Sloth","b":"1F9A5","j":["lazy","slow","animal"]},"otter":{"a":"Otter","b":"1F9A6","j":["fishing","playful","animal"]},"skunk":{"a":"Skunk","b":"1F9A8","j":["stink","animal"]},"kangaroo":{"a":"Kangaroo","b":"1F998","j":["Australia","joey","jump","marsupial","animal","nature","australia","hop"]},"badger":{"a":"Badger","b":"1F9A1","j":["honey badger","pester","animal","nature","honey"]},"paw-prints":{"a":"Paw Prints","b":"1F43E","j":["feet","paw","print","animal","tracking","footprints","dog","cat","pet"]},"turkey":{"a":"Turkey","b":"1F983","j":["bird","animal"]},"chicken":{"a":"Chicken","b":"1F414","j":["bird","animal","cluck","nature"]},"rooster":{"a":"Rooster","b":"1F413","j":["bird","animal","nature","chicken"]},"hatching-chick":{"a":"Hatching Chick","b":"1F423","j":["baby","bird","chick","hatching","animal","chicken","egg","born"]},"baby-chick":{"a":"Baby Chick","b":"1F424","j":["baby","bird","chick","animal","chicken"]},"frontfacing-baby-chick":{"a":"Front-Facing Baby Chick","b":"1F425","j":["baby","bird","chick","front-facing baby chick","front_facing_baby_chick","animal","chicken"]},"bird":{"a":"Bird","b":"1F426","j":["animal","nature","fly","tweet","spring"]},"penguin":{"a":"Penguin","b":"1F427","j":["bird","animal","nature"]},"dove":{"a":"Dove","b":"1F54A","j":["bird","fly","peace","animal"]},"eagle":{"a":"Eagle","b":"1F985","j":["bird","animal","nature"]},"duck":{"a":"Duck","b":"1F986","j":["bird","animal","nature","mallard"]},"swan":{"a":"Swan","b":"1F9A2","j":["bird","cygnet","ugly duckling","animal","nature"]},"owl":{"a":"Owl","b":"1F989","j":["bird","wise","animal","nature","hoot"]},"dodo":{"a":"Dodo","b":"1F9A4","j":["extinction","large","Mauritius","animal","bird"]},"feather":{"a":"Feather","b":"1FAB6","j":["bird","flight","light","plumage","fly"]},"flamingo":{"a":"Flamingo","b":"1F9A9","j":["flamboyant","tropical","animal"]},"peacock":{"a":"Peacock","b":"1F99A","j":["bird","ostentatious","peahen","proud","animal","nature"]},"parrot":{"a":"Parrot","b":"1F99C","j":["bird","pirate","talk","animal","nature"]},"wing":{"a":"⊛ Wing","b":"1FABD","j":["angelic","aviation","bird","flying","mythology","wing"]},"black-bird":{"a":"⊛ Black Bird","b":"1F426-200D-2B1B","j":["bird","black","crow","raven","rook"]},"goose":{"a":"⊛ Goose","b":"1FABF","j":["bird","fowl","goose","honk","silly"]},"frog":{"a":"Frog","b":"1F438","j":["face","animal","nature","croak","toad"]},"crocodile":{"a":"Crocodile","b":"1F40A","j":["animal","nature","reptile","lizard","alligator"]},"turtle":{"a":"Turtle","b":"1F422","j":["terrapin","tortoise","animal","slow","nature"]},"lizard":{"a":"Lizard","b":"1F98E","j":["reptile","animal","nature"]},"snake":{"a":"Snake","b":"1F40D","j":["bearer","Ophiuchus","serpent","zodiac","animal","evil","nature","hiss","python"]},"dragon-face":{"a":"Dragon Face","b":"1F432","j":["dragon","face","fairy tale","animal","myth","nature","chinese","green"]},"dragon":{"a":"Dragon","b":"1F409","j":["fairy tale","animal","myth","nature","chinese","green"]},"sauropod":{"a":"Sauropod","b":"1F995","j":["brachiosaurus","brontosaurus","diplodocus","animal","nature","dinosaur","extinct"]},"trex":{"a":"T-Rex","b":"1F996","j":["Tyrannosaurus Rex","t_rex","animal","nature","dinosaur","tyrannosaurus","extinct"]},"spouting-whale":{"a":"Spouting Whale","b":"1F433","j":["face","spouting","whale","animal","nature","sea","ocean"]},"whale":{"a":"Whale","b":"1F40B","j":["animal","nature","sea","ocean"]},"dolphin":{"a":"Dolphin","b":"1F42C","j":["flipper","animal","nature","fish","sea","ocean","fins","beach"]},"seal":{"a":"Seal","b":"1F9AD","j":["sea lion","animal","creature","sea"]},"fish":{"a":"Fish","b":"1F41F","j":["Pisces","zodiac","animal","food","nature"]},"tropical-fish":{"a":"Tropical Fish","b":"1F420","j":["fish","tropical","animal","swim","ocean","beach","nemo"]},"blowfish":{"a":"Blowfish","b":"1F421","j":["fish","animal","nature","food","sea","ocean"]},"shark":{"a":"Shark","b":"1F988","j":["fish","animal","nature","sea","ocean","jaws","fins","beach"]},"octopus":{"a":"Octopus","b":"1F419","j":["animal","creature","ocean","sea","nature","beach"]},"spiral-shell":{"a":"Spiral Shell","b":"1F41A","j":["shell","spiral","nature","sea","beach"]},"coral":{"a":"Coral","b":"1FAB8","j":["ocean","reef","sea"]},"jellyfish":{"a":"⊛ Jellyfish","b":"1FABC","j":["burn","invertebrate","jelly","jellyfish","marine","ouch","stinger"]},"snail":{"a":"Snail","b":"1F40C","j":["slow","animal","shell"]},"butterfly":{"a":"Butterfly","b":"1F98B","j":["insect","pretty","animal","nature","caterpillar"]},"bug":{"a":"Bug","b":"1F41B","j":["insect","animal","nature","worm"]},"ant":{"a":"Ant","b":"1F41C","j":["insect","animal","nature","bug"]},"honeybee":{"a":"Honeybee","b":"1F41D","j":["bee","insect","animal","nature","bug","spring","honey"]},"beetle":{"a":"Beetle","b":"1FAB2","j":["bug","insect"]},"lady-beetle":{"a":"Lady Beetle","b":"1F41E","j":["beetle","insect","ladybird","ladybug","animal","nature"]},"cricket":{"a":"Cricket","b":"1F997","j":["grasshopper","Orthoptera","animal","chirp"]},"cockroach":{"a":"Cockroach","b":"1FAB3","j":["insect","pest","roach","pests"]},"spider":{"a":"Spider","b":"1F577","j":["insect","animal","arachnid"]},"spider-web":{"a":"Spider Web","b":"1F578","j":["spider","web","animal","insect","arachnid","silk"]},"scorpion":{"a":"Scorpion","b":"1F982","j":["scorpio","Scorpio","zodiac","animal","arachnid"]},"mosquito":{"a":"Mosquito","b":"1F99F","j":["disease","fever","malaria","pest","virus","animal","nature","insect"]},"fly":{"a":"Fly","b":"1FAB0","j":["disease","maggot","pest","rotting","insect"]},"worm":{"a":"Worm","b":"1FAB1","j":["annelid","earthworm","parasite","animal"]},"microbe":{"a":"Microbe","b":"1F9A0","j":["amoeba","bacteria","virus","germs","covid"]},"bouquet":{"a":"Bouquet","b":"1F490","j":["flower","flowers","nature","spring"]},"cherry-blossom":{"a":"Cherry Blossom","b":"1F338","j":["blossom","cherry","flower","nature","plant","spring"]},"white-flower":{"a":"White Flower","b":"1F4AE","j":["flower","japanese","spring"]},"lotus":{"a":"Lotus","b":"1FAB7","j":["Buddhism","flower","Hinduism","India","purity","Vietnam","calm","meditation"]},"rosette":{"a":"Rosette","b":"1F3F5","j":["plant","flower","decoration","military"]},"rose":{"a":"Rose","b":"1F339","j":["flower","flowers","valentines","love","spring"]},"wilted-flower":{"a":"Wilted Flower","b":"1F940","j":["flower","wilted","plant","nature","rose"]},"hibiscus":{"a":"Hibiscus","b":"1F33A","j":["flower","plant","vegetable","flowers","beach"]},"sunflower":{"a":"Sunflower","b":"1F33B","j":["flower","sun","nature","plant","fall"]},"blossom":{"a":"Blossom","b":"1F33C","j":["flower","nature","flowers","yellow"]},"tulip":{"a":"Tulip","b":"1F337","j":["flower","flowers","plant","nature","summer","spring"]},"hyacinth":{"a":"⊛ Hyacinth","b":"1FABB","j":["bluebonnet","flower","hyacinth","lavender","lupine","snapdragon"]},"seedling":{"a":"Seedling","b":"1F331","j":["young","plant","nature","grass","lawn","spring"]},"potted-plant":{"a":"Potted Plant","b":"1FAB4","j":["boring","grow","house","nurturing","plant","useless","greenery"]},"evergreen-tree":{"a":"Evergreen Tree","b":"1F332","j":["tree","plant","nature"]},"deciduous-tree":{"a":"Deciduous Tree","b":"1F333","j":["deciduous","shedding","tree","plant","nature"]},"palm-tree":{"a":"Palm Tree","b":"1F334","j":["palm","tree","plant","vegetable","nature","summer","beach","mojito","tropical"]},"cactus":{"a":"Cactus","b":"1F335","j":["plant","vegetable","nature"]},"sheaf-of-rice":{"a":"Sheaf of Rice","b":"1F33E","j":["ear","grain","rice","nature","plant"]},"herb":{"a":"Herb","b":"1F33F","j":["leaf","vegetable","plant","medicine","weed","grass","lawn"]},"shamrock":{"a":"Shamrock","b":"2618","j":["plant","vegetable","nature","irish","clover"]},"four-leaf-clover":{"a":"Four Leaf Clover","b":"1F340","j":["4","clover","four","four-leaf clover","leaf","vegetable","plant","nature","lucky","irish"]},"maple-leaf":{"a":"Maple Leaf","b":"1F341","j":["falling","leaf","maple","nature","plant","vegetable","ca","fall"]},"fallen-leaf":{"a":"Fallen Leaf","b":"1F342","j":["falling","leaf","nature","plant","vegetable","leaves"]},"leaf-fluttering-in-wind":{"a":"Leaf Fluttering in Wind","b":"1F343","j":["blow","flutter","leaf","wind","nature","plant","tree","vegetable","grass","lawn","spring"]},"empty-nest":{"a":"Empty Nest","b":"1FAB9","j":["nesting","bird"]},"nest-with-eggs":{"a":"Nest with Eggs","b":"1FABA","j":["nesting","bird"]},"mushroom":{"a":"Mushroom","b":"1F344","j":["toadstool","plant","vegetable"]},"grapes":{"a":"Grapes","b":"1F347","j":["fruit","grape","food","wine"]},"melon":{"a":"Melon","b":"1F348","j":["fruit","nature","food"]},"watermelon":{"a":"Watermelon","b":"1F349","j":["fruit","food","picnic","summer"]},"tangerine":{"a":"Tangerine","b":"1F34A","j":["fruit","orange","food","nature"]},"lemon":{"a":"Lemon","b":"1F34B","j":["citrus","fruit","nature"]},"banana":{"a":"Banana","b":"1F34C","j":["fruit","food","monkey"]},"pineapple":{"a":"Pineapple","b":"1F34D","j":["fruit","nature","food"]},"mango":{"a":"Mango","b":"1F96D","j":["fruit","tropical","food"]},"red-apple":{"a":"Red Apple","b":"1F34E","j":["apple","fruit","red","mac","school"]},"green-apple":{"a":"Green Apple","b":"1F34F","j":["apple","fruit","green","nature"]},"pear":{"a":"Pear","b":"1F350","j":["fruit","nature","food"]},"peach":{"a":"Peach","b":"1F351","j":["fruit","nature","food"]},"cherries":{"a":"Cherries","b":"1F352","j":["berries","cherry","fruit","red","food"]},"strawberry":{"a":"Strawberry","b":"1F353","j":["berry","fruit","food","nature"]},"blueberries":{"a":"Blueberries","b":"1FAD0","j":["berry","bilberry","blue","blueberry","fruit"]},"kiwi-fruit":{"a":"Kiwi Fruit","b":"1F95D","j":["food","fruit","kiwi"]},"tomato":{"a":"Tomato","b":"1F345","j":["fruit","vegetable","nature","food"]},"olive":{"a":"Olive","b":"1FAD2","j":["food","fruit"]},"coconut":{"a":"Coconut","b":"1F965","j":["palm","piña colada","fruit","nature","food"]},"avocado":{"a":"Avocado","b":"1F951","j":["food","fruit"]},"eggplant":{"a":"Eggplant","b":"1F346","j":["aubergine","vegetable","nature","food"]},"potato":{"a":"Potato","b":"1F954","j":["food","vegetable","tuber","vegatable","starch"]},"carrot":{"a":"Carrot","b":"1F955","j":["food","vegetable","orange"]},"ear-of-corn":{"a":"Ear of Corn","b":"1F33D","j":["corn","ear","maize","maze","food","vegetable","plant"]},"hot-pepper":{"a":"Hot Pepper","b":"1F336","j":["hot","pepper","food","spicy","chilli","chili"]},"bell-pepper":{"a":"Bell Pepper","b":"1FAD1","j":["capsicum","pepper","vegetable","fruit","plant"]},"cucumber":{"a":"Cucumber","b":"1F952","j":["food","pickle","vegetable","fruit"]},"leafy-green":{"a":"Leafy Green","b":"1F96C","j":["bok choy","cabbage","kale","lettuce","food","vegetable","plant"]},"broccoli":{"a":"Broccoli","b":"1F966","j":["wild cabbage","fruit","food","vegetable"]},"garlic":{"a":"Garlic","b":"1F9C4","j":["flavoring","food","spice","cook"]},"onion":{"a":"Onion","b":"1F9C5","j":["flavoring","cook","food","spice"]},"peanuts":{"a":"Peanuts","b":"1F95C","j":["food","nut","peanut","vegetable"]},"beans":{"a":"Beans","b":"1FAD8","j":["food","kidney","legume"]},"chestnut":{"a":"Chestnut","b":"1F330","j":["plant","food","squirrel"]},"ginger-root":{"a":"⊛ Ginger Root","b":"1FADA","j":["beer","ginger root","root","spice"]},"pea-pod":{"a":"⊛ Pea Pod","b":"1FADB","j":["beans","edamame","legume","pea","pod","vegetable"]},"bread":{"a":"Bread","b":"1F35E","j":["loaf","food","wheat","breakfast","toast"]},"croissant":{"a":"Croissant","b":"1F950","j":["bread","breakfast","food","french","roll"]},"baguette-bread":{"a":"Baguette Bread","b":"1F956","j":["baguette","bread","food","french","france","bakery"]},"flatbread":{"a":"Flatbread","b":"1FAD3","j":["arepa","lavash","naan","pita","flour","food","bakery"]},"pretzel":{"a":"Pretzel","b":"1F968","j":["twisted","convoluted","food","bread","germany","bakery"]},"bagel":{"a":"Bagel","b":"1F96F","j":["bakery","breakfast","schmear","food","bread","jewish"]},"pancakes":{"a":"Pancakes","b":"1F95E","j":["breakfast","crêpe","food","hotcake","pancake","flapjacks","hotcakes","brunch"]},"waffle":{"a":"Waffle","b":"1F9C7","j":["breakfast","indecisive","iron","food","brunch"]},"cheese-wedge":{"a":"Cheese Wedge","b":"1F9C0","j":["cheese","food","chadder","swiss"]},"meat-on-bone":{"a":"Meat on Bone","b":"1F356","j":["bone","meat","good","food","drumstick"]},"poultry-leg":{"a":"Poultry Leg","b":"1F357","j":["bone","chicken","drumstick","leg","poultry","food","meat","bird","turkey"]},"cut-of-meat":{"a":"Cut of Meat","b":"1F969","j":["chop","lambchop","porkchop","steak","food","cow","meat","cut"]},"bacon":{"a":"Bacon","b":"1F953","j":["breakfast","food","meat","pork","pig","brunch"]},"hamburger":{"a":"Hamburger","b":"1F354","j":["burger","meat","fast food","beef","cheeseburger","mcdonalds","burger king"]},"french-fries":{"a":"French Fries","b":"1F35F","j":["french","fries","chips","snack","fast food","potato"]},"pizza":{"a":"Pizza","b":"1F355","j":["cheese","slice","food","party","italy"]},"hot-dog":{"a":"Hot Dog","b":"1F32D","j":["frankfurter","hotdog","sausage","food","america"]},"sandwich":{"a":"Sandwich","b":"1F96A","j":["bread","food","lunch","toast","bakery"]},"taco":{"a":"Taco","b":"1F32E","j":["mexican","food"]},"burrito":{"a":"Burrito","b":"1F32F","j":["mexican","wrap","food"]},"tamale":{"a":"Tamale","b":"1FAD4","j":["mexican","wrapped","food","masa"]},"stuffed-flatbread":{"a":"Stuffed Flatbread","b":"1F959","j":["falafel","flatbread","food","gyro","kebab","stuffed","mediterranean"]},"falafel":{"a":"Falafel","b":"1F9C6","j":["chickpea","meatball","food","mediterranean"]},"egg":{"a":"Egg","b":"1F95A","j":["breakfast","food","chicken"]},"cooking":{"a":"Cooking","b":"1F373","j":["breakfast","egg","frying","pan","food","kitchen","skillet"]},"shallow-pan-of-food":{"a":"Shallow Pan of Food","b":"1F958","j":["casserole","food","paella","pan","shallow","cooking","skillet"]},"pot-of-food":{"a":"Pot of Food","b":"1F372","j":["pot","stew","food","meat","soup","hot pot"]},"fondue":{"a":"Fondue","b":"1FAD5","j":["cheese","chocolate","melted","pot","Swiss","food"]},"bowl-with-spoon":{"a":"Bowl with Spoon","b":"1F963","j":["breakfast","cereal","congee","oatmeal","porridge","food"]},"green-salad":{"a":"Green Salad","b":"1F957","j":["food","green","salad","healthy","lettuce","vegetable"]},"popcorn":{"a":"Popcorn","b":"1F37F","j":["food","movie theater","films","snack","drama"]},"butter":{"a":"Butter","b":"1F9C8","j":["dairy","food","cook"]},"salt":{"a":"Salt","b":"1F9C2","j":["condiment","shaker"]},"canned-food":{"a":"Canned Food","b":"1F96B","j":["can","food","soup","tomatoes"]},"bento-box":{"a":"Bento Box","b":"1F371","j":["bento","box","food","japanese","lunch"]},"rice-cracker":{"a":"Rice Cracker","b":"1F358","j":["cracker","rice","food","japanese","snack"]},"rice-ball":{"a":"Rice Ball","b":"1F359","j":["ball","Japanese","rice","food","japanese"]},"cooked-rice":{"a":"Cooked Rice","b":"1F35A","j":["cooked","rice","food","asian"]},"curry-rice":{"a":"Curry Rice","b":"1F35B","j":["curry","rice","food","spicy","hot","indian"]},"steaming-bowl":{"a":"Steaming Bowl","b":"1F35C","j":["bowl","noodle","ramen","steaming","food","japanese","chopsticks"]},"spaghetti":{"a":"Spaghetti","b":"1F35D","j":["pasta","food","italian","noodle"]},"roasted-sweet-potato":{"a":"Roasted Sweet Potato","b":"1F360","j":["potato","roasted","sweet","food","nature","plant"]},"oden":{"a":"Oden","b":"1F362","j":["kebab","seafood","skewer","stick","food","japanese"]},"sushi":{"a":"Sushi","b":"1F363","j":["food","fish","japanese","rice"]},"fried-shrimp":{"a":"Fried Shrimp","b":"1F364","j":["fried","prawn","shrimp","tempura","food","animal","appetizer","summer"]},"fish-cake-with-swirl":{"a":"Fish Cake with Swirl","b":"1F365","j":["cake","fish","pastry","swirl","food","japan","sea","beach","narutomaki","pink","kamaboko","surimi","ramen"]},"moon-cake":{"a":"Moon Cake","b":"1F96E","j":["autumn","festival","yuèbǐng","food","dessert"]},"dango":{"a":"Dango","b":"1F361","j":["dessert","Japanese","skewer","stick","sweet","food","japanese","barbecue","meat"]},"dumpling":{"a":"Dumpling","b":"1F95F","j":["empanada","gyōza","jiaozi","pierogi","potsticker","food","gyoza"]},"fortune-cookie":{"a":"Fortune Cookie","b":"1F960","j":["prophecy","food","dessert"]},"takeout-box":{"a":"Takeout Box","b":"1F961","j":["oyster pail","food","leftovers"]},"crab":{"a":"Crab","b":"1F980","j":["Cancer","zodiac","animal","crustacean"]},"lobster":{"a":"Lobster","b":"1F99E","j":["bisque","claws","seafood","animal","nature"]},"shrimp":{"a":"Shrimp","b":"1F990","j":["food","shellfish","small","animal","ocean","nature","seafood"]},"squid":{"a":"Squid","b":"1F991","j":["food","molusc","animal","nature","ocean","sea"]},"oyster":{"a":"Oyster","b":"1F9AA","j":["diving","pearl","food"]},"soft-ice-cream":{"a":"Soft Ice Cream","b":"1F366","j":["cream","dessert","ice","icecream","soft","sweet","food","hot","summer"]},"shaved-ice":{"a":"Shaved Ice","b":"1F367","j":["dessert","ice","shaved","sweet","hot","summer"]},"ice-cream":{"a":"Ice Cream","b":"1F368","j":["cream","dessert","ice","sweet","food","hot"]},"doughnut":{"a":"Doughnut","b":"1F369","j":["breakfast","dessert","donut","sweet","food","snack"]},"cookie":{"a":"Cookie","b":"1F36A","j":["dessert","sweet","food","snack","oreo","chocolate"]},"birthday-cake":{"a":"Birthday Cake","b":"1F382","j":["birthday","cake","celebration","dessert","pastry","sweet","food"]},"shortcake":{"a":"Shortcake","b":"1F370","j":["cake","dessert","pastry","slice","sweet","food"]},"cupcake":{"a":"Cupcake","b":"1F9C1","j":["bakery","sweet","food","dessert"]},"pie":{"a":"Pie","b":"1F967","j":["filling","pastry","fruit","meat","food","dessert"]},"chocolate-bar":{"a":"Chocolate Bar","b":"1F36B","j":["bar","chocolate","dessert","sweet","food","snack"]},"candy":{"a":"Candy","b":"1F36C","j":["dessert","sweet","snack","lolly"]},"lollipop":{"a":"Lollipop","b":"1F36D","j":["candy","dessert","sweet","food","snack"]},"custard":{"a":"Custard","b":"1F36E","j":["dessert","pudding","sweet","food"]},"honey-pot":{"a":"Honey Pot","b":"1F36F","j":["honey","honeypot","pot","sweet","bees","kitchen"]},"baby-bottle":{"a":"Baby Bottle","b":"1F37C","j":["baby","bottle","drink","milk","food","container"]},"glass-of-milk":{"a":"Glass of Milk","b":"1F95B","j":["drink","glass","milk","beverage","cow"]},"hot-beverage":{"a":"Hot Beverage","b":"2615","j":["beverage","coffee","drink","hot","steaming","tea","caffeine","latte","espresso","mug"]},"teapot":{"a":"Teapot","b":"1FAD6","j":["drink","pot","tea","hot"]},"teacup-without-handle":{"a":"Teacup Without Handle","b":"1F375","j":["beverage","cup","drink","tea","teacup","bowl","breakfast","green","british"]},"sake":{"a":"Sake","b":"1F376","j":["bar","beverage","bottle","cup","drink","wine","drunk","japanese","alcohol","booze"]},"bottle-with-popping-cork":{"a":"Bottle with Popping Cork","b":"1F37E","j":["bar","bottle","cork","drink","popping","wine","celebration"]},"wine-glass":{"a":"Wine Glass","b":"1F377","j":["bar","beverage","drink","glass","wine","drunk","alcohol","booze"]},"cocktail-glass":{"a":"Cocktail Glass","b":"1F378","j":["bar","cocktail","drink","glass","drunk","alcohol","beverage","booze","mojito"]},"tropical-drink":{"a":"Tropical Drink","b":"1F379","j":["bar","drink","tropical","beverage","cocktail","summer","beach","alcohol","booze","mojito"]},"beer-mug":{"a":"Beer Mug","b":"1F37A","j":["bar","beer","drink","mug","relax","beverage","drunk","party","pub","summer","alcohol","booze"]},"clinking-beer-mugs":{"a":"Clinking Beer Mugs","b":"1F37B","j":["bar","beer","clink","drink","mug","relax","beverage","drunk","party","pub","summer","alcohol","booze"]},"clinking-glasses":{"a":"Clinking Glasses","b":"1F942","j":["celebrate","clink","drink","glass","beverage","party","alcohol","cheers","wine","champagne","toast"]},"tumbler-glass":{"a":"Tumbler Glass","b":"1F943","j":["glass","liquor","shot","tumbler","whisky","drink","beverage","drunk","alcohol","booze","bourbon","scotch"]},"pouring-liquid":{"a":"Pouring Liquid","b":"1FAD7","j":["drink","empty","glass","spill","cup","water"]},"cup-with-straw":{"a":"Cup with Straw","b":"1F964","j":["juice","soda","malt","soft drink","water","drink"]},"bubble-tea":{"a":"Bubble Tea","b":"1F9CB","j":["bubble","milk","pearl","tea","taiwan","boba","milk tea","straw"]},"beverage-box":{"a":"Beverage Box","b":"1F9C3","j":["beverage","box","juice","straw","sweet","drink"]},"mate":{"a":"Mate","b":"1F9C9","j":["drink","tea","beverage"]},"ice":{"a":"Ice","b":"1F9CA","j":["cold","ice cube","iceberg","water"]},"chopsticks":{"a":"Chopsticks","b":"1F962","j":["hashi","jeotgarak","kuaizi","food"]},"fork-and-knife-with-plate":{"a":"Fork and Knife with Plate","b":"1F37D","j":["cooking","fork","knife","plate","food","eat","meal","lunch","dinner","restaurant"]},"fork-and-knife":{"a":"Fork and Knife","b":"1F374","j":["cooking","cutlery","fork","knife","kitchen"]},"spoon":{"a":"Spoon","b":"1F944","j":["tableware","cutlery","kitchen"]},"kitchen-knife":{"a":"Kitchen Knife","b":"1F52A","j":["cooking","hocho","knife","tool","weapon","blade","cutlery","kitchen"]},"jar":{"a":"Jar","b":"1FAD9","j":["condiment","container","empty","sauce","store"]},"amphora":{"a":"Amphora","b":"1F3FA","j":["Aquarius","cooking","drink","jug","zodiac","vase","jar"]},"globe-showing-europeafrica":{"a":"Globe Showing Europe-Africa","b":"1F30D","j":["Africa","earth","Europe","globe","globe showing Europe-Africa","world","globe_showing_europe_africa","international"]},"globe-showing-americas":{"a":"Globe Showing Americas","b":"1F30E","j":["Americas","earth","globe","globe showing Americas","world","USA","international"]},"globe-showing-asiaaustralia":{"a":"Globe Showing Asia-Australia","b":"1F30F","j":["Asia","Australia","earth","globe","globe showing Asia-Australia","world","globe_showing_asia_australia","east","international"]},"globe-with-meridians":{"a":"Globe with Meridians","b":"1F310","j":["earth","globe","meridians","world","international","internet","interweb","i18n"]},"world-map":{"a":"World Map","b":"1F5FA","j":["map","world","location","direction"]},"map-of-japan":{"a":"Map of Japan","b":"1F5FE","j":["Japan","map","map of Japan","nation","country","japanese","asia"]},"compass":{"a":"Compass","b":"1F9ED","j":["magnetic","navigation","orienteering"]},"snowcapped-mountain":{"a":"Snow-Capped Mountain","b":"1F3D4","j":["cold","mountain","snow","snow-capped mountain","snow_capped_mountain","photo","nature","environment","winter"]},"mountain":{"a":"Mountain","b":"26F0","j":["photo","nature","environment"]},"volcano":{"a":"Volcano","b":"1F30B","j":["eruption","mountain","photo","nature","disaster"]},"mount-fuji":{"a":"Mount Fuji","b":"1F5FB","j":["fuji","mountain","photo","nature","japanese"]},"camping":{"a":"Camping","b":"1F3D5","j":["photo","outdoors","tent"]},"beach-with-umbrella":{"a":"Beach with Umbrella","b":"1F3D6","j":["beach","umbrella","weather","summer","sunny","sand","mojito"]},"desert":{"a":"Desert","b":"1F3DC","j":["photo","warm","saharah"]},"desert-island":{"a":"Desert Island","b":"1F3DD","j":["desert","island","photo","tropical","mojito"]},"national-park":{"a":"National Park","b":"1F3DE","j":["park","photo","environment","nature"]},"stadium":{"a":"Stadium","b":"1F3DF","j":["photo","place","sports","concert","venue"]},"classical-building":{"a":"Classical Building","b":"1F3DB","j":["classical","art","culture","history"]},"building-construction":{"a":"Building Construction","b":"1F3D7","j":["construction","wip","working","progress"]},"brick":{"a":"Brick","b":"1F9F1","j":["bricks","clay","mortar","wall"]},"rock":{"a":"Rock","b":"1FAA8","j":["boulder","heavy","solid","stone"]},"wood":{"a":"Wood","b":"1FAB5","j":["log","lumber","timber","nature","trunk"]},"hut":{"a":"Hut","b":"1F6D6","j":["house","roundhouse","yurt","structure"]},"houses":{"a":"Houses","b":"1F3D8","j":["buildings","photo"]},"derelict-house":{"a":"Derelict House","b":"1F3DA","j":["derelict","house","abandon","evict","broken","building"]},"house":{"a":"House","b":"1F3E0","j":["home","building"]},"house-with-garden":{"a":"House with Garden","b":"1F3E1","j":["garden","home","house","plant","nature"]},"office-building":{"a":"Office Building","b":"1F3E2","j":["building","bureau","work"]},"japanese-post-office":{"a":"Japanese Post Office","b":"1F3E3","j":["Japanese","Japanese post office","post","building","envelope","communication"]},"post-office":{"a":"Post Office","b":"1F3E4","j":["European","post","building","email"]},"hospital":{"a":"Hospital","b":"1F3E5","j":["doctor","medicine","building","health","surgery"]},"bank":{"a":"Bank","b":"1F3E6","j":["building","money","sales","cash","business","enterprise"]},"hotel":{"a":"Hotel","b":"1F3E8","j":["building","accomodation","checkin"]},"love-hotel":{"a":"Love Hotel","b":"1F3E9","j":["hotel","love","like","affection","dating"]},"convenience-store":{"a":"Convenience Store","b":"1F3EA","j":["convenience","store","building","shopping","groceries"]},"school":{"a":"School","b":"1F3EB","j":["building","student","education","learn","teach"]},"department-store":{"a":"Department Store","b":"1F3EC","j":["department","store","building","shopping","mall"]},"factory":{"a":"Factory","b":"1F3ED","j":["building","industry","pollution","smoke"]},"japanese-castle":{"a":"Japanese Castle","b":"1F3EF","j":["castle","Japanese","photo","building"]},"castle":{"a":"Castle","b":"1F3F0","j":["European","building","royalty","history"]},"wedding":{"a":"Wedding","b":"1F492","j":["chapel","romance","love","like","affection","couple","marriage","bride","groom"]},"tokyo-tower":{"a":"Tokyo Tower","b":"1F5FC","j":["Tokyo","tower","photo","japanese"]},"statue-of-liberty":{"a":"Statue of Liberty","b":"1F5FD","j":["liberty","statue","american","newyork"]},"church":{"a":"Church","b":"26EA","j":["Christian","cross","religion","building","christ"]},"mosque":{"a":"Mosque","b":"1F54C","j":["islam","Muslim","religion","worship","minaret"]},"hindu-temple":{"a":"Hindu Temple","b":"1F6D5","j":["hindu","temple","religion"]},"synagogue":{"a":"Synagogue","b":"1F54D","j":["Jew","Jewish","religion","temple","judaism","worship","jewish"]},"shinto-shrine":{"a":"Shinto Shrine","b":"26E9","j":["religion","shinto","shrine","temple","japan","kyoto"]},"kaaba":{"a":"Kaaba","b":"1F54B","j":["islam","Muslim","religion","mecca","mosque"]},"fountain":{"a":"Fountain","b":"26F2","j":["photo","summer","water","fresh"]},"tent":{"a":"Tent","b":"26FA","j":["camping","photo","outdoors"]},"foggy":{"a":"Foggy","b":"1F301","j":["fog","photo","mountain"]},"night-with-stars":{"a":"Night with Stars","b":"1F303","j":["night","star","evening","city","downtown"]},"cityscape":{"a":"Cityscape","b":"1F3D9","j":["city","photo","night life","urban"]},"sunrise-over-mountains":{"a":"Sunrise over Mountains","b":"1F304","j":["morning","mountain","sun","sunrise","view","vacation","photo"]},"sunrise":{"a":"Sunrise","b":"1F305","j":["morning","sun","view","vacation","photo"]},"cityscape-at-dusk":{"a":"Cityscape at Dusk","b":"1F306","j":["city","dusk","evening","landscape","sunset","photo","sky","buildings"]},"sunset":{"a":"Sunset","b":"1F307","j":["dusk","sun","photo","good morning","dawn"]},"bridge-at-night":{"a":"Bridge at Night","b":"1F309","j":["bridge","night","photo","sanfrancisco"]},"hot-springs":{"a":"Hot Springs","b":"2668","j":["hot","hotsprings","springs","steaming","bath","warm","relax"]},"carousel-horse":{"a":"Carousel Horse","b":"1F3A0","j":["carousel","horse","photo","carnival"]},"playground-slide":{"a":"Playground Slide","b":"1F6DD","j":["amusement park","play","fun","park"]},"ferris-wheel":{"a":"Ferris Wheel","b":"1F3A1","j":["amusement park","ferris","wheel","photo","carnival","londoneye"]},"roller-coaster":{"a":"Roller Coaster","b":"1F3A2","j":["amusement park","coaster","roller","carnival","playground","photo","fun"]},"barber-pole":{"a":"Barber Pole","b":"1F488","j":["barber","haircut","pole","hair","salon","style"]},"circus-tent":{"a":"Circus Tent","b":"1F3AA","j":["circus","tent","festival","carnival","party"]},"locomotive":{"a":"Locomotive","b":"1F682","j":["engine","railway","steam","train","transportation","vehicle"]},"railway-car":{"a":"Railway Car","b":"1F683","j":["car","electric","railway","train","tram","trolleybus","transportation","vehicle"]},"highspeed-train":{"a":"High-Speed Train","b":"1F684","j":["high-speed train","railway","shinkansen","speed","train","high_speed_train","transportation","vehicle"]},"bullet-train":{"a":"Bullet Train","b":"1F685","j":["bullet","railway","shinkansen","speed","train","transportation","vehicle","fast","public","travel"]},"train":{"a":"Train","b":"1F686","j":["railway","transportation","vehicle"]},"metro":{"a":"Metro","b":"1F687","j":["subway","transportation","blue-square","mrt","underground","tube"]},"light-rail":{"a":"Light Rail","b":"1F688","j":["railway","transportation","vehicle"]},"station":{"a":"Station","b":"1F689","j":["railway","train","transportation","vehicle","public"]},"tram":{"a":"Tram","b":"1F68A","j":["trolleybus","transportation","vehicle"]},"monorail":{"a":"Monorail","b":"1F69D","j":["vehicle","transportation"]},"mountain-railway":{"a":"Mountain Railway","b":"1F69E","j":["car","mountain","railway","transportation","vehicle"]},"tram-car":{"a":"Tram Car","b":"1F68B","j":["car","tram","trolleybus","transportation","vehicle","carriage","public","travel"]},"bus":{"a":"Bus","b":"1F68C","j":["vehicle","car","transportation"]},"oncoming-bus":{"a":"Oncoming Bus","b":"1F68D","j":["bus","oncoming","vehicle","transportation"]},"trolleybus":{"a":"Trolleybus","b":"1F68E","j":["bus","tram","trolley","bart","transportation","vehicle"]},"minibus":{"a":"Minibus","b":"1F690","j":["bus","vehicle","car","transportation"]},"ambulance":{"a":"Ambulance","b":"1F691","j":["vehicle","health","911","hospital"]},"fire-engine":{"a":"Fire Engine","b":"1F692","j":["engine","fire","truck","transportation","cars","vehicle"]},"police-car":{"a":"Police Car","b":"1F693","j":["car","patrol","police","vehicle","cars","transportation","law","legal","enforcement"]},"oncoming-police-car":{"a":"Oncoming Police Car","b":"1F694","j":["car","oncoming","police","vehicle","law","legal","enforcement","911"]},"taxi":{"a":"Taxi","b":"1F695","j":["vehicle","uber","cars","transportation"]},"oncoming-taxi":{"a":"Oncoming Taxi","b":"1F696","j":["oncoming","taxi","vehicle","cars","uber"]},"automobile":{"a":"Automobile","b":"1F697","j":["car","red","transportation","vehicle"]},"oncoming-automobile":{"a":"Oncoming Automobile","b":"1F698","j":["automobile","car","oncoming","vehicle","transportation"]},"sport-utility-vehicle":{"a":"Sport Utility Vehicle","b":"1F699","j":["recreational","sport utility","transportation","vehicle"]},"pickup-truck":{"a":"Pickup Truck","b":"1F6FB","j":["pick-up","pickup","truck","car","transportation"]},"delivery-truck":{"a":"Delivery Truck","b":"1F69A","j":["delivery","truck","cars","transportation"]},"articulated-lorry":{"a":"Articulated Lorry","b":"1F69B","j":["lorry","semi","truck","vehicle","cars","transportation","express"]},"tractor":{"a":"Tractor","b":"1F69C","j":["vehicle","car","farming","agriculture"]},"racing-car":{"a":"Racing Car","b":"1F3CE","j":["car","racing","sports","race","fast","formula","f1"]},"motorcycle":{"a":"Motorcycle","b":"1F3CD","j":["racing","race","sports","fast"]},"motor-scooter":{"a":"Motor Scooter","b":"1F6F5","j":["motor","scooter","vehicle","vespa","sasha"]},"manual-wheelchair":{"a":"Manual Wheelchair","b":"1F9BD","j":["accessibility"]},"motorized-wheelchair":{"a":"Motorized Wheelchair","b":"1F9BC","j":["accessibility"]},"auto-rickshaw":{"a":"Auto Rickshaw","b":"1F6FA","j":["tuk tuk","move","transportation"]},"bicycle":{"a":"Bicycle","b":"1F6B2","j":["bike","sports","exercise","hipster"]},"kick-scooter":{"a":"Kick Scooter","b":"1F6F4","j":["kick","scooter","vehicle","razor"]},"skateboard":{"a":"Skateboard","b":"1F6F9","j":["board"]},"roller-skate":{"a":"Roller Skate","b":"1F6FC","j":["roller","skate","footwear","sports"]},"bus-stop":{"a":"Bus Stop","b":"1F68F","j":["bus","stop","transportation","wait"]},"motorway":{"a":"Motorway","b":"1F6E3","j":["highway","road","cupertino","interstate"]},"railway-track":{"a":"Railway Track","b":"1F6E4","j":["railway","train","transportation"]},"oil-drum":{"a":"Oil Drum","b":"1F6E2","j":["drum","oil","barrell"]},"fuel-pump":{"a":"Fuel Pump","b":"26FD","j":["diesel","fuel","fuelpump","gas","pump","station","gas station","petroleum"]},"wheel":{"a":"Wheel","b":"1F6DE","j":["circle","tire","turn","car","transport"]},"police-car-light":{"a":"Police Car Light","b":"1F6A8","j":["beacon","car","light","police","revolving","ambulance","911","emergency","alert","error","pinged","law","legal"]},"horizontal-traffic-light":{"a":"Horizontal Traffic Light","b":"1F6A5","j":["light","signal","traffic","transportation"]},"vertical-traffic-light":{"a":"Vertical Traffic Light","b":"1F6A6","j":["light","signal","traffic","transportation","driving"]},"stop-sign":{"a":"Stop Sign","b":"1F6D1","j":["octagonal","sign","stop"]},"construction":{"a":"Construction","b":"1F6A7","j":["barrier","wip","progress","caution","warning"]},"anchor":{"a":"Anchor","b":"2693","j":["ship","tool","ferry","sea","boat"]},"ring-buoy":{"a":"Ring Buoy","b":"1F6DF","j":["float","life preserver","life saver","rescue","safety"]},"sailboat":{"a":"Sailboat","b":"26F5","j":["boat","resort","sea","yacht","ship","summer","transportation","water","sailing"]},"canoe":{"a":"Canoe","b":"1F6F6","j":["boat","paddle","water","ship"]},"speedboat":{"a":"Speedboat","b":"1F6A4","j":["boat","ship","transportation","vehicle","summer"]},"passenger-ship":{"a":"Passenger Ship","b":"1F6F3","j":["passenger","ship","yacht","cruise","ferry"]},"ferry":{"a":"Ferry","b":"26F4","j":["boat","passenger","ship","yacht"]},"motor-boat":{"a":"Motor Boat","b":"1F6E5","j":["boat","motorboat","ship"]},"ship":{"a":"Ship","b":"1F6A2","j":["boat","passenger","transportation","titanic","deploy"]},"airplane":{"a":"Airplane","b":"2708","j":["aeroplane","vehicle","transportation","flight","fly"]},"small-airplane":{"a":"Small Airplane","b":"1F6E9","j":["aeroplane","airplane","flight","transportation","fly","vehicle"]},"airplane-departure":{"a":"Airplane Departure","b":"1F6EB","j":["aeroplane","airplane","check-in","departure","departures","airport","flight","landing"]},"airplane-arrival":{"a":"Airplane Arrival","b":"1F6EC","j":["aeroplane","airplane","arrivals","arriving","landing","airport","flight","boarding"]},"parachute":{"a":"Parachute","b":"1FA82","j":["hang-glide","parasail","skydive","fly","glide"]},"seat":{"a":"Seat","b":"1F4BA","j":["chair","sit","airplane","transport","bus","flight","fly"]},"helicopter":{"a":"Helicopter","b":"1F681","j":["vehicle","transportation","fly"]},"suspension-railway":{"a":"Suspension Railway","b":"1F69F","j":["railway","suspension","vehicle","transportation"]},"mountain-cableway":{"a":"Mountain Cableway","b":"1F6A0","j":["cable","gondola","mountain","transportation","vehicle","ski"]},"aerial-tramway":{"a":"Aerial Tramway","b":"1F6A1","j":["aerial","cable","car","gondola","tramway","transportation","vehicle","ski"]},"satellite":{"a":"Satellite","b":"1F6F0","j":["space","communication","gps","orbit","spaceflight","NASA","ISS"]},"rocket":{"a":"Rocket","b":"1F680","j":["space","launch","ship","staffmode","NASA","outer space","outer_space","fly"]},"flying-saucer":{"a":"Flying Saucer","b":"1F6F8","j":["UFO","transportation","vehicle","ufo"]},"bellhop-bell":{"a":"Bellhop Bell","b":"1F6CE","j":["bell","bellhop","hotel","service"]},"luggage":{"a":"Luggage","b":"1F9F3","j":["packing","travel"]},"hourglass-done":{"a":"Hourglass Done","b":"231B","j":["sand","timer","time","clock","oldschool","limit","exam","quiz","test"]},"hourglass-not-done":{"a":"Hourglass Not Done","b":"23F3","j":["hourglass","sand","timer","oldschool","time","countdown"]},"watch":{"a":"Watch","b":"231A","j":["clock","time","accessories"]},"alarm-clock":{"a":"Alarm Clock","b":"23F0","j":["alarm","clock","time","wake"]},"stopwatch":{"a":"Stopwatch","b":"23F1","j":["clock","time","deadline"]},"timer-clock":{"a":"Timer Clock","b":"23F2","j":["clock","timer","alarm"]},"mantelpiece-clock":{"a":"Mantelpiece Clock","b":"1F570","j":["clock","time"]},"twelve-oclock":{"a":"Twelve O’Clock","b":"1F55B","j":["00","12","12:00","clock","o’clock","twelve","twelve_o_clock","time","noon","midnight","midday","late","early","schedule"]},"twelvethirty":{"a":"Twelve-Thirty","b":"1F567","j":["12","12:30","clock","thirty","twelve","twelve-thirty","twelve_thirty","time","late","early","schedule"]},"one-oclock":{"a":"One O’Clock","b":"1F550","j":["00","1","1:00","clock","o’clock","one","one_o_clock","time","late","early","schedule"]},"onethirty":{"a":"One-Thirty","b":"1F55C","j":["1","1:30","clock","one","one-thirty","thirty","one_thirty","time","late","early","schedule"]},"two-oclock":{"a":"Two O’Clock","b":"1F551","j":["00","2","2:00","clock","o’clock","two","two_o_clock","time","late","early","schedule"]},"twothirty":{"a":"Two-Thirty","b":"1F55D","j":["2","2:30","clock","thirty","two","two-thirty","two_thirty","time","late","early","schedule"]},"three-oclock":{"a":"Three O’Clock","b":"1F552","j":["00","3","3:00","clock","o’clock","three","three_o_clock","time","late","early","schedule"]},"threethirty":{"a":"Three-Thirty","b":"1F55E","j":["3","3:30","clock","thirty","three","three-thirty","three_thirty","time","late","early","schedule"]},"four-oclock":{"a":"Four O’Clock","b":"1F553","j":["00","4","4:00","clock","four","o’clock","four_o_clock","time","late","early","schedule"]},"fourthirty":{"a":"Four-Thirty","b":"1F55F","j":["4","4:30","clock","four","four-thirty","thirty","four_thirty","time","late","early","schedule"]},"five-oclock":{"a":"Five O’Clock","b":"1F554","j":["00","5","5:00","clock","five","o’clock","five_o_clock","time","late","early","schedule"]},"fivethirty":{"a":"Five-Thirty","b":"1F560","j":["5","5:30","clock","five","five-thirty","thirty","five_thirty","time","late","early","schedule"]},"six-oclock":{"a":"Six O’Clock","b":"1F555","j":["00","6","6:00","clock","o’clock","six","six_o_clock","time","late","early","schedule","dawn","dusk"]},"sixthirty":{"a":"Six-Thirty","b":"1F561","j":["6","6:30","clock","six","six-thirty","thirty","six_thirty","time","late","early","schedule"]},"seven-oclock":{"a":"Seven O’Clock","b":"1F556","j":["00","7","7:00","clock","o’clock","seven","seven_o_clock","time","late","early","schedule"]},"seventhirty":{"a":"Seven-Thirty","b":"1F562","j":["7","7:30","clock","seven","seven-thirty","thirty","seven_thirty","time","late","early","schedule"]},"eight-oclock":{"a":"Eight O’Clock","b":"1F557","j":["00","8","8:00","clock","eight","o’clock","eight_o_clock","time","late","early","schedule"]},"eightthirty":{"a":"Eight-Thirty","b":"1F563","j":["8","8:30","clock","eight","eight-thirty","thirty","eight_thirty","time","late","early","schedule"]},"nine-oclock":{"a":"Nine O’Clock","b":"1F558","j":["00","9","9:00","clock","nine","o’clock","nine_o_clock","time","late","early","schedule"]},"ninethirty":{"a":"Nine-Thirty","b":"1F564","j":["9","9:30","clock","nine","nine-thirty","thirty","nine_thirty","time","late","early","schedule"]},"ten-oclock":{"a":"Ten O’Clock","b":"1F559","j":["00","10","10:00","clock","o’clock","ten","ten_o_clock","time","late","early","schedule"]},"tenthirty":{"a":"Ten-Thirty","b":"1F565","j":["10","10:30","clock","ten","ten-thirty","thirty","ten_thirty","time","late","early","schedule"]},"eleven-oclock":{"a":"Eleven O’Clock","b":"1F55A","j":["00","11","11:00","clock","eleven","o’clock","eleven_o_clock","time","late","early","schedule"]},"eleventhirty":{"a":"Eleven-Thirty","b":"1F566","j":["11","11:30","clock","eleven","eleven-thirty","thirty","eleven_thirty","time","late","early","schedule"]},"new-moon":{"a":"New Moon","b":"1F311","j":["dark","moon","nature","twilight","planet","space","night","evening","sleep"]},"waxing-crescent-moon":{"a":"Waxing Crescent Moon","b":"1F312","j":["crescent","moon","waxing","nature","twilight","planet","space","night","evening","sleep"]},"first-quarter-moon":{"a":"First Quarter Moon","b":"1F313","j":["moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"waxing-gibbous-moon":{"a":"Waxing Gibbous Moon","b":"1F314","j":["gibbous","moon","waxing","nature","night","sky","gray","twilight","planet","space","evening","sleep"]},"full-moon":{"a":"Full Moon","b":"1F315","j":["full","moon","nature","yellow","twilight","planet","space","night","evening","sleep"]},"waning-gibbous-moon":{"a":"Waning Gibbous Moon","b":"1F316","j":["gibbous","moon","waning","nature","twilight","planet","space","night","evening","sleep","waxing_gibbous_moon"]},"last-quarter-moon":{"a":"Last Quarter Moon","b":"1F317","j":["moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"waning-crescent-moon":{"a":"Waning Crescent Moon","b":"1F318","j":["crescent","moon","waning","nature","twilight","planet","space","night","evening","sleep"]},"crescent-moon":{"a":"Crescent Moon","b":"1F319","j":["crescent","moon","night","sleep","sky","evening","magic"]},"new-moon-face":{"a":"New Moon Face","b":"1F31A","j":["face","moon","nature","twilight","planet","space","night","evening","sleep"]},"first-quarter-moon-face":{"a":"First Quarter Moon Face","b":"1F31B","j":["face","moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"last-quarter-moon-face":{"a":"Last Quarter Moon Face","b":"1F31C","j":["face","moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"thermometer":{"a":"Thermometer","b":"1F321","j":["weather","temperature","hot","cold"]},"sun":{"a":"Sun","b":"2600","j":["bright","rays","sunny","weather","nature","brightness","summer","beach","spring"]},"full-moon-face":{"a":"Full Moon Face","b":"1F31D","j":["bright","face","full","moon","nature","twilight","planet","space","night","evening","sleep"]},"sun-with-face":{"a":"Sun with Face","b":"1F31E","j":["bright","face","sun","nature","morning","sky"]},"ringed-planet":{"a":"Ringed Planet","b":"1FA90","j":["saturn","saturnine","outerspace"]},"star":{"a":"Star","b":"2B50","j":["night","yellow"]},"glowing-star":{"a":"Glowing Star","b":"1F31F","j":["glittery","glow","shining","sparkle","star","night","awesome","good","magic"]},"shooting-star":{"a":"Shooting Star","b":"1F320","j":["falling","shooting","star","night","photo"]},"milky-way":{"a":"Milky Way","b":"1F30C","j":["space","photo","stars"]},"cloud":{"a":"Cloud","b":"2601","j":["weather","sky"]},"sun-behind-cloud":{"a":"Sun Behind Cloud","b":"26C5","j":["cloud","sun","weather","nature","cloudy","morning","fall","spring"]},"cloud-with-lightning-and-rain":{"a":"Cloud with Lightning and Rain","b":"26C8","j":["cloud","rain","thunder","weather","lightning"]},"sun-behind-small-cloud":{"a":"Sun Behind Small Cloud","b":"1F324","j":["cloud","sun","weather"]},"sun-behind-large-cloud":{"a":"Sun Behind Large Cloud","b":"1F325","j":["cloud","sun","weather"]},"sun-behind-rain-cloud":{"a":"Sun Behind Rain Cloud","b":"1F326","j":["cloud","rain","sun","weather"]},"cloud-with-rain":{"a":"Cloud with Rain","b":"1F327","j":["cloud","rain","weather"]},"cloud-with-snow":{"a":"Cloud with Snow","b":"1F328","j":["cloud","cold","snow","weather"]},"cloud-with-lightning":{"a":"Cloud with Lightning","b":"1F329","j":["cloud","lightning","weather","thunder"]},"tornado":{"a":"Tornado","b":"1F32A","j":["cloud","whirlwind","weather","cyclone","twister"]},"fog":{"a":"Fog","b":"1F32B","j":["cloud","weather"]},"wind-face":{"a":"Wind Face","b":"1F32C","j":["blow","cloud","face","wind","gust","air"]},"cyclone":{"a":"Cyclone","b":"1F300","j":["dizzy","hurricane","twister","typhoon","weather","swirl","blue","cloud","vortex","spiral","whirlpool","spin","tornado"]},"rainbow":{"a":"Rainbow","b":"1F308","j":["rain","nature","happy","unicorn_face","photo","sky","spring"]},"closed-umbrella":{"a":"Closed Umbrella","b":"1F302","j":["clothing","rain","umbrella","weather","drizzle"]},"umbrella":{"a":"Umbrella","b":"2602","j":["clothing","rain","weather","spring"]},"umbrella-with-rain-drops":{"a":"Umbrella with Rain Drops","b":"2614","j":["clothing","drop","rain","umbrella","rainy","weather","spring"]},"umbrella-on-ground":{"a":"Umbrella on Ground","b":"26F1","j":["rain","sun","umbrella","weather","summer"]},"high-voltage":{"a":"High Voltage","b":"26A1","j":["danger","electric","lightning","voltage","zap","thunder","weather","lightning bolt","fast"]},"snowflake":{"a":"Snowflake","b":"2744","j":["cold","snow","winter","season","weather","christmas","xmas"]},"snowman":{"a":"Snowman","b":"2603","j":["cold","snow","winter","season","weather","christmas","xmas","frozen"]},"snowman-without-snow":{"a":"Snowman Without Snow","b":"26C4","j":["cold","snow","snowman","winter","season","weather","christmas","xmas","frozen","without_snow"]},"comet":{"a":"Comet","b":"2604","j":["space"]},"fire":{"a":"Fire","b":"1F525","j":["flame","tool","hot","cook"]},"droplet":{"a":"Droplet","b":"1F4A7","j":["cold","comic","drop","sweat","water","drip","faucet","spring"]},"water-wave":{"a":"Water Wave","b":"1F30A","j":["ocean","water","wave","sea","nature","tsunami","disaster"]},"jackolantern":{"a":"Jack-O-Lantern","b":"1F383","j":["celebration","halloween","jack","jack-o-lantern","lantern","jack_o_lantern","light","pumpkin","creepy","fall"]},"christmas-tree":{"a":"Christmas Tree","b":"1F384","j":["celebration","Christmas","tree","festival","vacation","december","xmas"]},"fireworks":{"a":"Fireworks","b":"1F386","j":["celebration","photo","festival","carnival","congratulations"]},"sparkler":{"a":"Sparkler","b":"1F387","j":["celebration","fireworks","sparkle","stars","night","shine"]},"firecracker":{"a":"Firecracker","b":"1F9E8","j":["dynamite","explosive","fireworks","boom","explode","explosion"]},"sparkles":{"a":"Sparkles","b":"2728","j":["*","sparkle","star","stars","shine","shiny","cool","awesome","good","magic"]},"balloon":{"a":"Balloon","b":"1F388","j":["celebration","party","birthday","circus"]},"party-popper":{"a":"Party Popper","b":"1F389","j":["celebration","party","popper","tada","congratulations","birthday","magic","circus"]},"confetti-ball":{"a":"Confetti Ball","b":"1F38A","j":["ball","celebration","confetti","festival","party","birthday","circus"]},"tanabata-tree":{"a":"Tanabata Tree","b":"1F38B","j":["banner","celebration","Japanese","tree","plant","nature","branch","summer","bamboo","wish","star_festival","tanzaku"]},"pine-decoration":{"a":"Pine Decoration","b":"1F38D","j":["bamboo","celebration","Japanese","pine","japanese","plant","nature","vegetable","panda","new_years"]},"japanese-dolls":{"a":"Japanese Dolls","b":"1F38E","j":["celebration","doll","festival","Japanese","Japanese dolls","japanese","toy","kimono"]},"carp-streamer":{"a":"Carp Streamer","b":"1F38F","j":["carp","celebration","streamer","fish","japanese","koinobori","banner"]},"wind-chime":{"a":"Wind Chime","b":"1F390","j":["bell","celebration","chime","wind","nature","ding","spring"]},"moon-viewing-ceremony":{"a":"Moon Viewing Ceremony","b":"1F391","j":["celebration","ceremony","moon","photo","japan","asia","tsukimi"]},"red-envelope":{"a":"Red Envelope","b":"1F9E7","j":["gift","good luck","hóngbāo","lai see","money"]},"ribbon":{"a":"Ribbon","b":"1F380","j":["celebration","decoration","pink","girl","bowtie"]},"wrapped-gift":{"a":"Wrapped Gift","b":"1F381","j":["box","celebration","gift","present","wrapped","birthday","christmas","xmas"]},"reminder-ribbon":{"a":"Reminder Ribbon","b":"1F397","j":["celebration","reminder","ribbon","sports","cause","support","awareness"]},"admission-tickets":{"a":"Admission Tickets","b":"1F39F","j":["admission","ticket","sports","concert","entrance"]},"ticket":{"a":"Ticket","b":"1F3AB","j":["admission","event","concert","pass"]},"military-medal":{"a":"Military Medal","b":"1F396","j":["celebration","medal","military","award","winning","army"]},"trophy":{"a":"Trophy","b":"1F3C6","j":["prize","win","award","contest","place","ftw","ceremony"]},"sports-medal":{"a":"Sports Medal","b":"1F3C5","j":["medal","award","winning"]},"1st-place-medal":{"a":"1st Place Medal","b":"1F947","j":["first","gold","medal","award","winning"]},"2nd-place-medal":{"a":"2nd Place Medal","b":"1F948","j":["medal","second","silver","award"]},"3rd-place-medal":{"a":"3rd Place Medal","b":"1F949","j":["bronze","medal","third","award"]},"soccer-ball":{"a":"Soccer Ball","b":"26BD","j":["ball","football","soccer","sports"]},"baseball":{"a":"Baseball","b":"26BE","j":["ball","sports","balls"]},"softball":{"a":"Softball","b":"1F94E","j":["ball","glove","underarm","sports","balls"]},"basketball":{"a":"Basketball","b":"1F3C0","j":["ball","hoop","sports","balls","NBA"]},"volleyball":{"a":"Volleyball","b":"1F3D0","j":["ball","game","sports","balls"]},"american-football":{"a":"American Football","b":"1F3C8","j":["american","ball","football","sports","balls","NFL"]},"rugby-football":{"a":"Rugby Football","b":"1F3C9","j":["ball","football","rugby","sports","team"]},"tennis":{"a":"Tennis","b":"1F3BE","j":["ball","racquet","sports","balls","green"]},"flying-disc":{"a":"Flying Disc","b":"1F94F","j":["ultimate","sports","frisbee"]},"bowling":{"a":"Bowling","b":"1F3B3","j":["ball","game","sports","fun","play"]},"cricket-game":{"a":"Cricket Game","b":"1F3CF","j":["ball","bat","game","sports"]},"field-hockey":{"a":"Field Hockey","b":"1F3D1","j":["ball","field","game","hockey","stick","sports"]},"ice-hockey":{"a":"Ice Hockey","b":"1F3D2","j":["game","hockey","ice","puck","stick","sports"]},"lacrosse":{"a":"Lacrosse","b":"1F94D","j":["ball","goal","stick","sports"]},"ping-pong":{"a":"Ping Pong","b":"1F3D3","j":["ball","bat","game","paddle","table tennis","sports","pingpong"]},"badminton":{"a":"Badminton","b":"1F3F8","j":["birdie","game","racquet","shuttlecock","sports"]},"boxing-glove":{"a":"Boxing Glove","b":"1F94A","j":["boxing","glove","sports","fighting"]},"martial-arts-uniform":{"a":"Martial Arts Uniform","b":"1F94B","j":["judo","karate","martial arts","taekwondo","uniform"]},"goal-net":{"a":"Goal Net","b":"1F945","j":["goal","net","sports"]},"flag-in-hole":{"a":"Flag in Hole","b":"26F3","j":["golf","hole","sports","business","flag","summer"]},"ice-skate":{"a":"Ice Skate","b":"26F8","j":["ice","skate","sports"]},"fishing-pole":{"a":"Fishing Pole","b":"1F3A3","j":["fish","pole","food","hobby","summer"]},"diving-mask":{"a":"Diving Mask","b":"1F93F","j":["diving","scuba","snorkeling","sport","ocean"]},"running-shirt":{"a":"Running Shirt","b":"1F3BD","j":["athletics","running","sash","shirt","play","pageant"]},"skis":{"a":"Skis","b":"1F3BF","j":["ski","snow","sports","winter","cold"]},"sled":{"a":"Sled","b":"1F6F7","j":["sledge","sleigh","luge","toboggan"]},"curling-stone":{"a":"Curling Stone","b":"1F94C","j":["game","rock","sports"]},"bullseye":{"a":"Bullseye","b":"1F3AF","j":["dart","direct hit","game","hit","target","direct_hit","play","bar"]},"yoyo":{"a":"Yo-Yo","b":"1FA80","j":["fluctuate","toy","yo-yo","yo_yo"]},"kite":{"a":"Kite","b":"1FA81","j":["fly","soar","wind"]},"water-pistol":{"a":"Water Pistol","b":"1F52B","j":["gun","handgun","pistol","revolver","tool","water","weapon","violence"]},"pool-8-ball":{"a":"Pool 8 Ball","b":"1F3B1","j":["8","ball","billiard","eight","game","pool","hobby","luck","magic"]},"crystal-ball":{"a":"Crystal Ball","b":"1F52E","j":["ball","crystal","fairy tale","fantasy","fortune","tool","disco","party","magic","circus","fortune_teller"]},"magic-wand":{"a":"Magic Wand","b":"1FA84","j":["magic","witch","wizard","supernature","power"]},"video-game":{"a":"Video Game","b":"1F3AE","j":["controller","game","play","console","PS4"]},"joystick":{"a":"Joystick","b":"1F579","j":["game","video game","play"]},"slot-machine":{"a":"Slot Machine","b":"1F3B0","j":["game","slot","bet","gamble","vegas","fruit machine","luck","casino"]},"game-die":{"a":"Game Die","b":"1F3B2","j":["dice","die","game","random","tabletop","play","luck"]},"puzzle-piece":{"a":"Puzzle Piece","b":"1F9E9","j":["clue","interlocking","jigsaw","piece","puzzle"]},"teddy-bear":{"a":"Teddy Bear","b":"1F9F8","j":["plaything","plush","stuffed","toy"]},"piata":{"a":"Piñata","b":"1FA85","j":["celebration","party","piñata","pinata","mexico","candy"]},"mirror-ball":{"a":"Mirror Ball","b":"1FAA9","j":["dance","disco","glitter","party"]},"nesting-dolls":{"a":"Nesting Dolls","b":"1FA86","j":["doll","nesting","russia","matryoshka","toy"]},"spade-suit":{"a":"Spade Suit","b":"2660","j":["card","game","poker","cards","suits","magic"]},"heart-suit":{"a":"Heart Suit","b":"2665","j":["card","game","poker","cards","magic","suits"]},"diamond-suit":{"a":"Diamond Suit","b":"2666","j":["card","game","poker","cards","magic","suits"]},"club-suit":{"a":"Club Suit","b":"2663","j":["card","game","poker","cards","magic","suits"]},"chess-pawn":{"a":"Chess Pawn","b":"265F","j":["chess","dupe","expendable"]},"joker":{"a":"Joker","b":"1F0CF","j":["card","game","wildcard","poker","cards","play","magic"]},"mahjong-red-dragon":{"a":"Mahjong Red Dragon","b":"1F004","j":["game","mahjong","red","play","chinese","kanji"]},"flower-playing-cards":{"a":"Flower Playing Cards","b":"1F3B4","j":["card","flower","game","Japanese","playing","sunset","red"]},"performing-arts":{"a":"Performing Arts","b":"1F3AD","j":["art","mask","performing","theater","theatre","acting","drama"]},"framed-picture":{"a":"Framed Picture","b":"1F5BC","j":["art","frame","museum","painting","picture","photography"]},"artist-palette":{"a":"Artist Palette","b":"1F3A8","j":["art","museum","painting","palette","design","paint","draw","colors"]},"thread":{"a":"Thread","b":"1F9F5","j":["needle","sewing","spool","string"]},"sewing-needle":{"a":"Sewing Needle","b":"1FAA1","j":["embroidery","needle","sewing","stitches","sutures","tailoring"]},"yarn":{"a":"Yarn","b":"1F9F6","j":["ball","crochet","knit"]},"knot":{"a":"Knot","b":"1FAA2","j":["rope","tangled","tie","twine","twist","scout"]},"glasses":{"a":"Glasses","b":"1F453","j":["clothing","eye","eyeglasses","eyewear","fashion","accessories","eyesight","nerdy","dork","geek"]},"sunglasses":{"a":"Sunglasses","b":"1F576","j":["dark","eye","eyewear","glasses","face","cool","accessories"]},"goggles":{"a":"Goggles","b":"1F97D","j":["eye protection","swimming","welding","eyes","protection","safety"]},"lab-coat":{"a":"Lab Coat","b":"1F97C","j":["doctor","experiment","scientist","chemist"]},"safety-vest":{"a":"Safety Vest","b":"1F9BA","j":["emergency","safety","vest","protection"]},"necktie":{"a":"Necktie","b":"1F454","j":["clothing","tie","shirt","suitup","formal","fashion","cloth","business"]},"tshirt":{"a":"T-Shirt","b":"1F455","j":["clothing","shirt","t-shirt","t_shirt","fashion","cloth","casual","tee"]},"jeans":{"a":"Jeans","b":"1F456","j":["clothing","pants","trousers","fashion","shopping"]},"scarf":{"a":"Scarf","b":"1F9E3","j":["neck","winter","clothes"]},"gloves":{"a":"Gloves","b":"1F9E4","j":["hand","hands","winter","clothes"]},"coat":{"a":"Coat","b":"1F9E5","j":["jacket"]},"socks":{"a":"Socks","b":"1F9E6","j":["stocking","stockings","clothes"]},"dress":{"a":"Dress","b":"1F457","j":["clothing","clothes","fashion","shopping"]},"kimono":{"a":"Kimono","b":"1F458","j":["clothing","dress","fashion","women","female","japanese"]},"sari":{"a":"Sari","b":"1F97B","j":["clothing","dress"]},"onepiece-swimsuit":{"a":"One-Piece Swimsuit","b":"1FA71","j":["bathing suit","one-piece swimsuit","one_piece_swimsuit","fashion"]},"briefs":{"a":"Briefs","b":"1FA72","j":["bathing suit","one-piece","swimsuit","underwear","clothing"]},"shorts":{"a":"Shorts","b":"1FA73","j":["bathing suit","pants","underwear","clothing"]},"bikini":{"a":"Bikini","b":"1F459","j":["clothing","swim","swimming","female","woman","girl","fashion","beach","summer"]},"womans-clothes":{"a":"Woman’S Clothes","b":"1F45A","j":["clothing","woman","woman’s clothes","woman_s_clothes","fashion","shopping_bags","female"]},"folding-hand-fan":{"a":"⊛ Folding Hand Fan","b":"1FAAD","j":["cooling","dance","fan","flutter","folding hand fan","hot","shy"]},"purse":{"a":"Purse","b":"1F45B","j":["clothing","coin","fashion","accessories","money","sales","shopping"]},"handbag":{"a":"Handbag","b":"1F45C","j":["bag","clothing","purse","fashion","accessory","accessories","shopping"]},"clutch-bag":{"a":"Clutch Bag","b":"1F45D","j":["bag","clothing","pouch","accessories","shopping"]},"shopping-bags":{"a":"Shopping Bags","b":"1F6CD","j":["bag","hotel","shopping","mall","buy","purchase"]},"backpack":{"a":"Backpack","b":"1F392","j":["bag","rucksack","satchel","school","student","education"]},"thong-sandal":{"a":"Thong Sandal","b":"1FA74","j":["beach sandals","sandals","thong sandals","thongs","zōri","footwear","summer"]},"mans-shoe":{"a":"Man’S Shoe","b":"1F45E","j":["clothing","man","man’s shoe","shoe","man_s_shoe","fashion","male"]},"running-shoe":{"a":"Running Shoe","b":"1F45F","j":["athletic","clothing","shoe","sneaker","shoes","sports","sneakers"]},"hiking-boot":{"a":"Hiking Boot","b":"1F97E","j":["backpacking","boot","camping","hiking"]},"flat-shoe":{"a":"Flat Shoe","b":"1F97F","j":["ballet flat","slip-on","slipper","ballet"]},"highheeled-shoe":{"a":"High-Heeled Shoe","b":"1F460","j":["clothing","heel","high-heeled shoe","shoe","woman","high_heeled_shoe","fashion","shoes","female","pumps","stiletto"]},"womans-sandal":{"a":"Woman’S Sandal","b":"1F461","j":["clothing","sandal","shoe","woman","woman’s sandal","woman_s_sandal","shoes","fashion","flip flops"]},"ballet-shoes":{"a":"Ballet Shoes","b":"1FA70","j":["ballet","dance"]},"womans-boot":{"a":"Woman’S Boot","b":"1F462","j":["boot","clothing","shoe","woman","woman’s boot","woman_s_boot","shoes","fashion"]},"hair-pick":{"a":"⊛ Hair Pick","b":"1FAAE","j":["Afro","comb","hair","pick"]},"crown":{"a":"Crown","b":"1F451","j":["clothing","king","queen","kod","leader","royalty","lord"]},"womans-hat":{"a":"Woman’S Hat","b":"1F452","j":["clothing","hat","woman","woman’s hat","woman_s_hat","fashion","accessories","female","lady","spring"]},"top-hat":{"a":"Top Hat","b":"1F3A9","j":["clothing","hat","top","tophat","magic","gentleman","classy","circus"]},"graduation-cap":{"a":"Graduation Cap","b":"1F393","j":["cap","celebration","clothing","graduation","hat","school","college","degree","university","legal","learn","education"]},"billed-cap":{"a":"Billed Cap","b":"1F9E2","j":["baseball cap","cap","baseball"]},"military-helmet":{"a":"Military Helmet","b":"1FA96","j":["army","helmet","military","soldier","warrior","protection"]},"rescue-workers-helmet":{"a":"Rescue Worker’S Helmet","b":"26D1","j":["aid","cross","face","hat","helmet","rescue worker’s helmet","rescue_worker_s_helmet","construction","build"]},"prayer-beads":{"a":"Prayer Beads","b":"1F4FF","j":["beads","clothing","necklace","prayer","religion","dhikr","religious"]},"lipstick":{"a":"Lipstick","b":"1F484","j":["cosmetics","makeup","female","girl","fashion","woman"]},"ring":{"a":"Ring","b":"1F48D","j":["diamond","wedding","propose","marriage","valentines","fashion","jewelry","gem","engagement"]},"gem-stone":{"a":"Gem Stone","b":"1F48E","j":["diamond","gem","jewel","blue","ruby","jewelry"]},"muted-speaker":{"a":"Muted Speaker","b":"1F507","j":["mute","quiet","silent","speaker","sound","volume","silence"]},"speaker-low-volume":{"a":"Speaker Low Volume","b":"1F508","j":["soft","sound","volume","silence","broadcast"]},"speaker-medium-volume":{"a":"Speaker Medium Volume","b":"1F509","j":["medium","volume","speaker","broadcast"]},"speaker-high-volume":{"a":"Speaker High Volume","b":"1F50A","j":["loud","volume","noise","noisy","speaker","broadcast"]},"loudspeaker":{"a":"Loudspeaker","b":"1F4E2","j":["loud","public address","volume","sound"]},"megaphone":{"a":"Megaphone","b":"1F4E3","j":["cheering","sound","speaker","volume"]},"postal-horn":{"a":"Postal Horn","b":"1F4EF","j":["horn","post","postal","instrument","music"]},"bell":{"a":"Bell","b":"1F514","j":["sound","notification","christmas","xmas","chime"]},"bell-with-slash":{"a":"Bell with Slash","b":"1F515","j":["bell","forbidden","mute","quiet","silent","sound","volume"]},"musical-score":{"a":"Musical Score","b":"1F3BC","j":["music","score","treble","clef","compose"]},"musical-note":{"a":"Musical Note","b":"1F3B5","j":["music","note","score","tone","sound"]},"musical-notes":{"a":"Musical Notes","b":"1F3B6","j":["music","note","notes","score"]},"studio-microphone":{"a":"Studio Microphone","b":"1F399","j":["mic","microphone","music","studio","sing","recording","artist","talkshow"]},"level-slider":{"a":"Level Slider","b":"1F39A","j":["level","music","slider","scale"]},"control-knobs":{"a":"Control Knobs","b":"1F39B","j":["control","knobs","music","dial"]},"microphone":{"a":"Microphone","b":"1F3A4","j":["karaoke","mic","sound","music","PA","sing","talkshow"]},"headphone":{"a":"Headphone","b":"1F3A7","j":["earbud","music","score","gadgets"]},"radio":{"a":"Radio","b":"1F4FB","j":["video","communication","music","podcast","program"]},"saxophone":{"a":"Saxophone","b":"1F3B7","j":["instrument","music","sax","jazz","blues"]},"accordion":{"a":"Accordion","b":"1FA97","j":["concertina","squeeze box","music"]},"guitar":{"a":"Guitar","b":"1F3B8","j":["instrument","music"]},"musical-keyboard":{"a":"Musical Keyboard","b":"1F3B9","j":["instrument","keyboard","music","piano","compose"]},"trumpet":{"a":"Trumpet","b":"1F3BA","j":["instrument","music","brass"]},"violin":{"a":"Violin","b":"1F3BB","j":["instrument","music","orchestra","symphony"]},"banjo":{"a":"Banjo","b":"1FA95","j":["music","stringed","instructment"]},"drum":{"a":"Drum","b":"1F941","j":["drumsticks","music","instrument","snare"]},"long-drum":{"a":"Long Drum","b":"1FA98","j":["beat","conga","drum","rhythm","music"]},"maracas":{"a":"⊛ Maracas","b":"1FA87","j":["instrument","maracas","music","percussion","rattle","shake"]},"flute":{"a":"⊛ Flute","b":"1FA88","j":["fife","flute","music","pipe","recorder","woodwind"]},"mobile-phone":{"a":"Mobile Phone","b":"1F4F1","j":["cell","mobile","phone","telephone","technology","apple","gadgets","dial"]},"mobile-phone-with-arrow":{"a":"Mobile Phone with Arrow","b":"1F4F2","j":["arrow","cell","mobile","phone","receive","iphone","incoming"]},"telephone":{"a":"Telephone","b":"260E","j":["phone","technology","communication","dial"]},"telephone-receiver":{"a":"Telephone Receiver","b":"1F4DE","j":["phone","receiver","telephone","technology","communication","dial"]},"pager":{"a":"Pager","b":"1F4DF","j":["bbcall","oldschool","90s"]},"fax-machine":{"a":"Fax Machine","b":"1F4E0","j":["fax","communication","technology"]},"battery":{"a":"Battery","b":"1F50B","j":["power","energy","sustain"]},"low-battery":{"a":"Low Battery","b":"1FAAB","j":["electronic","low energy","drained","dead"]},"electric-plug":{"a":"Electric Plug","b":"1F50C","j":["electric","electricity","plug","charger","power"]},"laptop":{"a":"Laptop","b":"1F4BB","j":["computer","pc","personal","technology","screen","display","monitor"]},"desktop-computer":{"a":"Desktop Computer","b":"1F5A5","j":["computer","desktop","technology","computing","screen"]},"printer":{"a":"Printer","b":"1F5A8","j":["computer","paper","ink"]},"keyboard":{"a":"Keyboard","b":"2328","j":["computer","technology","type","input","text"]},"computer-mouse":{"a":"Computer Mouse","b":"1F5B1","j":["computer","click"]},"trackball":{"a":"Trackball","b":"1F5B2","j":["computer","technology","trackpad"]},"computer-disk":{"a":"Computer Disk","b":"1F4BD","j":["computer","disk","minidisk","optical","technology","record","data","90s"]},"floppy-disk":{"a":"Floppy Disk","b":"1F4BE","j":["computer","disk","floppy","oldschool","technology","save","90s","80s"]},"optical-disk":{"a":"Optical Disk","b":"1F4BF","j":["CD","computer","disk","optical","technology","dvd","disc","90s"]},"dvd":{"a":"Dvd","b":"1F4C0","j":["Blu-ray","computer","disk","DVD","optical","cd","disc"]},"abacus":{"a":"Abacus","b":"1F9EE","j":["calculation"]},"movie-camera":{"a":"Movie Camera","b":"1F3A5","j":["camera","cinema","movie","film","record"]},"film-frames":{"a":"Film Frames","b":"1F39E","j":["cinema","film","frames","movie"]},"film-projector":{"a":"Film Projector","b":"1F4FD","j":["cinema","film","movie","projector","video","tape","record"]},"clapper-board":{"a":"Clapper Board","b":"1F3AC","j":["clapper","movie","film","record"]},"television":{"a":"Television","b":"1F4FA","j":["tv","video","technology","program","oldschool","show"]},"camera":{"a":"Camera","b":"1F4F7","j":["video","gadgets","photography"]},"camera-with-flash":{"a":"Camera with Flash","b":"1F4F8","j":["camera","flash","video","photography","gadgets"]},"video-camera":{"a":"Video Camera","b":"1F4F9","j":["camera","video","film","record"]},"videocassette":{"a":"Videocassette","b":"1F4FC","j":["tape","vhs","video","record","oldschool","90s","80s"]},"magnifying-glass-tilted-left":{"a":"Magnifying Glass Tilted Left","b":"1F50D","j":["glass","magnifying","search","tool","zoom","find","detective"]},"magnifying-glass-tilted-right":{"a":"Magnifying Glass Tilted Right","b":"1F50E","j":["glass","magnifying","search","tool","zoom","find","detective"]},"candle":{"a":"Candle","b":"1F56F","j":["light","fire","wax"]},"light-bulb":{"a":"Light Bulb","b":"1F4A1","j":["bulb","comic","electric","idea","light","electricity"]},"flashlight":{"a":"Flashlight","b":"1F526","j":["electric","light","tool","torch","dark","camping","sight","night"]},"red-paper-lantern":{"a":"Red Paper Lantern","b":"1F3EE","j":["bar","lantern","light","red","paper","halloween","spooky"]},"diya-lamp":{"a":"Diya Lamp","b":"1FA94","j":["diya","lamp","oil","lighting"]},"notebook-with-decorative-cover":{"a":"Notebook with Decorative Cover","b":"1F4D4","j":["book","cover","decorated","notebook","classroom","notes","record","paper","study"]},"closed-book":{"a":"Closed Book","b":"1F4D5","j":["book","closed","read","library","knowledge","textbook","learn"]},"open-book":{"a":"Open Book","b":"1F4D6","j":["book","open","read","library","knowledge","literature","learn","study"]},"green-book":{"a":"Green Book","b":"1F4D7","j":["book","green","read","library","knowledge","study"]},"blue-book":{"a":"Blue Book","b":"1F4D8","j":["blue","book","read","library","knowledge","learn","study"]},"orange-book":{"a":"Orange Book","b":"1F4D9","j":["book","orange","read","library","knowledge","textbook","study"]},"books":{"a":"Books","b":"1F4DA","j":["book","literature","library","study"]},"notebook":{"a":"Notebook","b":"1F4D3","j":["stationery","record","notes","paper","study"]},"ledger":{"a":"Ledger","b":"1F4D2","j":["notebook","notes","paper"]},"page-with-curl":{"a":"Page with Curl","b":"1F4C3","j":["curl","document","page","documents","office","paper"]},"scroll":{"a":"Scroll","b":"1F4DC","j":["paper","documents","ancient","history"]},"page-facing-up":{"a":"Page Facing Up","b":"1F4C4","j":["document","page","documents","office","paper","information"]},"newspaper":{"a":"Newspaper","b":"1F4F0","j":["news","paper","press","headline"]},"rolledup-newspaper":{"a":"Rolled-Up Newspaper","b":"1F5DE","j":["news","newspaper","paper","rolled","rolled-up newspaper","rolled_up_newspaper","press","headline"]},"bookmark-tabs":{"a":"Bookmark Tabs","b":"1F4D1","j":["bookmark","mark","marker","tabs","favorite","save","order","tidy"]},"bookmark":{"a":"Bookmark","b":"1F516","j":["mark","favorite","label","save"]},"label":{"a":"Label","b":"1F3F7","j":["sale","tag"]},"money-bag":{"a":"Money Bag","b":"1F4B0","j":["bag","dollar","money","moneybag","payment","coins","sale"]},"coin":{"a":"Coin","b":"1FA99","j":["gold","metal","money","silver","treasure","currency"]},"yen-banknote":{"a":"Yen Banknote","b":"1F4B4","j":["banknote","bill","currency","money","note","yen","sales","japanese","dollar"]},"dollar-banknote":{"a":"Dollar Banknote","b":"1F4B5","j":["banknote","bill","currency","dollar","money","note","sales"]},"euro-banknote":{"a":"Euro Banknote","b":"1F4B6","j":["banknote","bill","currency","euro","money","note","sales","dollar"]},"pound-banknote":{"a":"Pound Banknote","b":"1F4B7","j":["banknote","bill","currency","money","note","pound","british","sterling","sales","bills","uk","england"]},"money-with-wings":{"a":"Money with Wings","b":"1F4B8","j":["banknote","bill","fly","money","wings","dollar","bills","payment","sale"]},"credit-card":{"a":"Credit Card","b":"1F4B3","j":["card","credit","money","sales","dollar","bill","payment","shopping"]},"receipt":{"a":"Receipt","b":"1F9FE","j":["accounting","bookkeeping","evidence","proof","expenses"]},"chart-increasing-with-yen":{"a":"Chart Increasing with Yen","b":"1F4B9","j":["chart","graph","growth","money","yen","green-square","presentation","stats"]},"envelope":{"a":"Envelope","b":"2709","j":["email","letter","postal","inbox","communication"]},"email":{"a":"E-Mail","b":"1F4E7","j":["e-mail","letter","mail","e_mail","communication","inbox"]},"incoming-envelope":{"a":"Incoming Envelope","b":"1F4E8","j":["e-mail","email","envelope","incoming","letter","receive","inbox"]},"envelope-with-arrow":{"a":"Envelope with Arrow","b":"1F4E9","j":["arrow","e-mail","email","envelope","outgoing","communication"]},"outbox-tray":{"a":"Outbox Tray","b":"1F4E4","j":["box","letter","mail","outbox","sent","tray","inbox","email"]},"inbox-tray":{"a":"Inbox Tray","b":"1F4E5","j":["box","inbox","letter","mail","receive","tray","email","documents"]},"package":{"a":"Package","b":"1F4E6","j":["box","parcel","mail","gift","cardboard","moving"]},"closed-mailbox-with-raised-flag":{"a":"Closed Mailbox with Raised Flag","b":"1F4EB","j":["closed","mail","mailbox","postbox","email","inbox","communication"]},"closed-mailbox-with-lowered-flag":{"a":"Closed Mailbox with Lowered Flag","b":"1F4EA","j":["closed","lowered","mail","mailbox","postbox","email","communication","inbox"]},"open-mailbox-with-raised-flag":{"a":"Open Mailbox with Raised Flag","b":"1F4EC","j":["mail","mailbox","open","postbox","email","inbox","communication"]},"open-mailbox-with-lowered-flag":{"a":"Open Mailbox with Lowered Flag","b":"1F4ED","j":["lowered","mail","mailbox","open","postbox","email","inbox"]},"postbox":{"a":"Postbox","b":"1F4EE","j":["mail","mailbox","email","letter","envelope"]},"ballot-box-with-ballot":{"a":"Ballot Box with Ballot","b":"1F5F3","j":["ballot","box","election","vote"]},"pencil":{"a":"Pencil","b":"270F","j":["stationery","write","paper","writing","school","study"]},"black-nib":{"a":"Black Nib","b":"2712","j":["nib","pen","stationery","writing","write"]},"fountain-pen":{"a":"Fountain Pen","b":"1F58B","j":["fountain","pen","stationery","writing","write"]},"pen":{"a":"Pen","b":"1F58A","j":["ballpoint","stationery","writing","write"]},"paintbrush":{"a":"Paintbrush","b":"1F58C","j":["painting","drawing","creativity","art"]},"crayon":{"a":"Crayon","b":"1F58D","j":["drawing","creativity"]},"memo":{"a":"Memo","b":"1F4DD","j":["pencil","write","documents","stationery","paper","writing","legal","exam","quiz","test","study","compose"]},"briefcase":{"a":"Briefcase","b":"1F4BC","j":["business","documents","work","law","legal","job","career"]},"file-folder":{"a":"File Folder","b":"1F4C1","j":["file","folder","documents","business","office"]},"open-file-folder":{"a":"Open File Folder","b":"1F4C2","j":["file","folder","open","documents","load"]},"card-index-dividers":{"a":"Card Index Dividers","b":"1F5C2","j":["card","dividers","index","organizing","business","stationery"]},"calendar":{"a":"Calendar","b":"1F4C5","j":["date","schedule"]},"tearoff-calendar":{"a":"Tear-off Calendar","b":"1F4C6","j":["calendar","tear-off calendar","tear_off_calendar","schedule","date","planning"]},"spiral-notepad":{"a":"Spiral Notepad","b":"1F5D2","j":["note","pad","spiral","memo","stationery"]},"spiral-calendar":{"a":"Spiral Calendar","b":"1F5D3","j":["calendar","pad","spiral","date","schedule","planning"]},"card-index":{"a":"Card Index","b":"1F4C7","j":["card","index","rolodex","business","stationery"]},"chart-increasing":{"a":"Chart Increasing","b":"1F4C8","j":["chart","graph","growth","trend","upward","presentation","stats","recovery","business","economics","money","sales","good","success"]},"chart-decreasing":{"a":"Chart Decreasing","b":"1F4C9","j":["chart","down","graph","trend","presentation","stats","recession","business","economics","money","sales","bad","failure"]},"bar-chart":{"a":"Bar Chart","b":"1F4CA","j":["bar","chart","graph","presentation","stats"]},"clipboard":{"a":"Clipboard","b":"1F4CB","j":["stationery","documents"]},"pushpin":{"a":"Pushpin","b":"1F4CC","j":["pin","stationery","mark","here"]},"round-pushpin":{"a":"Round Pushpin","b":"1F4CD","j":["pin","pushpin","stationery","location","map","here"]},"paperclip":{"a":"Paperclip","b":"1F4CE","j":["documents","stationery"]},"linked-paperclips":{"a":"Linked Paperclips","b":"1F587","j":["link","paperclip","documents","stationery"]},"straight-ruler":{"a":"Straight Ruler","b":"1F4CF","j":["ruler","straight edge","stationery","calculate","length","math","school","drawing","architect","sketch"]},"triangular-ruler":{"a":"Triangular Ruler","b":"1F4D0","j":["ruler","set","triangle","stationery","math","architect","sketch"]},"scissors":{"a":"Scissors","b":"2702","j":["cutting","tool","stationery","cut"]},"card-file-box":{"a":"Card File Box","b":"1F5C3","j":["box","card","file","business","stationery"]},"file-cabinet":{"a":"File Cabinet","b":"1F5C4","j":["cabinet","file","filing","organizing"]},"wastebasket":{"a":"Wastebasket","b":"1F5D1","j":["bin","trash","rubbish","garbage","toss"]},"locked":{"a":"Locked","b":"1F512","j":["closed","security","password","padlock"]},"unlocked":{"a":"Unlocked","b":"1F513","j":["lock","open","unlock","privacy","security"]},"locked-with-pen":{"a":"Locked with Pen","b":"1F50F","j":["ink","lock","nib","pen","privacy","security","secret"]},"locked-with-key":{"a":"Locked with Key","b":"1F510","j":["closed","key","lock","secure","security","privacy"]},"key":{"a":"Key","b":"1F511","j":["lock","password","door"]},"old-key":{"a":"Old Key","b":"1F5DD","j":["clue","key","lock","old","door","password"]},"hammer":{"a":"Hammer","b":"1F528","j":["tool","tools","build","create"]},"axe":{"a":"Axe","b":"1FA93","j":["chop","hatchet","split","wood","tool","cut"]},"pick":{"a":"Pick","b":"26CF","j":["mining","tool","tools","dig"]},"hammer-and-pick":{"a":"Hammer and Pick","b":"2692","j":["hammer","pick","tool","tools","build","create"]},"hammer-and-wrench":{"a":"Hammer and Wrench","b":"1F6E0","j":["hammer","spanner","tool","wrench","tools","build","create"]},"dagger":{"a":"Dagger","b":"1F5E1","j":["knife","weapon"]},"crossed-swords":{"a":"Crossed Swords","b":"2694","j":["crossed","swords","weapon"]},"bomb":{"a":"Bomb","b":"1F4A3","j":["comic","boom","explode","explosion","terrorism"]},"boomerang":{"a":"Boomerang","b":"1FA83","j":["australia","rebound","repercussion","weapon"]},"bow-and-arrow":{"a":"Bow and Arrow","b":"1F3F9","j":["archer","arrow","bow","Sagittarius","zodiac","sports"]},"shield":{"a":"Shield","b":"1F6E1","j":["weapon","protection","security"]},"carpentry-saw":{"a":"Carpentry Saw","b":"1FA9A","j":["carpenter","lumber","saw","tool","cut","chop"]},"wrench":{"a":"Wrench","b":"1F527","j":["spanner","tool","tools","diy","ikea","fix","maintainer"]},"screwdriver":{"a":"Screwdriver","b":"1FA9B","j":["screw","tool","tools"]},"nut-and-bolt":{"a":"Nut and Bolt","b":"1F529","j":["bolt","nut","tool","handy","tools","fix"]},"gear":{"a":"Gear","b":"2699","j":["cog","cogwheel","tool"]},"clamp":{"a":"Clamp","b":"1F5DC","j":["compress","tool","vice"]},"balance-scale":{"a":"Balance Scale","b":"2696","j":["balance","justice","Libra","scale","zodiac","law","fairness","weight"]},"white-cane":{"a":"White Cane","b":"1F9AF","j":["accessibility","blind","probing_cane"]},"link":{"a":"Link","b":"1F517","j":["rings","url"]},"chains":{"a":"Chains","b":"26D3","j":["chain","lock","arrest"]},"hook":{"a":"Hook","b":"1FA9D","j":["catch","crook","curve","ensnare","selling point","tools"]},"toolbox":{"a":"Toolbox","b":"1F9F0","j":["chest","mechanic","tool","tools","diy","fix","maintainer"]},"magnet":{"a":"Magnet","b":"1F9F2","j":["attraction","horseshoe","magnetic"]},"ladder":{"a":"Ladder","b":"1FA9C","j":["climb","rung","step","tools"]},"alembic":{"a":"Alembic","b":"2697","j":["chemistry","tool","distilling","science","experiment"]},"test-tube":{"a":"Test Tube","b":"1F9EA","j":["chemist","chemistry","experiment","lab","science"]},"petri-dish":{"a":"Petri Dish","b":"1F9EB","j":["bacteria","biologist","biology","culture","lab"]},"dna":{"a":"Dna","b":"1F9EC","j":["biologist","evolution","gene","genetics","life"]},"microscope":{"a":"Microscope","b":"1F52C","j":["science","tool","laboratory","experiment","zoomin","study"]},"telescope":{"a":"Telescope","b":"1F52D","j":["science","tool","stars","space","zoom","astronomy"]},"satellite-antenna":{"a":"Satellite Antenna","b":"1F4E1","j":["antenna","dish","satellite","communication","future","radio","space"]},"syringe":{"a":"Syringe","b":"1F489","j":["medicine","needle","shot","sick","health","hospital","drugs","blood","doctor","nurse"]},"drop-of-blood":{"a":"Drop of Blood","b":"1FA78","j":["bleed","blood donation","injury","medicine","menstruation","period","hurt","harm","wound"]},"pill":{"a":"Pill","b":"1F48A","j":["doctor","medicine","sick","health","pharmacy","drug"]},"adhesive-bandage":{"a":"Adhesive Bandage","b":"1FA79","j":["bandage","heal"]},"crutch":{"a":"Crutch","b":"1FA7C","j":["cane","disability","hurt","mobility aid","stick","accessibility","assist"]},"stethoscope":{"a":"Stethoscope","b":"1FA7A","j":["doctor","heart","medicine","health"]},"xray":{"a":"X-Ray","b":"1FA7B","j":["bones","doctor","medical","skeleton","x-ray","medicine"]},"door":{"a":"Door","b":"1F6AA","j":["house","entry","exit"]},"elevator":{"a":"Elevator","b":"1F6D7","j":["accessibility","hoist","lift"]},"mirror":{"a":"Mirror","b":"1FA9E","j":["reflection","reflector","speculum"]},"window":{"a":"Window","b":"1FA9F","j":["frame","fresh air","opening","transparent","view","scenery"]},"bed":{"a":"Bed","b":"1F6CF","j":["hotel","sleep","rest"]},"couch-and-lamp":{"a":"Couch and Lamp","b":"1F6CB","j":["couch","hotel","lamp","read","chill"]},"chair":{"a":"Chair","b":"1FA91","j":["seat","sit","furniture"]},"toilet":{"a":"Toilet","b":"1F6BD","j":["restroom","wc","washroom","bathroom","potty"]},"plunger":{"a":"Plunger","b":"1FAA0","j":["force cup","plumber","suction","toilet"]},"shower":{"a":"Shower","b":"1F6BF","j":["water","clean","bathroom"]},"bathtub":{"a":"Bathtub","b":"1F6C1","j":["bath","clean","shower","bathroom"]},"mouse-trap":{"a":"Mouse Trap","b":"1FAA4","j":["bait","mousetrap","snare","trap","cheese"]},"razor":{"a":"Razor","b":"1FA92","j":["sharp","shave","cut"]},"lotion-bottle":{"a":"Lotion Bottle","b":"1F9F4","j":["lotion","moisturizer","shampoo","sunscreen"]},"safety-pin":{"a":"Safety Pin","b":"1F9F7","j":["diaper","punk rock"]},"broom":{"a":"Broom","b":"1F9F9","j":["cleaning","sweeping","witch"]},"basket":{"a":"Basket","b":"1F9FA","j":["farming","laundry","picnic"]},"roll-of-paper":{"a":"Roll of Paper","b":"1F9FB","j":["paper towels","toilet paper","roll"]},"bucket":{"a":"Bucket","b":"1FAA3","j":["cask","pail","vat","water","container"]},"soap":{"a":"Soap","b":"1F9FC","j":["bar","bathing","cleaning","lather","soapdish"]},"bubbles":{"a":"Bubbles","b":"1FAE7","j":["burp","clean","soap","underwater","fun","carbonation","sparkling"]},"toothbrush":{"a":"Toothbrush","b":"1FAA5","j":["bathroom","brush","clean","dental","hygiene","teeth"]},"sponge":{"a":"Sponge","b":"1F9FD","j":["absorbing","cleaning","porous"]},"fire-extinguisher":{"a":"Fire Extinguisher","b":"1F9EF","j":["extinguish","fire","quench"]},"shopping-cart":{"a":"Shopping Cart","b":"1F6D2","j":["cart","shopping","trolley"]},"cigarette":{"a":"Cigarette","b":"1F6AC","j":["smoking","kills","tobacco","joint","smoke"]},"coffin":{"a":"Coffin","b":"26B0","j":["death","vampire","dead","die","rip","graveyard","cemetery","casket","funeral","box"]},"headstone":{"a":"Headstone","b":"1FAA6","j":["cemetery","grave","graveyard","tombstone","death","rip"]},"funeral-urn":{"a":"Funeral Urn","b":"26B1","j":["ashes","death","funeral","urn","dead","die","rip"]},"nazar-amulet":{"a":"Nazar Amulet","b":"1F9FF","j":["bead","charm","evil-eye","nazar","talisman"]},"hamsa":{"a":"Hamsa","b":"1FAAC","j":["amulet","Fatima","hand","Mary","Miriam","protection","religion"]},"moai":{"a":"Moai","b":"1F5FF","j":["face","moyai","statue","rock","easter island"]},"placard":{"a":"Placard","b":"1FAA7","j":["demonstration","picket","protest","sign","announcement"]},"identification-card":{"a":"Identification Card","b":"1FAAA","j":["credentials","ID","license","security","document"]},"atm-sign":{"a":"Atm Sign","b":"1F3E7","j":["ATM","ATM sign","automated","bank","teller","money","sales","cash","blue-square","payment"]},"litter-in-bin-sign":{"a":"Litter in Bin Sign","b":"1F6AE","j":["litter","litter bin","blue-square","sign","human","info"]},"potable-water":{"a":"Potable Water","b":"1F6B0","j":["drinking","potable","water","blue-square","liquid","restroom","cleaning","faucet"]},"wheelchair-symbol":{"a":"Wheelchair Symbol","b":"267F","j":["access","blue-square","disabled","accessibility"]},"mens-room":{"a":"Men’S Room","b":"1F6B9","j":["bathroom","lavatory","man","men’s room","restroom","toilet","WC","men_s_room","wc","blue-square","gender","male"]},"womens-room":{"a":"Women’S Room","b":"1F6BA","j":["bathroom","lavatory","restroom","toilet","WC","woman","women’s room","women_s_room","purple-square","female","loo","gender"]},"restroom":{"a":"Restroom","b":"1F6BB","j":["bathroom","lavatory","toilet","WC","blue-square","refresh","wc","gender"]},"baby-symbol":{"a":"Baby Symbol","b":"1F6BC","j":["baby","changing","orange-square","child"]},"water-closet":{"a":"Water Closet","b":"1F6BE","j":["bathroom","closet","lavatory","restroom","toilet","water","WC","blue-square"]},"passport-control":{"a":"Passport Control","b":"1F6C2","j":["control","passport","custom","blue-square"]},"customs":{"a":"Customs","b":"1F6C3","j":["passport","border","blue-square"]},"baggage-claim":{"a":"Baggage Claim","b":"1F6C4","j":["baggage","claim","blue-square","airport","transport"]},"left-luggage":{"a":"Left Luggage","b":"1F6C5","j":["baggage","locker","luggage","blue-square","travel"]},"warning":{"a":"Warning","b":"26A0","j":["exclamation","wip","alert","error","problem","issue"]},"children-crossing":{"a":"Children Crossing","b":"1F6B8","j":["child","crossing","pedestrian","traffic","school","warning","danger","sign","driving","yellow-diamond"]},"no-entry":{"a":"No Entry","b":"26D4","j":["entry","forbidden","no","not","prohibited","traffic","limit","security","privacy","bad","denied","stop","circle"]},"prohibited":{"a":"Prohibited","b":"1F6AB","j":["entry","forbidden","no","not","forbid","stop","limit","denied","disallow","circle"]},"no-bicycles":{"a":"No Bicycles","b":"1F6B3","j":["bicycle","bike","forbidden","no","prohibited","cyclist","circle"]},"no-smoking":{"a":"No Smoking","b":"1F6AD","j":["forbidden","no","not","prohibited","smoking","cigarette","blue-square","smell","smoke"]},"no-littering":{"a":"No Littering","b":"1F6AF","j":["forbidden","litter","no","not","prohibited","trash","bin","garbage","circle"]},"nonpotable-water":{"a":"Non-Potable Water","b":"1F6B1","j":["non-drinking","non-potable","water","non_potable_water","drink","faucet","tap","circle"]},"no-pedestrians":{"a":"No Pedestrians","b":"1F6B7","j":["forbidden","no","not","pedestrian","prohibited","rules","crossing","walking","circle"]},"no-mobile-phones":{"a":"No Mobile Phones","b":"1F4F5","j":["cell","forbidden","mobile","no","phone","iphone","mute","circle"]},"no-one-under-eighteen":{"a":"No One Under Eighteen","b":"1F51E","j":["18","age restriction","eighteen","prohibited","underage","drink","pub","night","minor","circle"]},"radioactive":{"a":"Radioactive","b":"2622","j":["sign","nuclear","danger"]},"biohazard":{"a":"Biohazard","b":"2623","j":["sign","danger"]},"up-arrow":{"a":"Up Arrow","b":"2B06","j":["arrow","cardinal","direction","north","blue-square","continue","top"]},"upright-arrow":{"a":"Up-Right Arrow","b":"2197","j":["arrow","direction","intercardinal","northeast","up-right arrow","up_right_arrow","blue-square","point","diagonal"]},"right-arrow":{"a":"Right Arrow","b":"27A1","j":["arrow","cardinal","direction","east","blue-square","next"]},"downright-arrow":{"a":"Down-Right Arrow","b":"2198","j":["arrow","direction","down-right arrow","intercardinal","southeast","down_right_arrow","blue-square","diagonal"]},"down-arrow":{"a":"Down Arrow","b":"2B07","j":["arrow","cardinal","direction","down","south","blue-square","bottom"]},"downleft-arrow":{"a":"Down-Left Arrow","b":"2199","j":["arrow","direction","down-left arrow","intercardinal","southwest","down_left_arrow","blue-square","diagonal"]},"left-arrow":{"a":"Left Arrow","b":"2B05","j":["arrow","cardinal","direction","west","blue-square","previous","back"]},"upleft-arrow":{"a":"Up-Left Arrow","b":"2196","j":["arrow","direction","intercardinal","northwest","up-left arrow","up_left_arrow","blue-square","point","diagonal"]},"updown-arrow":{"a":"Up-Down Arrow","b":"2195","j":["arrow","up-down arrow","up_down_arrow","blue-square","direction","way","vertical"]},"leftright-arrow":{"a":"Left-Right Arrow","b":"2194","j":["arrow","left-right arrow","left_right_arrow","shape","direction","horizontal","sideways"]},"right-arrow-curving-left":{"a":"Right Arrow Curving Left","b":"21A9","j":["arrow","back","return","blue-square","undo","enter"]},"left-arrow-curving-right":{"a":"Left Arrow Curving Right","b":"21AA","j":["arrow","blue-square","return","rotate","direction"]},"right-arrow-curving-up":{"a":"Right Arrow Curving Up","b":"2934","j":["arrow","blue-square","direction","top"]},"right-arrow-curving-down":{"a":"Right Arrow Curving Down","b":"2935","j":["arrow","down","blue-square","direction","bottom"]},"clockwise-vertical-arrows":{"a":"Clockwise Vertical Arrows","b":"1F503","j":["arrow","clockwise","reload","sync","cycle","round","repeat"]},"counterclockwise-arrows-button":{"a":"Counterclockwise Arrows Button","b":"1F504","j":["anticlockwise","arrow","counterclockwise","withershins","blue-square","sync","cycle"]},"back-arrow":{"a":"Back Arrow","b":"1F519","j":["arrow","BACK","words","return"]},"end-arrow":{"a":"End Arrow","b":"1F51A","j":["arrow","END","words"]},"on-arrow":{"a":"On! Arrow","b":"1F51B","j":["arrow","mark","ON","ON!","words"]},"soon-arrow":{"a":"Soon Arrow","b":"1F51C","j":["arrow","SOON","words"]},"top-arrow":{"a":"Top Arrow","b":"1F51D","j":["arrow","TOP","up","words","blue-square"]},"place-of-worship":{"a":"Place of Worship","b":"1F6D0","j":["religion","worship","church","temple","prayer"]},"atom-symbol":{"a":"Atom Symbol","b":"269B","j":["atheist","atom","science","physics","chemistry"]},"om":{"a":"Om","b":"1F549","j":["Hindu","religion","hinduism","buddhism","sikhism","jainism"]},"star-of-david":{"a":"Star of David","b":"2721","j":["David","Jew","Jewish","religion","star","star of David","judaism"]},"wheel-of-dharma":{"a":"Wheel of Dharma","b":"2638","j":["Buddhist","dharma","religion","wheel","hinduism","buddhism","sikhism","jainism"]},"yin-yang":{"a":"Yin Yang","b":"262F","j":["religion","tao","taoist","yang","yin","balance"]},"latin-cross":{"a":"Latin Cross","b":"271D","j":["Christian","cross","religion","christianity"]},"orthodox-cross":{"a":"Orthodox Cross","b":"2626","j":["Christian","cross","religion","suppedaneum"]},"star-and-crescent":{"a":"Star and Crescent","b":"262A","j":["islam","Muslim","religion"]},"peace-symbol":{"a":"Peace Symbol","b":"262E","j":["peace","hippie"]},"menorah":{"a":"Menorah","b":"1F54E","j":["candelabrum","candlestick","religion","hanukkah","candles","jewish"]},"dotted-sixpointed-star":{"a":"Dotted Six-Pointed Star","b":"1F52F","j":["dotted six-pointed star","fortune","star","dotted_six_pointed_star","purple-square","religion","jewish","hexagram"]},"khanda":{"a":"⊛ Khanda","b":"1FAAF","j":["khanda","religion","Sikh"]},"aries":{"a":"Aries","b":"2648","j":["ram","zodiac","sign","purple-square","astrology"]},"taurus":{"a":"Taurus","b":"2649","j":["bull","ox","zodiac","purple-square","sign","astrology"]},"gemini":{"a":"Gemini","b":"264A","j":["twins","zodiac","sign","purple-square","astrology"]},"cancer":{"a":"Cancer","b":"264B","j":["crab","zodiac","sign","purple-square","astrology"]},"leo":{"a":"Leo","b":"264C","j":["lion","zodiac","sign","purple-square","astrology"]},"virgo":{"a":"Virgo","b":"264D","j":["zodiac","sign","purple-square","astrology"]},"libra":{"a":"Libra","b":"264E","j":["balance","justice","scales","zodiac","sign","purple-square","astrology"]},"scorpio":{"a":"Scorpio","b":"264F","j":["scorpion","scorpius","zodiac","sign","purple-square","astrology"]},"sagittarius":{"a":"Sagittarius","b":"2650","j":["archer","zodiac","sign","purple-square","astrology"]},"capricorn":{"a":"Capricorn","b":"2651","j":["goat","zodiac","sign","purple-square","astrology"]},"aquarius":{"a":"Aquarius","b":"2652","j":["bearer","water","zodiac","sign","purple-square","astrology"]},"pisces":{"a":"Pisces","b":"2653","j":["fish","zodiac","purple-square","sign","astrology"]},"ophiuchus":{"a":"Ophiuchus","b":"26CE","j":["bearer","serpent","snake","zodiac","sign","purple-square","constellation","astrology"]},"shuffle-tracks-button":{"a":"Shuffle Tracks Button","b":"1F500","j":["arrow","crossed","blue-square","shuffle","music","random"]},"repeat-button":{"a":"Repeat Button","b":"1F501","j":["arrow","clockwise","repeat","loop","record"]},"repeat-single-button":{"a":"Repeat Single Button","b":"1F502","j":["arrow","clockwise","once","blue-square","loop"]},"play-button":{"a":"Play Button","b":"25B6","j":["arrow","play","right","triangle","blue-square","direction"]},"fastforward-button":{"a":"Fast-Forward Button","b":"23E9","j":["arrow","double","fast","fast-forward button","forward","fast_forward_button","blue-square","play","speed","continue"]},"next-track-button":{"a":"Next Track Button","b":"23ED","j":["arrow","next scene","next track","triangle","forward","next","blue-square"]},"play-or-pause-button":{"a":"Play or Pause Button","b":"23EF","j":["arrow","pause","play","right","triangle","blue-square"]},"reverse-button":{"a":"Reverse Button","b":"25C0","j":["arrow","left","reverse","triangle","blue-square","direction"]},"fast-reverse-button":{"a":"Fast Reverse Button","b":"23EA","j":["arrow","double","rewind","play","blue-square"]},"last-track-button":{"a":"Last Track Button","b":"23EE","j":["arrow","previous scene","previous track","triangle","backward"]},"upwards-button":{"a":"Upwards Button","b":"1F53C","j":["arrow","button","blue-square","triangle","direction","point","forward","top"]},"fast-up-button":{"a":"Fast Up Button","b":"23EB","j":["arrow","double","blue-square","direction","top"]},"downwards-button":{"a":"Downwards Button","b":"1F53D","j":["arrow","button","down","blue-square","direction","bottom"]},"fast-down-button":{"a":"Fast Down Button","b":"23EC","j":["arrow","double","down","blue-square","direction","bottom"]},"pause-button":{"a":"Pause Button","b":"23F8","j":["bar","double","pause","vertical","blue-square"]},"stop-button":{"a":"Stop Button","b":"23F9","j":["square","stop","blue-square"]},"record-button":{"a":"Record Button","b":"23FA","j":["circle","record","blue-square"]},"eject-button":{"a":"Eject Button","b":"23CF","j":["eject","blue-square"]},"cinema":{"a":"Cinema","b":"1F3A6","j":["camera","film","movie","blue-square","record","curtain","stage","theater"]},"dim-button":{"a":"Dim Button","b":"1F505","j":["brightness","dim","low","sun","afternoon","warm","summer"]},"bright-button":{"a":"Bright Button","b":"1F506","j":["bright","brightness","sun","light"]},"antenna-bars":{"a":"Antenna Bars","b":"1F4F6","j":["antenna","bar","cell","mobile","phone","blue-square","reception","internet","connection","wifi","bluetooth","bars"]},"wireless":{"a":"⊛ Wireless","b":"1F6DC","j":["computer","internet","network","wireless"]},"vibration-mode":{"a":"Vibration Mode","b":"1F4F3","j":["cell","mobile","mode","phone","telephone","vibration","orange-square"]},"mobile-phone-off":{"a":"Mobile Phone off","b":"1F4F4","j":["cell","mobile","off","phone","telephone","mute","orange-square","silence","quiet"]},"female-sign":{"a":"Female Sign","b":"2640","j":["woman","women","lady","girl"]},"male-sign":{"a":"Male Sign","b":"2642","j":["man","boy","men"]},"transgender-symbol":{"a":"Transgender Symbol","b":"26A7","j":["transgender","lgbtq"]},"multiply":{"a":"Multiply","b":"2716","j":["×","cancel","multiplication","sign","x","multiplication_sign","math","calculation"]},"plus":{"a":"Plus","b":"2795","j":["+","math","sign","plus_sign","calculation","addition","more","increase"]},"minus":{"a":"Minus","b":"2796","j":["-","−","math","sign","minus_sign","calculation","subtract","less"]},"divide":{"a":"Divide","b":"2797","j":["÷","division","math","sign","division_sign","calculation"]},"heavy-equals-sign":{"a":"Heavy Equals Sign","b":"1F7F0","j":["equality","math"]},"infinity":{"a":"Infinity","b":"267E","j":["forever","unbounded","universal"]},"double-exclamation-mark":{"a":"Double Exclamation Mark","b":"203C","j":["!","!!","bangbang","exclamation","mark","surprise"]},"exclamation-question-mark":{"a":"Exclamation Question Mark","b":"2049","j":["!","!?","?","exclamation","interrobang","mark","punctuation","question","wat","surprise"]},"red-question-mark":{"a":"Red Question Mark","b":"2753","j":["?","mark","punctuation","question","question_mark","doubt","confused"]},"white-question-mark":{"a":"White Question Mark","b":"2754","j":["?","mark","outlined","punctuation","question","doubts","gray","huh","confused"]},"white-exclamation-mark":{"a":"White Exclamation Mark","b":"2755","j":["!","exclamation","mark","outlined","punctuation","surprise","gray","wow","warning"]},"red-exclamation-mark":{"a":"Red Exclamation Mark","b":"2757","j":["!","exclamation","mark","punctuation","exclamation_mark","heavy_exclamation_mark","danger","surprise","wow","warning"]},"wavy-dash":{"a":"Wavy Dash","b":"3030","j":["dash","punctuation","wavy","draw","line","moustache","mustache","squiggle","scribble"]},"currency-exchange":{"a":"Currency Exchange","b":"1F4B1","j":["bank","currency","exchange","money","sales","dollar","travel"]},"heavy-dollar-sign":{"a":"Heavy Dollar Sign","b":"1F4B2","j":["currency","dollar","money","sales","payment","buck"]},"medical-symbol":{"a":"Medical Symbol","b":"2695","j":["aesculapius","medicine","staff","health","hospital"]},"recycling-symbol":{"a":"Recycling Symbol","b":"267B","j":["recycle","arrow","environment","garbage","trash"]},"fleurdelis":{"a":"Fleur-De-Lis","b":"269C","j":["fleur-de-lis","fleur_de_lis","decorative","scout"]},"trident-emblem":{"a":"Trident Emblem","b":"1F531","j":["anchor","emblem","ship","tool","trident","weapon","spear"]},"name-badge":{"a":"Name Badge","b":"1F4DB","j":["badge","name","fire","forbid"]},"japanese-symbol-for-beginner":{"a":"Japanese Symbol for Beginner","b":"1F530","j":["beginner","chevron","Japanese","Japanese symbol for beginner","leaf","badge","shield"]},"hollow-red-circle":{"a":"Hollow Red Circle","b":"2B55","j":["circle","large","o","red","round"]},"check-mark-button":{"a":"Check Mark Button","b":"2705","j":["✓","button","check","mark","green-square","ok","agree","vote","election","answer","tick"]},"check-box-with-check":{"a":"Check Box with Check","b":"2611","j":["✓","box","check","ok","agree","confirm","black-square","vote","election","yes","tick"]},"check-mark":{"a":"Check Mark","b":"2714","j":["✓","check","mark","ok","nike","answer","yes","tick"]},"cross-mark":{"a":"Cross Mark","b":"274C","j":["×","cancel","cross","mark","multiplication","multiply","x","no","delete","remove","red"]},"cross-mark-button":{"a":"Cross Mark Button","b":"274E","j":["×","mark","square","x","green-square","no","deny"]},"curly-loop":{"a":"Curly Loop","b":"27B0","j":["curl","loop","scribble","draw","shape","squiggle"]},"double-curly-loop":{"a":"Double Curly Loop","b":"27BF","j":["curl","double","loop","tape","cassette"]},"part-alternation-mark":{"a":"Part Alternation Mark","b":"303D","j":["mark","part","graph","presentation","stats","business","economics","bad"]},"eightspoked-asterisk":{"a":"Eight-Spoked Asterisk","b":"2733","j":["*","asterisk","eight-spoked asterisk","eight_spoked_asterisk","star","sparkle","green-square"]},"eightpointed-star":{"a":"Eight-Pointed Star","b":"2734","j":["*","eight-pointed star","star","eight_pointed_star","orange-square","shape","polygon"]},"sparkle":{"a":"Sparkle","b":"2747","j":["*","stars","green-square","awesome","good","fireworks"]},"copyright":{"a":"Copyright","b":"00A9","j":["C","ip","license","circle","law","legal"]},"registered":{"a":"Registered","b":"00AE","j":["R","alphabet","circle"]},"trade-mark":{"a":"Trade Mark","b":"2122","j":["mark","TM","trademark","brand","law","legal"]},"keycap":{"a":"Keycap: *","b":"002A-FE0F-20E3","j":["keycap_","star"]},"keycap-0":{"a":"Keycap: 0","b":"0030-FE0F-20E3","j":["keycap","0","numbers","blue-square","null"]},"keycap-1":{"a":"Keycap: 1","b":"0031-FE0F-20E3","j":["keycap","blue-square","numbers","1"]},"keycap-2":{"a":"Keycap: 2","b":"0032-FE0F-20E3","j":["keycap","numbers","2","prime","blue-square"]},"keycap-3":{"a":"Keycap: 3","b":"0033-FE0F-20E3","j":["keycap","3","numbers","prime","blue-square"]},"keycap-4":{"a":"Keycap: 4","b":"0034-FE0F-20E3","j":["keycap","4","numbers","blue-square"]},"keycap-5":{"a":"Keycap: 5","b":"0035-FE0F-20E3","j":["keycap","5","numbers","blue-square","prime"]},"keycap-6":{"a":"Keycap: 6","b":"0036-FE0F-20E3","j":["keycap","6","numbers","blue-square"]},"keycap-7":{"a":"Keycap: 7","b":"0037-FE0F-20E3","j":["keycap","7","numbers","blue-square","prime"]},"keycap-8":{"a":"Keycap: 8","b":"0038-FE0F-20E3","j":["keycap","8","blue-square","numbers"]},"keycap-9":{"a":"Keycap: 9","b":"0039-FE0F-20E3","j":["keycap","blue-square","numbers","9"]},"keycap-10":{"a":"Keycap: 10","b":"1F51F","j":["keycap","numbers","10","blue-square"]},"input-latin-uppercase":{"a":"Input Latin Uppercase","b":"1F520","j":["ABCD","input","latin","letters","uppercase","alphabet","words","blue-square"]},"input-latin-lowercase":{"a":"Input Latin Lowercase","b":"1F521","j":["abcd","input","latin","letters","lowercase","blue-square","alphabet"]},"input-numbers":{"a":"Input Numbers","b":"1F522","j":["1234","input","numbers","blue-square"]},"input-symbols":{"a":"Input Symbols","b":"1F523","j":["〒♪&%","input","blue-square","music","note","ampersand","percent","glyphs","characters"]},"input-latin-letters":{"a":"Input Latin Letters","b":"1F524","j":["abc","alphabet","input","latin","letters","blue-square"]},"a-button-blood-type":{"a":"A Button (Blood Type)","b":"1F170","j":["A","A button (blood type)","blood type","a_button","red-square","alphabet","letter"]},"ab-button-blood-type":{"a":"Ab Button (Blood Type)","b":"1F18E","j":["AB","AB button (blood type)","blood type","ab_button","red-square","alphabet"]},"b-button-blood-type":{"a":"B Button (Blood Type)","b":"1F171","j":["B","B button (blood type)","blood type","b_button","red-square","alphabet","letter"]},"cl-button":{"a":"Cl Button","b":"1F191","j":["CL","CL button","alphabet","words","red-square"]},"cool-button":{"a":"Cool Button","b":"1F192","j":["COOL","COOL button","words","blue-square"]},"free-button":{"a":"Free Button","b":"1F193","j":["FREE","FREE button","blue-square","words"]},"information":{"a":"Information","b":"2139","j":["i","blue-square","alphabet","letter"]},"id-button":{"a":"Id Button","b":"1F194","j":["ID","ID button","identity","purple-square","words"]},"circled-m":{"a":"Circled M","b":"24C2","j":["circle","circled M","M","alphabet","blue-circle","letter"]},"new-button":{"a":"New Button","b":"1F195","j":["NEW","NEW button","blue-square","words","start"]},"ng-button":{"a":"Ng Button","b":"1F196","j":["NG","NG button","blue-square","words","shape","icon"]},"o-button-blood-type":{"a":"O Button (Blood Type)","b":"1F17E","j":["blood type","O","O button (blood type)","o_button","alphabet","red-square","letter"]},"ok-button":{"a":"Ok Button","b":"1F197","j":["OK","OK button","good","agree","yes","blue-square"]},"p-button":{"a":"P Button","b":"1F17F","j":["P","P button","parking","cars","blue-square","alphabet","letter"]},"sos-button":{"a":"Sos Button","b":"1F198","j":["help","SOS","SOS button","red-square","words","emergency","911"]},"up-button":{"a":"Up! Button","b":"1F199","j":["mark","UP","UP!","UP! button","blue-square","above","high"]},"vs-button":{"a":"Vs Button","b":"1F19A","j":["versus","VS","VS button","words","orange-square"]},"japanese-here-button":{"a":"Japanese “Here” Button","b":"1F201","j":["“here”","Japanese","Japanese “here” button","katakana","ココ","blue-square","here","japanese","destination"]},"japanese-service-charge-button":{"a":"Japanese “Service Charge” Button","b":"1F202","j":["“service charge”","Japanese","Japanese “service charge” button","katakana","サ","japanese","blue-square"]},"japanese-monthly-amount-button":{"a":"Japanese “Monthly Amount” Button","b":"1F237","j":["“monthly amount”","ideograph","Japanese","Japanese “monthly amount” button","月","chinese","month","moon","japanese","orange-square","kanji"]},"japanese-not-free-of-charge-button":{"a":"Japanese “Not Free of Charge” Button","b":"1F236","j":["“not free of charge”","ideograph","Japanese","Japanese “not free of charge” button","有","orange-square","chinese","have","kanji"]},"japanese-reserved-button":{"a":"Japanese “Reserved” Button","b":"1F22F","j":["“reserved”","ideograph","Japanese","Japanese “reserved” button","指","chinese","point","green-square","kanji"]},"japanese-bargain-button":{"a":"Japanese “Bargain” Button","b":"1F250","j":["“bargain”","ideograph","Japanese","Japanese “bargain” button","得","chinese","kanji","obtain","get","circle"]},"japanese-discount-button":{"a":"Japanese “Discount” Button","b":"1F239","j":["“discount”","ideograph","Japanese","Japanese “discount” button","割","cut","divide","chinese","kanji","pink-square"]},"japanese-free-of-charge-button":{"a":"Japanese “Free of Charge” Button","b":"1F21A","j":["“free of charge”","ideograph","Japanese","Japanese “free of charge” button","無","nothing","chinese","kanji","japanese","orange-square"]},"japanese-prohibited-button":{"a":"Japanese “Prohibited” Button","b":"1F232","j":["“prohibited”","ideograph","Japanese","Japanese “prohibited” button","禁","kanji","japanese","chinese","forbidden","limit","restricted","red-square"]},"japanese-acceptable-button":{"a":"Japanese “Acceptable” Button","b":"1F251","j":["“acceptable”","ideograph","Japanese","Japanese “acceptable” button","可","ok","good","chinese","kanji","agree","yes","orange-circle"]},"japanese-application-button":{"a":"Japanese “Application” Button","b":"1F238","j":["“application”","ideograph","Japanese","Japanese “application” button","申","chinese","japanese","kanji","orange-square"]},"japanese-passing-grade-button":{"a":"Japanese “Passing Grade” Button","b":"1F234","j":["“passing grade”","ideograph","Japanese","Japanese “passing grade” button","合","japanese","chinese","join","kanji","red-square"]},"japanese-vacancy-button":{"a":"Japanese “Vacancy” Button","b":"1F233","j":["“vacancy”","ideograph","Japanese","Japanese “vacancy” button","空","kanji","japanese","chinese","empty","sky","blue-square"]},"japanese-congratulations-button":{"a":"Japanese “Congratulations” Button","b":"3297","j":["“congratulations”","ideograph","Japanese","Japanese “congratulations” button","祝","chinese","kanji","japanese","red-circle"]},"japanese-secret-button":{"a":"Japanese “Secret” Button","b":"3299","j":["“secret”","ideograph","Japanese","Japanese “secret” button","秘","privacy","chinese","sshh","kanji","red-circle"]},"japanese-open-for-business-button":{"a":"Japanese “Open for Business” Button","b":"1F23A","j":["“open for business”","ideograph","Japanese","Japanese “open for business” button","営","japanese","opening hours","orange-square"]},"japanese-no-vacancy-button":{"a":"Japanese “No Vacancy” Button","b":"1F235","j":["“no vacancy”","ideograph","Japanese","Japanese “no vacancy” button","満","full","chinese","japanese","red-square","kanji"]},"red-circle":{"a":"Red Circle","b":"1F534","j":["circle","geometric","red","shape","error","danger"]},"orange-circle":{"a":"Orange Circle","b":"1F7E0","j":["circle","orange","round"]},"yellow-circle":{"a":"Yellow Circle","b":"1F7E1","j":["circle","yellow","round"]},"green-circle":{"a":"Green Circle","b":"1F7E2","j":["circle","green","round"]},"blue-circle":{"a":"Blue Circle","b":"1F535","j":["blue","circle","geometric","shape","icon","button"]},"purple-circle":{"a":"Purple Circle","b":"1F7E3","j":["circle","purple","round"]},"brown-circle":{"a":"Brown Circle","b":"1F7E4","j":["brown","circle","round"]},"black-circle":{"a":"Black Circle","b":"26AB","j":["circle","geometric","shape","button","round"]},"white-circle":{"a":"White Circle","b":"26AA","j":["circle","geometric","shape","round"]},"red-square":{"a":"Red Square","b":"1F7E5","j":["red","square"]},"orange-square":{"a":"Orange Square","b":"1F7E7","j":["orange","square"]},"yellow-square":{"a":"Yellow Square","b":"1F7E8","j":["square","yellow"]},"green-square":{"a":"Green Square","b":"1F7E9","j":["green","square"]},"blue-square":{"a":"Blue Square","b":"1F7E6","j":["blue","square"]},"purple-square":{"a":"Purple Square","b":"1F7EA","j":["purple","square"]},"brown-square":{"a":"Brown Square","b":"1F7EB","j":["brown","square"]},"black-large-square":{"a":"Black Large Square","b":"2B1B","j":["geometric","square","shape","icon","button"]},"white-large-square":{"a":"White Large Square","b":"2B1C","j":["geometric","square","shape","icon","stone","button"]},"black-medium-square":{"a":"Black Medium Square","b":"25FC","j":["geometric","square","shape","button","icon"]},"white-medium-square":{"a":"White Medium Square","b":"25FB","j":["geometric","square","shape","stone","icon"]},"black-mediumsmall-square":{"a":"Black Medium-Small Square","b":"25FE","j":["black medium-small square","geometric","square","black_medium_small_square","icon","shape","button"]},"white-mediumsmall-square":{"a":"White Medium-Small Square","b":"25FD","j":["geometric","square","white medium-small square","white_medium_small_square","shape","stone","icon","button"]},"black-small-square":{"a":"Black Small Square","b":"25AA","j":["geometric","square","shape","icon"]},"white-small-square":{"a":"White Small Square","b":"25AB","j":["geometric","square","shape","icon"]},"large-orange-diamond":{"a":"Large Orange Diamond","b":"1F536","j":["diamond","geometric","orange","shape","jewel","gem"]},"large-blue-diamond":{"a":"Large Blue Diamond","b":"1F537","j":["blue","diamond","geometric","shape","jewel","gem"]},"small-orange-diamond":{"a":"Small Orange Diamond","b":"1F538","j":["diamond","geometric","orange","shape","jewel","gem"]},"small-blue-diamond":{"a":"Small Blue Diamond","b":"1F539","j":["blue","diamond","geometric","shape","jewel","gem"]},"red-triangle-pointed-up":{"a":"Red Triangle Pointed Up","b":"1F53A","j":["geometric","red","shape","direction","up","top"]},"red-triangle-pointed-down":{"a":"Red Triangle Pointed Down","b":"1F53B","j":["down","geometric","red","shape","direction","bottom"]},"diamond-with-a-dot":{"a":"Diamond with a Dot","b":"1F4A0","j":["comic","diamond","geometric","inside","jewel","blue","gem","crystal","fancy"]},"radio-button":{"a":"Radio Button","b":"1F518","j":["button","geometric","radio","input","old","music","circle"]},"white-square-button":{"a":"White Square Button","b":"1F533","j":["button","geometric","outlined","square","shape","input"]},"black-square-button":{"a":"Black Square Button","b":"1F532","j":["button","geometric","square","shape","input","frame"]},"chequered-flag":{"a":"Chequered Flag","b":"1F3C1","j":["checkered","chequered","racing","contest","finishline","race","gokart"]},"triangular-flag":{"a":"Triangular Flag","b":"1F6A9","j":["post","mark","milestone","place"]},"crossed-flags":{"a":"Crossed Flags","b":"1F38C","j":["celebration","cross","crossed","Japanese","japanese","nation","country","border"]},"black-flag":{"a":"Black Flag","b":"1F3F4","j":["waving","pirate"]},"white-flag":{"a":"White Flag","b":"1F3F3","j":["waving","losing","loser","lost","surrender","give up","fail"]},"rainbow-flag":{"a":"Rainbow Flag","b":"1F3F3-FE0F-200D-1F308","j":["pride","rainbow","flag","gay","lgbt","glbt","queer","homosexual","lesbian","bisexual","transgender"]},"transgender-flag":{"a":"Transgender Flag","b":"1F3F3-FE0F-200D-26A7-FE0F","j":["flag","light blue","pink","transgender","white","lgbtq"]},"pirate-flag":{"a":"Pirate Flag","b":"1F3F4-200D-2620-FE0F","j":["Jolly Roger","pirate","plunder","treasure","skull","crossbones","flag","banner"]},"flag-ascension-island":{"a":"Flag: Ascension Island","b":"1F1E6-1F1E8","j":["flag"]},"flag-andorra":{"a":"Flag: Andorra","b":"1F1E6-1F1E9","j":["flag","ad","nation","country","banner","andorra"]},"flag-united-arab-emirates":{"a":"Flag: United Arab Emirates","b":"1F1E6-1F1EA","j":["flag","united","arab","emirates","nation","country","banner","united_arab_emirates"]},"flag-afghanistan":{"a":"Flag: Afghanistan","b":"1F1E6-1F1EB","j":["flag","af","nation","country","banner","afghanistan"]},"flag-antigua--barbuda":{"a":"Flag: Antigua & Barbuda","b":"1F1E6-1F1EC","j":["flag","flag_antigua_barbuda","antigua","barbuda","nation","country","banner","antigua_barbuda"]},"flag-anguilla":{"a":"Flag: Anguilla","b":"1F1E6-1F1EE","j":["flag","ai","nation","country","banner","anguilla"]},"flag-albania":{"a":"Flag: Albania","b":"1F1E6-1F1F1","j":["flag","al","nation","country","banner","albania"]},"flag-armenia":{"a":"Flag: Armenia","b":"1F1E6-1F1F2","j":["flag","am","nation","country","banner","armenia"]},"flag-angola":{"a":"Flag: Angola","b":"1F1E6-1F1F4","j":["flag","ao","nation","country","banner","angola"]},"flag-antarctica":{"a":"Flag: Antarctica","b":"1F1E6-1F1F6","j":["flag","aq","nation","country","banner","antarctica"]},"flag-argentina":{"a":"Flag: Argentina","b":"1F1E6-1F1F7","j":["flag","ar","nation","country","banner","argentina"]},"flag-american-samoa":{"a":"Flag: American Samoa","b":"1F1E6-1F1F8","j":["flag","american","ws","nation","country","banner","american_samoa"]},"flag-austria":{"a":"Flag: Austria","b":"1F1E6-1F1F9","j":["flag","at","nation","country","banner","austria"]},"flag-australia":{"a":"Flag: Australia","b":"1F1E6-1F1FA","j":["flag","au","nation","country","banner","australia"]},"flag-aruba":{"a":"Flag: Aruba","b":"1F1E6-1F1FC","j":["flag","aw","nation","country","banner","aruba"]},"flag-land-islands":{"a":"Flag: Åland Islands","b":"1F1E6-1F1FD","j":["flag","flag_aland_islands","Åland","islands","nation","country","banner","aland_islands"]},"flag-azerbaijan":{"a":"Flag: Azerbaijan","b":"1F1E6-1F1FF","j":["flag","az","nation","country","banner","azerbaijan"]},"flag-bosnia--herzegovina":{"a":"Flag: Bosnia & Herzegovina","b":"1F1E7-1F1E6","j":["flag","flag_bosnia_herzegovina","bosnia","herzegovina","nation","country","banner","bosnia_herzegovina"]},"flag-barbados":{"a":"Flag: Barbados","b":"1F1E7-1F1E7","j":["flag","bb","nation","country","banner","barbados"]},"flag-bangladesh":{"a":"Flag: Bangladesh","b":"1F1E7-1F1E9","j":["flag","bd","nation","country","banner","bangladesh"]},"flag-belgium":{"a":"Flag: Belgium","b":"1F1E7-1F1EA","j":["flag","be","nation","country","banner","belgium"]},"flag-burkina-faso":{"a":"Flag: Burkina Faso","b":"1F1E7-1F1EB","j":["flag","burkina","faso","nation","country","banner","burkina_faso"]},"flag-bulgaria":{"a":"Flag: Bulgaria","b":"1F1E7-1F1EC","j":["flag","bg","nation","country","banner","bulgaria"]},"flag-bahrain":{"a":"Flag: Bahrain","b":"1F1E7-1F1ED","j":["flag","bh","nation","country","banner","bahrain"]},"flag-burundi":{"a":"Flag: Burundi","b":"1F1E7-1F1EE","j":["flag","bi","nation","country","banner","burundi"]},"flag-benin":{"a":"Flag: Benin","b":"1F1E7-1F1EF","j":["flag","bj","nation","country","banner","benin"]},"flag-st-barthlemy":{"a":"Flag: St. Barthélemy","b":"1F1E7-1F1F1","j":["flag","flag_st_barthelemy","saint","barthélemy","nation","country","banner","st_barthelemy"]},"flag-bermuda":{"a":"Flag: Bermuda","b":"1F1E7-1F1F2","j":["flag","bm","nation","country","banner","bermuda"]},"flag-brunei":{"a":"Flag: Brunei","b":"1F1E7-1F1F3","j":["flag","bn","darussalam","nation","country","banner","brunei"]},"flag-bolivia":{"a":"Flag: Bolivia","b":"1F1E7-1F1F4","j":["flag","bo","nation","country","banner","bolivia"]},"flag-caribbean-netherlands":{"a":"Flag: Caribbean Netherlands","b":"1F1E7-1F1F6","j":["flag","bonaire","nation","country","banner","caribbean_netherlands"]},"flag-brazil":{"a":"Flag: Brazil","b":"1F1E7-1F1F7","j":["flag","br","nation","country","banner","brazil"]},"flag-bahamas":{"a":"Flag: Bahamas","b":"1F1E7-1F1F8","j":["flag","bs","nation","country","banner","bahamas"]},"flag-bhutan":{"a":"Flag: Bhutan","b":"1F1E7-1F1F9","j":["flag","bt","nation","country","banner","bhutan"]},"flag-bouvet-island":{"a":"Flag: Bouvet Island","b":"1F1E7-1F1FB","j":["flag","norway"]},"flag-botswana":{"a":"Flag: Botswana","b":"1F1E7-1F1FC","j":["flag","bw","nation","country","banner","botswana"]},"flag-belarus":{"a":"Flag: Belarus","b":"1F1E7-1F1FE","j":["flag","by","nation","country","banner","belarus"]},"flag-belize":{"a":"Flag: Belize","b":"1F1E7-1F1FF","j":["flag","bz","nation","country","banner","belize"]},"flag-canada":{"a":"Flag: Canada","b":"1F1E8-1F1E6","j":["flag","ca","nation","country","banner","canada"]},"flag-cocos-keeling-islands":{"a":"Flag: Cocos (Keeling) Islands","b":"1F1E8-1F1E8","j":["flag","flag_cocos_islands","cocos","keeling","islands","nation","country","banner","cocos_islands"]},"flag-congo--kinshasa":{"a":"Flag: Congo - Kinshasa","b":"1F1E8-1F1E9","j":["flag","flag_congo_kinshasa","congo","democratic","republic","nation","country","banner","congo_kinshasa"]},"flag-central-african-republic":{"a":"Flag: Central African Republic","b":"1F1E8-1F1EB","j":["flag","central","african","republic","nation","country","banner","central_african_republic"]},"flag-congo--brazzaville":{"a":"Flag: Congo - Brazzaville","b":"1F1E8-1F1EC","j":["flag","flag_congo_brazzaville","congo","nation","country","banner","congo_brazzaville"]},"flag-switzerland":{"a":"Flag: Switzerland","b":"1F1E8-1F1ED","j":["flag","ch","nation","country","banner","switzerland"]},"flag-cte-divoire":{"a":"Flag: Côte D’Ivoire","b":"1F1E8-1F1EE","j":["flag","flag_cote_d_ivoire","ivory","coast","nation","country","banner","cote_d_ivoire"]},"flag-cook-islands":{"a":"Flag: Cook Islands","b":"1F1E8-1F1F0","j":["flag","cook","islands","nation","country","banner","cook_islands"]},"flag-chile":{"a":"Flag: Chile","b":"1F1E8-1F1F1","j":["flag","nation","country","banner","chile"]},"flag-cameroon":{"a":"Flag: Cameroon","b":"1F1E8-1F1F2","j":["flag","cm","nation","country","banner","cameroon"]},"flag-china":{"a":"Flag: China","b":"1F1E8-1F1F3","j":["flag","china","chinese","prc","country","nation","banner"]},"flag-colombia":{"a":"Flag: Colombia","b":"1F1E8-1F1F4","j":["flag","co","nation","country","banner","colombia"]},"flag-clipperton-island":{"a":"Flag: Clipperton Island","b":"1F1E8-1F1F5","j":["flag"]},"flag-costa-rica":{"a":"Flag: Costa Rica","b":"1F1E8-1F1F7","j":["flag","costa","rica","nation","country","banner","costa_rica"]},"flag-cuba":{"a":"Flag: Cuba","b":"1F1E8-1F1FA","j":["flag","cu","nation","country","banner","cuba"]},"flag-cape-verde":{"a":"Flag: Cape Verde","b":"1F1E8-1F1FB","j":["flag","cabo","verde","nation","country","banner","cape_verde"]},"flag-curaao":{"a":"Flag: Curaçao","b":"1F1E8-1F1FC","j":["flag","flag_curacao","curaçao","nation","country","banner","curacao"]},"flag-christmas-island":{"a":"Flag: Christmas Island","b":"1F1E8-1F1FD","j":["flag","christmas","island","nation","country","banner","christmas_island"]},"flag-cyprus":{"a":"Flag: Cyprus","b":"1F1E8-1F1FE","j":["flag","cy","nation","country","banner","cyprus"]},"flag-czechia":{"a":"Flag: Czechia","b":"1F1E8-1F1FF","j":["flag","cz","nation","country","banner","czechia"]},"flag-germany":{"a":"Flag: Germany","b":"1F1E9-1F1EA","j":["flag","german","nation","country","banner","germany"]},"flag-diego-garcia":{"a":"Flag: Diego Garcia","b":"1F1E9-1F1EC","j":["flag"]},"flag-djibouti":{"a":"Flag: Djibouti","b":"1F1E9-1F1EF","j":["flag","dj","nation","country","banner","djibouti"]},"flag-denmark":{"a":"Flag: Denmark","b":"1F1E9-1F1F0","j":["flag","dk","nation","country","banner","denmark"]},"flag-dominica":{"a":"Flag: Dominica","b":"1F1E9-1F1F2","j":["flag","dm","nation","country","banner","dominica"]},"flag-dominican-republic":{"a":"Flag: Dominican Republic","b":"1F1E9-1F1F4","j":["flag","dominican","republic","nation","country","banner","dominican_republic"]},"flag-algeria":{"a":"Flag: Algeria","b":"1F1E9-1F1FF","j":["flag","dz","nation","country","banner","algeria"]},"flag-ceuta--melilla":{"a":"Flag: Ceuta & Melilla","b":"1F1EA-1F1E6","j":["flag","flag_ceuta_melilla"]},"flag-ecuador":{"a":"Flag: Ecuador","b":"1F1EA-1F1E8","j":["flag","ec","nation","country","banner","ecuador"]},"flag-estonia":{"a":"Flag: Estonia","b":"1F1EA-1F1EA","j":["flag","ee","nation","country","banner","estonia"]},"flag-egypt":{"a":"Flag: Egypt","b":"1F1EA-1F1EC","j":["flag","eg","nation","country","banner","egypt"]},"flag-western-sahara":{"a":"Flag: Western Sahara","b":"1F1EA-1F1ED","j":["flag","western","sahara","nation","country","banner","western_sahara"]},"flag-eritrea":{"a":"Flag: Eritrea","b":"1F1EA-1F1F7","j":["flag","er","nation","country","banner","eritrea"]},"flag-spain":{"a":"Flag: Spain","b":"1F1EA-1F1F8","j":["flag","spain","nation","country","banner"]},"flag-ethiopia":{"a":"Flag: Ethiopia","b":"1F1EA-1F1F9","j":["flag","et","nation","country","banner","ethiopia"]},"flag-european-union":{"a":"Flag: European Union","b":"1F1EA-1F1FA","j":["flag","european","union","banner"]},"flag-finland":{"a":"Flag: Finland","b":"1F1EB-1F1EE","j":["flag","fi","nation","country","banner","finland"]},"flag-fiji":{"a":"Flag: Fiji","b":"1F1EB-1F1EF","j":["flag","fj","nation","country","banner","fiji"]},"flag-falkland-islands":{"a":"Flag: Falkland Islands","b":"1F1EB-1F1F0","j":["flag","falkland","islands","malvinas","nation","country","banner","falkland_islands"]},"flag-micronesia":{"a":"Flag: Micronesia","b":"1F1EB-1F1F2","j":["flag","micronesia","federated","states","nation","country","banner"]},"flag-faroe-islands":{"a":"Flag: Faroe Islands","b":"1F1EB-1F1F4","j":["flag","faroe","islands","nation","country","banner","faroe_islands"]},"flag-france":{"a":"Flag: France","b":"1F1EB-1F1F7","j":["flag","banner","nation","france","french","country"]},"flag-gabon":{"a":"Flag: Gabon","b":"1F1EC-1F1E6","j":["flag","ga","nation","country","banner","gabon"]},"flag-united-kingdom":{"a":"Flag: United Kingdom","b":"1F1EC-1F1E7","j":["flag","united","kingdom","great","britain","northern","ireland","nation","country","banner","british","UK","english","england","union jack","united_kingdom"]},"flag-grenada":{"a":"Flag: Grenada","b":"1F1EC-1F1E9","j":["flag","gd","nation","country","banner","grenada"]},"flag-georgia":{"a":"Flag: Georgia","b":"1F1EC-1F1EA","j":["flag","ge","nation","country","banner","georgia"]},"flag-french-guiana":{"a":"Flag: French Guiana","b":"1F1EC-1F1EB","j":["flag","french","guiana","nation","country","banner","french_guiana"]},"flag-guernsey":{"a":"Flag: Guernsey","b":"1F1EC-1F1EC","j":["flag","gg","nation","country","banner","guernsey"]},"flag-ghana":{"a":"Flag: Ghana","b":"1F1EC-1F1ED","j":["flag","gh","nation","country","banner","ghana"]},"flag-gibraltar":{"a":"Flag: Gibraltar","b":"1F1EC-1F1EE","j":["flag","gi","nation","country","banner","gibraltar"]},"flag-greenland":{"a":"Flag: Greenland","b":"1F1EC-1F1F1","j":["flag","gl","nation","country","banner","greenland"]},"flag-gambia":{"a":"Flag: Gambia","b":"1F1EC-1F1F2","j":["flag","gm","nation","country","banner","gambia"]},"flag-guinea":{"a":"Flag: Guinea","b":"1F1EC-1F1F3","j":["flag","gn","nation","country","banner","guinea"]},"flag-guadeloupe":{"a":"Flag: Guadeloupe","b":"1F1EC-1F1F5","j":["flag","gp","nation","country","banner","guadeloupe"]},"flag-equatorial-guinea":{"a":"Flag: Equatorial Guinea","b":"1F1EC-1F1F6","j":["flag","equatorial","gn","nation","country","banner","equatorial_guinea"]},"flag-greece":{"a":"Flag: Greece","b":"1F1EC-1F1F7","j":["flag","gr","nation","country","banner","greece"]},"flag-south-georgia--south-sandwich-islands":{"a":"Flag: South Georgia & South Sandwich Islands","b":"1F1EC-1F1F8","j":["flag","flag_south_georgia_south_sandwich_islands","south","georgia","sandwich","islands","nation","country","banner","south_georgia_south_sandwich_islands"]},"flag-guatemala":{"a":"Flag: Guatemala","b":"1F1EC-1F1F9","j":["flag","gt","nation","country","banner","guatemala"]},"flag-guam":{"a":"Flag: Guam","b":"1F1EC-1F1FA","j":["flag","gu","nation","country","banner","guam"]},"flag-guineabissau":{"a":"Flag: Guinea-Bissau","b":"1F1EC-1F1FC","j":["flag","flag_guinea_bissau","gw","bissau","nation","country","banner","guinea_bissau"]},"flag-guyana":{"a":"Flag: Guyana","b":"1F1EC-1F1FE","j":["flag","gy","nation","country","banner","guyana"]},"flag-hong-kong-sar-china":{"a":"Flag: Hong Kong Sar China","b":"1F1ED-1F1F0","j":["flag","hong","kong","nation","country","banner","hong_kong_sar_china"]},"flag-heard--mcdonald-islands":{"a":"Flag: Heard & Mcdonald Islands","b":"1F1ED-1F1F2","j":["flag","flag_heard_mcdonald_islands"]},"flag-honduras":{"a":"Flag: Honduras","b":"1F1ED-1F1F3","j":["flag","hn","nation","country","banner","honduras"]},"flag-croatia":{"a":"Flag: Croatia","b":"1F1ED-1F1F7","j":["flag","hr","nation","country","banner","croatia"]},"flag-haiti":{"a":"Flag: Haiti","b":"1F1ED-1F1F9","j":["flag","ht","nation","country","banner","haiti"]},"flag-hungary":{"a":"Flag: Hungary","b":"1F1ED-1F1FA","j":["flag","hu","nation","country","banner","hungary"]},"flag-canary-islands":{"a":"Flag: Canary Islands","b":"1F1EE-1F1E8","j":["flag","canary","islands","nation","country","banner","canary_islands"]},"flag-indonesia":{"a":"Flag: Indonesia","b":"1F1EE-1F1E9","j":["flag","nation","country","banner","indonesia"]},"flag-ireland":{"a":"Flag: Ireland","b":"1F1EE-1F1EA","j":["flag","ie","nation","country","banner","ireland"]},"flag-israel":{"a":"Flag: Israel","b":"1F1EE-1F1F1","j":["flag","il","nation","country","banner","israel"]},"flag-isle-of-man":{"a":"Flag: Isle of Man","b":"1F1EE-1F1F2","j":["flag","isle","man","nation","country","banner","isle_of_man"]},"flag-india":{"a":"Flag: India","b":"1F1EE-1F1F3","j":["flag","in","nation","country","banner","india"]},"flag-british-indian-ocean-territory":{"a":"Flag: British Indian Ocean Territory","b":"1F1EE-1F1F4","j":["flag","british","indian","ocean","territory","nation","country","banner","british_indian_ocean_territory"]},"flag-iraq":{"a":"Flag: Iraq","b":"1F1EE-1F1F6","j":["flag","iq","nation","country","banner","iraq"]},"flag-iran":{"a":"Flag: Iran","b":"1F1EE-1F1F7","j":["flag","iran","islamic","republic","nation","country","banner"]},"flag-iceland":{"a":"Flag: Iceland","b":"1F1EE-1F1F8","j":["flag","is","nation","country","banner","iceland"]},"flag-italy":{"a":"Flag: Italy","b":"1F1EE-1F1F9","j":["flag","italy","nation","country","banner"]},"flag-jersey":{"a":"Flag: Jersey","b":"1F1EF-1F1EA","j":["flag","je","nation","country","banner","jersey"]},"flag-jamaica":{"a":"Flag: Jamaica","b":"1F1EF-1F1F2","j":["flag","jm","nation","country","banner","jamaica"]},"flag-jordan":{"a":"Flag: Jordan","b":"1F1EF-1F1F4","j":["flag","jo","nation","country","banner","jordan"]},"flag-japan":{"a":"Flag: Japan","b":"1F1EF-1F1F5","j":["flag","japanese","nation","country","banner","japan","jp","ja"]},"flag-kenya":{"a":"Flag: Kenya","b":"1F1F0-1F1EA","j":["flag","ke","nation","country","banner","kenya"]},"flag-kyrgyzstan":{"a":"Flag: Kyrgyzstan","b":"1F1F0-1F1EC","j":["flag","kg","nation","country","banner","kyrgyzstan"]},"flag-cambodia":{"a":"Flag: Cambodia","b":"1F1F0-1F1ED","j":["flag","kh","nation","country","banner","cambodia"]},"flag-kiribati":{"a":"Flag: Kiribati","b":"1F1F0-1F1EE","j":["flag","ki","nation","country","banner","kiribati"]},"flag-comoros":{"a":"Flag: Comoros","b":"1F1F0-1F1F2","j":["flag","km","nation","country","banner","comoros"]},"flag-st-kitts--nevis":{"a":"Flag: St. Kitts & Nevis","b":"1F1F0-1F1F3","j":["flag","flag_st_kitts_nevis","saint","kitts","nevis","nation","country","banner","st_kitts_nevis"]},"flag-north-korea":{"a":"Flag: North Korea","b":"1F1F0-1F1F5","j":["flag","north","korea","nation","country","banner","north_korea"]},"flag-south-korea":{"a":"Flag: South Korea","b":"1F1F0-1F1F7","j":["flag","south","korea","nation","country","banner","south_korea"]},"flag-kuwait":{"a":"Flag: Kuwait","b":"1F1F0-1F1FC","j":["flag","kw","nation","country","banner","kuwait"]},"flag-cayman-islands":{"a":"Flag: Cayman Islands","b":"1F1F0-1F1FE","j":["flag","cayman","islands","nation","country","banner","cayman_islands"]},"flag-kazakhstan":{"a":"Flag: Kazakhstan","b":"1F1F0-1F1FF","j":["flag","kz","nation","country","banner","kazakhstan"]},"flag-laos":{"a":"Flag: Laos","b":"1F1F1-1F1E6","j":["flag","lao","democratic","republic","nation","country","banner","laos"]},"flag-lebanon":{"a":"Flag: Lebanon","b":"1F1F1-1F1E7","j":["flag","lb","nation","country","banner","lebanon"]},"flag-st-lucia":{"a":"Flag: St. Lucia","b":"1F1F1-1F1E8","j":["flag","saint","lucia","nation","country","banner","st_lucia"]},"flag-liechtenstein":{"a":"Flag: Liechtenstein","b":"1F1F1-1F1EE","j":["flag","li","nation","country","banner","liechtenstein"]},"flag-sri-lanka":{"a":"Flag: Sri Lanka","b":"1F1F1-1F1F0","j":["flag","sri","lanka","nation","country","banner","sri_lanka"]},"flag-liberia":{"a":"Flag: Liberia","b":"1F1F1-1F1F7","j":["flag","lr","nation","country","banner","liberia"]},"flag-lesotho":{"a":"Flag: Lesotho","b":"1F1F1-1F1F8","j":["flag","ls","nation","country","banner","lesotho"]},"flag-lithuania":{"a":"Flag: Lithuania","b":"1F1F1-1F1F9","j":["flag","lt","nation","country","banner","lithuania"]},"flag-luxembourg":{"a":"Flag: Luxembourg","b":"1F1F1-1F1FA","j":["flag","lu","nation","country","banner","luxembourg"]},"flag-latvia":{"a":"Flag: Latvia","b":"1F1F1-1F1FB","j":["flag","lv","nation","country","banner","latvia"]},"flag-libya":{"a":"Flag: Libya","b":"1F1F1-1F1FE","j":["flag","ly","nation","country","banner","libya"]},"flag-morocco":{"a":"Flag: Morocco","b":"1F1F2-1F1E6","j":["flag","ma","nation","country","banner","morocco"]},"flag-monaco":{"a":"Flag: Monaco","b":"1F1F2-1F1E8","j":["flag","mc","nation","country","banner","monaco"]},"flag-moldova":{"a":"Flag: Moldova","b":"1F1F2-1F1E9","j":["flag","moldova","republic","nation","country","banner"]},"flag-montenegro":{"a":"Flag: Montenegro","b":"1F1F2-1F1EA","j":["flag","me","nation","country","banner","montenegro"]},"flag-st-martin":{"a":"Flag: St. Martin","b":"1F1F2-1F1EB","j":["flag"]},"flag-madagascar":{"a":"Flag: Madagascar","b":"1F1F2-1F1EC","j":["flag","mg","nation","country","banner","madagascar"]},"flag-marshall-islands":{"a":"Flag: Marshall Islands","b":"1F1F2-1F1ED","j":["flag","marshall","islands","nation","country","banner","marshall_islands"]},"flag-north-macedonia":{"a":"Flag: North Macedonia","b":"1F1F2-1F1F0","j":["flag","macedonia","nation","country","banner","north_macedonia"]},"flag-mali":{"a":"Flag: Mali","b":"1F1F2-1F1F1","j":["flag","ml","nation","country","banner","mali"]},"flag-myanmar-burma":{"a":"Flag: Myanmar (Burma)","b":"1F1F2-1F1F2","j":["flag","flag_myanmar","mm","nation","country","banner","myanmar"]},"flag-mongolia":{"a":"Flag: Mongolia","b":"1F1F2-1F1F3","j":["flag","mn","nation","country","banner","mongolia"]},"flag-macao-sar-china":{"a":"Flag: Macao Sar China","b":"1F1F2-1F1F4","j":["flag","macao","nation","country","banner","macao_sar_china"]},"flag-northern-mariana-islands":{"a":"Flag: Northern Mariana Islands","b":"1F1F2-1F1F5","j":["flag","northern","mariana","islands","nation","country","banner","northern_mariana_islands"]},"flag-martinique":{"a":"Flag: Martinique","b":"1F1F2-1F1F6","j":["flag","mq","nation","country","banner","martinique"]},"flag-mauritania":{"a":"Flag: Mauritania","b":"1F1F2-1F1F7","j":["flag","mr","nation","country","banner","mauritania"]},"flag-montserrat":{"a":"Flag: Montserrat","b":"1F1F2-1F1F8","j":["flag","ms","nation","country","banner","montserrat"]},"flag-malta":{"a":"Flag: Malta","b":"1F1F2-1F1F9","j":["flag","mt","nation","country","banner","malta"]},"flag-mauritius":{"a":"Flag: Mauritius","b":"1F1F2-1F1FA","j":["flag","mu","nation","country","banner","mauritius"]},"flag-maldives":{"a":"Flag: Maldives","b":"1F1F2-1F1FB","j":["flag","mv","nation","country","banner","maldives"]},"flag-malawi":{"a":"Flag: Malawi","b":"1F1F2-1F1FC","j":["flag","mw","nation","country","banner","malawi"]},"flag-mexico":{"a":"Flag: Mexico","b":"1F1F2-1F1FD","j":["flag","mx","nation","country","banner","mexico"]},"flag-malaysia":{"a":"Flag: Malaysia","b":"1F1F2-1F1FE","j":["flag","my","nation","country","banner","malaysia"]},"flag-mozambique":{"a":"Flag: Mozambique","b":"1F1F2-1F1FF","j":["flag","mz","nation","country","banner","mozambique"]},"flag-namibia":{"a":"Flag: Namibia","b":"1F1F3-1F1E6","j":["flag","na","nation","country","banner","namibia"]},"flag-new-caledonia":{"a":"Flag: New Caledonia","b":"1F1F3-1F1E8","j":["flag","new","caledonia","nation","country","banner","new_caledonia"]},"flag-niger":{"a":"Flag: Niger","b":"1F1F3-1F1EA","j":["flag","ne","nation","country","banner","niger"]},"flag-norfolk-island":{"a":"Flag: Norfolk Island","b":"1F1F3-1F1EB","j":["flag","norfolk","island","nation","country","banner","norfolk_island"]},"flag-nigeria":{"a":"Flag: Nigeria","b":"1F1F3-1F1EC","j":["flag","nation","country","banner","nigeria"]},"flag-nicaragua":{"a":"Flag: Nicaragua","b":"1F1F3-1F1EE","j":["flag","ni","nation","country","banner","nicaragua"]},"flag-netherlands":{"a":"Flag: Netherlands","b":"1F1F3-1F1F1","j":["flag","nl","nation","country","banner","netherlands"]},"flag-norway":{"a":"Flag: Norway","b":"1F1F3-1F1F4","j":["flag","no","nation","country","banner","norway"]},"flag-nepal":{"a":"Flag: Nepal","b":"1F1F3-1F1F5","j":["flag","np","nation","country","banner","nepal"]},"flag-nauru":{"a":"Flag: Nauru","b":"1F1F3-1F1F7","j":["flag","nr","nation","country","banner","nauru"]},"flag-niue":{"a":"Flag: Niue","b":"1F1F3-1F1FA","j":["flag","nu","nation","country","banner","niue"]},"flag-new-zealand":{"a":"Flag: New Zealand","b":"1F1F3-1F1FF","j":["flag","new","zealand","nation","country","banner","new_zealand"]},"flag-oman":{"a":"Flag: Oman","b":"1F1F4-1F1F2","j":["flag","om_symbol","nation","country","banner","oman"]},"flag-panama":{"a":"Flag: Panama","b":"1F1F5-1F1E6","j":["flag","pa","nation","country","banner","panama"]},"flag-peru":{"a":"Flag: Peru","b":"1F1F5-1F1EA","j":["flag","pe","nation","country","banner","peru"]},"flag-french-polynesia":{"a":"Flag: French Polynesia","b":"1F1F5-1F1EB","j":["flag","french","polynesia","nation","country","banner","french_polynesia"]},"flag-papua-new-guinea":{"a":"Flag: Papua New Guinea","b":"1F1F5-1F1EC","j":["flag","papua","new","guinea","nation","country","banner","papua_new_guinea"]},"flag-philippines":{"a":"Flag: Philippines","b":"1F1F5-1F1ED","j":["flag","ph","nation","country","banner","philippines"]},"flag-pakistan":{"a":"Flag: Pakistan","b":"1F1F5-1F1F0","j":["flag","pk","nation","country","banner","pakistan"]},"flag-poland":{"a":"Flag: Poland","b":"1F1F5-1F1F1","j":["flag","pl","nation","country","banner","poland"]},"flag-st-pierre--miquelon":{"a":"Flag: St. Pierre & Miquelon","b":"1F1F5-1F1F2","j":["flag","flag_st_pierre_miquelon","saint","pierre","miquelon","nation","country","banner","st_pierre_miquelon"]},"flag-pitcairn-islands":{"a":"Flag: Pitcairn Islands","b":"1F1F5-1F1F3","j":["flag","pitcairn","nation","country","banner","pitcairn_islands"]},"flag-puerto-rico":{"a":"Flag: Puerto Rico","b":"1F1F5-1F1F7","j":["flag","puerto","rico","nation","country","banner","puerto_rico"]},"flag-palestinian-territories":{"a":"Flag: Palestinian Territories","b":"1F1F5-1F1F8","j":["flag","palestine","palestinian","territories","nation","country","banner","palestinian_territories"]},"flag-portugal":{"a":"Flag: Portugal","b":"1F1F5-1F1F9","j":["flag","pt","nation","country","banner","portugal"]},"flag-palau":{"a":"Flag: Palau","b":"1F1F5-1F1FC","j":["flag","pw","nation","country","banner","palau"]},"flag-paraguay":{"a":"Flag: Paraguay","b":"1F1F5-1F1FE","j":["flag","py","nation","country","banner","paraguay"]},"flag-qatar":{"a":"Flag: Qatar","b":"1F1F6-1F1E6","j":["flag","qa","nation","country","banner","qatar"]},"flag-runion":{"a":"Flag: Réunion","b":"1F1F7-1F1EA","j":["flag","flag_reunion","réunion","nation","country","banner","reunion"]},"flag-romania":{"a":"Flag: Romania","b":"1F1F7-1F1F4","j":["flag","ro","nation","country","banner","romania"]},"flag-serbia":{"a":"Flag: Serbia","b":"1F1F7-1F1F8","j":["flag","rs","nation","country","banner","serbia"]},"flag-russia":{"a":"Flag: Russia","b":"1F1F7-1F1FA","j":["flag","russian","federation","nation","country","banner","russia"]},"flag-rwanda":{"a":"Flag: Rwanda","b":"1F1F7-1F1FC","j":["flag","rw","nation","country","banner","rwanda"]},"flag-saudi-arabia":{"a":"Flag: Saudi Arabia","b":"1F1F8-1F1E6","j":["flag","nation","country","banner","saudi_arabia"]},"flag-solomon-islands":{"a":"Flag: Solomon Islands","b":"1F1F8-1F1E7","j":["flag","solomon","islands","nation","country","banner","solomon_islands"]},"flag-seychelles":{"a":"Flag: Seychelles","b":"1F1F8-1F1E8","j":["flag","sc","nation","country","banner","seychelles"]},"flag-sudan":{"a":"Flag: Sudan","b":"1F1F8-1F1E9","j":["flag","sd","nation","country","banner","sudan"]},"flag-sweden":{"a":"Flag: Sweden","b":"1F1F8-1F1EA","j":["flag","se","nation","country","banner","sweden"]},"flag-singapore":{"a":"Flag: Singapore","b":"1F1F8-1F1EC","j":["flag","sg","nation","country","banner","singapore"]},"flag-st-helena":{"a":"Flag: St. Helena","b":"1F1F8-1F1ED","j":["flag","saint","helena","ascension","tristan","cunha","nation","country","banner","st_helena"]},"flag-slovenia":{"a":"Flag: Slovenia","b":"1F1F8-1F1EE","j":["flag","si","nation","country","banner","slovenia"]},"flag-svalbard--jan-mayen":{"a":"Flag: Svalbard & Jan Mayen","b":"1F1F8-1F1EF","j":["flag","flag_svalbard_jan_mayen"]},"flag-slovakia":{"a":"Flag: Slovakia","b":"1F1F8-1F1F0","j":["flag","sk","nation","country","banner","slovakia"]},"flag-sierra-leone":{"a":"Flag: Sierra Leone","b":"1F1F8-1F1F1","j":["flag","sierra","leone","nation","country","banner","sierra_leone"]},"flag-san-marino":{"a":"Flag: San Marino","b":"1F1F8-1F1F2","j":["flag","san","marino","nation","country","banner","san_marino"]},"flag-senegal":{"a":"Flag: Senegal","b":"1F1F8-1F1F3","j":["flag","sn","nation","country","banner","senegal"]},"flag-somalia":{"a":"Flag: Somalia","b":"1F1F8-1F1F4","j":["flag","so","nation","country","banner","somalia"]},"flag-suriname":{"a":"Flag: Suriname","b":"1F1F8-1F1F7","j":["flag","sr","nation","country","banner","suriname"]},"flag-south-sudan":{"a":"Flag: South Sudan","b":"1F1F8-1F1F8","j":["flag","south","sd","nation","country","banner","south_sudan"]},"flag-so-tom--prncipe":{"a":"Flag: São Tomé & Príncipe","b":"1F1F8-1F1F9","j":["flag","flag_sao_tome_principe","sao","tome","principe","nation","country","banner","sao_tome_principe"]},"flag-el-salvador":{"a":"Flag: El Salvador","b":"1F1F8-1F1FB","j":["flag","el","salvador","nation","country","banner","el_salvador"]},"flag-sint-maarten":{"a":"Flag: Sint Maarten","b":"1F1F8-1F1FD","j":["flag","sint","maarten","dutch","nation","country","banner","sint_maarten"]},"flag-syria":{"a":"Flag: Syria","b":"1F1F8-1F1FE","j":["flag","syrian","arab","republic","nation","country","banner","syria"]},"flag-eswatini":{"a":"Flag: Eswatini","b":"1F1F8-1F1FF","j":["flag","sz","nation","country","banner","eswatini"]},"flag-tristan-da-cunha":{"a":"Flag: Tristan Da Cunha","b":"1F1F9-1F1E6","j":["flag"]},"flag-turks--caicos-islands":{"a":"Flag: Turks & Caicos Islands","b":"1F1F9-1F1E8","j":["flag","flag_turks_caicos_islands","turks","caicos","islands","nation","country","banner","turks_caicos_islands"]},"flag-chad":{"a":"Flag: Chad","b":"1F1F9-1F1E9","j":["flag","td","nation","country","banner","chad"]},"flag-french-southern-territories":{"a":"Flag: French Southern Territories","b":"1F1F9-1F1EB","j":["flag","french","southern","territories","nation","country","banner","french_southern_territories"]},"flag-togo":{"a":"Flag: Togo","b":"1F1F9-1F1EC","j":["flag","tg","nation","country","banner","togo"]},"flag-thailand":{"a":"Flag: Thailand","b":"1F1F9-1F1ED","j":["flag","th","nation","country","banner","thailand"]},"flag-tajikistan":{"a":"Flag: Tajikistan","b":"1F1F9-1F1EF","j":["flag","tj","nation","country","banner","tajikistan"]},"flag-tokelau":{"a":"Flag: Tokelau","b":"1F1F9-1F1F0","j":["flag","tk","nation","country","banner","tokelau"]},"flag-timorleste":{"a":"Flag: Timor-Leste","b":"1F1F9-1F1F1","j":["flag","flag_timor_leste","timor","leste","nation","country","banner","timor_leste"]},"flag-turkmenistan":{"a":"Flag: Turkmenistan","b":"1F1F9-1F1F2","j":["flag","nation","country","banner","turkmenistan"]},"flag-tunisia":{"a":"Flag: Tunisia","b":"1F1F9-1F1F3","j":["flag","tn","nation","country","banner","tunisia"]},"flag-tonga":{"a":"Flag: Tonga","b":"1F1F9-1F1F4","j":["flag","to","nation","country","banner","tonga"]},"flag-turkey":{"a":"Flag: Turkey","b":"1F1F9-1F1F7","j":["flag","turkey","nation","country","banner"]},"flag-trinidad--tobago":{"a":"Flag: Trinidad & Tobago","b":"1F1F9-1F1F9","j":["flag","flag_trinidad_tobago","trinidad","tobago","nation","country","banner","trinidad_tobago"]},"flag-tuvalu":{"a":"Flag: Tuvalu","b":"1F1F9-1F1FB","j":["flag","nation","country","banner","tuvalu"]},"flag-taiwan":{"a":"Flag: Taiwan","b":"1F1F9-1F1FC","j":["flag","tw","nation","country","banner","taiwan"]},"flag-tanzania":{"a":"Flag: Tanzania","b":"1F1F9-1F1FF","j":["flag","tanzania","united","republic","nation","country","banner"]},"flag-ukraine":{"a":"Flag: Ukraine","b":"1F1FA-1F1E6","j":["flag","ua","nation","country","banner","ukraine"]},"flag-uganda":{"a":"Flag: Uganda","b":"1F1FA-1F1EC","j":["flag","ug","nation","country","banner","uganda"]},"flag-us-outlying-islands":{"a":"Flag: U.S. Outlying Islands","b":"1F1FA-1F1F2","j":["flag","flag_u_s_outlying_islands"]},"flag-united-nations":{"a":"Flag: United Nations","b":"1F1FA-1F1F3","j":["flag","un","banner"]},"flag-united-states":{"a":"Flag: United States","b":"1F1FA-1F1F8","j":["flag","united","states","america","nation","country","banner","united_states"]},"flag-uruguay":{"a":"Flag: Uruguay","b":"1F1FA-1F1FE","j":["flag","uy","nation","country","banner","uruguay"]},"flag-uzbekistan":{"a":"Flag: Uzbekistan","b":"1F1FA-1F1FF","j":["flag","uz","nation","country","banner","uzbekistan"]},"flag-vatican-city":{"a":"Flag: Vatican City","b":"1F1FB-1F1E6","j":["flag","vatican","city","nation","country","banner","vatican_city"]},"flag-st-vincent--grenadines":{"a":"Flag: St. Vincent & Grenadines","b":"1F1FB-1F1E8","j":["flag","flag_st_vincent_grenadines","saint","vincent","grenadines","nation","country","banner","st_vincent_grenadines"]},"flag-venezuela":{"a":"Flag: Venezuela","b":"1F1FB-1F1EA","j":["flag","ve","bolivarian","republic","nation","country","banner","venezuela"]},"flag-british-virgin-islands":{"a":"Flag: British Virgin Islands","b":"1F1FB-1F1EC","j":["flag","british","virgin","islands","bvi","nation","country","banner","british_virgin_islands"]},"flag-us-virgin-islands":{"a":"Flag: U.S. Virgin Islands","b":"1F1FB-1F1EE","j":["flag","flag_u_s_virgin_islands","virgin","islands","us","nation","country","banner","u_s_virgin_islands"]},"flag-vietnam":{"a":"Flag: Vietnam","b":"1F1FB-1F1F3","j":["flag","viet","nam","nation","country","banner","vietnam"]},"flag-vanuatu":{"a":"Flag: Vanuatu","b":"1F1FB-1F1FA","j":["flag","vu","nation","country","banner","vanuatu"]},"flag-wallis--futuna":{"a":"Flag: Wallis & Futuna","b":"1F1FC-1F1EB","j":["flag","flag_wallis_futuna","wallis","futuna","nation","country","banner","wallis_futuna"]},"flag-samoa":{"a":"Flag: Samoa","b":"1F1FC-1F1F8","j":["flag","ws","nation","country","banner","samoa"]},"flag-kosovo":{"a":"Flag: Kosovo","b":"1F1FD-1F1F0","j":["flag","xk","nation","country","banner","kosovo"]},"flag-yemen":{"a":"Flag: Yemen","b":"1F1FE-1F1EA","j":["flag","ye","nation","country","banner","yemen"]},"flag-mayotte":{"a":"Flag: Mayotte","b":"1F1FE-1F1F9","j":["flag","yt","nation","country","banner","mayotte"]},"flag-south-africa":{"a":"Flag: South Africa","b":"1F1FF-1F1E6","j":["flag","south","africa","nation","country","banner","south_africa"]},"flag-zambia":{"a":"Flag: Zambia","b":"1F1FF-1F1F2","j":["flag","zm","nation","country","banner","zambia"]},"flag-zimbabwe":{"a":"Flag: Zimbabwe","b":"1F1FF-1F1FC","j":["flag","zw","nation","country","banner","zimbabwe"]},"flag-england":{"a":"Flag: England","b":"1F3F4-E0067-E0062-E0065-E006E-E0067-E007F","j":["flag","english"]},"flag-scotland":{"a":"Flag: Scotland","b":"1F3F4-E0067-E0062-E0073-E0063-E0074-E007F","j":["flag","scottish"]},"flag-wales":{"a":"Flag: Wales","b":"1F3F4-E0067-E0062-E0077-E006C-E0073-E007F","j":["flag","welsh"]}},"aliases":{}}
\ No newline at end of file
diff --git a/vector/src/main/res/res/drawable-hdpi/app_layout_onboarding_feedback.webp b/vector/src/main/res/res/drawable-hdpi/app_layout_onboarding_feedback.webp
new file mode 100644
index 0000000000..5ac890e617
Binary files /dev/null and b/vector/src/main/res/res/drawable-hdpi/app_layout_onboarding_feedback.webp differ
diff --git a/vector/src/main/res/res/drawable-hdpi/app_layout_onboarding_spaces.webp b/vector/src/main/res/res/drawable-hdpi/app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..35f2a04236
Binary files /dev/null and b/vector/src/main/res/res/drawable-hdpi/app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/res/drawable-hdpi/app_layout_onboarding_welcome.webp b/vector/src/main/res/res/drawable-hdpi/app_layout_onboarding_welcome.webp
new file mode 100644
index 0000000000..5ac890e617
Binary files /dev/null and b/vector/src/main/res/res/drawable-hdpi/app_layout_onboarding_welcome.webp differ
diff --git a/vector/src/main/res/res/drawable-mdpi/app_layout_onboarding_feedback.webp b/vector/src/main/res/res/drawable-mdpi/app_layout_onboarding_feedback.webp
new file mode 100644
index 0000000000..07ece0d947
Binary files /dev/null and b/vector/src/main/res/res/drawable-mdpi/app_layout_onboarding_feedback.webp differ
diff --git a/vector/src/main/res/res/drawable-mdpi/app_layout_onboarding_spaces.webp b/vector/src/main/res/res/drawable-mdpi/app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..a77bce20e8
Binary files /dev/null and b/vector/src/main/res/res/drawable-mdpi/app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/res/drawable-mdpi/app_layout_onboarding_welcome.webp b/vector/src/main/res/res/drawable-mdpi/app_layout_onboarding_welcome.webp
new file mode 100644
index 0000000000..07ece0d947
Binary files /dev/null and b/vector/src/main/res/res/drawable-mdpi/app_layout_onboarding_welcome.webp differ
diff --git a/vector/src/main/res/res/drawable-xhdpi/app_layout_onboarding_feedback.webp b/vector/src/main/res/res/drawable-xhdpi/app_layout_onboarding_feedback.webp
new file mode 100644
index 0000000000..e86bd5fe6b
Binary files /dev/null and b/vector/src/main/res/res/drawable-xhdpi/app_layout_onboarding_feedback.webp differ
diff --git a/vector/src/main/res/res/drawable-xhdpi/app_layout_onboarding_spaces.webp b/vector/src/main/res/res/drawable-xhdpi/app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..9b5b9fa607
Binary files /dev/null and b/vector/src/main/res/res/drawable-xhdpi/app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/res/drawable-xhdpi/app_layout_onboarding_welcome.webp b/vector/src/main/res/res/drawable-xhdpi/app_layout_onboarding_welcome.webp
new file mode 100644
index 0000000000..e86bd5fe6b
Binary files /dev/null and b/vector/src/main/res/res/drawable-xhdpi/app_layout_onboarding_welcome.webp differ
diff --git a/vector/src/main/res/res/drawable-xxhdpi/app_layout_onboarding_feedback.webp b/vector/src/main/res/res/drawable-xxhdpi/app_layout_onboarding_feedback.webp
new file mode 100644
index 0000000000..f95909eaae
Binary files /dev/null and b/vector/src/main/res/res/drawable-xxhdpi/app_layout_onboarding_feedback.webp differ
diff --git a/vector/src/main/res/res/drawable-xxhdpi/app_layout_onboarding_spaces.webp b/vector/src/main/res/res/drawable-xxhdpi/app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..03e31dc9d6
Binary files /dev/null and b/vector/src/main/res/res/drawable-xxhdpi/app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/res/drawable-xxhdpi/app_layout_onboarding_welcome.webp b/vector/src/main/res/res/drawable-xxhdpi/app_layout_onboarding_welcome.webp
new file mode 100644
index 0000000000..f95909eaae
Binary files /dev/null and b/vector/src/main/res/res/drawable-xxhdpi/app_layout_onboarding_welcome.webp differ
diff --git a/vector/src/main/res/res/drawable-xxxhdpi/app_layout_onboarding_feedback.webp b/vector/src/main/res/res/drawable-xxxhdpi/app_layout_onboarding_feedback.webp
new file mode 100644
index 0000000000..cee3cf512c
Binary files /dev/null and b/vector/src/main/res/res/drawable-xxxhdpi/app_layout_onboarding_feedback.webp differ
diff --git a/vector/src/main/res/res/drawable-xxxhdpi/app_layout_onboarding_spaces.webp b/vector/src/main/res/res/drawable-xxxhdpi/app_layout_onboarding_spaces.webp
new file mode 100644
index 0000000000..b4bf421be5
Binary files /dev/null and b/vector/src/main/res/res/drawable-xxxhdpi/app_layout_onboarding_spaces.webp differ
diff --git a/vector/src/main/res/res/drawable-xxxhdpi/app_layout_onboarding_welcome.webp b/vector/src/main/res/res/drawable-xxxhdpi/app_layout_onboarding_welcome.webp
new file mode 100644
index 0000000000..cee3cf512c
Binary files /dev/null and b/vector/src/main/res/res/drawable-xxxhdpi/app_layout_onboarding_welcome.webp differ
diff --git a/vector/src/main/res/values-az/strings.xml b/vector/src/main/res/values-az/strings.xml
deleted file mode 100644
index cd5820c5fa..0000000000
--- a/vector/src/main/res/values-az/strings.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="notice_room_invite_no_invitee">%s-nin dəvəti</string>
-    <string name="notice_room_invite">%1$s dəvət etdi %2$s</string>
-    <string name="notice_room_invite_you">%1$s sizi dəvət etdi</string>
-    <string name="notice_room_join">%1$s qoşuldu</string>
-    <string name="notice_room_leave">%1$s qalıb</string>
-    <string name="notice_room_reject">%1$s dəvəti rədd etdi</string>
-    <string name="notice_room_remove">%1$s %2$s-i xaric etdi</string>
-    <string name="notice_room_unban">%1$s %2$s-i blokdan açdı</string>
-    <string name="notice_room_ban">%1$s %2$s-i blokladı</string>
-    <string name="notice_room_withdraw">%1$s %2$s-in dəvətini geri götürdü</string>
-    <string name="notice_avatar_url_changed">%1$s avatarı dəyişdi</string>
-    <string name="notice_display_name_set">%1$s ekran adını %2$s olaraq təyin etdi</string>
-    <string name="notice_display_name_changed_from">%1$s ekran adını %2$s-dan %3$s-ya dəyişdi</string>
-    <string name="notice_display_name_removed">%1$s onların göstərilən adlarını sildi (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s mövzunu dəyişdi: %2$s</string>
-    <string name="notice_room_name_changed">%1$s otaq adını dəyişdirdi: %2$s</string>
-    <string name="notice_placed_video_call">%s video zəng etdi.</string>
-    <string name="notice_placed_voice_call">%s səsli zəng etdi.</string>
-    <string name="notice_answered_call">%s zəngə cavab verdi.</string>
-    <string name="notice_ended_call">%s zəng başa çatdı.</string>
-    <string name="notice_made_future_room_visibility">"%1$s gələcək otaq tarixçəsini %2$s-ə  görünən etdi"</string>
-    <string name="notice_room_visibility_invited">bütün otaq üzvləri, dəvət olunduğu andan.</string>
-    <string name="notice_room_visibility_joined">bütün otaq üzvləri, qoşulduğu andan.</string>
-    <string name="notice_room_visibility_shared">bütün otaq üzvləri.</string>
-    <string name="notice_room_visibility_world_readable">hər kəs.</string>
-    <string name="notice_room_update">%s bu otağı təkmilləşdirdi.</string>
-
-
-    <string name="notice_avatar_changed_too">(avatar da dəyişdirilib)</string>
-    <string name="notice_room_name_removed">%1$s otaq adını sildi</string>
-    <string name="notice_room_topic_removed">%1$s otaq mövzusunu sildi</string>
-    <string name="notice_room_third_party_invite">%1$s otağa qoşulmaq üçün %2$s dəvətnamə göndərdi</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s otağa qoşulmaq üçün %2$s dəvətini ləğv etdi</string>
-    <string name="notice_room_third_party_registered_invite">%1$s %2$s üçün dəvəti qəbul etdi</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** Şifrəni aça bilmir: %s **</string>
-    <string name="notice_crypto_error_unknown_inbound_session_id">Göndərənin cihazı bu mesaj üçün açarları bizə göndərməyib.</string>
-
-    <string name="unable_to_send_message">Mesaj göndərmək olmur</string>
-
-
-    <string name="matrix_error">Matris xətası</string>
-
-
-    <string name="encrypted_message">Şifrəli mesaj</string>
-
-    <string name="medium_email">Elektron poçt ünvanı</string>
-    <string name="medium_phone_number">Telefon nömrəsi</string>
-
-    <string name="room_displayname_room_invite">Otağa dəvət</string>
-
-    <string name="room_displayname_two_members">%1$s və %2$s</string>
-
-
-
-    <string name="room_displayname_empty_room">Boş otaq</string>
-
-    <string name="initial_sync_start_importing_account">İlkin sinxronizasiya:
-\nHesab idxal olunur…</string>
-    <string name="initial_sync_start_importing_account_crypto">İlkin sinxronizasiya:
-\nKriptografiyanın idxalı</string>
-    <string name="initial_sync_start_importing_account_rooms">İlkin sinxronizasiya:
-\nOtaqlar idxalı</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">İlkin sinxronizasiya:
-\nOtaqlara daxil olmaq</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">İlkin sinxronizasiya:
-\nDəvət olunmuş otaqların idxalı</string>
-    <string name="initial_sync_start_importing_account_left_rooms">İlkin sinxronizasiya:
-\nTərk olunmuş otaqların idxalı</string>
-    <string name="initial_sync_start_importing_account_groups">İlkin sinxronizasiya:
-\nİcmaların idxalı</string>
-    <string name="initial_sync_start_importing_account_data">İlkin sinxronizasiya:
-\nHesab məlumatlarının idxalı</string>
-
-    <string name="event_status_sending_message">Mesaj göndərilir…</string>
-
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s-nin dəvəti. Səbəb: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s dəvət olunmuş %2$s. Səbəb: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s sizi dəvət etdi. Səbəb: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s qoşuldu. Səbəb: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s qalıb. Səbəb: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s dəvəti rədd etdi. Səbəb: %2$s</string>
-    <string name="notice_room_remove_with_reason">%1$s %2$s-i xaric etdi. Səbəb: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s blokdan açdı %2$s. Səbəb: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s blokladı %2$s. Səbəb: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s üçün dəvəti qəbul etdi. Səbəb: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s %2$s dəvətini geri götürdü. Səbəb: %3$s</string>
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-lt/strings.xml b/vector/src/main/res/values-lt/strings.xml
deleted file mode 100644
index d2e7fa9be8..0000000000
--- a/vector/src/main/res/values-lt/strings.xml
+++ /dev/null
@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="notice_room_invite_no_invitee">Naudotojo %s pakvietimas</string>
-    <string name="notice_room_join_by_you">Jūs prisijungėte prie kambario</string>
-    <string name="notice_room_join">%1$s prisijungė prie kambario</string>
-    <string name="notice_room_invite_you">%1$s pakvietė jus</string>
-    <string name="notice_room_invite_by_you">Jūs pakvietėte naudotoją %1$s</string>
-    <string name="notice_room_invite">%1$s pakvietė naudotoją %2$s</string>
-    <string name="notice_direct_room_created_by_you">Jūs sukūrėte diskusiją</string>
-    <string name="notice_direct_room_created">%1$s sukūrė diskusiją</string>
-    <string name="notice_room_created_by_you">Jūs sukūrėte kambarį</string>
-    <string name="notice_room_created">%1$s sukūrė kambarį</string>
-    <string name="notice_room_invite_no_invitee_by_you">Jūsų pakvietimas</string>
-    <string name="notice_room_withdraw_by_you">Jūs atšaukėte %1$s pakvietimą</string>
-    <string name="notice_room_withdraw">%1$s atšaukė naudotojo %2$s pakvietimą</string>
-    <string name="notice_room_ban_by_you">Jūs užblokavote %1$s</string>
-    <string name="notice_room_ban">%1$s užblokavo naudotoją %2$s</string>
-    <string name="notice_room_unban_by_you">Jūs atblokavote %1$s</string>
-    <string name="notice_room_unban">%1$s atblokavo naudotoją %2$s</string>
-    <string name="notice_room_remove_by_you">Jūs išmetėte %1$s</string>
-    <string name="notice_room_remove">%1$s išmetė naudotoją %2$s</string>
-    <string name="notice_room_reject_by_you">Jūs atmetėte pakvietimą</string>
-    <string name="notice_room_reject">%1$s atmetė pakvietimą</string>
-    <string name="notice_direct_room_leave_by_you">Jūs išėjote iš kambario</string>
-    <string name="notice_direct_room_leave">%1$s išėjo iš kambario</string>
-    <string name="notice_room_leave_by_you">Jūs išėjote iš kambario</string>
-    <string name="notice_room_leave">%1$s išėjo iš kambario</string>
-    <string name="notice_direct_room_join_by_you">Jūs prisijungėte</string>
-    <string name="notice_direct_room_join">%1$s prisijungė</string>
-    <string name="settings_notifications">Pranešimai</string>
-    <string name="settings_version">Versija</string>
-    <string name="settings_troubleshoot_test_device_settings_quickfix">Įjungti</string>
-    <string name="settings_troubleshoot_test_account_settings_quickfix">Įjungti</string>
-    <string name="ssl_logout_account">Atsijungti</string>
-    <string name="room_participants_action_ignore">Ignoruoti</string>
-    <string name="room_participants_action_unban">Atblokuoti</string>
-    <string name="room_participants_action_ban">Užblokuoti</string>
-    <string name="room_participants_action_invite">Pakviesti</string>
-    <string name="action_reject">Atmesti</string>
-    <string name="action_join">Prisijungti</string>
-    <string name="action_remove">Pašalinti</string>
-    <string name="_continue">Tęsti</string>
-    <string name="no">NE</string>
-    <string name="yes">TAIP</string>
-    <string name="permissions_rationale_popup_title">Informacija</string>
-    <string name="call">Skambutis</string>
-    <string name="settings_call_category">Skambučiai</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Jūs pakvietėte %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s pakvietė %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Jūs išsiuntėte pakvietimą %1$s prisijungti prie kambario</string>
-    <string name="notice_room_avatar_removed_by_you">Jūs pašalinote kambario nuotrauką</string>
-    <string name="notice_room_avatar_removed">%1$s pašalino kambario nuotrauka</string>
-    <string name="notice_room_topic_removed_by_you">Jūs pašalinote kambario tema</string>
-    <string name="notice_room_topic_removed">%1$s pašalino kambario temą</string>
-    <string name="notice_room_name_removed_by_you">Jūs pašalinote kambario pavadinimą</string>
-    <string name="notice_room_name_removed">%1$s pašalino kambario pavadinimą</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Visiem serveriam yra uždrausta dalyvauti! Šiuo kambariu nebegalima naudotis.</string>
-    <string name="notice_room_update_by_you">Jūs atnaujinote šį kambarį.</string>
-    <string name="notice_room_update">%s atnaujino šį kambarį.</string>
-    <string name="notice_room_visibility_world_readable">bet kas.</string>
-    <string name="notice_room_visibility_shared">Visi kambario dalyviai.</string>
-    <string name="notice_room_visibility_invited">Visi kambario dalyviai, nuo tada, kai jie yra pakviesti.</string>
-    <string name="notice_ended_call">%s baigė skambutį.</string>
-    <string name="notice_answered_call_by_you">Jūs atsiliepėte į skambutį.</string>
-    <string name="notice_answered_call">%s atsiliepė į skambutį.</string>
-    <string name="notice_placed_voice_call">%s pradėjo balso skambutį.</string>
-    <string name="notice_placed_video_call_by_you">Jūs pradėjote vaizdo skambutį.</string>
-    <string name="notice_placed_video_call">%s pradėjo vaizdo skambutį.</string>
-    <string name="notice_room_name_changed">%1$s pakeitė kambario pavadinimą į %2$s</string>
-    <string name="notice_room_avatar_changed_by_you">Jūs pakeitėte kambario nuotrauką</string>
-    <string name="notice_room_topic_changed_by_you">Jūs pakeitėte temą į %1$s</string>
-    <string name="notice_room_topic_changed">%1$s pakeitė temą į: %2$s</string>
-    <string name="notice_display_name_changed_from_by_you">Jūs pakeitėte savo vardą iš %1$s į %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s pakeitė savo vardą iš %2$s į %3$s</string>
-    <string name="notice_display_name_set_by_you">Jūs pakeitėte savo vardą į %1$s</string>
-    <string name="notice_display_name_set">%1$s pakeitė savo vardą į %2$s</string>
-    <string name="notice_avatar_url_changed_by_you">Jūs pakeitėte savo profilio nuotrauką</string>
-    <string name="notice_avatar_url_changed">%1$s pakeitė savo profilio nuotrauką</string>
-    <string name="or">arba</string>
-    <string name="no_more_results">Daugiau rezultatų nėra</string>
-    <string name="no_result_placeholder">Rezultatų nėra</string>
-    <string name="notice_call_candidates">%s išsiuntė duomenis pokalbio nustatymui.</string>
-    <string name="notice_room_name_changed_by_you">Jūs pakeitėte kambario pavadinimą į: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Jūs pakvietėte %1$s. Priežastis: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s pakvietė %2$s. Priežastis: %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Jūsų pakvietimas. Priežastis: %1$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s\'s pakvietimas. Priežastis: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s pakvietė jus. Priežastis: %2$s</string>
-    <string name="notice_avatar_changed_too">(profilio nuotrauka taip pat buvo pakeista)</string>
-    <string name="notice_display_name_removed_by_you">Jūs pašalinote savo vardą (buvo %1$s)</string>
-    <string name="notice_display_name_removed">%1$s pašalino savo vardą (buvo %2$s)</string>
-    <string name="notice_room_visibility_joined">Visi kambario dalyviai, nuo tada, kai jie prisijungė prie kambario.</string>
-    <string name="notice_ended_call_by_you">Jūs baigėte skambutį.</string>
-    <string name="notice_placed_voice_call_by_you">Jūs pradėjote balso skambutį.</string>
-    <string name="notice_room_avatar_changed">%1$s pakeitė kambario nuotrauką</string>
-    <string name="option_always_ask">Visada klausti</string>
-    <string name="sound_device_wireless_headset">Belaidės ausinės</string>
-    <string name="sound_device_headset">Ausinės</string>
-    <string name="sound_device_speaker">Garsiakalbis</string>
-    <string name="sound_device_phone">Telefonas</string>
-    <string name="call_failed_no_connection_description">Nepavyko užmegzti realaus laiko ryšio.
-\nKad skambučiai veiktų patikimai, paprašykite namų serverio administratoriaus sukonfigūruoti TURN serverį.</string>
-    <string name="call_failed_no_connection">${app_name} Skambutis nepavyko</string>
-    <string name="start_video_call_prompt_msg">Ar tikrai norite pradėti vaizdo skambutį\?</string>
-    <string name="start_voice_call_prompt_msg">Ar tikrai norite pradėti balso skambutį\?</string>
-    <string name="option_send_voice">Siųsti balsą</string>
-    <string name="start_video_call">Pradėti vaizdo skambutį</string>
-    <string name="start_voice_call">Pradėti balso skambutį</string>
-    <string name="search">Ieškoti</string>
-    <string name="hs_client_url">Namų serverio API URL adresas</string>
-    <string name="hs_url">Namų serverio URL adresas</string>
-    <string name="logout">Atsijungti</string>
-    <string name="username">Slapyvardis</string>
-    <string name="join_room">Jungtis prie kambario</string>
-    <string name="send_bug_report_progress">Progresas (%s%%)</string>
-    <string name="send_bug_report_failed">Nepavyko išsiųsti pranešimo apie klaidą (%s)</string>
-    <string name="send_bug_report_sent">Pranešimas apie klaidą sėkmingai išsiųstas</string>
-    <string name="send_bug_report_rage_shake">Piktai purtykite telefoną kad pranešti apie klaidą</string>
-    <string name="send_bug_report_app_crashed">Paskutinį kartą programa sugedo. Ar norite atidaryti sutrikimo ataskaitos ekraną\?</string>
-    <string name="send_bug_report_alert_message">Atrodo, kad nusivylę purtote telefoną. Ar norėtumėte atidaryti pranešimo apie klaidas ekraną\?</string>
-    <string name="send_bug_report_logs_description">Norint diagnozuoti problemas, kartu su šiuo pranešimu apie klaidą bus siunčiami šio kliento žurnalai. Ši klaidos ataskaita, įskaitant žurnalus ir ekrano nuotrauką, nebus viešai matoma. Jei pageidaujate siųsti tik pirmiau pateiktą tekstą, panaikinkite žymėjimą:</string>
-    <string name="send_bug_report_placeholder">Apibūdinkite savo problemą čia</string>
-    <string name="send_bug_report_description_in_english">Jei įmanoma, aprašymą rašykite anglų kalba.</string>
-    <string name="send_bug_report_description">Aprašykite klaidą. Ką padarėte\? Ko tikėjotės, kad įvyks\? Kas iš tikrųjų nutiko\?</string>
-    <string name="send_bug_report">Pranešti apie klaidą</string>
-    <string name="send_bug_report_include_screenshot">Siųsti ekrano nuotrauką</string>
-    <string name="send_bug_report_include_key_share_history">Siųsti raktų bendrinimo užklausų istoriją</string>
-    <string name="send_bug_report_include_crash_logs">Siųsti sutrikimų žurnalus</string>
-    <string name="send_bug_report_include_logs">Siųsti žurnalus</string>
-    <string name="groups_header">Bendruomenės</string>
-    <string name="settings_room_directory_show_all_rooms_summary">Rodyti visus kambarių kataloge esančius kambarius, įskaitant kambarius su eksplicitiniu turiniu.</string>
-    <string name="settings_room_directory_show_all_rooms">Rodyti eksplicitinio turinio kambarius</string>
-    <string name="settings_category_room_directory">Kambarių katalogas</string>
-    <string name="rooms_header">Kambariai</string>
-    <string name="matrix_only_filter">Tik Matrix kontaktai</string>
-    <string name="direct_chats_header">Pokalbiai</string>
-    <string name="suggested_header">Siūlomi kambariai</string>
-    <string name="system_alerts_header">Sistemos perspėjimai</string>
-    <string name="low_priority_header">Žemo prioriteto</string>
-    <string name="invitations_header">Pakvietimai</string>
-    <string name="home_filter_placeholder_home">Filtruoti kambarių pavadinimus</string>
-    <string name="bottom_action_rooms">Kambariai</string>
-    <string name="bottom_action_people">Žmonės</string>
-    <string name="bottom_action_favourites">Parankiniai</string>
-    <string name="bottom_action_notification">Pranešimai</string>
-    <string name="dialog_edit_hint">Nauja reikšmė</string>
-    <string name="dialog_title_success">Sėkmė</string>
-    <string name="dialog_title_error">Klaida</string>
-    <string name="dialog_title_warning">Įspėjimas</string>
-    <string name="dialog_title_confirmation">Patvirtinimas</string>
-    <string name="action_thread_copy_link_to_thread">Kopijuoti nuorodą į temą</string>
-    <string name="action_thread_view_in_room">Peržiūrėti kambaryje</string>
-    <string name="copied_to_clipboard">Nukopijuota į iškarpinę</string>
-    <string name="action_learn_more">Sužinoti daugiau</string>
-    <string name="action_reset">Nustatyti iš naujo</string>
-    <string name="action_dismiss">Atmesti</string>
-    <string name="action_play">Paleisti</string>
-    <string name="action_disconnect">Atjungti</string>
-    <string name="action_revoke">Panaikinti</string>
-    <string name="action_rename">Pervadinti</string>
-    <string name="action_delete">Ištrinti</string>
-    <string name="action_share">Bendrinti</string>
-    <string name="action_download">Atsisiųsti</string>
-    <string name="action_quote">Cituoti</string>
-    <string name="action_send">Siųsti</string>
-    <string name="action_leave">Išeiti</string>
-    <string name="action_save">Išsaugoti</string>
-    <string name="action_cancel">Atšaukti</string>
-    <string name="action_invite">Pakviesti</string>
-    <string name="action_decline">Atmesti</string>
-    <string name="action_ignore">Ignoruoti</string>
-    <string name="action_skip">Praleisti</string>
-    <string name="action_accept">Priimti</string>
-    <string name="action_change">Keisti</string>
-    <string name="action_agree">Sutinku</string>
-    <string name="action_try_it_out">Išbandyti</string>
-    <string name="action_not_now">Ne dabar</string>
-    <string name="action_disable">Išjungti</string>
-    <string name="action_enable">Įjungti</string>
-    <string name="action_unpublish">Atšaukti publikavimą</string>
-    <string name="action_switch">Perjungti</string>
-    <string name="action_add">Pridėti</string>
-    <string name="action_copy">Kopijuoti</string>
-    <string name="action_close">Uždaryti</string>
-    <string name="action_open">Atidaryti</string>
-    <string name="action_mark_room_read">Pažymėti kaip perskaitytą</string>
-    <string name="action_quick_reply">Greitas atsakymas</string>
-    <string name="action_mark_all_as_read">Pažymėti visus kaip perskaitytus</string>
-    <string name="action_view_threads">Peržiūrėti temas</string>
-    <string name="action_video_call">Vaizdo skambutis</string>
-    <string name="action_voice_call">Balso skambutis</string>
-    <string name="action_sign_out_confirmation_simple">Ar tikrai norite atsijungti\?</string>
-    <string name="action_sign_out">Atsijungti</string>
-    <string name="call_notification_hangup">Padėti ragelį</string>
-    <string name="call_notification_reject">Atmesti</string>
-    <string name="call_notification_answer">Priimti</string>
-    <string name="done">Baigta</string>
-    <string name="failed_to_remove_widget">Nepavyko pašalinti valdiklio</string>
-    <string name="failed_to_add_widget">Nepavyko pridėti valdiklio</string>
-    <string name="cannot_call_yourself_with_invite">Negalite skambinti patys sau, laukite, kol dalyviai priims kvietimą</string>
-    <string name="cannot_call_yourself">Negalite skambinti patys sau</string>
-    <string name="audio_video_meeting_description">Susitikimuose naudojamos \"Jitsi\" saugumo ir leidimų politikos. Visi šiuo metu kambaryje esantys žmonės matys kvietimą prisijungti, kol vyks jūsų susitikimas.</string>
-    <string name="audio_meeting">Pradėti garso susitikimą</string>
-    <string name="video_meeting">Pradėti vaizdo susitikimą</string>
-    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Neturite leidimo pradėti skambutį</string>
-    <string name="no_permissions_to_start_webrtc_call">Neturite leidimo pradėti skambutį šiame kambaryje</string>
-    <string name="no_permissions_to_start_conf_call_in_direct_room">Neturite leidimo pradėti konferencinį skambutį</string>
-    <string name="no_permissions_to_start_conf_call">Neturite leidimo pradėti konferencinį skambutį šiame kambaryje</string>
-    <string name="denied_permission_voice_message">Jei norite siųsti balso žinutes, suteikite mikrofono leidimą.</string>
-    <string name="denied_permission_camera">Norėdami atlikti šį veiksmą, sistemos nustatymuose suteikite fotoaparato leidimą.</string>
-    <string name="missing_permissions_title">Trūkstami leidimai</string>
-    <string name="denied_permission_generic">Šiam veiksmui atlikti trūksta kai kurių leidimų, suteikite juos sistemos nustatymuose.</string>
-    <string name="time_unit_second_short">sek</string>
-    <string name="start_chatting">Pradėti pokalbį</string>
-    <string name="report_content">Pranešti turinį</string>
-    <string name="none">Nėra</string>
-    <string name="view_decrypted_source">Peržiūrėti iššifruotą šaltinį</string>
-    <string name="view_source">Peržiūrėti šaltinį</string>
-    <string name="permalink">Nuolatinė nuoroda</string>
-    <string name="later">Vėliau</string>
-    <string name="ok">GERAI</string>
-    <string name="loading">Įkeliama…</string>
-    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Prarasite prieigą prie užšifruotų žinučių, jei prieš atsijungdami nepadarysite atsarginės raktų kopijos.</string>
-    <string name="backup">Atsarginė kopija</string>
-    <string name="are_you_sure">Ar esate tikri\?</string>
-    <string name="sign_out_bottom_sheet_backing_up_keys">Darome atsarginę raktų kopiją…</string>
-    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Nenoriu savo užšifruotų žinučių</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">Kad neprarastumėte prieigos prie užšifruotų žinučių, saugi raktų atsarginė kopija turėtų būti aktyvi visose jūsų sesijose.</string>
-    <string name="title_activity_keys_backup_setup">Raktų atsarginė kopija</string>
-    <string name="title_activity_keys_backup_restore">Naudoti atsarginę raktų kopiją</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">Atliekama atsarginė raktų kopija. Jei dabar atsijungsite, neteksite prieigos prie užšifruotų žinučių.</string>
-    <string name="sign_out_bottom_sheet_warning_no_backup">Jei dabar atsijungsite, prarasite užšifruotas žinutes</string>
-    <string name="title_activity_choose_sticker">Siųsti lipduką</string>
-    <string name="title_activity_bug_report">Pranešti apie klaidą</string>
-    <string name="title_activity_settings">Nustatymai</string>
-    <string name="notification_silent_notifications">Tylūs pranešimai</string>
-    <string name="notification_noisy_notifications">Garsūs pranešimai</string>
-    <string name="notification_listening_for_events">Laukiama įvykių</string>
-    <string name="notification_listening_for_notifications">Laukiama pranešimų</string>
-    <string name="black_theme">Juoda tema</string>
-    <string name="dark_theme">Tamsi tema</string>
-    <string name="light_theme">Šviesi tema</string>
-    <string name="system_theme">Sistemos numatytoji</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Įjungėte visapusį šifravimą (neatpažintas algoritmas %1$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s įjungė visapusį šifravimą (neatpažintas algoritmas %2$s).</string>
-    <string name="notice_end_to_end_ok_by_you">Įjungėte visapusį šifravimą.</string>
-    <string name="notice_end_to_end_ok">%1$s įjungė visapusį šifravimą.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Uždraudėte svečiams patekti į kambarį.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s uždraudė svečiams prisijungti prie kambario.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Uždraudėte svečiams patekti į kambarį.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s uždraudė svečiams prisijungti prie kambario.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Leidote čia prisijungti svečiams.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s leido svečiams prisijungti čia.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Leidote svečiams prisijungti prie kambario.</string>
-    <string name="notice_room_guest_access_can_join">%1$s leido svečiams prisijungti prie kambario.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Pakeitėte šio kambario adresus.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s pakeitė šio kambario adresus.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Pakeitėte pagrindinį ir alternatyvius šio kambario adresus.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s pakeitė pagrindinį ir alternatyvų šio kambario adresus.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Pakeitėte alternatyvius šio kambario adresus.</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Dėl visapusio šifravimo gali tekti laukti, kol bus gauta kieno nors žinutė, nes šifravimo raktai nebuvo tinkamai išsiųsti.</string>
-    <string name="crypto_error_withheld_blacklisted">Jūs negalite pasiekti šios žinutės, nes siuntėjas jus užblokavo</string>
-    <string name="crypto_error_withheld_unverified">Jūs negalite pasiekti šios žinutės, nes siuntėjas nepasitiki jūsų sesija</string>
-    <string name="crypto_error_withheld_generic">Jūs negalite pasiekti šios žinutės, nes siuntėjas tyčia neatsiuntė raktų</string>
-    <string name="notice_crypto_unable_to_decrypt_merged">Laukiama šifravimo istorijos</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly">Laukiame šios žinutės, tai gali užtrukti</string>
-    <string name="notice_crypto_unable_to_decrypt_final">Jūs negalite pasiekti šios žinutės</string>
-    <string name="set_a_security_phrase_again_notice">Dar kartą įveskite saugumo frazę, kad ją patvirtintumėte.</string>
-    <string name="set_a_security_phrase_notice">Įveskite tik jums žinomą saugumo frazę, naudojamą apsaugoti paslaptis serveryje.</string>
-    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Sugeneruokite saugumo raktą, kurį laikykite saugioje vietoje, pvz., slaptažodžių tvarkyklėje arba seife.</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Naudoti saugumo frazę</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Įveskite tik jums žinomą slaptą frazę ir sugeneruokite atsarginės kopijos raktą.</string>
-    <string name="bottom_sheet_save_your_recovery_key_title">Išsaugokite saugumo raktą</string>
-    <string name="bottom_sheet_save_your_recovery_key_content">Saugumo raktą laikykite saugioje vietoje, pavyzdžiui, slaptažodžių tvarkyklėje arba seife.</string>
-    <string name="set_a_security_phrase_title">Nustatyti saugumo frazę</string>
-    <string name="set_a_security_phrase_hint">Saugumo frazė</string>
-    <string name="bottom_sheet_setup_secure_backup_title">Saugi atsarginė kopija</string>
-    <string name="a11y_unmute_microphone">Įjungti mikrofoną</string>
-    <string name="a11y_mute_microphone">Išjungti mikrofoną</string>
-    <string name="a11y_stop_camera">Išjungti kamerą</string>
-    <string name="a11y_start_camera">Įjungti kamerą</string>
-    <string name="power_level_edit_title">Nustatyti rolę</string>
-    <string name="power_level_title">Rolė</string>
-    <string name="a11y_open_chat">Atidaryti pokalbį</string>
-    <string name="identity_server_set_alternative_submit">Pateikti</string>
-    <string name="bottom_sheet_setup_secure_backup_submit">Nustatyti</string>
-    <string name="bottom_sheet_setup_secure_backup_security_key_title">Naudoti saugumo raktą</string>
-    <string name="room_settings_save_success">Sėkmingai pakeitėte kambario nustatymus</string>
-    <string name="room_settings_topic_hint">Tema</string>
-    <string name="room_settings_name_hint">Kambario pavadinimas</string>
-    <string name="disclaimer_positive_button">SUŽINOTI DAUGIAU</string>
-    <string name="room_settings_set_avatar">Nustatyti avatarą</string>
-    <string name="disclaimer_negative_button">SUPRATAU</string>
-    <string name="wrong_pin_message_last_remaining_attempt">Įspėjimas! Paskutinis likęs bandymas prieš atjungimą!</string>
-    <string name="too_many_pin_failures">Per daug klaidų, buvote atjungti</string>
-    <string name="create_pin_title">Pasirinkti PIN kodą saugumui</string>
-    <string name="create_pin_confirm_title">Patvirtinti PIN kodą</string>
-    <string name="create_pin_confirm_failure">Nepavyko patvirtinti PIN kodo, bakstelėkite naują.</string>
-    <string name="auth_pin_title">Įveskite PIN kodą</string>
-    <string name="auth_pin_forgot">Pamiršote PIN kodą\?</string>
-    <string name="auth_pin_reset_title">Iš naujo nustatyti PIN kodą</string>
-    <string name="auth_pin_new_pin_action">Naujas PIN kodas</string>
-    <string name="auth_pin_reset_content">Norėdami iš naujo nustatyti PIN kodą, turėsite iš naujo prisijungti ir sukurti naują PIN kodą.</string>
-    <string name="settings_security_application_protection_title">Apsaugoti prieigą</string>
-    <string name="settings_security_application_protection_summary">Apsaugoti prieigą su PIN kodu ir biometriniais duomenimis.</string>
-    <string name="settings_security_application_protection_screen_title">Konfigūruoti apsaugą</string>
-    <string name="settings_security_pin_code_title">Įjungti PIN kodą</string>
-    <string name="settings_security_pin_code_summary">Jei norite iš naujo nustatyti PIN kodą, bakstelėkite Pamiršau PIN kodą, kad atsijungtumėte ir nustatytumėte iš naujo.</string>
-    <string name="settings_security_pin_code_use_biometrics_title">Įgalinti biometrinius duomenis</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_on">Įgalinti konkrečiam įrenginiui būdingus biometrinius duomenis, pvz., pirštų atspaudus ir veido atpažinimą.</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN kodas yra vienintelis būdas atrakinti ${app_name}.</string>
-    <string name="settings_security_pin_code_notifications_title">Rodyti turinį pranešimuose</string>
-    <string name="settings_security_pin_code_notifications_summary_on">Rodyti išsamią informaciją, pvz., kambarių pavadinimus ir žinučių turinį.</string>
-    <string name="settings_security_pin_code_notifications_summary_off">Rodyti tik neperskaitytų žinučių skaičių paprastame pranešime.</string>
-    <string name="settings_security_pin_code_grace_period_title">Reikalauti PIN kodo po 2 min.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN kodas reikalingas po 2 minučių ${app_name} nenaudojimo.</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">PIN kodas reikalingas kiekvieną kartą, atidarant ${app_name}.</string>
-    <string name="settings_security_pin_code_change_pin_title">Keisti PIN kodą</string>
-    <string name="settings_security_pin_code_change_pin_summary">Pakeisti dabartinį PIN kodą</string>
-    <string name="error_opening_banned_room">Negalite atidaryti kambario, kuriame esate užblokuoti.</string>
-    <string name="room_error_not_found">Nepavyko rasti šio kambario. Įsitikinkite, kad jis egzistuoja.</string>
-    <string name="share_by_text">Bendrinti tekstu</string>
-    <string name="cannot_dm_self">Negalima rašyti sau!</string>
-    <string name="invalid_qr_code_uri">Neteisingas QR kodas (neteisingas URI)!</string>
-    <string name="qr_code_not_scanned">QR kodas nenuskaitytas!</string>
-    <string name="universal_link_malformed">Nuoroda buvo netinkamai suformuota</string>
-    <string name="warning_room_not_created_yet">Kambarys dar nesukurtas. Atšaukti kambario kūrimą\?</string>
-    <string name="warning_unsaved_change">Yra neišsaugotų pakeitimų. Atmesti pakeitimus\?</string>
-    <string name="warning_unsaved_change_discard">Atmesti pakeitimus</string>
-    <string name="call_tile_you_declined_this_call">Jūs atmetėte šį skambutį</string>
-    <string name="call_tile_other_declined">%1$s atmetė šį skambutį</string>
-    <string name="call_tile_ended">Šis skambutis baigėsi</string>
-    <string name="call_tile_call_back">Perskambinti</string>
-    <string name="call_tile_voice_incoming">Gaunamas balso skambutis</string>
-    <string name="call_tile_video_incoming">Gaunamas vaizdo skambutis</string>
-    <string name="call_tile_voice_active">Aktyvus balso skambutis</string>
-    <string name="call_tile_video_active">Aktyvus vaizdo skambutis</string>
-    <string name="call_tile_voice_call_has_ended">Balso skambutis baigtas • %1$s</string>
-    <string name="call_tile_video_call_has_ended">Vaizdo skambutis baigtas • %1$s</string>
-    <string name="a11y_rule_notify_silent">Pranešti be garso</string>
-    <string name="a11y_error_some_message_not_sent">Kai kurios žinutės nebuvo išsiųstos</string>
-    <string name="a11y_change_avatar">Keisti avatarą</string>
-    <string name="a11y_delete_avatar">Ištrinti avatarą</string>
-    <string name="a11y_unchecked">Nepatikrinta</string>
-    <string name="a11y_checked">Patikrinta</string>
-    <string name="a11y_error_message_not_sent">Žinutė neišsiųsta dėl klaidos</string>
-    <string name="a11y_rule_notify_noisy">Pranešti su garsu</string>
-    <string name="a11y_unsent_draft">turi neišsiųstą juodraštį</string>
-    <string name="a11y_open_widget">Atidaryti valdiklius</string>
-    <string name="a11y_import_key_from_file">Importuoti raktą iš failo</string>
-    <string name="authentication_error">Nepavyko patvirtinti tapatybės</string>
-    <string name="a11y_screenshot">Ekrano nuotrauka</string>
-    <string name="a11y_image">Nuotrauka</string>
-    <string name="a11y_selected">Pasirinktas</string>
-    <string name="a11y_rule_notify_off">Nepranešti</string>
-    <string name="a11y_presence_unavailable">Nutolęs</string>
-    <string name="a11y_presence_busy">Užsiėmęs</string>
-    <string name="a11y_presence_offline">Atsijungęs</string>
-    <string name="a11y_public_room">Viešas kambarys</string>
-    <string name="a11y_presence_online">Prisijungęs</string>
-    <string name="command_description_upgrade_room">Atnaujina kambarį į naują versiją</string>
-    <string name="event_status_a11y_sending">Siunčiama</string>
-    <string name="event_status_a11y_sent">Išsiųsta</string>
-    <string name="event_status_a11y_failed">Nepavyko</string>
-    <string name="event_status_a11y_delete_all">Ištrinti visas nepavykusias žinutes</string>
-    <string name="event_status_cancel_sending_dialog_message">Ar norite atšaukti žinutės siuntimą\?</string>
-    <string name="event_status_failed_messages_warning">Nepavyko išsiųsti žinučių</string>
-    <string name="event_status_delete_all_failed_dialog_title">Ištrinti neišsiųstas žinutes</string>
-    <string name="space_type_public">Vieša</string>
-    <string name="space_type_public_desc">Atvira visiems, geriausiai tinka bendruomenėms</string>
-    <string name="space_type_private">Privati</string>
-    <string name="space_type_private_desc">Tik su kvietimais, geriausia sau arba komandoms</string>
-    <string name="invite_people_menu">Pakviesti žmonių</string>
-    <string name="invite_to_space">Pakviesti į %s</string>
-    <string name="invite_people_to_your_space_desc">Šiuo metu esate tik jūs. %s bus dar geriau su kitais.</string>
-    <string name="invite_by_email">Pakviesti paštu</string>
-    <string name="invite_by_username_or_mail">Pakviesti slapyvardžiu arba paštu</string>
-    <string name="invite_by_link">Bendrinti nuorodą</string>
-    <plurals name="space_people_you_know">
-        <item quantity="one">%d pažįstamas asmuo jau prisijungė</item>
-        <item quantity="few">%d pažįstami asmenys jau prisijungė</item>
-        <item quantity="other">%d pažįstamų asmenų jau prisijungė</item>
-    </plurals>
-    <string name="space_explore_activity_title">Naršyti kambarius</string>
-    <string name="space_add_child_title">Pridėti kambarius</string>
-    <string name="leave_space">Išeiti</string>
-    <string name="you_are_invited">Esate kviečiami</string>
-    <string name="preference_show_all_rooms_in_home">Rodyti visus kambarius pradžioje</string>
-    <string name="voice_message_release_to_send_toast">Laikykite, kad įrašytumėte, atleiskite, kad išsiųstumėte</string>
-    <string name="a11y_delete_recorded_voice_message">Ištrinti įrašą</string>
-    <string name="a11y_recording_voice_message">Balso žinutė įrašoma</string>
-    <string name="voice_message_slide_to_cancel">Pastumkite, kad atšauktumėte</string>
-    <string name="a11y_play_voice_message">Paleisti balso žinutę</string>
-    <string name="a11y_pause_voice_message">Pristabdyti balso žinutę</string>
-    <string name="a11y_stop_voice_message">Stabdyti įrašymą</string>
-    <string name="a11y_start_voice_message">Įrašyti balso žinutę</string>
-    <string name="upgrade_room_auto_invite">Automatiškai pakviesti narius</string>
-    <string name="voice_message_tap_to_stop_toast">Bakstelėkite įrašą, kad sustabdytumėte arba klausytumėte</string>
-    <string name="error_voice_message_unable_to_play">Negalima paleisti šios balso žinutės</string>
-    <string name="error_voice_message_unable_to_record">Negalima įrašyti balso žinutės</string>
-    <string name="error_voice_message_cannot_reply_or_edit">Negalima atsakyti ar redaguoti, kol veikia balso žinutė</string>
-    <string name="voice_message_reply_content">Balso žinutė (%1$s)</string>
-    <string name="link_this_email_settings_link">Susieti šį el. paštą su savo paskyra</string>
-    <plurals name="create_poll_not_enough_options_error">
-        <item quantity="one">Bent %1$s pasirinkimas yra būtinas</item>
-        <item quantity="few">Bent %1$s pasirinkimai yra būtini</item>
-        <item quantity="other">Bent %1$s pasirinkimų yra būtini</item>
-    </plurals>
-    <plurals name="poll_option_vote_count">
-        <item quantity="one">%1$d balsas</item>
-        <item quantity="few">%1$d balsai</item>
-        <item quantity="other">%1$d balsų</item>
-    </plurals>
-    <plurals name="poll_total_vote_count_before_ended_and_voted">
-        <item quantity="one">Pagal %1$d balsą</item>
-        <item quantity="few">Pagal %1$d balsus</item>
-        <item quantity="other">Pagal %1$d balsų</item>
-    </plurals>
-    <string name="end_poll_confirmation_title">Baigti šią apklausą\?</string>
-    <string name="create_poll_empty_question_error">Klausimas negali būti tuščias</string>
-    <string name="create_poll_question_title">Apklausos klausimas arba tema</string>
-    <string name="create_poll_question_hint">Klausimas arba tema</string>
-    <string name="create_poll_options_title">Kurti pasirinkimus</string>
-    <string name="create_poll_options_hint">Pasirinkimas %1$d</string>
-    <string name="create_poll_add_option">PRIDĖTI PASIRINKIMĄ</string>
-    <string name="create_poll_button">KURTI APKLAUSĄ</string>
-    <string name="create_poll_title">Kurti apklausą</string>
-    <plurals name="poll_total_vote_count_after_ended">
-        <item quantity="one">Galutinis rezultatas pagal %1$d balsą</item>
-        <item quantity="few">Galutinis rezultatas pagal %1$d balsus</item>
-        <item quantity="other">Galutinis rezultatas pagal %1$d balsus</item>
-    </plurals>
-    <plurals name="poll_total_vote_count_before_ended_and_not_voted">
-        <item quantity="one">%1$d surinktas balsas. Balsuokite, kad pamatytumėte rezultatus</item>
-        <item quantity="few">%1$d surinkti balsai. Balsuokite, kad pamatytumėte rezultatus</item>
-        <item quantity="other">%1$d surinktų balsų. Balsuokite, kad pamatytumėte rezultatus</item>
-    </plurals>
-    <string name="poll_end_action">Baigti apklausą</string>
-    <string name="location_activity_title_static_sharing">Bendrinti vietą</string>
-    <string name="location_activity_title_preview">Vieta</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Padarėte būsimas žinutes matomas %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s padarė būsimas žinutes matomas %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Būsimą kambario istoriją padarėte matomą %1$s</string>
-    <string name="notice_made_future_room_visibility">%1$s padarė būsimą kambario istoriją matomą %2$s</string>
-    <plurals name="missed_audio_call">
-        <item quantity="one">%d praleistas balso skambutis</item>
-        <item quantity="few">%d praleisti balso skambučiai</item>
-        <item quantity="other">%d praleistų balso skambučių</item>
-    </plurals>
-    <string name="call_ended">Skambutis baigtas</string>
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings_login_v2.xml b/vector/src/main/res/values/strings_login_v2.xml
deleted file mode 100644
index c84455a665..0000000000
--- a/vector/src/main/res/values/strings_login_v2.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Those strings are not final, so do not put them into Weblate for the moment -->
-
-    <string name="login_welcome_back">Welcome back %s!</string>
-    <string name="login_please_enter_your_password">Please enter your password</string>
-    <string name="login_please_enter_your_matrix_identifier">Please enter your Matrix identifier</string>
-    <string name="login_please_enter_your_matrix_identifier_help">Matrix identifiers start with @, for instance @alice:server.org</string>
-    <string name="login_enter_identifier_help">If you do not know your Matrix identifier, or if your account has been created using Single Sign On (for instance using a Google account), or if you want to connect using your simple name, or an email associated to your account, you have to select your server first.</string>
-    <string name="login_choose_a_server">Choose a server</string>
-    <string name="login_please_choose_a_server">Please choose a server</string>
-    <string name="login_please_select_your_server">Please select your server</string>
-    <string name="login_please_choose_a_password">Please choose a password</string>
-    <string name="login_please_choose_a_new_password">Please choose a new password</string>
-    <string name="login_your_matrix_identifier">Your Matrix identifier</string>
-    <string name="login_press_back_to_change">Press back to change</string>
-    <string name="login_choose_a_password">Choose a password</string>
-    <string name="login_enter_your_email">Enter an email associated to your Matrix account</string>
-    <string name="login_choose_a_new_password">Choose a new password</string>
-    <string name="login_please_choose_a_user_name">Please choose an identifier</string>
-    <string name="login_please_choose_a_user_name_help_2">Once your account is created, your identifier cannot be modified. However you will be able to change your display name.</string>
-    <string name="login_if_you_re_not_sure_select_this_option">If you\'re not sure, select this option</string>
-    <string name="login_element_matrix_server_and_others">Element Matrix Server and others</string>
-    <string name="login_create_a_new_account">Create a new account</string>
-    <string name="login_i_already_have_an_account">I already have an account</string>
-
-    <string name="login_unknown_user_warning">Warning: no profile information can be retrieved with this Matrix identifier. Please check that there is no mistake.</string>
-
-    <string name="login_wait_for_email_notice_2">We just sent an email to %1$s.</string>
-    <string name="login_wait_for_email_help">Click on the link it contains to continue the account creation.</string>
-    <string name="login_account_created_title">Congratulations!</string>
-    <string name="login_account_created_subtitle">You account %s has been successfully created.</string>
-    <string name="login_account_created_notice">To complete your profile, you can set a profile image and/or a display name. This can also be done later from the settings.</string>
-    <string name="login_account_created_notice_2">This is how your messages will appear:</string>
-    <string name="login_account_created_message">Hello Matrix world!</string>
-    <string name="login_account_created_instruction">Click on the image and on your name to configure them.</string>
-
-    <string name="login_set_email_title_2">Associate an email</string>
-    <string name="login_set_email_notice_2">Associate an email to be able to later recover your account, in case you forget your password.</string>
-    <string name="login_set_email_mandatory_notice_2">The server %s requires you to associate an email to create an account.</string>
-
-    <string name="login_set_msisdn_title_2">Associate a phone number</string>
-    <string name="login_set_msisdn_notice_2">Associate a phone number to optionally allow people you know to discover you.</string>
-    <string name="login_set_msisdn_mandatory_notice_2">The server %s requires you to associate a phone number to create an account.</string>
-    <!-- %S will be replaced by the value of login_server_modular_learn_more ("Learn more" in English)-->
-    <string name="login_server_modular_learn_more_about_ems">%s about Element Matrix Service.</string>
-
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
index 29d8051583..9260b33162 100644
--- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml
+++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
@@ -95,4 +95,16 @@
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
+    <im.vector.app.core.preference.VectorPreferenceCategory
+        android:key="SETTINGS_NIGHTLY_BUILD_PREFERENCE_KEY"
+        android:title="@string/settings_nightly_build"
+        app:isPreferenceVisible="true">
+
+        <im.vector.app.core.preference.VectorPreference
+            android:key="SETTINGS_NIGHTLY_BUILD_UPDATE_PREFERENCE_KEY"
+            android:persistent="false"
+            android:title="@string/settings_nightly_build_update" />
+
+    </im.vector.app.core.preference.VectorPreferenceCategory>
+
 </androidx.preference.PreferenceScreen>
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 80b71a1f75..15a255753a 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -47,8 +47,8 @@
 
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
-        android:persistent="false"
         android:key="SETTINGS_LABS_MSC3061_SHARE_KEYS_HISTORY"
+        android:persistent="false"
         android:summary="@string/labs_enable_msc3061_share_history_desc"
         android:title="@string/labs_enable_msc3061_share_history" />
 
@@ -83,4 +83,45 @@
         android:summary="@string/labs_enable_element_call_permission_shortcuts_summary"
         android:title="@string/labs_enable_element_call_permission_shortcuts" />
 
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="@bool/settings_labs_new_app_layout_default"
+        android:key="SETTINGS_LABS_NEW_APP_LAYOUT_KEY"
+        android:summary="@string/labs_enable_new_app_layout_summary"
+        android:title="@string/labs_enable_new_app_layout_title" />
+
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="@bool/settings_labs_deferred_dm_default"
+        android:key="SETTINGS_LABS_DEFERRED_DM_KEY"
+        android:summary="@string/labs_enable_deferred_dm_summary"
+        android:title="@string/labs_enable_deferred_dm_title"
+        app:isPreferenceVisible="@bool/settings_labs_deferred_dm_visible" />
+
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="@bool/settings_labs_rich_text_editor_default"
+        android:key="SETTINGS_LABS_RICH_TEXT_EDITOR_KEY"
+        android:summary="@string/labs_enable_rich_text_editor_summary"
+        android:title="@string/labs_enable_rich_text_editor_title"
+        app:isPreferenceVisible="@bool/settings_labs_rich_text_editor_visible" />
+
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="@bool/settings_labs_new_session_manager_default"
+        android:key="SETTINGS_LABS_NEW_SESSION_MANAGER_KEY"
+        android:summary="@string/labs_enable_session_manager_summary"
+        android:title="@string/labs_enable_session_manager_title"
+        app:isPreferenceVisible="@bool/settings_labs_new_session_manager_visible" />
+
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="@bool/settings_labs_client_info_recording_default"
+        android:key="SETTINGS_LABS_CLIENT_INFO_RECORDING_KEY"
+        android:summary="@string/labs_enable_client_info_recording_summary"
+        android:title="@string/labs_enable_client_info_recording_title"
+        app:isPreferenceVisible="@bool/settings_labs_client_info_recording_visible" />
+
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="@bool/settings_labs_enable_voice_broadcast_default"
+        android:key="SETTINGS_LABS_VOICE_BROADCAST_KEY"
+        android:summary="@string/labs_enable_voice_broadcast_summary"
+        android:title="@string/labs_enable_voice_broadcast_title"
+        app:isPreferenceVisible="@bool/settings_labs_enable_voice_broadcast_visible" />
+
 </androidx.preference.PreferenceScreen>
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index a3b8a3476c..52afe16bbb 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -30,7 +30,9 @@
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/spaces">
+    <im.vector.app.core.preference.VectorPreferenceCategory
+        android:title="@string/spaces"
+        android:key="SETTINGS_PREF_SPACE_CATEGORY">
 
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
@@ -145,6 +147,12 @@
             android:title="@string/settings_vibrate_on_mention"
             app:isPreferenceVisible="@bool/false_not_implemented" />
 
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="true"
+            android:key="SETTINGS_ENABLE_DIRECT_SHARE"
+            android:summary="@string/settings_enable_direct_share_summary"
+            android:title="@string/settings_enable_direct_share_title" />
+
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
     <im.vector.app.core.preference.VectorPreferenceCategory
diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
index 02dc36bf39..ffa8688cbd 100644
--- a/vector/src/main/res/xml/vector_settings_root.xml
+++ b/vector/src/main/res/xml/vector_settings_root.xml
@@ -35,7 +35,7 @@
     <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_labs"
         android:title="@string/room_settings_labs_pref_title"
-        app:fragment="im.vector.app.features.settings.VectorSettingsLabsFragment"
+        app:fragment="im.vector.app.features.settings.labs.VectorSettingsLabsFragment"
         app:isPreferenceVisible="@bool/settings_root_labs_visible" />
 
     <im.vector.app.core.preference.VectorPreference
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index c246a40f71..78e1ba42a8 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -35,7 +35,7 @@
         <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/encryption_information_device_id"
+            android:title="@string/device_manager_session_details_session_id"
             tools:summary="VZRHETBEER" />
 
         <im.vector.app.core.preference.VectorPreference
@@ -141,6 +141,12 @@
             android:summary="@string/settings_security_application_protection_summary"
             android:title="@string/settings_security_application_protection_title" />
 
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY"
+            android:summary="@string/settings_security_incognito_keyboard_summary"
+            android:title="@string/settings_security_incognito_keyboard_title" />
+
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:key="SETTINGS_SECURITY_USE_FLAG_SECURE"
diff --git a/vector/src/test/java/im/vector/app/SpaceStateHandlerImplTest.kt b/vector/src/test/java/im/vector/app/SpaceStateHandlerImplTest.kt
index 36d372cfac..3a01054db2 100644
--- a/vector/src/test/java/im/vector/app/SpaceStateHandlerImplTest.kt
+++ b/vector/src/test/java/im/vector/app/SpaceStateHandlerImplTest.kt
@@ -21,11 +21,13 @@ import im.vector.app.test.fakes.FakeActiveSessionHolder
 import im.vector.app.test.fakes.FakeAnalyticsTracker
 import im.vector.app.test.fakes.FakeSession
 import im.vector.app.test.fakes.FakeUiStateRepository
+import im.vector.app.test.fakes.FakeVectorPreferences
 import im.vector.app.test.fixtures.RoomSummaryFixture.aRoomSummary
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.amshove.kluent.shouldBe
 import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Before
 import org.junit.Test
 
 internal class SpaceStateHandlerImplTest {
@@ -38,14 +40,21 @@ internal class SpaceStateHandlerImplTest {
     private val uiStateRepository = FakeUiStateRepository()
     private val activeSessionHolder = FakeActiveSessionHolder(session)
     private val analyticsTracker = FakeAnalyticsTracker()
+    private val vectorPreferences = FakeVectorPreferences()
 
     private val spaceStateHandler = SpaceStateHandlerImpl(
             sessionDataSource.instance,
             uiStateRepository,
             activeSessionHolder.instance,
             analyticsTracker,
+            vectorPreferences.instance,
     )
 
+    @Before
+    fun setup() {
+        vectorPreferences.givenSpaceBackstack(emptyList())
+    }
+
     @Test
     fun `given selected space doesn't exist, when getCurrentSpace, then return null`() {
         val currentSpace = spaceStateHandler.getCurrentSpace()
@@ -77,33 +86,33 @@ internal class SpaceStateHandlerImplTest {
     }
 
     @Test
-    fun `given is forward navigation and no current space, when setCurrentSpace, then null added to backstack`() {
+    fun `given not in space and is forward navigation, when setCurrentSpace, then null added to backstack`() {
         spaceStateHandler.setCurrentSpace(spaceId, session, isForwardNavigation = true)
 
-        val backstack = spaceStateHandler.getSpaceBackstack()
-
-        backstack.size shouldBe 1
-        backstack.first() shouldBe null
+        vectorPreferences.verifySetSpaceBackstack(listOf(null))
     }
 
     @Test
-    fun `given is forward navigation and is in space, when setCurrentSpace, then previous space added to backstack`() {
+    fun `given in space and is forward navigation, when setCurrentSpace, then previous space added to backstack`() {
         spaceStateHandler.setCurrentSpace(spaceId, session, isForwardNavigation = true)
         spaceStateHandler.setCurrentSpace("secondSpaceId", session, isForwardNavigation = true)
 
-        val backstack = spaceStateHandler.getSpaceBackstack()
-
-        backstack.size shouldBe 2
-        backstack shouldBeEqualTo listOf(null, spaceId)
+        vectorPreferences.verifySetSpaceBackstack(listOf(spaceId))
     }
 
     @Test
     fun `given is not forward navigation, when setCurrentSpace, then previous space not added to backstack`() {
         spaceStateHandler.setCurrentSpace(spaceId, session, isForwardNavigation = false)
 
-        val backstack = spaceStateHandler.getSpaceBackstack()
+        vectorPreferences.verifySetSpaceBackstack(listOf(spaceId), inverse = true)
+    }
 
-        backstack.size shouldBe 0
+    @Test
+    fun `given navigating to all chats, when setCurrentSpace, then backstack cleared`() {
+        spaceStateHandler.setCurrentSpace(spaceId, session)
+        spaceStateHandler.setCurrentSpace(null, session)
+
+        vectorPreferences.verifySetSpaceBackstack(emptyList())
     }
 
     @Test
diff --git a/vector/src/test/java/im/vector/app/core/device/DefaultGetDeviceInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/device/DefaultGetDeviceInfoUseCaseTest.kt
new file mode 100644
index 0000000000..0673fbadb5
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/device/DefaultGetDeviceInfoUseCaseTest.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.device
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeCryptoService
+import im.vector.app.test.fakes.FakeSession
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+class DefaultGetDeviceInfoUseCaseTest {
+
+    private val cryptoService = FakeCryptoService()
+    private val session = FakeSession(fakeCryptoService = cryptoService)
+    private val activeSessionHolder = FakeActiveSessionHolder(session)
+
+    private val getDeviceInfoUseCase = DefaultGetDeviceInfoUseCase(activeSessionHolder.instance)
+
+    @Test
+    fun `when execute, then get crypto device info`() {
+        val result = getDeviceInfoUseCase.execute()
+
+        result shouldBeEqualTo cryptoService.cryptoDeviceInfo
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/notification/NotificationsSettingUpdaterTest.kt b/vector/src/test/java/im/vector/app/core/notification/NotificationsSettingUpdaterTest.kt
new file mode 100644
index 0000000000..0920ee4716
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/notification/NotificationsSettingUpdaterTest.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.notification
+
+import im.vector.app.features.session.coroutineScope
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+class NotificationsSettingUpdaterTest {
+
+    private val fakeUpdateEnableNotificationsSettingOnChangeUseCase = mockk<UpdateEnableNotificationsSettingOnChangeUseCase>()
+
+    private val notificationsSettingUpdater = NotificationsSettingUpdater(
+            updateEnableNotificationsSettingOnChangeUseCase = fakeUpdateEnableNotificationsSettingOnChangeUseCase,
+    )
+
+    @Before
+    fun setup() {
+        mockkStatic("im.vector.app.features.session.SessionCoroutineScopesKt")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a session when calling onSessionStarted then update enable notification on change`() = runTest {
+        // Given
+        val aSession = FakeSession()
+        every { aSession.coroutineScope } returns this
+        coJustRun { fakeUpdateEnableNotificationsSettingOnChangeUseCase.execute(any()) }
+
+        // When
+        notificationsSettingUpdater.onSessionStarted(aSession)
+        advanceUntilIdle()
+
+        // Then
+        coVerify { fakeUpdateEnableNotificationsSettingOnChangeUseCase.execute(aSession) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/notification/UpdateEnableNotificationsSettingOnChangeUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/notification/UpdateEnableNotificationsSettingOnChangeUseCaseTest.kt
new file mode 100644
index 0000000000..5cced75735
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/notification/UpdateEnableNotificationsSettingOnChangeUseCaseTest.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.notification
+
+import im.vector.app.features.settings.devices.v2.notification.NotificationsStatus
+import im.vector.app.test.fakes.FakeGetNotificationsStatusUseCase
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fakes.FakeVectorPreferences
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+private const val A_SESSION_ID = "session-id"
+
+class UpdateEnableNotificationsSettingOnChangeUseCaseTest {
+
+    private val fakeSession = FakeSession().also { it.givenSessionId(A_SESSION_ID) }
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val fakeGetNotificationsStatusUseCase = FakeGetNotificationsStatusUseCase()
+
+    private val updateEnableNotificationsSettingOnChangeUseCase = UpdateEnableNotificationsSettingOnChangeUseCase(
+            vectorPreferences = fakeVectorPreferences.instance,
+            getNotificationsStatusUseCase = fakeGetNotificationsStatusUseCase.instance,
+    )
+
+    @Test
+    fun `given notifications are enabled when execute then setting is updated to true`() = runTest {
+        // Given
+        fakeGetNotificationsStatusUseCase.givenExecuteReturns(
+                fakeSession,
+                A_SESSION_ID,
+                NotificationsStatus.ENABLED,
+        )
+        fakeVectorPreferences.givenSetNotificationEnabledForDevice()
+
+        // When
+        updateEnableNotificationsSettingOnChangeUseCase.execute(fakeSession)
+
+        // Then
+        fakeVectorPreferences.verifySetNotificationEnabledForDevice(true)
+    }
+
+    @Test
+    fun `given notifications are disabled when execute then setting is updated to false`() = runTest {
+        // Given
+        fakeGetNotificationsStatusUseCase.givenExecuteReturns(
+                fakeSession,
+                A_SESSION_ID,
+                NotificationsStatus.DISABLED,
+        )
+        fakeVectorPreferences.givenSetNotificationEnabledForDevice()
+
+        // When
+        updateEnableNotificationsSettingOnChangeUseCase.execute(fakeSession)
+
+        // Then
+        fakeVectorPreferences.verifySetNotificationEnabledForDevice(false)
+    }
+
+    @Test
+    fun `given notifications toggle is not supported when execute then nothing is done`() = runTest {
+        // Given
+        fakeGetNotificationsStatusUseCase.givenExecuteReturns(
+                fakeSession,
+                A_SESSION_ID,
+                NotificationsStatus.NOT_SUPPORTED,
+        )
+        fakeVectorPreferences.givenSetNotificationEnabledForDevice()
+
+        // When
+        updateEnableNotificationsSettingOnChangeUseCase.execute(fakeSession)
+
+        // Then
+        fakeVectorPreferences.verifySetNotificationEnabledForDevice(true, inverse = true)
+        fakeVectorPreferences.verifySetNotificationEnabledForDevice(false, inverse = true)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/pushers/EnsureFcmTokenIsRetrievedUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/pushers/EnsureFcmTokenIsRetrievedUseCaseTest.kt
new file mode 100644
index 0000000000..fca49adc9b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/pushers/EnsureFcmTokenIsRetrievedUseCaseTest.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.pushers
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeFcmHelper
+import im.vector.app.test.fakes.FakePushersManager
+import im.vector.app.test.fakes.FakeUnifiedPushHelper
+import im.vector.app.test.fixtures.PusherFixture
+import org.junit.Test
+
+class EnsureFcmTokenIsRetrievedUseCaseTest {
+
+    private val fakeUnifiedPushHelper = FakeUnifiedPushHelper()
+    private val fakeFcmHelper = FakeFcmHelper()
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+
+    private val ensureFcmTokenIsRetrievedUseCase = EnsureFcmTokenIsRetrievedUseCase(
+            unifiedPushHelper = fakeUnifiedPushHelper.instance,
+            fcmHelper = fakeFcmHelper.instance,
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+    )
+
+    @Test
+    fun `given no registered pusher and distributor as embedded when execute then ensure the FCM token is retrieved with register pusher option`() {
+        // Given
+        val aPushersManager = FakePushersManager()
+        fakeUnifiedPushHelper.givenIsEmbeddedDistributorReturns(true)
+        fakeFcmHelper.givenEnsureFcmTokenIsRetrieved(aPushersManager.instance)
+        val aSessionId = "aSessionId"
+        fakeActiveSessionHolder.fakeSession.givenSessionId(aSessionId)
+        val expectedPusher = PusherFixture.aPusher(deviceId = "")
+        fakeActiveSessionHolder.fakeSession.fakePushersService.givenGetPushers(listOf(expectedPusher))
+
+        // When
+        ensureFcmTokenIsRetrievedUseCase.execute(aPushersManager.instance, registerPusher = true)
+
+        // Then
+        fakeFcmHelper.verifyEnsureFcmTokenIsRetrieved(aPushersManager.instance, registerPusher = true)
+    }
+
+    @Test
+    fun `given a registered pusher and distributor as embedded when execute then ensure the FCM token is retrieved without register pusher option`() {
+        // Given
+        val aPushersManager = FakePushersManager()
+        fakeUnifiedPushHelper.givenIsEmbeddedDistributorReturns(true)
+        fakeFcmHelper.givenEnsureFcmTokenIsRetrieved(aPushersManager.instance)
+        val aSessionId = "aSessionId"
+        fakeActiveSessionHolder.fakeSession.givenSessionId(aSessionId)
+        val expectedPusher = PusherFixture.aPusher(deviceId = aSessionId)
+        fakeActiveSessionHolder.fakeSession.fakePushersService.givenGetPushers(listOf(expectedPusher))
+
+        // When
+        ensureFcmTokenIsRetrievedUseCase.execute(aPushersManager.instance, registerPusher = true)
+
+        // Then
+        fakeFcmHelper.verifyEnsureFcmTokenIsRetrieved(aPushersManager.instance, registerPusher = false)
+    }
+
+    @Test
+    fun `given no registering asked and distributor as embedded when execute then ensure the FCM token is retrieved without register pusher option`() {
+        // Given
+        val aPushersManager = FakePushersManager()
+        fakeUnifiedPushHelper.givenIsEmbeddedDistributorReturns(true)
+        fakeFcmHelper.givenEnsureFcmTokenIsRetrieved(aPushersManager.instance)
+        val aSessionId = "aSessionId"
+        fakeActiveSessionHolder.fakeSession.givenSessionId(aSessionId)
+        val expectedPusher = PusherFixture.aPusher(deviceId = aSessionId)
+        fakeActiveSessionHolder.fakeSession.fakePushersService.givenGetPushers(listOf(expectedPusher))
+
+        // When
+        ensureFcmTokenIsRetrievedUseCase.execute(aPushersManager.instance, registerPusher = false)
+
+        // Then
+        fakeFcmHelper.verifyEnsureFcmTokenIsRetrieved(aPushersManager.instance, registerPusher = false)
+    }
+
+    @Test
+    fun `given distributor as not embedded when execute then nothing is done`() {
+        // Given
+        val aPushersManager = FakePushersManager()
+        fakeUnifiedPushHelper.givenIsEmbeddedDistributorReturns(false)
+
+        // When
+        ensureFcmTokenIsRetrievedUseCase.execute(aPushersManager.instance, registerPusher = true)
+
+        // Then
+        fakeFcmHelper.verifyEnsureFcmTokenIsRetrieved(aPushersManager.instance, registerPusher = true, inverse = true)
+        fakeFcmHelper.verifyEnsureFcmTokenIsRetrieved(aPushersManager.instance, registerPusher = false, inverse = true)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/pushers/PushParserTest.kt b/vector/src/test/java/im/vector/app/core/pushers/PushParserTest.kt
index 03577a4400..c0f6c33da8 100644
--- a/vector/src/test/java/im/vector/app/core/pushers/PushParserTest.kt
+++ b/vector/src/test/java/im/vector/app/core/pushers/PushParserTest.kt
@@ -35,73 +35,89 @@ class PushParserTest {
     )
 
     @Test
-    fun `test edge cases`() {
-        doAllEdgeTests(true)
-        doAllEdgeTests(false)
+    fun `test edge cases Firebase`() {
+        val pushParser = PushParser()
+        // Empty Json
+        pushParser.parsePushDataFcm(emptyMap()) shouldBeEqualTo emptyData
+        // Bad Json
+        pushParser.parsePushDataFcm(FIREBASE_PUSH_DATA.mutate("unread", "str")) shouldBeEqualTo validData.copy(unread = null)
+        // Extra data
+        pushParser.parsePushDataFcm(FIREBASE_PUSH_DATA.mutate("extra", "5")) shouldBeEqualTo validData
     }
 
-    private fun doAllEdgeTests(firebaseFormat: Boolean) {
+    @Test
+    fun `test edge cases UnifiedPush`() {
         val pushParser = PushParser()
         // Empty string
-        pushParser.parseData("", firebaseFormat) shouldBe null
+        pushParser.parsePushDataUnifiedPush("".toByteArray()) shouldBe null
         // Empty Json
-        pushParser.parseData("{}", firebaseFormat) shouldBeEqualTo emptyData
+        pushParser.parsePushDataUnifiedPush("{}".toByteArray()) shouldBeEqualTo emptyData
         // Bad Json
-        pushParser.parseData("ABC", firebaseFormat) shouldBe null
+        pushParser.parsePushDataUnifiedPush("ABC".toByteArray()) shouldBe null
     }
 
     @Test
-    fun `test unified push format`() {
+    fun `test UnifiedPush format`() {
         val pushParser = PushParser()
-
-        pushParser.parseData(UNIFIED_PUSH_DATA, false) shouldBeEqualTo validData
-        pushParser.parseData(UNIFIED_PUSH_DATA, true) shouldBeEqualTo emptyData
+        pushParser.parsePushDataUnifiedPush(UNIFIED_PUSH_DATA.toByteArray()) shouldBeEqualTo validData
     }
 
     @Test
-    fun `test firebase push format`() {
+    fun `test Firebase format`() {
         val pushParser = PushParser()
-
-        pushParser.parseData(FIREBASE_PUSH_DATA, true) shouldBeEqualTo validData
-        pushParser.parseData(FIREBASE_PUSH_DATA, false) shouldBeEqualTo emptyData
+        pushParser.parsePushDataFcm(FIREBASE_PUSH_DATA) shouldBeEqualTo validData
     }
 
     @Test
     fun `test empty roomId`() {
         val pushParser = PushParser()
-
-        pushParser.parseData(FIREBASE_PUSH_DATA.replace("!aRoomId:domain", ""), true) shouldBeEqualTo validData.copy(roomId = null)
-        pushParser.parseData(UNIFIED_PUSH_DATA.replace("!aRoomId:domain", ""), false) shouldBeEqualTo validData.copy(roomId = null)
+        val expected = validData.copy(roomId = null)
+        pushParser.parsePushDataFcm(FIREBASE_PUSH_DATA.mutate("room_id", null)) shouldBeEqualTo expected
+        pushParser.parsePushDataFcm(FIREBASE_PUSH_DATA.mutate("room_id", "")) shouldBeEqualTo expected
+        pushParser.parsePushDataUnifiedPush(UNIFIED_PUSH_DATA.replace("!aRoomId:domain", "").toByteArray()) shouldBeEqualTo expected
     }
 
     @Test
     fun `test invalid roomId`() {
         val pushParser = PushParser()
-
-        pushParser.parseData(FIREBASE_PUSH_DATA.replace("!aRoomId:domain", "aRoomId:domain"), true) shouldBeEqualTo validData.copy(roomId = null)
-        pushParser.parseData(UNIFIED_PUSH_DATA.replace("!aRoomId:domain", "aRoomId:domain"), false) shouldBeEqualTo validData.copy(roomId = null)
+        val expected = validData.copy(roomId = null)
+        pushParser.parsePushDataFcm(FIREBASE_PUSH_DATA.mutate("room_id", "aRoomId:domain")) shouldBeEqualTo expected
+        pushParser.parsePushDataUnifiedPush(UNIFIED_PUSH_DATA.mutate("!aRoomId:domain", "aRoomId:domain")) shouldBeEqualTo expected
     }
 
     @Test
     fun `test empty eventId`() {
         val pushParser = PushParser()
-
-        pushParser.parseData(FIREBASE_PUSH_DATA.replace("\$anEventId", ""), true) shouldBeEqualTo validData.copy(eventId = null)
-        pushParser.parseData(UNIFIED_PUSH_DATA.replace("\$anEventId", ""), false) shouldBeEqualTo validData.copy(eventId = null)
+        val expected = validData.copy(eventId = null)
+        pushParser.parsePushDataFcm(FIREBASE_PUSH_DATA.mutate("event_id", null)) shouldBeEqualTo expected
+        pushParser.parsePushDataFcm(FIREBASE_PUSH_DATA.mutate("event_id", "")) shouldBeEqualTo expected
+        pushParser.parsePushDataUnifiedPush(UNIFIED_PUSH_DATA.mutate("\$anEventId", "")) shouldBeEqualTo expected
     }
 
     @Test
     fun `test invalid eventId`() {
         val pushParser = PushParser()
-
-        pushParser.parseData(FIREBASE_PUSH_DATA.replace("\$anEventId", "anEventId"), true) shouldBeEqualTo validData.copy(eventId = null)
-        pushParser.parseData(UNIFIED_PUSH_DATA.replace("\$anEventId", "anEventId"), false) shouldBeEqualTo validData.copy(eventId = null)
+        val expected = validData.copy(eventId = null)
+        pushParser.parsePushDataFcm(FIREBASE_PUSH_DATA.mutate("event_id", "anEventId")) shouldBeEqualTo expected
+        pushParser.parsePushDataUnifiedPush(UNIFIED_PUSH_DATA.mutate("\$anEventId", "anEventId")) shouldBeEqualTo expected
     }
 
     companion object {
         private const val UNIFIED_PUSH_DATA =
                 "{\"notification\":{\"event_id\":\"\$anEventId\",\"room_id\":\"!aRoomId:domain\",\"counts\":{\"unread\":1},\"prio\":\"high\"}}"
-        private const val FIREBASE_PUSH_DATA =
-                "{\"event_id\":\"\$anEventId\",\"room_id\":\"!aRoomId:domain\",\"unread\":\"1\",\"prio\":\"high\"}"
+        private val FIREBASE_PUSH_DATA = mapOf(
+                "event_id" to "\$anEventId",
+                "room_id" to "!aRoomId:domain",
+                "unread" to "1",
+                "prio" to "high",
+        )
     }
 }
+
+private fun Map<String, String?>.mutate(key: String, value: String?): Map<String, String?> {
+    return toMutableMap().apply { put(key, value) }
+}
+
+private fun String.mutate(oldValue: String, newValue: String): ByteArray {
+    return replace(oldValue, newValue).toByteArray()
+}
diff --git a/vector/src/test/java/im/vector/app/core/pushers/PushersManagerTest.kt b/vector/src/test/java/im/vector/app/core/pushers/PushersManagerTest.kt
new file mode 100644
index 0000000000..7a1833e057
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/pushers/PushersManagerTest.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.pushers
+
+import im.vector.app.R
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeAppNameProvider
+import im.vector.app.test.fakes.FakeGetDeviceInfoUseCase
+import im.vector.app.test.fakes.FakeLocaleProvider
+import im.vector.app.test.fakes.FakePushersService
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fakes.FakeStringProvider
+import im.vector.app.test.fixtures.CredentialsFixture
+import im.vector.app.test.fixtures.CryptoDeviceInfoFixture.aCryptoDeviceInfo
+import im.vector.app.test.fixtures.PusherFixture
+import im.vector.app.test.fixtures.SessionParamsFixture
+import io.mockk.mockk
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.UnsignedDeviceInfo
+import org.matrix.android.sdk.api.session.pushers.HttpPusher
+import java.util.Locale
+import kotlin.math.abs
+
+class PushersManagerTest {
+
+    private val pushersService = FakePushersService()
+    private val session = FakeSession(fakePushersService = pushersService)
+    private val activeSessionHolder = FakeActiveSessionHolder(session)
+    private val stringProvider = FakeStringProvider()
+    private val localeProvider = FakeLocaleProvider()
+    private val appNameProvider = FakeAppNameProvider()
+    private val getDeviceInfoUseCase = FakeGetDeviceInfoUseCase()
+
+    private val pushersManager = PushersManager(
+            mockk(),
+            activeSessionHolder.instance,
+            localeProvider,
+            stringProvider.instance,
+            appNameProvider,
+            getDeviceInfoUseCase,
+    )
+
+    @Test
+    fun `when enqueueRegisterPusher, then HttpPusher created and enqueued`() {
+        val pushKey = "abc"
+        val gateway = "123"
+        val pusherAppId = "app-id"
+        val appName = "element"
+        val deviceDisplayName = "iPhone Lollipop"
+        stringProvider.given(R.string.pusher_app_id, pusherAppId)
+        localeProvider.givenCurrent(Locale.UK)
+        appNameProvider.givenAppName(appName)
+        getDeviceInfoUseCase.givenDeviceInfo(aCryptoDeviceInfo(unsigned = UnsignedDeviceInfo(deviceDisplayName)))
+        val expectedHttpPusher = HttpPusher(
+                pushkey = pushKey,
+                appId = pusherAppId,
+                profileTag = DEFAULT_PUSHER_FILE_TAG + "_" + abs(session.myUserId.hashCode()),
+                lang = Locale.UK.language,
+                appDisplayName = appName,
+                deviceDisplayName = deviceDisplayName,
+                url = gateway,
+                enabled = true,
+                deviceId = session.sessionParams.deviceId!!,
+                append = false,
+                withEventIdOnly = true,
+        )
+
+        pushersManager.enqueueRegisterPusher(pushKey, gateway)
+
+        val httpPusher = pushersService.verifyEnqueueAddHttpPusher()
+        httpPusher shouldBeEqualTo expectedHttpPusher
+    }
+
+    @Test
+    fun `when getPusherForCurrentSession, then return pusher`() {
+        val deviceId = "device_id"
+        val sessionParams = SessionParamsFixture.aSessionParams(
+                credentials = CredentialsFixture.aCredentials(deviceId = deviceId)
+        )
+        session.givenSessionParams(sessionParams)
+        val expectedPusher = PusherFixture.aPusher(deviceId = deviceId)
+        pushersService.givenGetPushers(listOf(expectedPusher))
+
+        val pusher = pushersManager.getPusherForCurrentSession()
+
+        pusher shouldBeEqualTo expectedPusher
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/pushers/RegisterUnifiedPushUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/pushers/RegisterUnifiedPushUseCaseTest.kt
new file mode 100644
index 0000000000..c72c519172
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/pushers/RegisterUnifiedPushUseCaseTest.kt
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.pushers
+
+import im.vector.app.test.fakes.FakeContext
+import im.vector.app.test.fakes.FakeVectorFeatures
+import io.mockk.every
+import io.mockk.justRun
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import io.mockk.verify
+import io.mockk.verifyAll
+import io.mockk.verifyOrder
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.unifiedpush.android.connector.UnifiedPush
+
+class RegisterUnifiedPushUseCaseTest {
+
+    private val fakeContext = FakeContext()
+    private val fakeVectorFeatures = FakeVectorFeatures()
+
+    private val registerUnifiedPushUseCase = RegisterUnifiedPushUseCase(
+            context = fakeContext.instance,
+            vectorFeatures = fakeVectorFeatures,
+    )
+
+    @Before
+    fun setup() {
+        mockkStatic(UnifiedPush::class)
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given non empty distributor when execute then distributor is saved and app is registered`() = runTest {
+        // Given
+        val aDistributor = "distributor"
+        justRun { UnifiedPush.registerApp(any()) }
+        justRun { UnifiedPush.saveDistributor(any(), any()) }
+
+        // When
+        val result = registerUnifiedPushUseCase.execute(aDistributor)
+
+        // Then
+        result shouldBe RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success
+        verifyOrder {
+            UnifiedPush.saveDistributor(fakeContext.instance, aDistributor)
+            UnifiedPush.registerApp(fakeContext.instance)
+        }
+    }
+
+    @Test
+    fun `given external distributors are not allowed when execute then internal distributor is saved and app is registered`() = runTest {
+        // Given
+        val aPackageName = "packageName"
+        fakeContext.givenPackageName(aPackageName)
+        justRun { UnifiedPush.registerApp(any()) }
+        justRun { UnifiedPush.saveDistributor(any(), any()) }
+        fakeVectorFeatures.givenExternalDistributorsAreAllowed(false)
+
+        // When
+        val result = registerUnifiedPushUseCase.execute()
+
+        // Then
+        result shouldBe RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success
+        verifyOrder {
+            UnifiedPush.saveDistributor(fakeContext.instance, aPackageName)
+            UnifiedPush.registerApp(fakeContext.instance)
+        }
+    }
+
+    @Test
+    fun `given a saved distributor and external distributors are allowed when execute then app is registered`() = runTest {
+        // Given
+        justRun { UnifiedPush.registerApp(any()) }
+        val aDistributor = "distributor"
+        every { UnifiedPush.getDistributor(any()) } returns aDistributor
+        fakeVectorFeatures.givenExternalDistributorsAreAllowed(true)
+
+        // When
+        val result = registerUnifiedPushUseCase.execute()
+
+        // Then
+        result shouldBe RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success
+        verifyAll {
+            UnifiedPush.getDistributor(fakeContext.instance)
+            UnifiedPush.registerApp(fakeContext.instance)
+        }
+    }
+
+    @Test
+    fun `given no saved distributor and a unique distributor available when execute then the distributor is saved and app is registered`() = runTest {
+        // Given
+        justRun { UnifiedPush.registerApp(any()) }
+        justRun { UnifiedPush.saveDistributor(any(), any()) }
+        every { UnifiedPush.getDistributor(any()) } returns ""
+        fakeVectorFeatures.givenExternalDistributorsAreAllowed(true)
+        val aDistributor = "distributor"
+        every { UnifiedPush.getDistributors(any()) } returns listOf(aDistributor)
+
+        // When
+        val result = registerUnifiedPushUseCase.execute()
+
+        // Then
+        result shouldBe RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success
+        verifyOrder {
+            UnifiedPush.getDistributor(fakeContext.instance)
+            UnifiedPush.getDistributors(fakeContext.instance)
+            UnifiedPush.saveDistributor(fakeContext.instance, aDistributor)
+            UnifiedPush.registerApp(fakeContext.instance)
+        }
+    }
+
+    @Test
+    fun `given no saved distributor and multiple distributors available when execute then result is to ask user`() = runTest {
+        // Given
+        every { UnifiedPush.getDistributor(any()) } returns ""
+        fakeVectorFeatures.givenExternalDistributorsAreAllowed(true)
+        val aDistributor1 = "distributor1"
+        val aDistributor2 = "distributor2"
+        every { UnifiedPush.getDistributors(any()) } returns listOf(aDistributor1, aDistributor2)
+
+        // When
+        val result = registerUnifiedPushUseCase.execute()
+
+        // Then
+        result shouldBe RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.NeedToAskUserForDistributor
+        verifyOrder {
+            UnifiedPush.getDistributor(fakeContext.instance)
+            UnifiedPush.getDistributors(fakeContext.instance)
+        }
+        verify(inverse = true) {
+            UnifiedPush.saveDistributor(any(), any())
+            UnifiedPush.registerApp(any())
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/pushers/UnregisterUnifiedPushUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/pushers/UnregisterUnifiedPushUseCaseTest.kt
new file mode 100644
index 0000000000..bee545b3e1
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/pushers/UnregisterUnifiedPushUseCaseTest.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.pushers
+
+import im.vector.app.features.settings.BackgroundSyncMode
+import im.vector.app.test.fakes.FakeContext
+import im.vector.app.test.fakes.FakePushersManager
+import im.vector.app.test.fakes.FakeUnifiedPushHelper
+import im.vector.app.test.fakes.FakeUnifiedPushStore
+import im.vector.app.test.fakes.FakeVectorPreferences
+import io.mockk.justRun
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import io.mockk.verifyAll
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.unifiedpush.android.connector.UnifiedPush
+
+class UnregisterUnifiedPushUseCaseTest {
+
+    private val fakeContext = FakeContext()
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val fakeUnifiedPushStore = FakeUnifiedPushStore()
+    private val fakeUnifiedPushHelper = FakeUnifiedPushHelper()
+
+    private val unregisterUnifiedPushUseCase = UnregisterUnifiedPushUseCase(
+            context = fakeContext.instance,
+            vectorPreferences = fakeVectorPreferences.instance,
+            unifiedPushStore = fakeUnifiedPushStore.instance,
+            unifiedPushHelper = fakeUnifiedPushHelper.instance,
+    )
+
+    @Before
+    fun setup() {
+        mockkStatic(UnifiedPush::class)
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given pushersManager when execute then unregister and clean everything which is needed`() = runTest {
+        // Given
+        val aEndpoint = "endpoint"
+        fakeUnifiedPushHelper.givenGetEndpointOrTokenReturns(aEndpoint)
+        val aPushersManager = FakePushersManager()
+        aPushersManager.givenUnregisterPusher(aEndpoint)
+        justRun { UnifiedPush.unregisterApp(any()) }
+        fakeVectorPreferences.givenSetFdroidSyncBackgroundMode(BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME)
+        fakeUnifiedPushStore.givenStorePushGateway(null)
+        fakeUnifiedPushStore.givenStoreUpEndpoint(null)
+
+        // When
+        unregisterUnifiedPushUseCase.execute(aPushersManager.instance)
+
+        // Then
+        fakeVectorPreferences.verifySetFdroidSyncBackgroundMode(BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME)
+        aPushersManager.verifyUnregisterPusher(aEndpoint)
+        verifyAll {
+            UnifiedPush.unregisterApp(fakeContext.instance)
+        }
+        fakeUnifiedPushStore.verifyStorePushGateway(null)
+        fakeUnifiedPushStore.verifyStoreUpEndpoint(null)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt
new file mode 100644
index 0000000000..d72500b520
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session
+
+import im.vector.app.core.extensions.startSyncing
+import im.vector.app.core.session.clientinfo.UpdateMatrixClientInfoUseCase
+import im.vector.app.features.session.coroutineScope
+import im.vector.app.features.settings.devices.v2.notification.UpdateNotificationSettingsAccountDataUseCase
+import im.vector.app.test.fakes.FakeContext
+import im.vector.app.test.fakes.FakeNotificationsSettingUpdater
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fakes.FakeVectorPreferences
+import im.vector.app.test.fakes.FakeWebRtcCallManager
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.runs
+import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+class ConfigureAndStartSessionUseCaseTest {
+
+    private val fakeContext = FakeContext()
+    private val fakeWebRtcCallManager = FakeWebRtcCallManager()
+    private val fakeUpdateMatrixClientInfoUseCase = mockk<UpdateMatrixClientInfoUseCase>()
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val fakeNotificationsSettingUpdater = FakeNotificationsSettingUpdater()
+    private val fakeUpdateNotificationSettingsAccountDataUseCase = mockk<UpdateNotificationSettingsAccountDataUseCase>()
+
+    private val configureAndStartSessionUseCase = ConfigureAndStartSessionUseCase(
+            context = fakeContext.instance,
+            webRtcCallManager = fakeWebRtcCallManager.instance,
+            updateMatrixClientInfoUseCase = fakeUpdateMatrixClientInfoUseCase,
+            vectorPreferences = fakeVectorPreferences.instance,
+            notificationsSettingUpdater = fakeNotificationsSettingUpdater.instance,
+            updateNotificationSettingsAccountDataUseCase = fakeUpdateNotificationSettingsAccountDataUseCase,
+    )
+
+    @Before
+    fun setup() {
+        mockkStatic("im.vector.app.core.extensions.SessionKt")
+        mockkStatic("im.vector.app.features.session.SessionCoroutineScopesKt")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given start sync needed and client info recording enabled when execute then it should be configured properly`() = runTest {
+        // Given
+        val aSession = givenASession()
+        every { aSession.coroutineScope } returns this
+        fakeWebRtcCallManager.givenCheckForProtocolsSupportIfNeededSucceeds()
+        coJustRun { fakeUpdateMatrixClientInfoUseCase.execute(any()) }
+        coJustRun { fakeUpdateNotificationSettingsAccountDataUseCase.execute(any()) }
+        fakeVectorPreferences.givenIsClientInfoRecordingEnabled(isEnabled = true)
+        fakeNotificationsSettingUpdater.givenOnSessionsStarted(aSession)
+
+        // When
+        configureAndStartSessionUseCase.execute(aSession, startSyncing = true)
+        advanceUntilIdle()
+
+        // Then
+        verify { aSession.startSyncing(fakeContext.instance) }
+        aSession.fakePushersService.verifyRefreshPushers()
+        fakeWebRtcCallManager.verifyCheckForProtocolsSupportIfNeeded()
+        coVerify {
+            fakeUpdateMatrixClientInfoUseCase.execute(aSession)
+            fakeUpdateNotificationSettingsAccountDataUseCase.execute(aSession)
+        }
+    }
+
+    @Test
+    fun `given start sync needed and client info recording disabled when execute then it should be configured properly`() = runTest {
+        // Given
+        val aSession = givenASession()
+        every { aSession.coroutineScope } returns this
+        fakeWebRtcCallManager.givenCheckForProtocolsSupportIfNeededSucceeds()
+        coJustRun { fakeUpdateNotificationSettingsAccountDataUseCase.execute(any()) }
+        fakeVectorPreferences.givenIsClientInfoRecordingEnabled(isEnabled = false)
+        fakeNotificationsSettingUpdater.givenOnSessionsStarted(aSession)
+
+        // When
+        configureAndStartSessionUseCase.execute(aSession, startSyncing = true)
+        advanceUntilIdle()
+
+        // Then
+        verify { aSession.startSyncing(fakeContext.instance) }
+        aSession.fakePushersService.verifyRefreshPushers()
+        fakeWebRtcCallManager.verifyCheckForProtocolsSupportIfNeeded()
+        coVerify(inverse = true) {
+            fakeUpdateMatrixClientInfoUseCase.execute(aSession)
+        }
+        coVerify {
+            fakeUpdateNotificationSettingsAccountDataUseCase.execute(aSession)
+        }
+    }
+
+    @Test
+    fun `given a session and no start sync needed when execute then it should be configured properly`() = runTest {
+        // Given
+        val aSession = givenASession()
+        every { aSession.coroutineScope } returns this
+        fakeWebRtcCallManager.givenCheckForProtocolsSupportIfNeededSucceeds()
+        coJustRun { fakeUpdateMatrixClientInfoUseCase.execute(any()) }
+        coJustRun { fakeUpdateNotificationSettingsAccountDataUseCase.execute(any()) }
+        fakeVectorPreferences.givenIsClientInfoRecordingEnabled(isEnabled = true)
+        fakeNotificationsSettingUpdater.givenOnSessionsStarted(aSession)
+
+        // When
+        configureAndStartSessionUseCase.execute(aSession, startSyncing = false)
+        advanceUntilIdle()
+
+        // Then
+        verify(inverse = true) { aSession.startSyncing(fakeContext.instance) }
+        aSession.fakePushersService.verifyRefreshPushers()
+        fakeWebRtcCallManager.verifyCheckForProtocolsSupportIfNeeded()
+        coVerify {
+            fakeUpdateMatrixClientInfoUseCase.execute(aSession)
+            fakeUpdateNotificationSettingsAccountDataUseCase.execute(aSession)
+        }
+    }
+
+    private fun givenASession(): FakeSession {
+        val fakeSession = FakeSession()
+        every { fakeSession.open() } just runs
+        every { fakeSession.startSyncing(any()) } just runs
+        fakeSession.fakePushersService.givenRefreshPushersSucceeds()
+        return fakeSession
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/session/clientinfo/DeleteMatrixClientInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/clientinfo/DeleteMatrixClientInfoUseCaseTest.kt
new file mode 100644
index 0000000000..44ee4d8e9e
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/session/clientinfo/DeleteMatrixClientInfoUseCaseTest.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+class DeleteMatrixClientInfoUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val fakeSetMatrixClientInfoUseCase = mockk<SetMatrixClientInfoUseCase>()
+
+    private val deleteMatrixClientInfoUseCase = DeleteMatrixClientInfoUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+            setMatrixClientInfoUseCase = fakeSetMatrixClientInfoUseCase
+    )
+
+    @Test
+    fun `given current session when calling use case then empty client info is set and result is success`() = runTest {
+        // Given
+        givenSetMatrixClientInfoSucceeds()
+        val expectedClientInfoToBeSet = MatrixClientInfoContent(
+                name = "",
+                version = "",
+                url = "",
+        )
+
+        // When
+        val result = deleteMatrixClientInfoUseCase.execute()
+
+        // Then
+        result.isSuccess shouldBe true
+        coVerify {
+            fakeSetMatrixClientInfoUseCase.execute(
+                    fakeActiveSessionHolder.fakeSession,
+                    expectedClientInfoToBeSet
+            )
+        }
+    }
+
+    @Test
+    fun `given current session and error during the process when calling use case then result is failure`() = runTest {
+        // Given
+        val error = Exception()
+        givenSetMatrixClientInfoFails(error)
+        val expectedClientInfoToBeSet = MatrixClientInfoContent(
+                name = "",
+                version = "",
+                url = "",
+        )
+
+        // When
+        val result = deleteMatrixClientInfoUseCase.execute()
+
+        // Then
+        result.isFailure shouldBe true
+        result.exceptionOrNull() shouldBeEqualTo error
+        coVerify {
+            fakeSetMatrixClientInfoUseCase.execute(
+                    fakeActiveSessionHolder.fakeSession,
+                    expectedClientInfoToBeSet
+            )
+        }
+    }
+
+    private fun givenSetMatrixClientInfoSucceeds() {
+        coEvery { fakeSetMatrixClientInfoUseCase.execute(any(), any()) } returns Result.success(Unit)
+    }
+
+    private fun givenSetMatrixClientInfoFails(error: Exception) {
+        coEvery { fakeSetMatrixClientInfoUseCase.execute(any(), any()) } returns Result.failure(error)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/session/clientinfo/DeleteUnusedClientInformationUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/clientinfo/DeleteUnusedClientInformationUseCaseTest.kt
new file mode 100644
index 0000000000..8acb7b404b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/session/clientinfo/DeleteUnusedClientInformationUseCaseTest.kt
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import io.mockk.coVerify
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+
+private const val A_CURRENT_DEVICE_ID = "current-device-id"
+private const val A_DEVICE_ID_1 = "a-device-id-1"
+private const val A_DEVICE_ID_2 = "a-device-id-2"
+private const val A_DEVICE_ID_3 = "a-device-id-3"
+private const val A_DEVICE_ID_4 = "a-device-id-4"
+
+private val A_DEVICE_INFO_1 = DeviceInfo(deviceId = A_DEVICE_ID_1)
+private val A_DEVICE_INFO_2 = DeviceInfo(deviceId = A_DEVICE_ID_2)
+
+class DeleteUnusedClientInformationUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+
+    private val deleteUnusedClientInformationUseCase = DeleteUnusedClientInformationUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+    )
+
+    @Before
+    fun setup() {
+        fakeActiveSessionHolder.fakeSession.givenSessionId(A_CURRENT_DEVICE_ID)
+    }
+
+    @Test
+    fun `given a device list that account data has all of them and extra devices then use case deletes the unused ones`() = runTest {
+        // Given
+        val devices = listOf(A_DEVICE_INFO_1, A_DEVICE_INFO_2)
+        val userAccountDataEventList = listOf(
+                UserAccountDataEvent(type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_1, mapOf("key" to "value")),
+                UserAccountDataEvent(type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_2, mapOf("key" to "value")),
+                UserAccountDataEvent(type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_3, mapOf("key" to "value")),
+                UserAccountDataEvent(type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_4, mapOf("key" to "value")),
+        )
+        fakeActiveSessionHolder.fakeSession.fakeSessionAccountDataService.givenGetUserAccountDataEventsStartWith(
+                type = MATRIX_CLIENT_INFO_KEY_PREFIX,
+                userAccountDataEventList = userAccountDataEventList,
+        )
+
+        // When
+        deleteUnusedClientInformationUseCase.execute(devices)
+
+        // Then
+        coVerify { fakeActiveSessionHolder.fakeSession.fakeSessionAccountDataService.deleteUserAccountData(MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_3) }
+        coVerify { fakeActiveSessionHolder.fakeSession.fakeSessionAccountDataService.deleteUserAccountData(MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_4) }
+    }
+
+    @Test
+    fun `given a device list that account data has exactly all of them then use case does nothing`() = runTest {
+        // Given
+        val devices = listOf(A_DEVICE_INFO_1, A_DEVICE_INFO_2)
+        val userAccountDataEventList = listOf(
+                UserAccountDataEvent(type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_1, mapOf("key" to "value")),
+                UserAccountDataEvent(type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_2, mapOf("key" to "value")),
+        )
+        fakeActiveSessionHolder.fakeSession.fakeSessionAccountDataService.givenGetUserAccountDataEventsStartWith(
+                type = MATRIX_CLIENT_INFO_KEY_PREFIX,
+                userAccountDataEventList = userAccountDataEventList,
+        )
+
+        // When
+        deleteUnusedClientInformationUseCase.execute(devices)
+
+        // Then
+        coVerify(exactly = 0) {
+            fakeActiveSessionHolder.fakeSession.fakeSessionAccountDataService.deleteUserAccountData(any())
+        }
+    }
+
+    @Test
+    fun `given a device list that account data has missing some of them then use case does nothing`() = runTest {
+        // Given
+        val devices = listOf(A_DEVICE_INFO_1, A_DEVICE_INFO_2)
+        val userAccountDataEventList = listOf(
+                UserAccountDataEvent(type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_1, mapOf("key" to "value")),
+        )
+        fakeActiveSessionHolder.fakeSession.fakeSessionAccountDataService.givenGetUserAccountDataEventsStartWith(
+                type = MATRIX_CLIENT_INFO_KEY_PREFIX,
+                userAccountDataEventList = userAccountDataEventList,
+        )
+
+        // When
+        deleteUnusedClientInformationUseCase.execute(devices)
+
+        // Then
+        coVerify(exactly = 0) {
+            fakeActiveSessionHolder.fakeSession.fakeSessionAccountDataService.deleteUserAccountData(any())
+        }
+    }
+
+    @Test
+    fun `given an empty device list that account data has some devices then use case does nothing`() = runTest {
+        // Given
+        val devices = emptyList<DeviceInfo>()
+        val userAccountDataEventList = listOf(
+                UserAccountDataEvent(type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_1, mapOf("key" to "value")),
+                UserAccountDataEvent(type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID_2, mapOf("key" to "value")),
+        )
+        fakeActiveSessionHolder.fakeSession.fakeSessionAccountDataService.givenGetUserAccountDataEventsStartWith(
+                type = MATRIX_CLIENT_INFO_KEY_PREFIX,
+                userAccountDataEventList = userAccountDataEventList,
+        )
+
+        // When
+        deleteUnusedClientInformationUseCase.execute(devices)
+
+        // Then
+        coVerify(exactly = 0) {
+            fakeActiveSessionHolder.fakeSession.fakeSessionAccountDataService.deleteUserAccountData(any())
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCaseTest.kt
new file mode 100644
index 0000000000..4be8218ab5
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/session/clientinfo/GetMatrixClientInfoUseCaseTest.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import im.vector.app.test.fakes.FakeSession
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+private const val A_DEVICE_ID = "device-id"
+private const val A_CLIENT_NAME = "client-name"
+private const val A_CLIENT_VERSION = "client-version"
+private const val A_CLIENT_URL = "client-url"
+
+class GetMatrixClientInfoUseCaseTest {
+
+    private val fakeSession = FakeSession()
+
+    private val getMatrixClientInfoUseCase = GetMatrixClientInfoUseCase()
+
+    @Test
+    fun `given a device id and existing content when getting the info then result should contain that info`() {
+        // Given
+        givenClientInfoContent(A_DEVICE_ID)
+        val expectedClientInfo = MatrixClientInfoContent(
+                name = A_CLIENT_NAME,
+                version = A_CLIENT_VERSION,
+                url = A_CLIENT_URL,
+        )
+
+        // When
+        val result = getMatrixClientInfoUseCase.execute(fakeSession, A_DEVICE_ID)
+
+        // Then
+        result shouldBeEqualTo expectedClientInfo
+    }
+
+    private fun givenClientInfoContent(deviceId: String) {
+        val type = MATRIX_CLIENT_INFO_KEY_PREFIX + deviceId
+        val content = mapOf(
+                Pair("name", A_CLIENT_NAME),
+                Pair("version", A_CLIENT_VERSION),
+                Pair("url", A_CLIENT_URL),
+        )
+        fakeSession
+                .fakeSessionAccountDataService
+                .givenGetUserAccountDataEventReturns(type, content)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCaseTest.kt
new file mode 100644
index 0000000000..4345de45c4
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/session/clientinfo/SetMatrixClientInfoUseCaseTest.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import im.vector.app.test.fakes.FakeSession
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeInstanceOf
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.toContent
+
+private const val A_DEVICE_ID = "device-id"
+
+class SetMatrixClientInfoUseCaseTest {
+
+    private val fakeSession = FakeSession()
+
+    private val setMatrixClientInfoUseCase = SetMatrixClientInfoUseCase()
+
+    @Test
+    fun `given client info and no error when setting the info then account data is correctly updated`() = runTest {
+        // Given
+        val type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID
+        val clientInfo = givenClientInfo()
+        val content = clientInfo.toContent()
+        fakeSession
+                .givenSessionId(A_DEVICE_ID)
+        fakeSession
+                .fakeSessionAccountDataService
+                .givenUpdateUserAccountDataEventSucceeds()
+
+        // When
+        val result = setMatrixClientInfoUseCase.execute(fakeSession, clientInfo)
+
+        // Then
+        result.isSuccess shouldBe true
+        fakeSession
+                .fakeSessionAccountDataService
+                .verifyUpdateUserAccountDataEventSucceeds(type, content)
+    }
+
+    @Test
+    fun `given client info and error during update when setting the info then result is failure`() = runTest {
+        // Given
+        val type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID
+        val clientInfo = givenClientInfo()
+        val content = clientInfo.toContent()
+        fakeSession
+                .givenSessionId(A_DEVICE_ID)
+        val error = Exception()
+        fakeSession
+                .fakeSessionAccountDataService
+                .givenUpdateUserAccountDataEventFailsWithError(error)
+
+        // When
+        val result = setMatrixClientInfoUseCase.execute(fakeSession, clientInfo)
+
+        // Then
+        result.isFailure shouldBe true
+        result.exceptionOrNull() shouldBeEqualTo error
+        fakeSession
+                .fakeSessionAccountDataService
+                .verifyUpdateUserAccountDataEventSucceeds(type, content)
+    }
+
+    @Test
+    fun `given client info and null device id when setting the info then result is failure`() = runTest {
+        // Given
+        val type = MATRIX_CLIENT_INFO_KEY_PREFIX + A_DEVICE_ID
+        val clientInfo = givenClientInfo()
+        val content = clientInfo.toContent()
+        fakeSession
+                .givenSessionId(null)
+
+        // When
+        val result = setMatrixClientInfoUseCase.execute(fakeSession, clientInfo)
+
+        // Then
+        result.isFailure shouldBe true
+        result.exceptionOrNull() shouldBeInstanceOf NoDeviceIdError::class
+        fakeSession
+                .fakeSessionAccountDataService
+                .verifyUpdateUserAccountDataEventSucceeds(type, content, inverse = true)
+    }
+
+    private fun givenClientInfo() = MatrixClientInfoContent(
+            name = "name",
+            version = "version",
+            url = null,
+    )
+}
diff --git a/vector/src/test/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCaseTest.kt
new file mode 100644
index 0000000000..7f1727ff37
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/session/clientinfo/UpdateMatrixClientInfoUseCaseTest.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.session.clientinfo
+
+import im.vector.app.core.resources.BuildMeta
+import im.vector.app.test.fakes.FakeAppNameProvider
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeInstanceOf
+import org.junit.Test
+
+private const val AN_APP_NAME_1 = "app_name_1"
+private const val AN_APP_NAME_2 = "app_name_2"
+private const val A_VERSION_NAME_1 = "version_name_1"
+private const val A_VERSION_NAME_2 = "version_name_2"
+private const val A_SESSION_ID = "session-id"
+
+class UpdateMatrixClientInfoUseCaseTest {
+
+    private val fakeSession = FakeSession()
+    private val fakeAppNameProvider = FakeAppNameProvider()
+    private val fakeBuildMeta = mockk<BuildMeta>()
+    private val getMatrixClientInfoUseCase = mockk<GetMatrixClientInfoUseCase>()
+    private val setMatrixClientInfoUseCase = mockk<SetMatrixClientInfoUseCase>()
+
+    private val updateMatrixClientInfoUseCase = UpdateMatrixClientInfoUseCase(
+            appNameProvider = fakeAppNameProvider,
+            buildMeta = fakeBuildMeta,
+            getMatrixClientInfoUseCase = getMatrixClientInfoUseCase,
+            setMatrixClientInfoUseCase = setMatrixClientInfoUseCase,
+    )
+
+    @Test
+    fun `given current client info is different than the stored one when trying to update then new client info is set`() = runTest {
+        // Given
+        givenCurrentAppName(AN_APP_NAME_1)
+        givenCurrentVersionName(A_VERSION_NAME_1)
+        givenStoredClientInfo(AN_APP_NAME_2, A_VERSION_NAME_2)
+        givenSetClientInfoSucceeds()
+        val expectedClientInfoToSet = MatrixClientInfoContent(
+                name = AN_APP_NAME_1,
+                version = A_VERSION_NAME_1,
+        )
+
+        // When
+        val result = updateMatrixClientInfoUseCase.execute(fakeSession)
+
+        // Then
+        result.isSuccess shouldBe true
+        coVerify { setMatrixClientInfoUseCase.execute(fakeSession, match { it == expectedClientInfoToSet }) }
+    }
+
+    @Test
+    fun `given error during set of new client info when trying to update then result is failure`() = runTest {
+        // Given
+        givenCurrentAppName(AN_APP_NAME_1)
+        givenCurrentVersionName(A_VERSION_NAME_1)
+        givenStoredClientInfo(AN_APP_NAME_2, A_VERSION_NAME_2)
+        val error = Exception()
+        givenSetClientInfoFails(error)
+        val expectedClientInfoToSet = MatrixClientInfoContent(
+                name = AN_APP_NAME_1,
+                version = A_VERSION_NAME_1,
+        )
+
+        // When
+        val result = updateMatrixClientInfoUseCase.execute(fakeSession)
+
+        // Then
+        result.isFailure shouldBe true
+        result.exceptionOrNull() shouldBeEqualTo error
+        coVerify { setMatrixClientInfoUseCase.execute(fakeSession, match { it == expectedClientInfoToSet }) }
+    }
+
+    @Test
+    fun `given current client info is equal to the stored one when trying to update then nothing is done`() = runTest {
+        // Given
+        givenCurrentAppName(AN_APP_NAME_1)
+        givenCurrentVersionName(A_VERSION_NAME_1)
+        givenStoredClientInfo(AN_APP_NAME_1, A_VERSION_NAME_1)
+
+        // When
+        val result = updateMatrixClientInfoUseCase.execute(fakeSession)
+
+        // Then
+        result.isSuccess shouldBe true
+        coVerify(inverse = true) { setMatrixClientInfoUseCase.execute(fakeSession, any()) }
+    }
+
+    @Test
+    fun `given no session id for current session when trying to update then nothing is done`() = runTest {
+        // Given
+        givenCurrentAppName(AN_APP_NAME_1)
+        givenCurrentVersionName(A_VERSION_NAME_1)
+        fakeSession.givenSessionId(null)
+
+        // When
+        val result = updateMatrixClientInfoUseCase.execute(fakeSession)
+
+        // Then
+        result.isFailure shouldBe true
+        result.exceptionOrNull() shouldBeInstanceOf NoDeviceIdError::class
+        coVerify(inverse = true) { setMatrixClientInfoUseCase.execute(fakeSession, any()) }
+    }
+
+    private fun givenCurrentAppName(appName: String) {
+        fakeAppNameProvider.givenAppName(appName)
+    }
+
+    private fun givenCurrentVersionName(versionName: String) {
+        every { fakeBuildMeta.versionName } returns versionName
+    }
+
+    private fun givenStoredClientInfo(appName: String, versionName: String) {
+        fakeSession.givenSessionId(A_SESSION_ID)
+        every { getMatrixClientInfoUseCase.execute(fakeSession, A_SESSION_ID) } returns MatrixClientInfoContent(
+                name = appName,
+                version = versionName,
+        )
+    }
+
+    private fun givenSetClientInfoSucceeds() {
+        coEvery { setMatrixClientInfoUseCase.execute(any(), any()) } returns Result.success(Unit)
+    }
+
+    private fun givenSetClientInfoFails(error: Throwable) {
+        coEvery { setMatrixClientInfoUseCase.execute(any(), any()) } returns Result.failure(error)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/core/utils/CopyToClipboardUseCaseTest.kt b/vector/src/test/java/im/vector/app/core/utils/CopyToClipboardUseCaseTest.kt
new file mode 100644
index 0000000000..8de6991a2e
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/utils/CopyToClipboardUseCaseTest.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.core.utils
+
+import android.content.ClipData
+import im.vector.app.test.fakes.FakeContext
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import io.mockk.verify
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+private const val A_TEXT = "text"
+
+class CopyToClipboardUseCaseTest {
+
+    private val fakeContext = FakeContext()
+
+    private val copyToClipboardUseCase = CopyToClipboardUseCase(
+            context = fakeContext.instance
+    )
+
+    @Before
+    fun setup() {
+        mockkStatic(ClipData::class)
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a text when executing the use case then the text is copied into the clipboard`() {
+        // Given
+        val clipboardManager = fakeContext.givenClipboardManager()
+        clipboardManager.givenSetPrimaryClip()
+        val clipData = mockk<ClipData>()
+        every { ClipData.newPlainText(any(), any()) } returns clipData
+
+        // When
+        copyToClipboardUseCase.execute(A_TEXT)
+
+        // Then
+        clipboardManager.verifySetPrimaryClip(clipData)
+        verify { ClipData.newPlainText("", A_TEXT) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/MemberListViewModelTest.kt b/vector/src/test/java/im/vector/app/features/MemberListViewModelTest.kt
new file mode 100644
index 0000000000..f8d4b1e698
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/MemberListViewModelTest.kt
@@ -0,0 +1,282 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.MutableLiveData
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.features.roomprofile.RoomProfileArgs
+import im.vector.app.features.roomprofile.members.RoomMemberListViewModel
+import im.vector.app.features.roomprofile.members.RoomMemberListViewState
+import im.vector.app.features.roomprofile.members.RoomMemberSummaryComparator
+import im.vector.app.test.test
+import im.vector.app.test.testCoroutineDispatchers
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CryptoCrossSigningKey
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.UserVerificationLevel
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
+import org.matrix.android.sdk.api.session.room.members.MembershipService
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.state.StateService
+import org.matrix.android.sdk.api.session.user.UserService
+import org.matrix.android.sdk.api.util.Optional
+
+class MemberListViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule()
+
+    @get:Rule
+    val instantExecutorRule = InstantTaskExecutorRule()
+
+    private val fakeRoomId = "!roomId"
+    private val args = RoomProfileArgs(fakeRoomId)
+
+    private val aliceMxid = "@alice:example.com"
+    private val bobMxid = "@bob:example.com"
+    private val marcMxid = "@marc:example.com"
+
+    private val aliceDevice1 = CryptoDeviceInfo(
+            deviceId = "ALICE_1",
+            userId = aliceMxid,
+            trustLevel = DeviceTrustLevel(true, true)
+    )
+
+    private val aliceDevice2 = CryptoDeviceInfo(
+            deviceId = "ALICE_2",
+            userId = aliceMxid,
+            trustLevel = DeviceTrustLevel(false, false)
+    )
+
+    private val bobDevice1 = CryptoDeviceInfo(
+            deviceId = "BOB_1",
+            userId = bobMxid,
+            trustLevel = DeviceTrustLevel(true, true)
+    )
+
+    private val bobDevice2 = CryptoDeviceInfo(
+            deviceId = "BOB_2",
+            userId = bobMxid,
+            trustLevel = DeviceTrustLevel(true, true)
+    )
+
+    private val markDevice = CryptoDeviceInfo(
+            deviceId = "MARK_1",
+            userId = marcMxid,
+            trustLevel = DeviceTrustLevel(false, true)
+    )
+
+    private val fakeMembershipservice: MembershipService = mockk {
+
+        val memberList = mutableListOf<RoomMemberSummary>(
+                RoomMemberSummary(Membership.JOIN, aliceMxid, displayName = "Alice"),
+                RoomMemberSummary(Membership.JOIN, bobMxid, displayName = "Bob"),
+                RoomMemberSummary(Membership.JOIN, marcMxid, displayName = "marc")
+        )
+
+        every { getRoomMembers(any()) } returns memberList
+
+        every { getRoomMembersLive(any()) } returns MutableLiveData(memberList)
+
+        every { areAllMembersLoadedLive() } returns MutableLiveData(true)
+
+        coEvery { areAllMembersLoaded() } returns true
+    }
+
+    private val fakeRoomCryptoService: RoomCryptoService = mockk {
+        every { isEncrypted() } returns true
+    }
+    private val fakeRoom: Room = mockk {
+
+        val fakeStateService: StateService = mockk {
+            every { getStateEventLive(any(), any()) } returns MutableLiveData()
+            every { getStateEventsLive(any(), any()) } returns MutableLiveData()
+            every { getStateEvent(any(), any()) } returns null
+        }
+
+        every { stateService() } returns fakeStateService
+
+        every { coroutineDispatchers } returns testCoroutineDispatchers
+
+        every { getRoomSummaryLive() } returns MutableLiveData<Optional<RoomSummary>>(Optional(fakeRoomSummary))
+
+        every { membershipService() } returns fakeMembershipservice
+
+        every { roomCryptoService() } returns fakeRoomCryptoService
+
+        every { roomSummary() } returns fakeRoomSummary
+    }
+
+    private val fakeUserService: UserService = mockk {
+        every { getIgnoredUsersLive() } returns MutableLiveData()
+    }
+
+    val fakeSession: Session = mockk {
+
+        val fakeCrossSigningService: CrossSigningService = mockk {
+            every { isUserTrusted(aliceMxid) } returns true
+            every { isUserTrusted(bobMxid) } returns true
+            every { isUserTrusted(marcMxid) } returns false
+
+            every { getUserCrossSigningKeys(aliceMxid) } returns MXCrossSigningInfo(
+                    aliceMxid,
+                    crossSigningKeys = listOf(
+                            CryptoCrossSigningKey(
+                                    aliceMxid,
+                                    usages = listOf("master"),
+                                    keys = emptyMap(),
+                                    trustLevel = DeviceTrustLevel(true, true),
+                                    signatures = emptyMap()
+                            ),
+                            CryptoCrossSigningKey(
+                                    aliceMxid,
+                                    usages = listOf("self_signing"),
+                                    keys = emptyMap(),
+                                    trustLevel = DeviceTrustLevel(true, true),
+                                    signatures = emptyMap()
+                            ),
+                            CryptoCrossSigningKey(
+                                    aliceMxid,
+                                    usages = listOf("user_signing"),
+                                    keys = emptyMap(),
+                                    trustLevel = DeviceTrustLevel(true, true),
+                                    signatures = emptyMap()
+                            )
+                    ),
+                    true
+            )
+            every { getUserCrossSigningKeys(bobMxid) } returns MXCrossSigningInfo(
+                    aliceMxid,
+                    crossSigningKeys = listOf(
+                            CryptoCrossSigningKey(
+                                    bobMxid,
+                                    usages = listOf("master"),
+                                    keys = emptyMap(),
+                                    trustLevel = DeviceTrustLevel(true, true),
+                                    signatures = emptyMap()
+                            ),
+                            CryptoCrossSigningKey(
+                                    bobMxid,
+                                    usages = listOf("self_signing"),
+                                    keys = emptyMap(),
+                                    trustLevel = DeviceTrustLevel(true, true),
+                                    signatures = emptyMap()
+                            ),
+                            CryptoCrossSigningKey(
+                                    bobMxid,
+                                    usages = listOf("user_signing"),
+                                    keys = emptyMap(),
+                                    trustLevel = DeviceTrustLevel(true, true),
+                                    signatures = emptyMap()
+                            )
+                    ),
+                    true
+            )
+            every { getUserCrossSigningKeys(marcMxid) } returns MXCrossSigningInfo(
+                    aliceMxid,
+                    crossSigningKeys = listOf(
+                            CryptoCrossSigningKey(
+                                    marcMxid,
+                                    usages = listOf("master"),
+                                    keys = emptyMap(),
+                                    trustLevel = DeviceTrustLevel(false, false),
+                                    signatures = emptyMap()
+                            ),
+                            CryptoCrossSigningKey(
+                                    marcMxid,
+                                    usages = listOf("self_signing"),
+                                    keys = emptyMap(),
+                                    trustLevel = DeviceTrustLevel(false, false),
+                                    signatures = emptyMap()
+                            ),
+                            CryptoCrossSigningKey(
+                                    marcMxid,
+                                    usages = listOf("user_signing"),
+                                    keys = emptyMap(),
+                                    trustLevel = DeviceTrustLevel(false, false),
+                                    signatures = emptyMap()
+                            )
+                    ),
+                    true
+            )
+        }
+
+        val fakeCryptoService: CryptoService = mockk {
+            every { crossSigningService() } returns fakeCrossSigningService
+
+            every {
+                getLiveCryptoDeviceInfo(listOf(aliceMxid, bobMxid, marcMxid))
+            } returns MutableLiveData(
+                    listOf(
+                            aliceDevice1, aliceDevice2, bobDevice1, bobDevice2, markDevice
+                    )
+            )
+        }
+
+        val fakeRoomService: RoomService = mockk {
+            every { getRoom(any()) } returns fakeRoom
+        }
+        every { roomService() } returns fakeRoomService
+        every { userService() } returns fakeUserService
+        every { cryptoService() } returns fakeCryptoService
+    }
+
+    private val fakeRoomSummary = RoomSummary(
+            roomId = fakeRoomId,
+            displayName = "Fake Room",
+            topic = "A topic",
+            isEncrypted = true,
+            encryptionEventTs = 0,
+            typingUsers = emptyList(),
+    )
+
+    @Test
+    fun testBasicUserVerificationLevels() {
+        val viewModel = createViewModel()
+        viewModel
+                .test()
+                .assertLatestState {
+                    val trustMap = it.trustLevelMap.invoke() ?: return@assertLatestState false
+                    trustMap[aliceMxid] == UserVerificationLevel.VERIFIED_WITH_DEVICES_UNTRUSTED &&
+                            trustMap[bobMxid] == UserVerificationLevel.VERIFIED_ALL_DEVICES_TRUSTED &&
+                            trustMap[marcMxid] == UserVerificationLevel.UNVERIFIED_BUT_WAS_PREVIOUSLY
+                }
+                .finish()
+    }
+
+    private fun createViewModel(): RoomMemberListViewModel {
+        return RoomMemberListViewModel(
+                RoomMemberListViewState(args),
+                RoomMemberSummaryComparator(),
+                fakeSession,
+        )
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/analytics/impl/DefaultVectorAnalyticsTest.kt b/vector/src/test/java/im/vector/app/features/analytics/impl/DefaultVectorAnalyticsTest.kt
index 543d517db1..3fd0528a19 100644
--- a/vector/src/test/java/im/vector/app/features/analytics/impl/DefaultVectorAnalyticsTest.kt
+++ b/vector/src/test/java/im/vector/app/features/analytics/impl/DefaultVectorAnalyticsTest.kt
@@ -23,6 +23,7 @@ import im.vector.app.test.fakes.FakeAnalyticsStore
 import im.vector.app.test.fakes.FakeLateInitUserPropertiesFactory
 import im.vector.app.test.fakes.FakePostHog
 import im.vector.app.test.fakes.FakePostHogFactory
+import im.vector.app.test.fakes.FakeSentryAnalytics
 import im.vector.app.test.fixtures.AnalyticsConfigFixture.anAnalyticsConfig
 import im.vector.app.test.fixtures.aUserProperties
 import im.vector.app.test.fixtures.aVectorAnalyticsEvent
@@ -45,9 +46,11 @@ class DefaultVectorAnalyticsTest {
     private val fakePostHog = FakePostHog()
     private val fakeAnalyticsStore = FakeAnalyticsStore()
     private val fakeLateInitUserPropertiesFactory = FakeLateInitUserPropertiesFactory()
+    private val fakeSentryAnalytics = FakeSentryAnalytics()
 
     private val defaultVectorAnalytics = DefaultVectorAnalytics(
             postHogFactory = FakePostHogFactory(fakePostHog.instance).instance,
+            sentryAnalytics = fakeSentryAnalytics.instance,
             analyticsStore = fakeAnalyticsStore.instance,
             globalScope = CoroutineScope(Dispatchers.Unconfined),
             analyticsConfig = anAnalyticsConfig(isEnabled = true),
@@ -67,17 +70,21 @@ class DefaultVectorAnalyticsTest {
     }
 
     @Test
-    fun `when consenting to analytics then updates posthog opt out to false`() = runTest {
+    fun `when consenting to analytics then updates posthog opt out to false and initialize Sentry`() = runTest {
         fakeAnalyticsStore.givenUserContent(consent = true)
 
         fakePostHog.verifyOptOutStatus(optedOut = false)
+
+        fakeSentryAnalytics.verifySentryInit()
     }
 
     @Test
-    fun `when revoking consent to analytics then updates posthog opt out to true`() = runTest {
+    fun `when revoking consent to analytics then updates posthog opt out to true and closes Sentry`() = runTest {
         fakeAnalyticsStore.givenUserContent(consent = false)
 
         fakePostHog.verifyOptOutStatus(optedOut = true)
+
+        fakeSentryAnalytics.verifySentryClose()
     }
 
     @Test
@@ -97,12 +104,14 @@ class DefaultVectorAnalyticsTest {
     }
 
     @Test
-    fun `when signing out then resets posthog`() = runTest {
+    fun `when signing out then resets posthog and closes Sentry`() = runTest {
         fakeAnalyticsStore.allowSettingAnalyticsIdToCallBackingFlow()
 
         defaultVectorAnalytics.onSignOut()
 
         fakePostHog.verifyReset()
+
+        fakeSentryAnalytics.verifySentryClose()
     }
 
     @Test
@@ -140,6 +149,25 @@ class DefaultVectorAnalyticsTest {
 
         fakePostHog.verifyNoEventTracking()
     }
+
+    @Test
+    fun `given user has consented, when tracking exception, then submits to sentry`() = runTest {
+        fakeAnalyticsStore.givenUserContent(consent = true)
+        val exception = Exception("test")
+
+        defaultVectorAnalytics.trackError(exception)
+
+        fakeSentryAnalytics.verifySentryTrackError(exception)
+    }
+
+    @Test
+    fun `given user has not consented, when tracking exception, then does not track to sentry`() = runTest {
+        fakeAnalyticsStore.givenUserContent(consent = false)
+
+        defaultVectorAnalytics.trackError(Exception("test"))
+
+        fakeSentryAnalytics.verifyNoErrorTracking()
+    }
 }
 
 private fun VectorAnalyticsScreen.toPostHogProperties(): Properties? {
diff --git a/vector/src/test/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModelTest.kt b/vector/src/test/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModelTest.kt
new file mode 100644
index 0000000000..e20d498a37
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModelTest.kt
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.attachments
+
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.test.fakes.FakeVectorFeatures
+import im.vector.app.test.fakes.FakeVectorPreferences
+import im.vector.app.test.test
+import io.mockk.verifyOrder
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+internal class AttachmentTypeSelectorViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule()
+
+    private val fakeVectorFeatures = FakeVectorFeatures()
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val initialState = AttachmentTypeSelectorViewState()
+
+    @Before
+    fun setUp() {
+        // Disable all features by default
+        fakeVectorFeatures.givenLocationSharing(isEnabled = false)
+        fakeVectorFeatures.givenVoiceBroadcast(isEnabled = false)
+        fakeVectorPreferences.givenTextFormatting(isEnabled = false)
+    }
+
+    @Test
+    fun `given features are not enabled, then options are not visible`() {
+        createViewModel()
+                .test()
+                .assertStates(
+                        listOf(
+                                initialState,
+                        )
+                )
+                .finish()
+    }
+
+    @Test
+    fun `given location sharing is enabled, then location sharing option is visible`() {
+        fakeVectorFeatures.givenLocationSharing(isEnabled = true)
+
+        createViewModel()
+                .test()
+                .assertStates(
+                        listOf(
+                                initialState.copy(
+                                        isLocationVisible = true
+                                ),
+                        )
+                )
+                .finish()
+    }
+
+    @Test
+    fun `given voice broadcast is enabled, then voice broadcast option is visible`() {
+        fakeVectorFeatures.givenVoiceBroadcast(isEnabled = true)
+
+        createViewModel()
+                .test()
+                .assertStates(
+                        listOf(
+                                initialState.copy(
+                                        isVoiceBroadcastVisible = true
+                                ),
+                        )
+                )
+                .finish()
+    }
+
+    @Test
+    fun `given text formatting is enabled, then text formatting option is checked`() {
+        fakeVectorPreferences.givenTextFormatting(isEnabled = true)
+
+        createViewModel()
+                .test()
+                .assertStates(
+                        listOf(
+                                initialState.copy(
+                                        isTextFormattingEnabled = true
+                                ),
+                        )
+                )
+                .finish()
+    }
+
+    @Test
+    fun `when text formatting is changed, then it updates the UI`() {
+        createViewModel()
+                .apply {
+                    handle(AttachmentTypeSelectorAction.ToggleTextFormatting(isEnabled = true))
+                }
+                .test()
+                .assertStates(
+                        listOf(
+                                initialState.copy(
+                                        isTextFormattingEnabled = true
+                                ),
+                        )
+                )
+                .finish()
+    }
+
+    @Test
+    fun `when text formatting is changed, then it persists the change`() {
+        createViewModel()
+                .apply {
+                    handle(AttachmentTypeSelectorAction.ToggleTextFormatting(isEnabled = true))
+                    handle(AttachmentTypeSelectorAction.ToggleTextFormatting(isEnabled = false))
+                }
+        verifyOrder {
+            fakeVectorPreferences.instance.setTextFormattingEnabled(true)
+            fakeVectorPreferences.instance.setTextFormattingEnabled(false)
+        }
+    }
+
+    private fun createViewModel(): AttachmentTypeSelectorViewModel {
+        return AttachmentTypeSelectorViewModel(
+                initialState,
+                vectorFeatures = fakeVectorFeatures,
+                vectorPreferences = fakeVectorPreferences.instance,
+        )
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/auth/PendingAuthHandlerTest.kt b/vector/src/test/java/im/vector/app/features/auth/PendingAuthHandlerTest.kt
new file mode 100644
index 0000000000..a3b75aa7f4
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/auth/PendingAuthHandlerTest.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.auth
+
+import android.util.Base64
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeMatrix
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.runs
+import io.mockk.unmockkAll
+import io.mockk.verify
+import org.amshove.kluent.shouldBe
+import org.junit.After
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Test
+import org.matrix.android.sdk.api.auth.UIABaseAuth
+import org.matrix.android.sdk.api.auth.UserPasswordAuth
+import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+private const val A_PASSWORD = "a-password"
+private const val A_SESSION_ID = "session-id"
+
+class PendingAuthHandlerTest {
+
+    private val fakeMatrix = FakeMatrix()
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+
+    private val pendingAuthHandler = PendingAuthHandler(
+            matrix = fakeMatrix.instance,
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+    )
+
+    @Before
+    fun setUp() {
+        mockkStatic(Base64::class)
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a pending auth and continuation when SSO auth is done then continuation is resumed with pending auth`() {
+        // Given
+        val pendingAuth = mockk<UIABaseAuth>()
+        val continuation = mockk<Continuation<UIABaseAuth>>()
+        every { continuation.resume(any()) } just runs
+        pendingAuthHandler.pendingAuth = pendingAuth
+        pendingAuthHandler.uiaContinuation = continuation
+
+        // When
+        pendingAuthHandler.ssoAuthDone()
+
+        // Then
+        verify { continuation.resume(pendingAuth) }
+    }
+
+    @Test
+    @Ignore("Ignored due because of problem to mock the inline method continuation.resumeWithException")
+    fun `given missing pending auth and continuation when SSO auth is done then continuation is resumed with error`() {
+        // Given
+        val pendingAuth = null
+        val continuation = mockk<Continuation<UIABaseAuth>>()
+        every { continuation.resumeWithException(any()) } just runs
+        pendingAuthHandler.pendingAuth = pendingAuth
+        pendingAuthHandler.uiaContinuation = continuation
+
+        // When
+        pendingAuthHandler.ssoAuthDone()
+
+        // Then
+        verify { continuation.resumeWithException(match { it is IllegalArgumentException }) }
+    }
+
+    @Test
+    fun `given a password, pending auth and continuation when password auth is done then continuation is resumed with correct auth`() {
+        // Given
+        val pendingAuth = mockk<UIABaseAuth>()
+        every { pendingAuth.session } returns A_SESSION_ID
+        val continuation = mockk<Continuation<UIABaseAuth>>()
+        every { continuation.resume(any()) } just runs
+        pendingAuthHandler.pendingAuth = pendingAuth
+        pendingAuthHandler.uiaContinuation = continuation
+        val decryptedPwd = "decrypted-pwd"
+        val decodedPwd = byteArrayOf()
+        every { Base64.decode(A_PASSWORD, any()) } returns decodedPwd
+        fakeMatrix.fakeSecureStorageService.givenLoadSecureSecretReturns(decryptedPwd)
+        val expectedAuth = UserPasswordAuth(
+                session = A_SESSION_ID,
+                password = decryptedPwd,
+                user = fakeActiveSessionHolder.fakeSession.myUserId
+        )
+
+        // When
+        pendingAuthHandler.passwordAuthDone(A_PASSWORD)
+
+        // Then
+        verify {
+            fakeMatrix.fakeSecureStorageService.loadSecureSecret<String>(any(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
+            continuation.resume(expectedAuth)
+        }
+    }
+
+    @Test
+    @Ignore("Ignored because of problem to mock the inline method continuation.resumeWithException")
+    fun `given pending auth and continuation when reAuth is cancelled then pending auth and continuation are reset`() {
+        // Given
+        val pendingAuth = mockk<UIABaseAuth>()
+        val continuation = mockk<Continuation<UIABaseAuth>>()
+        every { continuation.resumeWithException(any()) } just runs
+        pendingAuthHandler.pendingAuth = pendingAuth
+        pendingAuthHandler.uiaContinuation = continuation
+
+        // When
+        pendingAuthHandler.reAuthCancelled()
+
+        // Then
+        pendingAuthHandler.pendingAuth shouldBe null
+        pendingAuthHandler.uiaContinuation shouldBe null
+        verify { continuation.resumeWithException(match { it is UiaCancelledException }) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/command/CommandParserTest.kt b/vector/src/test/java/im/vector/app/features/command/CommandParserTest.kt
index f5233a496c..f502db85ca 100644
--- a/vector/src/test/java/im/vector/app/features/command/CommandParserTest.kt
+++ b/vector/src/test/java/im/vector/app/features/command/CommandParserTest.kt
@@ -19,6 +19,8 @@ package im.vector.app.features.command
 import org.amshove.kluent.shouldBeEqualTo
 import org.junit.Test
 
+private const val A_SPACE_ID = "!my-space-id"
+
 class CommandParserTest {
     @Test
     fun parseSlashCommandEmpty() {
@@ -31,6 +33,15 @@ class CommandParserTest {
         test("/unknown with param", ParsedCommand.ErrorUnknownSlashCommand("/unknown"))
     }
 
+    @Test
+    fun parseSlashAddToSpaceCommand() {
+        test("/addToSpace $A_SPACE_ID", ParsedCommand.AddToSpace(A_SPACE_ID))
+    }
+    @Test
+    fun parseSlashJoinSpaceCommand() {
+        test("/joinSpace $A_SPACE_ID", ParsedCommand.JoinSpace(A_SPACE_ID))
+    }
+
     @Test
     fun parseSlashCommandNotACommand() {
         test("", ParsedCommand.ErrorNotACommand)
@@ -60,7 +71,7 @@ class CommandParserTest {
 
     private fun test(message: String, expectedResult: ParsedCommand) {
         val commandParser = CommandParser()
-        val result = commandParser.parseSlashCommand(message, false)
+        val result = commandParser.parseSlashCommand(message, null, false)
         result shouldBeEqualTo expectedResult
     }
 }
diff --git a/vector/src/test/java/im/vector/app/features/crypto/keys/KeysExporterTest.kt b/vector/src/test/java/im/vector/app/features/crypto/keys/KeysExporterTest.kt
index 3cd797a7b1..e4181f4e3f 100644
--- a/vector/src/test/java/im/vector/app/features/crypto/keys/KeysExporterTest.kt
+++ b/vector/src/test/java/im/vector/app/features/crypto/keys/KeysExporterTest.kt
@@ -17,12 +17,12 @@
 package im.vector.app.features.crypto.keys
 
 import android.net.Uri
-import android.os.ParcelFileDescriptor
 import im.vector.app.core.dispatchers.CoroutineDispatchers
 import im.vector.app.test.fakes.FakeContext
 import im.vector.app.test.fakes.FakeCryptoService
 import im.vector.app.test.fakes.FakeSession
 import io.mockk.every
+import io.mockk.justRun
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.Dispatchers
@@ -91,7 +91,10 @@ class KeysExporterTest {
 
     private fun givenFileDescriptorWithSize(size: Long) {
         context.givenFileDescriptor(A_URI, mode = "r") {
-            mockk<ParcelFileDescriptor>().also { every { it.statSize } returns size }
+            mockk {
+                every { statSize } returns size
+                justRun { close() }
+            }
         }
     }
 }
diff --git a/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt b/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt
index e5426c0d9d..b1f893b164 100644
--- a/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt
@@ -17,7 +17,7 @@
 package im.vector.app.features.crypto.quads
 
 import com.airbnb.mvrx.Uninitialized
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.test.fakes.FakeSession
 import im.vector.app.test.fakes.FakeStringProvider
 import im.vector.app.test.test
@@ -42,7 +42,7 @@ private val KEY_INFO_WITHOUT_PASSPHRASE = KeyInfo(id = "id", content = SecretSto
 class SharedSecureStorageViewModelTest {
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule()
+    val mavericksTestRule = MavericksTestRule()
 
     private val stringProvider = FakeStringProvider()
     private val fakeSession = FakeSession()
diff --git a/vector/src/test/java/im/vector/app/features/home/ShouldShowUnverifiedSessionsAlertUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/home/ShouldShowUnverifiedSessionsAlertUseCaseTest.kt
new file mode 100644
index 0000000000..5d08499e32
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/home/ShouldShowUnverifiedSessionsAlertUseCaseTest.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home
+
+import im.vector.app.config.Config
+import im.vector.app.test.fakes.FakeClock
+import im.vector.app.test.fakes.FakeVectorFeatures
+import im.vector.app.test.fakes.FakeVectorPreferences
+import org.amshove.kluent.shouldBe
+import org.junit.Test
+
+private val AN_EPOCH = Config.SHOW_UNVERIFIED_SESSIONS_ALERT_AFTER_MILLIS.toLong()
+private const val A_DEVICE_ID = "A_DEVICE_ID"
+
+class ShouldShowUnverifiedSessionsAlertUseCaseTest {
+
+    private val fakeVectorFeatures = FakeVectorFeatures()
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val fakeClock = FakeClock()
+
+    private val shouldShowUnverifiedSessionsAlertUseCase = ShouldShowUnverifiedSessionsAlertUseCase(
+            vectorFeatures = fakeVectorFeatures,
+            vectorPreferences = fakeVectorPreferences.instance,
+            clock = fakeClock,
+    )
+
+    @Test
+    fun `given the feature is disabled then the use case returns false`() {
+        fakeVectorFeatures.givenUnverifiedSessionsAlertEnabled(false)
+        fakeVectorPreferences.givenUnverifiedSessionsAlertLastShownMillis(0L)
+
+        shouldShowUnverifiedSessionsAlertUseCase.execute(A_DEVICE_ID) shouldBe false
+    }
+
+    @Test
+    fun `given the feature in enabled and there is not a saved preference then the use case returns true`() {
+        fakeVectorFeatures.givenUnverifiedSessionsAlertEnabled(true)
+        fakeVectorPreferences.givenUnverifiedSessionsAlertLastShownMillis(0L)
+        fakeClock.givenEpoch(AN_EPOCH + 1)
+
+        shouldShowUnverifiedSessionsAlertUseCase.execute(A_DEVICE_ID) shouldBe true
+    }
+
+    @Test
+    fun `given the feature in enabled and last shown is a long time ago then the use case returns true`() {
+        fakeVectorFeatures.givenUnverifiedSessionsAlertEnabled(true)
+        fakeVectorPreferences.givenUnverifiedSessionsAlertLastShownMillis(AN_EPOCH)
+        fakeClock.givenEpoch(AN_EPOCH * 2 + 1)
+
+        shouldShowUnverifiedSessionsAlertUseCase.execute(A_DEVICE_ID) shouldBe true
+    }
+
+    @Test
+    fun `given the feature in enabled and last shown is not a long time ago then the use case returns false`() {
+        fakeVectorFeatures.givenUnverifiedSessionsAlertEnabled(true)
+        fakeVectorPreferences.givenUnverifiedSessionsAlertLastShownMillis(AN_EPOCH)
+        fakeClock.givenEpoch(AN_EPOCH + 1)
+
+        shouldShowUnverifiedSessionsAlertUseCase.execute(A_DEVICE_ID) shouldBe false
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewModelTest.kt b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewModelTest.kt
new file mode 100644
index 0000000000..9739fbec13
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/link/SetLinkViewModelTest.kt
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.composer.link
+
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import org.junit.Rule
+import org.junit.Test
+
+class SetLinkViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
+
+    companion object {
+        const val link = "https://matrix.org"
+        const val newLink = "https://matrix.org/new"
+        const val text = "Matrix"
+    }
+
+    private val fragmentArgs = SetLinkFragment.Args(
+            isTextSupported = true,
+            initialLink = link
+    )
+
+    private fun createViewModel(
+            args: SetLinkFragment.Args
+    ) = SetLinkViewModel(
+            initialState = SetLinkViewState(args),
+    )
+
+    @Test
+    fun `given no initial link, then remove button is hidden`() {
+        val viewModel = createViewModel(
+                fragmentArgs
+                        .copy(initialLink = null)
+        )
+
+        val viewModelTest = viewModel.test()
+
+        viewModelTest
+                .assertLatestState { !it.removeVisible }
+                .finish()
+    }
+
+    @Test
+    fun `given no initial link, when link changed, then remove button is still hidden`() {
+        val viewModel = createViewModel(
+                fragmentArgs.copy(initialLink = null)
+        )
+
+        val viewModelTest = viewModel.test()
+        viewModel.handle(SetLinkAction.LinkChanged(newLink))
+
+        viewModelTest
+                .assertLatestState { !it.removeVisible }
+                .finish()
+    }
+
+    @Test
+    fun `when link is unchanged, it disables the save button`() {
+        val viewModel = createViewModel(
+                fragmentArgs
+                        .copy(initialLink = link)
+        )
+
+        val viewModelTest = viewModel.test()
+
+        viewModelTest
+                .assertLatestState { !it.saveEnabled }
+                .finish()
+    }
+
+    @Test
+    fun `when link is changed, it enables the save button`() {
+        val viewModel = createViewModel(
+                fragmentArgs.copy(initialLink = link)
+        )
+
+        val viewModelTest = viewModel.test()
+        viewModel.handle(SetLinkAction.LinkChanged(newLink))
+
+        viewModelTest
+                .assertLatestState { it.saveEnabled }
+                .finish()
+    }
+
+    @Test
+    fun `given no initial link, when link is changed to empty, it disables the save button`() {
+        val viewModel = createViewModel(
+                fragmentArgs.copy(initialLink = null)
+        )
+
+        val viewModelTest = viewModel.test()
+        viewModel.handle(SetLinkAction.LinkChanged(""))
+
+        viewModelTest
+                .assertLatestState {
+                    !it.saveEnabled
+                }
+                .finish()
+    }
+
+    @Test
+    fun `given text is supported, when saved, it emits the right event`() {
+        val viewModel = createViewModel(
+                fragmentArgs.copy(isTextSupported = true)
+        )
+
+        val viewModelTest = viewModel.test()
+        viewModel.handle(
+                SetLinkAction.Save(link = newLink, text = text)
+        )
+
+        viewModelTest
+                .assertEvent {
+                    it == SetLinkViewEvents.SavedLinkAndText(
+                            link = newLink,
+                            text = text,
+                    )
+                }
+                .finish()
+    }
+
+    @Test
+    fun `given text is not supported, when saved, it emits the right event`() {
+        val viewModel = createViewModel(
+                fragmentArgs.copy(isTextSupported = false)
+        )
+
+        val viewModelTest = viewModel.test()
+        viewModel.handle(
+                SetLinkAction.Save(link = newLink, text = text)
+        )
+
+        viewModelTest
+                .assertEvent {
+                    it == SetLinkViewEvents.SavedLink(link = newLink)
+                }
+                .finish()
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanRedactEventUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanRedactEventUseCaseTest.kt
index 08dd5dac5b..bedb289a39 100644
--- a/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanRedactEventUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanRedactEventUseCaseTest.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home.room.detail.timeline.action
 
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
 import im.vector.app.test.fakes.FakeActiveSessionHolder
 import io.mockk.mockk
 import org.amshove.kluent.shouldBe
@@ -34,8 +35,13 @@ class CheckIfCanRedactEventUseCaseTest {
 
     @Test
     fun `given an event which can be redacted and owned by user when use case executes then the result is true`() {
-        val canRedactEventTypes = listOf(EventType.MESSAGE, EventType.STICKER) +
-                EventType.POLL_START + EventType.STATE_ROOM_BEACON_INFO
+        val canRedactEventTypes = listOf(
+                EventType.MESSAGE,
+                EventType.STICKER,
+                VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO
+        ) +
+                EventType.POLL_START.values +
+                EventType.STATE_ROOM_BEACON_INFO.values
 
         canRedactEventTypes.forEach { eventType ->
             val event = givenAnEvent(
diff --git a/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCaseTest.kt
index 83d23681fc..51082e0e06 100644
--- a/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCaseTest.kt
@@ -43,7 +43,7 @@ class CheckIfCanReplyEventUseCaseTest {
 
     @Test
     fun `given reply is allowed for the event type when use case is executed then result is true`() {
-        val eventTypes = EventType.STATE_ROOM_BEACON_INFO + EventType.POLL_START + EventType.MESSAGE
+        val eventTypes = EventType.STATE_ROOM_BEACON_INFO.values + EventType.POLL_START.values + EventType.MESSAGE
 
         eventTypes.forEach { eventType ->
             val event = givenAnEvent(eventType)
diff --git a/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/render/ProcessBodyOfReplyToEventUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/render/ProcessBodyOfReplyToEventUseCaseTest.kt
new file mode 100644
index 0000000000..f612861511
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/render/ProcessBodyOfReplyToEventUseCaseTest.kt
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.render
+
+import android.annotation.StringRes
+import im.vector.app.R
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeStringProvider
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.getPollQuestion
+import org.matrix.android.sdk.api.session.events.model.isAudioMessage
+import org.matrix.android.sdk.api.session.events.model.isFileMessage
+import org.matrix.android.sdk.api.session.events.model.isImageMessage
+import org.matrix.android.sdk.api.session.events.model.isLiveLocation
+import org.matrix.android.sdk.api.session.events.model.isPoll
+import org.matrix.android.sdk.api.session.events.model.isSticker
+import org.matrix.android.sdk.api.session.events.model.isVideoMessage
+import org.matrix.android.sdk.api.session.events.model.isVoiceMessage
+import org.matrix.android.sdk.api.session.room.model.relation.ReplyToContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+
+private const val A_ROOM_ID = "room-id"
+private const val AN_EVENT_ID = "event-id"
+private const val A_REPLY_TO_EVENT_MATRIX_FORMATTED_BODY =
+        "<mx-reply>" +
+                "<blockquote>" +
+                "<a href=\"matrixToLink\">In reply to</a> " +
+                "<a href=\"matrixToLink\">@user:matrix.org</a>" +
+                "<br />" +
+                "Message content" +
+                "</blockquote>" +
+                "</mx-reply>" +
+                "Reply text"
+private const val A_NEW_PREFIX = "new-prefix"
+private const val A_NEW_CONTENT = "new-content"
+private const val PREFIX_PROCESSED_ONLY_REPLY_TO_EVENT_MATRIX_FORMATTED_BODY =
+        "<mx-reply>" +
+                "<blockquote>" +
+                "<a href=\"matrixToLink\">$A_NEW_PREFIX</a> " +
+                "<a href=\"matrixToLink\">@user:matrix.org</a>" +
+                "<br />" +
+                "Message content" +
+                "</blockquote>" +
+                "</mx-reply>" +
+                "Reply text"
+private const val FULLY_PROCESSED_REPLY_TO_EVENT_MATRIX_FORMATTED_BODY =
+        "<mx-reply>" +
+                "<blockquote>" +
+                "<a href=\"matrixToLink\">$A_NEW_PREFIX</a> " +
+                "<a href=\"matrixToLink\">@user:matrix.org</a>" +
+                "<br />" +
+                A_NEW_CONTENT +
+                "</blockquote>" +
+                "</mx-reply>" +
+                "Reply text"
+
+class ProcessBodyOfReplyToEventUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val fakeStringProvider = FakeStringProvider()
+    private val fakeReplyToContent = ReplyToContent(eventId = AN_EVENT_ID)
+    private val fakeRepliedEvent = givenARepliedEvent()
+
+    private val processBodyOfReplyToEventUseCase = ProcessBodyOfReplyToEventUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+            stringProvider = fakeStringProvider.instance,
+    )
+
+    @Before
+    fun setup() {
+        givenNewPrefix()
+        mockkStatic("org.matrix.android.sdk.api.session.events.model.EventKt")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a replied event of type file message when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isFileMessage = true)
+        givenNewContentForId(R.string.message_reply_to_sender_sent_file)
+
+        executeAndAssertResult()
+    }
+
+    @Test
+    fun `given a replied event of type voice message when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isVoiceMessage = true)
+        givenNewContentForId(R.string.message_reply_to_sender_sent_voice_message)
+
+        executeAndAssertResult()
+    }
+
+    @Test
+    fun `given a replied event of type audio message when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isAudioMessage = true)
+        givenNewContentForId(R.string.message_reply_to_sender_sent_audio_file)
+
+        executeAndAssertResult()
+    }
+
+    @Test
+    fun `given a replied event of type image message when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isImageMessage = true)
+        givenNewContentForId(R.string.message_reply_to_sender_sent_image)
+
+        executeAndAssertResult()
+    }
+
+    @Test
+    fun `given a replied event of type video message when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isVideoMessage = true)
+        givenNewContentForId(R.string.message_reply_to_sender_sent_video)
+
+        executeAndAssertResult()
+    }
+
+    @Test
+    fun `given a replied event of type sticker message when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isStickerMessage = true)
+        givenNewContentForId(R.string.message_reply_to_sender_sent_sticker)
+
+        executeAndAssertResult()
+    }
+
+    @Test
+    fun `given a replied event of type poll message with null question when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isPollMessage = true)
+        givenNewContentForId(R.string.message_reply_to_sender_created_poll)
+        every { fakeRepliedEvent.getPollQuestion() } returns null
+
+        executeAndAssertResult()
+    }
+
+    @Test
+    fun `given a replied event of type poll message with existing question when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isPollMessage = true)
+        givenNewContentForId(R.string.message_reply_to_sender_created_poll)
+        every { fakeRepliedEvent.getPollQuestion() } returns A_NEW_CONTENT
+
+        executeAndAssertResult()
+    }
+
+    @Test
+    fun `given a replied event of type live location message when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isLiveLocationMessage = true)
+        givenNewContentForId(R.string.live_location_description)
+
+        executeAndAssertResult()
+    }
+
+    @Test
+    fun `given a replied event of type not handled when process the formatted body only prefix is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent()
+
+        // When
+        val result = processBodyOfReplyToEventUseCase.execute(
+                roomId = A_ROOM_ID,
+                matrixFormattedBody = A_REPLY_TO_EVENT_MATRIX_FORMATTED_BODY,
+                replyToContent = fakeReplyToContent,
+        )
+
+        // Then
+        result shouldBeEqualTo PREFIX_PROCESSED_ONLY_REPLY_TO_EVENT_MATRIX_FORMATTED_BODY
+    }
+
+    @Test
+    fun `given no replied event found when process the formatted body then only prefix is replaced by correct string`() {
+        // Given
+        givenARepliedEvent(timelineEvent = null)
+
+        // When
+        val result = processBodyOfReplyToEventUseCase.execute(
+                roomId = A_ROOM_ID,
+                matrixFormattedBody = A_REPLY_TO_EVENT_MATRIX_FORMATTED_BODY,
+                replyToContent = fakeReplyToContent,
+        )
+
+        // Then
+        result shouldBeEqualTo PREFIX_PROCESSED_ONLY_REPLY_TO_EVENT_MATRIX_FORMATTED_BODY
+    }
+
+    private fun executeAndAssertResult() {
+        // When
+        val result = processBodyOfReplyToEventUseCase.execute(
+                roomId = A_ROOM_ID,
+                matrixFormattedBody = A_REPLY_TO_EVENT_MATRIX_FORMATTED_BODY,
+                replyToContent = fakeReplyToContent,
+        )
+
+        // Then
+        result shouldBeEqualTo FULLY_PROCESSED_REPLY_TO_EVENT_MATRIX_FORMATTED_BODY
+    }
+
+    private fun givenARepliedEvent(timelineEvent: TimelineEvent? = mockk()): Event {
+        val event = mockk<Event>()
+        timelineEvent?.let { every { it.root } returns event }
+        fakeActiveSessionHolder
+                .fakeSession
+                .roomService()
+                .getRoom(A_ROOM_ID)
+                .timelineService()
+                .givenTimelineEvent(timelineEvent)
+        return event
+    }
+
+    private fun givenTypeOfRepliedEvent(
+            isFileMessage: Boolean = false,
+            isVoiceMessage: Boolean = false,
+            isAudioMessage: Boolean = false,
+            isImageMessage: Boolean = false,
+            isVideoMessage: Boolean = false,
+            isStickerMessage: Boolean = false,
+            isPollMessage: Boolean = false,
+            isLiveLocationMessage: Boolean = false,
+    ) {
+        every { fakeRepliedEvent.isFileMessage() } returns isFileMessage
+        every { fakeRepliedEvent.isVoiceMessage() } returns isVoiceMessage
+        every { fakeRepliedEvent.isAudioMessage() } returns isAudioMessage
+        every { fakeRepliedEvent.isImageMessage() } returns isImageMessage
+        every { fakeRepliedEvent.isVideoMessage() } returns isVideoMessage
+        every { fakeRepliedEvent.isSticker() } returns isStickerMessage
+        every { fakeRepliedEvent.isPoll() } returns isPollMessage
+        every { fakeRepliedEvent.isLiveLocation() } returns isLiveLocationMessage
+    }
+
+    private fun givenNewPrefix() {
+        fakeStringProvider.given(R.string.message_reply_to_prefix, A_NEW_PREFIX)
+    }
+
+    private fun givenNewContentForId(@StringRes resId: Int) {
+        fakeStringProvider.given(resId, A_NEW_CONTENT)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/location/live/GetLiveLocationShareSummaryUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/location/live/GetLiveLocationShareSummaryUseCaseTest.kt
index ed1bcebf16..89966b5317 100644
--- a/vector/src/test/java/im/vector/app/features/location/live/GetLiveLocationShareSummaryUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/location/live/GetLiveLocationShareSummaryUseCaseTest.kt
@@ -18,7 +18,7 @@ package im.vector.app.features.location.live
 
 import im.vector.app.test.fakes.FakeFlowLiveDataConversions
 import im.vector.app.test.fakes.FakeSession
-import im.vector.app.test.fakes.givenAsFlowReturns
+import im.vector.app.test.fakes.givenAsFlow
 import io.mockk.unmockkAll
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
@@ -28,7 +28,6 @@ import org.junit.Before
 import org.junit.Test
 import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
 import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
-import org.matrix.android.sdk.api.util.Optional
 
 private const val A_ROOM_ID = "room_id"
 private const val AN_EVENT_ID = "event_id"
@@ -64,7 +63,7 @@ class GetLiveLocationShareSummaryUseCaseTest {
                 .getRoom(A_ROOM_ID)
                 .locationSharingService()
                 .givenLiveLocationShareSummaryReturns(AN_EVENT_ID, summary)
-                .givenAsFlowReturns(Optional(summary))
+                .givenAsFlow()
 
         val result = getLiveLocationShareSummaryUseCase.execute(A_ROOM_ID, AN_EVENT_ID).first()
 
@@ -77,7 +76,7 @@ class GetLiveLocationShareSummaryUseCaseTest {
                 .getRoom(A_ROOM_ID)
                 .locationSharingService()
                 .givenLiveLocationShareSummaryReturns(AN_EVENT_ID, null)
-                .givenAsFlowReturns(Optional(null))
+                .givenAsFlow()
 
         val result = getLiveLocationShareSummaryUseCase.execute(A_ROOM_ID, AN_EVENT_ID).first()
 
diff --git a/vector/src/test/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCaseTest.kt
index 420b8e6a06..6d24858915 100644
--- a/vector/src/test/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCaseTest.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.location.live.map
 import im.vector.app.features.location.LocationData
 import im.vector.app.test.fakes.FakeFlowLiveDataConversions
 import im.vector.app.test.fakes.FakeSession
-import im.vector.app.test.fakes.givenAsFlowReturns
+import im.vector.app.test.fakes.givenAsFlow
 import io.mockk.coEvery
 import io.mockk.mockk
 import io.mockk.unmockkAll
@@ -81,7 +81,7 @@ class GetListOfUserLiveLocationUseCaseTest {
                 .getRoom(A_ROOM_ID)
                 .locationSharingService()
                 .givenRunningLiveLocationShareSummariesReturns(summaries)
-                .givenAsFlowReturns(summaries)
+                .givenAsFlow()
 
         val viewState1 = UserLiveLocationViewState(
                 matrixItem = MatrixItem.UserItem(id = "@userId1:matrix.org", displayName = "User 1", avatarUrl = ""),
diff --git a/vector/src/test/java/im/vector/app/features/location/live/map/LiveLocationMapViewModelTest.kt b/vector/src/test/java/im/vector/app/features/location/live/map/LiveLocationMapViewModelTest.kt
index fca5db14cc..fef0f55530 100644
--- a/vector/src/test/java/im/vector/app/features/location/live/map/LiveLocationMapViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/location/live/map/LiveLocationMapViewModelTest.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.location.live.map
 
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.live.StopLiveLocationShareUseCase
 import im.vector.app.test.fakes.FakeLocationSharingServiceConnection
@@ -37,7 +37,7 @@ private const val A_ROOM_ID = "room_id"
 class LiveLocationMapViewModelTest {
 
     @get:Rule
-    val mvRxTestRule = MvRxTestRule(testDispatcher = UnconfinedTestDispatcher())
+    val mavericksTestRule = MavericksTestRule(testDispatcher = UnconfinedTestDispatcher())
 
     private val args = LiveLocationMapViewArgs(roomId = A_ROOM_ID)
 
diff --git a/vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt b/vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt
new file mode 100644
index 0000000000..bdf1dbd4e6
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.navigation
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeAnalyticsTracker
+import im.vector.app.test.fakes.FakeContext
+import im.vector.app.test.fakes.FakeDebugNavigator
+import im.vector.app.test.fakes.FakeSpaceStateHandler
+import im.vector.app.test.fakes.FakeSupportedVerificationMethodsProvider
+import im.vector.app.test.fakes.FakeVectorFeatures
+import im.vector.app.test.fakes.FakeVectorPreferences
+import im.vector.app.test.fakes.FakeWidgetArgsBuilder
+import im.vector.app.test.fixtures.RoomSummaryFixture.aRoomSummary
+import org.junit.Test
+
+internal class DefaultNavigatorTest {
+
+    private val sessionHolder = FakeActiveSessionHolder()
+    private val vectorPreferences = FakeVectorPreferences()
+    private val widgetArgsBuilder = FakeWidgetArgsBuilder()
+    private val spaceStateHandler = FakeSpaceStateHandler()
+    private val supportedVerificationMethodsProvider = FakeSupportedVerificationMethodsProvider()
+    private val features = FakeVectorFeatures()
+    private val analyticsTracker = FakeAnalyticsTracker()
+    private val debugNavigator = FakeDebugNavigator()
+
+    private val navigator = DefaultNavigator(
+            sessionHolder.instance,
+            vectorPreferences.instance,
+            widgetArgsBuilder.instance,
+            spaceStateHandler,
+            supportedVerificationMethodsProvider.instance,
+            features,
+            analyticsTracker,
+            debugNavigator,
+    )
+
+    /**
+     * The below test is by no means all that we want to test in [DefaultNavigator].
+     * Please add relevant tests as you make changes to or related to other functions in the class.
+     */
+
+    @Test
+    fun `when switchToSpace, then current space set`() {
+        val spaceId = "space-id"
+        val spaceSummary = aRoomSummary(spaceId)
+        sessionHolder.fakeSession.fakeRoomService.getRoomSummaryReturns(spaceSummary)
+
+        navigator.switchToSpace(FakeContext().instance, spaceId, Navigator.PostSwitchSpaceAction.None)
+
+        spaceStateHandler.verifySetCurrentSpace(spaceId)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/notifications/CircularCacheTest.kt b/vector/src/test/java/im/vector/app/features/notifications/CircularCacheTest.kt
index 6428b1025b..509e2a8e29 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/CircularCacheTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/CircularCacheTest.kt
@@ -66,7 +66,7 @@ class CircularCacheTest {
         return CircularCache(cacheSize, factory) to internalData!!
     }
 
-    private fun CircularCache<Int>.putInOrder(vararg keys: Int) {
-        keys.forEach { put(it) }
+    private fun CircularCache<Int>.putInOrder(vararg values: Int) {
+        values.forEach { put(it) }
     }
 }
diff --git a/vector/src/test/java/im/vector/app/features/notifications/NotifiableEventProcessorTest.kt b/vector/src/test/java/im/vector/app/features/notifications/NotifiableEventProcessorTest.kt
index 131a423316..59e42a9568 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/NotifiableEventProcessorTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/NotifiableEventProcessorTest.kt
@@ -27,6 +27,7 @@ import org.junit.Test
 import org.matrix.android.sdk.api.session.events.model.EventType
 
 private val NOT_VIEWING_A_ROOM: String? = null
+private val NOT_VIEWING_A_THREAD: String? = null
 
 class NotifiableEventProcessorTest {
 
@@ -42,7 +43,7 @@ class NotifiableEventProcessorTest {
                 aSimpleNotifiableEvent(eventId = "event-2")
         )
 
-        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, renderedEvents = emptyList())
+        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, currentThreadId = NOT_VIEWING_A_THREAD, renderedEvents = emptyList())
 
         result shouldBeEqualTo listOfProcessedEvents(
                 Type.KEEP to events[0],
@@ -54,7 +55,7 @@ class NotifiableEventProcessorTest {
     fun `given redacted simple event when processing then remove redaction event`() {
         val events = listOf(aSimpleNotifiableEvent(eventId = "event-1", type = EventType.REDACTION))
 
-        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, renderedEvents = emptyList())
+        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, currentThreadId = NOT_VIEWING_A_THREAD, renderedEvents = emptyList())
 
         result shouldBeEqualTo listOfProcessedEvents(
                 Type.REMOVE to events[0]
@@ -69,7 +70,7 @@ class NotifiableEventProcessorTest {
                 anInviteNotifiableEvent(roomId = "room-2")
         )
 
-        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, renderedEvents = emptyList())
+        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, currentThreadId = NOT_VIEWING_A_THREAD, renderedEvents = emptyList())
 
         result shouldBeEqualTo listOfProcessedEvents(
                 Type.REMOVE to events[0],
@@ -85,7 +86,7 @@ class NotifiableEventProcessorTest {
                 anInviteNotifiableEvent(roomId = "room-2")
         )
 
-        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, renderedEvents = emptyList())
+        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, currentThreadId = NOT_VIEWING_A_THREAD, renderedEvents = emptyList())
 
         result shouldBeEqualTo listOfProcessedEvents(
                 Type.KEEP to events[0],
@@ -98,7 +99,7 @@ class NotifiableEventProcessorTest {
         val events = listOf(aNotifiableMessageEvent(eventId = "event-1", roomId = "room-1"))
         outdatedDetector.givenEventIsOutOfDate(events[0])
 
-        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, renderedEvents = emptyList())
+        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, currentThreadId = NOT_VIEWING_A_THREAD, renderedEvents = emptyList())
 
         result shouldBeEqualTo listOfProcessedEvents(
                 Type.REMOVE to events[0],
@@ -110,7 +111,7 @@ class NotifiableEventProcessorTest {
         val events = listOf(aNotifiableMessageEvent(eventId = "event-1", roomId = "room-1"))
         outdatedDetector.givenEventIsInDate(events[0])
 
-        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, renderedEvents = emptyList())
+        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, currentThreadId = NOT_VIEWING_A_THREAD, renderedEvents = emptyList())
 
         result shouldBeEqualTo listOfProcessedEvents(
                 Type.KEEP to events[0],
@@ -118,16 +119,51 @@ class NotifiableEventProcessorTest {
     }
 
     @Test
-    fun `given viewing the same room as message event when processing then removes message`() {
-        val events = listOf(aNotifiableMessageEvent(eventId = "event-1", roomId = "room-1"))
+    fun `given viewing the same room main timeline when processing main timeline message event then removes message`() {
+        val events = listOf(aNotifiableMessageEvent(eventId = "event-1", roomId = "room-1", threadId = null))
 
-        val result = eventProcessor.process(events, currentRoomId = "room-1", renderedEvents = emptyList())
+        val result = eventProcessor.process(events, currentRoomId = "room-1", currentThreadId = null, renderedEvents = emptyList())
 
         result shouldBeEqualTo listOfProcessedEvents(
                 Type.REMOVE to events[0],
         )
     }
 
+    @Test
+    fun `given viewing the same thread timeline when processing thread message event then removes message`() {
+        val events = listOf(aNotifiableMessageEvent(eventId = "event-1", roomId = "room-1", threadId = "thread-1"))
+
+        val result = eventProcessor.process(events, currentRoomId = "room-1", currentThreadId = "thread-1", renderedEvents = emptyList())
+
+        result shouldBeEqualTo listOfProcessedEvents(
+                Type.REMOVE to events[0],
+        )
+    }
+
+    @Test
+    fun `given viewing main timeline of the same room when processing thread timeline message event then keep message`() {
+        val events = listOf(aNotifiableMessageEvent(eventId = "event-1", roomId = "room-1", threadId = "thread-1"))
+        outdatedDetector.givenEventIsInDate(events[0])
+
+        val result = eventProcessor.process(events, currentRoomId = "room-1", currentThreadId = null, renderedEvents = emptyList())
+
+        result shouldBeEqualTo listOfProcessedEvents(
+                Type.KEEP to events[0],
+        )
+    }
+
+    @Test
+    fun `given viewing thread timeline of the same room when processing main timeline message event then keep message`() {
+        val events = listOf(aNotifiableMessageEvent(eventId = "event-1", roomId = "room-1"))
+        outdatedDetector.givenEventIsInDate(events[0])
+
+        val result = eventProcessor.process(events, currentRoomId = "room-1", currentThreadId = "thread-1", renderedEvents = emptyList())
+
+        result shouldBeEqualTo listOfProcessedEvents(
+                Type.KEEP to events[0],
+        )
+    }
+
     @Test
     fun `given events are different to rendered events when processing then removes difference`() {
         val events = listOf(aSimpleNotifiableEvent(eventId = "event-1"))
@@ -136,7 +172,7 @@ class NotifiableEventProcessorTest {
                 ProcessedEvent(Type.KEEP, anInviteNotifiableEvent(roomId = "event-2"))
         )
 
-        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, renderedEvents = renderedEvents)
+        val result = eventProcessor.process(events, currentRoomId = NOT_VIEWING_A_ROOM, currentThreadId = NOT_VIEWING_A_THREAD, renderedEvents = renderedEvents)
 
         result shouldBeEqualTo listOfProcessedEvents(
                 Type.REMOVE to renderedEvents[1].event,
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index 5a0fcac576..bbca6e2aa6 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -18,8 +18,9 @@ package im.vector.app.features.onboarding
 
 import android.net.Uri
 import android.os.Build
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.R
+import im.vector.app.core.session.ConfigureAndStartSessionUseCase
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.ReAuthHelper
@@ -48,7 +49,9 @@ import im.vector.app.test.fakes.FakeVectorOverrides
 import im.vector.app.test.fakes.toTestString
 import im.vector.app.test.fixtures.a401ServerError
 import im.vector.app.test.fixtures.aHomeServerCapabilities
+import im.vector.app.test.fixtures.anUnrecognisedCertificateError
 import im.vector.app.test.test
+import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
 import org.amshove.kluent.shouldBeEqualTo
 import org.junit.Before
@@ -59,6 +62,7 @@ import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import org.matrix.android.sdk.api.auth.registration.Stage
 import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.network.ssl.Fingerprint
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 
@@ -66,10 +70,12 @@ private const val A_DISPLAY_NAME = "a display name"
 private const val A_PICTURE_FILENAME = "a-picture.png"
 private val A_SERVER_ERROR = a401ServerError()
 private val AN_ERROR = RuntimeException("an error!")
+private val AN_UNRECOGNISED_CERTIFICATE_ERROR = anUnrecognisedCertificateError()
 private val A_LOADABLE_REGISTER_ACTION = RegisterAction.StartRegistration
 private val A_NON_LOADABLE_REGISTER_ACTION = RegisterAction.CheckIfEmailHasBeenValidated(delayMillis = -1L)
 private val A_RESULT_IGNORED_REGISTER_ACTION = RegisterAction.SendAgainThreePid
 private val A_HOMESERVER_CAPABILITIES = aHomeServerCapabilities(canChangeDisplayName = true, canChangeAvatar = true)
+private val A_FINGERPRINT = Fingerprint(ByteArray(1), Fingerprint.HashType.SHA1)
 private val ANY_CONTINUING_REGISTRATION_RESULT = RegistrationActionHandler.Result.NextStage(Stage.Dummy(mandatory = true))
 private val A_DIRECT_LOGIN = OnboardingAction.AuthenticateAction.LoginDirect("@a-user:id.org", "a-password", "a-device-name")
 private const val A_HOMESERVER_URL = "https://edited-homeserver.org"
@@ -78,6 +84,7 @@ private val A_HOMESERVER_CONFIG = HomeServerConnectionConfig(FakeUri().instance)
 private val SELECTED_HOMESERVER_STATE = SelectedHomeserverState(preferredLoginMode = LoginMode.Password, userFacingUrl = A_HOMESERVER_URL)
 private val SELECTED_HOMESERVER_STATE_SUPPORTED_LOGOUT_DEVICES = SelectedHomeserverState(isLogoutDevicesSupported = true)
 private val DEFAULT_SELECTED_HOMESERVER_STATE = SELECTED_HOMESERVER_STATE.copy(userFacingUrl = A_DEFAULT_HOMESERVER_URL)
+private val DEFAULT_SELECTED_HOMESERVER_STATE_WITH_QR_SUPPORTED = DEFAULT_SELECTED_HOMESERVER_STATE.copy(isLoginWithQrSupported = true)
 private const val AN_EMAIL = "hello@example.com"
 private const val A_PASSWORD = "a-password"
 private const val A_USERNAME = "hello-world"
@@ -93,7 +100,7 @@ private val SSO_REGISTRATION_DESCRIPTION = AuthenticationDescription.Register(Au
 class OnboardingViewModelTest {
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule()
+    val mavericksTestRule = MavericksTestRule()
 
     private val fakeUri = FakeUri()
     private val fakeContext = FakeContext()
@@ -108,6 +115,7 @@ class OnboardingViewModelTest {
     private val fakeStartAuthenticationFlowUseCase = FakeStartAuthenticationFlowUseCase()
     private val fakeHomeServerHistoryService = FakeHomeServerHistoryService()
     private val fakeLoginWizard = FakeLoginWizard()
+    private val fakeConfigureAndStartSessionUseCase = mockk<ConfigureAndStartSessionUseCase>()
 
     private var initialState = OnboardingViewState()
     private lateinit var viewModel: OnboardingViewModel
@@ -154,6 +162,28 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `given combined login enabled, when handling sign in splash action, then emits OpenCombinedLogin with default homeserver qrCode supported`() = runTest {
+        val test = viewModel.test()
+        fakeVectorFeatures.givenCombinedLoginEnabled()
+        givenCanSuccessfullyUpdateHomeserver(A_DEFAULT_HOMESERVER_URL, DEFAULT_SELECTED_HOMESERVER_STATE_WITH_QR_SUPPORTED)
+
+        viewModel.handle(OnboardingAction.SplashAction.OnIAlreadyHaveAnAccount(OnboardingFlow.SignIn))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(onboardingFlow = OnboardingFlow.SignIn) },
+                        { copy(isLoading = true) },
+                        { copy(selectedHomeserver = DEFAULT_SELECTED_HOMESERVER_STATE_WITH_QR_SUPPORTED) },
+                        { copy(signMode = SignMode.SignIn) },
+                        { copy(canLoginWithQrCode = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.OpenCombinedLogin)
+                .finish()
+    }
+
     @Test
     fun `given can successfully login in with token, when logging in with token, then emits AccountSignedIn`() = runTest {
         val test = viewModel.test()
@@ -167,7 +197,7 @@ class OnboardingViewModelTest {
                 .assertStatesChanges(
                         initialState,
                         { copy(isLoading = true) },
-                        { copy(isLoading = false) }
+                        { copy(isLoading = false, selectedAuthenticationState = SelectedAuthenticationState(description = AuthenticationDescription.Login)) }
                 )
                 .assertEvents(OnboardingViewEvents.OnAccountSignedIn)
                 .finish()
@@ -186,27 +216,12 @@ class OnboardingViewModelTest {
                 .assertStatesChanges(
                         initialState,
                         { copy(isLoading = true) },
-                        { copy(isLoading = false) }
+                        { copy(isLoading = false, selectedAuthenticationState = SelectedAuthenticationState(description = AuthenticationDescription.Login)) }
                 )
                 .assertEvents(OnboardingViewEvents.OnAccountSignedIn)
                 .finish()
     }
 
-    @Test
-    fun `given registration started with currentThreePid, when handling InitWith, then emits restored session OnSendEmailSuccess`() = runTest {
-        val test = viewModel.test()
-        fakeAuthenticationService.givenRegistrationWizard(FakeRegistrationWizard().also {
-            it.givenRegistrationStarted(hasStarted = true)
-            it.givenCurrentThreePid(AN_EMAIL)
-        })
-
-        viewModel.handle(OnboardingAction.InitWith(LoginConfig(A_HOMESERVER_URL, identityServerUrl = null)))
-
-        test
-                .assertEvents(OnboardingViewEvents.OnSendEmailSuccess(AN_EMAIL, isRestoredSession = true))
-                .finish()
-    }
-
     @Test
     fun `given registration not started, when handling InitWith, then does nothing`() = runTest {
         val test = viewModel.test()
@@ -296,7 +311,7 @@ class OnboardingViewModelTest {
                 .assertStatesChanges(
                         initialState,
                         { copy(isLoading = true) },
-                        { copy(isLoading = false) }
+                        { copy(isLoading = false, selectedAuthenticationState = SelectedAuthenticationState(description = AuthenticationDescription.Login)) }
                 )
                 .assertEvents(OnboardingViewEvents.OnAccountSignedIn)
                 .finish()
@@ -321,6 +336,25 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `given has sign in with matrix id sign mode, when handling login or register action fails with certificate error, then emits error`() = runTest {
+        viewModelWith(initialState.copy(signMode = SignMode.SignInWithMatrixId))
+        fakeDirectLoginUseCase.givenFailureResult(A_DIRECT_LOGIN, config = null, cause = AN_UNRECOGNISED_CERTIFICATE_ERROR)
+        givenInitialisesSession(fakeSession)
+        val test = viewModel.test()
+
+        viewModel.handle(A_DIRECT_LOGIN)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.UnrecognisedCertificateFailure(A_DIRECT_LOGIN, AN_UNRECOGNISED_CERTIFICATE_ERROR))
+                .finish()
+    }
+
     @Test
     fun `when handling SignUp then sets sign mode to sign up and starts registration`() = runTest {
         givenRegistrationResultFor(RegisterAction.StartRegistration, ANY_CONTINUING_REGISTRATION_RESULT)
@@ -405,23 +439,59 @@ class OnboardingViewModelTest {
     }
 
     @Test
-    fun `given unavailable deeplink, when selecting homeserver, then emits failure with default homeserver as retry action`() = runTest {
-        fakeContext.givenHasConnection()
-        fakeHomeServerConnectionConfigFactory.givenConfigFor(A_HOMESERVER_URL, A_HOMESERVER_CONFIG)
-        fakeStartAuthenticationFlowUseCase.givenHomeserverUnavailable(A_HOMESERVER_CONFIG)
+    fun `given in sign in flow, when selecting homeserver fails with network error, then emits Failure`() = runTest {
+        viewModelWith(initialState.copy(onboardingFlow = OnboardingFlow.SignIn))
+        fakeVectorFeatures.givenCombinedLoginEnabled()
+        givenHomeserverSelectionFailsWith(AN_ERROR)
         val test = viewModel.test()
 
-        viewModel.handle(OnboardingAction.InitWith(LoginConfig(A_HOMESERVER_URL, null)))
         viewModel.handle(OnboardingAction.HomeServerChange.SelectHomeServer(A_HOMESERVER_URL))
 
-        val expectedRetryAction = OnboardingAction.HomeServerChange.SelectHomeServer("${R.string.matrix_org_server_url.toTestString()}/")
         test
                 .assertStatesChanges(
                         initialState,
                         { copy(isLoading = true) },
                         { copy(isLoading = false) }
                 )
-                .assertEvents(OnboardingViewEvents.DeeplinkAuthenticationFailure(expectedRetryAction))
+                .assertEvents(OnboardingViewEvents.Failure(AN_ERROR))
+                .finish()
+    }
+
+    @Test
+    fun `given in sign in flow, when selecting homeserver fails with network error, then emits EditServerSelection`() = runTest {
+        viewModelWith(initialState.copy(onboardingFlow = OnboardingFlow.SignIn))
+        fakeVectorFeatures.givenCombinedLoginEnabled()
+        givenHomeserverSelectionFailsWithNetworkError()
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.HomeServerChange.SelectHomeServer(A_HOMESERVER_URL))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.EditServerSelection)
+                .finish()
+    }
+
+    @Test
+    fun `given in sign up flow, when selecting homeserver fails with network error, then emits EditServerSelection`() = runTest {
+        viewModelWith(initialState.copy(onboardingFlow = OnboardingFlow.SignUp))
+        fakeVectorFeatures.givenCombinedRegisterEnabled()
+        givenHomeserverSelectionFailsWithNetworkError()
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.HomeServerChange.SelectHomeServer(A_HOMESERVER_URL))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.EditServerSelection)
                 .finish()
     }
 
@@ -549,6 +619,44 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `when editing homeserver errors with certificate error, then emits error`() = runTest {
+        fakeHomeServerConnectionConfigFactory.givenConfigFor(A_HOMESERVER_URL, fingerprint = null, A_HOMESERVER_CONFIG)
+        fakeStartAuthenticationFlowUseCase.givenErrors(A_HOMESERVER_CONFIG, AN_UNRECOGNISED_CERTIFICATE_ERROR)
+        val editAction = OnboardingAction.HomeServerChange.EditHomeServer(A_HOMESERVER_URL)
+        val test = viewModel.test()
+
+        viewModel.handle(editAction)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.UnrecognisedCertificateFailure(editAction, AN_UNRECOGNISED_CERTIFICATE_ERROR))
+                .finish()
+    }
+
+    @Test
+    fun `when selecting homeserver errors with certificate error, then emits error`() = runTest {
+        fakeHomeServerConnectionConfigFactory.givenConfigFor(A_HOMESERVER_URL, fingerprint = null, A_HOMESERVER_CONFIG)
+        fakeStartAuthenticationFlowUseCase.givenErrors(A_HOMESERVER_CONFIG, AN_UNRECOGNISED_CERTIFICATE_ERROR)
+        val selectAction = OnboardingAction.HomeServerChange.SelectHomeServer(A_HOMESERVER_URL)
+        val test = viewModel.test()
+
+        viewModel.handle(selectAction)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.UnrecognisedCertificateFailure(selectAction, AN_UNRECOGNISED_CERTIFICATE_ERROR))
+                .finish()
+    }
+
     @Test
     fun `given unavailable full matrix id, when a register username is entered, then emits availability error`() = runTest {
         viewModelWith(initialRegistrationState("ignored-url"))
@@ -603,7 +711,7 @@ class OnboardingViewModelTest {
                 .assertStatesChanges(
                         initialState,
                         { copy(isLoading = true) },
-                        { copy(isLoading = false, personalizationState = A_HOMESERVER_CAPABILITIES.toPersonalisationState(A_USERNAME)) }
+                        { copy(isLoading = false, personalizationState = A_HOMESERVER_CAPABILITIES.toPersonalisationState("@fake:server.fake", A_USERNAME)) }
                 )
                 .assertEvents(OnboardingViewEvents.OnAccountCreated)
                 .finish()
@@ -725,6 +833,76 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `given in sign in mode, when accepting user certificate with SelectHomeserver retry action, then emits OnHomeserverEdited`() = runTest {
+        viewModelWith(initialState.copy(onboardingFlow = OnboardingFlow.SignIn))
+        val test = viewModel.test()
+        fakeVectorFeatures.givenCombinedLoginEnabled()
+        givenCanSuccessfullyUpdateHomeserver(
+                A_HOMESERVER_URL,
+                SELECTED_HOMESERVER_STATE,
+                config = A_HOMESERVER_CONFIG.copy(allowedFingerprints = listOf(A_FINGERPRINT)),
+                fingerprint = A_FINGERPRINT,
+        )
+
+        viewModel.handle(OnboardingAction.UserAcceptCertificate(A_FINGERPRINT, OnboardingAction.HomeServerChange.SelectHomeServer(A_HOMESERVER_URL)))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(selectedHomeserver = SELECTED_HOMESERVER_STATE) },
+                        { copy(signMode = SignMode.SignIn) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.OpenCombinedLogin)
+                .finish()
+    }
+
+    @Test
+    fun `given in sign up mode, when accepting user certificate with EditHomeserver retry action, then emits OnHomeserverEdited`() = runTest {
+        viewModelWith(initialState.copy(onboardingFlow = OnboardingFlow.SignUp))
+        givenCanSuccessfullyUpdateHomeserver(
+                A_HOMESERVER_URL,
+                SELECTED_HOMESERVER_STATE,
+                config = A_HOMESERVER_CONFIG.copy(allowedFingerprints = listOf(A_FINGERPRINT)),
+                fingerprint = A_FINGERPRINT,
+        )
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.UserAcceptCertificate(A_FINGERPRINT, OnboardingAction.HomeServerChange.EditHomeServer(A_HOMESERVER_URL)))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(selectedHomeserver = SELECTED_HOMESERVER_STATE) },
+                        { copy(isLoading = false) }
+
+                )
+                .assertEvents(OnboardingViewEvents.OnHomeserverEdited)
+                .finish()
+    }
+
+    @Test
+    fun `given DirectLogin retry action, when accepting user certificate, then logs in directly`() = runTest {
+        fakeHomeServerConnectionConfigFactory.givenConfigFor("https://dummy.org", A_FINGERPRINT, A_HOMESERVER_CONFIG)
+        fakeDirectLoginUseCase.givenSuccessResult(A_DIRECT_LOGIN, config = A_HOMESERVER_CONFIG, result = fakeSession)
+        givenInitialisesSession(fakeSession)
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.UserAcceptCertificate(A_FINGERPRINT, A_DIRECT_LOGIN))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false, selectedAuthenticationState = SelectedAuthenticationState(description = AuthenticationDescription.Login)) }
+                )
+                .assertEvents(OnboardingViewEvents.OnAccountSignedIn)
+                .finish()
+    }
+
     @Test
     fun `given can successfully start password reset, when resetting password, then emits confirmation email sent`() = runTest {
         viewModelWith(initialState.copy(selectedHomeserver = SELECTED_HOMESERVER_STATE_SUPPORTED_LOGOUT_DEVICES))
@@ -942,6 +1120,7 @@ class OnboardingViewModelTest {
                 FakeVectorOverrides(),
                 fakeRegistrationActionHandler.instance,
                 TestBuildVersionSdkIntProvider().also { it.value = Build.VERSION_CODES.O },
+                fakeConfigureAndStartSessionUseCase,
         ).also {
             viewModel = it
             initialState = state
@@ -981,7 +1160,7 @@ class OnboardingViewModelTest {
     private fun givenInitialisesSession(session: Session) {
         fakeActiveSessionHolder.expectSetsActiveSession(session)
         fakeAuthenticationService.expectReset()
-        fakeSession.expectStartsSyncing()
+        fakeSession.expectStartsSyncing(fakeConfigureAndStartSessionUseCase)
     }
 
     private fun givenRegistrationResultFor(action: RegisterAction, result: RegistrationActionHandler.Result) {
@@ -992,15 +1171,20 @@ class OnboardingViewModelTest {
         fakeRegistrationActionHandler.givenResultsFor(results)
     }
 
-    private fun givenCanSuccessfullyUpdateHomeserver(homeserverUrl: String, resultingState: SelectedHomeserverState) {
-        fakeHomeServerConnectionConfigFactory.givenConfigFor(homeserverUrl, A_HOMESERVER_CONFIG)
-        fakeStartAuthenticationFlowUseCase.givenResult(A_HOMESERVER_CONFIG, StartAuthenticationResult(isHomeserverOutdated = false, resultingState))
+    private fun givenCanSuccessfullyUpdateHomeserver(
+            homeserverUrl: String,
+            resultingState: SelectedHomeserverState,
+            config: HomeServerConnectionConfig = A_HOMESERVER_CONFIG,
+            fingerprint: Fingerprint? = null,
+    ) {
+        fakeHomeServerConnectionConfigFactory.givenConfigFor(homeserverUrl, fingerprint, config)
+        fakeStartAuthenticationFlowUseCase.givenResult(config, StartAuthenticationResult(isHomeserverOutdated = false, resultingState))
         givenRegistrationResultFor(RegisterAction.StartRegistration, RegistrationActionHandler.Result.StartRegistration)
-        fakeHomeServerHistoryService.expectUrlToBeAdded(A_HOMESERVER_CONFIG.homeServerUri.toString())
+        fakeHomeServerHistoryService.expectUrlToBeAdded(config.homeServerUri.toString())
     }
 
     private fun givenUpdatingHomeserverErrors(homeserverUrl: String, resultingState: SelectedHomeserverState, error: Throwable) {
-        fakeHomeServerConnectionConfigFactory.givenConfigFor(homeserverUrl, A_HOMESERVER_CONFIG)
+        fakeHomeServerConnectionConfigFactory.givenConfigFor(homeserverUrl, fingerprint = null, A_HOMESERVER_CONFIG)
         fakeStartAuthenticationFlowUseCase.givenResult(A_HOMESERVER_CONFIG, StartAuthenticationResult(isHomeserverOutdated = false, resultingState))
         givenRegistrationResultFor(RegisterAction.StartRegistration, RegistrationActionHandler.Result.Error(error))
         fakeHomeServerHistoryService.expectUrlToBeAdded(A_HOMESERVER_CONFIG.homeServerUri.toString())
@@ -1022,9 +1206,22 @@ class OnboardingViewModelTest {
     private fun initialRegistrationState(homeServerUrl: String) = initialState.copy(
             onboardingFlow = OnboardingFlow.SignUp, selectedHomeserver = SelectedHomeserverState(userFacingUrl = homeServerUrl)
     )
+
+    private fun givenHomeserverSelectionFailsWithNetworkError() {
+        fakeContext.givenHasConnection()
+        fakeHomeServerConnectionConfigFactory.givenConfigFor(A_HOMESERVER_URL, fingerprint = null, A_HOMESERVER_CONFIG)
+        fakeStartAuthenticationFlowUseCase.givenHomeserverUnavailable(A_HOMESERVER_CONFIG)
+    }
+
+    private fun givenHomeserverSelectionFailsWith(cause: Throwable) {
+        fakeContext.givenHasConnection()
+        fakeHomeServerConnectionConfigFactory.givenConfigFor(A_HOMESERVER_URL, fingerprint = null, A_HOMESERVER_CONFIG)
+        fakeStartAuthenticationFlowUseCase.givenErrors(A_HOMESERVER_CONFIG, cause)
+    }
 }
 
-private fun HomeServerCapabilities.toPersonalisationState(displayName: String? = null) = PersonalizationState(
+private fun HomeServerCapabilities.toPersonalisationState(userId: String, displayName: String? = null) = PersonalizationState(
+        userId = userId,
         supportsChangingDisplayName = canChangeDisplayName,
         supportsChangingProfilePicture = canChangeAvatar,
         displayName = displayName,
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt
index de55b3e322..6b0c893f2b 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.onboarding
 
 import im.vector.app.features.login.LoginMode
+import im.vector.app.features.login.SsoState
 import im.vector.app.features.onboarding.StartAuthenticationFlowUseCase.StartAuthenticationResult
 import im.vector.app.test.fakes.FakeAuthenticationService
 import im.vector.app.test.fakes.FakeUri
@@ -32,7 +33,11 @@ import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 
 private const val A_DECLARED_HOMESERVER_URL = "https://foo.bar"
 private val A_HOMESERVER_CONFIG = HomeServerConnectionConfig(homeServerUri = FakeUri().instance)
-private val SSO_IDENTITY_PROVIDERS = emptyList<SsoIdentityProvider>()
+private val FALLBACK_SSO_IDENTITY_PROVIDERS = emptyList<SsoIdentityProvider>()
+private val SSO_IDENTITY_PROVIDERS = listOf(SsoIdentityProvider(id = "id", "name", null, "sso-brand"))
+private val SSO_LOGIN_TYPE = listOf(LoginFlowTypes.SSO)
+private val SSO_AND_PASSWORD_LOGIN_TYPES = listOf(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD)
+private val PASSWORD_LOGIN_TYPE = listOf(LoginFlowTypes.PASSWORD)
 
 class StartAuthenticationFlowUseCaseTest {
 
@@ -47,7 +52,7 @@ class StartAuthenticationFlowUseCaseTest {
 
     @Test
     fun `given empty login result when starting authentication flow then returns empty result`() = runTest {
-        val loginResult = aLoginResult()
+        val loginResult = aLoginResult(supportedLoginTypes = emptyList())
         fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
 
         val result = useCase.execute(A_HOMESERVER_CONFIG)
@@ -57,60 +62,87 @@ class StartAuthenticationFlowUseCaseTest {
     }
 
     @Test
-    fun `given login supports SSO and Password when starting authentication flow then prefers SsoAndPassword`() = runTest {
-        val supportedLoginTypes = listOf(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD)
-        val loginResult = aLoginResult(supportedLoginTypes = supportedLoginTypes)
+    fun `given empty sso providers and login supports SSO and Password when starting authentication flow then prefers fallback SsoAndPassword`() = runTest {
+        val loginResult = aLoginResult(supportedLoginTypes = SSO_AND_PASSWORD_LOGIN_TYPES, ssoProviders = emptyList())
         fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
 
         val result = useCase.execute(A_HOMESERVER_CONFIG)
 
         result shouldBeEqualTo expectedResult(
-                supportedLoginTypes = supportedLoginTypes,
-                preferredLoginMode = LoginMode.SsoAndPassword(SSO_IDENTITY_PROVIDERS),
+                supportedLoginTypes = SSO_AND_PASSWORD_LOGIN_TYPES,
+                preferredLoginMode = LoginMode.SsoAndPassword(SsoState.Fallback),
         )
         verifyClearsAndThenStartsLogin(A_HOMESERVER_CONFIG)
     }
 
     @Test
-    fun `given login supports SSO when starting authentication flow then prefers Sso`() = runTest {
-        val supportedLoginTypes = listOf(LoginFlowTypes.SSO)
-        val loginResult = aLoginResult(supportedLoginTypes = supportedLoginTypes)
+    fun `given sso providers and login supports SSO and Password when starting authentication flow then prefers SsoAndPassword`() = runTest {
+        val loginResult = aLoginResult(supportedLoginTypes = SSO_AND_PASSWORD_LOGIN_TYPES, ssoProviders = SSO_IDENTITY_PROVIDERS)
         fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
 
         val result = useCase.execute(A_HOMESERVER_CONFIG)
 
         result shouldBeEqualTo expectedResult(
-                supportedLoginTypes = supportedLoginTypes,
-                preferredLoginMode = LoginMode.Sso(SSO_IDENTITY_PROVIDERS),
+                supportedLoginTypes = SSO_AND_PASSWORD_LOGIN_TYPES,
+                preferredLoginMode = LoginMode.SsoAndPassword(SsoState.IdentityProviders(SSO_IDENTITY_PROVIDERS)),
+        )
+        verifyClearsAndThenStartsLogin(A_HOMESERVER_CONFIG)
+    }
+
+    @Test
+    fun `given empty sso providers and login supports SSO when starting authentication flow then prefers fallback Sso`() = runTest {
+        val loginResult = aLoginResult(supportedLoginTypes = SSO_LOGIN_TYPE, ssoProviders = emptyList())
+        fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
+
+        val result = useCase.execute(A_HOMESERVER_CONFIG)
+
+        result shouldBeEqualTo expectedResult(
+                supportedLoginTypes = SSO_LOGIN_TYPE,
+                preferredLoginMode = LoginMode.Sso(SsoState.Fallback),
+        )
+        verifyClearsAndThenStartsLogin(A_HOMESERVER_CONFIG)
+    }
+
+    @Test
+    fun `given identity providers and login supports SSO when starting authentication flow then prefers Sso`() = runTest {
+        val loginResult = aLoginResult(supportedLoginTypes = SSO_LOGIN_TYPE, ssoProviders = SSO_IDENTITY_PROVIDERS)
+        fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
+
+        val result = useCase.execute(A_HOMESERVER_CONFIG)
+
+        result shouldBeEqualTo expectedResult(
+                supportedLoginTypes = SSO_LOGIN_TYPE,
+                preferredLoginMode = LoginMode.Sso(SsoState.IdentityProviders(SSO_IDENTITY_PROVIDERS)),
         )
         verifyClearsAndThenStartsLogin(A_HOMESERVER_CONFIG)
     }
 
     @Test
     fun `given login supports Password when starting authentication flow then prefers Password`() = runTest {
-        val supportedLoginTypes = listOf(LoginFlowTypes.PASSWORD)
-        val loginResult = aLoginResult(supportedLoginTypes = supportedLoginTypes)
+        val loginResult = aLoginResult(supportedLoginTypes = PASSWORD_LOGIN_TYPE)
         fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
 
         val result = useCase.execute(A_HOMESERVER_CONFIG)
 
         result shouldBeEqualTo expectedResult(
-                supportedLoginTypes = supportedLoginTypes,
+                supportedLoginTypes = PASSWORD_LOGIN_TYPE,
                 preferredLoginMode = LoginMode.Password,
         )
         verifyClearsAndThenStartsLogin(A_HOMESERVER_CONFIG)
     }
 
     private fun aLoginResult(
-            supportedLoginTypes: List<String> = emptyList()
+            supportedLoginTypes: List<String>,
+            ssoProviders: List<SsoIdentityProvider> = FALLBACK_SSO_IDENTITY_PROVIDERS
     ) = LoginFlowResult(
             supportedLoginTypes = supportedLoginTypes,
-            ssoIdentityProviders = SSO_IDENTITY_PROVIDERS,
+            ssoIdentityProviders = ssoProviders,
             isLoginAndRegistrationSupported = true,
             homeServerUrl = A_DECLARED_HOMESERVER_URL,
             isOutdatedHomeserver = false,
             hasOidcCompatibilityFlow = false,
-            isLogoutDevicesSupported = false
+            isLogoutDevicesSupported = false,
+            isLoginWithQrSupported = false
     )
 
     private fun expectedResult(
diff --git a/vector/src/test/java/im/vector/app/features/pin/lockscreen/fragment/LockScreenViewModelTests.kt b/vector/src/test/java/im/vector/app/features/pin/lockscreen/fragment/LockScreenViewModelTests.kt
index 6037d9933e..8f436444c4 100644
--- a/vector/src/test/java/im/vector/app/features/pin/lockscreen/fragment/LockScreenViewModelTests.kt
+++ b/vector/src/test/java/im/vector/app/features/pin/lockscreen/fragment/LockScreenViewModelTests.kt
@@ -21,7 +21,7 @@ import android.os.Build
 import android.security.keystore.KeyPermanentlyInvalidatedException
 import androidx.biometric.BiometricPrompt
 import androidx.fragment.app.FragmentActivity
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import com.airbnb.mvrx.withState
 import im.vector.app.features.pin.lockscreen.biometrics.BiometricAuthError
 import im.vector.app.features.pin.lockscreen.biometrics.BiometricHelper
@@ -54,7 +54,7 @@ import org.junit.Test
 class LockScreenViewModelTests {
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule()
+    val mavericksTestRule = MavericksTestRule()
 
     private val pinCodeHelper = mockk<PinCodeHelper>(relaxed = true)
     private val biometricHelper = mockk<BiometricHelper>(relaxed = true)
@@ -295,7 +295,7 @@ class LockScreenViewModelTests {
         test.assertEvents(LockScreenViewEvent.ShowBiometricKeyInvalidatedMessage)
     }
 
-        private fun createViewState(
+    private fun createViewState(
             lockScreenConfiguration: LockScreenConfiguration = createDefaultConfiguration(),
             canUseBiometricAuth: Boolean = false,
             showBiometricPromptAutomatically: Boolean = false,
diff --git a/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt b/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt
index 0387fc8986..491834db5b 100644
--- a/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.poll.create
 
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.features.poll.PollMode
 import im.vector.app.test.fakes.FakeCreatePollViewStates.A_FAKE_OPTIONS
 import im.vector.app.test.fakes.FakeCreatePollViewStates.A_FAKE_QUESTION
@@ -48,7 +48,7 @@ class CreatePollViewModelTest {
     private val testDispatcher = UnconfinedTestDispatcher()
 
     @get:Rule
-    val mvRxTestRule = MvRxTestRule(
+    val mavericksTestRule = MavericksTestRule(
             testDispatcher = testDispatcher // See https://github.com/airbnb/mavericks/issues/599
     )
 
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/GetCurrentSessionCrossSigningInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/GetCurrentSessionCrossSigningInfoUseCaseTest.kt
new file mode 100644
index 0000000000..b9ba1b1c0b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/GetCurrentSessionCrossSigningInfoUseCaseTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices
+
+import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+private const val A_DEVICE_ID = "device-id"
+
+class GetCurrentSessionCrossSigningInfoUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+
+    private val getCurrentSessionCrossSigningInfoUseCase = GetCurrentSessionCrossSigningInfoUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance
+    )
+
+    @Test
+    fun `given the active session when getting cross signing info then the result is correct`() {
+        fakeActiveSessionHolder.fakeSession.givenSessionId(A_DEVICE_ID)
+        val isCrossSigningInitialized = true
+        fakeActiveSessionHolder.fakeSession
+                .fakeCryptoService
+                .fakeCrossSigningService
+                .givenIsCrossSigningInitializedReturns(isCrossSigningInitialized)
+        val isCrossSigningVerified = true
+        fakeActiveSessionHolder.fakeSession
+                .fakeCryptoService
+                .fakeCrossSigningService
+                .givenIsCrossSigningVerifiedReturns(isCrossSigningVerified)
+        val expectedResult = CurrentSessionCrossSigningInfo(
+                deviceId = A_DEVICE_ID,
+                isCrossSigningInitialized = isCrossSigningInitialized,
+                isCrossSigningVerified = isCrossSigningVerified
+        )
+
+        val result = getCurrentSessionCrossSigningInfoUseCase.execute()
+
+        result shouldBeEqualTo expectedResult
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt
new file mode 100644
index 0000000000..79c998ff5c
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt
@@ -0,0 +1,453 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import android.os.SystemClock
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.core.session.clientinfo.MatrixClientInfoContent
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import im.vector.app.features.settings.devices.v2.verification.CheckIfCurrentSessionCanBeVerifiedUseCase
+import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
+import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakePendingAuthHandler
+import im.vector.app.test.fakes.FakeSignoutSessionsUseCase
+import im.vector.app.test.fakes.FakeVectorPreferences
+import im.vector.app.test.fakes.FakeVerificationService
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.just
+import io.mockk.justRun
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.runs
+import io.mockk.unmockkAll
+import io.mockk.verify
+import io.mockk.verifyAll
+import kotlinx.coroutines.flow.flowOf
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
+
+private const val A_CURRENT_DEVICE_ID = "current-device-id"
+private const val A_DEVICE_ID_1 = "device-id-1"
+private const val A_DEVICE_ID_2 = "device-id-2"
+private const val A_PASSWORD = "password"
+
+class DevicesViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val getCurrentSessionCrossSigningInfoUseCase = mockk<GetCurrentSessionCrossSigningInfoUseCase>()
+    private val getDeviceFullInfoListUseCase = mockk<GetDeviceFullInfoListUseCase>()
+    private val refreshDevicesOnCryptoDevicesChangeUseCase = mockk<RefreshDevicesOnCryptoDevicesChangeUseCase>(relaxed = true)
+    private val checkIfCurrentSessionCanBeVerifiedUseCase = mockk<CheckIfCurrentSessionCanBeVerifiedUseCase>()
+    private val fakeSignoutSessionsUseCase = FakeSignoutSessionsUseCase()
+    private val fakePendingAuthHandler = FakePendingAuthHandler()
+    private val fakeRefreshDevicesUseCase = mockk<RefreshDevicesUseCase>(relaxUnitFun = true)
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val toggleIpAddressVisibilityUseCase = mockk<ToggleIpAddressVisibilityUseCase>()
+
+    private val verifiedTransaction = mockk<VerificationTransaction>().apply {
+        every { state } returns VerificationTxState.Verified
+    }
+
+    private fun createViewModel(): DevicesViewModel {
+        return DevicesViewModel(
+                initialState = DevicesViewState(),
+                activeSessionHolder = fakeActiveSessionHolder.instance,
+                getCurrentSessionCrossSigningInfoUseCase = getCurrentSessionCrossSigningInfoUseCase,
+                getDeviceFullInfoListUseCase = getDeviceFullInfoListUseCase,
+                refreshDevicesOnCryptoDevicesChangeUseCase = refreshDevicesOnCryptoDevicesChangeUseCase,
+                checkIfCurrentSessionCanBeVerifiedUseCase = checkIfCurrentSessionCanBeVerifiedUseCase,
+                signoutSessionsUseCase = fakeSignoutSessionsUseCase.instance,
+                pendingAuthHandler = fakePendingAuthHandler.instance,
+                refreshDevicesUseCase = fakeRefreshDevicesUseCase,
+                vectorPreferences = fakeVectorPreferences.instance,
+                toggleIpAddressVisibilityUseCase = toggleIpAddressVisibilityUseCase,
+        )
+    }
+
+    @Before
+    fun setup() {
+        // Needed for internal usage of Flow<T>.throttleFirst() inside the ViewModel
+        mockkStatic(SystemClock::class)
+        every { SystemClock.elapsedRealtime() } returns 1234
+
+        givenVerificationService()
+        givenCurrentSessionCrossSigningInfo()
+        givenDeviceFullInfoList(deviceId1 = A_DEVICE_ID_1, deviceId2 = A_DEVICE_ID_2)
+        fakeVectorPreferences.givenSessionManagerShowIpAddress(false)
+    }
+
+    private fun givenVerificationService(): FakeVerificationService {
+        val fakeVerificationService = fakeActiveSessionHolder
+                .fakeSession
+                .fakeCryptoService
+                .fakeVerificationService
+        fakeVerificationService.givenAddListenerSucceeds()
+        fakeVerificationService.givenRemoveListenerSucceeds()
+        return fakeVerificationService
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given the viewModel when initializing it then verification listener is added`() {
+        // Given
+        val fakeVerificationService = givenVerificationService()
+
+        // When
+        val viewModel = createViewModel()
+
+        // Then
+        verify {
+            fakeVerificationService.addListener(viewModel)
+        }
+    }
+
+    @Test
+    fun `given the viewModel when clearing it then verification listener is removed`() {
+        // Given
+        val fakeVerificationService = givenVerificationService()
+
+        // When
+        val viewModel = createViewModel()
+        viewModel.onCleared()
+
+        // Then
+        verify {
+            fakeVerificationService.removeListener(viewModel)
+        }
+    }
+
+    @Test
+    fun `given the viewModel when initializing it then view state is updated with current session cross signing info`() {
+        // Given
+        val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo()
+
+        // When
+        val viewModelTest = createViewModel().test()
+
+        // Then
+        viewModelTest.assertLatestState { it.currentSessionCrossSigningInfo == currentSessionCrossSigningInfo }
+        viewModelTest.finish()
+    }
+
+    @Test
+    fun `given the viewModel when initializing it then view state is updated with current device full info list`() {
+        // Given
+        val deviceFullInfoList = givenDeviceFullInfoList(deviceId1 = A_DEVICE_ID_1, deviceId2 = A_DEVICE_ID_2)
+
+        // When
+        val viewModelTest = createViewModel().test()
+
+        // Then
+        viewModelTest.assertLatestState { it.devices is Success && it.devices.invoke() == deviceFullInfoList }
+        viewModelTest.finish()
+    }
+
+    @Test
+    fun `given the viewModel when initializing it then devices are refreshed on crypto devices change`() {
+        // Given
+
+        // When
+        createViewModel()
+
+        // Then
+        coVerify { refreshDevicesOnCryptoDevicesChangeUseCase.execute() }
+    }
+
+    @Test
+    fun `given current session can be verified when handling verify current session action then self verification event is posted`() {
+        // Given
+        val verifyCurrentSessionAction = DevicesAction.VerifyCurrentSession
+        coEvery { checkIfCurrentSessionCanBeVerifiedUseCase.execute() } returns true
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(verifyCurrentSessionAction)
+
+        // Then
+        viewModelTest
+                .assertEvent { it is DevicesViewEvent.SelfVerification }
+                .finish()
+        coVerify {
+            checkIfCurrentSessionCanBeVerifiedUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given current session cannot be verified when handling verify current session action then reset secrets event is posted`() {
+        // Given
+        val verifyCurrentSessionAction = DevicesAction.VerifyCurrentSession
+        coEvery { checkIfCurrentSessionCanBeVerifiedUseCase.execute() } returns false
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(verifyCurrentSessionAction)
+
+        // Then
+        viewModelTest
+                .assertEvent { it is DevicesViewEvent.PromptResetSecrets }
+                .finish()
+        coVerify {
+            checkIfCurrentSessionCanBeVerifiedUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given no reAuth is needed when handling multiSignout other sessions action then signout process is performed`() {
+        // Given
+        val expectedViewState = givenInitialViewState(deviceId1 = A_DEVICE_ID_1, deviceId2 = A_CURRENT_DEVICE_ID)
+        // signout all devices except the current device
+        fakeSignoutSessionsUseCase.givenSignoutSuccess(listOf(A_DEVICE_ID_1))
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(DevicesAction.MultiSignoutOtherSessions)
+
+        // Then
+        viewModelTest
+                .assertStatesChanges(
+                        expectedViewState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvent { it is DevicesViewEvent.SignoutSuccess }
+                .finish()
+        verify {
+            fakeRefreshDevicesUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given unexpected error during multiSignout when handling multiSignout action then signout process is performed`() {
+        // Given
+        val error = Exception()
+        fakeSignoutSessionsUseCase.givenSignoutError(listOf(A_DEVICE_ID_1, A_DEVICE_ID_2), error)
+        val expectedViewState = givenInitialViewState(deviceId1 = A_DEVICE_ID_1, deviceId2 = A_DEVICE_ID_2)
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(DevicesAction.MultiSignoutOtherSessions)
+
+        // Then
+        viewModelTest
+                .assertStatesChanges(
+                        expectedViewState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvent { it is DevicesViewEvent.SignoutError && it.error == error }
+                .finish()
+    }
+
+    @Test
+    fun `given reAuth is needed during multiSignout when handling multiSignout action then requestReAuth is sent and pending auth is stored`() {
+        // Given
+        val reAuthNeeded = fakeSignoutSessionsUseCase.givenSignoutReAuthNeeded(listOf(A_DEVICE_ID_1, A_DEVICE_ID_2))
+        val expectedPendingAuth = DefaultBaseAuth(session = reAuthNeeded.flowResponse.session)
+        val expectedReAuthEvent = DevicesViewEvent.RequestReAuth(reAuthNeeded.flowResponse, reAuthNeeded.errCode)
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(DevicesAction.MultiSignoutOtherSessions)
+
+        // Then
+        viewModelTest
+                .assertEvent { it == expectedReAuthEvent }
+                .finish()
+        fakePendingAuthHandler.instance.pendingAuth shouldBeEqualTo expectedPendingAuth
+        fakePendingAuthHandler.instance.uiaContinuation shouldBeEqualTo reAuthNeeded.uiaContinuation
+    }
+
+    @Test
+    fun `given SSO auth has been done when handling ssoAuthDone action then corresponding method of pending auth handler is called`() {
+        // Given
+        justRun { fakePendingAuthHandler.instance.ssoAuthDone() }
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(DevicesAction.SsoAuthDone)
+
+        // Then
+        viewModelTest.finish()
+        verifyAll {
+            fakePendingAuthHandler.instance.ssoAuthDone()
+        }
+    }
+
+    @Test
+    fun `given password auth has been done when handling passwordAuthDone action then corresponding method of pending auth handler is called`() {
+        // Given
+        justRun { fakePendingAuthHandler.instance.passwordAuthDone(any()) }
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(DevicesAction.PasswordAuthDone(A_PASSWORD))
+
+        // Then
+        viewModelTest.finish()
+        verifyAll {
+            fakePendingAuthHandler.instance.passwordAuthDone(A_PASSWORD)
+        }
+    }
+
+    @Test
+    fun `given reAuth has been cancelled when handling reAuthCancelled action then corresponding method of pending auth handler is called`() {
+        // Given
+        justRun { fakePendingAuthHandler.instance.reAuthCancelled() }
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(DevicesAction.ReAuthCancelled)
+
+        // Then
+        viewModelTest.finish()
+        verifyAll {
+            fakePendingAuthHandler.instance.reAuthCancelled()
+        }
+    }
+
+    @Test
+    fun `given the viewModel when initializing it then view state of ip address visibility is false`() {
+        // When
+        val viewModelTest = createViewModel().test()
+
+        // Then
+        viewModelTest.assertLatestState { it.isShowingIpAddress == false }
+        viewModelTest.finish()
+    }
+
+    @Test
+    fun `given the viewModel when toggleIpAddressVisibility action is triggered then view state and preference change accordingly`() {
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        every { toggleIpAddressVisibilityUseCase.execute() } just runs
+        every { fakeVectorPreferences.instance.setIpAddressVisibilityInDeviceManagerScreens(true) } just runs
+        every { fakeVectorPreferences.instance.showIpAddressInSessionManagerScreens() } returns true
+
+        viewModel.handle(DevicesAction.ToggleIpAddressVisibility)
+        viewModel.onSharedPreferenceChanged(null, null)
+
+        // Then
+        viewModelTest.assertLatestState { it.isShowingIpAddress == true }
+        viewModelTest.finish()
+    }
+
+    @Test
+    fun `given the view model when a verified transaction is updated then device list is refreshed`() {
+        // Given
+        val viewModel = createViewModel()
+
+        // When
+        viewModel.transactionUpdated(verifiedTransaction)
+
+        // Then
+        verify { viewModel.refreshDeviceList() }
+    }
+
+    private fun givenCurrentSessionCrossSigningInfo(): CurrentSessionCrossSigningInfo {
+        val currentSessionCrossSigningInfo = mockk<CurrentSessionCrossSigningInfo>()
+        every { currentSessionCrossSigningInfo.deviceId } returns A_CURRENT_DEVICE_ID
+        every { getCurrentSessionCrossSigningInfoUseCase.execute() } returns flowOf(currentSessionCrossSigningInfo)
+        return currentSessionCrossSigningInfo
+    }
+
+    /**
+     * Generate mocked deviceFullInfo list with 1 unverified and inactive + 1 verified and active.
+     */
+    private fun givenDeviceFullInfoList(deviceId1: String, deviceId2: String): DeviceFullInfoList {
+        val verifiedCryptoDeviceInfo = mockk<CryptoDeviceInfo>()
+        every { verifiedCryptoDeviceInfo.trustLevel } returns DeviceTrustLevel(crossSigningVerified = true, locallyVerified = true)
+        val unverifiedCryptoDeviceInfo = mockk<CryptoDeviceInfo>()
+        every { unverifiedCryptoDeviceInfo.trustLevel } returns DeviceTrustLevel(crossSigningVerified = false, locallyVerified = false)
+
+        val deviceInfo1 = mockk<DeviceInfo>()
+        every { deviceInfo1.deviceId } returns deviceId1
+        val deviceInfo2 = mockk<DeviceInfo>()
+        every { deviceInfo2.deviceId } returns deviceId2
+
+        val deviceFullInfo1 = DeviceFullInfo(
+                deviceInfo = deviceInfo1,
+                cryptoDeviceInfo = verifiedCryptoDeviceInfo,
+                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+                isInactive = false,
+                isCurrentDevice = true,
+                deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+                matrixClientInfo = MatrixClientInfoContent(),
+        )
+        val deviceFullInfo2 = DeviceFullInfo(
+                deviceInfo = deviceInfo2,
+                cryptoDeviceInfo = unverifiedCryptoDeviceInfo,
+                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
+                isInactive = true,
+                isCurrentDevice = false,
+                deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+                matrixClientInfo = MatrixClientInfoContent(),
+        )
+        val devices = listOf(deviceFullInfo1, deviceFullInfo2)
+        every { getDeviceFullInfoListUseCase.execute(DeviceManagerFilterType.ALL_SESSIONS, any()) } returns flowOf(devices)
+        every { getDeviceFullInfoListUseCase.execute(DeviceManagerFilterType.UNVERIFIED, any()) } returns flowOf(listOf(deviceFullInfo2))
+        every { getDeviceFullInfoListUseCase.execute(DeviceManagerFilterType.INACTIVE, any()) } returns flowOf(listOf(deviceFullInfo1))
+        return DeviceFullInfoList(
+                allSessions = devices,
+                unverifiedSessionsCount = 1,
+                inactiveSessionsCount = 1,
+        )
+    }
+
+    private fun givenInitialViewState(deviceId1: String, deviceId2: String): DevicesViewState {
+        val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo()
+        val deviceFullInfoList = givenDeviceFullInfoList(deviceId1, deviceId2)
+        return DevicesViewState(
+                currentSessionCrossSigningInfo = currentSessionCrossSigningInfo,
+                devices = Success(deviceFullInfoList),
+                isLoading = false,
+        )
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt
new file mode 100644
index 0000000000..17ad58668a
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.core.session.clientinfo.GetMatrixClientInfoUseCase
+import im.vector.app.core.session.clientinfo.MatrixClientInfoContent
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.filter.FilterDevicesUseCase
+import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
+import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
+import im.vector.app.features.settings.devices.v2.verification.GetEncryptionTrustLevelForDeviceUseCase
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+private const val A_DEVICE_ID_1 = "device-id-1"
+private const val A_DEVICE_ID_2 = "device-id-2"
+private const val A_DEVICE_ID_3 = "device-id-3"
+private const val A_TIMESTAMP_1 = 100L
+private const val A_TIMESTAMP_2 = 200L
+private const val A_TIMESTAMP_3 = 300L
+
+class GetDeviceFullInfoListUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val checkIfSessionIsInactiveUseCase = mockk<CheckIfSessionIsInactiveUseCase>()
+    private val getEncryptionTrustLevelForDeviceUseCase = mockk<GetEncryptionTrustLevelForDeviceUseCase>()
+    private val getCurrentSessionCrossSigningInfoUseCase = mockk<GetCurrentSessionCrossSigningInfoUseCase>()
+    private val filterDevicesUseCase = mockk<FilterDevicesUseCase>()
+    private val parseDeviceUserAgentUseCase = mockk<ParseDeviceUserAgentUseCase>()
+    private val getMatrixClientInfoUseCase = mockk<GetMatrixClientInfoUseCase>()
+
+    private val getDeviceFullInfoListUseCase = GetDeviceFullInfoListUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+            checkIfSessionIsInactiveUseCase = checkIfSessionIsInactiveUseCase,
+            getEncryptionTrustLevelForDeviceUseCase = getEncryptionTrustLevelForDeviceUseCase,
+            getCurrentSessionCrossSigningInfoUseCase = getCurrentSessionCrossSigningInfoUseCase,
+            filterDevicesUseCase = filterDevicesUseCase,
+            parseDeviceUserAgentUseCase = parseDeviceUserAgentUseCase,
+            getMatrixClientInfoUseCase = getMatrixClientInfoUseCase,
+    )
+
+    @Before
+    fun setUp() {
+        mockkStatic("org.matrix.android.sdk.flow.FlowSessionKt")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given active session when getting list of device full info then the list is correct and sorted in descending order`() = runTest(testDispatcher) {
+        // Given
+        val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo()
+        val fakeFlowSession = fakeActiveSessionHolder.fakeSession.givenFlowSession()
+        val cryptoDeviceInfo1 = givenACryptoDeviceInfo(A_DEVICE_ID_1)
+        val cryptoDeviceInfo2 = givenACryptoDeviceInfo(A_DEVICE_ID_2)
+        val cryptoDeviceInfo3 = givenACryptoDeviceInfo(A_DEVICE_ID_3)
+        val cryptoDeviceInfoList = listOf(cryptoDeviceInfo1, cryptoDeviceInfo2, cryptoDeviceInfo3)
+        every { fakeFlowSession.liveUserCryptoDevices(any()) } returns flowOf(cryptoDeviceInfoList)
+        val deviceInfo1 = givenADevicesInfo(
+                deviceId = A_DEVICE_ID_1,
+                lastSeenTs = A_TIMESTAMP_1,
+                isInactive = true,
+                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+                cryptoDeviceInfo = cryptoDeviceInfo1,
+        )
+        val deviceInfo2 = givenADevicesInfo(
+                deviceId = A_DEVICE_ID_2,
+                lastSeenTs = A_TIMESTAMP_2,
+                isInactive = false,
+                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+                cryptoDeviceInfo = cryptoDeviceInfo2,
+        )
+        val deviceInfo3 = givenADevicesInfo(
+                deviceId = A_DEVICE_ID_3,
+                lastSeenTs = A_TIMESTAMP_3,
+                isInactive = false,
+                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
+                cryptoDeviceInfo = cryptoDeviceInfo3,
+        )
+        val deviceInfoList = listOf(deviceInfo1, deviceInfo2, deviceInfo3)
+        every { fakeFlowSession.liveMyDevicesInfo() } returns flowOf(deviceInfoList)
+        val matrixClientInfo1 = givenAMatrixClientInfo(A_DEVICE_ID_1)
+        val matrixClientInfo2 = givenAMatrixClientInfo(A_DEVICE_ID_2)
+        val matrixClientInfo3 = givenAMatrixClientInfo(A_DEVICE_ID_3)
+        val expectedResult1 = DeviceFullInfo(
+                deviceInfo = deviceInfo1,
+                cryptoDeviceInfo = cryptoDeviceInfo1,
+                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+                isInactive = true,
+                isCurrentDevice = true,
+                deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+                matrixClientInfo = matrixClientInfo1,
+        )
+        val expectedResult2 = DeviceFullInfo(
+                deviceInfo = deviceInfo2,
+                cryptoDeviceInfo = cryptoDeviceInfo2,
+                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+                isInactive = false,
+                isCurrentDevice = false,
+                deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+                matrixClientInfo = matrixClientInfo2,
+        )
+        val expectedResult3 = DeviceFullInfo(
+                deviceInfo = deviceInfo3,
+                cryptoDeviceInfo = cryptoDeviceInfo3,
+                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
+                isInactive = false,
+                isCurrentDevice = false,
+                deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+                matrixClientInfo = matrixClientInfo3,
+        )
+        val expectedResult = listOf(expectedResult3, expectedResult2, expectedResult1)
+        every { filterDevicesUseCase.execute(any(), any(), any()) } returns expectedResult
+        val filterType = DeviceManagerFilterType.ALL_SESSIONS
+
+        // When
+        val result = getDeviceFullInfoListUseCase.execute(filterType, excludeCurrentDevice = false)
+                .test(this)
+
+        // Then
+        result.assertValues(expectedResult)
+                .finish()
+        verify {
+            getCurrentSessionCrossSigningInfoUseCase.execute()
+            fakeFlowSession.liveUserCryptoDevices(fakeActiveSessionHolder.fakeSession.myUserId)
+            fakeFlowSession.liveMyDevicesInfo()
+            getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo1)
+            getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo2)
+            getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo3)
+            checkIfSessionIsInactiveUseCase.execute(A_TIMESTAMP_1)
+            checkIfSessionIsInactiveUseCase.execute(A_TIMESTAMP_2)
+            checkIfSessionIsInactiveUseCase.execute(A_TIMESTAMP_3)
+            getMatrixClientInfoUseCase.execute(fakeActiveSessionHolder.fakeSession, A_DEVICE_ID_1)
+            getMatrixClientInfoUseCase.execute(fakeActiveSessionHolder.fakeSession, A_DEVICE_ID_2)
+            getMatrixClientInfoUseCase.execute(fakeActiveSessionHolder.fakeSession, A_DEVICE_ID_3)
+            filterDevicesUseCase.execute(currentSessionCrossSigningInfo, expectedResult, filterType, emptyList())
+        }
+    }
+
+    @Test
+    fun `given no active session when getting list then the result is empty`() = runTest(testDispatcher) {
+        // Given
+        fakeActiveSessionHolder.givenGetSafeActiveSessionReturns(null)
+
+        // When
+        val result = getDeviceFullInfoListUseCase.execute(DeviceManagerFilterType.ALL_SESSIONS, excludeCurrentDevice = false)
+                .test(this)
+
+        // Then
+        result.assertNoValues()
+                .finish()
+    }
+
+    private fun givenCurrentSessionCrossSigningInfo(): CurrentSessionCrossSigningInfo {
+        val currentSessionCrossSigningInfo = mockk<CurrentSessionCrossSigningInfo>()
+        every { getCurrentSessionCrossSigningInfoUseCase.execute() } returns flowOf(currentSessionCrossSigningInfo)
+        every { currentSessionCrossSigningInfo.deviceId } returns A_DEVICE_ID_1
+        return currentSessionCrossSigningInfo
+    }
+
+    private fun givenACryptoDeviceInfo(deviceId: String): CryptoDeviceInfo {
+        val cryptoDeviceInfo = mockk<CryptoDeviceInfo>()
+        every { cryptoDeviceInfo.deviceId } returns deviceId
+        return cryptoDeviceInfo
+    }
+
+    private fun givenADevicesInfo(
+            deviceId: String,
+            lastSeenTs: Long,
+            isInactive: Boolean,
+            roomEncryptionTrustLevel: RoomEncryptionTrustLevel,
+            cryptoDeviceInfo: CryptoDeviceInfo,
+    ): DeviceInfo {
+        val deviceInfo = mockk<DeviceInfo>()
+        every { deviceInfo.deviceId } returns deviceId
+        every { deviceInfo.lastSeenTs } returns lastSeenTs
+        every { deviceInfo.getBestLastSeenUserAgent() } returns ""
+        every { getEncryptionTrustLevelForDeviceUseCase.execute(any(), cryptoDeviceInfo) } returns roomEncryptionTrustLevel
+        every { checkIfSessionIsInactiveUseCase.execute(lastSeenTs) } returns isInactive
+        every { parseDeviceUserAgentUseCase.execute(any()) } returns DeviceExtendedInfo(
+                DeviceType.MOBILE,
+        )
+
+        return deviceInfo
+    }
+
+    private fun givenAMatrixClientInfo(deviceId: String): MatrixClientInfoContent {
+        val matrixClientInfo = mockk<MatrixClientInfoContent>()
+        every { getMatrixClientInfoUseCase.execute(fakeActiveSessionHolder.fakeSession, deviceId) } returns matrixClientInfo
+        return matrixClientInfo
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCaseTest.kt
new file mode 100644
index 0000000000..20c4a8fa3d
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/ParseDeviceUserAgentUseCaseTest.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+private val A_USER_AGENT_LIST_FOR_ANDROID = listOf(
+        // New User Agent Implementation
+        "Element dbg/1.5.0-dev (Xiaomi Mi 9T; Android 11; RKQ1.200826.002 test-keys; Flavour GooglePlay; MatrixAndroidSdk2 1.5.2)",
+        "Element/1.5.0 (Samsung SM-G960F; Android 6.0.1; RKQ1.200826.002; Flavour FDroid; MatrixAndroidSdk2 1.5.2)",
+        "Element/1.5.0 (Google Nexus 5; Android 7.0; RKQ1.200826.002 test test; Flavour FDroid; MatrixAndroidSdk2 1.5.2)",
+        "Element/1.5.0 (Google (Nexus) 5; Android 7.0; RKQ1.200826.002 test test; Flavour FDroid; MatrixAndroidSdk2 1.5.2)",
+        "Element/1.5.0 (Google (Nexus) (5); Android 7.0; RKQ1.200826.002 test test; Flavour FDroid; MatrixAndroidSdk2 1.5.2)",
+        // Legacy User Agent Implementation
+        "Element/1.0.0 (Linux; U; Android 6.0.1; SM-A510F Build/MMB29; Flavour GPlay; MatrixAndroidSdk2 1.0)",
+        "Element/1.0.0 (Linux; Android 7.0; SM-G610M Build/NRD90M; Flavour GPlay; MatrixAndroidSdk2 1.0)",
+)
+private val AN_EXPECTED_RESULT_LIST_FOR_ANDROID = listOf(
+        DeviceExtendedInfo(DeviceType.MOBILE, "Xiaomi Mi 9T", "Android 11", "Element dbg", "1.5.0-dev"),
+        DeviceExtendedInfo(DeviceType.MOBILE, "Samsung SM-G960F", "Android 6.0.1", "Element", "1.5.0"),
+        DeviceExtendedInfo(DeviceType.MOBILE, "Google Nexus 5", "Android 7.0", "Element", "1.5.0"),
+        DeviceExtendedInfo(DeviceType.MOBILE, "Google (Nexus) 5", "Android 7.0", "Element", "1.5.0"),
+        DeviceExtendedInfo(DeviceType.MOBILE, "Google (Nexus) (5)", "Android 7.0", "Element", "1.5.0"),
+        DeviceExtendedInfo(DeviceType.MOBILE, "SM-A510F Build/MMB29", "Android 6.0.1", "Element", "1.0.0"),
+        DeviceExtendedInfo(DeviceType.MOBILE, "SM-G610M Build/NRD90M", "Android 7.0", "Element", "1.0.0"),
+)
+
+private val A_USER_AGENT_LIST_FOR_IOS = listOf(
+        "Element/1.8.21 (iPhone; iOS 15.2; Scale/3.00)",
+        "Element/1.8.21 (iPhone XS Max; iOS 15.2; Scale/3.00)",
+        "Element/1.8.21 (iPad Pro (11-inch); iOS 15.2; Scale/3.00)",
+        "Element/1.8.21 (iPad Pro (12.9-inch) (3rd generation); iOS 15.2; Scale/3.00)",
+)
+private val AN_EXPECTED_RESULT_LIST_FOR_IOS = listOf(
+        DeviceExtendedInfo(DeviceType.MOBILE, "iPhone", "iOS 15.2", "Element", "1.8.21"),
+        DeviceExtendedInfo(DeviceType.MOBILE, "iPhone XS Max", "iOS 15.2", "Element", "1.8.21"),
+        DeviceExtendedInfo(DeviceType.MOBILE, "iPad Pro (11-inch)", "iOS 15.2", "Element", "1.8.21"),
+        DeviceExtendedInfo(DeviceType.MOBILE, "iPad Pro (12.9-inch) (3rd generation)", "iOS 15.2",
+                "Element", "1.8.21"),
+)
+
+private val A_USER_AGENT_LIST_FOR_DESKTOP = listOf(
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) ElementNightly/2022091301 Chrome/104.0.5112.102" +
+                " Electron/20.1.1 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) ElementNightly/2022091301 Chrome/104.0.5112.102 Electron/20.1.1 Safari/537.36",
+)
+private val AN_EXPECTED_RESULT_LIST_FOR_DESKTOP = listOf(
+        DeviceExtendedInfo(DeviceType.DESKTOP, null, "macOS", "Electron", "20.1.1"),
+        DeviceExtendedInfo(DeviceType.DESKTOP, null, "Windows", "Electron", "20.1.1"),
+)
+
+private val A_USER_AGENT_LIST_FOR_WEB = listOf(
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:39.0) Gecko/20100101 Firefox/39.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_2) AppleWebKit/600.3.18 (KHTML, like Gecko) Version/8.0.3 Safari/600.3.18",
+        "Mozilla/5.0 (Linux; Android 9; SM-G973U Build/PPR1.180610.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36",
+        "Mozilla/5.0 (iPad; CPU OS 8_4_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12H321 Safari/600.1.4",
+        "Mozilla/5.0 (iPhone; CPU iPhone OS 8_4_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12H321 Safari/600.1.4",
+        "Mozilla/5.0 (Windows NT 6.0; rv:40.0) Gecko/20100101 Firefox/40.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246",
+        )
+private val AN_EXPECTED_RESULT_LIST_FOR_WEB = listOf(
+        DeviceExtendedInfo(DeviceType.WEB, null, "macOS", "Chrome", "104.0.5112.102"),
+        DeviceExtendedInfo(DeviceType.WEB, null, "Windows", "Chrome", "104.0.5112.102"),
+        DeviceExtendedInfo(DeviceType.WEB, null, "macOS", "Firefox", "39.0"),
+        DeviceExtendedInfo(DeviceType.WEB, null, "macOS", "Safari", "8.0.3"),
+        DeviceExtendedInfo(DeviceType.WEB, null, "Android", "Chrome", "69.0.3497.100"),
+        DeviceExtendedInfo(DeviceType.WEB, null, "iOS", "Safari", "8.0"),
+        DeviceExtendedInfo(DeviceType.WEB, null, "iOS", "Safari", "8.0"),
+        DeviceExtendedInfo(DeviceType.WEB, null, "Windows", "Firefox", "40.0"),
+        DeviceExtendedInfo(DeviceType.WEB, null, "Windows", "Edge", "12.246"),
+)
+
+private val AN_UNKNOWN_USER_AGENT_LIST = listOf(
+        "AppleTV11,1/11.1",
+        "Curl Client/1.0",
+)
+private val AN_UNKNOWN_USER_AGENT_EXPECTED_RESULT_LIST = listOf(
+        DeviceExtendedInfo(DeviceType.UNKNOWN, null, null, null, null),
+        DeviceExtendedInfo(DeviceType.UNKNOWN, null, null, null, null),
+)
+
+class ParseDeviceUserAgentUseCaseTest {
+
+    private val parseDeviceUserAgentUseCase = ParseDeviceUserAgentUseCase()
+
+    @Test
+    fun `given an Android user agent then it should be parsed as expected`() {
+        A_USER_AGENT_LIST_FOR_ANDROID.forEachIndexed { index, userAgent ->
+            parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_EXPECTED_RESULT_LIST_FOR_ANDROID[index]
+        }
+    }
+
+    @Test
+    fun `given an iOS user agent then it should be parsed as expected`() {
+        A_USER_AGENT_LIST_FOR_IOS.forEachIndexed { index, userAgent ->
+            parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_EXPECTED_RESULT_LIST_FOR_IOS[index]
+        }
+    }
+
+    @Test
+    fun `given a Desktop user agent then it should be parsed as expected`() {
+        A_USER_AGENT_LIST_FOR_DESKTOP.forEachIndexed { index, userAgent ->
+            parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_EXPECTED_RESULT_LIST_FOR_DESKTOP[index]
+        }
+    }
+
+    @Test
+    fun `given a Web user agent then it should be parsed as expected`() {
+        A_USER_AGENT_LIST_FOR_WEB.forEachIndexed { index, userAgent ->
+            parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_EXPECTED_RESULT_LIST_FOR_WEB[index]
+        }
+    }
+
+    @Test
+    fun `given an unknown user agent then it should be parsed as expected`() {
+        AN_UNKNOWN_USER_AGENT_LIST.forEachIndexed { index, userAgent ->
+            parseDeviceUserAgentUseCase.execute(userAgent) shouldBeEqualTo AN_UNKNOWN_USER_AGENT_EXPECTED_RESULT_LIST[index]
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/RefreshDevicesOnCryptoDevicesChangeUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/RefreshDevicesOnCryptoDevicesChangeUseCaseTest.kt
new file mode 100644
index 0000000000..97958d04ed
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/RefreshDevicesOnCryptoDevicesChangeUseCaseTest.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.runs
+import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.flow.FlowSession
+import org.matrix.android.sdk.flow.flow
+
+class RefreshDevicesOnCryptoDevicesChangeUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+
+    private val refreshDevicesOnCryptoDevicesChangeUseCase = RefreshDevicesOnCryptoDevicesChangeUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance
+    )
+
+    @Before
+    fun setUp() {
+        mockkStatic("org.matrix.android.sdk.flow.FlowSessionKt")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given the current session when crypto devices list changes then the devices list is refreshed`() = runTest {
+        // Given
+        val device1 = givenACryptoDevice()
+        val devices = listOf(device1)
+        val fakeSession = fakeActiveSessionHolder.fakeSession
+        val flowSession = mockk<FlowSession>()
+        every { fakeSession.flow() } returns flowSession
+        every { flowSession.liveUserCryptoDevices(any()) } returns flowOf(devices)
+        every { fakeSession.cryptoService().fetchDevicesList(any()) } just runs
+
+        // When
+        refreshDevicesOnCryptoDevicesChangeUseCase.execute()
+
+        // Then
+        verify {
+            flowSession.liveUserCryptoDevices(fakeSession.myUserId)
+            // FIXME the following verification does not work due to the usage of Flow.sample() inside the use case implementation
+            // fakeSession.cryptoService().fetchDevicesList(match { it is NoOpMatrixCallback })
+        }
+    }
+
+    private fun givenACryptoDevice(): CryptoDeviceInfo = mockk()
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/RefreshDevicesUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/RefreshDevicesUseCaseTest.kt
new file mode 100644
index 0000000000..4cd7afaf08
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/RefreshDevicesUseCaseTest.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import io.mockk.every
+import io.mockk.just
+import io.mockk.runs
+import io.mockk.verifyAll
+import org.junit.Test
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+
+class RefreshDevicesUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+
+    private val refreshDevicesUseCase = RefreshDevicesUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance
+    )
+
+    @Test
+    fun `given current session when refreshing then devices list and keys are fetched`() {
+        val session = fakeActiveSessionHolder.fakeSession
+        every { session.cryptoService().fetchDevicesList(any()) } just runs
+        every { session.cryptoService().downloadKeys(any(), any(), any()) } just runs
+
+        refreshDevicesUseCase.execute()
+
+        verifyAll {
+            session.cryptoService().fetchDevicesList(match { it is NoOpMatrixCallback })
+            session.cryptoService().downloadKeys(listOf(session.myUserId), true, match { it is NoOpMatrixCallback })
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/ToggleIpAddressVisibilityUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/ToggleIpAddressVisibilityUseCaseTest.kt
new file mode 100644
index 0000000000..53dfc707b1
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/ToggleIpAddressVisibilityUseCaseTest.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import im.vector.app.test.fakes.FakeVectorPreferences
+import org.junit.Test
+
+class ToggleIpAddressVisibilityUseCaseTest {
+
+    private val fakeVectorPreferences = FakeVectorPreferences()
+
+    private val toggleIpAddressVisibilityUseCase = ToggleIpAddressVisibilityUseCase(
+            vectorPreferences = fakeVectorPreferences.instance,
+    )
+
+    @Test
+    fun `given ip addresses are currently visible then then visibility is set as false`() {
+        // Given
+        fakeVectorPreferences.givenShowIpAddressInSessionManagerScreens(true)
+
+        // When
+        toggleIpAddressVisibilityUseCase.execute()
+
+        // Then
+        fakeVectorPreferences.verifySetIpAddressVisibilityInDeviceManagerScreens(false)
+    }
+
+    @Test
+    fun `given ip addresses are currently not visible then then visibility is set as true`() {
+        // Given
+        fakeVectorPreferences.givenShowIpAddressInSessionManagerScreens(false)
+
+        // When
+        toggleIpAddressVisibilityUseCase.execute()
+
+        // Then
+        fakeVectorPreferences.verifySetIpAddressVisibilityInDeviceManagerScreens(true)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigatorTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigatorTest.kt
new file mode 100644
index 0000000000..e53e9f7151
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigatorTest.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2
+
+import android.content.Intent
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.othersessions.OtherSessionsActivity
+import im.vector.app.features.settings.devices.v2.overview.SessionOverviewActivity
+import im.vector.app.features.settings.devices.v2.rename.RenameSessionActivity
+import im.vector.app.test.fakes.FakeContext
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.unmockkAll
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+private const val A_SESSION_ID = "session_id"
+private val A_DEFAULT_FILTER = DeviceManagerFilterType.INACTIVE
+
+class VectorSettingsDevicesViewNavigatorTest {
+
+    private val context = FakeContext()
+    private val vectorSettingsDevicesViewNavigator = VectorSettingsDevicesViewNavigator()
+
+    @Before
+    fun setUp() {
+        mockkObject(SessionOverviewActivity.Companion)
+        mockkObject(OtherSessionsActivity.Companion)
+        mockkObject(RenameSessionActivity.Companion)
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a session id when navigating to overview then it starts the correct activity`() {
+        // Given
+        val intent = givenIntentForSessionOverview(A_SESSION_ID)
+        context.givenStartActivity(intent)
+
+        // When
+        vectorSettingsDevicesViewNavigator.navigateToSessionOverview(context.instance, A_SESSION_ID)
+
+        // Then
+        context.verifyStartActivity(intent)
+    }
+
+    @Test
+    fun `given an intent when navigating to other sessions list then it starts the correct activity`() {
+        // Given
+        val intent = givenIntentForOtherSessions(A_DEFAULT_FILTER, true)
+        context.givenStartActivity(intent)
+
+        // When
+        vectorSettingsDevicesViewNavigator.navigateToOtherSessions(context.instance, A_DEFAULT_FILTER, true)
+
+        // Then
+        context.verifyStartActivity(intent)
+    }
+
+    @Test
+    fun `given an intent when navigating to rename session screen then it starts the correct activity`() {
+        // Given
+        val intent = givenIntentForRenameSession(A_SESSION_ID)
+        context.givenStartActivity(intent)
+
+        // When
+        vectorSettingsDevicesViewNavigator.navigateToRenameSession(context.instance, A_SESSION_ID)
+
+        // Then
+        context.verifyStartActivity(intent)
+    }
+
+    private fun givenIntentForSessionOverview(sessionId: String): Intent {
+        val intent = mockk<Intent>()
+        every { SessionOverviewActivity.newIntent(context.instance, sessionId) } returns intent
+        return intent
+    }
+
+    private fun givenIntentForOtherSessions(defaultFilter: DeviceManagerFilterType, excludeCurrentDevice: Boolean): Intent {
+        val intent = mockk<Intent>()
+        every { OtherSessionsActivity.newIntent(context.instance, defaultFilter, excludeCurrentDevice) } returns intent
+        return intent
+    }
+
+    private fun givenIntentForRenameSession(sessionId: String): Intent {
+        val intent = mockk<Intent>()
+        every { RenameSessionActivity.newIntent(context.instance, sessionId) } returns intent
+        return intent
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionApplicationIsVisibleUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionApplicationIsVisibleUseCaseTest.kt
new file mode 100644
index 0000000000..23b02088b0
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionApplicationIsVisibleUseCaseTest.kt
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import im.vector.app.core.session.clientinfo.MatrixClientInfoContent
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+private const val AN_APP_NAME = "app-name"
+private const val AN_APP_VERSION = "app-version"
+private const val AN_APP_URL = "app-url"
+
+class CheckIfSectionApplicationIsVisibleUseCaseTest {
+
+    private val checkIfSectionApplicationIsVisibleUseCase = CheckIfSectionApplicationIsVisibleUseCase()
+
+    @Test
+    fun `given client info with name, version or url when checking is application section is visible then it returns true`() {
+        // Given
+        val clientInfoList = listOf(
+                givenAClientInfo(
+                        name = AN_APP_NAME,
+                        version = null,
+                        url = null,
+                ),
+                givenAClientInfo(
+                        name = null,
+                        version = AN_APP_VERSION,
+                        url = null,
+                ),
+                givenAClientInfo(
+                        name = null,
+                        version = null,
+                        url = AN_APP_URL,
+                ),
+                givenAClientInfo(
+                        name = AN_APP_NAME,
+                        version = AN_APP_VERSION,
+                        url = null,
+                ),
+                givenAClientInfo(
+                        name = AN_APP_NAME,
+                        version = null,
+                        url = AN_APP_URL,
+                ),
+                givenAClientInfo(
+                        name = null,
+                        version = AN_APP_VERSION,
+                        url = AN_APP_URL,
+                ),
+                givenAClientInfo(
+                        name = AN_APP_NAME,
+                        version = AN_APP_VERSION,
+                        url = AN_APP_URL,
+                ),
+        )
+
+        clientInfoList.forEach { clientInfo ->
+            // When
+            val result = checkIfSectionApplicationIsVisibleUseCase.execute(clientInfo)
+
+            // Then
+            result shouldBeEqualTo true
+        }
+    }
+
+    @Test
+    fun `given client info with missing application info when checking is application section is visible then it returns false`() {
+        // Given
+        val clientInfoList = listOf(
+                givenAClientInfo(
+                        name = null,
+                        version = null,
+                        url = null,
+                ),
+                givenAClientInfo(
+                        name = "",
+                        version = null,
+                        url = null,
+                ),
+                givenAClientInfo(
+                        name = null,
+                        version = "",
+                        url = null,
+                ),
+                givenAClientInfo(
+                        name = null,
+                        version = null,
+                        url = "",
+                ),
+                givenAClientInfo(
+                        name = "",
+                        version = "",
+                        url = null,
+                ),
+                givenAClientInfo(
+                        name = "",
+                        version = null,
+                        url = "",
+                ),
+                givenAClientInfo(
+                        name = null,
+                        version = "",
+                        url = "",
+                ),
+                givenAClientInfo(
+                        name = "",
+                        version = "",
+                        url = "",
+                ),
+        )
+
+        clientInfoList.forEach { clientInfo ->
+            // When
+            val result = checkIfSectionApplicationIsVisibleUseCase.execute(clientInfo)
+
+            // Then
+            result shouldBeEqualTo false
+        }
+    }
+
+    private fun givenAClientInfo(
+            name: String?,
+            version: String?,
+            url: String?,
+    ) = MatrixClientInfoContent(
+            name = name,
+            version = version,
+            url = url,
+    )
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionDeviceIsVisibleUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionDeviceIsVisibleUseCaseTest.kt
new file mode 100644
index 0000000000..d124f68b1b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionDeviceIsVisibleUseCaseTest.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import io.mockk.every
+import io.mockk.mockk
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+
+private const val AN_IP_ADDRESS = "ip-address"
+private const val A_DEVICE_MODEL = "device-model"
+private const val A_DEVICE_OPERATING_SYSTEM = "device-operating-system"
+private const val A_CLIENT_NAME = "client-name"
+
+class CheckIfSectionDeviceIsVisibleUseCaseTest {
+
+    private val checkIfSectionDeviceIsVisibleUseCase = CheckIfSectionDeviceIsVisibleUseCase()
+
+    @Test
+    fun `given device of any type with Ip address when checking if device section is visible then it returns true`() {
+        DeviceType.values().forEach { deviceType ->
+            // Given
+            val deviceExtendedInfo = givenAnExtendedDeviceInfo(deviceType)
+            val deviceFullInfo = givenADeviceFullInfo(deviceExtendedInfo)
+            val deviceInfo = givenADeviceInfo(ipAddress = AN_IP_ADDRESS)
+            every { deviceFullInfo.deviceInfo } returns deviceInfo
+
+            // When
+            val result = checkIfSectionDeviceIsVisibleUseCase.execute(deviceFullInfo)
+
+            // Then
+            result shouldBeEqualTo true
+        }
+    }
+
+    @Test
+    fun `given device of any type with empty or null Ip address and no extended info when checking if device section is visible then it returns false`() {
+        DeviceType.values().forEach { deviceType ->
+            // Given
+            val deviceExtendedInfo = givenAnExtendedDeviceInfo(deviceType)
+            val deviceFullInfo1 = givenADeviceFullInfo(deviceExtendedInfo)
+            val deviceFullInfo2 = givenADeviceFullInfo(deviceExtendedInfo)
+            val deviceInfo1 = givenADeviceInfo(ipAddress = "")
+            val deviceInfo2 = givenADeviceInfo(ipAddress = null)
+            every { deviceFullInfo1.deviceInfo } returns deviceInfo1
+            every { deviceFullInfo2.deviceInfo } returns deviceInfo2
+
+            // When
+            val result1 = checkIfSectionDeviceIsVisibleUseCase.execute(deviceFullInfo1)
+            val result2 = checkIfSectionDeviceIsVisibleUseCase.execute(deviceFullInfo2)
+
+            // Then
+            result1 shouldBeEqualTo false
+            result2 shouldBeEqualTo false
+        }
+    }
+
+    @Test
+    fun `given device of any type with extended info when checking if device section is visible then it returns true`() {
+        // Given
+        val deviceExtendedInfoList = listOf(
+                givenAnExtendedDeviceInfo(
+                        DeviceType.MOBILE,
+                        deviceModel = A_DEVICE_MODEL,
+                ),
+                givenAnExtendedDeviceInfo(
+                        DeviceType.MOBILE,
+                        deviceOperatingSystem = A_DEVICE_OPERATING_SYSTEM,
+                ),
+                givenAnExtendedDeviceInfo(
+                        DeviceType.MOBILE,
+                        deviceModel = A_DEVICE_MODEL,
+                        deviceOperatingSystem = A_DEVICE_OPERATING_SYSTEM,
+                ),
+                givenAnExtendedDeviceInfo(
+                        DeviceType.DESKTOP,
+                        deviceOperatingSystem = A_DEVICE_OPERATING_SYSTEM,
+                ),
+                givenAnExtendedDeviceInfo(
+                        DeviceType.WEB,
+                        clientName = A_CLIENT_NAME,
+                ),
+                givenAnExtendedDeviceInfo(
+                        DeviceType.WEB,
+                        deviceOperatingSystem = A_DEVICE_OPERATING_SYSTEM,
+                ),
+                givenAnExtendedDeviceInfo(
+                        DeviceType.WEB,
+                        clientName = A_CLIENT_NAME,
+                        deviceOperatingSystem = A_DEVICE_OPERATING_SYSTEM,
+                ),
+        )
+
+        deviceExtendedInfoList.forEach { deviceExtendedInfo ->
+            val deviceFullInfo = givenADeviceFullInfo(deviceExtendedInfo)
+            val deviceInfo = givenADeviceInfo(ipAddress = null)
+            every { deviceFullInfo.deviceInfo } returns deviceInfo
+
+            // When
+            val result = checkIfSectionDeviceIsVisibleUseCase.execute(deviceFullInfo)
+
+            // Then
+            result shouldBeEqualTo true
+        }
+    }
+
+    private fun givenADeviceFullInfo(deviceExtendedInfo: DeviceExtendedInfo): DeviceFullInfo {
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.deviceExtendedInfo } returns deviceExtendedInfo
+        return deviceFullInfo
+    }
+
+    private fun givenADeviceInfo(ipAddress: String?): DeviceInfo {
+        val info = mockk<DeviceInfo>()
+        every { info.lastSeenIp } returns ipAddress
+        return info
+    }
+
+    private fun givenAnExtendedDeviceInfo(
+            deviceType: DeviceType,
+            clientName: String? = null,
+            clientVersion: String? = null,
+            deviceOperatingSystem: String? = null,
+            deviceModel: String? = null,
+    ): DeviceExtendedInfo {
+        return DeviceExtendedInfo(
+                deviceType = deviceType,
+                clientName = clientName,
+                clientVersion = clientVersion,
+                deviceOperatingSystem = deviceOperatingSystem,
+                deviceModel = deviceModel,
+        )
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionSessionIsVisibleUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionSessionIsVisibleUseCaseTest.kt
new file mode 100644
index 0000000000..a6d29f4fe1
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/CheckIfSectionSessionIsVisibleUseCaseTest.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import io.mockk.every
+import io.mockk.mockk
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+
+private const val A_SESSION_NAME = "session-name"
+private const val A_SESSION_ID = "session-id"
+private const val A_LAST_SEEN_TS = 123L
+
+class CheckIfSectionSessionIsVisibleUseCaseTest {
+
+    private val checkIfSectionSessionIsVisibleUseCase = CheckIfSectionSessionIsVisibleUseCase()
+
+    @Test
+    fun `given device info with name, id or lastSeenTs when checking is session section is visible then it returns true`() {
+        // Given
+        val deviceInfoList = listOf(
+                givenADeviceInfo(
+                        sessionName = A_SESSION_NAME,
+                        sessionId = null,
+                        lastSeenTs = null,
+                ),
+                givenADeviceInfo(
+                        sessionName = null,
+                        sessionId = A_SESSION_ID,
+                        lastSeenTs = null,
+                ),
+                givenADeviceInfo(
+                        sessionName = null,
+                        sessionId = null,
+                        lastSeenTs = A_LAST_SEEN_TS,
+                ),
+                givenADeviceInfo(
+                        sessionName = A_SESSION_NAME,
+                        sessionId = A_SESSION_ID,
+                        lastSeenTs = null,
+                ),
+                givenADeviceInfo(
+                        sessionName = A_SESSION_NAME,
+                        sessionId = null,
+                        lastSeenTs = A_LAST_SEEN_TS,
+                ),
+                givenADeviceInfo(
+                        sessionName = null,
+                        sessionId = A_SESSION_ID,
+                        lastSeenTs = A_LAST_SEEN_TS,
+                ),
+                givenADeviceInfo(
+                        sessionName = A_SESSION_NAME,
+                        sessionId = A_SESSION_ID,
+                        lastSeenTs = A_LAST_SEEN_TS,
+                ),
+        )
+
+        deviceInfoList.forEach { deviceInfo ->
+            // When
+            val result = checkIfSectionSessionIsVisibleUseCase.execute(deviceInfo)
+
+            // Then
+            result shouldBeEqualTo true
+        }
+    }
+
+    @Test
+    fun `given device info with missing session info when checking is session section is visible then it returns false`() {
+        // Given
+        val deviceInfoList = listOf(
+                givenADeviceInfo(
+                        sessionName = null,
+                        sessionId = null,
+                        lastSeenTs = null,
+                ),
+                givenADeviceInfo(
+                        sessionName = "",
+                        sessionId = "",
+                        lastSeenTs = null,
+                ),
+                givenADeviceInfo(
+                        sessionName = "",
+                        sessionId = "",
+                        lastSeenTs = -1,
+                ),
+        )
+
+        deviceInfoList.forEach { deviceInfo ->
+            // When
+            val result = checkIfSectionSessionIsVisibleUseCase.execute(deviceInfo)
+
+            // Then
+            result shouldBeEqualTo false
+        }
+    }
+
+    private fun givenADeviceInfo(
+            sessionName: String?,
+            sessionId: String?,
+            lastSeenTs: Long?,
+    ): DeviceInfo {
+        val info = mockk<DeviceInfo>()
+        every { info.displayName } returns sessionName
+        every { info.deviceId } returns sessionId
+        every { info.lastSeenTs } returns lastSeenTs
+        return info
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewModelTest.kt
new file mode 100644
index 0000000000..5fdd219226
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsViewModelTest.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.details
+
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.core.utils.CopyToClipboardUseCase
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.overview.GetDeviceFullInfoUseCase
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import io.mockk.verify
+import kotlinx.coroutines.flow.flowOf
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+
+private const val A_SESSION_ID = "session-id"
+private const val A_TEXT = "text"
+
+class SessionDetailsViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
+
+    private val args = SessionDetailsArgs(
+            deviceId = A_SESSION_ID
+    )
+    private val getDeviceFullInfoUseCase = mockk<GetDeviceFullInfoUseCase>()
+    private val copyToClipboardUseCase = mockk<CopyToClipboardUseCase>()
+
+    private fun createViewModel() = SessionDetailsViewModel(
+            initialState = SessionDetailsViewState(args),
+            getDeviceFullInfoUseCase = getDeviceFullInfoUseCase,
+            copyToClipboardUseCase = copyToClipboardUseCase,
+    )
+
+    @Test
+    fun `given the viewModel has been initialized then viewState is updated with session info`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID) } returns flowOf(deviceFullInfo)
+        val expectedState = SessionDetailsViewState(
+                deviceId = A_SESSION_ID,
+                deviceFullInfo = Success(deviceFullInfo)
+        )
+
+        // When
+        val viewModel = createViewModel()
+
+        // Then
+        viewModel.test()
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+        verify { getDeviceFullInfoUseCase.execute(A_SESSION_ID) }
+    }
+
+    @Test
+    fun `given copyToClipboard action when viewModel handle it then related use case is executed and viewEvent is updated`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        val deviceInfo = mockk<DeviceInfo>()
+        every { deviceFullInfo.deviceInfo } returns deviceInfo
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID) } returns flowOf(deviceFullInfo)
+        val action = SessionDetailsAction.CopyToClipboard(A_TEXT)
+        every { copyToClipboardUseCase.execute(any()) } just runs
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest
+                .assertEvent { it is SessionDetailsViewEvent.ContentCopiedToClipboard }
+                .finish()
+        verify { copyToClipboardUseCase.execute(A_TEXT) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCaseTest.kt
new file mode 100644
index 0000000000..2e8a81bf54
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/filter/FilterDevicesUseCaseTest.kt
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.filter
+
+import im.vector.app.core.session.clientinfo.MatrixClientInfoContent
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldContain
+import org.amshove.kluent.shouldContainAll
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+private val activeVerifiedDevice = DeviceFullInfo(
+        deviceInfo = DeviceInfo(deviceId = "ACTIVE_VERIFIED_DEVICE"),
+        cryptoDeviceInfo = CryptoDeviceInfo(
+                userId = "USER_ID_1",
+                deviceId = "ACTIVE_VERIFIED_DEVICE",
+                trustLevel = DeviceTrustLevel(crossSigningVerified = true, locallyVerified = true)
+        ),
+        roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+        isInactive = false,
+        isCurrentDevice = true,
+        deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+        matrixClientInfo = MatrixClientInfoContent(),
+)
+private val inactiveVerifiedDevice = DeviceFullInfo(
+        deviceInfo = DeviceInfo(deviceId = "INACTIVE_VERIFIED_DEVICE"),
+        cryptoDeviceInfo = CryptoDeviceInfo(
+                userId = "USER_ID_1",
+                deviceId = "INACTIVE_VERIFIED_DEVICE",
+                trustLevel = DeviceTrustLevel(crossSigningVerified = true, locallyVerified = true)
+        ),
+        roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+        isInactive = true,
+        isCurrentDevice = false,
+        deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+        matrixClientInfo = MatrixClientInfoContent(),
+)
+private val activeUnverifiedDevice = DeviceFullInfo(
+        deviceInfo = DeviceInfo(deviceId = "ACTIVE_UNVERIFIED_DEVICE"),
+        cryptoDeviceInfo = CryptoDeviceInfo(
+                userId = "USER_ID_1",
+                deviceId = "ACTIVE_UNVERIFIED_DEVICE",
+                trustLevel = DeviceTrustLevel(crossSigningVerified = false, locallyVerified = false)
+        ),
+        roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
+        isInactive = false,
+        isCurrentDevice = false,
+        deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+        matrixClientInfo = MatrixClientInfoContent(),
+)
+private val inactiveUnverifiedDevice = DeviceFullInfo(
+        deviceInfo = DeviceInfo(deviceId = "INACTIVE_UNVERIFIED_DEVICE"),
+        cryptoDeviceInfo = CryptoDeviceInfo(
+                userId = "USER_ID_1",
+                deviceId = "INACTIVE_UNVERIFIED_DEVICE",
+                trustLevel = DeviceTrustLevel(crossSigningVerified = false, locallyVerified = false)
+        ),
+        roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Warning,
+        isInactive = true,
+        isCurrentDevice = false,
+        deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+        matrixClientInfo = MatrixClientInfoContent(),
+)
+
+private val deviceWithoutEncryptionSupport = DeviceFullInfo(
+        deviceInfo = DeviceInfo(deviceId = "DEVICE_WITHOUT_ENCRYPTION_SUPPORT"),
+        cryptoDeviceInfo = null,
+        roomEncryptionTrustLevel = null,
+        isInactive = false,
+        isCurrentDevice = false,
+        deviceExtendedInfo = DeviceExtendedInfo(DeviceType.UNKNOWN),
+        matrixClientInfo = MatrixClientInfoContent(),
+)
+
+private val devices = listOf(
+        activeVerifiedDevice,
+        inactiveVerifiedDevice,
+        activeUnverifiedDevice,
+        inactiveUnverifiedDevice,
+        deviceWithoutEncryptionSupport,
+)
+
+class FilterDevicesUseCaseTest {
+
+    private val filterDevicesUseCase = FilterDevicesUseCase()
+
+    @Test
+    fun `given a device list when filter type is ALL_SESSIONS then returns the same list`() {
+        val currentSessionCrossSigningInfo = givenCurrentSessionVerified(true)
+        val filteredDeviceList = filterDevicesUseCase.execute(currentSessionCrossSigningInfo, devices, DeviceManagerFilterType.ALL_SESSIONS, emptyList())
+
+        filteredDeviceList.size shouldBeEqualTo devices.size
+    }
+
+    @Test
+    fun `given a device list and current session is verified when filter type is VERIFIED then returns only verified devices`() {
+        val currentSessionCrossSigningInfo = givenCurrentSessionVerified(true)
+        val filteredDeviceList = filterDevicesUseCase.execute(currentSessionCrossSigningInfo, devices, DeviceManagerFilterType.VERIFIED, emptyList())
+
+        filteredDeviceList.size shouldBeEqualTo 2
+        filteredDeviceList shouldContainAll listOf(activeVerifiedDevice, inactiveVerifiedDevice)
+    }
+
+    @Test
+    fun `given a device list and current session is unverified when filter type is VERIFIED then returns empty list of devices`() {
+        val currentSessionCrossSigningInfo = givenCurrentSessionVerified(false)
+        val filteredDeviceList = filterDevicesUseCase.execute(currentSessionCrossSigningInfo, devices, DeviceManagerFilterType.VERIFIED, emptyList())
+
+        filteredDeviceList.size shouldBeEqualTo 0
+    }
+
+    @Test
+    fun `given a device list and current session is verified when filter type is UNVERIFIED then returns only unverified devices`() {
+        val currentSessionCrossSigningInfo = givenCurrentSessionVerified(true)
+        val filteredDeviceList = filterDevicesUseCase.execute(currentSessionCrossSigningInfo, devices, DeviceManagerFilterType.UNVERIFIED, emptyList())
+
+        filteredDeviceList.size shouldBeEqualTo 3
+        filteredDeviceList shouldContainAll listOf(activeUnverifiedDevice, inactiveUnverifiedDevice, deviceWithoutEncryptionSupport)
+    }
+
+    @Test
+    fun `given a device list and current session is unverified when filter type is UNVERIFIED then returns empty list of devices`() {
+        val currentSessionCrossSigningInfo = givenCurrentSessionVerified(false)
+        val filteredDeviceList = filterDevicesUseCase.execute(currentSessionCrossSigningInfo, devices, DeviceManagerFilterType.UNVERIFIED, emptyList())
+
+        filteredDeviceList.size shouldBeEqualTo 1
+        filteredDeviceList shouldContain deviceWithoutEncryptionSupport
+    }
+
+    @Test
+    fun `given a device list when filter type is INACTIVE then returns only inactive devices`() {
+        val currentSessionCrossSigningInfo = givenCurrentSessionVerified(true)
+        val filteredDeviceList = filterDevicesUseCase.execute(currentSessionCrossSigningInfo, devices, DeviceManagerFilterType.INACTIVE, emptyList())
+
+        filteredDeviceList.size shouldBeEqualTo 2
+        filteredDeviceList shouldContainAll listOf(inactiveVerifiedDevice, inactiveUnverifiedDevice)
+    }
+
+    private fun givenCurrentSessionVerified(isVerified: Boolean): CurrentSessionCrossSigningInfo = CurrentSessionCrossSigningInfo(
+            isCrossSigningVerified = isVerified,
+            isCrossSigningInitialized = true,
+            deviceId = ""
+    )
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt
new file mode 100644
index 0000000000..20291e5ee2
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCaseTest.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import im.vector.app.test.fakes.FakeClock
+import org.amshove.kluent.shouldBeFalse
+import org.amshove.kluent.shouldBeTrue
+import org.junit.Test
+import java.util.concurrent.TimeUnit
+
+private const val A_TIMESTAMP_MILLIS = 1654689143000L
+
+class CheckIfSessionIsInactiveUseCaseTest {
+
+    private val clock = FakeClock().apply { givenEpoch(A_TIMESTAMP_MILLIS) }
+    private val checkIfSessionIsInactiveUseCase = CheckIfSessionIsInactiveUseCase(clock)
+
+    @Test
+    fun `given an old last seen date then session is inactive`() {
+        val lastSeenDate = A_TIMESTAMP_MILLIS - TimeUnit.DAYS.toMillis(SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS.toLong()) - 1
+
+        val result = checkIfSessionIsInactiveUseCase.execute(lastSeenDate)
+
+        result.shouldBeTrue()
+    }
+
+    @Test
+    fun `given a last seen date equal to the threshold then session is inactive`() {
+        val lastSeenDate = A_TIMESTAMP_MILLIS - TimeUnit.DAYS.toMillis(SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS.toLong())
+
+        val result = checkIfSessionIsInactiveUseCase.execute(lastSeenDate)
+
+        result.shouldBeTrue()
+    }
+
+    @Test
+    fun `given a recent last seen date then session is active`() {
+        val lastSeenDate = A_TIMESTAMP_MILLIS - TimeUnit.DAYS.toMillis(SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS.toLong()) + 1
+
+        val result = checkIfSessionIsInactiveUseCase.execute(lastSeenDate)
+
+        result.shouldBeFalse()
+    }
+
+    @Test
+    fun `given a last seen date as zero then session is not inactive`() {
+        val lastSeenDate = 0L
+
+        val result = checkIfSessionIsInactiveUseCase.execute(lastSeenDate)
+
+        result.shouldBeFalse()
+    }
+
+    @Test
+    fun `given a last seen date as null then session is not inactive`() {
+        val lastSeenDate = null
+
+        val result = checkIfSessionIsInactiveUseCase.execute(lastSeenDate)
+
+        result.shouldBeFalse()
+    }
+
+    @Test
+    fun `given a last seen date as negative then session is not inactive`() {
+        val lastSeenDate = -3L
+
+        val result = checkIfSessionIsInactiveUseCase.execute(lastSeenDate)
+
+        result.shouldBeFalse()
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/SetDeviceTypeIconUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/SetDeviceTypeIconUseCaseTest.kt
new file mode 100644
index 0000000000..30456c596c
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/list/SetDeviceTypeIconUseCaseTest.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.list
+
+import android.widget.ImageView
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import im.vector.app.R
+import im.vector.app.test.fakes.FakeStringProvider
+import io.mockk.mockk
+import io.mockk.verifyAll
+import org.junit.Test
+
+private const val A_DESCRIPTION = "description"
+
+class SetDeviceTypeIconUseCaseTest {
+
+    private val fakeStringProvider = FakeStringProvider()
+
+    private val setDeviceTypeIconUseCase = SetDeviceTypeIconUseCase()
+
+    @Test
+    fun `given a device type when execute then correct icon and description is set to the ImageView`() {
+        testType(
+                deviceType = DeviceType.UNKNOWN,
+                drawableResId = R.drawable.ic_device_type_unknown,
+                descriptionResId = R.string.a11y_device_manager_device_type_unknown
+        )
+
+        testType(
+                deviceType = DeviceType.MOBILE,
+                drawableResId = R.drawable.ic_device_type_mobile,
+                descriptionResId = R.string.a11y_device_manager_device_type_mobile
+        )
+
+        testType(
+                deviceType = DeviceType.WEB,
+                drawableResId = R.drawable.ic_device_type_web,
+                descriptionResId = R.string.a11y_device_manager_device_type_web
+        )
+
+        testType(
+                deviceType = DeviceType.DESKTOP,
+                drawableResId = R.drawable.ic_device_type_desktop,
+                descriptionResId = R.string.a11y_device_manager_device_type_desktop
+        )
+    }
+
+    private fun testType(deviceType: DeviceType, @DrawableRes drawableResId: Int, @StringRes descriptionResId: Int) {
+        // Given
+        val imageView = mockk<ImageView>(relaxUnitFun = true)
+        fakeStringProvider.given(descriptionResId, A_DESCRIPTION)
+
+        // When
+        setDeviceTypeIconUseCase.execute(deviceType, imageView, fakeStringProvider.instance)
+
+        // Then
+        verifyAll {
+            imageView.setImageResource(drawableResId)
+            imageView.contentDescription = A_DESCRIPTION
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaAccountDataUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaAccountDataUseCaseTest.kt
new file mode 100644
index 0000000000..b85acb1e69
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaAccountDataUseCaseTest.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+
+class CanToggleNotificationsViaAccountDataUseCaseTest {
+
+    private val fakeGetNotificationSettingsAccountDataUpdatesUseCase = mockk<GetNotificationSettingsAccountDataUpdatesUseCase>()
+
+    private val canToggleNotificationsViaAccountDataUseCase = CanToggleNotificationsViaAccountDataUseCase(
+            getNotificationSettingsAccountDataUpdatesUseCase = fakeGetNotificationSettingsAccountDataUpdatesUseCase,
+    )
+
+    @Test
+    fun `given current session and content for account data when execute then true is returned`() = runTest {
+        // Given
+        val aSession = FakeSession()
+        val aDeviceId = "aDeviceId"
+        val localNotificationSettingsContent = LocalNotificationSettingsContent(
+                isSilenced = true,
+        )
+        every { fakeGetNotificationSettingsAccountDataUpdatesUseCase.execute(any(), any()) } returns flowOf(localNotificationSettingsContent)
+
+        // When
+        val result = canToggleNotificationsViaAccountDataUseCase.execute(aSession, aDeviceId).firstOrNull()
+
+        // Then
+        result shouldBe true
+        verify { fakeGetNotificationSettingsAccountDataUpdatesUseCase.execute(aSession, aDeviceId) }
+    }
+
+    @Test
+    fun `given current session and empty content for account data when execute then false is returned`() = runTest {
+        // Given
+        val aSession = FakeSession()
+        val aDeviceId = "aDeviceId"
+        val localNotificationSettingsContent = LocalNotificationSettingsContent(
+                isSilenced = null,
+        )
+        every { fakeGetNotificationSettingsAccountDataUpdatesUseCase.execute(any(), any()) } returns flowOf(localNotificationSettingsContent)
+
+        // When
+        val result = canToggleNotificationsViaAccountDataUseCase.execute(aSession, aDeviceId).firstOrNull()
+
+        // Then
+        result shouldBe false
+        verify { fakeGetNotificationSettingsAccountDataUpdatesUseCase.execute(aSession, aDeviceId) }
+    }
+
+    @Test
+    fun `given current session and no related account data when execute then false is returned`() = runTest {
+        // Given
+        val aSession = FakeSession()
+        val aDeviceId = "aDeviceId"
+        every { fakeGetNotificationSettingsAccountDataUpdatesUseCase.execute(any(), any()) } returns flowOf(null)
+
+        // When
+        val result = canToggleNotificationsViaAccountDataUseCase.execute(aSession, aDeviceId).firstOrNull()
+
+        // Then
+        result shouldBe false
+        verify { fakeGetNotificationSettingsAccountDataUpdatesUseCase.execute(aSession, aDeviceId) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaPusherUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaPusherUseCaseTest.kt
new file mode 100644
index 0000000000..3284adb32d
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CanToggleNotificationsViaPusherUseCaseTest.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeFlowLiveDataConversions
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fakes.givenAsFlow
+import im.vector.app.test.fixtures.aHomeServerCapabilities
+import io.mockk.unmockkAll
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+private val A_HOMESERVER_CAPABILITIES = aHomeServerCapabilities(canRemotelyTogglePushNotificationsOfDevices = true)
+
+class CanToggleNotificationsViaPusherUseCaseTest {
+
+    private val fakeSession = FakeSession()
+    private val fakeFlowLiveDataConversions = FakeFlowLiveDataConversions()
+
+    private val canToggleNotificationsViaPusherUseCase =
+            CanToggleNotificationsViaPusherUseCase()
+
+    @Before
+    fun setUp() {
+        fakeFlowLiveDataConversions.setup()
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given current session when execute then flow of the toggle capability is returned`() = runTest {
+        // Given
+        fakeSession
+                .fakeHomeServerCapabilitiesService
+                .givenCapabilitiesLiveReturns(A_HOMESERVER_CAPABILITIES)
+                .givenAsFlow()
+
+        // When
+        val result = canToggleNotificationsViaPusherUseCase.execute(fakeSession).firstOrNull()
+
+        // Then
+        result shouldBeEqualTo A_HOMESERVER_CAPABILITIES.canRemotelyTogglePushNotificationsOfDevices
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaAccountDataUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaAccountDataUseCaseTest.kt
new file mode 100644
index 0000000000..f97e326a02
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaAccountDataUseCaseTest.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.every
+import io.mockk.mockk
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+
+private const val A_DEVICE_ID = "device-id"
+
+class CheckIfCanToggleNotificationsViaAccountDataUseCaseTest {
+
+    private val fakeGetNotificationSettingsAccountDataUseCase = mockk<GetNotificationSettingsAccountDataUseCase>()
+    private val fakeSession = FakeSession()
+
+    private val checkIfCanToggleNotificationsViaAccountDataUseCase =
+            CheckIfCanToggleNotificationsViaAccountDataUseCase(
+                    getNotificationSettingsAccountDataUseCase = fakeGetNotificationSettingsAccountDataUseCase,
+            )
+
+    @Test
+    fun `given current session and an account data with a content for the device id when execute then result is true`() {
+        // Given
+        val content = LocalNotificationSettingsContent(isSilenced = true)
+        every { fakeGetNotificationSettingsAccountDataUseCase.execute(fakeSession, A_DEVICE_ID) } returns content
+
+        // When
+        val result = checkIfCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, A_DEVICE_ID)
+
+        // Then
+        result shouldBeEqualTo true
+    }
+
+    @Test
+    fun `given current session and an account data with empty content for the device id when execute then result is false`() {
+        // Given
+        val content = LocalNotificationSettingsContent(isSilenced = null)
+        every { fakeGetNotificationSettingsAccountDataUseCase.execute(fakeSession, A_DEVICE_ID) } returns content
+
+        // When
+        val result = checkIfCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, A_DEVICE_ID)
+
+        // Then
+        result shouldBeEqualTo false
+    }
+
+    @Test
+    fun `given current session and NO account data for the device id when execute then result is false`() {
+        // Given
+        val content = null
+        every { fakeGetNotificationSettingsAccountDataUseCase.execute(fakeSession, A_DEVICE_ID) } returns content
+
+        // When
+        val result = checkIfCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, A_DEVICE_ID)
+
+        // Then
+        result shouldBeEqualTo false
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaPusherUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaPusherUseCaseTest.kt
new file mode 100644
index 0000000000..64beb7b8e2
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/CheckIfCanToggleNotificationsViaPusherUseCaseTest.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fixtures.aHomeServerCapabilities
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+private val A_HOMESERVER_CAPABILITIES = aHomeServerCapabilities(canRemotelyTogglePushNotificationsOfDevices = true)
+
+class CheckIfCanToggleNotificationsViaPusherUseCaseTest {
+
+    private val fakeSession = FakeSession()
+
+    private val checkIfCanToggleNotificationsViaPusherUseCase =
+            CheckIfCanToggleNotificationsViaPusherUseCase()
+
+    @Test
+    fun `given current session when execute then toggle capability is returned`() {
+        // Given
+        fakeSession
+                .fakeHomeServerCapabilitiesService
+                .givenCapabilities(A_HOMESERVER_CAPABILITIES)
+
+        // When
+        val result = checkIfCanToggleNotificationsViaPusherUseCase.execute(fakeSession)
+
+        // Then
+        result shouldBeEqualTo A_HOMESERVER_CAPABILITIES.canRemotelyTogglePushNotificationsOfDevices
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/DeleteNotificationSettingsAccountDataUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/DeleteNotificationSettingsAccountDataUseCaseTest.kt
new file mode 100644
index 0000000000..600ba2ba48
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/DeleteNotificationSettingsAccountDataUseCaseTest.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+
+class DeleteNotificationSettingsAccountDataUseCaseTest {
+
+    private val fakeSetNotificationSettingsAccountDataUseCase = mockk<SetNotificationSettingsAccountDataUseCase>()
+    private val fakeGetNotificationSettingsAccountDataUseCase = mockk<GetNotificationSettingsAccountDataUseCase>()
+
+    private val deleteNotificationSettingsAccountDataUseCase = DeleteNotificationSettingsAccountDataUseCase(
+            setNotificationSettingsAccountDataUseCase = fakeSetNotificationSettingsAccountDataUseCase,
+            getNotificationSettingsAccountDataUseCase = fakeGetNotificationSettingsAccountDataUseCase,
+    )
+
+    @Test
+    fun `given a device id and existing account data content when execute then empty content is set for the account data`() = runTest {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        aSession.givenSessionId(aDeviceId)
+        every { fakeGetNotificationSettingsAccountDataUseCase.execute(any(), any()) } returns LocalNotificationSettingsContent(
+                isSilenced = true,
+        )
+        coJustRun { fakeSetNotificationSettingsAccountDataUseCase.execute(any(), any(), any()) }
+        val expectedContent = LocalNotificationSettingsContent(
+                isSilenced = null
+        )
+
+        // When
+        deleteNotificationSettingsAccountDataUseCase.execute(aSession)
+
+        // Then
+        verify { fakeGetNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId) }
+        coVerify { fakeSetNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId, expectedContent) }
+    }
+
+    @Test
+    fun `given a device id and empty existing account data content when execute then nothing is done`() = runTest {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        aSession.givenSessionId(aDeviceId)
+        every { fakeGetNotificationSettingsAccountDataUseCase.execute(any(), any()) } returns LocalNotificationSettingsContent(
+                isSilenced = null,
+        )
+
+        // When
+        deleteNotificationSettingsAccountDataUseCase.execute(aSession)
+
+        // Then
+        verify { fakeGetNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId) }
+        coVerify(inverse = true) { fakeSetNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId, any()) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUpdatesUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUpdatesUseCaseTest.kt
new file mode 100644
index 0000000000..50940b9d34
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUpdatesUseCaseTest.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeFlowLiveDataConversions
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fakes.givenAsFlow
+import io.mockk.unmockkAll
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.toContent
+
+class GetNotificationSettingsAccountDataUpdatesUseCaseTest {
+
+    private val fakeFlowLiveDataConversions = FakeFlowLiveDataConversions()
+    private val getNotificationSettingsAccountDataUpdatesUseCase = GetNotificationSettingsAccountDataUpdatesUseCase()
+
+    @Before
+    fun setUp() {
+        fakeFlowLiveDataConversions.setup()
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a device id when execute then retrieve the account data event corresponding to this id if any`() = runTest {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        val expectedContent = LocalNotificationSettingsContent(isSilenced = true)
+        aSession
+                .accountDataService()
+                .givenGetLiveUserAccountDataEventReturns(
+                        type = UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + aDeviceId,
+                        content = expectedContent.toContent(),
+                )
+                .givenAsFlow()
+
+        // When
+        val result = getNotificationSettingsAccountDataUpdatesUseCase.execute(aSession, aDeviceId).firstOrNull()
+
+        // Then
+        result shouldBeEqualTo expectedContent
+    }
+
+    @Test
+    fun `given a device id and no content for account data when execute then retrieve the account data event corresponding to this id if any`() = runTest {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        aSession
+                .accountDataService()
+                .givenGetLiveUserAccountDataEventReturns(
+                        type = UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + aDeviceId,
+                        content = null,
+                )
+                .givenAsFlow()
+
+        // When
+        val result = getNotificationSettingsAccountDataUpdatesUseCase.execute(aSession, aDeviceId).firstOrNull()
+
+        // Then
+        result shouldBeEqualTo null
+    }
+
+    @Test
+    fun `given a device id and empty content for account data when execute then retrieve the account data event corresponding to this id if any`() = runTest {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        val expectedContent = LocalNotificationSettingsContent(isSilenced = null)
+        aSession
+                .accountDataService()
+                .givenGetLiveUserAccountDataEventReturns(
+                        type = UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + aDeviceId,
+                        content = expectedContent.toContent(),
+                )
+                .givenAsFlow()
+
+        // When
+        val result = getNotificationSettingsAccountDataUpdatesUseCase.execute(aSession, aDeviceId).firstOrNull()
+
+        // Then
+        result shouldBeEqualTo expectedContent
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUseCaseTest.kt
new file mode 100644
index 0000000000..2adb0d8599
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationSettingsAccountDataUseCaseTest.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeSession
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.toContent
+
+class GetNotificationSettingsAccountDataUseCaseTest {
+
+    private val getNotificationSettingsAccountDataUseCase = GetNotificationSettingsAccountDataUseCase()
+
+    @Test
+    fun `given a device id when execute then retrieve the account data event corresponding to this id if any`() {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        val expectedContent = LocalNotificationSettingsContent(isSilenced = true)
+        aSession
+                .accountDataService()
+                .givenGetUserAccountDataEventReturns(
+                        type = UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + aDeviceId,
+                        content = expectedContent.toContent(),
+                )
+
+        // When
+        val result = getNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId)
+
+        // Then
+        result shouldBeEqualTo expectedContent
+    }
+
+    @Test
+    fun `given a device id and empty content when execute then retrieve the account data event corresponding to this id if any`() {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        val expectedContent = LocalNotificationSettingsContent(isSilenced = null)
+        aSession
+                .accountDataService()
+                .givenGetUserAccountDataEventReturns(
+                        type = UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + aDeviceId,
+                        content = expectedContent.toContent(),
+                )
+
+        // When
+        val result = getNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId)
+
+        // Then
+        result shouldBeEqualTo expectedContent
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCaseTest.kt
new file mode 100644
index 0000000000..e4b681c5ec
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCaseTest.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fixtures.PusherFixture
+import im.vector.app.test.testDispatcher
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import io.mockk.verifyOrder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.toContent
+
+private const val A_DEVICE_ID = "device-id"
+
+class GetNotificationsStatusUseCaseTest {
+
+    @get:Rule
+    val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+    private val fakeSession = FakeSession()
+    private val fakeCanToggleNotificationsViaAccountDataUseCase =
+            mockk<CanToggleNotificationsViaAccountDataUseCase>()
+    private val fakeCanToggleNotificationsViaPusherUseCase =
+            mockk<CanToggleNotificationsViaPusherUseCase>()
+
+    private val getNotificationsStatusUseCase =
+            GetNotificationsStatusUseCase(
+                    canToggleNotificationsViaAccountDataUseCase = fakeCanToggleNotificationsViaAccountDataUseCase,
+                    canToggleNotificationsViaPusherUseCase = fakeCanToggleNotificationsViaPusherUseCase,
+            )
+
+    @Before
+    fun setup() {
+        Dispatchers.setMain(testDispatcher)
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `given current session and toggle is not supported when execute then resulting flow contains NOT_SUPPORTED value`() = runTest {
+        // Given
+        every { fakeCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, A_DEVICE_ID) } returns flowOf(false)
+        every { fakeCanToggleNotificationsViaPusherUseCase.execute(fakeSession) } returns flowOf(false)
+
+        // When
+        val result = getNotificationsStatusUseCase.execute(fakeSession, A_DEVICE_ID)
+
+        // Then
+        result.firstOrNull() shouldBeEqualTo NotificationsStatus.NOT_SUPPORTED
+        verifyOrder {
+            // we should first check account data
+            fakeCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, A_DEVICE_ID)
+            fakeCanToggleNotificationsViaPusherUseCase.execute(fakeSession)
+        }
+    }
+
+    @Test
+    fun `given current session and toggle via pusher is supported when execute then resulting flow contains status based on pusher value`() = runTest {
+        // Given
+        val pushers = listOf(
+                PusherFixture.aPusher(
+                        deviceId = A_DEVICE_ID,
+                        enabled = true,
+                )
+        )
+        fakeSession.pushersService().givenPushersLive(pushers)
+        every { fakeCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, A_DEVICE_ID) } returns flowOf(false)
+        every { fakeCanToggleNotificationsViaPusherUseCase.execute(fakeSession) } returns flowOf(true)
+
+        // When
+        val result = getNotificationsStatusUseCase.execute(fakeSession, A_DEVICE_ID)
+
+        // Then
+        result.firstOrNull() shouldBeEqualTo NotificationsStatus.ENABLED
+    }
+
+    @Test
+    fun `given toggle via pusher is supported and no registered pusher when execute then resulting flow contains NOT_SUPPORTED value`() = runTest {
+        // Given
+        fakeSession.pushersService().givenPushersLive(emptyList())
+        every { fakeCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, A_DEVICE_ID) } returns flowOf(false)
+        every { fakeCanToggleNotificationsViaPusherUseCase.execute(fakeSession) } returns flowOf(true)
+
+        // When
+        val result = getNotificationsStatusUseCase.execute(fakeSession, A_DEVICE_ID)
+
+        // Then
+        result.firstOrNull() shouldBeEqualTo NotificationsStatus.NOT_SUPPORTED
+    }
+
+    @Test
+    fun `given current session and toggle via account data is supported when execute then resulting flow contains status based on account data`() = runTest {
+        // Given
+        fakeSession
+                .accountDataService()
+                .givenGetUserAccountDataEventReturns(
+                        type = UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + A_DEVICE_ID,
+                        content = LocalNotificationSettingsContent(
+                                isSilenced = false
+                        ).toContent(),
+                )
+        every { fakeCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, A_DEVICE_ID) } returns flowOf(true)
+        every { fakeCanToggleNotificationsViaPusherUseCase.execute(fakeSession) } returns flowOf(false)
+
+        // When
+        val result = getNotificationsStatusUseCase.execute(fakeSession, A_DEVICE_ID)
+
+        // Then
+        result.firstOrNull() shouldBeEqualTo NotificationsStatus.ENABLED
+        verify {
+            fakeCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, A_DEVICE_ID)
+        }
+        verify(inverse = true) {
+            fakeCanToggleNotificationsViaPusherUseCase.execute(fakeSession)
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/SetNotificationSettingsAccountDataUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/SetNotificationSettingsAccountDataUseCaseTest.kt
new file mode 100644
index 0000000000..89fcd5e512
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/SetNotificationSettingsAccountDataUseCaseTest.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeSession
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.toContent
+
+class SetNotificationSettingsAccountDataUseCaseTest {
+
+    private val setNotificationSettingsAccountDataUseCase = SetNotificationSettingsAccountDataUseCase()
+
+    @Test
+    fun `given a content when execute then update local notification settings with this content`() = runTest {
+        // Given
+        val sessionId = "a_session_id"
+        val localNotificationSettingsContent = LocalNotificationSettingsContent(isSilenced = true)
+        val fakeSession = FakeSession()
+        fakeSession.accountDataService().givenUpdateUserAccountDataEventSucceeds()
+
+        // When
+        setNotificationSettingsAccountDataUseCase.execute(fakeSession, sessionId, localNotificationSettingsContent)
+
+        // Then
+        fakeSession.accountDataService().verifyUpdateUserAccountDataEventSucceeds(
+                UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + sessionId,
+                localNotificationSettingsContent.toContent(),
+        )
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/ToggleNotificationsUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/ToggleNotificationsUseCaseTest.kt
new file mode 100644
index 0000000000..90afbe9045
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/ToggleNotificationsUseCaseTest.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fixtures.PusherFixture
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+
+class ToggleNotificationsUseCaseTest {
+
+    private val activeSessionHolder = FakeActiveSessionHolder()
+    private val fakeCheckIfCanToggleNotificationsViaPusherUseCase =
+            mockk<CheckIfCanToggleNotificationsViaPusherUseCase>()
+    private val fakeCheckIfCanToggleNotificationsViaAccountDataUseCase =
+            mockk<CheckIfCanToggleNotificationsViaAccountDataUseCase>()
+    private val fakeSetNotificationSettingsAccountDataUseCase =
+            mockk<SetNotificationSettingsAccountDataUseCase>()
+
+    private val toggleNotificationsUseCase =
+            ToggleNotificationsUseCase(
+                    activeSessionHolder = activeSessionHolder.instance,
+                    checkIfCanToggleNotificationsViaPusherUseCase = fakeCheckIfCanToggleNotificationsViaPusherUseCase,
+                    checkIfCanToggleNotificationsViaAccountDataUseCase = fakeCheckIfCanToggleNotificationsViaAccountDataUseCase,
+                    setNotificationSettingsAccountDataUseCase = fakeSetNotificationSettingsAccountDataUseCase,
+            )
+
+    @Test
+    fun `when execute, then toggle enabled for device pushers`() = runTest {
+        // Given
+        val sessionId = "a_session_id"
+        val pushers = listOf(
+                PusherFixture.aPusher(deviceId = sessionId, enabled = false),
+                PusherFixture.aPusher(deviceId = "another id", enabled = false)
+        )
+        val fakeSession = activeSessionHolder.fakeSession
+        fakeSession.pushersService().givenPushersLive(pushers)
+        fakeSession.pushersService().givenGetPushers(pushers)
+        every { fakeCheckIfCanToggleNotificationsViaPusherUseCase.execute(fakeSession) } returns true
+        every { fakeCheckIfCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, sessionId) } returns false
+
+        // When
+        toggleNotificationsUseCase.execute(sessionId, true)
+
+        // Then
+        activeSessionHolder.fakeSession.pushersService().verifyTogglePusherCalled(pushers.first(), true)
+    }
+
+    @Test
+    fun `when execute, then toggle local notification settings`() = runTest {
+        // Given
+        val sessionId = "a_session_id"
+        val fakeSession = activeSessionHolder.fakeSession
+        every { fakeCheckIfCanToggleNotificationsViaPusherUseCase.execute(fakeSession) } returns false
+        every { fakeCheckIfCanToggleNotificationsViaAccountDataUseCase.execute(fakeSession, sessionId) } returns true
+        coJustRun { fakeSetNotificationSettingsAccountDataUseCase.execute(any(), any(), any()) }
+        val expectedLocalNotificationSettingsContent = LocalNotificationSettingsContent(
+                isSilenced = false
+        )
+
+        // When
+        toggleNotificationsUseCase.execute(sessionId, true)
+
+        // Then
+        coVerify {
+            fakeSetNotificationSettingsAccountDataUseCase.execute(fakeSession, sessionId, expectedLocalNotificationSettingsContent)
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/UpdateNotificationSettingsAccountDataUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/UpdateNotificationSettingsAccountDataUseCaseTest.kt
new file mode 100644
index 0000000000..0075be02d2
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/notification/UpdateNotificationSettingsAccountDataUseCaseTest.kt
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.notification
+
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fakes.FakeUnifiedPushHelper
+import im.vector.app.test.fakes.FakeVectorPreferences
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+
+class UpdateNotificationSettingsAccountDataUseCaseTest {
+
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val fakeUnifiedPushHelper = FakeUnifiedPushHelper()
+    private val fakeGetNotificationSettingsAccountDataUseCase = mockk<GetNotificationSettingsAccountDataUseCase>()
+    private val fakeSetNotificationSettingsAccountDataUseCase = mockk<SetNotificationSettingsAccountDataUseCase>()
+    private val fakeDeleteNotificationSettingsAccountDataUseCase = mockk<DeleteNotificationSettingsAccountDataUseCase>()
+
+    private val updateNotificationSettingsAccountDataUseCase = UpdateNotificationSettingsAccountDataUseCase(
+            vectorPreferences = fakeVectorPreferences.instance,
+            unifiedPushHelper = fakeUnifiedPushHelper.instance,
+            getNotificationSettingsAccountDataUseCase = fakeGetNotificationSettingsAccountDataUseCase,
+            setNotificationSettingsAccountDataUseCase = fakeSetNotificationSettingsAccountDataUseCase,
+            deleteNotificationSettingsAccountDataUseCase = fakeDeleteNotificationSettingsAccountDataUseCase,
+    )
+
+    @Test
+    fun `given back sync enabled, a device id and a different local setting compared to remote when execute then content is updated`() = runTest {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        aSession.givenSessionId(aDeviceId)
+        coJustRun { fakeSetNotificationSettingsAccountDataUseCase.execute(any(), any(), any()) }
+        val areNotificationsEnabled = true
+        fakeVectorPreferences.givenAreNotificationsEnabledForDevice(areNotificationsEnabled)
+        fakeUnifiedPushHelper.givenIsBackgroundSyncReturns(true)
+        every { fakeGetNotificationSettingsAccountDataUseCase.execute(any(), any()) } returns
+                LocalNotificationSettingsContent(
+                        isSilenced = null
+                )
+        val expectedContent = LocalNotificationSettingsContent(
+                isSilenced = !areNotificationsEnabled
+        )
+
+        // When
+        updateNotificationSettingsAccountDataUseCase.execute(aSession)
+
+        // Then
+        verify {
+            fakeUnifiedPushHelper.instance.isBackgroundSync()
+            fakeVectorPreferences.instance.areNotificationEnabledForDevice()
+            fakeGetNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId)
+        }
+        coVerify(inverse = true) { fakeDeleteNotificationSettingsAccountDataUseCase.execute(aSession) }
+        coVerify { fakeSetNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId, expectedContent) }
+    }
+
+    @Test
+    fun `given back sync enabled, a device id and a same local setting compared to remote when execute then content is not updated`() = runTest {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        aSession.givenSessionId(aDeviceId)
+        coJustRun { fakeSetNotificationSettingsAccountDataUseCase.execute(any(), any(), any()) }
+        val areNotificationsEnabled = true
+        fakeVectorPreferences.givenAreNotificationsEnabledForDevice(areNotificationsEnabled)
+        fakeUnifiedPushHelper.givenIsBackgroundSyncReturns(true)
+        every { fakeGetNotificationSettingsAccountDataUseCase.execute(any(), any()) } returns
+                LocalNotificationSettingsContent(
+                        isSilenced = false
+                )
+        val expectedContent = LocalNotificationSettingsContent(
+                isSilenced = !areNotificationsEnabled
+        )
+
+        // When
+        updateNotificationSettingsAccountDataUseCase.execute(aSession)
+
+        // Then
+        verify {
+            fakeUnifiedPushHelper.instance.isBackgroundSync()
+            fakeVectorPreferences.instance.areNotificationEnabledForDevice()
+            fakeGetNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId)
+        }
+        coVerify(inverse = true) { fakeDeleteNotificationSettingsAccountDataUseCase.execute(aSession) }
+        coVerify(inverse = true) { fakeSetNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId, expectedContent) }
+    }
+
+    @Test
+    fun `given back sync disabled and a device id when execute then content is deleted`() = runTest {
+        // Given
+        val aDeviceId = "device-id"
+        val aSession = FakeSession()
+        aSession.givenSessionId(aDeviceId)
+        coJustRun { fakeDeleteNotificationSettingsAccountDataUseCase.execute(any()) }
+        fakeUnifiedPushHelper.givenIsBackgroundSyncReturns(false)
+
+        // When
+        updateNotificationSettingsAccountDataUseCase.execute(aSession)
+
+        // Then
+        verify {
+            fakeUnifiedPushHelper.instance.isBackgroundSync()
+        }
+        coVerify { fakeDeleteNotificationSettingsAccountDataUseCase.execute(aSession) }
+        coVerify(inverse = true) { fakeSetNotificationSettingsAccountDataUseCase.execute(aSession, aDeviceId, any()) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
new file mode 100644
index 0000000000..687d03926f
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
@@ -0,0 +1,507 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import android.os.SystemClock
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.GetDeviceFullInfoListUseCase
+import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
+import im.vector.app.features.settings.devices.v2.ToggleIpAddressVisibilityUseCase
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakePendingAuthHandler
+import im.vector.app.test.fakes.FakeSignoutSessionsUseCase
+import im.vector.app.test.fakes.FakeVectorPreferences
+import im.vector.app.test.fakes.FakeVerificationService
+import im.vector.app.test.fixtures.aDeviceFullInfo
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.every
+import io.mockk.justRun
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import io.mockk.verify
+import io.mockk.verifyAll
+import kotlinx.coroutines.flow.flowOf
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
+
+private const val A_DEVICE_ID_1 = "device-id-1"
+private const val A_DEVICE_ID_2 = "device-id-2"
+private const val A_PASSWORD = "password"
+
+class OtherSessionsViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
+
+    private val defaultArgs = OtherSessionsArgs(
+            defaultFilter = DeviceManagerFilterType.ALL_SESSIONS,
+            excludeCurrentDevice = false,
+    )
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val fakeGetDeviceFullInfoListUseCase = mockk<GetDeviceFullInfoListUseCase>()
+    private val fakeRefreshDevicesUseCase = mockk<RefreshDevicesUseCase>(relaxed = true)
+    private val fakeSignoutSessionsUseCase = FakeSignoutSessionsUseCase()
+    private val fakePendingAuthHandler = FakePendingAuthHandler()
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val toggleIpAddressVisibilityUseCase = mockk<ToggleIpAddressVisibilityUseCase>()
+
+    private fun createViewModel(viewState: OtherSessionsViewState = OtherSessionsViewState(defaultArgs)) =
+            OtherSessionsViewModel(
+                    initialState = viewState,
+                    activeSessionHolder = fakeActiveSessionHolder.instance,
+                    getDeviceFullInfoListUseCase = fakeGetDeviceFullInfoListUseCase,
+                    signoutSessionsUseCase = fakeSignoutSessionsUseCase.instance,
+                    pendingAuthHandler = fakePendingAuthHandler.instance,
+                    refreshDevicesUseCase = fakeRefreshDevicesUseCase,
+                    vectorPreferences = fakeVectorPreferences.instance,
+                    toggleIpAddressVisibilityUseCase = toggleIpAddressVisibilityUseCase,
+            )
+
+    @Before
+    fun setup() {
+        // Needed for internal usage of Flow<T>.throttleFirst() inside the ViewModel
+        mockkStatic(SystemClock::class)
+        every { SystemClock.elapsedRealtime() } returns 1234
+
+        givenVerificationService()
+        fakeVectorPreferences.givenSessionManagerShowIpAddress(false)
+    }
+
+    private fun givenVerificationService(): FakeVerificationService {
+        val fakeVerificationService = fakeActiveSessionHolder
+                .fakeSession
+                .fakeCryptoService
+                .fakeVerificationService
+        fakeVerificationService.givenAddListenerSucceeds()
+        fakeVerificationService.givenRemoveListenerSucceeds()
+        return fakeVerificationService
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given the viewModel when initializing it then verification listener is added`() {
+        // Given
+        val fakeVerificationService = givenVerificationService()
+        val devices = mockk<List<DeviceFullInfo>>()
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+
+        // When
+        val viewModel = createViewModel()
+
+        // Then
+        verify {
+            fakeVerificationService.addListener(viewModel)
+        }
+    }
+
+    @Test
+    fun `given the viewModel when clearing it then verification listener is removed`() {
+        // Given
+        val fakeVerificationService = givenVerificationService()
+        val devices = mockk<List<DeviceFullInfo>>()
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+
+        // When
+        val viewModel = createViewModel()
+        viewModel.onCleared()
+
+        // Then
+        verify {
+            fakeVerificationService.removeListener(viewModel)
+        }
+    }
+
+    @Test
+    fun `given the viewModel has been initialized then viewState is updated with devices list`() {
+        // Given
+        val devices = mockk<List<DeviceFullInfo>>()
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(devices),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+
+        // Then
+        viewModel.test()
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+        verifyAll { fakeGetDeviceFullInfoListUseCase.execute(defaultArgs.defaultFilter, defaultArgs.excludeCurrentDevice) }
+    }
+
+    @Test
+    fun `given filter devices action when handling the action then viewState is updated with filter option and devices are filtered`() {
+        // Given
+        val filterType = DeviceManagerFilterType.UNVERIFIED
+        val devices = mockk<List<DeviceFullInfo>>()
+        val filteredDevices = mockk<List<DeviceFullInfo>>()
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        givenGetDeviceFullInfoListReturns(filterType = filterType, filteredDevices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(filteredDevices),
+                currentFilter = filterType,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.FilterDevices(filterType))
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+        verifyAll {
+            fakeGetDeviceFullInfoListUseCase.execute(defaultArgs.defaultFilter, defaultArgs.excludeCurrentDevice)
+            fakeGetDeviceFullInfoListUseCase.execute(filterType, defaultArgs.excludeCurrentDevice)
+        }
+    }
+
+    @Test
+    fun `given enable select mode action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = false)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo.copy(isSelected = true))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = true,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.EnableSelectMode(A_DEVICE_ID_1))
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given disable select mode action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = true)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo1.copy(isSelected = false), deviceFullInfo2.copy(isSelected = false))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.DisableSelectMode)
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given toggle selection for device action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = false)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo.copy(isSelected = true))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.ToggleSelectionForDevice(A_DEVICE_ID_1))
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given select all action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = false)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID_2, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo1.copy(isSelected = true), deviceFullInfo2.copy(isSelected = true))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.SelectAll)
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given deselect all action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = false)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID_2, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo1.copy(isSelected = false), deviceFullInfo2.copy(isSelected = false))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.DeselectAll)
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given no reAuth is needed and in selectMode when handling multiSignout action then signout process is performed`() {
+        // Given
+        val isSelectModeEnabled = true
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = false)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID_2, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        // signout only selected devices
+        fakeSignoutSessionsUseCase.givenSignoutSuccess(listOf(A_DEVICE_ID_2))
+        val expectedViewState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo1, deviceFullInfo2)),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = isSelectModeEnabled,
+        )
+
+        // When
+        val viewModel = createViewModel(OtherSessionsViewState(defaultArgs).copy(isSelectModeEnabled = isSelectModeEnabled))
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.MultiSignout)
+
+        // Then
+        viewModelTest
+                .assertStatesChanges(
+                        expectedViewState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvent { it is OtherSessionsViewEvents.SignoutSuccess }
+                .finish()
+        verify {
+            fakeRefreshDevicesUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given no reAuth is needed and NOT in selectMode when handling multiSignout action then signout process is performed`() {
+        // Given
+        val isSelectModeEnabled = false
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = false)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID_2, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        // signout all devices
+        fakeSignoutSessionsUseCase.givenSignoutSuccess(listOf(A_DEVICE_ID_1, A_DEVICE_ID_2))
+        val expectedViewState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo1, deviceFullInfo2)),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = isSelectModeEnabled,
+        )
+
+        // When
+        val viewModel = createViewModel(OtherSessionsViewState(defaultArgs).copy(isSelectModeEnabled = isSelectModeEnabled))
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.MultiSignout)
+
+        // Then
+        viewModelTest
+                .assertStatesChanges(
+                        expectedViewState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvent { it is OtherSessionsViewEvents.SignoutSuccess }
+                .finish()
+        verify {
+            fakeRefreshDevicesUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given unexpected error during multiSignout when handling multiSignout action then signout process is performed`() {
+        // Given
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = false)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID_2, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val error = Exception()
+        fakeSignoutSessionsUseCase.givenSignoutError(listOf(A_DEVICE_ID_1, A_DEVICE_ID_2), error)
+        val expectedViewState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo1, deviceFullInfo2)),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.MultiSignout)
+
+        // Then
+        viewModelTest
+                .assertStatesChanges(
+                        expectedViewState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvent { it is OtherSessionsViewEvents.SignoutError && it.error == error }
+                .finish()
+    }
+
+    @Test
+    fun `given reAuth is needed during multiSignout when handling multiSignout action then requestReAuth is sent and pending auth is stored`() {
+        // Given
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID_1, isSelected = false)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID_2, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val reAuthNeeded = fakeSignoutSessionsUseCase.givenSignoutReAuthNeeded(listOf(A_DEVICE_ID_1, A_DEVICE_ID_2))
+        val expectedPendingAuth = DefaultBaseAuth(session = reAuthNeeded.flowResponse.session)
+        val expectedReAuthEvent = OtherSessionsViewEvents.RequestReAuth(reAuthNeeded.flowResponse, reAuthNeeded.errCode)
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.MultiSignout)
+
+        // Then
+        viewModelTest
+                .assertEvent { it == expectedReAuthEvent }
+                .finish()
+        fakePendingAuthHandler.instance.pendingAuth shouldBeEqualTo expectedPendingAuth
+        fakePendingAuthHandler.instance.uiaContinuation shouldBeEqualTo reAuthNeeded.uiaContinuation
+    }
+
+    @Test
+    fun `given SSO auth has been done when handling ssoAuthDone action then corresponding method of pending auth handler is called`() {
+        // Given
+        val devices = mockk<List<DeviceFullInfo>>()
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        justRun { fakePendingAuthHandler.instance.ssoAuthDone() }
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.SsoAuthDone)
+
+        // Then
+        viewModelTest.finish()
+        verifyAll {
+            fakePendingAuthHandler.instance.ssoAuthDone()
+        }
+    }
+
+    @Test
+    fun `given password auth has been done when handling passwordAuthDone action then corresponding method of pending auth handler is called`() {
+        // Given
+        val devices = mockk<List<DeviceFullInfo>>()
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        justRun { fakePendingAuthHandler.instance.passwordAuthDone(any()) }
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.PasswordAuthDone(A_PASSWORD))
+
+        // Then
+        viewModelTest.finish()
+        verifyAll {
+            fakePendingAuthHandler.instance.passwordAuthDone(A_PASSWORD)
+        }
+    }
+
+    @Test
+    fun `given reAuth has been cancelled when handling reAuthCancelled action then corresponding method of pending auth handler is called`() {
+        // Given
+        val devices = mockk<List<DeviceFullInfo>>()
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        justRun { fakePendingAuthHandler.instance.reAuthCancelled() }
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.ReAuthCancelled)
+
+        // Then
+        viewModelTest.finish()
+        verifyAll {
+            fakePendingAuthHandler.instance.reAuthCancelled()
+        }
+    }
+
+    private fun givenGetDeviceFullInfoListReturns(
+            filterType: DeviceManagerFilterType,
+            devices: List<DeviceFullInfo>,
+    ) {
+        every { fakeGetDeviceFullInfoListUseCase.execute(filterType, any()) } returns flowOf(devices)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewNavigatorTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewNavigatorTest.kt
new file mode 100644
index 0000000000..23fc1cbdce
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewNavigatorTest.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.othersessions
+
+import android.content.Intent
+import im.vector.app.features.settings.devices.v2.overview.SessionOverviewActivity
+import im.vector.app.test.fakes.FakeContext
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.unmockkAll
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+private const val A_DEVICE_ID = "A_DEVICE_ID"
+
+class OtherSessionsViewNavigatorTest {
+
+    private val context = FakeContext()
+    private val otherSessionsViewNavigator = OtherSessionsViewNavigator()
+
+    @Before
+    fun setUp() {
+        mockkObject(SessionOverviewActivity)
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a device id when navigating to overview then it starts the correct activity`() {
+        // Given
+        val intent = givenIntentForDeviceOverview(A_DEVICE_ID)
+        context.givenStartActivity(intent)
+
+        // When
+        otherSessionsViewNavigator.navigateToSessionOverview(context.instance, A_DEVICE_ID)
+
+        // Then
+        context.verifyStartActivity(intent)
+    }
+
+    private fun givenIntentForDeviceOverview(deviceId: String): Intent {
+        val intent = mockk<Intent>()
+        every { SessionOverviewActivity.newIntent(context.instance, deviceId) } returns intent
+        return intent
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCaseTest.kt
new file mode 100644
index 0000000000..48c5ce74b4
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/GetDeviceFullInfoUseCaseTest.kt
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.asFlow
+import im.vector.app.core.session.clientinfo.GetMatrixClientInfoUseCase
+import im.vector.app.core.session.clientinfo.MatrixClientInfoContent
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.ParseDeviceUserAgentUseCase
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import im.vector.app.features.settings.devices.v2.verification.CurrentSessionCrossSigningInfo
+import im.vector.app.features.settings.devices.v2.verification.GetCurrentSessionCrossSigningInfoUseCase
+import im.vector.app.features.settings.devices.v2.verification.GetEncryptionTrustLevelForDeviceUseCase
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeFlowLiveDataConversions
+import im.vector.app.test.fakes.givenAsFlow
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeNull
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.util.Optional
+
+private const val A_DEVICE_ID = "device-id"
+private const val A_TIMESTAMP = 123L
+
+class GetDeviceFullInfoUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val getCurrentSessionCrossSigningInfoUseCase = mockk<GetCurrentSessionCrossSigningInfoUseCase>()
+    private val getEncryptionTrustLevelForDeviceUseCase = mockk<GetEncryptionTrustLevelForDeviceUseCase>()
+    private val checkIfSessionIsInactiveUseCase = mockk<CheckIfSessionIsInactiveUseCase>()
+    private val fakeFlowLiveDataConversions = FakeFlowLiveDataConversions()
+    private val parseDeviceUserAgentUseCase = mockk<ParseDeviceUserAgentUseCase>()
+    private val getMatrixClientInfoUseCase = mockk<GetMatrixClientInfoUseCase>()
+
+    private val getDeviceFullInfoUseCase = GetDeviceFullInfoUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+            getCurrentSessionCrossSigningInfoUseCase = getCurrentSessionCrossSigningInfoUseCase,
+            getEncryptionTrustLevelForDeviceUseCase = getEncryptionTrustLevelForDeviceUseCase,
+            checkIfSessionIsInactiveUseCase = checkIfSessionIsInactiveUseCase,
+            parseDeviceUserAgentUseCase = parseDeviceUserAgentUseCase,
+            getMatrixClientInfoUseCase = getMatrixClientInfoUseCase,
+    )
+
+    @Before
+    fun setUp() {
+        fakeFlowLiveDataConversions.setup()
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given current session and info for device when getting device info then the result is correct`() = runTest {
+        // Given
+        val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo()
+        val deviceInfo = givenADeviceInfo()
+        val cryptoDeviceInfo = givenACryptoDeviceInfo()
+        val trustLevel = givenTrustLevel(currentSessionCrossSigningInfo, cryptoDeviceInfo)
+        val isInactive = false
+        val isCurrentDevice = true
+        every { checkIfSessionIsInactiveUseCase.execute(any()) } returns isInactive
+        every { parseDeviceUserAgentUseCase.execute(any()) } returns DeviceExtendedInfo(DeviceType.MOBILE)
+        val matrixClientInfo = givenAMatrixClientInfo()
+
+        // When
+        val deviceFullInfo = getDeviceFullInfoUseCase.execute(A_DEVICE_ID).firstOrNull()
+
+        // Then
+        deviceFullInfo shouldBeEqualTo DeviceFullInfo(
+                deviceInfo = deviceInfo,
+                cryptoDeviceInfo = cryptoDeviceInfo,
+                roomEncryptionTrustLevel = trustLevel,
+                isInactive = isInactive,
+                isCurrentDevice = isCurrentDevice,
+                deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+                matrixClientInfo = matrixClientInfo,
+        )
+        verify {
+            fakeActiveSessionHolder.instance.getSafeActiveSession()
+            getCurrentSessionCrossSigningInfoUseCase.execute()
+            getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo)
+            fakeActiveSessionHolder.fakeSession.fakeCryptoService.getMyDevicesInfoLive(A_DEVICE_ID).asFlow()
+            fakeActiveSessionHolder.fakeSession.fakeCryptoService.getLiveCryptoDeviceInfoWithId(A_DEVICE_ID).asFlow()
+            checkIfSessionIsInactiveUseCase.execute(A_TIMESTAMP)
+            getMatrixClientInfoUseCase.execute(fakeActiveSessionHolder.fakeSession, A_DEVICE_ID)
+        }
+    }
+
+    @Test
+    fun `given current session and no crypto info for device when getting device info then the result is correct`() = runTest {
+        // Given
+        val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo()
+        val deviceInfo = givenADeviceInfo()
+        val cryptoDeviceInfo = null
+        val trustLevel = givenTrustLevel(currentSessionCrossSigningInfo, cryptoDeviceInfo)
+        val isInactive = false
+        val isCurrentDevice = true
+        every { checkIfSessionIsInactiveUseCase.execute(any()) } returns isInactive
+        every { parseDeviceUserAgentUseCase.execute(any()) } returns DeviceExtendedInfo(DeviceType.MOBILE)
+        val matrixClientInfo = givenAMatrixClientInfo()
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.cryptoDeviceInfoWithIdLiveData = MutableLiveData(Optional(null))
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.cryptoDeviceInfoWithIdLiveData.givenAsFlow()
+
+        // When
+        val deviceFullInfo = getDeviceFullInfoUseCase.execute(A_DEVICE_ID).firstOrNull()
+
+        // Then
+        deviceFullInfo shouldBeEqualTo DeviceFullInfo(
+                deviceInfo = deviceInfo,
+                cryptoDeviceInfo = cryptoDeviceInfo,
+                roomEncryptionTrustLevel = trustLevel,
+                isInactive = isInactive,
+                isCurrentDevice = isCurrentDevice,
+                deviceExtendedInfo = DeviceExtendedInfo(DeviceType.MOBILE),
+                matrixClientInfo = matrixClientInfo,
+        )
+        verify {
+            fakeActiveSessionHolder.instance.getSafeActiveSession()
+            getCurrentSessionCrossSigningInfoUseCase.execute()
+            getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo)
+            fakeActiveSessionHolder.fakeSession.fakeCryptoService.getMyDevicesInfoLive(A_DEVICE_ID).asFlow()
+            fakeActiveSessionHolder.fakeSession.fakeCryptoService.getLiveCryptoDeviceInfoWithId(A_DEVICE_ID).asFlow()
+            checkIfSessionIsInactiveUseCase.execute(A_TIMESTAMP)
+            getMatrixClientInfoUseCase.execute(fakeActiveSessionHolder.fakeSession, A_DEVICE_ID)
+        }
+    }
+
+    @Test
+    fun `given current session and no info for device when getting device info then the result is empty`() = runTest {
+        // Given
+        givenCurrentSessionCrossSigningInfo()
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.myDevicesInfoWithIdLiveData = MutableLiveData(Optional(null))
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.myDevicesInfoWithIdLiveData.givenAsFlow()
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.cryptoDeviceInfoWithIdLiveData = MutableLiveData(Optional(null))
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.cryptoDeviceInfoWithIdLiveData.givenAsFlow()
+
+        // When
+        val deviceFullInfo = getDeviceFullInfoUseCase.execute(A_DEVICE_ID).firstOrNull()
+
+        // Then
+        deviceFullInfo.shouldBeNull()
+        verify {
+            fakeActiveSessionHolder.instance.getSafeActiveSession()
+            fakeActiveSessionHolder.fakeSession.fakeCryptoService.getMyDevicesInfoLive(A_DEVICE_ID).asFlow()
+            fakeActiveSessionHolder.fakeSession.fakeCryptoService.getLiveCryptoDeviceInfoWithId(A_DEVICE_ID).asFlow()
+        }
+    }
+
+    @Test
+    fun `given no current session when getting device info then the result is empty`() = runTest {
+        // Given
+        fakeActiveSessionHolder.givenGetSafeActiveSessionReturns(null)
+
+        // When
+        val deviceFullInfo = getDeviceFullInfoUseCase.execute(A_DEVICE_ID).firstOrNull()
+
+        // Then
+        deviceFullInfo.shouldBeNull()
+        verify { fakeActiveSessionHolder.instance.getSafeActiveSession() }
+    }
+
+    private fun givenCurrentSessionCrossSigningInfo(): CurrentSessionCrossSigningInfo {
+        val currentSessionCrossSigningInfo = CurrentSessionCrossSigningInfo(
+                deviceId = A_DEVICE_ID,
+                isCrossSigningInitialized = true,
+                isCrossSigningVerified = false
+        )
+        every { getCurrentSessionCrossSigningInfoUseCase.execute() } returns flowOf(currentSessionCrossSigningInfo)
+        return currentSessionCrossSigningInfo
+    }
+
+    private fun givenTrustLevel(currentSessionCrossSigningInfo: CurrentSessionCrossSigningInfo, cryptoDeviceInfo: CryptoDeviceInfo?): RoomEncryptionTrustLevel {
+        val trustLevel = RoomEncryptionTrustLevel.Trusted
+        every { getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo) } returns trustLevel
+        return trustLevel
+    }
+
+    private fun givenADeviceInfo(): DeviceInfo {
+        val deviceInfo = DeviceInfo(
+                deviceId = A_DEVICE_ID,
+                lastSeenTs = A_TIMESTAMP,
+        )
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.myDevicesInfoWithIdLiveData = MutableLiveData(Optional(deviceInfo))
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.myDevicesInfoWithIdLiveData.givenAsFlow()
+        return deviceInfo
+    }
+
+    private fun givenACryptoDeviceInfo(): CryptoDeviceInfo {
+        val cryptoDeviceInfo = CryptoDeviceInfo(deviceId = A_DEVICE_ID, userId = "")
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.cryptoDeviceInfoWithIdLiveData = MutableLiveData(Optional(cryptoDeviceInfo))
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.cryptoDeviceInfoWithIdLiveData.givenAsFlow()
+        return cryptoDeviceInfo
+    }
+
+    private fun givenAMatrixClientInfo(): MatrixClientInfoContent {
+        val matrixClientInfo = mockk<MatrixClientInfoContent>()
+        every { getMatrixClientInfoUseCase.execute(fakeActiveSessionHolder.fakeSession, A_DEVICE_ID) } returns matrixClientInfo
+        return matrixClientInfo
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt
new file mode 100644
index 0000000000..b0f7a774f2
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt
@@ -0,0 +1,439 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import android.os.SystemClock
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
+import im.vector.app.features.settings.devices.v2.ToggleIpAddressVisibilityUseCase
+import im.vector.app.features.settings.devices.v2.notification.NotificationsStatus
+import im.vector.app.features.settings.devices.v2.verification.CheckIfCurrentSessionCanBeVerifiedUseCase
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeGetNotificationsStatusUseCase
+import im.vector.app.test.fakes.FakePendingAuthHandler
+import im.vector.app.test.fakes.FakeSignoutSessionsUseCase
+import im.vector.app.test.fakes.FakeToggleNotificationUseCase
+import im.vector.app.test.fakes.FakeVectorPreferences
+import im.vector.app.test.fakes.FakeVerificationService
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.runs
+import io.mockk.unmockkAll
+import io.mockk.verify
+import io.mockk.verifyAll
+import kotlinx.coroutines.flow.flowOf
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
+
+private const val A_SESSION_ID_1 = "session-id-1"
+private const val A_SESSION_ID_2 = "session-id-2"
+private const val A_PASSWORD = "password"
+
+class SessionOverviewViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
+
+    @get:Rule
+    val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+    private val args = SessionOverviewArgs(
+            deviceId = A_SESSION_ID_1
+    )
+    private val getDeviceFullInfoUseCase = mockk<GetDeviceFullInfoUseCase>(relaxed = true)
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val checkIfCurrentSessionCanBeVerifiedUseCase = mockk<CheckIfCurrentSessionCanBeVerifiedUseCase>()
+    private val fakeSignoutSessionsUseCase = FakeSignoutSessionsUseCase()
+    private val fakePendingAuthHandler = FakePendingAuthHandler()
+    private val refreshDevicesUseCase = mockk<RefreshDevicesUseCase>(relaxed = true)
+    private val toggleNotificationUseCase = FakeToggleNotificationUseCase()
+    private val fakeGetNotificationsStatusUseCase = FakeGetNotificationsStatusUseCase()
+    private val notificationsStatus = NotificationsStatus.ENABLED
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val toggleIpAddressVisibilityUseCase = mockk<ToggleIpAddressVisibilityUseCase>()
+
+    private fun createViewModel() = SessionOverviewViewModel(
+            initialState = SessionOverviewViewState(args),
+            getDeviceFullInfoUseCase = getDeviceFullInfoUseCase,
+            checkIfCurrentSessionCanBeVerifiedUseCase = checkIfCurrentSessionCanBeVerifiedUseCase,
+            signoutSessionsUseCase = fakeSignoutSessionsUseCase.instance,
+            pendingAuthHandler = fakePendingAuthHandler.instance,
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+            refreshDevicesUseCase = refreshDevicesUseCase,
+            toggleNotificationsUseCase = toggleNotificationUseCase.instance,
+            getNotificationsStatusUseCase = fakeGetNotificationsStatusUseCase.instance,
+            vectorPreferences = fakeVectorPreferences.instance,
+            toggleIpAddressVisibilityUseCase = toggleIpAddressVisibilityUseCase,
+    )
+
+    @Before
+    fun setup() {
+        // Needed for internal usage of Flow<T>.throttleFirst() inside the ViewModel
+        mockkStatic(SystemClock::class)
+        every { SystemClock.elapsedRealtime() } returns 1234
+
+        givenVerificationService()
+        fakeGetNotificationsStatusUseCase.givenExecuteReturns(
+                fakeActiveSessionHolder.fakeSession,
+                A_SESSION_ID_1,
+                notificationsStatus
+        )
+        fakeVectorPreferences.givenSessionManagerShowIpAddress(false)
+    }
+
+    private fun givenVerificationService(): FakeVerificationService {
+        val fakeVerificationService = fakeActiveSessionHolder
+                .fakeSession
+                .fakeCryptoService
+                .fakeVerificationService
+        fakeVerificationService.givenAddListenerSucceeds()
+        fakeVerificationService.givenRemoveListenerSucceeds()
+        return fakeVerificationService
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given the viewModel when initializing it then verification listener is added`() {
+        // Given
+        val fakeVerificationService = givenVerificationService()
+
+        // When
+        val viewModel = createViewModel()
+
+        // Then
+        verify {
+            fakeVerificationService.addListener(viewModel)
+        }
+    }
+
+    @Test
+    fun `given the viewModel when clearing it then verification listener is removed`() {
+        // Given
+        val fakeVerificationService = givenVerificationService()
+
+        // When
+        val viewModel = createViewModel()
+        viewModel.onCleared()
+
+        // Then
+        verify {
+            fakeVerificationService.removeListener(viewModel)
+        }
+    }
+
+    @Test
+    fun `given the viewModel has been initialized then pushers are refreshed`() {
+        createViewModel()
+
+        fakeActiveSessionHolder.fakeSession.pushersService().verifyRefreshPushers()
+    }
+
+    @Test
+    fun `given the viewModel has been initialized then viewState is updated with session info`() {
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        givenCurrentSessionIsTrusted()
+        val expectedState = SessionOverviewViewState(
+                deviceId = A_SESSION_ID_1,
+                deviceInfo = Success(deviceFullInfo),
+                isCurrentSessionTrusted = true,
+                notificationsStatus = notificationsStatus,
+        )
+
+        val viewModel = createViewModel()
+
+        viewModel.test()
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+        verify {
+            getDeviceFullInfoUseCase.execute(A_SESSION_ID_1)
+        }
+    }
+
+    @Test
+    fun `given current session can be verified when handling verify current session action then self verification event is posted`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.isCurrentDevice } returns true
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        val verifySessionAction = SessionOverviewAction.VerifySession
+        coEvery { checkIfCurrentSessionCanBeVerifiedUseCase.execute() } returns true
+        givenCurrentSessionIsTrusted()
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(verifySessionAction)
+
+        // Then
+        viewModelTest
+                .assertEvent { it is SessionOverviewViewEvent.ShowVerifyCurrentSession }
+                .finish()
+        coVerify {
+            checkIfCurrentSessionCanBeVerifiedUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given current session cannot be verified when handling verify current session action then reset secrets event is posted`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.isCurrentDevice } returns true
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        val verifySessionAction = SessionOverviewAction.VerifySession
+        coEvery { checkIfCurrentSessionCanBeVerifiedUseCase.execute() } returns false
+        givenCurrentSessionIsTrusted()
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(verifySessionAction)
+
+        // Then
+        viewModelTest
+                .assertEvent { it is SessionOverviewViewEvent.PromptResetSecrets }
+                .finish()
+        coVerify {
+            checkIfCurrentSessionCanBeVerifiedUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given another session when handling verify session action then verify session event is posted`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.isCurrentDevice } returns false
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        val verifySessionAction = SessionOverviewAction.VerifySession
+        givenCurrentSessionIsTrusted()
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(verifySessionAction)
+
+        // Then
+        viewModelTest
+                .assertEvent { it is SessionOverviewViewEvent.ShowVerifyOtherSession }
+                .finish()
+    }
+
+    @Test
+    fun `given another session and no reAuth is needed when handling signout action then signout process is performed`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.isCurrentDevice } returns false
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        fakeSignoutSessionsUseCase.givenSignoutSuccess(listOf(A_SESSION_ID_1))
+        val signoutAction = SessionOverviewAction.SignoutOtherSession
+        givenCurrentSessionIsTrusted()
+        val expectedViewState = SessionOverviewViewState(
+                deviceId = A_SESSION_ID_1,
+                isCurrentSessionTrusted = true,
+                deviceInfo = Success(deviceFullInfo),
+                isLoading = false,
+                notificationsStatus = notificationsStatus,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(signoutAction)
+
+        // Then
+        viewModelTest
+                .assertStatesChanges(
+                        expectedViewState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvent { it is SessionOverviewViewEvent.SignoutSuccess }
+                .finish()
+        verify {
+            refreshDevicesUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given another session and unexpected error during signout when handling signout action then signout process is performed`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.isCurrentDevice } returns false
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        val error = Exception()
+        fakeSignoutSessionsUseCase.givenSignoutError(listOf(A_SESSION_ID_1), error)
+        val signoutAction = SessionOverviewAction.SignoutOtherSession
+        givenCurrentSessionIsTrusted()
+        val expectedViewState = SessionOverviewViewState(
+                deviceId = A_SESSION_ID_1,
+                isCurrentSessionTrusted = true,
+                deviceInfo = Success(deviceFullInfo),
+                isLoading = false,
+                notificationsStatus = notificationsStatus,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(signoutAction)
+
+        // Then
+        viewModelTest
+                .assertStatesChanges(
+                        expectedViewState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvent { it is SessionOverviewViewEvent.SignoutError && it.error == error }
+                .finish()
+    }
+
+    @Test
+    fun `given another session and reAuth is needed during signout when handling signout action then requestReAuth is sent and pending auth is stored`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.isCurrentDevice } returns false
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        val reAuthNeeded = fakeSignoutSessionsUseCase.givenSignoutReAuthNeeded(listOf(A_SESSION_ID_1))
+        val signoutAction = SessionOverviewAction.SignoutOtherSession
+        givenCurrentSessionIsTrusted()
+        val expectedPendingAuth = DefaultBaseAuth(session = reAuthNeeded.flowResponse.session)
+        val expectedReAuthEvent = SessionOverviewViewEvent.RequestReAuth(reAuthNeeded.flowResponse, reAuthNeeded.errCode)
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(signoutAction)
+
+        // Then
+        viewModelTest
+                .assertEvent { it == expectedReAuthEvent }
+                .finish()
+        fakePendingAuthHandler.instance.pendingAuth shouldBeEqualTo expectedPendingAuth
+        fakePendingAuthHandler.instance.uiaContinuation shouldBeEqualTo reAuthNeeded.uiaContinuation
+    }
+
+    @Test
+    fun `given SSO auth has been done when handling ssoAuthDone action then corresponding method of pending auth handler is called`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.isCurrentDevice } returns false
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        val action = SessionOverviewAction.SsoAuthDone
+        givenCurrentSessionIsTrusted()
+        every { fakePendingAuthHandler.instance.ssoAuthDone() } just runs
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest.finish()
+        verifyAll {
+            fakePendingAuthHandler.instance.ssoAuthDone()
+        }
+    }
+
+    @Test
+    fun `given password auth has been done when handling passwordAuthDone action then corresponding method of pending auth handler is called`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.isCurrentDevice } returns false
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        val action = SessionOverviewAction.PasswordAuthDone(password = A_PASSWORD)
+        givenCurrentSessionIsTrusted()
+        every { fakePendingAuthHandler.instance.passwordAuthDone(any()) } just runs
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest.finish()
+        verifyAll {
+            fakePendingAuthHandler.instance.passwordAuthDone(A_PASSWORD)
+        }
+    }
+
+    @Test
+    fun `given reAuth has been cancelled when handling reAuthCancelled action then corresponding method of pending auth handler is called`() {
+        // Given
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.isCurrentDevice } returns false
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_1) } returns flowOf(deviceFullInfo)
+        val action = SessionOverviewAction.ReAuthCancelled
+        givenCurrentSessionIsTrusted()
+        every { fakePendingAuthHandler.instance.reAuthCancelled() } just runs
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest.finish()
+        verifyAll {
+            fakePendingAuthHandler.instance.reAuthCancelled()
+        }
+    }
+
+    private fun givenCurrentSessionIsTrusted() {
+        fakeActiveSessionHolder.fakeSession.givenSessionId(A_SESSION_ID_2)
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.roomEncryptionTrustLevel } returns RoomEncryptionTrustLevel.Trusted
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID_2) } returns flowOf(deviceFullInfo)
+    }
+
+    @Test
+    fun `when viewModel init, then observe pushers and emit to state`() {
+        val viewModel = createViewModel()
+
+        viewModel.test()
+                .assertLatestState { state -> state.notificationsStatus == notificationsStatus }
+                .finish()
+    }
+
+    @Test
+    fun `when handle TogglePushNotifications, then execute use case and update state`() {
+        val viewModel = createViewModel()
+
+        viewModel.handle(SessionOverviewAction.TogglePushNotifications(A_SESSION_ID_1, true))
+
+        toggleNotificationUseCase.verifyExecute(A_SESSION_ID_1, true)
+        viewModel.test().assertLatestState { state -> state.notificationsStatus == NotificationsStatus.ENABLED }.finish()
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewNavigatorTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewNavigatorTest.kt
new file mode 100644
index 0000000000..99f3013697
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewNavigatorTest.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.overview
+
+import android.content.Intent
+import androidx.fragment.app.FragmentActivity
+import im.vector.app.features.settings.devices.v2.details.SessionDetailsActivity
+import im.vector.app.features.settings.devices.v2.rename.RenameSessionActivity
+import im.vector.app.test.fakes.FakeContext
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.runs
+import io.mockk.unmockkAll
+import io.mockk.verify
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+private const val A_SESSION_ID = "session_id"
+
+class SessionOverviewViewNavigatorTest {
+
+    private val context = FakeContext()
+    private val sessionOverviewViewNavigator = SessionOverviewViewNavigator()
+
+    @Before
+    fun setUp() {
+        mockkObject(SessionDetailsActivity)
+        mockkObject(RenameSessionActivity)
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given a session id when navigating to details then it starts the correct activity`() {
+        // Given
+        val intent = givenIntentForSessionDetails(A_SESSION_ID)
+        context.givenStartActivity(intent)
+
+        // When
+        sessionOverviewViewNavigator.goToSessionDetails(context.instance, A_SESSION_ID)
+
+        // Then
+        context.verifyStartActivity(intent)
+    }
+
+    @Test
+    fun `given a session id when navigating to rename screen then it starts the correct activity`() {
+        // Given
+        val intent = givenIntentForRenameSession(A_SESSION_ID)
+        context.givenStartActivity(intent)
+
+        // When
+        sessionOverviewViewNavigator.goToRenameSession(context.instance, A_SESSION_ID)
+
+        // Then
+        context.verifyStartActivity(intent)
+    }
+
+    @Test
+    fun `given an activity when going back then the activity is finished`() {
+        // Given
+        val fragmentActivity = mockk<FragmentActivity>()
+        every { fragmentActivity.finish() } just runs
+
+        // When
+        sessionOverviewViewNavigator.goBack(fragmentActivity)
+
+        // Then
+        verify {
+            fragmentActivity.finish()
+        }
+    }
+
+    private fun givenIntentForSessionDetails(sessionId: String): Intent {
+        val intent = mockk<Intent>()
+        every { SessionDetailsActivity.newIntent(context.instance, sessionId) } returns intent
+        return intent
+    }
+
+    private fun givenIntentForRenameSession(sessionId: String): Intent {
+        val intent = mockk<Intent>()
+        every { RenameSessionActivity.newIntent(context.instance, sessionId) } returns intent
+        return intent
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionUseCaseTest.kt
new file mode 100644
index 0000000000..9ef4718559
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionUseCaseTest.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import io.mockk.verify
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+private const val A_DEVICE_ID = "device-id"
+private const val A_DEVICE_NAME = "device-name"
+
+class RenameSessionUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val refreshDevicesUseCase = mockk<RefreshDevicesUseCase>()
+
+    private val renameSessionUseCase = RenameSessionUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+            refreshDevicesUseCase = refreshDevicesUseCase
+    )
+
+    @Test
+    fun `given a device id and a new name when no error during rename then the device is renamed with success`() = runTest {
+        // Given
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.givenSetDeviceNameSucceeds()
+        every { refreshDevicesUseCase.execute() } just runs
+
+        // When
+        val result = renameSessionUseCase.execute(A_DEVICE_ID, A_DEVICE_NAME)
+
+        // Then
+        result.isSuccess shouldBe true
+        verify {
+            fakeActiveSessionHolder.fakeSession
+                    .cryptoService()
+                    .setDeviceName(A_DEVICE_ID, A_DEVICE_NAME, any())
+            refreshDevicesUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given a device id and a new name when an error occurs during rename then result is failure`() = runTest {
+        // Given
+        val error = Exception()
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.givenSetDeviceNameFailsWithError(error)
+
+        // When
+        val result = renameSessionUseCase.execute(A_DEVICE_ID, A_DEVICE_NAME)
+
+        // Then
+        result.isFailure shouldBe true
+        result.exceptionOrNull() shouldBeEqualTo error
+    }
+
+    @Test
+    fun `given a device id and a new name when an error occurs during devices refresh then result is failure`() = runTest {
+        // Given
+        val error = Exception()
+        fakeActiveSessionHolder.fakeSession.fakeCryptoService.givenSetDeviceNameSucceeds()
+        every { refreshDevicesUseCase.execute() } throws error
+
+        // When
+        val result = renameSessionUseCase.execute(A_DEVICE_ID, A_DEVICE_NAME)
+
+        // Then
+        result.isFailure shouldBe true
+        result.exceptionOrNull() shouldBeEqualTo error
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewModelTest.kt
new file mode 100644
index 0000000000..8bb6c3119d
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewModelTest.kt
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.overview.GetDeviceFullInfoUseCase
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.flow.flowOf
+import org.junit.Rule
+import org.junit.Test
+
+private const val A_SESSION_ID = "session-id"
+private const val A_SESSION_NAME = "session-name"
+private const val AN_EDITED_SESSION_NAME = "edited-session-name"
+
+class RenameSessionViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
+
+    private val args = RenameSessionArgs(
+            deviceId = A_SESSION_ID
+    )
+    private val getDeviceFullInfoUseCase = mockk<GetDeviceFullInfoUseCase>()
+    private val renameSessionUseCase = mockk<RenameSessionUseCase>()
+
+    private fun createViewModel() = RenameSessionViewModel(
+            initialState = RenameSessionViewState(args),
+            getDeviceFullInfoUseCase = getDeviceFullInfoUseCase,
+            renameSessionUseCase = renameSessionUseCase,
+    )
+
+    @Test
+    fun `given the original device name has not been retrieved when handling init with last edited name action then view state and view events are updated`() {
+        // Given
+        givenSessionWithName(A_SESSION_NAME)
+        val action = RenameSessionAction.InitWithLastEditedName
+        val expectedState = RenameSessionViewState(
+                deviceId = A_SESSION_ID,
+                editedDeviceName = A_SESSION_NAME,
+        )
+        val expectedEvent = RenameSessionViewEvent.Initialized(
+                deviceName = A_SESSION_NAME,
+        )
+        val viewModel = createViewModel()
+        viewModel.hasRetrievedOriginalDeviceName = false
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest.assertLatestState { state -> state == expectedState }
+                .assertEvent { event -> event == expectedEvent }
+                .finish()
+        verify {
+            getDeviceFullInfoUseCase.execute(A_SESSION_ID)
+        }
+    }
+
+    @Test
+    fun `given the original device name has been retrieved when handling init with last edited name action then view state and view events are updated`() {
+        // Given
+        val action = RenameSessionAction.InitWithLastEditedName
+        val expectedState = RenameSessionViewState(
+                deviceId = A_SESSION_ID,
+                editedDeviceName = AN_EDITED_SESSION_NAME,
+        )
+        val expectedEvent = RenameSessionViewEvent.Initialized(
+                deviceName = AN_EDITED_SESSION_NAME,
+        )
+        val viewModel = createViewModel()
+        viewModel.handle(RenameSessionAction.EditLocally(AN_EDITED_SESSION_NAME))
+        viewModel.hasRetrievedOriginalDeviceName = true
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest.assertLatestState { state -> state == expectedState }
+                .assertEvent { event -> event == expectedEvent }
+                .finish()
+        verify(inverse = true) {
+            getDeviceFullInfoUseCase.execute(A_SESSION_ID)
+        }
+    }
+
+    @Test
+    fun `given a new edited name when handling edit name locally action then view state is updated accordingly`() {
+        // Given
+        val action = RenameSessionAction.EditLocally(AN_EDITED_SESSION_NAME)
+        val expectedState = RenameSessionViewState(
+                deviceId = A_SESSION_ID,
+                editedDeviceName = AN_EDITED_SESSION_NAME,
+        )
+        val viewModel = createViewModel()
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given current edited name when handling save modifications action with success then correct view event is posted`() {
+        // Given
+        coEvery { renameSessionUseCase.execute(A_SESSION_ID, any()) } returns Result.success(Unit)
+        val action = RenameSessionAction.SaveModifications
+        val viewModel = createViewModel()
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest
+                .assertEvent { event -> event is RenameSessionViewEvent.SessionRenamed }
+                .finish()
+    }
+
+    @Test
+    fun `given current edited name when handling save modifications action with error then correct view event is posted`() {
+        // Given
+        val error = Exception()
+        coEvery { renameSessionUseCase.execute(A_SESSION_ID, any()) } returns Result.failure(error)
+        val action = RenameSessionAction.SaveModifications
+        val viewModel = createViewModel()
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest
+                .assertEvent { event -> event is RenameSessionViewEvent.Failure && event.throwable == error }
+                .finish()
+    }
+
+    private fun givenSessionWithName(sessionName: String) {
+        val deviceFullInfo = mockk<DeviceFullInfo>()
+        every { deviceFullInfo.deviceInfo.displayName } returns sessionName
+        every { getDeviceFullInfoUseCase.execute(A_SESSION_ID) } returns flowOf(deviceFullInfo)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewNavigatorTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewNavigatorTest.kt
new file mode 100644
index 0000000000..faf25e5487
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionViewNavigatorTest.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.rename
+
+import androidx.fragment.app.FragmentActivity
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import io.mockk.verify
+import org.junit.Test
+
+class RenameSessionViewNavigatorTest {
+
+    private val renameSessionViewNavigator = RenameSessionViewNavigator()
+
+    @Test
+    fun `given an activity when going back then the activity is finished`() {
+        // Given
+        val fragmentActivity = mockk<FragmentActivity>()
+        every { fragmentActivity.finish() } just runs
+
+        // When
+        renameSessionViewNavigator.goBack(fragmentActivity)
+
+        // Then
+        verify {
+            fragmentActivity.finish()
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/signout/InterceptSignoutFlowResponseUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/signout/InterceptSignoutFlowResponseUseCaseTest.kt
new file mode 100644
index 0000000000..cd0575f2a0
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/signout/InterceptSignoutFlowResponseUseCaseTest.kt
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.signout
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeReAuthHelper
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.runs
+import io.mockk.unmockkAll
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.auth.UIABaseAuth
+import org.matrix.android.sdk.api.auth.UserPasswordAuth
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
+import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+
+private const val A_PASSWORD = "password"
+private const val A_SESSION_ID = "session-id"
+private const val AN_ERROR_CODE = "error-code"
+
+class InterceptSignoutFlowResponseUseCaseTest {
+
+    private val fakeReAuthHelper = FakeReAuthHelper()
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+
+    private val interceptSignoutFlowResponseUseCase = InterceptSignoutFlowResponseUseCase(
+            reAuthHelper = fakeReAuthHelper.instance,
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+    )
+
+    @Before
+    fun setUp() {
+        mockkStatic("org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponseKt")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given no error and a stored password and a next stage as password when intercepting then promise is resumed and null is returned`() {
+        // Given
+        val registrationFlowResponse = givenNextUncompletedStage(LoginFlowTypes.PASSWORD, A_SESSION_ID)
+        fakeReAuthHelper.givenStoredPassword(A_PASSWORD)
+        val errorCode: String? = null
+        val promise = mockk<Continuation<UIABaseAuth>>()
+        every { promise.resume(any()) } just runs
+        val expectedAuth = UserPasswordAuth(
+                session = null,
+                user = fakeActiveSessionHolder.fakeSession.myUserId,
+                password = A_PASSWORD,
+        )
+
+        // When
+        val result = interceptSignoutFlowResponseUseCase.execute(
+                flowResponse = registrationFlowResponse,
+                errCode = errorCode,
+                promise = promise,
+        )
+
+        // Then
+        result shouldBe null
+        every {
+            promise.resume(expectedAuth)
+        }
+    }
+
+    @Test
+    fun `given an error when intercepting then reAuthNeeded result is returned`() {
+        // Given
+        val registrationFlowResponse = givenNextUncompletedStage(LoginFlowTypes.PASSWORD, A_SESSION_ID)
+        fakeReAuthHelper.givenStoredPassword(A_PASSWORD)
+        val errorCode = AN_ERROR_CODE
+        val promise = mockk<Continuation<UIABaseAuth>>()
+        val expectedResult = SignoutSessionsReAuthNeeded(
+                pendingAuth = DefaultBaseAuth(session = A_SESSION_ID),
+                uiaContinuation = promise,
+                flowResponse = registrationFlowResponse,
+                errCode = errorCode
+        )
+
+        // When
+        val result = interceptSignoutFlowResponseUseCase.execute(
+                flowResponse = registrationFlowResponse,
+                errCode = errorCode,
+                promise = promise,
+        )
+
+        // Then
+        result shouldBeEqualTo expectedResult
+    }
+
+    @Test
+    fun `given next stage is not password when intercepting then reAuthNeeded result is returned`() {
+        // Given
+        val registrationFlowResponse = givenNextUncompletedStage(LoginFlowTypes.SSO, A_SESSION_ID)
+        fakeReAuthHelper.givenStoredPassword(A_PASSWORD)
+        val errorCode: String? = null
+        val promise = mockk<Continuation<UIABaseAuth>>()
+        val expectedResult = SignoutSessionsReAuthNeeded(
+                pendingAuth = DefaultBaseAuth(session = A_SESSION_ID),
+                uiaContinuation = promise,
+                flowResponse = registrationFlowResponse,
+                errCode = errorCode
+        )
+
+        // When
+        val result = interceptSignoutFlowResponseUseCase.execute(
+                flowResponse = registrationFlowResponse,
+                errCode = errorCode,
+                promise = promise,
+        )
+
+        // Then
+        result shouldBeEqualTo expectedResult
+    }
+
+    @Test
+    fun `given no existing stored password when intercepting then reAuthNeeded result is returned`() {
+        // Given
+        val registrationFlowResponse = givenNextUncompletedStage(LoginFlowTypes.PASSWORD, A_SESSION_ID)
+        fakeReAuthHelper.givenStoredPassword(null)
+        val errorCode: String? = null
+        val promise = mockk<Continuation<UIABaseAuth>>()
+        val expectedResult = SignoutSessionsReAuthNeeded(
+                pendingAuth = DefaultBaseAuth(session = A_SESSION_ID),
+                uiaContinuation = promise,
+                flowResponse = registrationFlowResponse,
+                errCode = errorCode
+        )
+
+        // When
+        val result = interceptSignoutFlowResponseUseCase.execute(
+                flowResponse = registrationFlowResponse,
+                errCode = errorCode,
+                promise = promise,
+        )
+
+        // Then
+        result shouldBeEqualTo expectedResult
+    }
+
+    private fun givenNextUncompletedStage(nextStage: String, sessionId: String): RegistrationFlowResponse {
+        val registrationFlowResponse = mockk<RegistrationFlowResponse>()
+        every { registrationFlowResponse.nextUncompletedStage() } returns nextStage
+        every { registrationFlowResponse.session } returns sessionId
+        return registrationFlowResponse
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsUseCaseTest.kt
new file mode 100644
index 0000000000..70d2b4b039
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/signout/SignoutSessionsUseCaseTest.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.signout
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.junit.Test
+
+private const val A_DEVICE_ID_1 = "device-id-1"
+private const val A_DEVICE_ID_2 = "device-id-2"
+
+class SignoutSessionsUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val fakeInterceptSignoutFlowResponseUseCase = mockk<InterceptSignoutFlowResponseUseCase>()
+
+    private val signoutSessionsUseCase = SignoutSessionsUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+            interceptSignoutFlowResponseUseCase = fakeInterceptSignoutFlowResponseUseCase,
+    )
+
+    @Test
+    fun `given a list of device ids when signing out with success then success result is returned`() = runTest {
+        // Given
+        val callback = givenOnReAuthCallback()
+        val deviceIds = listOf(A_DEVICE_ID_1, A_DEVICE_ID_2)
+        fakeActiveSessionHolder.fakeSession
+                .fakeCryptoService
+                .givenDeleteDevicesSucceeds(deviceIds)
+
+        // When
+        val result = signoutSessionsUseCase.execute(deviceIds, callback)
+
+        // Then
+        result.isSuccess shouldBe true
+        verify {
+            fakeActiveSessionHolder.fakeSession
+                    .fakeCryptoService
+                    .deleteDevices(deviceIds, any(), any())
+        }
+    }
+
+    @Test
+    fun `given a list of device ids when signing out with error then failure result is returned`() = runTest {
+        // Given
+        val interceptor = givenOnReAuthCallback()
+        val deviceIds = listOf(A_DEVICE_ID_1, A_DEVICE_ID_2)
+        val error = mockk<Exception>()
+        fakeActiveSessionHolder.fakeSession
+                .fakeCryptoService
+                .givenDeleteDevicesFailsWithError(deviceIds, error)
+
+        // When
+        val result = signoutSessionsUseCase.execute(deviceIds, interceptor)
+
+        // Then
+        result.isFailure shouldBe true
+        verify {
+            fakeActiveSessionHolder.fakeSession
+                    .fakeCryptoService
+                    .deleteDevices(deviceIds, any(), any())
+        }
+    }
+
+    @Test
+    fun `given a list of device ids when signing out with reAuth needed then callback is called`() = runTest {
+        // Given
+        val callback = givenOnReAuthCallback()
+        val deviceIds = listOf(A_DEVICE_ID_1, A_DEVICE_ID_2)
+        fakeActiveSessionHolder.fakeSession
+                .fakeCryptoService
+                .givenDeleteDevicesNeedsUIAuth(deviceIds)
+        val reAuthNeeded = SignoutSessionsReAuthNeeded(
+                pendingAuth = mockk(),
+                uiaContinuation = mockk(),
+                flowResponse = mockk(),
+                errCode = "errorCode"
+        )
+        every { fakeInterceptSignoutFlowResponseUseCase.execute(any(), any(), any()) } returns reAuthNeeded
+
+        // When
+        val result = signoutSessionsUseCase.execute(deviceIds, callback)
+
+        // Then
+        result.isSuccess shouldBe true
+        verify {
+            fakeActiveSessionHolder.fakeSession
+                    .fakeCryptoService
+                    .deleteDevices(deviceIds, any(), any())
+            callback(reAuthNeeded)
+        }
+    }
+
+    private fun givenOnReAuthCallback(): (SignoutSessionsReAuthNeeded) -> Unit = {}
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/CheckIfCurrentSessionCanBeVerifiedUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/CheckIfCurrentSessionCanBeVerifiedUseCaseTest.kt
new file mode 100644
index 0000000000..22bc0edae1
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/CheckIfCurrentSessionCanBeVerifiedUseCaseTest.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.flow.FlowSession
+import org.matrix.android.sdk.flow.flow
+
+class CheckIfCurrentSessionCanBeVerifiedUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+
+    private val checkIfCurrentSessionCanBeVerifiedUseCase = CheckIfCurrentSessionCanBeVerifiedUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance
+    )
+
+    @Before
+    fun setUp() {
+        mockkStatic("org.matrix.android.sdk.flow.FlowSessionKt")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given there are other sessions when checking if session can be verified then result is true`() = runTest {
+        // Given
+        val device1 = givenACryptoDevice()
+        val device2 = givenACryptoDevice()
+        val devices = listOf(device1, device2)
+        val fakeSession = fakeActiveSessionHolder.fakeSession
+        val flowSession = mockk<FlowSession>()
+        every { fakeSession.flow() } returns flowSession
+        every { flowSession.liveUserCryptoDevices(any()) } returns flowOf(devices)
+
+        fakeSession.fakeSharedSecretStorageService.givenIsRecoverySetupReturns(false)
+
+        // When
+        val result = checkIfCurrentSessionCanBeVerifiedUseCase.execute()
+
+        // Then
+        result shouldBeEqualTo true
+        verify {
+            flowSession.liveUserCryptoDevices(fakeSession.myUserId)
+            fakeSession.fakeSharedSecretStorageService.isRecoverySetup()
+        }
+    }
+
+    @Test
+    fun `given recovery is setup when checking if session can be verified then result is true`() = runTest {
+        // Given
+        val device1 = givenACryptoDevice()
+        val devices = listOf(device1)
+        val fakeSession = fakeActiveSessionHolder.fakeSession
+        val flowSession = mockk<FlowSession>()
+        every { fakeSession.flow() } returns flowSession
+        every { flowSession.liveUserCryptoDevices(any()) } returns flowOf(devices)
+
+        fakeSession.fakeSharedSecretStorageService.givenIsRecoverySetupReturns(true)
+
+        // When
+        val result = checkIfCurrentSessionCanBeVerifiedUseCase.execute()
+
+        // Then
+        result shouldBeEqualTo true
+        verify {
+            flowSession.liveUserCryptoDevices(fakeSession.myUserId)
+            fakeSession.fakeSharedSecretStorageService.isRecoverySetup()
+        }
+    }
+
+    @Test
+    fun `given recovery is not setup and there are no other sessions when checking if session can be verified then result is false`() = runTest {
+        // Given
+        val device1 = givenACryptoDevice()
+        val devices = listOf(device1)
+        val fakeSession = fakeActiveSessionHolder.fakeSession
+        val flowSession = mockk<FlowSession>()
+        every { fakeSession.flow() } returns flowSession
+        every { flowSession.liveUserCryptoDevices(any()) } returns flowOf(devices)
+
+        fakeSession.fakeSharedSecretStorageService.givenIsRecoverySetupReturns(false)
+
+        // When
+        val result = checkIfCurrentSessionCanBeVerifiedUseCase.execute()
+
+        // Then
+        result shouldBeEqualTo false
+        verify {
+            flowSession.liveUserCryptoDevices(fakeSession.myUserId)
+            fakeSession.fakeSharedSecretStorageService.isRecoverySetup()
+        }
+    }
+
+    private fun givenACryptoDevice(): CryptoDeviceInfo = mockk()
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetCurrentSessionCrossSigningInfoUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetCurrentSessionCrossSigningInfoUseCaseTest.kt
new file mode 100644
index 0000000000..356d771d39
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetCurrentSessionCrossSigningInfoUseCaseTest.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.util.toOptional
+
+private const val A_DEVICE_ID = "device-id"
+
+class GetCurrentSessionCrossSigningInfoUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+
+    private val getCurrentSessionCrossSigningInfoUseCase = GetCurrentSessionCrossSigningInfoUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance
+    )
+
+    @Before
+    fun setUp() {
+        mockkStatic("org.matrix.android.sdk.flow.FlowSessionKt")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given the active session and existing cross signing info when getting these info then the result is correct`() = runTest(testDispatcher) {
+        val fakeSession = givenSession(A_DEVICE_ID)
+        val fakeFlowSession = fakeSession.givenFlowSession()
+        val isCrossSigningVerified = true
+        val mxCrossSigningInfo = givenMxCrossSigningInfo(isCrossSigningVerified)
+        every { fakeFlowSession.liveCrossSigningInfo(any()) } returns flowOf(mxCrossSigningInfo.toOptional())
+        val expectedResult = CurrentSessionCrossSigningInfo(
+                deviceId = A_DEVICE_ID,
+                isCrossSigningInitialized = true,
+                isCrossSigningVerified = isCrossSigningVerified
+        )
+
+        val result = getCurrentSessionCrossSigningInfoUseCase.execute()
+                .test(this)
+
+        result.assertValues(listOf(expectedResult))
+                .finish()
+        verify { fakeFlowSession.liveCrossSigningInfo(fakeSession.myUserId) }
+    }
+
+    @Test
+    fun `given the active session and no existing cross signing info when getting these info then the result is correct`() = runTest(testDispatcher) {
+        val fakeSession = givenSession(A_DEVICE_ID)
+        val fakeFlowSession = fakeSession.givenFlowSession()
+        val mxCrossSigningInfo = null
+        every { fakeFlowSession.liveCrossSigningInfo(any()) } returns flowOf(mxCrossSigningInfo.toOptional())
+        val expectedResult = CurrentSessionCrossSigningInfo(
+                deviceId = A_DEVICE_ID,
+                isCrossSigningInitialized = false,
+                isCrossSigningVerified = false
+        )
+
+        val result = getCurrentSessionCrossSigningInfoUseCase.execute()
+                .test(this)
+
+        result.assertValues(listOf(expectedResult))
+                .finish()
+        verify { fakeFlowSession.liveCrossSigningInfo(fakeSession.myUserId) }
+    }
+
+    @Test
+    fun `given no active session when getting cross signing info then the result is empty`() = runTest(testDispatcher) {
+        fakeActiveSessionHolder.givenGetSafeActiveSessionReturns(null)
+
+        val result = getCurrentSessionCrossSigningInfoUseCase.execute()
+                .test(this)
+
+        result.assertNoValues()
+                .finish()
+    }
+
+    private fun givenSession(deviceId: String): FakeSession {
+        val fakeSession = fakeActiveSessionHolder.fakeSession
+        fakeSession.givenSessionId(deviceId)
+
+        return fakeSession
+    }
+
+    private fun givenMxCrossSigningInfo(isTrusted: Boolean) = mockk<MXCrossSigningInfo>()
+            .also {
+                every { it.isTrusted() } returns isTrusted
+            }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForCurrentDeviceUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForCurrentDeviceUseCaseTest.kt
new file mode 100644
index 0000000000..3f82cb0dd2
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForCurrentDeviceUseCaseTest.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+class GetEncryptionTrustLevelForCurrentDeviceUseCaseTest {
+
+    private val getEncryptionTrustLevelForCurrentDeviceUseCase = GetEncryptionTrustLevelForCurrentDeviceUseCase()
+
+    @Test
+    fun `given in legacy mode when computing trust level then device is trusted`() {
+        val trustMSK = false
+        val legacyMode = true
+
+        val result = getEncryptionTrustLevelForCurrentDeviceUseCase.execute(trustMSK = trustMSK, legacyMode = legacyMode)
+
+        result shouldBeEqualTo RoomEncryptionTrustLevel.Trusted
+    }
+
+    @Test
+    fun `given trustMSK is true and not in legacy mode when computing trust level then device is trusted`() {
+        val trustMSK = true
+        val legacyMode = false
+
+        val result = getEncryptionTrustLevelForCurrentDeviceUseCase.execute(trustMSK = trustMSK, legacyMode = legacyMode)
+
+        result shouldBeEqualTo RoomEncryptionTrustLevel.Trusted
+    }
+
+    @Test
+    fun `given trustMSK is false and not in legacy mode when computing trust level then device is unverified`() {
+        val trustMSK = false
+        val legacyMode = false
+
+        val result = getEncryptionTrustLevelForCurrentDeviceUseCase.execute(trustMSK = trustMSK, legacyMode = legacyMode)
+
+        result shouldBeEqualTo RoomEncryptionTrustLevel.Warning
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCaseTest.kt
new file mode 100644
index 0000000000..fd10ee1083
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCaseTest.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+private const val A_DEVICE_ID = "device-id"
+private const val A_DEVICE_ID_2 = "device-id-2"
+
+class GetEncryptionTrustLevelForDeviceUseCaseTest {
+
+    private val getEncryptionTrustLevelForCurrentDeviceUseCase = mockk<GetEncryptionTrustLevelForCurrentDeviceUseCase>()
+    private val getEncryptionTrustLevelForOtherDeviceUseCase = mockk<GetEncryptionTrustLevelForOtherDeviceUseCase>()
+
+    private val getEncryptionTrustLevelForDeviceUseCase = GetEncryptionTrustLevelForDeviceUseCase(
+            getEncryptionTrustLevelForCurrentDeviceUseCase = getEncryptionTrustLevelForCurrentDeviceUseCase,
+            getEncryptionTrustLevelForOtherDeviceUseCase = getEncryptionTrustLevelForOtherDeviceUseCase,
+    )
+
+    @Test
+    fun `given is current device when computing trust level then the correct sub use case result is returned`() {
+        val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo(
+                deviceId = A_DEVICE_ID,
+                isCrossSigningInitialized = true,
+                isCrossSigningVerified = false
+        )
+        val cryptoDeviceInfo = givenCryptoDeviceInfo(
+                deviceId = A_DEVICE_ID,
+                trustLevel = null
+        )
+        val trustLevel = RoomEncryptionTrustLevel.Trusted
+        every { getEncryptionTrustLevelForCurrentDeviceUseCase.execute(any(), any()) } returns trustLevel
+
+        val result = getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo)
+
+        result shouldBeEqualTo trustLevel
+        verify {
+            getEncryptionTrustLevelForCurrentDeviceUseCase.execute(
+                    trustMSK = currentSessionCrossSigningInfo.isCrossSigningVerified,
+                    legacyMode = !currentSessionCrossSigningInfo.isCrossSigningInitialized
+            )
+        }
+    }
+
+    @Test
+    fun `given is not current device when computing trust level then the correct sub use case result is returned`() {
+        val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo(
+                deviceId = A_DEVICE_ID,
+                isCrossSigningInitialized = true,
+                isCrossSigningVerified = false
+        )
+        val cryptoDeviceInfo = givenCryptoDeviceInfo(
+                deviceId = A_DEVICE_ID_2,
+                trustLevel = null
+        )
+        val trustLevel = RoomEncryptionTrustLevel.Trusted
+        every { getEncryptionTrustLevelForOtherDeviceUseCase.execute(any(), any(), any()) } returns trustLevel
+
+        val result = getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo)
+
+        result shouldBeEqualTo trustLevel
+        verify {
+            getEncryptionTrustLevelForOtherDeviceUseCase.execute(
+                    trustMSK = currentSessionCrossSigningInfo.isCrossSigningVerified,
+                    legacyMode = !currentSessionCrossSigningInfo.isCrossSigningInitialized,
+                    deviceTrustLevel = cryptoDeviceInfo.trustLevel
+            )
+        }
+    }
+
+    @Test
+    fun `given no crypto device info when computing trust level then result is null`() {
+        val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo(
+                deviceId = A_DEVICE_ID,
+                isCrossSigningInitialized = true,
+                isCrossSigningVerified = false
+        )
+        val cryptoDeviceInfo = null
+
+        val result = getEncryptionTrustLevelForDeviceUseCase.execute(currentSessionCrossSigningInfo, cryptoDeviceInfo)
+
+        result shouldBe null
+    }
+
+    private fun givenCurrentSessionCrossSigningInfo(
+            deviceId: String,
+            isCrossSigningInitialized: Boolean,
+            isCrossSigningVerified: Boolean
+    ): CurrentSessionCrossSigningInfo {
+        return CurrentSessionCrossSigningInfo(
+                deviceId = deviceId,
+                isCrossSigningInitialized = isCrossSigningInitialized,
+                isCrossSigningVerified = isCrossSigningVerified
+        )
+    }
+
+    private fun givenCryptoDeviceInfo(
+            deviceId: String,
+            trustLevel: DeviceTrustLevel?
+    ): CryptoDeviceInfo {
+        return CryptoDeviceInfo(
+                userId = "",
+                deviceId = deviceId,
+                trustLevel = trustLevel
+        )
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForOtherDeviceUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForOtherDeviceUseCaseTest.kt
new file mode 100644
index 0000000000..18f998cf97
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForOtherDeviceUseCaseTest.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.devices.v2.verification
+
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+class GetEncryptionTrustLevelForOtherDeviceUseCaseTest {
+
+    private val getEncryptionTrustLevelForOtherDeviceUseCase = GetEncryptionTrustLevelForOtherDeviceUseCase()
+
+    @Test
+    fun `given in legacy mode and device locally verified when computing trust level then device is trusted`() {
+        val trustMSK = false
+        val legacyMode = true
+        val deviceTrustLevel = givenDeviceTrustLevel(locallyVerified = true, crossSigningVerified = false)
+
+        val result = getEncryptionTrustLevelForOtherDeviceUseCase.execute(trustMSK = trustMSK, legacyMode = legacyMode, deviceTrustLevel = deviceTrustLevel)
+
+        result shouldBeEqualTo RoomEncryptionTrustLevel.Trusted
+    }
+
+    @Test
+    fun `given in legacy mode and device not locally verified when computing trust level then device is unverified`() {
+        val trustMSK = false
+        val legacyMode = true
+        val deviceTrustLevel = givenDeviceTrustLevel(locallyVerified = false, crossSigningVerified = false)
+
+        val result = getEncryptionTrustLevelForOtherDeviceUseCase.execute(trustMSK = trustMSK, legacyMode = legacyMode, deviceTrustLevel = deviceTrustLevel)
+
+        result shouldBeEqualTo RoomEncryptionTrustLevel.Warning
+    }
+
+    @Test
+    fun `given trustMSK is true and not in legacy mode and device cross signing verified when computing trust level then device is trusted`() {
+        val trustMSK = true
+        val legacyMode = false
+        val deviceTrustLevel = givenDeviceTrustLevel(locallyVerified = false, crossSigningVerified = true)
+
+        val result = getEncryptionTrustLevelForOtherDeviceUseCase.execute(trustMSK = trustMSK, legacyMode = legacyMode, deviceTrustLevel = deviceTrustLevel)
+
+        result shouldBeEqualTo RoomEncryptionTrustLevel.Trusted
+    }
+
+    @Test
+    fun `given trustMSK is true and not in legacy mode and device locally verified when computing trust level then device has default trust level`() {
+        val trustMSK = true
+        val legacyMode = false
+        val deviceTrustLevel = givenDeviceTrustLevel(locallyVerified = true, crossSigningVerified = false)
+
+        val result = getEncryptionTrustLevelForOtherDeviceUseCase.execute(trustMSK = trustMSK, legacyMode = legacyMode, deviceTrustLevel = deviceTrustLevel)
+
+        result shouldBeEqualTo RoomEncryptionTrustLevel.Default
+    }
+
+    @Test
+    fun `given trustMSK is true and not in legacy mode and device not verified when computing trust level then device is unverified`() {
+        val trustMSK = true
+        val legacyMode = false
+        val deviceTrustLevel = givenDeviceTrustLevel(locallyVerified = false, crossSigningVerified = false)
+
+        val result = getEncryptionTrustLevelForOtherDeviceUseCase.execute(trustMSK = trustMSK, legacyMode = legacyMode, deviceTrustLevel = deviceTrustLevel)
+
+        result shouldBeEqualTo RoomEncryptionTrustLevel.Warning
+    }
+
+    @Test
+    fun `given trustMSK is false and not in legacy mode when computing trust level then device has default trust level`() {
+        val trustMSK = false
+        val legacyMode = false
+        val deviceTrustLevel = givenDeviceTrustLevel(locallyVerified = false, crossSigningVerified = false)
+
+        val result = getEncryptionTrustLevelForOtherDeviceUseCase.execute(trustMSK = trustMSK, legacyMode = legacyMode, deviceTrustLevel = deviceTrustLevel)
+
+        result shouldBeEqualTo RoomEncryptionTrustLevel.Default
+    }
+
+    private fun givenDeviceTrustLevel(locallyVerified: Boolean?, crossSigningVerified: Boolean): DeviceTrustLevel {
+        return DeviceTrustLevel(
+                crossSigningVerified = crossSigningVerified,
+                locallyVerified = locallyVerified
+        )
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/font/FontScaleSettingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/font/FontScaleSettingViewModelTest.kt
index f21cc86572..96cf6a3b52 100644
--- a/vector/src/test/java/im/vector/app/features/settings/font/FontScaleSettingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/settings/font/FontScaleSettingViewModelTest.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.settings.font
 
-import com.airbnb.mvrx.test.MvRxTestRule
+import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.features.settings.FontScaleValue
 import im.vector.app.test.fakes.FakeConfiguration
 import im.vector.app.test.fakes.FakeFontScalePreferences
@@ -38,7 +38,7 @@ private fun aFontScaleValue(index: Int) = FontScaleValue(index, "foo", -1f, 0)
 class FontScaleSettingViewModelTest {
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule()
+    val mavericksTestRule = MavericksTestRule()
 
     private val fakeConfiguration = FakeConfiguration()
     private val fakeFontScalePreferences = FakeFontScalePreferences()
diff --git a/vector/src/test/java/im/vector/app/features/settings/labs/VectorSettingsLabsViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/labs/VectorSettingsLabsViewModelTest.kt
new file mode 100644
index 0000000000..b3a4648263
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/labs/VectorSettingsLabsViewModelTest.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.labs
+
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.core.session.clientinfo.DeleteMatrixClientInfoUseCase
+import im.vector.app.core.session.clientinfo.UpdateMatrixClientInfoUseCase
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import org.junit.Rule
+import org.junit.Test
+
+class VectorSettingsLabsViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val fakeUpdateMatrixClientInfoUseCase = mockk<UpdateMatrixClientInfoUseCase>()
+    private val fakeDeleteMatrixClientInfoUseCase = mockk<DeleteMatrixClientInfoUseCase>()
+
+    private fun createViewModel(): VectorSettingsLabsViewModel {
+        return VectorSettingsLabsViewModel(
+                initialState = VectorSettingsLabsViewState(),
+                activeSessionHolder = fakeActiveSessionHolder.instance,
+                updateMatrixClientInfoUseCase = fakeUpdateMatrixClientInfoUseCase,
+                deleteMatrixClientInfoUseCase = fakeDeleteMatrixClientInfoUseCase,
+        )
+    }
+
+    @Test
+    fun `given update client info action when handling this action then update client info use case is called`() {
+        // Given
+        givenUpdateClientInfoSucceeds()
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(VectorSettingsLabsAction.UpdateClientInfo)
+
+        // Then
+        viewModelTest.finish()
+        coVerify { fakeUpdateMatrixClientInfoUseCase.execute(fakeActiveSessionHolder.fakeSession) }
+    }
+
+    @Test
+    fun `given delete client info action when handling this action then delete client info use case is called`() {
+        // Given
+        givenDeleteClientInfoSucceeds()
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(VectorSettingsLabsAction.DeleteRecordedClientInfo)
+
+        // Then
+        viewModelTest.finish()
+        coVerify { fakeDeleteMatrixClientInfoUseCase.execute() }
+    }
+
+    private fun givenUpdateClientInfoSucceeds() {
+        coEvery { fakeUpdateMatrixClientInfoUseCase.execute(any()) } returns Result.success(Unit)
+    }
+
+    private fun givenDeleteClientInfoSucceeds() {
+        coEvery { fakeDeleteMatrixClientInfoUseCase.execute() } returns Result.success(Unit)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/notifications/DisableNotificationsForCurrentSessionUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/notifications/DisableNotificationsForCurrentSessionUseCaseTest.kt
new file mode 100644
index 0000000000..669b20fc1a
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/notifications/DisableNotificationsForCurrentSessionUseCaseTest.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import im.vector.app.core.pushers.UnregisterUnifiedPushUseCase
+import im.vector.app.test.fakes.FakePushersManager
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DisableNotificationsForCurrentSessionUseCaseTest {
+
+    private val fakePushersManager = FakePushersManager()
+    private val fakeToggleNotificationsForCurrentSessionUseCase = mockk<ToggleNotificationsForCurrentSessionUseCase>()
+    private val fakeUnregisterUnifiedPushUseCase = mockk<UnregisterUnifiedPushUseCase>()
+
+    private val disableNotificationsForCurrentSessionUseCase = DisableNotificationsForCurrentSessionUseCase(
+            pushersManager = fakePushersManager.instance,
+            toggleNotificationsForCurrentSessionUseCase = fakeToggleNotificationsForCurrentSessionUseCase,
+            unregisterUnifiedPushUseCase = fakeUnregisterUnifiedPushUseCase,
+    )
+
+    @Test
+    fun `when execute then disable notifications and unregister the pusher`() = runTest {
+        // Given
+        coJustRun { fakeToggleNotificationsForCurrentSessionUseCase.execute(any()) }
+        coJustRun { fakeUnregisterUnifiedPushUseCase.execute(any()) }
+
+        // When
+        disableNotificationsForCurrentSessionUseCase.execute()
+
+        // Then
+        coVerify {
+            fakeToggleNotificationsForCurrentSessionUseCase.execute(false)
+            fakeUnregisterUnifiedPushUseCase.execute(fakePushersManager.instance)
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/notifications/EnableNotificationsForCurrentSessionUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/notifications/EnableNotificationsForCurrentSessionUseCaseTest.kt
new file mode 100644
index 0000000000..d58ba7645c
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/notifications/EnableNotificationsForCurrentSessionUseCaseTest.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import im.vector.app.core.pushers.EnsureFcmTokenIsRetrievedUseCase
+import im.vector.app.core.pushers.RegisterUnifiedPushUseCase
+import im.vector.app.test.fakes.FakePushersManager
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.justRun
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.junit.Test
+
+class EnableNotificationsForCurrentSessionUseCaseTest {
+
+    private val fakePushersManager = FakePushersManager()
+    private val fakeToggleNotificationsForCurrentSessionUseCase = mockk<ToggleNotificationsForCurrentSessionUseCase>()
+    private val fakeRegisterUnifiedPushUseCase = mockk<RegisterUnifiedPushUseCase>()
+    private val fakeEnsureFcmTokenIsRetrievedUseCase = mockk<EnsureFcmTokenIsRetrievedUseCase>()
+
+    private val enableNotificationsForCurrentSessionUseCase = EnableNotificationsForCurrentSessionUseCase(
+            pushersManager = fakePushersManager.instance,
+            toggleNotificationsForCurrentSessionUseCase = fakeToggleNotificationsForCurrentSessionUseCase,
+            registerUnifiedPushUseCase = fakeRegisterUnifiedPushUseCase,
+            ensureFcmTokenIsRetrievedUseCase = fakeEnsureFcmTokenIsRetrievedUseCase,
+    )
+
+    @Test
+    fun `given no existing pusher and a registered distributor when execute then a new pusher is registered and result is success`() = runTest {
+        // Given
+        val aDistributor = "distributor"
+        fakePushersManager.givenGetPusherForCurrentSessionReturns(null)
+        every { fakeRegisterUnifiedPushUseCase.execute(any()) } returns RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success
+        justRun { fakeEnsureFcmTokenIsRetrievedUseCase.execute(any(), any()) }
+        coJustRun { fakeToggleNotificationsForCurrentSessionUseCase.execute(any()) }
+
+        // When
+        val result = enableNotificationsForCurrentSessionUseCase.execute(aDistributor)
+
+        // Then
+        result shouldBe EnableNotificationsForCurrentSessionUseCase.EnableNotificationsResult.Success
+        verify {
+            fakeRegisterUnifiedPushUseCase.execute(aDistributor)
+            fakeEnsureFcmTokenIsRetrievedUseCase.execute(fakePushersManager.instance, registerPusher = true)
+        }
+        coVerify {
+            fakeToggleNotificationsForCurrentSessionUseCase.execute(enabled = true)
+        }
+    }
+
+    @Test
+    fun `given no existing pusher and a no registered distributor when execute then result is need to ask user for distributor`() = runTest {
+        // Given
+        val aDistributor = "distributor"
+        fakePushersManager.givenGetPusherForCurrentSessionReturns(null)
+        every { fakeRegisterUnifiedPushUseCase.execute(any()) } returns RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.NeedToAskUserForDistributor
+
+        // When
+        val result = enableNotificationsForCurrentSessionUseCase.execute(aDistributor)
+
+        // Then
+        result shouldBe EnableNotificationsForCurrentSessionUseCase.EnableNotificationsResult.NeedToAskUserForDistributor
+        verify {
+            fakeRegisterUnifiedPushUseCase.execute(aDistributor)
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/notifications/ToggleNotificationsForCurrentSessionUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/notifications/ToggleNotificationsForCurrentSessionUseCaseTest.kt
new file mode 100644
index 0000000000..f49aafab8a
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/notifications/ToggleNotificationsForCurrentSessionUseCaseTest.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import im.vector.app.features.settings.devices.v2.notification.CheckIfCanToggleNotificationsViaPusherUseCase
+import im.vector.app.features.settings.devices.v2.notification.DeleteNotificationSettingsAccountDataUseCase
+import im.vector.app.features.settings.devices.v2.notification.SetNotificationSettingsAccountDataUseCase
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeUnifiedPushHelper
+import im.vector.app.test.fixtures.PusherFixture
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.android.sdk.api.account.LocalNotificationSettingsContent
+
+class ToggleNotificationsForCurrentSessionUseCaseTest {
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val fakeUnifiedPushHelper = FakeUnifiedPushHelper()
+    private val fakeCheckIfCanToggleNotificationsViaPusherUseCase = mockk<CheckIfCanToggleNotificationsViaPusherUseCase>()
+    private val fakeSetNotificationSettingsAccountDataUseCase = mockk<SetNotificationSettingsAccountDataUseCase>()
+    private val fakeDeleteNotificationSettingsAccountDataUseCase = mockk<DeleteNotificationSettingsAccountDataUseCase>()
+
+    private val toggleNotificationsForCurrentSessionUseCase = ToggleNotificationsForCurrentSessionUseCase(
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+            unifiedPushHelper = fakeUnifiedPushHelper.instance,
+            checkIfCanToggleNotificationsViaPusherUseCase = fakeCheckIfCanToggleNotificationsViaPusherUseCase,
+            setNotificationSettingsAccountDataUseCase = fakeSetNotificationSettingsAccountDataUseCase,
+            deleteNotificationSettingsAccountDataUseCase = fakeDeleteNotificationSettingsAccountDataUseCase,
+    )
+
+    @Test
+    fun `given background sync is enabled when execute then set the related account data with correct value`() = runTest {
+        // Given
+        val enabled = true
+        val aDeviceId = "deviceId"
+        fakeUnifiedPushHelper.givenIsBackgroundSyncReturns(true)
+        fakeActiveSessionHolder.fakeSession.givenSessionId(aDeviceId)
+        coJustRun { fakeSetNotificationSettingsAccountDataUseCase.execute(any(), any(), any()) }
+        val expectedNotificationContent = LocalNotificationSettingsContent(isSilenced = !enabled)
+
+        // When
+        toggleNotificationsForCurrentSessionUseCase.execute(enabled)
+
+        // Then
+        coVerify {
+            fakeSetNotificationSettingsAccountDataUseCase.execute(
+                    fakeActiveSessionHolder.fakeSession,
+                    aDeviceId,
+                    expectedNotificationContent
+            )
+        }
+    }
+
+    @Test
+    fun `given background sync is not enabled and toggle pusher is possible when execute then delete any related account data and toggle pusher`() = runTest {
+        // Given
+        val enabled = true
+        val aDeviceId = "deviceId"
+        fakeUnifiedPushHelper.givenIsBackgroundSyncReturns(false)
+        fakeActiveSessionHolder.fakeSession.givenSessionId(aDeviceId)
+        coJustRun { fakeDeleteNotificationSettingsAccountDataUseCase.execute(any()) }
+        every { fakeCheckIfCanToggleNotificationsViaPusherUseCase.execute(any()) } returns true
+        val aPusher = PusherFixture.aPusher(deviceId = aDeviceId)
+        fakeActiveSessionHolder.fakeSession.fakePushersService.givenGetPushers(listOf(aPusher))
+
+        // When
+        toggleNotificationsForCurrentSessionUseCase.execute(enabled)
+
+        // Then
+        coVerify {
+            fakeDeleteNotificationSettingsAccountDataUseCase.execute(fakeActiveSessionHolder.fakeSession)
+            fakeCheckIfCanToggleNotificationsViaPusherUseCase.execute(fakeActiveSessionHolder.fakeSession)
+        }
+        fakeActiveSessionHolder.fakeSession.fakePushersService.verifyTogglePusherCalled(aPusher, enabled)
+    }
+
+    @Test
+    fun `given background sync is not enabled and toggle pusher is not possible when execute then only delete any related account data`() = runTest {
+        // Given
+        val enabled = true
+        val aDeviceId = "deviceId"
+        fakeUnifiedPushHelper.givenIsBackgroundSyncReturns(false)
+        fakeActiveSessionHolder.fakeSession.givenSessionId(aDeviceId)
+        coJustRun { fakeDeleteNotificationSettingsAccountDataUseCase.execute(any()) }
+        every { fakeCheckIfCanToggleNotificationsViaPusherUseCase.execute(any()) } returns false
+
+        // When
+        toggleNotificationsForCurrentSessionUseCase.execute(enabled)
+
+        // Then
+        coVerify {
+            fakeDeleteNotificationSettingsAccountDataUseCase.execute(fakeActiveSessionHolder.fakeSession)
+            fakeCheckIfCanToggleNotificationsViaPusherUseCase.execute(fakeActiveSessionHolder.fakeSession)
+        }
+        coVerify(inverse = true) {
+            fakeActiveSessionHolder.fakeSession.fakePushersService.togglePusher(any(), any())
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewModelTest.kt
new file mode 100644
index 0000000000..ae36ee7600
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceViewModelTest.kt
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.settings.notifications
+
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.core.platform.VectorDummyViewState
+import im.vector.app.core.pushers.EnsureFcmTokenIsRetrievedUseCase
+import im.vector.app.core.pushers.RegisterUnifiedPushUseCase
+import im.vector.app.core.pushers.UnregisterUnifiedPushUseCase
+import im.vector.app.features.settings.VectorPreferences.Companion.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY
+import im.vector.app.test.fakes.FakePushersManager
+import im.vector.app.test.fakes.FakeVectorPreferences
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.coEvery
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.coVerifyOrder
+import io.mockk.justRun
+import io.mockk.mockk
+import org.junit.Rule
+import org.junit.Test
+
+class VectorSettingsNotificationPreferenceViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
+
+    private val fakePushersManager = FakePushersManager()
+    private val fakeVectorPreferences = FakeVectorPreferences()
+    private val fakeEnableNotificationsForCurrentSessionUseCase = mockk<EnableNotificationsForCurrentSessionUseCase>()
+    private val fakeDisableNotificationsForCurrentSessionUseCase = mockk<DisableNotificationsForCurrentSessionUseCase>()
+    private val fakeUnregisterUnifiedPushUseCase = mockk<UnregisterUnifiedPushUseCase>()
+    private val fakeRegisterUnifiedPushUseCase = mockk<RegisterUnifiedPushUseCase>()
+    private val fakeEnsureFcmTokenIsRetrievedUseCase = mockk<EnsureFcmTokenIsRetrievedUseCase>()
+    private val fakeToggleNotificationsForCurrentSessionUseCase = mockk<ToggleNotificationsForCurrentSessionUseCase>()
+
+    private fun createViewModel() = VectorSettingsNotificationPreferenceViewModel(
+            initialState = VectorDummyViewState(),
+            pushersManager = fakePushersManager.instance,
+            vectorPreferences = fakeVectorPreferences.instance,
+            enableNotificationsForCurrentSessionUseCase = fakeEnableNotificationsForCurrentSessionUseCase,
+            disableNotificationsForCurrentSessionUseCase = fakeDisableNotificationsForCurrentSessionUseCase,
+            unregisterUnifiedPushUseCase = fakeUnregisterUnifiedPushUseCase,
+            registerUnifiedPushUseCase = fakeRegisterUnifiedPushUseCase,
+            ensureFcmTokenIsRetrievedUseCase = fakeEnsureFcmTokenIsRetrievedUseCase,
+            toggleNotificationsForCurrentSessionUseCase = fakeToggleNotificationsForCurrentSessionUseCase,
+    )
+
+    @Test
+    fun `given view model init when notifications are enabled in preferences then view event is posted`() {
+        // Given
+        fakeVectorPreferences.givenAreNotificationsEnabledForDevice(true)
+        val expectedEvent = VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceEnabled
+        val viewModel = createViewModel()
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.notificationsPreferenceListener.onSharedPreferenceChanged(mockk(), SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
+
+        // Then
+        viewModelTest
+                .assertEvent { event -> event == expectedEvent }
+                .finish()
+    }
+
+    @Test
+    fun `given view model init when notifications are disabled in preferences then view event is posted`() {
+        // Given
+        fakeVectorPreferences.givenAreNotificationsEnabledForDevice(false)
+        val expectedEvent = VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceDisabled
+        val viewModel = createViewModel()
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.notificationsPreferenceListener.onSharedPreferenceChanged(mockk(), SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
+
+        // Then
+        viewModelTest
+                .assertEvent { event -> event == expectedEvent }
+                .finish()
+    }
+
+    @Test
+    fun `given DisableNotificationsForDevice action when handling action then disable use case is called`() {
+        // Given
+        val viewModel = createViewModel()
+        val action = VectorSettingsNotificationPreferenceViewAction.DisableNotificationsForDevice
+        coJustRun { fakeDisableNotificationsForCurrentSessionUseCase.execute() }
+        val expectedEvent = VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceDisabled
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest
+                .assertEvent { event -> event == expectedEvent }
+                .finish()
+        coVerify {
+            fakeDisableNotificationsForCurrentSessionUseCase.execute()
+        }
+    }
+
+    @Test
+    fun `given EnableNotificationsForDevice action and enable success when handling action then enable use case is called`() {
+        // Given
+        val viewModel = createViewModel()
+        val aDistributor = "aDistributor"
+        val action = VectorSettingsNotificationPreferenceViewAction.EnableNotificationsForDevice(aDistributor)
+        coEvery { fakeEnableNotificationsForCurrentSessionUseCase.execute(any()) } returns
+                EnableNotificationsForCurrentSessionUseCase.EnableNotificationsResult.Success
+        val expectedEvent = VectorSettingsNotificationPreferenceViewEvent.NotificationsForDeviceEnabled
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest
+                .assertEvent { event -> event == expectedEvent }
+                .finish()
+        coVerify {
+            fakeEnableNotificationsForCurrentSessionUseCase.execute(aDistributor)
+        }
+    }
+
+    @Test
+    fun `given EnableNotificationsForDevice action and enable needs user choice when handling action then enable use case is called`() {
+        // Given
+        val viewModel = createViewModel()
+        val aDistributor = "aDistributor"
+        val action = VectorSettingsNotificationPreferenceViewAction.EnableNotificationsForDevice(aDistributor)
+        coEvery { fakeEnableNotificationsForCurrentSessionUseCase.execute(any()) } returns
+                EnableNotificationsForCurrentSessionUseCase.EnableNotificationsResult.NeedToAskUserForDistributor
+        val expectedEvent = VectorSettingsNotificationPreferenceViewEvent.AskUserForPushDistributor
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest
+                .assertEvent { event -> event == expectedEvent }
+                .finish()
+        coVerify {
+            fakeEnableNotificationsForCurrentSessionUseCase.execute(aDistributor)
+        }
+    }
+
+    @Test
+    fun `given RegisterPushDistributor action and register success when handling action then register use case is called`() {
+        // Given
+        val viewModel = createViewModel()
+        val aDistributor = "aDistributor"
+        val action = VectorSettingsNotificationPreferenceViewAction.RegisterPushDistributor(aDistributor)
+        coEvery { fakeRegisterUnifiedPushUseCase.execute(any()) } returns RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.Success
+        coJustRun { fakeUnregisterUnifiedPushUseCase.execute(any()) }
+        val areNotificationsEnabled = true
+        fakeVectorPreferences.givenAreNotificationsEnabledForDevice(areNotificationsEnabled)
+        coJustRun { fakeToggleNotificationsForCurrentSessionUseCase.execute(any()) }
+        justRun { fakeEnsureFcmTokenIsRetrievedUseCase.execute(any(), any()) }
+        val expectedEvent = VectorSettingsNotificationPreferenceViewEvent.NotificationMethodChanged
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest
+                .assertEvent { event -> event == expectedEvent }
+                .finish()
+        coVerifyOrder {
+            fakeUnregisterUnifiedPushUseCase.execute(fakePushersManager.instance)
+            fakeRegisterUnifiedPushUseCase.execute(aDistributor)
+            fakeEnsureFcmTokenIsRetrievedUseCase.execute(fakePushersManager.instance, registerPusher = areNotificationsEnabled)
+            fakeToggleNotificationsForCurrentSessionUseCase.execute(enabled = areNotificationsEnabled)
+        }
+    }
+
+    @Test
+    fun `given RegisterPushDistributor action and register needs user choice when handling action then register use case is called`() {
+        // Given
+        val viewModel = createViewModel()
+        val aDistributor = "aDistributor"
+        val action = VectorSettingsNotificationPreferenceViewAction.RegisterPushDistributor(aDistributor)
+        coEvery { fakeRegisterUnifiedPushUseCase.execute(any()) } returns RegisterUnifiedPushUseCase.RegisterUnifiedPushResult.NeedToAskUserForDistributor
+        coJustRun { fakeUnregisterUnifiedPushUseCase.execute(any()) }
+        val expectedEvent = VectorSettingsNotificationPreferenceViewEvent.AskUserForPushDistributor
+
+        // When
+        val viewModelTest = viewModel.test()
+        viewModel.handle(action)
+
+        // Then
+        viewModelTest
+                .assertEvent { event -> event == expectedEvent }
+                .finish()
+        coVerifyOrder {
+            fakeUnregisterUnifiedPushUseCase.execute(fakePushersManager.instance)
+            fakeRegisterUnifiedPushUseCase.execute(aDistributor)
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastEventTest.kt b/vector/src/test/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastEventTest.kt
new file mode 100644
index 0000000000..ca2e8320c9
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/voicebroadcast/model/VoiceBroadcastEventTest.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.model
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeNull
+import org.amshove.kluent.shouldNotBeNull
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.message.AudioInfo
+import org.matrix.android.sdk.api.session.room.model.message.AudioWaveformInfo
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.room.model.relation.ReplyToContent
+
+private const val AN_EVENT_ID = "event_id"
+private const val A_REFERENCED_EVENT_ID = "event_id_ref"
+private const val A_CHUNK_LENGTH = 30
+
+class VoiceBroadcastEventTest {
+
+    @Test
+    fun `given a started Voice Broadcast Event, when mapping to VoiceBroadcastEvent, then return expected object`() {
+        // Given
+        val content = MessageVoiceBroadcastInfoContent(
+                voiceBroadcastStateStr = VoiceBroadcastState.STARTED.value,
+                chunkLength = A_CHUNK_LENGTH,
+                relatesTo = RelationDefaultContent(RelationType.REFERENCE, A_REFERENCED_EVENT_ID),
+        )
+        val event = Event(
+                eventId = AN_EVENT_ID,
+                type = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                content = content.toContent(),
+        )
+        val expectedReference = RelationDefaultContent(RelationType.REFERENCE, event.eventId)
+
+        // When
+        val result = event.asVoiceBroadcastEvent()
+
+        // Then
+        result.shouldNotBeNull()
+        result.content shouldBeEqualTo content
+        result.reference shouldBeEqualTo expectedReference
+    }
+
+    @Test
+    fun `given a not started Voice Broadcast Event, when mapping to VoiceBroadcastEvent, then return expected object`() {
+        // Given
+        val content = MessageVoiceBroadcastInfoContent(
+                voiceBroadcastStateStr = VoiceBroadcastState.PAUSED.value,
+                chunkLength = A_CHUNK_LENGTH,
+                relatesTo = RelationDefaultContent(RelationType.REFERENCE, A_REFERENCED_EVENT_ID),
+        )
+        val event = Event(
+                type = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                content = content.toContent(),
+        )
+        val expectedReference = content.relatesTo
+
+        // When
+        val result = event.asVoiceBroadcastEvent()
+
+        // Then
+        result.shouldNotBeNull()
+        result.content shouldBeEqualTo content
+        result.reference shouldBeEqualTo expectedReference
+    }
+
+    @Test
+    fun `given a non Voice Broadcast Event, when mapping to VoiceBroadcastEvent, then return null`() {
+        // Given
+        val content = MessageAudioContent(
+                msgType = MessageType.MSGTYPE_AUDIO,
+                body = "audio",
+                audioInfo = AudioInfo(
+                        duration = 300,
+                        mimeType = "",
+                        size = 500L
+                ),
+                url = "a_url",
+                audioWaveformInfo = AudioWaveformInfo(
+                        duration = 300,
+                        waveform = null
+                ),
+                voiceMessageIndicator = emptyMap(),
+                relatesTo = RelationDefaultContent(
+                        type = RelationType.THREAD,
+                        eventId = AN_EVENT_ID,
+                        isFallingBack = true,
+                        inReplyTo = ReplyToContent(eventId = A_REFERENCED_EVENT_ID)
+                )
+        )
+        val event = Event(
+                type = EventType.MESSAGE,
+                content = content.toContent(),
+        )
+
+        // When
+        val result = event.asVoiceBroadcastEvent()
+
+        // Then
+        result.shouldBeNull()
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/PauseVoiceBroadcastUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/PauseVoiceBroadcastUseCaseTest.kt
new file mode 100644
index 0000000000..a1ec91aab8
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/PauseVoiceBroadcastUseCaseTest.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.usecase
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import im.vector.app.features.voicebroadcast.recording.usecase.PauseVoiceBroadcastUseCase
+import im.vector.app.test.fakes.FakeRoom
+import im.vector.app.test.fakes.FakeRoomService
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.clearAllMocks
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import io.mockk.slot
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+
+private const val A_ROOM_ID = "room_id"
+private const val AN_EVENT_ID = "event_id"
+private const val A_STARTED_VOICE_BROADCAST_EVENT_ID = "a_started_voice_broadcast_event_id"
+
+class PauseVoiceBroadcastUseCaseTest {
+
+    private val fakeRoom = FakeRoom()
+    private val fakeSession = FakeSession(fakeRoomService = FakeRoomService(fakeRoom))
+    private val fakeVoiceBroadcastRecorder = mockk<VoiceBroadcastRecorder>(relaxed = true)
+    private val pauseVoiceBroadcastUseCase = PauseVoiceBroadcastUseCase(fakeSession, fakeVoiceBroadcastRecorder)
+
+    @Test
+    fun `given a room id with a potential existing voice broadcast state when calling execute then the voice broadcast is paused or not`() = runTest {
+        val cases = listOf<VoiceBroadcastState?>(null).plus(VoiceBroadcastState.values()).map {
+            when (it) {
+                VoiceBroadcastState.STARTED,
+                VoiceBroadcastState.RESUMED -> Case(it, true)
+                VoiceBroadcastState.STOPPED,
+                VoiceBroadcastState.PAUSED,
+                null -> Case(it, false)
+            }
+        }
+
+        cases.forEach { case ->
+            if (case.canPauseVoiceBroadcast) {
+                testVoiceBroadcastPaused(case.previousState)
+            } else {
+                testVoiceBroadcastNotPaused(case.previousState)
+            }
+        }
+    }
+
+    private suspend fun testVoiceBroadcastPaused(previousState: VoiceBroadcastState?) {
+        // Given
+        clearAllMocks()
+        givenAVoiceBroadcastState(previousState)
+        val voiceBroadcastInfoContentInterceptor = slot<Content>()
+        coEvery { fakeRoom.stateService().sendStateEvent(any(), any(), capture(voiceBroadcastInfoContentInterceptor)) } coAnswers { AN_EVENT_ID }
+
+        // When
+        pauseVoiceBroadcastUseCase.execute(A_ROOM_ID)
+
+        // Then
+        coVerify {
+            fakeRoom.stateService().sendStateEvent(
+                    eventType = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                    stateKey = fakeSession.myUserId,
+                    body = any(),
+            )
+        }
+        val voiceBroadcastInfoContent = voiceBroadcastInfoContentInterceptor.captured.toModel<MessageVoiceBroadcastInfoContent>()
+        voiceBroadcastInfoContent?.voiceBroadcastState shouldBe VoiceBroadcastState.PAUSED
+        voiceBroadcastInfoContent?.relatesTo?.type shouldBe RelationType.REFERENCE
+        voiceBroadcastInfoContent?.relatesTo?.eventId shouldBe A_STARTED_VOICE_BROADCAST_EVENT_ID
+    }
+
+    private suspend fun testVoiceBroadcastNotPaused(previousState: VoiceBroadcastState?) {
+        // Given
+        clearAllMocks()
+        givenAVoiceBroadcastState(previousState)
+
+        // When
+        pauseVoiceBroadcastUseCase.execute(A_ROOM_ID)
+
+        // Then
+        coVerify(exactly = 0) { fakeRoom.stateService().sendStateEvent(any(), any(), any()) }
+    }
+
+    private fun givenAVoiceBroadcastState(state: VoiceBroadcastState?) {
+        val relatesTo = when (state) {
+            VoiceBroadcastState.STARTED,
+            null -> null
+            VoiceBroadcastState.PAUSED,
+            VoiceBroadcastState.RESUMED,
+            VoiceBroadcastState.STOPPED -> RelationDefaultContent(RelationType.REFERENCE, A_STARTED_VOICE_BROADCAST_EVENT_ID)
+        }
+        val event = state?.let {
+            Event(
+                    eventId = if (state == VoiceBroadcastState.STARTED) A_STARTED_VOICE_BROADCAST_EVENT_ID else AN_EVENT_ID,
+                    type = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                    stateKey = fakeSession.myUserId,
+                    content = MessageVoiceBroadcastInfoContent(
+                            voiceBroadcastStateStr = state.value,
+                            relatesTo = relatesTo
+                    ).toContent()
+            )
+        }
+        fakeRoom.stateService().givenGetStateEvent(event)
+    }
+
+    private data class Case(val previousState: VoiceBroadcastState?, val canPauseVoiceBroadcast: Boolean)
+}
diff --git a/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/ResumeVoiceBroadcastUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/ResumeVoiceBroadcastUseCaseTest.kt
new file mode 100644
index 0000000000..7fe74052a9
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/ResumeVoiceBroadcastUseCaseTest.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.usecase
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.recording.usecase.ResumeVoiceBroadcastUseCase
+import im.vector.app.test.fakes.FakeRoom
+import im.vector.app.test.fakes.FakeRoomService
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.clearAllMocks
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.slot
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+
+private const val A_ROOM_ID = "room_id"
+private const val AN_EVENT_ID = "event_id"
+private const val A_STARTED_VOICE_BROADCAST_EVENT_ID = "a_started_voice_broadcast_event_id"
+
+class ResumeVoiceBroadcastUseCaseTest {
+
+    private val fakeRoom = FakeRoom()
+    private val fakeSession = FakeSession(fakeRoomService = FakeRoomService(fakeRoom))
+    private val resumeVoiceBroadcastUseCase = ResumeVoiceBroadcastUseCase(fakeSession)
+
+    @Test
+    fun `given a room id with a potential existing voice broadcast state when calling execute then the voice broadcast is resumed or not`() = runTest {
+        val cases = listOf<VoiceBroadcastState?>(null).plus(VoiceBroadcastState.values()).map {
+            when (it) {
+                VoiceBroadcastState.PAUSED -> Case(it, true)
+                VoiceBroadcastState.STARTED,
+                VoiceBroadcastState.RESUMED,
+                VoiceBroadcastState.STOPPED,
+                null -> Case(it, false)
+            }
+        }
+
+        cases.forEach { case ->
+            if (case.canResumeVoiceBroadcast) {
+                testVoiceBroadcastResumed(case.previousState)
+            } else {
+                testVoiceBroadcastNotResumed(case.previousState)
+            }
+        }
+    }
+
+    private suspend fun testVoiceBroadcastResumed(previousState: VoiceBroadcastState?) {
+        // Given
+        clearAllMocks()
+        givenAVoiceBroadcastState(previousState)
+        val voiceBroadcastInfoContentInterceptor = slot<Content>()
+        coEvery { fakeRoom.stateService().sendStateEvent(any(), any(), capture(voiceBroadcastInfoContentInterceptor)) } coAnswers { AN_EVENT_ID }
+
+        // When
+        resumeVoiceBroadcastUseCase.execute(A_ROOM_ID)
+
+        // Then
+        coVerify {
+            fakeRoom.stateService().sendStateEvent(
+                    eventType = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                    stateKey = fakeSession.myUserId,
+                    body = any(),
+            )
+        }
+        val voiceBroadcastInfoContent = voiceBroadcastInfoContentInterceptor.captured.toModel<MessageVoiceBroadcastInfoContent>()
+        voiceBroadcastInfoContent?.voiceBroadcastState shouldBe VoiceBroadcastState.RESUMED
+        voiceBroadcastInfoContent?.relatesTo?.type shouldBe RelationType.REFERENCE
+        voiceBroadcastInfoContent?.relatesTo?.eventId shouldBe A_STARTED_VOICE_BROADCAST_EVENT_ID
+    }
+
+    private suspend fun testVoiceBroadcastNotResumed(previousState: VoiceBroadcastState?) {
+        // Given
+        clearAllMocks()
+        givenAVoiceBroadcastState(previousState)
+
+        // When
+        resumeVoiceBroadcastUseCase.execute(A_ROOM_ID)
+
+        // Then
+        coVerify(exactly = 0) { fakeRoom.stateService().sendStateEvent(any(), any(), any()) }
+    }
+
+    private fun givenAVoiceBroadcastState(state: VoiceBroadcastState?) {
+        val relatesTo = when (state) {
+            VoiceBroadcastState.STARTED,
+            null -> null
+            VoiceBroadcastState.PAUSED,
+            VoiceBroadcastState.RESUMED,
+            VoiceBroadcastState.STOPPED -> RelationDefaultContent(RelationType.REFERENCE, A_STARTED_VOICE_BROADCAST_EVENT_ID)
+        }
+        val event = state?.let {
+            Event(
+                    eventId = if (state == VoiceBroadcastState.STARTED) A_STARTED_VOICE_BROADCAST_EVENT_ID else AN_EVENT_ID,
+                    type = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                    stateKey = fakeSession.myUserId,
+                    content = MessageVoiceBroadcastInfoContent(
+                            voiceBroadcastStateStr = state.value,
+                            relatesTo = relatesTo
+                    ).toContent()
+            )
+        }
+        fakeRoom.stateService().givenGetStateEvent(event)
+    }
+
+    private data class Case(val previousState: VoiceBroadcastState?, val canResumeVoiceBroadcast: Boolean)
+}
diff --git a/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCaseTest.kt
new file mode 100644
index 0000000000..5dfdd379e0
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCaseTest.kt
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.usecase
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import im.vector.app.features.voicebroadcast.recording.usecase.StartVoiceBroadcastUseCase
+import im.vector.app.test.fakes.FakeContext
+import im.vector.app.test.fakes.FakeRoom
+import im.vector.app.test.fakes.FakeRoomService
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.justRun
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.spyk
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeNull
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+
+private const val A_ROOM_ID = "room_id"
+private const val AN_EVENT_ID = "event_id"
+private const val A_USER_ID = "user_id"
+
+class StartVoiceBroadcastUseCaseTest {
+
+    private val fakeRoom = FakeRoom()
+    private val fakeSession = FakeSession(fakeRoomService = FakeRoomService(fakeRoom))
+    private val fakeVoiceBroadcastRecorder = mockk<VoiceBroadcastRecorder>(relaxed = true)
+    private val fakeGetRoomLiveVoiceBroadcastsUseCase = mockk<GetRoomLiveVoiceBroadcastsUseCase>()
+    private val startVoiceBroadcastUseCase = spyk(
+            StartVoiceBroadcastUseCase(
+                    session = fakeSession,
+                    voiceBroadcastRecorder = fakeVoiceBroadcastRecorder,
+                    context = FakeContext().instance,
+                    buildMeta = mockk(),
+                    getRoomLiveVoiceBroadcastsUseCase = fakeGetRoomLiveVoiceBroadcastsUseCase,
+                    stopVoiceBroadcastUseCase = mockk()
+            )
+    )
+
+    @Before
+    fun setup() {
+        every { fakeRoom.roomId } returns A_ROOM_ID
+        justRun { startVoiceBroadcastUseCase.assertHasEnoughPowerLevels(fakeRoom) }
+        every { fakeVoiceBroadcastRecorder.recordingState } returns VoiceBroadcastRecorder.State.Idle
+    }
+
+    @Test
+    fun `given a room id with potential several existing voice broadcast states when calling execute then the voice broadcast is started or not`() = runTest {
+        val cases = VoiceBroadcastState.values()
+                .flatMap { first ->
+                    VoiceBroadcastState.values().map { second ->
+                        Case(
+                                voiceBroadcasts = listOf(VoiceBroadcast(fakeSession.myUserId, first), VoiceBroadcast(A_USER_ID, second)),
+                                canStartVoiceBroadcast = first == VoiceBroadcastState.STOPPED && second == VoiceBroadcastState.STOPPED
+                        )
+                    }
+                }
+                .plus(Case(emptyList(), true))
+
+        cases.forEach { case ->
+            if (case.canStartVoiceBroadcast) {
+                testVoiceBroadcastStarted(case.voiceBroadcasts)
+            } else {
+                testVoiceBroadcastNotStarted(case.voiceBroadcasts)
+            }
+        }
+    }
+
+    private suspend fun testVoiceBroadcastStarted(voiceBroadcasts: List<VoiceBroadcast>) {
+        // Given
+        setup()
+        givenVoiceBroadcasts(voiceBroadcasts)
+        val voiceBroadcastInfoContentInterceptor = slot<Content>()
+        coEvery { fakeRoom.stateService().sendStateEvent(any(), any(), capture(voiceBroadcastInfoContentInterceptor)) } coAnswers { AN_EVENT_ID }
+
+        // When
+        startVoiceBroadcastUseCase.execute(A_ROOM_ID)
+
+        // Then
+        coVerify {
+            fakeRoom.stateService().sendStateEvent(
+                    eventType = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                    stateKey = fakeSession.myUserId,
+                    body = any(),
+            )
+        }
+        val voiceBroadcastInfoContent = voiceBroadcastInfoContentInterceptor.captured.toModel<MessageVoiceBroadcastInfoContent>()
+        voiceBroadcastInfoContent?.voiceBroadcastState shouldBe VoiceBroadcastState.STARTED
+        voiceBroadcastInfoContent?.relatesTo.shouldBeNull()
+    }
+
+    private suspend fun testVoiceBroadcastNotStarted(voiceBroadcasts: List<VoiceBroadcast>) {
+        // Given
+        setup()
+        givenVoiceBroadcasts(voiceBroadcasts)
+
+        // When
+        startVoiceBroadcastUseCase.execute(A_ROOM_ID)
+
+        // Then
+        coVerify(exactly = 0) { fakeRoom.stateService().sendStateEvent(any(), any(), any()) }
+    }
+
+    private fun givenVoiceBroadcasts(voiceBroadcasts: List<VoiceBroadcast>) {
+        val events = voiceBroadcasts.map {
+            Event(
+                    type = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                    stateKey = it.userId,
+                    content = MessageVoiceBroadcastInfoContent(
+                            voiceBroadcastStateStr = it.state.value
+                    ).toContent()
+            )
+        }
+                .mapNotNull { it.asVoiceBroadcastEvent() }
+                .filter { it.content?.voiceBroadcastState != VoiceBroadcastState.STOPPED }
+        every { fakeGetRoomLiveVoiceBroadcastsUseCase.execute(any()) } returns events
+    }
+
+    private data class VoiceBroadcast(val userId: String, val state: VoiceBroadcastState)
+    private data class Case(val voiceBroadcasts: List<VoiceBroadcast>, val canStartVoiceBroadcast: Boolean)
+}
diff --git a/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCaseTest.kt
new file mode 100644
index 0000000000..4b15f50be9
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCaseTest.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.features.voicebroadcast.usecase
+
+import im.vector.app.features.voicebroadcast.VoiceBroadcastConstants
+import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.recording.VoiceBroadcastRecorder
+import im.vector.app.features.voicebroadcast.recording.usecase.StopVoiceBroadcastUseCase
+import im.vector.app.test.fakes.FakeRoom
+import im.vector.app.test.fakes.FakeRoomService
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.clearAllMocks
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import io.mockk.slot
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+
+private const val A_ROOM_ID = "room_id"
+private const val AN_EVENT_ID = "event_id"
+private const val A_STARTED_VOICE_BROADCAST_EVENT_ID = "a_started_voice_broadcast_event_id"
+
+class StopVoiceBroadcastUseCaseTest {
+
+    private val fakeRoom = FakeRoom()
+    private val fakeSession = FakeSession(fakeRoomService = FakeRoomService(fakeRoom))
+    private val fakeVoiceBroadcastRecorder = mockk<VoiceBroadcastRecorder>(relaxed = true)
+    private val stopVoiceBroadcastUseCase = StopVoiceBroadcastUseCase(fakeSession, fakeVoiceBroadcastRecorder)
+
+    @Test
+    fun `given a room id with a potential existing voice broadcast state when calling execute then the voice broadcast is stopped or not`() = runTest {
+        val cases = listOf<VoiceBroadcastState?>(null).plus(VoiceBroadcastState.values()).map {
+            when (it) {
+                VoiceBroadcastState.STARTED,
+                VoiceBroadcastState.RESUMED,
+                VoiceBroadcastState.PAUSED -> Case(it, true)
+                VoiceBroadcastState.STOPPED,
+                null -> Case(it, false)
+            }
+        }
+
+        cases.forEach { case ->
+            if (case.canStopVoiceBroadcast) {
+                testVoiceBroadcastStopped(case.previousState)
+            } else {
+                testVoiceBroadcastNotStopped(case.previousState)
+            }
+        }
+    }
+
+    private suspend fun testVoiceBroadcastStopped(previousState: VoiceBroadcastState?) {
+        // Given
+        clearAllMocks()
+        givenAVoiceBroadcastState(previousState)
+        val voiceBroadcastInfoContentInterceptor = slot<Content>()
+        coEvery { fakeRoom.stateService().sendStateEvent(any(), any(), capture(voiceBroadcastInfoContentInterceptor)) } coAnswers { AN_EVENT_ID }
+
+        // When
+        stopVoiceBroadcastUseCase.execute(A_ROOM_ID)
+
+        // Then
+        coVerify {
+            fakeRoom.stateService().sendStateEvent(
+                    eventType = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                    stateKey = fakeSession.myUserId,
+                    body = any(),
+            )
+        }
+        val voiceBroadcastInfoContent = voiceBroadcastInfoContentInterceptor.captured.toModel<MessageVoiceBroadcastInfoContent>()
+        voiceBroadcastInfoContent?.voiceBroadcastState shouldBe VoiceBroadcastState.STOPPED
+        voiceBroadcastInfoContent?.relatesTo?.type shouldBe RelationType.REFERENCE
+        voiceBroadcastInfoContent?.relatesTo?.eventId shouldBe A_STARTED_VOICE_BROADCAST_EVENT_ID
+    }
+
+    private suspend fun testVoiceBroadcastNotStopped(previousState: VoiceBroadcastState?) {
+        // Given
+        clearAllMocks()
+        givenAVoiceBroadcastState(previousState)
+
+        // When
+        stopVoiceBroadcastUseCase.execute(A_ROOM_ID)
+
+        // Then
+        coVerify(exactly = 0) { fakeRoom.stateService().sendStateEvent(any(), any(), any()) }
+    }
+
+    private fun givenAVoiceBroadcastState(state: VoiceBroadcastState?) {
+        val relatesTo = when (state) {
+            VoiceBroadcastState.STARTED,
+            null -> null
+            VoiceBroadcastState.PAUSED,
+            VoiceBroadcastState.RESUMED,
+            VoiceBroadcastState.STOPPED -> RelationDefaultContent(RelationType.REFERENCE, A_STARTED_VOICE_BROADCAST_EVENT_ID)
+        }
+        val event = state?.let {
+            Event(
+                    eventId = if (state == VoiceBroadcastState.STARTED) A_STARTED_VOICE_BROADCAST_EVENT_ID else AN_EVENT_ID,
+                    type = VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO,
+                    stateKey = fakeSession.myUserId,
+                    content = MessageVoiceBroadcastInfoContent(
+                            voiceBroadcastStateStr = state.value,
+                            relatesTo = relatesTo
+                    ).toContent()
+            )
+        }
+        fakeRoom.stateService().givenGetStateEvent(event)
+    }
+
+    private data class Case(val previousState: VoiceBroadcastState?, val canStopVoiceBroadcast: Boolean)
+}
diff --git a/vector/src/test/java/im/vector/app/screenshot/PaparazziExampleScreenshotTest.kt b/vector/src/test/java/im/vector/app/screenshot/PaparazziExampleScreenshotTest.kt
new file mode 100644
index 0000000000..58658651cf
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/screenshot/PaparazziExampleScreenshotTest.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.screenshot
+
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import im.vector.app.R
+import org.junit.Rule
+import org.junit.Test
+
+class PaparazziExampleScreenshotTest {
+
+    @get:Rule
+    val paparazzi = createPaparazziRule()
+
+    @Test
+    fun `example paparazzi test`() {
+        val view = paparazzi.inflate<ConstraintLayout>(R.layout.item_radio)
+
+        view.findViewById<TextView>(R.id.actionTitle).text = paparazzi.resources.getString(R.string.room_settings_all_messages)
+        view.findViewById<ImageView>(R.id.radioIcon).setImageResource(R.drawable.ic_radio_on)
+
+        paparazzi.snapshot(view)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/screenshot/PaparazziRule.kt b/vector/src/test/java/im/vector/app/screenshot/PaparazziRule.kt
new file mode 100644
index 0000000000..a5cba20561
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/screenshot/PaparazziRule.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.screenshot
+
+import android.os.Build
+import app.cash.paparazzi.DeviceConfig.Companion.PIXEL_3
+import app.cash.paparazzi.Paparazzi
+import app.cash.paparazzi.androidHome
+import app.cash.paparazzi.detectEnvironment
+
+fun createPaparazziRule() = Paparazzi(
+        // Apply trick from https://github.com/cashapp/paparazzi/issues/489#issuecomment-1195674603
+        environment = detectEnvironment().copy(
+                platformDir = "${androidHome()}/platforms/android-32",
+                compileSdkVersion = Build.VERSION_CODES.S_V2 /* 32 */
+        ),
+        deviceConfig = PIXEL_3,
+        theme = "Theme.Vector.Light",
+        maxPercentDifference = 0.0,
+)
diff --git a/vector/src/test/java/im/vector/app/screenshot/RoomItemScreenshotTest.kt b/vector/src/test/java/im/vector/app/screenshot/RoomItemScreenshotTest.kt
new file mode 100644
index 0000000000..d1f4034f43
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/screenshot/RoomItemScreenshotTest.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.screenshot
+
+import android.view.View
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import im.vector.app.R
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import org.junit.Rule
+import org.junit.Test
+
+class RoomItemScreenshotTest {
+
+    @get:Rule
+    val paparazzi = createPaparazziRule()
+
+    @Test
+    fun `item room test`() {
+        val view = paparazzi.inflate<ConstraintLayout>(R.layout.item_room)
+
+        view.findViewById<View>(R.id.roomUnreadIndicator).isVisible = true
+        view.findViewById<TextView>(R.id.roomNameView).text = "Room name"
+        view.findViewById<TextView>(R.id.roomLastEventTimeView).text = "12:34"
+        view.findViewById<TextView>(R.id.subtitleView).text = "Latest message"
+        view.findViewById<View>(R.id.roomDraftBadge).isVisible = true
+        view.findViewById<UnreadCounterBadgeView>(R.id.roomUnreadCounterBadgeView).let {
+            it.isVisible = true
+            it.render(UnreadCounterBadgeView.State.Count(8, false))
+        }
+
+        paparazzi.snapshot(view)
+    }
+
+    @Test
+    fun `item room two line and highlight test`() {
+        val view = paparazzi.inflate<ConstraintLayout>(R.layout.item_room)
+
+        view.findViewById<View>(R.id.roomUnreadIndicator).isVisible = true
+        view.findViewById<TextView>(R.id.roomNameView).text = "Room name"
+        view.findViewById<TextView>(R.id.roomLastEventTimeView).text = "23:59"
+        view.findViewById<TextView>(R.id.subtitleView).text = "Latest message\nOn two lines"
+        view.findViewById<View>(R.id.roomDraftBadge).isVisible = true
+        view.findViewById<UnreadCounterBadgeView>(R.id.roomUnreadCounterBadgeView).let {
+            it.isVisible = true
+            it.render(UnreadCounterBadgeView.State.Count(88, true))
+        }
+
+        paparazzi.snapshot(view)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/TestCoroutineDispatchers.kt b/vector/src/test/java/im/vector/app/test/TestCoroutineDispatchers.kt
index fb3c1bb70a..c4f4c2a19a 100644
--- a/vector/src/test/java/im/vector/app/test/TestCoroutineDispatchers.kt
+++ b/vector/src/test/java/im/vector/app/test/TestCoroutineDispatchers.kt
@@ -19,7 +19,7 @@ package im.vector.app.test
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 
-private val testDispatcher = UnconfinedTestDispatcher()
+internal val testDispatcher = UnconfinedTestDispatcher()
 
 internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(
         io = testDispatcher,
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeActiveSessionDataSource.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeActiveSessionDataSource.kt
index 4dab6daf3b..938607017f 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeActiveSessionDataSource.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeActiveSessionDataSource.kt
@@ -16,15 +16,15 @@
 
 package im.vector.app.test.fakes
 
-import arrow.core.Option
 import im.vector.app.ActiveSessionDataSource
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.toOptional
 
 class FakeActiveSessionDataSource {
 
     val instance = ActiveSessionDataSource()
 
     fun setActiveSession(session: Session) {
-        instance.post(Option.just(session))
+        instance.post(session.toOptional())
     }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeActiveSessionHolder.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeActiveSessionHolder.kt
index 3065c18c30..bfc36ef06d 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeActiveSessionHolder.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeActiveSessionHolder.kt
@@ -33,4 +33,8 @@ class FakeActiveSessionHolder(
     fun expectSetsActiveSession(session: Session) {
         justRun { instance.setActiveSession(session) }
     }
+
+    fun givenGetSafeActiveSessionReturns(session: Session?) {
+        every { instance.getSafeActiveSession() } returns session
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsTracker.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsTracker.kt
index 1a490a7287..d35f1bd08c 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsTracker.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsTracker.kt
@@ -19,4 +19,4 @@ package im.vector.app.test.fakes
 import im.vector.app.features.analytics.AnalyticsTracker
 import io.mockk.mockk
 
-class FakeAnalyticsTracker : AnalyticsTracker by mockk()
+class FakeAnalyticsTracker : AnalyticsTracker by mockk(relaxUnitFun = true)
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeAppNameProvider.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeAppNameProvider.kt
new file mode 100644
index 0000000000..2e60a78853
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeAppNameProvider.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.resources.AppNameProvider
+import io.mockk.every
+import io.mockk.mockk
+
+class FakeAppNameProvider : AppNameProvider by mockk() {
+
+    fun givenAppName(appName: String) {
+        every { getAppName() } returns appName
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeClipboardManager.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeClipboardManager.kt
new file mode 100644
index 0000000000..983902b496
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeClipboardManager.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import io.mockk.verify
+
+class FakeClipboardManager {
+    val instance = mockk<ClipboardManager>()
+
+    fun givenSetPrimaryClip() {
+        every { instance.setPrimaryClip(any()) } just runs
+    }
+
+    fun verifySetPrimaryClip(clipData: ClipData) {
+        verify { instance.setPrimaryClip(clipData) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeContext.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeContext.kt
index 329ac1bdae..d8878a11ad 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeContext.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeContext.kt
@@ -16,13 +16,17 @@
 
 package im.vector.app.test.fakes
 
+import android.content.ClipboardManager
 import android.content.ContentResolver
 import android.content.Context
+import android.content.Intent
 import android.net.ConnectivityManager
 import android.net.Uri
 import android.os.ParcelFileDescriptor
 import io.mockk.every
+import io.mockk.justRun
 import io.mockk.mockk
+import io.mockk.verify
 import java.io.OutputStream
 
 class FakeContext(
@@ -67,4 +71,22 @@ class FakeContext(
         connectivityManager.givenHasActiveConnection()
         givenService(Context.CONNECTIVITY_SERVICE, ConnectivityManager::class.java, connectivityManager.instance)
     }
+
+    fun givenStartActivity(intent: Intent) {
+        justRun { instance.startActivity(intent) }
+    }
+
+    fun verifyStartActivity(intent: Intent) {
+        verify { instance.startActivity(intent) }
+    }
+
+    fun givenClipboardManager(): FakeClipboardManager {
+        val fakeClipboardManager = FakeClipboardManager()
+        givenService(Context.CLIPBOARD_SERVICE, ClipboardManager::class.java, fakeClipboardManager.instance)
+        return fakeClipboardManager
+    }
+
+    fun givenPackageName(name: String) {
+        every { instance.packageName } returns name
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeCreatePollViewStates.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeCreatePollViewStates.kt
index 04f3526602..3be1f5c643 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeCreatePollViewStates.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeCreatePollViewStates.kt
@@ -63,7 +63,7 @@ object FakeCreatePollViewStates {
     )
 
     private val A_POLL_START_EVENT = Event(
-            type = EventType.POLL_START.first(),
+            type = EventType.POLL_START.unstable,
             eventId = A_FAKE_EVENT_ID,
             originServerTs = 1652435922563,
             senderId = A_FAKE_USER_ID,
@@ -80,8 +80,8 @@ object FakeCreatePollViewStates {
     )
 
     val initialCreatePollViewState = CreatePollViewState(createPollArgs).copy(
-        canCreatePoll = false,
-        canAddMoreOptions = true
+            canCreatePoll = false,
+            canAddMoreOptions = true
     )
 
     val pollViewStateWithOnlyQuestion = initialCreatePollViewState.copy(
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeCrossSigningService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeCrossSigningService.kt
new file mode 100644
index 0000000000..e9a5365b1c
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeCrossSigningService.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+
+class FakeCrossSigningService : CrossSigningService by mockk() {
+
+    fun givenIsCrossSigningInitializedReturns(isInitialized: Boolean) {
+        every { isCrossSigningInitialized() } returns isInitialized
+    }
+
+    fun givenIsCrossSigningVerifiedReturns(isVerified: Boolean) {
+        every { isCrossSigningVerified() } returns isVerified
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
index ed571fc2f2..b23f018cf5 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
@@ -17,14 +17,31 @@
 package im.vector.app.test.fakes
 
 import androidx.lifecycle.MutableLiveData
+import im.vector.app.test.fixtures.CryptoDeviceInfoFixture.aCryptoDeviceInfo
+import io.mockk.every
 import io.mockk.mockk
+import io.mockk.slot
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.util.Optional
 
-class FakeCryptoService : CryptoService by mockk() {
+class FakeCryptoService(
+        val fakeCrossSigningService: FakeCrossSigningService = FakeCrossSigningService(),
+        val fakeVerificationService: FakeVerificationService = FakeVerificationService(),
+) : CryptoService by mockk() {
 
     var roomKeysExport = ByteArray(size = 1)
     var cryptoDeviceInfos = mutableMapOf<String, CryptoDeviceInfo>()
+    var cryptoDeviceInfoWithIdLiveData: MutableLiveData<Optional<CryptoDeviceInfo>> = MutableLiveData()
+    var myDevicesInfoWithIdLiveData: MutableLiveData<Optional<DeviceInfo>> = MutableLiveData()
+    var cryptoDeviceInfo = aCryptoDeviceInfo()
+
+    override fun crossSigningService() = fakeCrossSigningService
+
+    override fun verificationService() = fakeVerificationService
 
     override suspend fun exportRoomKeys(password: String) = roomKeysExport
 
@@ -35,4 +52,43 @@ class FakeCryptoService : CryptoService by mockk() {
     override fun getLiveCryptoDeviceInfo(userIds: List<String>) = MutableLiveData(
             cryptoDeviceInfos.filterKeys { userIds.contains(it) }.values.toList()
     )
+
+    override fun getLiveCryptoDeviceInfoWithId(deviceId: String) = cryptoDeviceInfoWithIdLiveData
+
+    override fun getMyDevicesInfoLive(deviceId: String) = myDevicesInfoWithIdLiveData
+
+    fun givenSetDeviceNameSucceeds() {
+        val matrixCallback = slot<MatrixCallback<Unit>>()
+        every { setDeviceName(any(), any(), capture(matrixCallback)) } answers {
+            thirdArg<MatrixCallback<Unit>>().onSuccess(Unit)
+        }
+    }
+
+    fun givenSetDeviceNameFailsWithError(error: Exception) {
+        val matrixCallback = slot<MatrixCallback<Unit>>()
+        every { setDeviceName(any(), any(), capture(matrixCallback)) } answers {
+            thirdArg<MatrixCallback<Unit>>().onFailure(error)
+        }
+    }
+
+    fun givenDeleteDevicesSucceeds(deviceIds: List<String>) {
+        every { deleteDevices(deviceIds, any(), any()) } answers {
+            thirdArg<MatrixCallback<Unit>>().onSuccess(Unit)
+        }
+    }
+
+    fun givenDeleteDevicesNeedsUIAuth(deviceIds: List<String>) {
+        every { deleteDevices(deviceIds, any(), any()) } answers {
+            secondArg<UserInteractiveAuthInterceptor>().performStage(mockk(), "", mockk())
+            thirdArg<MatrixCallback<Unit>>().onSuccess(Unit)
+        }
+    }
+
+    fun givenDeleteDevicesFailsWithError(deviceIds: List<String>, error: Exception) {
+        every { deleteDevices(deviceIds, any(), any()) } answers {
+            thirdArg<MatrixCallback<Unit>>().onFailure(error)
+        }
+    }
+
+    override fun getMyDevice() = cryptoDeviceInfo
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeDebugNavigator.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeDebugNavigator.kt
new file mode 100644
index 0000000000..42074093b3
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeDebugNavigator.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.debug.DebugNavigator
+import io.mockk.mockk
+
+class FakeDebugNavigator : DebugNavigator by mockk()
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeFcmHelper.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeFcmHelper.kt
new file mode 100644
index 0000000000..4c210215ec
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeFcmHelper.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.pushers.FcmHelper
+import im.vector.app.core.pushers.PushersManager
+import io.mockk.justRun
+import io.mockk.mockk
+import io.mockk.verify
+
+class FakeFcmHelper {
+
+    val instance = mockk<FcmHelper>()
+
+    fun givenEnsureFcmTokenIsRetrieved(pushersManager: PushersManager) {
+        justRun { instance.ensureFcmTokenIsRetrieved(pushersManager, any()) }
+    }
+
+    fun verifyEnsureFcmTokenIsRetrieved(
+            pushersManager: PushersManager,
+            registerPusher: Boolean,
+            inverse: Boolean = false,
+    ) {
+        verify(inverse = inverse) { instance.ensureFcmTokenIsRetrieved(pushersManager, registerPusher) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeFlowLiveDataConversions.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeFlowLiveDataConversions.kt
index 9abbcc174d..956a86f32e 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeFlowLiveDataConversions.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeFlowLiveDataConversions.kt
@@ -28,6 +28,6 @@ class FakeFlowLiveDataConversions {
     }
 }
 
-fun <T> LiveData<T>.givenAsFlowReturns(value: T) {
-    every { asFlow() } returns flowOf(value)
+fun <T> LiveData<T>.givenAsFlow() {
+    every { asFlow() } returns flowOf(value!!)
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeGetDeviceInfoUseCase.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeGetDeviceInfoUseCase.kt
new file mode 100644
index 0000000000..c284263d28
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeGetDeviceInfoUseCase.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.device.GetDeviceInfoUseCase
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+
+class FakeGetDeviceInfoUseCase : GetDeviceInfoUseCase by mockk() {
+
+    fun givenDeviceInfo(cryptoDeviceInfo: CryptoDeviceInfo) {
+        every { execute() } returns cryptoDeviceInfo
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeGetNotificationsStatusUseCase.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeGetNotificationsStatusUseCase.kt
new file mode 100644
index 0000000000..a9c1b37d69
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeGetNotificationsStatusUseCase.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.settings.devices.v2.notification.GetNotificationsStatusUseCase
+import im.vector.app.features.settings.devices.v2.notification.NotificationsStatus
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.flow.flowOf
+import org.matrix.android.sdk.api.session.Session
+
+class FakeGetNotificationsStatusUseCase {
+
+    val instance = mockk<GetNotificationsStatusUseCase>()
+
+    fun givenExecuteReturns(
+            session: Session,
+            sessionId: String,
+            notificationsStatus: NotificationsStatus
+    ) {
+        every { instance.execute(session, sessionId) } returns flowOf(notificationsStatus)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerCapabilitiesService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerCapabilitiesService.kt
index 006789f62b..c816c51c0f 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerCapabilitiesService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerCapabilitiesService.kt
@@ -16,14 +16,24 @@
 
 package im.vector.app.test.fakes
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import io.mockk.every
 import io.mockk.mockk
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
 
 class FakeHomeServerCapabilitiesService : HomeServerCapabilitiesService by mockk() {
 
     fun givenCapabilities(homeServerCapabilities: HomeServerCapabilities) {
         every { getHomeServerCapabilities() } returns homeServerCapabilities
     }
+
+    fun givenCapabilitiesLiveReturns(homeServerCapabilities: HomeServerCapabilities): LiveData<Optional<HomeServerCapabilities>> {
+        return MutableLiveData(homeServerCapabilities.toOptional()).also {
+            every { getHomeServerCapabilitiesLive() } returns it
+        }
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerConnectionConfigFactory.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerConnectionConfigFactory.kt
index 553a35ad8c..c0cfe5375b 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerConnectionConfigFactory.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerConnectionConfigFactory.kt
@@ -20,11 +20,12 @@ import im.vector.app.features.login.HomeServerConnectionConfigFactory
 import io.mockk.every
 import io.mockk.mockk
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.network.ssl.Fingerprint
 
 class FakeHomeServerConnectionConfigFactory {
     val instance: HomeServerConnectionConfigFactory = mockk()
 
-    fun givenConfigFor(url: String, config: HomeServerConnectionConfig) {
-        every { instance.create(url) } returns config
+    fun givenConfigFor(url: String, fingerprint: Fingerprint? = null, config: HomeServerConnectionConfig) {
+        every { instance.create(url, fingerprint) } returns config
     }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeLocaleProvider.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeLocaleProvider.kt
new file mode 100644
index 0000000000..4d4e2b5bcb
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeLocaleProvider.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.resources.LocaleProvider
+import io.mockk.every
+import io.mockk.mockk
+import java.util.Locale
+
+class FakeLocaleProvider : LocaleProvider by mockk() {
+
+    fun givenCurrent(locale: Locale) {
+        every { current() } returns locale
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeMatrix.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeMatrix.kt
new file mode 100644
index 0000000000..d4761a14af
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeMatrix.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.Matrix
+
+class FakeMatrix(
+        val fakeSecureStorageService: FakeSecureStorageService = FakeSecureStorageService(),
+) {
+
+    val instance = mockk<Matrix>()
+
+    init {
+        every { instance.secureStorageService() } returns fakeSecureStorageService
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationsSettingUpdater.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationsSettingUpdater.kt
new file mode 100644
index 0000000000..2e397763f8
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationsSettingUpdater.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.notification.NotificationsSettingUpdater
+import io.mockk.justRun
+import io.mockk.mockk
+import org.matrix.android.sdk.api.session.Session
+
+class FakeNotificationsSettingUpdater {
+
+    val instance = mockk<NotificationsSettingUpdater>()
+
+    fun givenOnSessionsStarted(session: Session) {
+        justRun { instance.onSessionStarted(session) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakePendingAuthHandler.kt b/vector/src/test/java/im/vector/app/test/fakes/FakePendingAuthHandler.kt
new file mode 100644
index 0000000000..9feea016e3
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakePendingAuthHandler.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.auth.PendingAuthHandler
+import io.mockk.mockk
+import io.mockk.spyk
+
+class FakePendingAuthHandler {
+
+    val instance = spyk(mockk<PendingAuthHandler>())
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakePushersManager.kt b/vector/src/test/java/im/vector/app/test/fakes/FakePushersManager.kt
new file mode 100644
index 0000000000..3dd3854a18
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakePushersManager.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.pushers.PushersManager
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.session.pushers.Pusher
+
+class FakePushersManager {
+
+    val instance = mockk<PushersManager>()
+
+    fun givenGetPusherForCurrentSessionReturns(pusher: Pusher?) {
+        every { instance.getPusherForCurrentSession() } returns pusher
+    }
+
+    fun givenUnregisterPusher(pushKey: String) {
+        coJustRun { instance.unregisterPusher(pushKey) }
+    }
+
+    fun verifyUnregisterPusher(pushKey: String) {
+        coVerify { instance.unregisterPusher(pushKey) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakePushersService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakePushersService.kt
new file mode 100644
index 0000000000..4e4323275b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakePushersService.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import androidx.lifecycle.liveData
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.justRun
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
+import org.matrix.android.sdk.api.session.pushers.HttpPusher
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.api.session.pushers.PushersService
+
+class FakePushersService : PushersService by mockk(relaxed = true) {
+
+    fun givenGetPushers(pushers: List<Pusher>) {
+        every { getPushers() } returns pushers
+    }
+
+    fun givenPushersLive(pushers: List<Pusher>) {
+        every { getPushersLive() } returns liveData { emit(pushers) }
+    }
+
+    fun verifyTogglePusherCalled(pusher: Pusher, enable: Boolean) {
+        coVerify {
+            togglePusher(pusher, enable)
+        }
+    }
+
+    fun verifyEnqueueAddHttpPusher(): HttpPusher {
+        val httpPusherSlot = slot<HttpPusher>()
+        verify { enqueueAddHttpPusher(capture(httpPusherSlot)) }
+        return httpPusherSlot.captured
+    }
+
+    fun givenRefreshPushersSucceeds() {
+        justRun { refreshPushers() }
+    }
+
+    fun verifyRefreshPushers() {
+        verify { refreshPushers() }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeReAuthHelper.kt
similarity index 59%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
rename to vector/src/test/java/im/vector/app/test/fakes/FakeReAuthHelper.kt
index bc592df474..96004a4990 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeReAuthHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 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.
@@ -14,21 +14,17 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.session.sync
+package im.vector.app.test.fakes
 
-interface FilterService {
+import im.vector.app.features.login.ReAuthHelper
+import io.mockk.every
+import io.mockk.mockk
 
-    enum class FilterPreset {
-        NoFilter,
+class FakeReAuthHelper {
 
-        /**
-         * Filter for Element, will include only known event type.
-         */
-        ElementFilter
+    val instance = mockk<ReAuthHelper>()
+
+    fun givenStoredPassword(pwd: String?) {
+        every { instance.data } returns pwd
     }
-
-    /**
-     * Configure the filter for the sync.
-     */
-    fun setFilter(filterPreset: FilterPreset)
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeRoom.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeRoom.kt
index 865b01551a..7835c314ef 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeRoom.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeRoom.kt
@@ -24,6 +24,7 @@ class FakeRoom(
         private val fakeSendService: FakeSendService = FakeSendService(),
         private val fakeTimelineService: FakeTimelineService = FakeTimelineService(),
         private val fakeRelationService: FakeRelationService = FakeRelationService(),
+        private val fakeStateService: FakeStateService = FakeStateService(),
 ) : Room by mockk() {
 
     override fun locationSharingService() = fakeLocationSharingService
@@ -33,4 +34,6 @@ class FakeRoom(
     override fun timelineService() = fakeTimelineService
 
     override fun relationService() = fakeRelationService
+
+    override fun stateService() = fakeStateService
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeRoomService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeRoomService.kt
index b09256f747..506e96ba11 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeRoomService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeRoomService.kt
@@ -16,12 +16,18 @@
 
 package im.vector.app.test.fakes
 
+import io.mockk.every
 import io.mockk.mockk
 import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 class FakeRoomService(
         private val fakeRoom: FakeRoom = FakeRoom()
 ) : RoomService by mockk() {
 
     override fun getRoom(roomId: String) = fakeRoom
+
+    fun getRoomSummaryReturns(roomSummary: RoomSummary?) {
+        every { getRoomSummary(any()) } returns roomSummary
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSecureStorageService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSecureStorageService.kt
new file mode 100644
index 0000000000..8055304172
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSecureStorageService.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.securestorage.SecureStorageService
+
+class FakeSecureStorageService : SecureStorageService by mockk() {
+
+    fun <T> givenLoadSecureSecretReturns(value: T?) {
+        every { loadSecureSecret<T>(any(), any()) } returns value
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSendService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSendService.kt
index 04b9b95ce1..425a485561 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeSendService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSendService.kt
@@ -17,6 +17,7 @@
 package im.vector.app.test.fakes
 
 import io.mockk.mockk
+import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.room.model.message.PollType
 import org.matrix.android.sdk.api.session.room.send.SendService
 import org.matrix.android.sdk.api.util.Cancelable
@@ -25,5 +26,5 @@ class FakeSendService : SendService by mockk() {
 
     private val cancelable = mockk<Cancelable>()
 
-    override fun sendPoll(pollType: PollType, question: String, options: List<String>): Cancelable = cancelable
+    override fun sendPoll(pollType: PollType, question: String, options: List<String>, additionalContent: Content?): Cancelable = cancelable
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSentryAnalytics.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSentryAnalytics.kt
new file mode 100644
index 0000000000..59f41543b0
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSentryAnalytics.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.analytics.impl.SentryAnalytics
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+
+class FakeSentryAnalytics {
+    private var isSentryEnabled = false
+
+    val instance = mockk<SentryAnalytics>(relaxUnitFun = true).also {
+        every { it.initSentry() } answers  {
+            isSentryEnabled = true
+        }
+
+        every { it.stopSentry() } answers {
+            isSentryEnabled = false
+        }
+    }
+
+    fun verifySentryInit() {
+        verify { instance.initSentry() }
+    }
+
+    fun verifySentryClose() {
+        verify { instance.stopSentry() }
+    }
+
+    fun verifySentryTrackError(error: Throwable) {
+        verify { instance.trackError(error) }
+    }
+
+    fun verifyNoErrorTracking() =
+        verify(inverse = true) {
+            instance.trackError(any())
+        }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
index 18af88ba0f..e368fbbcf2 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
@@ -16,9 +16,9 @@
 
 package im.vector.app.test.fakes
 
-import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.extensions.startSyncing
 import im.vector.app.core.extensions.vectorStore
+import im.vector.app.core.session.ConfigureAndStartSessionUseCase
 import im.vector.app.features.session.VectorSessionStore
 import im.vector.app.test.testCoroutineDispatchers
 import io.mockk.coEvery
@@ -26,19 +26,24 @@ import io.mockk.coJustRun
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
+import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.flow.FlowSession
+import org.matrix.android.sdk.flow.flow
 
 class FakeSession(
         val fakeCryptoService: FakeCryptoService = FakeCryptoService(),
         val fakeProfileService: FakeProfileService = FakeProfileService(),
         val fakeHomeServerCapabilitiesService: FakeHomeServerCapabilitiesService = FakeHomeServerCapabilitiesService(),
         val fakeSharedSecretStorageService: FakeSharedSecretStorageService = FakeSharedSecretStorageService(),
-        private val fakeRoomService: FakeRoomService = FakeRoomService(),
+        val fakeRoomService: FakeRoomService = FakeRoomService(),
+        val fakePushersService: FakePushersService = FakePushersService(),
         private val fakeEventService: FakeEventService = FakeEventService(),
+        val fakeSessionAccountDataService: FakeSessionAccountDataService = FakeSessionAccountDataService()
 ) : Session by mockk(relaxed = true) {
 
     init {
@@ -55,6 +60,8 @@ class FakeSession(
     override fun sharedSecretStorageService() = fakeSharedSecretStorageService
     override fun roomService() = fakeRoomService
     override fun eventService() = fakeEventService
+    override fun pushersService() = fakePushersService
+    override fun accountDataService() = fakeSessionAccountDataService
 
     fun givenVectorStore(vectorSessionStore: VectorSessionStore) {
         coEvery {
@@ -64,13 +71,33 @@ class FakeSession(
         }
     }
 
-    fun expectStartsSyncing() {
+    fun expectStartsSyncing(configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase) {
         coJustRun {
-            this@FakeSession.configureAndStart(any(), startSyncing = true)
+            configureAndStartSessionUseCase.execute(this@FakeSession, startSyncing = true)
             this@FakeSession.startSyncing(any())
         }
     }
 
+    fun givenSessionParams(sessionParams: SessionParams) {
+        every { this@FakeSession.sessionParams } returns sessionParams
+    }
+
+    fun givenSessionId(sessionId: String?): SessionParams {
+        val sessionParams = mockk<SessionParams>()
+        every { sessionParams.deviceId } returns sessionId
+        givenSessionParams(sessionParams)
+        return sessionParams
+    }
+
+    /**
+     * Do not forget to call mockkStatic("org.matrix.android.sdk.flow.FlowSessionKt") in the setup method of the tests.
+     */
+    fun givenFlowSession(): FlowSession {
+        val fakeFlowSession = mockk<FlowSession>()
+        every { flow() } returns fakeFlowSession
+        return fakeFlowSession
+    }
+
     companion object {
 
         fun withRoomSummary(roomSummary: RoomSummary) = FakeSession().apply {
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSessionAccountDataService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSessionAccountDataService.kt
new file mode 100644
index 0000000000..cd357ec85a
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSessionAccountDataService.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import org.matrix.android.sdk.api.session.accountdata.SessionAccountDataService
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+
+class FakeSessionAccountDataService : SessionAccountDataService by mockk(relaxed = true) {
+
+    fun givenGetUserAccountDataEventReturns(type: String, content: Content?) {
+        every { getUserAccountDataEvent(type) } returns content?.let { UserAccountDataEvent(type, it) }
+    }
+
+    fun givenGetLiveUserAccountDataEventReturns(type: String, content: Content?): LiveData<Optional<UserAccountDataEvent>> {
+        return MutableLiveData(content?.let { UserAccountDataEvent(type, it) }.toOptional())
+                .also {
+                    every { getLiveUserAccountDataEvent(type) } returns it
+                }
+    }
+
+    fun givenUpdateUserAccountDataEventSucceeds() {
+        coEvery { updateUserAccountData(any(), any()) } just runs
+    }
+
+    fun givenUpdateUserAccountDataEventFailsWithError(error: Exception) {
+        coEvery { updateUserAccountData(any(), any()) } throws error
+    }
+
+    fun verifyUpdateUserAccountDataEventSucceeds(type: String, content: Content, inverse: Boolean = false) {
+        coVerify(inverse = inverse) { updateUserAccountData(type, content) }
+    }
+
+    fun givenGetUserAccountDataEventsStartWith(type: String, userAccountDataEventList: List<UserAccountDataEvent>) {
+        every { getUserAccountDataEventsStartWith(type) } returns userAccountDataEventList
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSharedSecretStorageService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSharedSecretStorageService.kt
index 6ec9a4b593..1dc36de709 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeSharedSecretStorageService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSharedSecretStorageService.kt
@@ -16,6 +16,8 @@
 
 package im.vector.app.test.fakes
 
+import io.mockk.every
+import io.mockk.mockk
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.securestorage.IntegrityResult
 import org.matrix.android.sdk.api.session.securestorage.KeyInfoResult
@@ -26,7 +28,7 @@ import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageServi
 import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
 import org.matrix.android.sdk.api.session.securestorage.SsssKeySpec
 
-class FakeSharedSecretStorageService : SharedSecretStorageService {
+class FakeSharedSecretStorageService : SharedSecretStorageService by mockk() {
 
     var integrityResult: IntegrityResult = IntegrityResult.Error(SharedSecretStorageError.OtherError(IllegalStateException()))
     var _defaultKey: KeyInfoResult = KeyInfoResult.Error(SharedSecretStorageError.OtherError(IllegalStateException()))
@@ -76,4 +78,8 @@ class FakeSharedSecretStorageService : SharedSecretStorageService {
     override suspend fun requestSecret(name: String, myOtherDeviceId: String) {
         TODO("Not yet implemented")
     }
+
+    fun givenIsRecoverySetupReturns(isRecoverySetup: Boolean) {
+        every { isRecoverySetup() } returns isRecoverySetup
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSignoutSessionsUseCase.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSignoutSessionsUseCase.kt
new file mode 100644
index 0000000000..9eb3676475
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSignoutSessionsUseCase.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.settings.devices.v2.signout.SignoutSessionsReAuthNeeded
+import im.vector.app.features.settings.devices.v2.signout.SignoutSessionsUseCase
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+
+class FakeSignoutSessionsUseCase {
+
+    val instance = mockk<SignoutSessionsUseCase>()
+
+    fun givenSignoutSuccess(deviceIds: List<String>) {
+        coEvery { instance.execute(deviceIds, any()) } returns Result.success(Unit)
+    }
+
+    fun givenSignoutReAuthNeeded(deviceIds: List<String>): SignoutSessionsReAuthNeeded {
+        val flowResponse = mockk<RegistrationFlowResponse>()
+        every { flowResponse.session } returns "a-session-id"
+        val errorCode = "errorCode"
+        val reAuthNeeded = SignoutSessionsReAuthNeeded(
+                pendingAuth = mockk(),
+                uiaContinuation = mockk(),
+                flowResponse = flowResponse,
+                errCode = errorCode,
+        )
+        coEvery { instance.execute(deviceIds, any()) } coAnswers {
+            secondArg<(SignoutSessionsReAuthNeeded) -> Unit>().invoke(reAuthNeeded)
+            Result.success(Unit)
+        }
+
+        return reAuthNeeded
+    }
+
+    fun givenSignoutError(deviceIds: List<String>, error: Throwable) {
+        coEvery { instance.execute(deviceIds, any()) } returns Result.failure(error)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSpaceStateHandler.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSpaceStateHandler.kt
new file mode 100644
index 0000000000..f95b968c91
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSpaceStateHandler.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.SpaceStateHandler
+import io.mockk.mockk
+import io.mockk.verify
+
+class FakeSpaceStateHandler : SpaceStateHandler by mockk(relaxUnitFun = true) {
+
+    fun verifySetCurrentSpace(spaceId: String) {
+        verify { setCurrentSpace(spaceId) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt
index bfbef9e565..4b2709facc 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt
@@ -31,6 +31,10 @@ class FakeStartAuthenticationFlowUseCase {
         coEvery { instance.execute(config) } returns result
     }
 
+    fun givenErrors(config: HomeServerConnectionConfig, error: Throwable) {
+        coEvery { instance.execute(config) } throws  error
+    }
+
     fun givenHomeserverUnavailable(config: HomeServerConnectionConfig) {
         coEvery { instance.execute(config) } throws aHomeserverUnavailableError()
     }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeStateService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeStateService.kt
new file mode 100644
index 0000000000..7c393c7a57
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeStateService.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package im.vector.app.test.fakes
+
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.query.QueryStateEventValue
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.state.StateService
+
+class FakeStateService : StateService by mockk(relaxed = true) {
+
+    fun givenGetStateEvents(stateKey: QueryStateEventValue, result: List<Event>) {
+        every { getStateEvents(any(), stateKey) } returns result
+    }
+
+    fun givenGetStateEvent(event: Event?) {
+        every { getStateEvent(any(), any()) } returns event
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSupportedVerificationMethodsProvider.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSupportedVerificationMethodsProvider.kt
new file mode 100644
index 0000000000..ecb7c3289b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSupportedVerificationMethodsProvider.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider
+import io.mockk.mockk
+
+class FakeSupportedVerificationMethodsProvider {
+
+    val instance = mockk<SupportedVerificationMethodsProvider>()
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeTimelineService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeTimelineService.kt
index 56f38724b1..a5fac5f1a1 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeTimelineService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeTimelineService.kt
@@ -23,7 +23,7 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 
 class FakeTimelineService : TimelineService by mockk() {
 
-    fun givenTimelineEvent(event: TimelineEvent) {
+    fun givenTimelineEvent(event: TimelineEvent?) {
         every { getTimelineEvent(any()) } returns event
     }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeToggleNotificationUseCase.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeToggleNotificationUseCase.kt
new file mode 100644
index 0000000000..3d2179bc2d
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeToggleNotificationUseCase.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.settings.devices.v2.notification.ToggleNotificationsUseCase
+import io.mockk.coJustRun
+import io.mockk.coVerify
+import io.mockk.mockk
+
+class FakeToggleNotificationUseCase {
+
+    val instance = mockk<ToggleNotificationsUseCase> {
+        coJustRun { execute(any(), any()) }
+    }
+
+    fun verifyExecute(deviceId: String, enabled: Boolean) {
+        coVerify { instance.execute(deviceId, enabled) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeUnifiedPushHelper.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeUnifiedPushHelper.kt
new file mode 100644
index 0000000000..1a09783fad
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeUnifiedPushHelper.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.pushers.UnifiedPushHelper
+import io.mockk.every
+import io.mockk.mockk
+
+class FakeUnifiedPushHelper {
+
+    val instance = mockk<UnifiedPushHelper>()
+
+    fun givenIsEmbeddedDistributorReturns(isEmbedded: Boolean) {
+        every { instance.isEmbeddedDistributor() } returns isEmbedded
+    }
+
+    fun givenGetEndpointOrTokenReturns(endpoint: String?) {
+        every { instance.getEndpointOrToken() } returns endpoint
+    }
+
+    fun givenIsBackgroundSyncReturns(enabled: Boolean) {
+        every { instance.isBackgroundSync() } returns enabled
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeUnifiedPushStore.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeUnifiedPushStore.kt
new file mode 100644
index 0000000000..9b09bec688
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeUnifiedPushStore.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.pushers.UnifiedPushStore
+import io.mockk.justRun
+import io.mockk.mockk
+import io.mockk.verify
+
+class FakeUnifiedPushStore {
+
+    val instance = mockk<UnifiedPushStore>()
+
+    fun givenStoreUpEndpoint(endpoint: String?) {
+        justRun { instance.storeUpEndpoint(endpoint) }
+    }
+
+    fun verifyStoreUpEndpoint(endpoint: String?) {
+        verify { instance.storeUpEndpoint(endpoint) }
+    }
+
+    fun givenStorePushGateway(gateway: String?) {
+        justRun { instance.storePushGateway(gateway) }
+    }
+
+    fun verifyStorePushGateway(gateway: String?) {
+        verify { instance.storePushGateway(gateway) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
index 4e6b4fc3df..b399f0baa4 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
@@ -42,4 +42,20 @@ class FakeVectorFeatures : VectorFeatures by spyk<DefaultVectorFeatures>() {
     fun givenCombinedLoginDisabled() {
         every { isOnboardingCombinedLoginEnabled() } returns false
     }
+
+    fun givenLocationSharing(isEnabled: Boolean) {
+        every { isLocationSharingEnabled() } returns isEnabled
+    }
+
+    fun givenVoiceBroadcast(isEnabled: Boolean) {
+        every { isVoiceBroadcastEnabled() } returns isEnabled
+    }
+
+    fun givenUnverifiedSessionsAlertEnabled(isEnabled: Boolean) {
+        every { isUnverifiedSessionsAlertEnabled() } returns isEnabled
+    }
+
+    fun givenExternalDistributorsAreAllowed(allowed: Boolean) {
+        every { allowExternalUnifiedPushDistributors() } returns allowed
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorPreferences.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorPreferences.kt
index eb8f9ac413..3d3f415778 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorPreferences.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorPreferences.kt
@@ -16,15 +16,73 @@
 
 package im.vector.app.test.fakes
 
+import im.vector.app.features.settings.BackgroundSyncMode
 import im.vector.app.features.settings.VectorPreferences
 import io.mockk.every
+import io.mockk.justRun
 import io.mockk.mockk
+import io.mockk.verify
 
 class FakeVectorPreferences {
 
-    val instance = mockk<VectorPreferences>()
+    val instance = mockk<VectorPreferences>(relaxUnitFun = true)
 
     fun givenUseCompleteNotificationFormat(value: Boolean) {
         every { instance.useCompleteNotificationFormat() } returns value
     }
+
+    fun givenSpaceBackstack(value: List<String?>) {
+        every { instance.getSpaceBackstack() } returns value
+    }
+
+    fun verifySetSpaceBackstack(value: List<String?>, inverse: Boolean = false) {
+        verify(inverse = inverse) { instance.setSpaceBackstack(value) }
+    }
+
+    fun givenIsClientInfoRecordingEnabled(isEnabled: Boolean) {
+        every { instance.isClientInfoRecordingEnabled() } returns isEnabled
+    }
+
+    fun givenTextFormatting(isEnabled: Boolean) =
+            every { instance.isTextFormattingEnabled() } returns isEnabled
+
+    fun givenSetNotificationEnabledForDevice() {
+        justRun { instance.setNotificationEnabledForDevice(any()) }
+    }
+
+    fun verifySetNotificationEnabledForDevice(enabled: Boolean, inverse: Boolean = false) {
+        verify(inverse = inverse) { instance.setNotificationEnabledForDevice(enabled) }
+    }
+
+    fun givenSessionManagerShowIpAddress(showIpAddress: Boolean) {
+        every { instance.showIpAddressInSessionManagerScreens() } returns showIpAddress
+    }
+
+    fun givenUnverifiedSessionsAlertLastShownMillis(lastShownMillis: Long) {
+        every { instance.getUnverifiedSessionsAlertLastShownMillis(any()) } returns lastShownMillis
+    }
+
+    fun givenSetFdroidSyncBackgroundMode(mode: BackgroundSyncMode) {
+        justRun { instance.setFdroidSyncBackgroundMode(mode) }
+    }
+
+    fun verifySetFdroidSyncBackgroundMode(mode: BackgroundSyncMode) {
+        verify { instance.setFdroidSyncBackgroundMode(mode) }
+    }
+
+    fun givenAreNotificationsEnabledForDevice(notificationsEnabled: Boolean) {
+        every { instance.areNotificationEnabledForDevice() } returns notificationsEnabled
+    }
+
+    fun givenIsBackgroundSyncEnabled(isEnabled: Boolean) {
+        every { instance.isBackgroundSyncEnabled() } returns isEnabled
+    }
+
+    fun givenShowIpAddressInSessionManagerScreens(show: Boolean) {
+        every { instance.showIpAddressInSessionManagerScreens() } returns show
+    }
+
+    fun verifySetIpAddressVisibilityInDeviceManagerScreens(isVisible: Boolean) {
+        verify { instance.setIpAddressVisibilityInDeviceManagerScreens(isVisible) }
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeVerificationService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeVerificationService.kt
new file mode 100644
index 0000000000..4b2dec9fc2
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeVerificationService.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+
+class FakeVerificationService : VerificationService by mockk() {
+
+    fun givenAddListenerSucceeds() {
+        every { addListener(any()) } just runs
+    }
+
+    fun givenRemoveListenerSucceeds() {
+        every { removeListener(any()) } just runs
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeWebRtcCallManager.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeWebRtcCallManager.kt
new file mode 100644
index 0000000000..b3664bafa1
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeWebRtcCallManager.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.call.webrtc.WebRtcCallManager
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import io.mockk.verify
+
+class FakeWebRtcCallManager {
+
+    val instance = mockk<WebRtcCallManager>()
+
+    fun givenCheckForProtocolsSupportIfNeededSucceeds() {
+        every { instance.checkForProtocolsSupportIfNeeded() } just runs
+    }
+
+    fun verifyCheckForProtocolsSupportIfNeeded() {
+        verify { instance.checkForProtocolsSupportIfNeeded() }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeWidgetArgsBuilder.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeWidgetArgsBuilder.kt
new file mode 100644
index 0000000000..3a810b2c23
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeWidgetArgsBuilder.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.widgets.WidgetArgsBuilder
+import io.mockk.mockk
+
+class FakeWidgetArgsBuilder {
+
+    val instance = mockk<WidgetArgsBuilder>()
+}
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt
index ea1769ecb2..a53043774d 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt
@@ -23,6 +23,8 @@ object AnalyticsConfigFixture {
             isEnabled: Boolean = false,
             postHogHost: String = "http://posthog.url",
             postHogApiKey: String = "api-key",
-            policyLink: String = "http://policy.link"
-    ) = AnalyticsConfig(isEnabled, postHogHost, postHogApiKey, policyLink)
+            policyLink: String = "http://policy.link",
+            sentryDSN: String = "http://sentry.dsn",
+            sentryEnvironment: String = "sentry-env"
+    ) = AnalyticsConfig(isEnabled, postHogHost, postHogApiKey, policyLink, sentryDSN, sentryEnvironment)
 }
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
index 4f4649106d..e4dee0e474 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
@@ -26,7 +26,6 @@ fun aBuildMeta() = BuildMeta(
         gitRevision = "abcdef",
         gitRevisionDate = "01-01-01",
         gitBranchName = "a-branch-name",
-        buildNumber = "100",
         flavorDescription = "Gplay",
         flavorShortDescription = "",
 )
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/CredentialsFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/CredentialsFixture.kt
new file mode 100644
index 0000000000..1a70806e76
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/CredentialsFixture.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fixtures
+
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.DiscoveryInformation
+
+object CredentialsFixture {
+    fun aCredentials(
+            userId: String = "",
+            accessToken: String = "",
+            refreshToken: String? = null,
+            homeServer: String? = null,
+            deviceId: String? = null,
+            discoveryInformation: DiscoveryInformation? = null,
+    ) = Credentials(
+            userId,
+            accessToken,
+            refreshToken,
+            homeServer,
+            deviceId,
+            discoveryInformation,
+    )
+}
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/CryptoDeviceInfoFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/CryptoDeviceInfoFixture.kt
new file mode 100644
index 0000000000..834a428b4a
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/CryptoDeviceInfoFixture.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fixtures
+
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.UnsignedDeviceInfo
+
+object CryptoDeviceInfoFixture {
+
+    fun aCryptoDeviceInfo(
+            deviceId: String = "",
+            userId: String = "",
+            algorithms: List<String>? = null,
+            keys: Map<String, String>? = null,
+            signatures: Map<String, Map<String, String>>? = null,
+            unsigned: UnsignedDeviceInfo? = null,
+            trustLevel: DeviceTrustLevel? = null,
+            isBlocked: Boolean = false,
+            firstTimeSeenLocalTs: Long? = null,
+    ) = CryptoDeviceInfo(
+            deviceId,
+            userId,
+            algorithms,
+            keys,
+            signatures,
+            unsigned,
+            trustLevel,
+            isBlocked,
+            firstTimeSeenLocalTs,
+    )
+}
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/DeviceFullInfoFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/DeviceFullInfoFixture.kt
new file mode 100644
index 0000000000..d5f987b5c6
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/DeviceFullInfoFixture.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fixtures
+
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+fun aDeviceFullInfo(deviceId: String, isSelected: Boolean): DeviceFullInfo {
+    return DeviceFullInfo(
+            deviceInfo = DeviceInfo(
+                    deviceId = deviceId,
+            ),
+            cryptoDeviceInfo = null,
+            roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+            isInactive = true,
+            isCurrentDevice = true,
+            deviceExtendedInfo = DeviceExtendedInfo(
+                    deviceType = DeviceType.MOBILE,
+            ),
+            matrixClientInfo = null,
+            isSelected = isSelected,
+    )
+}
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/FailureFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/FailureFixture.kt
index 0f44976ab3..8437401294 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/FailureFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/FailureFixture.kt
@@ -18,6 +18,7 @@ package im.vector.app.test.fixtures
 
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.network.ssl.Fingerprint
 import java.net.UnknownHostException
 import javax.net.ssl.HttpsURLConnection
 
@@ -38,3 +39,5 @@ fun aLoginEmailUnknownError() = Failure.ServerError(
 )
 
 fun aHomeserverUnavailableError() = Failure.NetworkConnection(UnknownHostException())
+
+fun anUnrecognisedCertificateError() = Failure.UnrecognizedCertificateFailure("a-url", Fingerprint(ByteArray(1), Fingerprint.HashType.SHA1))
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/HomeserverCapabilityFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/HomeserverCapabilityFixture.kt
index a4d9869a89..c9f32c2cf2 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/HomeserverCapabilityFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/HomeserverCapabilityFixture.kt
@@ -27,14 +27,16 @@ fun aHomeServerCapabilities(
         maxUploadFileSize: Long = 100L,
         lastVersionIdentityServerSupported: Boolean = false,
         defaultIdentityServerUrl: String? = null,
-        roomVersions: RoomVersionCapabilities? = null
+        roomVersions: RoomVersionCapabilities? = null,
+        canRemotelyTogglePushNotificationsOfDevices: Boolean = true,
 ) = HomeServerCapabilities(
-        canChangePassword,
-        canChangeDisplayName,
-        canChangeAvatar,
-        canChange3pid,
-        maxUploadFileSize,
-        lastVersionIdentityServerSupported,
-        defaultIdentityServerUrl,
-        roomVersions
+        canChangePassword = canChangePassword,
+        canChangeDisplayName = canChangeDisplayName,
+        canChangeAvatar = canChangeAvatar,
+        canChange3pid = canChange3pid,
+        maxUploadFileSize = maxUploadFileSize,
+        lastVersionIdentityServerSupported = lastVersionIdentityServerSupported,
+        defaultIdentityServerUrl = defaultIdentityServerUrl,
+        roomVersions = roomVersions,
+        canRemotelyTogglePushNotificationsOfDevices = canRemotelyTogglePushNotificationsOfDevices,
 )
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt
index 397ca80f84..a6d21a46c9 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt
@@ -63,6 +63,7 @@ fun anInviteNotifiableEvent(
 fun aNotifiableMessageEvent(
         eventId: String = "a-message-event-id",
         roomId: String = "a-message-room-id",
+        threadId: String? = null,
         isRedacted: Boolean = false
 ) = NotifiableMessageEvent(
         eventId = eventId,
@@ -73,6 +74,7 @@ fun aNotifiableMessageEvent(
         senderId = "sending-id",
         body = "message-body",
         roomId = roomId,
+        threadId = threadId,
         roomName = "room-name",
         roomIsDirect = false,
         canBeReplaced = false,
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/PusherFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/PusherFixture.kt
new file mode 100644
index 0000000000..300c66eca3
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/PusherFixture.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fixtures
+
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.api.session.pushers.PusherData
+import org.matrix.android.sdk.api.session.pushers.PusherState
+
+object PusherFixture {
+
+    fun aPusher(
+            pushKey: String = "",
+            kind: String = "",
+            appId: String = "",
+            appDisplayName: String? = "",
+            deviceDisplayName: String? = "",
+            profileTag: String? = null,
+            lang: String? = "",
+            data: PusherData = PusherData("f.o/_matrix/push/v1/notify", ""),
+            enabled: Boolean = true,
+            deviceId: String? = "",
+            state: PusherState = PusherState.REGISTERED,
+    ) = Pusher(
+            pushKey,
+            kind,
+            appId,
+            appDisplayName,
+            deviceDisplayName,
+            profileTag,
+            lang,
+            data,
+            enabled,
+            deviceId,
+            state,
+    )
+}
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/SessionParamsFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/SessionParamsFixture.kt
new file mode 100644
index 0000000000..598a95707b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/SessionParamsFixture.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 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.
+ */
+
+package im.vector.app.test.fixtures
+
+import im.vector.app.test.fixtures.CredentialsFixture.aCredentials
+import io.mockk.mockk
+import org.matrix.android.sdk.api.auth.LoginType
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.SessionParams
+
+object SessionParamsFixture {
+    fun aSessionParams(
+            credentials: Credentials = aCredentials(),
+            homeServerConnectionConfig: HomeServerConnectionConfig = mockk(relaxed = true),
+            isTokenValid: Boolean = false,
+            loginType: LoginType = LoginType.UNKNOWN,
+    ) = SessionParams(
+            credentials,
+            homeServerConnectionConfig,
+            isTokenValid,
+            loginType,
+    )
+}
diff --git a/vector/src/test/snapshots/images/im.vector.app.screenshot_PaparazziExampleScreenshotTest_example paparazzi test.png b/vector/src/test/snapshots/images/im.vector.app.screenshot_PaparazziExampleScreenshotTest_example paparazzi test.png
new file mode 100644
index 0000000000..bba610b25f
--- /dev/null
+++ b/vector/src/test/snapshots/images/im.vector.app.screenshot_PaparazziExampleScreenshotTest_example paparazzi test.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:113cf006e9a881f19b79462297cf276aea2b82268182f9ecc297d4b31640b507
+size 11174
diff --git a/vector/src/test/snapshots/images/im.vector.app.screenshot_RoomItemScreenshotTest_item room test.png b/vector/src/test/snapshots/images/im.vector.app.screenshot_RoomItemScreenshotTest_item room test.png
new file mode 100644
index 0000000000..1e87449b3c
--- /dev/null
+++ b/vector/src/test/snapshots/images/im.vector.app.screenshot_RoomItemScreenshotTest_item room test.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d33e82c6647bab9dcb3745d8c5a5448d60049279c365b9f64816eb9c958360d2
+size 15015
diff --git a/vector/src/test/snapshots/images/im.vector.app.screenshot_RoomItemScreenshotTest_item room two line and highlight test.png b/vector/src/test/snapshots/images/im.vector.app.screenshot_RoomItemScreenshotTest_item room two line and highlight test.png
new file mode 100644
index 0000000000..83fcb8d000
--- /dev/null
+++ b/vector/src/test/snapshots/images/im.vector.app.screenshot_RoomItemScreenshotTest_item room two line and highlight test.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91a106e2a3f7310ac05425a2413ccec0aaa07720609d77a2ecd9a9d0d602b296
+size 17232